Update to KOffice 1.4.0a.

Note that 'a' does *not* stand for 'alpha', but denotes a short-notice
bugfix release made after KOffice 1.4.0.

11 files changed, 1339 insertions, 337 deletions

diff --git a/editors/koffice-kde4/Makefile b/editors/koffice-kde4/Makefile
index bd3e24f47837..36889951226f 100644
--- a/editors/koffice-kde4/Makefile
+++ b/editors/koffice-kde4/Makefile
@@ -1,4 +1,3 @@
-# -*-mode: makefile-*-
 # New ports collection makefile for:	koffice
 # Date created:				Sun May 14 2000 16:33:15
 # Whom:					Will Andrews <will@FreeBSD.org>
@@ -7,40 +6,53 @@
 #
 
 PORTNAME=	koffice
-PORTVERSION=	1.3.5
-PORTREVISION=	2
+PORTVERSION=	1.4.0a
 PORTEPOCH=	1
 CATEGORIES=	editors kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/${PORTNAME}-${PORTVERSION:S/.0//:S/a//}/src
 DIST_SUBDIR=	KDE/koffice
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Office Suite for KDE3
 
-BUILD_DEPENDS=	Magick-config:${PORTSDIR}/graphics/ImageMagick \
-		dot:${PORTSDIR}/graphics/graphviz
+BUILD_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx \
+		Magick-config:${PORTSDIR}/graphics/ImageMagick
 LIB_DEPENDS=	art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl2 \
 		aspell:${PORTSDIR}/textproc/aspell \
 		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype:${PORTSDIR}/print/freetype2 \
-		paper.2:${PORTSDIR}/print/libpaper \
+		lcms:${PORTSDIR}/graphics/lcms \
+		paper:${PORTSDIR}/print/libpaper \
+		pq:${PORTSDIR}/databases/postgresql74-client \
+		wpd-0.8:${PORTSDIR}/textproc/libwpd \
 		wv2:${PORTSDIR}/textproc/wv2 \
 		xml2:${PORTSDIR}/textproc/libxml2 \
 		xslt:${PORTSDIR}/textproc/libxslt
+RUN_DEPENDS=	${LOCALBASE}/lib/libpqxx.a:${PORTSDIR}/databases/postgresql-libpqxx
 
-USE_KDELIBS_VER=	3
-PREFIX=			${KDE_PREFIX}
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+PREFIX=		${KDE_PREFIX}
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_KDELIBS_VER=3
+USE_MYSQL=	yes
+USE_PYTHON=	yes
 
-USE_BZIP2=		yes
-USE_GMAKE=		yes
-USE_ICONV=		yes
-USE_PYTHON=		yes
-GNU_CONFIGURE=		yes
-_NO_KDE_FIXPTHREAD=	yes
+.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
+.include <bsd.port.pre.mk>
 
-INSTALLS_SHLIB=		yes
-LDCONFIG_DIRS+=		%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+.if ${OSVERSION} < 500035
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-kexi-main-keximainwindowimpl.cpp
+CPPFLAGS+=	-I${LOCALBASE}/include/stlport
+LDFLAGS+=	-L${LOCALBASE}/lib -lstlport_gcc ${PTHREAD_LIBS}
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS}" CPPFLAGS="${CPPFLAGS}"
+.endif
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
-.include <bsd.port.mk>
+post-patch:
+	@env TZ=UTC ${TOUCH} -t 200506221316 ${WRKSRC}/subdirs ${WRKSRC}/Makefile.am \
+			${WRKSRC}/configure.files ${WRKSRC}/configure.in \
+			${WRKSRC}/acinclude.m4 ${WRKSRC}/aclocal.m4
+
+.include <bsd.port.post.mk>
diff --git a/editors/koffice-kde4/distinfo b/editors/koffice-kde4/distinfo
index 7d8379fc1cd9..7d129d46113d 100644
--- a/editors/koffice-kde4/distinfo
+++ b/editors/koffice-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/koffice/koffice-1.3.5.tar.bz2) = dbc7e76c86647709a3e74f57c0fcf7f5
-SIZE (KDE/koffice/koffice-1.3.5.tar.bz2) = 10778584
+MD5 (KDE/koffice/koffice-1.4.0a.tar.bz2) = 9a8494144962ea5434397289ed326385
+SIZE (KDE/koffice/koffice-1.4.0a.tar.bz2) = 19728031
diff --git a/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp b/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp
new file mode 100644
index 000000000000..68068710b7c0
--- /dev/null
+++ b/editors/koffice-kde4/files/extrapatch-kexi-main-keximainwindowimpl.cpp
@@ -0,0 +1,13 @@
+--- kexi/main/keximainwindowimpl.cpp.orig	Thu Jun 30 17:28:58 2005
++++ kexi/main/keximainwindowimpl.cpp	Thu Jun 30 17:29:14 2005
+@@ -106,8 +106,8 @@
+ //#define PROPEDITOR_VISIBILITY_CHANGES
+ 
+ //temporary fix to manage layout
+-#include "ksplitter.h"
+-#define KDOCKWIDGET_P 1
++// #include "ksplitter.h"
++// #define KDOCKWIDGET_P 1
+ 
+ //#ifndef KEXI_NO_MIGRATION
+ //#include "migration/importwizard.h"
diff --git a/editors/koffice-kde4/files/patch-configure b/editors/koffice-kde4/files/patch-configure
deleted file mode 100644
index 5147ed156f26..000000000000
--- a/editors/koffice-kde4/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Sat Oct 30 03:46:09 2004
-+++ configure	Sat Oct 30 03:46:54 2004
-@@ -26335,7 +26335,7 @@
-     PTHREAD_LIBS="$PTHREAD_LIBS_save"
-   fi
- 
--  if test -z "$LIBPTHREAD"; then
-+  if test -z "$LIBPTHREAD" && test "$PTHREAD_LIBS" != "-pthread" ; then
-     echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
- echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
diff --git a/editors/koffice-kde4/files/patch-filters-kspread-excel-sidewinder-excel.cpp b/editors/koffice-kde4/files/patch-filters-kspread-excel-sidewinder-excel.cpp
new file mode 100644
index 000000000000..65e60fd83a86
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-filters-kspread-excel-sidewinder-excel.cpp
@@ -0,0 +1,11 @@
+--- filters/kspread/excel/sidewinder/excel.cpp.orig	Wed Jun 29 02:06:17 2005
++++ filters/kspread/excel/sidewinder/excel.cpp	Wed Jun 29 02:04:06 2005
+@@ -5412,7 +5412,7 @@
+       case 10:  valueFormat = "0.00%"; break;
+       case 11:  valueFormat = "0.00E+00"; break;
+       case 12:  valueFormat = "#?/?"; break;
+-      case 13:  valueFormat = "#\?\?\/\?\?"; break;
++      case 13:  valueFormat = "#\?\?/\?\?"; break;
+       case 14:  valueFormat = "M/D/YY"; break;
+       case 15:  valueFormat = "D-MMM-YY"; break;
+       case 16:  valueFormat = "D-MMM"; break;
diff --git a/editors/koffice-kde4/files/patch-krita-plugins-cimg-CImg.h b/editors/koffice-kde4/files/patch-krita-plugins-cimg-CImg.h
new file mode 100644
index 000000000000..9c914acb3d05
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-krita-plugins-cimg-CImg.h
@@ -0,0 +1,11 @@
+--- krita/plugins/cimg/CImg.h.orig	Tue Jun 28 02:31:30 2005
++++ krita/plugins/cimg/CImg.h	Tue Jun 28 02:32:10 2005
+@@ -5135,7 +5135,7 @@
+       if (ny1<0 || ny0>=dimy()) return *this;
+       if (ny0<0) { nx0-=ny0*(nx1-nx0)/(ny1-ny0); ny0=0; }
+       if (ny1>=dimy()) { nx1+=(ny1-dimy())*(nx0-nx1)/(ny1-ny0); ny1=dimy()-1;}
+-      const unsigned int dmax = (unsigned int)cimg::max(std::abs(nx1-nx0),ny1-ny0), whz = width*height*depth;
++      const unsigned int dmax = (unsigned int)cimg::max(std::abs((long int)(nx1-nx0)),(long int)(ny1-ny0)), whz = width*height*depth;
+       const float px = dmax?(nx1-nx0)/(float)dmax:0, py = dmax?(ny1-ny0)/(float)dmax:0;
+       float x = (float)nx0, y = (float)ny0;
+       if (opacity>=1) for (unsigned int t=0; t<=dmax; t++) {
diff --git a/editors/koffice-kde4/files/patch-kspread-dialogs-kspread_dlg_database.cc b/editors/koffice-kde4/files/patch-kspread-dialogs-kspread_dlg_database.cc
new file mode 100644
index 000000000000..0f733f0e891f
--- /dev/null
+++ b/editors/koffice-kde4/files/patch-kspread-dialogs-kspread_dlg_database.cc
@@ -0,0 +1,13 @@
+--- kspread/dialogs/kspread_dlg_database.cc.orig	Tue Jun 28 03:42:22 2005
++++ kspread/dialogs/kspread_dlg_database.cc	Tue Jun 28 03:48:20 2005
+@@ -600,8 +600,8 @@
+   // An update command must also be followed by a space, or it would be parsed
+   // as an identifier.
+   // For sanity, also check that there is a SELECT 
+-  QRegExp couldModifyDB( "(^|[( \s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
+-  QRegExp couldQueryDB( "(^|[( \s])(SELECT) ", false /* cs */ );
++  QRegExp couldModifyDB( "(^|[( \\s])(UPDATE|DELETE|INSERT|CREATE) ", false /* cs */ );
++  QRegExp couldQueryDB( "(^|[( \\s])(SELECT) ", false /* cs */ );
+ 
+   if (couldModifyDB.search( queryStr ) != -1 || couldQueryDB.search ( queryStr ) == -1 )
+   {
diff --git a/editors/koffice-kde4/files/patch-kspread_kspread_cell.cc b/editors/koffice-kde4/files/patch-kspread_kspread_cell.cc
deleted file mode 100644
index 4a02dc363cfa..000000000000
--- a/editors/koffice-kde4/files/patch-kspread_kspread_cell.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- kspread/kspread_cell.cc.orig	Sun Feb 20 23:27:56 2005
-+++ kspread/kspread_cell.cc	Sun Feb 20 23:29:21 2005
-@@ -2882,7 +2882,7 @@
-       x = indent + cellRect.x() + m_dTextX;
-     else
-       x = indent + cellRect.x() + m_dTextX
--        - ( fm.descent() + fm.ascent() ) * sin( angle * M_PI / 180 );
-+        - doc->unzoomItX(( fm.descent() + fm.ascent() ) * sin( angle * M_PI / 180 ));
-     double y;
-     if ( angle > 0 )
-       y = cellRect.y() + m_dTextY;
diff --git a/editors/koffice-kde4/files/patch-post-1.3.5-koffice.diff b/editors/koffice-kde4/files/patch-post-1.3.5-koffice.diff
deleted file mode 100644
index 4635b7562fac..000000000000
--- a/editors/koffice-kde4/files/patch-post-1.3.5-koffice.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- filters/kword/pdf/xpdf/xpdf/XRef.cc	30 Oct 2004 16:35:33 -0000	1.6
-+++ filters/kword/pdf/xpdf/xpdf/XRef.cc	20 Jan 2005 17:36:38 -0000	1.8
-@@ -501,6 +501,12 @@ GBool XRef::checkEncrypted(GString *owne
- 	} else {
- 	  keyLength = 5;
- 	}
-+	if (keyLength < 1) {
-+	  keyLength = 1;
-+	}
-+	if (keyLength > 16) {
-+	  keyLength = 16;
-+	}
- 	permFlags = permissions.getInt();
- 	if (encVersion >= 1 && encVersion <= 2 &&
- 	    encRevision >= 2 && encRevision <= 3) {
diff --git a/editors/koffice-kde4/files/patch-xpdf_security_integer_overflow_2.diff b/editors/koffice-kde4/files/patch-xpdf_security_integer_overflow_2.diff
deleted file mode 100644
index 929a3ba2964c..000000000000
--- a/editors/koffice-kde4/files/patch-xpdf_security_integer_overflow_2.diff
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -u -b -p -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/Gfx.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ filters/kword/pdf/xpdf/xpdf/Gfx.cc	22 Dec 2004 12:07:12 -0000	1.3.2.1
-@@ -2379,7 +2379,9 @@ void Gfx::doImage(Object *ref, Stream *s
-     haveMask = gFalse;
-     dict->lookup("Mask", &maskObj);
-     if (maskObj.isArray()) {
--      for (i = 0; i < maskObj.arrayGetLength(); ++i) {
-+      for (i = 0;
-+	   i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
-+	   ++i) {
- 	maskObj.arrayGet(i, &obj1);
- 	maskColors[i] = obj1.getInt();
- 	obj1.free();
-diff -u -b -p -u -r1.3 -r1.3.2.1
---- filters/kword/pdf/xpdf/xpdf/GfxState.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ filters/kword/pdf/xpdf/xpdf/GfxState.cc	22 Dec 2004 12:07:12 -0000	1.3.2.1
-@@ -682,6 +682,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
-   }
-   nCompsA = obj2.getInt();
-   obj2.free();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "ICCBased color space with too many (%d > %d) components",
-+	  nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   if (dict->lookup("Alternate", &obj2)->isNull() ||
-       !(altA = GfxColorSpace::parse(&obj2))) {
-     switch (nCompsA) {
-@@ -1023,6 +1028,11 @@ GfxColorSpace *GfxDeviceNColorSpace::par
-     goto err2;
-   }
-   nCompsA = obj1.arrayGetLength();
-+  if (nCompsA > gfxColorMaxComps) {
-+    error(-1, "DeviceN color space with too many (%d > %d) components",
-+         nCompsA, gfxColorMaxComps);
-+    nCompsA = gfxColorMaxComps;
-+  }
-   for (i = 0; i < nCompsA; ++i) {
-     if (!obj1.arrayGet(i, &obj2)->isName()) {
-       error(-1, "Bad DeviceN color space (names)");
diff --git a/editors/koffice-kde4/pkg-plist b/editors/koffice-kde4/pkg-plist
index ad77bd5134bc..e4362f911901 100644
--- a/editors/koffice-kde4/pkg-plist
+++ b/editors/koffice-kde4/pkg-plist
@@ -1,5 +1,8 @@
 bin/karbon
 bin/kchart
+bin/kexi
+bin/keximigratetest
+bin/kformdesigner
 bin/kformula
 bin/kivio
 bin/koconverter
@@ -7,7 +10,11 @@ bin/koscript
 bin/koshell
 bin/kprconverter.pl
 bin/kpresenter
+bin/krita
 bin/kspread
+bin/ksqlite
+bin/ksqlite2
+bin/ksqlite2to3
 bin/kthesaurus
 bin/kudesigner
 bin/kugar
@@ -34,6 +41,28 @@ include/KoMainWindowIface.h
 include/KoViewIface.h
 include/handler.h
 include/kcoloractions.h
+include/kexidb/connection.h
+include/kexidb/connectiondata.h
+include/kexidb/cursor.h
+include/kexidb/driver.h
+include/kexidb/drivermanager.h
+include/kexidb/error.h
+include/kexidb/expression.h
+include/kexidb/field.h
+include/kexidb/fieldlist.h
+include/kexidb/global.h
+include/kexidb/indexschema.h
+include/kexidb/kexidb_export.h
+include/kexidb/keximigrate.h
+include/kexidb/migratemanager.h
+include/kexidb/object.h
+include/kexidb/parser.h
+include/kexidb/queryschema.h
+include/kexidb/relationship.h
+include/kexidb/schemadata.h
+include/kexidb/tableschema.h
+include/kexidb/transaction.h
+include/kexidb/tristate.h
 include/koApplication.h
 include/koCharSelectDia.h
 include/koChart.h
@@ -47,10 +76,14 @@ include/koFilter.h
 include/koFilterChain.h
 include/koFilterManager.h
 include/koFrame.h
+include/koGenStyles.h
 include/koGlobal.h
 include/koInsertLink.h
 include/koKoolBar.h
 include/koMainWindow.h
+include/koOasisSettings.h
+include/koOasisStyles.h
+include/koPageLayout.h
 include/koPageLayoutDia.h
 include/koPartSelectAction.h
 include/koPartSelectDia.h
@@ -62,13 +95,10 @@ include/koPoint.h
 include/koQueryTrader.h
 include/koRect.h
 include/koRuler.h
-include/koSconfig.h
 include/koSize.h
-include/koSpell.h
-include/koSpellConfig.h
-include/koSpelldlg.h
 include/koStore.h
 include/koStoreDevice.h
+include/koStyleStack.h
 include/koTabChooser.h
 include/koTemplateChooseDia.h
 include/koTemplateCreateDia.h
@@ -76,13 +106,24 @@ include/koToolBox.h
 include/koUnit.h
 include/koUnitWidgets.h
 include/koView.h
-include/koaspell.h
 include/kocommandhistory.h
 include/kocontexthelp.h
+include/kodom.h
 include/koeditpath.h
+include/koffice_export.h
 include/kofficeversion.h
-include/koispell.h
+include/kolinestyleaction.h
+include/kolinewidthaction.h
+include/koselectaction.h
+include/kotabbar.h
 include/kotoolbutton.h
+include/kotooldockbase.h
+include/kotooldockmanager.h
+include/kotooldockmovemanager.h
+include/koversiondialog.h
+include/koxmlns.h
+include/koxmlwriter.h
+include/kozoomaction.h
 include/kreportviewer.h
 include/kugar.h
 include/kugarqt.h
@@ -106,12 +147,12 @@ include/tkaction.h
 include/tkcoloractions.h
 include/tkcombobox.h
 include/tktoolbarbutton.h
-lib/karbon.la
-lib/karbon.so
-lib/kchart.la
-lib/kchart.so
 lib/kde3/clipartthumbnail.la
 lib/kde3/clipartthumbnail.so
+lib/kde3/containers.la
+lib/kde3/containers.so
+lib/kde3/karbon.la
+lib/kde3/karbon.so
 lib/kde3/karbon_flattenpathplugin.la
 lib/kde3/karbon_flattenpathplugin.so
 lib/kde3/karbon_imagetoolplugin.la
@@ -126,22 +167,126 @@ lib/kde3/karbon_whirlpinchplugin.la
 lib/kde3/karbon_whirlpinchplugin.so
 lib/kde3/karbon_zoomtoolplugin.la
 lib/kde3/karbon_zoomtoolplugin.so
+lib/kde3/kchart.la
+lib/kde3/kchart.so
+lib/kde3/kexi.la
+lib/kde3/kexi.so
+lib/kde3/kexidb_mysqldriver.la
+lib/kde3/kexidb_mysqldriver.so
+lib/kde3/kexidb_pqxxsqldriver.la
+lib/kde3/kexidb_pqxxsqldriver.so
+lib/kde3/kexidb_sqlite2driver.la
+lib/kde3/kexidb_sqlite2driver.so
+lib/kde3/kexidb_sqlite3driver.la
+lib/kde3/kexidb_sqlite3driver.so
+lib/kde3/kexidbwidgets.la
+lib/kde3/kexidbwidgets.so
+lib/kde3/kexihandler_form.la
+lib/kde3/kexihandler_form.so
+lib/kde3/kexihandler_migration.la
+lib/kde3/kexihandler_migration.so
+lib/kde3/kexihandler_query.la
+lib/kde3/kexihandler_query.so
+lib/kde3/kexihandler_relation.la
+lib/kde3/kexihandler_relation.so
+lib/kde3/kexihandler_script.la
+lib/kde3/kexihandler_script.so
+lib/kde3/kexihandler_table.la
+lib/kde3/kexihandler_table.so
+lib/kde3/keximigrate_mysql.la
+lib/kde3/keximigrate_mysql.so
+lib/kde3/keximigrate_pqxx.la
+lib/kde3/keximigrate_pqxx.so
 lib/kde3/kfile_koffice.la
 lib/kde3/kfile_koffice.so
 lib/kde3/kfile_ooo.la
 lib/kde3/kfile_ooo.so
+lib/kde3/kformula.la
+lib/kde3/kformula.so
+lib/kde3/kivio.la
+lib/kde3/kivio.so
 lib/kde3/kodocinfopropspage.la
 lib/kde3/kodocinfopropspage.so
 lib/kde3/kofficescan.la
 lib/kde3/kofficescan.so
 lib/kde3/kofficethumbnail.la
 lib/kde3/kofficethumbnail.so
+lib/kde3/koshell.la
+lib/kde3/koshell.so
+lib/kde3/kpresenter.la
+lib/kde3/kpresenter.so
+lib/kde3/krita.la
+lib/kde3/krita.so
+lib/kde3/kritacimg.la
+lib/kde3/kritacimg.so
+lib/kde3/kritacolorrange.la
+lib/kde3/kritacolorrange.so
+lib/kde3/kritacolorsfilters.la
+lib/kde3/kritacolorsfilters.so
+lib/kde3/kritacolorspaceconversion.la
+lib/kde3/kritacolorspaceconversion.so
+lib/kde3/kritaconvolutionfilters.la
+lib/kde3/kritaconvolutionfilters.so
+lib/kde3/kritadefaultpaintops.la
+lib/kde3/kritadefaultpaintops.so
+lib/kde3/kritadefaulttools.la
+lib/kde3/kritadefaulttools.so
+lib/kde3/kritaembossfilter.la
+lib/kde3/kritaembossfilter.so
+lib/kde3/kritaexample.la
+lib/kde3/kritaexample.so
+lib/kde3/kritagrayplugin.la
+lib/kde3/kritagrayplugin.so
+lib/kde3/kritahistogram.la
+lib/kde3/kritahistogram.so
+lib/kde3/kritaimagesize.la
+lib/kde3/kritaimagesize.so
+lib/kde3/kritaoilpaintfilter.la
+lib/kde3/kritaoilpaintfilter.so
+lib/kde3/kritaraindropsfilter.la
+lib/kde3/kritaraindropsfilter.so
+lib/kde3/kritargbplugin.la
+lib/kde3/kritargbplugin.so
+lib/kde3/kritarotateimage.la
+lib/kde3/kritarotateimage.so
+lib/kde3/kritascreenshot.la
+lib/kde3/kritascreenshot.so
+lib/kde3/kritaselectiontools.la
+lib/kde3/kritaselectiontools.so
+lib/kde3/kritashearimage.la
+lib/kde3/kritashearimage.so
+lib/kde3/kritatoolcrop.la
+lib/kde3/kritatoolcrop.so
+lib/kde3/kritatoolfilter.la
+lib/kde3/kritatoolfilter.so
+lib/kde3/kritatoolpolygon.la
+lib/kde3/kritatoolpolygon.so
+lib/kde3/kritatoolpolyline.la
+lib/kde3/kritatoolpolyline.so
+lib/kde3/kritatoolstar.la
+lib/kde3/kritatoolstar.so
+lib/kde3/kritatooltransform.la
+lib/kde3/kritatooltransform.so
+lib/kde3/kspread.la
+lib/kde3/kspread.so
+lib/kde3/kthesaurus.la
+lib/kde3/kthesaurus.so
+lib/kde3/kudesigner.la
+lib/kde3/kudesigner.so
+lib/kde3/kugar.la
+lib/kde3/kugar.so
 lib/kde3/kwmailmerge_classic.la
 lib/kde3/kwmailmerge_classic.so
+lib/kde3/kwmailmerge_kabc.la
+lib/kde3/kwmailmerge_kabc.so
+lib/kde3/kwmailmerge_kspread.la
+lib/kde3/kwmailmerge_kspread.so
 lib/kde3/kwmailmerge_qtsqldb.la
 lib/kde3/kwmailmerge_qtsqldb.so
 lib/kde3/kwmailmerge_qtsqldb_power.la
 lib/kde3/kwmailmerge_qtsqldb_power.so
+lib/kde3/kword.la
+lib/kde3/kword.so
 lib/kde3/libabiwordexport.la
 lib/kde3/libabiwordexport.so
 lib/kde3/libabiwordimport.la
@@ -166,6 +311,8 @@ lib/kde3/libdbaseimport.la
 lib/kde3/libdbaseimport.so
 lib/kde3/libdocbookexport.la
 lib/kde3/libdocbookexport.so
+lib/kde3/libexcelimport.la
+lib/kde3/libexcelimport.so
 lib/kde3/libgenerickofilter.la
 lib/kde3/libgenerickofilter.so
 lib/kde3/libgnumericexport.la
@@ -178,9 +325,6 @@ lib/kde3/libhtmlimport.la
 lib/kde3/libhtmlimport.so
 lib/kde3/libkarbonaiimport.la
 lib/kde3/libkarbonaiimport.so
-lib/kde3/libkarbonaiimport.so.1
-lib/kde3/libkarbonbase.la
-lib/kde3/libkarbonbase.so
 lib/kde3/libkarbonepsexport.la
 lib/kde3/libkarbonepsexport.so
 lib/kde3/libkarbonepsimport.la
@@ -201,6 +345,10 @@ lib/kde3/libkarbonxcfexport.la
 lib/kde3/libkarbonxcfexport.so
 lib/kde3/libkchartpart.la
 lib/kde3/libkchartpart.so
+lib/kde3/libkchartpngexport.la
+lib/kde3/libkchartpngexport.so
+lib/kde3/libkchartsvgexport.la
+lib/kde3/libkchartsvgexport.so
 lib/kde3/libkfolatexexport.la
 lib/kde3/libkfolatexexport.so
 lib/kde3/libkfomathmlexport.la
@@ -209,6 +357,8 @@ lib/kde3/libkfomathmlimport.la
 lib/kde3/libkfomathmlimport.so
 lib/kde3/libkfopngexport.la
 lib/kde3/libkfopngexport.so
+lib/kde3/libkformdesigner_part.la
+lib/kde3/libkformdesigner_part.so
 lib/kde3/libkformulapart.la
 lib/kde3/libkformulapart.so
 lib/kde3/libkiviopart.la
@@ -219,12 +369,16 @@ lib/kde3/libkpresenterpart.la
 lib/kde3/libkpresenterpart.so
 lib/kde3/libkprkword.la
 lib/kde3/libkprkword.so
-lib/kde3/libkspelltool.la
-lib/kde3/libkspelltool.so
-lib/kde3/libkspreadcalc.la
-lib/kde3/libkspreadcalc.so
+lib/kde3/libkritamagickexport.la
+lib/kde3/libkritamagickexport.so
+lib/kde3/libkritamagickimport.la
+lib/kde3/libkritamagickimport.so
+lib/kde3/libkritapart.la
+lib/kde3/libkritapart.so
 lib/kde3/libkspreadhtmlexport.la
 lib/kde3/libkspreadhtmlexport.so
+lib/kde3/libkspreadinsertcalendar.la
+lib/kde3/libkspreadinsertcalendar.so
 lib/kde3/libkspreadlatexexport.la
 lib/kde3/libkspreadlatexexport.so
 lib/kde3/libkspreadpart.la
@@ -235,6 +389,8 @@ lib/kde3/libkugarnopimport.la
 lib/kde3/libkugarnopimport.so
 lib/kde3/libkugarpart.la
 lib/kde3/libkugarpart.so
+lib/kde3/libkwordkword1dot3import.la
+lib/kde3/libkwordkword1dot3import.so
 lib/kde3/libkwordlatexexport.la
 lib/kde3/libkwordlatexexport.so
 lib/kde3/libkwordpart.la
@@ -289,34 +445,102 @@ lib/kde3/libxsltexport.la
 lib/kde3/libxsltexport.so
 lib/kde3/libxsltimport.la
 lib/kde3/libxsltimport.so
+lib/kde3/stdwidgets.la
+lib/kde3/stdwidgets.so
 lib/kde3/straight_connector.la
 lib/kde3/straight_connector.so
-lib/kformulamain.la
-lib/kformulamain.so
-lib/kivio.la
-lib/kivio.so
-lib/koshell.la
-lib/koshell.so
-lib/kpresenter.la
-lib/kpresenter.so
-lib/kspread.la
-lib/kspread.so
-lib/kudesigner.la
-lib/kudesigner.so
-lib/kugar.la
-lib/kugar.so
-lib/kword.la
-lib/kword.so
+lib/libkarbonbase.la
+lib/libkarbonbase.so
+lib/libkarbonbase.so.2
+lib/libkarboncommon.la
+lib/libkarboncommon.so
+lib/libkarboncommon.so.0
+lib/libkchartcommon.la
+lib/libkchartcommon.so
+lib/libkchartcommon.so.2
 lib/libkdchart.la
 lib/libkdchart.so
 lib/libkdchart.so.0
-lib/libkformula.la
-lib/libkformula.so
-lib/libkformula.so.3
+lib/libkdeinit_karbon.la
+lib/libkdeinit_karbon.so
+lib/libkdeinit_kchart.la
+lib/libkdeinit_kchart.so
+lib/libkdeinit_kexi.la
+lib/libkdeinit_kexi.so
+lib/libkdeinit_kformula.la
+lib/libkdeinit_kformula.so
+lib/libkdeinit_kivio.la
+lib/libkdeinit_kivio.so
+lib/libkdeinit_koshell.la
+lib/libkdeinit_koshell.so
+lib/libkdeinit_kpresenter.la
+lib/libkdeinit_kpresenter.so
+lib/libkdeinit_krita.la
+lib/libkdeinit_krita.so
+lib/libkdeinit_kspread.la
+lib/libkdeinit_kspread.so
+lib/libkdeinit_kthesaurus.la
+lib/libkdeinit_kthesaurus.so
+lib/libkdeinit_kudesigner.la
+lib/libkdeinit_kudesigner.so
+lib/libkdeinit_kugar.la
+lib/libkdeinit_kugar.so
+lib/libkdeinit_kword.la
+lib/libkdeinit_kword.so
+lib/libkexicore.la
+lib/libkexicore.so
+lib/libkexicore.so.0
+lib/libkexidatatable.la
+lib/libkexidatatable.so
+lib/libkexidatatable.so.0
+lib/libkexidb.la
+lib/libkexidb.so
+lib/libkexidb.so.0
+lib/libkexidbparser.la
+lib/libkexidbparser.so
+lib/libkexidbparser.so.0
+lib/libkexiextendedwidgets.la
+lib/libkexiextendedwidgets.so
+lib/libkexiextendedwidgets.so.0
+lib/libkexiformutils.la
+lib/libkexiformutils.so
+lib/libkexiformutils.so.0
+lib/libkexiguiutils.la
+lib/libkexiguiutils.so
+lib/libkexiguiutils.so.0
+lib/libkeximain.la
+lib/libkeximain.so
+lib/libkeximain.so.0
+lib/libkeximigrate.la
+lib/libkeximigrate.so
+lib/libkeximigrate.so.0
+lib/libkexipropertyeditor.la
+lib/libkexipropertyeditor.so
+lib/libkexipropertyeditor.so.0
+lib/libkexirelationsview.la
+lib/libkexirelationsview.so
+lib/libkexirelationsview.so.0
+lib/libkexisql2.la
+lib/libkexisql2.so
+lib/libkexisql2.so.2
+lib/libkexisql3.la
+lib/libkexisql3.so
+lib/libkexisql3.so.3
+lib/libkformdesigner.la
+lib/libkformdesigner.so
+lib/libkformdesigner.so.0
+lib/libkformulalib.la
+lib/libkformulalib.so
+lib/libkformulalib.so.3
+lib/libkiviocommon.la
+lib/libkiviocommon.so
+lib/libkiviocommon.so.0
 lib/libkivioconnectortool.la
 lib/libkivioconnectortool.so
 lib/libkivioselecttool.la
 lib/libkivioselecttool.so
+lib/libkiviotargettool.la
+lib/libkiviotargettool.so
 lib/libkiviotexttool.la
 lib/libkiviotexttool.so
 lib/libkiviozoomtool.la
@@ -336,23 +560,26 @@ lib/libkopainter.so.1
 lib/libkoscript.la
 lib/libkoscript.so
 lib/libkoscript.so.2
-lib/libkospell.la
-lib/libkospell.so
-lib/libkospell.so.5
 lib/libkotext.la
 lib/libkotext.so
 lib/libkotext.so.2
 lib/libkowmf.la
 lib/libkowmf.so
 lib/libkowmf.so.1
+lib/libkritacommon.la
+lib/libkritacommon.so
+lib/libkritacommon.so.1
+lib/libkspreadcommon.la
+lib/libkspreadcommon.so
+lib/libkspreadcommon.so.0
 lib/libkstore.la
 lib/libkstore.so
 lib/libkstore.so.2
 lib/libkudesignercore.la
 lib/libkudesignercore.so
-lib/libkugar.la
-lib/libkugar.so
-lib/libkugar.so.1
+lib/libkugarlib.la
+lib/libkugarlib.so
+lib/libkugarlib.so.1
 lib/libkwmailmerge_interface.la
 lib/libkwmailmerge_interface.so
 lib/libkwmailmerge_interface.so.4
@@ -362,17 +589,20 @@ lib/libkwmf.so.2
 lib/libkwordexportfilters.la
 lib/libkwordexportfilters.so
 lib/libkwordexportfilters.so.1
+share/applications/kde/kexi.desktop
+share/applications/kde/kivio.desktop
 share/applnk/Office/KThesaurus.desktop
 share/applnk/Office/karbon.desktop
 share/applnk/Office/kchart.desktop
 share/applnk/Office/kformula.desktop
-share/applnk/Office/kivio.desktop
 share/applnk/Office/koshell.desktop
 share/applnk/Office/kpresenter.desktop
+share/applnk/Office/krita.desktop
 share/applnk/Office/kspread.desktop
 share/applnk/Office/kudesigner.desktop
 share/applnk/Office/kugar.desktop
 share/applnk/Office/kword.desktop
+share/applnk/Utilities/kformdesigner.desktop
 share/apps/karbon/gradients/allcolors.kgr
 share/apps/karbon/gradients/simple.kgr
 share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_deletelayer.png
@@ -381,6 +611,7 @@ share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_newlayer.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_novisible.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_raiselayer.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/14_layer_visible.png
+share/apps/karbon/icons/crystalsvg/16x16/actions/14_pencil.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/cap_butt.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/cap_round.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/cap_square.png
@@ -398,13 +629,13 @@ share/apps/karbon/icons/crystalsvg/16x16/actions/strokedocker.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/tooloptions.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/translate.png
 share/apps/karbon/icons/crystalsvg/16x16/actions/unlocked.png
-share/apps/karbon/icons/crystalsvg/16x16/apps/karbon.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_ellipse.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_flatten.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_gradient.png
-share/apps/karbon/icons/crystalsvg/22x22/actions/14_group.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_image.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_insertknots.png
+share/apps/karbon/icons/crystalsvg/22x22/actions/14_pattern.png
+share/apps/karbon/icons/crystalsvg/22x22/actions/14_pencil.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_polygon.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_polyline.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_rectangle.png
@@ -418,7 +649,6 @@ share/apps/karbon/icons/crystalsvg/22x22/actions/14_sinus.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_spiral.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_star.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_text.png
-share/apps/karbon/icons/crystalsvg/22x22/actions/14_ungroup.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_whirl.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/14_zoom.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/colorman.png
@@ -426,8 +656,11 @@ share/apps/karbon/icons/crystalsvg/22x22/actions/gradientdlg.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/outlinedlg.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/pagesetup.png
 share/apps/karbon/icons/crystalsvg/22x22/actions/solidfilldlg.png
-share/apps/karbon/icons/crystalsvg/32x32/apps/karbon.png
-share/apps/karbon/icons/crystalsvg/48x48/apps/karbon.png
+share/apps/karbon/icons/hicolor/16x16/apps/karbon.png
+share/apps/karbon/icons/hicolor/22x22/apps/karbon.png
+share/apps/karbon/icons/hicolor/32x32/apps/karbon.png
+share/apps/karbon/icons/hicolor/48x48/apps/karbon.png
+share/apps/karbon/icons/hicolor/scalable/apps/karbon.svgz
 share/apps/karbon/karbon.rc
 share/apps/karbon/karbon_readonly.rc
 share/apps/karbon/kpartplugins/flattenpathplugin.rc
@@ -437,28 +670,80 @@ share/apps/karbon/kpartplugins/roundcornersplugin.rc
 share/apps/karbon/kpartplugins/shadoweffectplugin.rc
 share/apps/karbon/kpartplugins/whirlpinchplugin.rc
 share/apps/karbon/kpartplugins/zoomtoolplugin.rc
-share/apps/kchart/icons/crystalsvg/16x16/actions/areas.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/areas3d.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/bars.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/bars3d.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/cakes.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/cakes3d.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_area.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_area_3d.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_bar.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_bar_3d.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_boxwhisker.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_hilo.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_line.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_line_3d.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_pie.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_pie_3d.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_polar.png
+share/apps/kchart/icons/crystalsvg/16x16/actions/chart_ring.png
 share/apps/kchart/icons/crystalsvg/16x16/actions/data.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/hilo.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/lines.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/lines3d.png
 share/apps/kchart/icons/crystalsvg/16x16/actions/options.png
-share/apps/kchart/icons/crystalsvg/16x16/actions/ring.png
 share/apps/kchart/icons/crystalsvg/16x16/actions/wizard.png
-share/apps/kchart/icons/crystalsvg/22x22/actions/areas.png
-share/apps/kchart/icons/crystalsvg/22x22/actions/lines.png
-share/apps/kchart/icons/crystalsvg/32x32/actions/areas.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_area.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_area_3d.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_bar.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_bar_3d.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_boxwhisker.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_hilo.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_line.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_line_3d.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_pie.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_pie_3d.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_polar.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/chart_ring.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/data.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/options.png
+share/apps/kchart/icons/crystalsvg/22x22/actions/wizard.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_area.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_area_3d.png
 share/apps/kchart/icons/crystalsvg/32x32/actions/chart_bar.png
-share/apps/kchart/icons/crystalsvg/32x32/actions/chart_pie2D.png
-share/apps/kchart/icons/crystalsvg/32x32/actions/chart_pie3D.png
-share/apps/kchart/icons/crystalsvg/32x32/actions/hilo.png
-share/apps/kchart/icons/crystalsvg/32x32/actions/lines.png
-share/apps/kchart/icons/crystalsvg/32x32/actions/ring.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_bar_3d.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_boxwhisker.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_hilo.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_line.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_line_3d.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_pie.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_pie_3d.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_polar.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/chart_ring.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/data.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/options.png
+share/apps/kchart/icons/crystalsvg/32x32/actions/wizard.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_area.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_area_3d.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_bar.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_bar_3d.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_boxwhisker.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_hilo.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_line.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_line_3d.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_pie.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_pie_3d.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_polar.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/chart_ring.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/options.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/template_barchart.png
+share/apps/kchart/icons/crystalsvg/48x48/actions/template_empty.png
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_area.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_area_3d.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_bar.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_bar_3d.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_boxwhisker.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_hilo.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_line.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_line_3d.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_pie.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_pie_3d.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_polar.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/chart_ring.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/template_barchart.svgz
+share/apps/kchart/icons/crystalsvg/scalable/actions/template_empty.svgz
 share/apps/kchart/icons/locolor/16x16/actions/areas.png
 share/apps/kchart/icons/locolor/16x16/actions/areas3d.png
 share/apps/kchart/icons/locolor/16x16/actions/bars.png
@@ -474,27 +759,15 @@ share/apps/kchart/icons/locolor/16x16/actions/ring.png
 share/apps/kchart/icons/locolor/16x16/actions/wizard.png
 share/apps/kchart/kchart.rc
 share/apps/kchart/kchart_readonly.rc
-share/apps/kchart/pics/3DAREA.png
-share/apps/kchart/pics/3DBAR.png
-share/apps/kchart/pics/3DCOMBO_HLC_AREA.png
-share/apps/kchart/pics/3DCOMBO_HLC_BAR.png
-share/apps/kchart/pics/3DCOMBO_LINE_AREA.png
-share/apps/kchart/pics/3DCOMBO_LINE_BAR.png
-share/apps/kchart/pics/3DLINE.png
-share/apps/kchart/pics/areasubtypebeside.png
-share/apps/kchart/pics/areasubtypedepth.png
-share/apps/kchart/pics/barsubtypebeside.png
-share/apps/kchart/pics/barsubtypedepth.png
-share/apps/kchart/pics/barsubtypelayer.png
-share/apps/kchart/pics/barsubtypepercent.png
-share/apps/kchart/pics/chart_3dhiloclose.png
-share/apps/kchart/pics/chart_area.png
-share/apps/kchart/pics/chart_bar.png
-share/apps/kchart/pics/chart_combo_hlc_area.png
-share/apps/kchart/pics/chart_combo_hlc_bar.png
-share/apps/kchart/pics/chart_combo_line_area.png
-share/apps/kchart/pics/chart_combo_line_bar.png
-share/apps/kchart/pics/chart_hiloclose.png
+share/apps/kchart/pics/chart_area_normal.png
+share/apps/kchart/pics/chart_area_percent.png
+share/apps/kchart/pics/chart_area_stacked.png
+share/apps/kchart/pics/chart_bar_beside.png
+share/apps/kchart/pics/chart_bar_layer.png
+share/apps/kchart/pics/chart_bar_percent.png
+share/apps/kchart/pics/chart_hilo_close.png
+share/apps/kchart/pics/chart_hilo_normal.png
+share/apps/kchart/pics/chart_hilo_openclose.png
 share/apps/kchart/pics/chart_legend_bottom.png
 share/apps/kchart/pics/chart_legend_bottomleft.png
 share/apps/kchart/pics/chart_legend_bottomright.png
@@ -504,11 +777,161 @@ share/apps/kchart/pics/chart_legend_right.png
 share/apps/kchart/pics/chart_legend_top.png
 share/apps/kchart/pics/chart_legend_topleft.png
 share/apps/kchart/pics/chart_legend_topright.png
-share/apps/kchart/pics/chart_lines.png
-share/apps/kchart/pics/chart_pie2D.png
-share/apps/kchart/pics/chart_pie3D.png
-share/apps/kchart/pics/chart_polar.png
-share/apps/kchart/pics/chart_ring.png
+share/apps/kchart/pics/chart_line_normal.png
+share/apps/kchart/pics/chart_line_percent.png
+share/apps/kchart/pics/chart_line_stacked.png
+share/apps/kchart/pics/chart_polar_normal.png
+share/apps/kchart/pics/chart_polar_percent.png
+share/apps/kchart/pics/chart_polar_stacked.png
+share/apps/kchart/templates/chart/.directory
+share/apps/kchart/templates/chart/.source/BarChart.chrt
+share/apps/kchart/templates/chart/.source/Empty.chrt
+share/apps/kchart/templates/chart/BarChart.desktop
+share/apps/kchart/templates/chart/Empty.desktop
+share/apps/kexi/icons/crystalsvg/128x128/actions/form_action.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/aofit.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/aogrid.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/aopos2grid.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/autonumber.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/business_user.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/button.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/button_no.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/clear_table_contents.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/db.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/delete_table_row.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/form.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/form_action.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/form_newobj.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/forms.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/grid.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/insert_table_row.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/key.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_first.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_last.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_new.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_next.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/navigator_prev.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/new_sign.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/pixmaplabel.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/queries.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/query.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/query_newobj.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/relation.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/report.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/report_newobj.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/reports.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/script.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/script_newobj.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/select_item.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/sort_az.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/sort_za.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/spring.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/state_data.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/state_edit.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/state_sql.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/state_text.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/table.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/table_newobj.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/tables.png
+share/apps/kexi/icons/crystalsvg/16x16/actions/test_it.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/alignobjs.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aobottom.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aofit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aogrid.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aoleft.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aonarrowest.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aopos2grid.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aoright.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aoshortest.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aotallest.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aotop.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/aowidest.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/business_user.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/button.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/check.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/clear_table_contents.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/combo.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/dateedit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/datetimeedit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/delete_table_row.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/form_action.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/form_edit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/frame.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/grid.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/groupbox.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/insert_table_row.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/key.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/label.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/line.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/lineedit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/listbox.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/listview.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/lower.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/mouse_pointer.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/new_sign.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/pixmaplabel.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/progress.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/radio.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/raise.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/relation.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/signalslot.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/slider.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/sort_az.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/sort_za.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/spin.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/spring.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/state_data.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/state_edit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/state_sql.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/state_text.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/table.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/table_newobj.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/tabwidget.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/test_it.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/textedit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/timeedit.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/urlrequest.png
+share/apps/kexi/icons/crystalsvg/22x22/actions/widgetstack.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/business_user.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/clear_table_contents.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/delete_table_row.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/form_action.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/grid.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/insert_table_row.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/key.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/new_sign.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/pixmaplabel.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/spring.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/state_data.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/state_sql.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/state_text.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/table.png
+share/apps/kexi/icons/crystalsvg/32x32/actions/table_newobj.png
+share/apps/kexi/icons/crystalsvg/48x48/actions/form_action.png
+share/apps/kexi/icons/crystalsvg/48x48/actions/key.png
+share/apps/kexi/icons/crystalsvg/64x64/actions/business_user.png
+share/apps/kexi/icons/crystalsvg/64x64/actions/form_action.png
+share/apps/kexi/kexidatatableui.rc
+share/apps/kexi/kexiformpartinstui.rc
+share/apps/kexi/kexiformpartui.rc
+share/apps/kexi/kexiquerypartinstui.rc
+share/apps/kexi/kexiquerypartui.rc
+share/apps/kexi/kexirelationhandlerui.rc
+share/apps/kexi/kexirelationpartui.rc
+share/apps/kexi/kexirelationsview.rc
+share/apps/kexi/kexireportpartinstui.rc
+share/apps/kexi/kexireportpartui.rc
+share/apps/kexi/kexiscriptpartinstui.rc
+share/apps/kexi/kexiscriptpartui.rc
+share/apps/kexi/kexitablepartinstui.rc
+share/apps/kexi/kexitablepartui.rc
+share/apps/kexi/kexitableview.rc
+share/apps/kexi/kexiui.rc
+share/apps/kexi/pics/cp-wiz.png
+share/apps/kexi/readme_en
+share/apps/kformdesigner/kfd_mainwindow.rc
+share/apps/kformdesigner_part/kformdesigner_part.rc
+share/apps/kformdesigner_part/kformdesigner_part_shell.rc
 share/apps/kformula/dtd/kformula.dtd
 share/apps/kformula/kformula.rc
 share/apps/kformula/kformula_readonly.rc
@@ -522,14 +945,17 @@ share/apps/kivio/icons/crystalsvg/22x22/actions/arrowheads.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_bold.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_italic.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/font_under.png
-share/apps/kivio/icons/crystalsvg/22x22/actions/kivio_connector.png
 share/apps/kivio/icons/crystalsvg/22x22/actions/open_stencilset.png
 share/apps/kivio/icons/crystalsvg/32x32/actions/arrowheads.png
-share/apps/kivio/icons/crystalsvg/32x32/actions/grid.png
+share/apps/kivio/icons/crystalsvg/48x48/actions/template_basicflow.png
+share/apps/kivio/icons/crystalsvg/48x48/actions/template_empty.png
+share/apps/kivio/icons/crystalsvg/scalable/actions/template_basicworkflow.svgz
+share/apps/kivio/icons/crystalsvg/scalable/actions/template_empty.svgz
 share/apps/kivio/icons/hicolor/16x16/actions/add_stencil.png
 share/apps/kivio/icons/hicolor/16x16/actions/bring_stencil_to_front.png
 share/apps/kivio/icons/hicolor/16x16/actions/copy_stencil.png
 share/apps/kivio/icons/hicolor/16x16/actions/cut_stencil.png
+share/apps/kivio/icons/hicolor/16x16/actions/end_arrowhead.png
 share/apps/kivio/icons/hicolor/16x16/actions/fillcolor.png
 share/apps/kivio/icons/hicolor/16x16/actions/font_bold.png
 share/apps/kivio/icons/hicolor/16x16/actions/font_italic.png
@@ -561,6 +987,7 @@ share/apps/kivio/icons/hicolor/16x16/actions/paste_stencil.png
 share/apps/kivio/icons/hicolor/16x16/actions/pencolor.png
 share/apps/kivio/icons/hicolor/16x16/actions/remove_stencil.png
 share/apps/kivio/icons/hicolor/16x16/actions/send_stencil_to_back.png
+share/apps/kivio/icons/hicolor/16x16/actions/start_arrowhead.png
 share/apps/kivio/icons/hicolor/16x16/actions/textcolor.png
 share/apps/kivio/icons/hicolor/16x16/actions/ungroup_stencils.png
 share/apps/kivio/icons/hicolor/16x16/actions/view_grid.png
@@ -572,6 +999,7 @@ share/apps/kivio/icons/hicolor/16x16/actions/view_pageborder.png
 share/apps/kivio/icons/hicolor/16x16/actions/view_ruler.png
 share/apps/kivio/icons/hicolor/16x16/actions/zoom_disabled.png
 share/apps/kivio/icons/hicolor/16x16/actions/zoom_enabled.png
+share/apps/kivio/icons/hicolor/22x22/actions/add_target.png
 share/apps/kivio/icons/hicolor/22x22/actions/arrowheads.png
 share/apps/kivio/icons/hicolor/22x22/actions/bring_stencil_to_front.png
 share/apps/kivio/icons/hicolor/22x22/actions/close_stencilset.png
@@ -579,7 +1007,6 @@ share/apps/kivio/icons/hicolor/22x22/actions/font_bold.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_italic.png
 share/apps/kivio/icons/hicolor/22x22/actions/font_under.png
 share/apps/kivio/icons/hicolor/22x22/actions/group_stencils.png
-share/apps/kivio/icons/hicolor/22x22/actions/kivio_connector.xpm
 share/apps/kivio/icons/hicolor/22x22/actions/linestyle.png
 share/apps/kivio/icons/hicolor/22x22/actions/linewidth.png
 share/apps/kivio/icons/hicolor/22x22/actions/open_stencilset.png
@@ -611,11 +1038,12 @@ share/apps/kivio/kivio_readonly.rc
 share/apps/kivio/kivio_tool.rc
 share/apps/kivio/kpartplugins/kivioconnectortool.rc
 share/apps/kivio/kpartplugins/kivioselecttool.rc
+share/apps/kivio/kpartplugins/kiviotargettool.rc
 share/apps/kivio/kpartplugins/kiviotexttool.rc
 share/apps/kivio/kpartplugins/kiviozoomtool.rc
 share/apps/kivio/pics/kivio_arrow.xpm
-share/apps/kivio/pics/kivio_connector_cursor1.xpm
-share/apps/kivio/pics/kivio_connector_cursor2.xpm
+share/apps/kivio/pics/kivio_connector_cursor1.png
+share/apps/kivio/pics/kivio_connector_cursor2.png
 share/apps/kivio/pics/kivio_text.xpm
 share/apps/kivio/pics/kivio_text_cursor.xpm
 share/apps/kivio/pics/kivio_zoom.xpm
@@ -1586,6 +2014,7 @@ share/apps/kivio/stencils/Flowcharting/Logic/buffer.sml
 share/apps/kivio/stencils/Flowcharting/Logic/buffer.xpm
 share/apps/kivio/stencils/Flowcharting/Logic/connector.sml
 share/apps/kivio/stencils/Flowcharting/Logic/connector.xpm
+share/apps/kivio/stencils/Flowcharting/Logic/desc
 share/apps/kivio/stencils/Flowcharting/Logic/icon.xpm
 share/apps/kivio/stencils/Flowcharting/Logic/inverter.sml
 share/apps/kivio/stencils/Flowcharting/Logic/inverter.xpm
@@ -1712,6 +2141,32 @@ share/apps/kivio/stencils/Miscellaneous/Buildings/Office.xpm
 share/apps/kivio/stencils/Miscellaneous/Buildings/Office2.xpm
 share/apps/kivio/stencils/Miscellaneous/Buildings/desc
 share/apps/kivio/stencils/Miscellaneous/Buildings/icon.xpm
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/block.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/block.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/box.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/box.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/call.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/call.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/choice-add.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/choice-add.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/choice.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/choice.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/conditional-head1.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/conditional-head1.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/conditional-head2.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/conditional-head2.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/conditional.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/conditional.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/desc
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/exit.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/exit.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/footloop.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/footloop.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/headloop.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/headloop.sml
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/icon.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/statement.png
+share/apps/kivio/stencils/Miscellaneous/NassiShneiderman/statement.sml
 share/apps/kivio/stencils/Miscellaneous/People/Bad.sml
 share/apps/kivio/stencils/Miscellaneous/People/Bad.xpm
 share/apps/kivio/stencils/Miscellaneous/People/Blue_Collar_Worker.sml
@@ -1763,8 +2218,6 @@ share/apps/kivio/stencils/UML/ClassDiagrams/icon.xpm
 share/apps/kivio/stencils/UML/desc
 share/apps/kivio/stencils/UML/icon.xpm
 share/apps/kivio/templates/Basic/.directory
-share/apps/kivio/templates/Basic/.icon/basicflow.png
-share/apps/kivio/templates/Basic/.icon/empty.png
 share/apps/kivio/templates/Basic/.source/basicflow.kft
 share/apps/kivio/templates/Basic/.source/empty.kft
 share/apps/kivio/templates/Basic/basicflow.desktop
@@ -1787,8 +2240,11 @@ share/apps/koffice/hyphdicts/hyph_pt_BR.dic
 share/apps/koffice/hyphdicts/hyph_pt_PT.dic
 share/apps/koffice/hyphdicts/hyph_ru.dic
 share/apps/koffice/hyphdicts/hyph_sk.dic
+share/apps/koffice/hyphdicts/hyph_sl.dic
+share/apps/koffice/hyphdicts/hyph_sv.dic
 share/apps/koffice/hyphdicts/hyph_uk.dic
 share/apps/koffice/icons/crystalsvg/16x16/actions/borderoutline.png
+share/apps/koffice/icons/crystalsvg/16x16/actions/bring_forward.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/color_fill.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/color_line.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/delete_table_col.png
@@ -1812,6 +2268,7 @@ share/apps/koffice/icons/crystalsvg/16x16/actions/insert_table_row.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/kdb_form.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/kdb_table.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/linewidth.png
+share/apps/koffice/icons/crystalsvg/16x16/actions/send_backward.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/tab_first.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/tab_last.png
 share/apps/koffice/icons/crystalsvg/16x16/actions/tab_left.png
@@ -1859,6 +2316,7 @@ share/apps/koffice/icons/crystalsvg/22x22/actions/frame_image.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/frame_query.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/frame_spreadsheet.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/frame_text.png
+share/apps/koffice/icons/crystalsvg/22x22/actions/group.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/inline_image.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/inline_table.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/insert_table_col.png
@@ -1867,8 +2325,7 @@ share/apps/koffice/icons/crystalsvg/22x22/actions/lower.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/neonpen.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/newslide.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/ok.png
-share/apps/koffice/icons/crystalsvg/22x22/actions/part/killustrator.png
-share/apps/koffice/icons/crystalsvg/22x22/actions/part/kword.png
+share/apps/koffice/icons/crystalsvg/22x22/actions/page.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/raise.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/select.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/send_backward.png
@@ -1881,19 +2338,32 @@ share/apps/koffice/icons/crystalsvg/22x22/actions/shadowR.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/shadowRB.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/shadowRU.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/shadowU.png
+share/apps/koffice/icons/crystalsvg/22x22/actions/slide.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/sub.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/super.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/toggle_docbrowser.png
+share/apps/koffice/icons/crystalsvg/22x22/actions/ungroup.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/unsortedList.png
 share/apps/koffice/icons/crystalsvg/22x22/actions/view_remove.png
+share/apps/koffice/icons/crystalsvg/32x32/actions/bring_forward.png
 share/apps/koffice/icons/crystalsvg/32x32/actions/delete_table_col.png
 share/apps/koffice/icons/crystalsvg/32x32/actions/delete_table_row.png
+share/apps/koffice/icons/crystalsvg/32x32/actions/fontsizedown.png
+share/apps/koffice/icons/crystalsvg/32x32/actions/fontsizeup.png
+share/apps/koffice/icons/crystalsvg/32x32/actions/grid.png
 share/apps/koffice/icons/crystalsvg/32x32/actions/insert_table_col.png
 share/apps/koffice/icons/crystalsvg/32x32/actions/insert_table_row.png
+share/apps/koffice/icons/crystalsvg/32x32/actions/send_backward.png
 share/apps/koffice/icons/crystalsvg/32x32/actions/sort_az.png
 share/apps/koffice/icons/crystalsvg/32x32/actions/view_remove.png
 share/apps/koffice/icons/crystalsvg/32x32/apps/go.png
+share/apps/koffice/icons/crystalsvg/48x48/actions/bring_forward.png
+share/apps/koffice/icons/crystalsvg/48x48/actions/fontsizedown.png
+share/apps/koffice/icons/crystalsvg/48x48/actions/fontsizeup.png
+share/apps/koffice/icons/crystalsvg/48x48/actions/send_backward.png
 share/apps/koffice/icons/crystalsvg/48x48/apps/key_bindings.png
+share/apps/koffice/icons/crystalsvg/scalable/actions/bring_forward.svgz
+share/apps/koffice/icons/crystalsvg/scalable/actions/send_backward.svgz
 share/apps/koffice/koffice_shell.rc
 share/apps/koffice/pics/koKoolBarDown.png
 share/apps/koffice/pics/koKoolBarUp.png
@@ -1991,7 +2461,6 @@ share/apps/kpresenter/icons/crystalsvg/22x22/actions/edit_pie.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/edit_polygon.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/effect.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/freehand.png
-share/apps/kpresenter/icons/crystalsvg/22x22/actions/group.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/line.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/line_arrow_begin.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/line_arrow_end.png
@@ -2043,19 +2512,37 @@ share/apps/kpresenter/icons/crystalsvg/22x22/actions/polygon.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/polyline.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/quadricbeziercurve.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/rectangle.png
-share/apps/kpresenter/icons/crystalsvg/22x22/actions/ungroup.png
 share/apps/kpresenter/icons/crystalsvg/22x22/actions/webpres.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_emptylandscape.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_emptyportrait.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_onecolumnlandscape.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_onecolumnportrait.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_titlelandscape.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_titleportrait.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_twocolumnlandscape.png
+share/apps/kpresenter/icons/crystalsvg/48x48/actions/template_twocolumnportrait.png
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_emptylandscape.svgz
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_emptyportrait.svgz
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_onecolumnlandscape.svgz
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_onecolumnportrait.svgz
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_titlelandscape.svgz
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_titleportrait.svgz
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_twocolumnlandscape.svgz
+share/apps/kpresenter/icons/crystalsvg/scalable/actions/template_twocolumnportrait.svgz
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_bluebreezedouble.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_bluebreezepicture.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_bluebreezesingle.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_copperplain.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_gradientbluered.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_kde.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_kde2.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_kde3.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_screenplain.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_snowymountains.png
+share/apps/kpresenter/icons/hicolor/48x48/actions/template_totallynewproduct.png
 share/apps/kpresenter/kpartplugins/scan-kpresenter.rc
 share/apps/kpresenter/kpresenter.rc
 share/apps/kpresenter/kpresenter_readonly.rc
-share/apps/kpresenter/pics/OneColumnLandscape.png
-share/apps/kpresenter/pics/OneColumnPortrait.png
-share/apps/kpresenter/pics/TitleLandscape.png
-share/apps/kpresenter/pics/TitlePortrait.png
-share/apps/kpresenter/pics/TwoColumnLandscape.png
-share/apps/kpresenter/pics/TwoColumnPortrait.png
-share/apps/kpresenter/pics/emptyLandscape.png
-share/apps/kpresenter/pics/emptyPortrait.png
 share/apps/kpresenter/pics/webslideshow-sidebar.png
 share/apps/kpresenter/slideshow/first.png
 share/apps/kpresenter/slideshow/home.png
@@ -2089,36 +2576,28 @@ share/apps/kpresenter/templates/Screen/TitleLandscape.desktop
 share/apps/kpresenter/templates/Screen/TwoColumnLandscape.desktop
 share/apps/kpresenter/templates/Screen/emptyLandscape.desktop
 share/apps/kpresenter/templates/Screenpresentations/.directory
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezeDouble.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezePicture.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/BlueBreezeSingle.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/CopperPlain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Gradient-Blue-Red.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/Plain.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/SnowyMountains.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/TotallyNewProduct.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/kde.png
-share/apps/kpresenter/templates/Screenpresentations/.icon/kde2.png
 share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezeDouble.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezePicture.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/BlueBreezeSingle.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/CopperPlain.kpt
-share/apps/kpresenter/templates/Screenpresentations/.source/Gradient-Blue-Red.kpt
+share/apps/kpresenter/templates/Screenpresentations/.source/GradientBlueRed.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/Plain.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/SnowyMountains.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/TotallyNewProduct.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde.kpt
 share/apps/kpresenter/templates/Screenpresentations/.source/kde2.kpt
+share/apps/kpresenter/templates/Screenpresentations/.source/kde3.kpt
 share/apps/kpresenter/templates/Screenpresentations/BlueBreezeDouble.desktop
 share/apps/kpresenter/templates/Screenpresentations/BlueBreezePicture.desktop
 share/apps/kpresenter/templates/Screenpresentations/BlueBreezeSingle.desktop
 share/apps/kpresenter/templates/Screenpresentations/CopperPlain.desktop
-share/apps/kpresenter/templates/Screenpresentations/Gradient-Blue-Red.desktop
+share/apps/kpresenter/templates/Screenpresentations/GradientBlueRed.desktop
 share/apps/kpresenter/templates/Screenpresentations/Plain.desktop
 share/apps/kpresenter/templates/Screenpresentations/SnowyMountains.desktop
 share/apps/kpresenter/templates/Screenpresentations/TotallyNewProduct.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde.desktop
 share/apps/kpresenter/templates/Screenpresentations/kde2.desktop
+share/apps/kpresenter/templates/Screenpresentations/kde3.desktop
 share/apps/kpresenter/templates/legal/.directory
 share/apps/kpresenter/templates/legal/.source/OneColumnLandscape.kpt
 share/apps/kpresenter/templates/legal/.source/OneColumnPortrait.kpt
@@ -2153,7 +2632,331 @@ share/apps/kpresenter/templates/letter/TwoColumnLandscape.desktop
 share/apps/kpresenter/templates/letter/TwoColumnPortrait.desktop
 share/apps/kpresenter/templates/letter/emptyLandscape.desktop
 share/apps/kpresenter/templates/letter/emptyPortrait.desktop
+share/apps/krita/brushes/10x10square.gbr
+share/apps/krita/brushes/10x10squareBlur.gbr
+share/apps/krita/brushes/11circle.gbr
+share/apps/krita/brushes/11fcircle.gbr
+share/apps/krita/brushes/13circle.gbr
+share/apps/krita/brushes/13fcircle.gbr
+share/apps/krita/brushes/15circle.gbr
+share/apps/krita/brushes/15fcircle.gbr
+share/apps/krita/brushes/17circle.gbr
+share/apps/krita/brushes/17fcircle.gbr
+share/apps/krita/brushes/19circle.gbr
+share/apps/krita/brushes/19fcircle.gbr
+share/apps/krita/brushes/1circle.gbr
+share/apps/krita/brushes/20x20square.gbr
+share/apps/krita/brushes/20x20squareBlur.gbr
+share/apps/krita/brushes/3circle.gbr
+share/apps/krita/brushes/3fcircle.gbr
+share/apps/krita/brushes/5circle.gbr
+share/apps/krita/brushes/5fcircle.gbr
+share/apps/krita/brushes/5x5square.gbr
+share/apps/krita/brushes/5x5squareBlur.gbr
+share/apps/krita/brushes/7circle.gbr
+share/apps/krita/brushes/7fcircle.gbr
+share/apps/krita/brushes/9circle.gbr
+share/apps/krita/brushes/9fcircle.gbr
+share/apps/krita/brushes/DStar11.gbr
+share/apps/krita/brushes/DStar17.gbr
+share/apps/krita/brushes/DStar25.gbr
+share/apps/krita/brushes/SketchBrush-16.gih
+share/apps/krita/brushes/SketchBrush-32.gih
+share/apps/krita/brushes/SketchBrush-64.gih
+share/apps/krita/brushes/callig1.gbr
+share/apps/krita/brushes/callig2.gbr
+share/apps/krita/brushes/callig3.gbr
+share/apps/krita/brushes/callig4.gbr
+share/apps/krita/brushes/confetti.gbr
+share/apps/krita/brushes/confetti.gih
+share/apps/krita/brushes/dunes.gbr
+share/apps/krita/brushes/feltpen.gih
+share/apps/krita/brushes/galaxy.gbr
+share/apps/krita/brushes/galaxy_big.gbr
+share/apps/krita/brushes/galaxy_small.gbr
+share/apps/krita/brushes/hsparks.gih
+share/apps/krita/brushes/pepper.gbr
+share/apps/krita/brushes/pixel.gbr
+share/apps/krita/brushes/vine.gih
+share/apps/krita/dtd/krita.dtd
+share/apps/krita/gradients/Abstract_1.ggr
+share/apps/krita/gradients/Abstract_2.ggr
+share/apps/krita/gradients/Abstract_3.ggr
+share/apps/krita/gradients/Aneurism.ggr
+share/apps/krita/gradients/Blinds.ggr
+share/apps/krita/gradients/Blue_Green.ggr
+share/apps/krita/gradients/Browns.ggr
+share/apps/krita/gradients/Brushed_Aluminium.ggr
+share/apps/krita/gradients/Burning_Paper.ggr
+share/apps/krita/gradients/Burning_Transparency.ggr
+share/apps/krita/gradients/CD.ggr
+share/apps/krita/gradients/CD_Half.ggr
+share/apps/krita/gradients/Caribbean_Blues.ggr
+share/apps/krita/gradients/Coffee.ggr
+share/apps/krita/gradients/Cold_Steel.ggr
+share/apps/krita/gradients/Cold_Steel_2.ggr
+share/apps/krita/gradients/Crown_molding.ggr
+share/apps/krita/gradients/Dark_1.ggr
+share/apps/krita/gradients/Deep_Sea.ggr
+share/apps/krita/gradients/Default.ggr
+share/apps/krita/gradients/Flare_Glow_Angular_1.ggr
+share/apps/krita/gradients/Flare_Glow_Radial_1.ggr
+share/apps/krita/gradients/Flare_Glow_Radial_2.ggr
+share/apps/krita/gradients/Flare_Glow_Radial_3.ggr
+share/apps/krita/gradients/Flare_Glow_Radial_4.ggr
+share/apps/krita/gradients/Flare_Radial_101.ggr
+share/apps/krita/gradients/Flare_Radial_102.ggr
+share/apps/krita/gradients/Flare_Radial_103.ggr
+share/apps/krita/gradients/Flare_Rays_Radial_1.ggr
+share/apps/krita/gradients/Flare_Rays_Radial_2.ggr
+share/apps/krita/gradients/Flare_Rays_Size_1.ggr
+share/apps/krita/gradients/Flare_Sizefac_101.ggr
+share/apps/krita/gradients/Four_bars.ggr
+share/apps/krita/gradients/French_flag.ggr
+share/apps/krita/gradients/French_flag_smooth.ggr
+share/apps/krita/gradients/Full_saturation_spectrum_CCW.ggr
+share/apps/krita/gradients/Full_saturation_spectrum_CW.ggr
+share/apps/krita/gradients/German_flag.ggr
+share/apps/krita/gradients/German_flag_smooth.ggr
+share/apps/krita/gradients/Golden.ggr
+share/apps/krita/gradients/Greens.ggr
+share/apps/krita/gradients/Horizon_1.ggr
+share/apps/krita/gradients/Horizon_2.ggr
+share/apps/krita/gradients/Incandescent.ggr
+share/apps/krita/gradients/Land_1.ggr
+share/apps/krita/gradients/Land_and_Sea.ggr
+share/apps/krita/gradients/Metallic_Something.ggr
+share/apps/krita/gradients/Mexican_flag.ggr
+share/apps/krita/gradients/Mexican_flag_smooth.ggr
+share/apps/krita/gradients/Nauseating_Headache.ggr
+share/apps/krita/gradients/Neon_Cyan.ggr
+share/apps/krita/gradients/Neon_Green.ggr
+share/apps/krita/gradients/Neon_Yellow.ggr
+share/apps/krita/gradients/Pastel_Rainbow.ggr
+share/apps/krita/gradients/Pastels.ggr
+share/apps/krita/gradients/Purples.ggr
+share/apps/krita/gradients/Radial_Eyeball_Blue.ggr
+share/apps/krita/gradients/Radial_Eyeball_Brown.ggr
+share/apps/krita/gradients/Radial_Eyeball_Green.ggr
+share/apps/krita/gradients/Radial_Glow_1.ggr
+share/apps/krita/gradients/Radial_Rainbow_Hoop.ggr
+share/apps/krita/gradients/Romanian_flag.ggr
+share/apps/krita/gradients/Romanian_flag_smooth.ggr
+share/apps/krita/gradients/Rounded_edge.ggr
+share/apps/krita/gradients/Shadows_1.ggr
+share/apps/krita/gradients/Shadows_2.ggr
+share/apps/krita/gradients/Shadows_3.ggr
+share/apps/krita/gradients/Skyline.ggr
+share/apps/krita/gradients/Skyline_polluted.ggr
+share/apps/krita/gradients/Square_Wood_Frame.ggr
+share/apps/krita/gradients/Sunrise.ggr
+share/apps/krita/gradients/Three_bars_sin.ggr
+share/apps/krita/gradients/Tropical_Colors.ggr
+share/apps/krita/gradients/Tube_Red.ggr
+share/apps/krita/gradients/Wood_1.ggr
+share/apps/krita/gradients/Wood_2.ggr
+share/apps/krita/gradients/Yellow_Contrast.ggr
+share/apps/krita/gradients/Yellow_Orange.ggr
+share/apps/krita/icons/crystalsvg/48x48/actions/template_empty.png
+share/apps/krita/icons/crystalsvg/48x48/actions/template_gray_empty.png
+share/apps/krita/icons/crystalsvg/48x48/actions/template_rgb_empty.png
+share/apps/krita/icons/crystalsvg/scalable/actions/template_empty.svgz
+share/apps/krita/icons/crystalsvg/scalable/actions/template_gray_empty.svgz
+share/apps/krita/icons/crystalsvg/scalable/actions/template_rgb_empty.svgz
+share/apps/krita/kpartplugins/colorrange.rc
+share/apps/krita/kpartplugins/colorsfilters.rc
+share/apps/krita/kpartplugins/colorspaceconversion.rc
+share/apps/krita/kpartplugins/histogram.rc
+share/apps/krita/kpartplugins/imagesize.rc
+share/apps/krita/kpartplugins/kritacimg.rc
+share/apps/krita/kpartplugins/kritaconvolutionfilters.rc
+share/apps/krita/kpartplugins/kritadefaulttools.rc
+share/apps/krita/kpartplugins/kritaembossfilter.rc
+share/apps/krita/kpartplugins/kritaexample.rc
+share/apps/krita/kpartplugins/kritaoilpaintfilter.rc
+share/apps/krita/kpartplugins/kritaraindropsfilter.rc
+share/apps/krita/kpartplugins/kritaselectiontools.rc
+share/apps/krita/kpartplugins/kritatoolcrop.rc
+share/apps/krita/kpartplugins/kritatoolfilter.rc
+share/apps/krita/kpartplugins/kritatoolpolygon.rc
+share/apps/krita/kpartplugins/kritatoolpolyline.rc
+share/apps/krita/kpartplugins/kritatoolstar.rc
+share/apps/krita/kpartplugins/kritatooltransform.rc
+share/apps/krita/kpartplugins/rotateimage.rc
 share/apps/krita/kpartplugins/scan-krita.rc
+share/apps/krita/kpartplugins/screenshot-krita.rc
+share/apps/krita/kpartplugins/shearimage.rc
+share/apps/krita/krita.rc
+share/apps/krita/krita_readonly.rc
+share/apps/krita/palettes/Bears.gpl
+share/apps/krita/palettes/Bgold.gpl
+share/apps/krita/palettes/Blues.gpl
+share/apps/krita/palettes/Borders.gpl
+share/apps/krita/palettes/Browns_And_Yellows.gpl
+share/apps/krita/palettes/Caramel.gpl
+share/apps/krita/palettes/Cascade.gpl
+share/apps/krita/palettes/China.gpl
+share/apps/krita/palettes/Coldfire.gpl
+share/apps/krita/palettes/Cool_Colors.gpl
+share/apps/krita/palettes/Cranes.gpl
+share/apps/krita/palettes/Dark_pastels.gpl
+share/apps/krita/palettes/Default.gpl
+share/apps/krita/palettes/Ega.gpl
+share/apps/krita/palettes/Firecode.gpl
+share/apps/krita/palettes/Gold.gpl
+share/apps/krita/palettes/GrayViolet.gpl
+share/apps/krita/palettes/Grayblue.gpl
+share/apps/krita/palettes/Grays.gpl
+share/apps/krita/palettes/Greens.gpl
+share/apps/krita/palettes/Hilite.gpl
+share/apps/krita/palettes/Khaki.gpl
+share/apps/krita/palettes/Lights.gpl
+share/apps/krita/palettes/Muted.gpl
+share/apps/krita/palettes/Named_Colors.gpl
+share/apps/krita/palettes/News3.gpl
+share/apps/krita/palettes/Op2.gpl
+share/apps/krita/palettes/Paintjet.gpl
+share/apps/krita/palettes/Pastels.gpl
+share/apps/krita/palettes/Plasma.gpl
+share/apps/krita/palettes/Reds.gpl
+share/apps/krita/palettes/Reds_And_Purples.gpl
+share/apps/krita/palettes/Royal.gpl
+share/apps/krita/palettes/Topographic.gpl
+share/apps/krita/palettes/Visibone.gpl
+share/apps/krita/palettes/Visibone_2.gpl
+share/apps/krita/palettes/Volcano.gpl
+share/apps/krita/palettes/Warm_Colors.gpl
+share/apps/krita/palettes/Web.gpl
+share/apps/krita/patterns/3dgreen.pat
+share/apps/krita/patterns/Craters.pat
+share/apps/krita/patterns/Moonfoot.pat
+share/apps/krita/patterns/Stripes1px.pat
+share/apps/krita/patterns/Stripes2px.pat
+share/apps/krita/patterns/amethyst.pat
+share/apps/krita/patterns/bark.pat
+share/apps/krita/patterns/blue.pat
+share/apps/krita/patterns/bluegrid.pat
+share/apps/krita/patterns/bluesquares.pat
+share/apps/krita/patterns/blueweb.pat
+share/apps/krita/patterns/brick.pat
+share/apps/krita/patterns/burlap.pat
+share/apps/krita/patterns/burlwood.pat
+share/apps/krita/patterns/choc_swirl.pat
+share/apps/krita/patterns/corkboard.pat
+share/apps/krita/patterns/cracked.pat
+share/apps/krita/patterns/crinklepaper.pat
+share/apps/krita/patterns/electric.pat
+share/apps/krita/patterns/fibers.pat
+share/apps/krita/patterns/granite1.pat
+share/apps/krita/patterns/ground1.pat
+share/apps/krita/patterns/ice.pat
+share/apps/krita/patterns/java.pat
+share/apps/krita/patterns/leather.pat
+share/apps/krita/patterns/leaves.pat
+share/apps/krita/patterns/leopard.pat
+share/apps/krita/patterns/lightning.pat
+share/apps/krita/patterns/marble1.pat
+share/apps/krita/patterns/marble2.pat
+share/apps/krita/patterns/marble3.pat
+share/apps/krita/patterns/nops.pat
+share/apps/krita/patterns/paper.pat
+share/apps/krita/patterns/parque1.pat
+share/apps/krita/patterns/parque2.pat
+share/apps/krita/patterns/parque3.pat
+share/apps/krita/patterns/pastel.pat
+share/apps/krita/patterns/pine.pat
+share/apps/krita/patterns/pink_marble.pat
+share/apps/krita/patterns/pool.pat
+share/apps/krita/patterns/qube1.pat
+share/apps/krita/patterns/rain.pat
+share/apps/krita/patterns/recessed.pat
+share/apps/krita/patterns/redcube.pat
+share/apps/krita/patterns/rock.pat
+share/apps/krita/patterns/sky.pat
+share/apps/krita/patterns/slate.pat
+share/apps/krita/patterns/sm_squares.pat
+share/apps/krita/patterns/starfield.pat
+share/apps/krita/patterns/stone33.pat
+share/apps/krita/patterns/terra.pat
+share/apps/krita/patterns/walnut.pat
+share/apps/krita/patterns/warning.pat
+share/apps/krita/patterns/wood1.pat
+share/apps/krita/patterns/wood2.pat
+share/apps/krita/patterns/wood3.pat
+share/apps/krita/patterns/wood4.pat
+share/apps/krita/patterns/wood5.pat
+share/apps/krita/pics/closedhand_cursor.xpm
+share/apps/krita/pics/deletelayer.png
+share/apps/krita/pics/ellipse.png
+share/apps/krita/pics/gradient.png
+share/apps/krita/pics/line.png
+share/apps/krita/pics/linked.png
+share/apps/krita/pics/locked.png
+share/apps/krita/pics/lowerlayer.png
+share/apps/krita/pics/newlayer.png
+share/apps/krita/pics/novisible.png
+share/apps/krita/pics/openhand_cursor.xpm
+share/apps/krita/pics/polygon.png
+share/apps/krita/pics/polyline.png
+share/apps/krita/pics/raiselayer.png
+share/apps/krita/pics/rectangle.png
+share/apps/krita/pics/tool_brush_selection.png
+share/apps/krita/pics/tool_elliptical_selection.png
+share/apps/krita/pics/tool_eraser_selection.png
+share/apps/krita/pics/tool_free_form_selection.png
+share/apps/krita/pics/tool_pan.png
+share/apps/krita/pics/tool_picker_selection.png
+share/apps/krita/pics/tool_polygonal_selection.png
+share/apps/krita/pics/tool_rect_selection.png
+share/apps/krita/pics/tool_screenshot.png
+share/apps/krita/pics/tool_star.png
+share/apps/krita/pics/tool_text.png
+share/apps/krita/pics/tool_wizard_selection.png
+share/apps/krita/pics/unlinked.png
+share/apps/krita/pics/unlocked.png
+share/apps/krita/pics/visible.png
+share/apps/krita/profiles/Apple.icm
+share/apps/krita/profiles/CIE.icm
+share/apps/krita/profiles/CMY.icm
+share/apps/krita/profiles/ColorMatch.icm
+share/apps/krita/profiles/NTSC.icm
+share/apps/krita/profiles/PAL.icm
+share/apps/krita/profiles/SMPTE-C.icm
+share/apps/krita/profiles/WideGamut.icm
+share/apps/krita/profiles/cmyk.icm
+share/apps/krita/profiles/lcmslabi.icm
+share/apps/krita/profiles/lcmsxyzi.icm
+share/apps/krita/profiles/monoscnr.icm
+share/apps/krita/profiles/sRGB.icm
+share/apps/krita/profiles/srgb_color_space_profile.icm
+share/apps/krita/profiles/srgbspac.icm
+share/apps/krita/profiles/tifflab8spac.icm
+share/apps/krita/profiles/tr01_d50.icm
+share/apps/krita/profiles/ycc601.icm
+share/apps/krita/profiles/ycc709.icm
+share/apps/krita/templates/empty/.directory
+share/apps/krita/templates/empty/.source/empty.kra
+share/apps/krita/templates/empty/empty.desktop
+share/apps/krita/templates/gray/.directory
+share/apps/krita/templates/gray/.source/white_640x480.kra
+share/apps/krita/templates/gray/white_640x480.desktop
+share/apps/krita/templates/rgb/.directory
+share/apps/krita/templates/rgb/.source/transparent_1024x768.kra
+share/apps/krita/templates/rgb/.source/transparent_1280x1024.kra
+share/apps/krita/templates/rgb/.source/transparent_1600x1200.kra
+share/apps/krita/templates/rgb/.source/transparent_640x480.kra
+share/apps/krita/templates/rgb/.source/white_1024x768.kra
+share/apps/krita/templates/rgb/.source/white_1280x1024.kra
+share/apps/krita/templates/rgb/.source/white_1600x1200.kra
+share/apps/krita/templates/rgb/.source/white_640x480.kra
+share/apps/krita/templates/rgb/transparent_1024x768.desktop
+share/apps/krita/templates/rgb/transparent_1280x1024.desktop
+share/apps/krita/templates/rgb/transparent_1600x1200.desktop
+share/apps/krita/templates/rgb/transparent_640x480.desktop
+share/apps/krita/templates/rgb/white_1024x768.desktop
+share/apps/krita/templates/rgb/white_1280x1024.desktop
+share/apps/krita/templates/rgb/white_1600x1200.desktop
+share/apps/krita/templates/rgb/white_640x480.desktop
 share/apps/kspread/dtd/kspread.dtd
 share/apps/kspread/extensions/builtin.xml
 share/apps/kspread/extensions/conversion.xml
@@ -2195,6 +2998,7 @@ share/apps/kspread/icons/crystalsvg/16x16/actions/first_letter_upper.png
 share/apps/kspread/icons/crystalsvg/16x16/actions/funct.png
 share/apps/kspread/icons/crystalsvg/16x16/actions/hide_table_column.png
 share/apps/kspread/icons/crystalsvg/16x16/actions/hide_table_row.png
+share/apps/kspread/icons/crystalsvg/16x16/actions/insert_link.png
 share/apps/kspread/icons/crystalsvg/16x16/actions/insertcell.png
 share/apps/kspread/icons/crystalsvg/16x16/actions/insertcellcopy.png
 share/apps/kspread/icons/crystalsvg/16x16/actions/inserttable.png
@@ -2233,6 +3037,8 @@ share/apps/kspread/icons/crystalsvg/22x22/actions/border_top.png
 share/apps/kspread/icons/crystalsvg/22x22/actions/border_up.png
 share/apps/kspread/icons/crystalsvg/22x22/actions/border_vertical.png
 share/apps/kspread/icons/crystalsvg/22x22/actions/funct.png
+share/apps/kspread/icons/crystalsvg/22x22/actions/insert_chart.png
+share/apps/kspread/icons/crystalsvg/22x22/actions/insert_link.png
 share/apps/kspread/icons/crystalsvg/22x22/actions/mergecell.png
 share/apps/kspread/icons/crystalsvg/22x22/actions/middle.png
 share/apps/kspread/icons/crystalsvg/22x22/actions/money.png
@@ -2260,7 +3066,29 @@ share/apps/kspread/icons/crystalsvg/32x32/actions/funct.png
 share/apps/kspread/icons/crystalsvg/32x32/actions/percent.png
 share/apps/kspread/icons/crystalsvg/32x32/actions/prec_minus.png
 share/apps/kspread/icons/crystalsvg/32x32/actions/prec_plus.png
-share/apps/kspread/kpartplugins/kspreadcalc.rc
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_balancesheet.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_bmi.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_creditcardtracker.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_expensereport.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_invoice.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_menuplan.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_packingslip.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_pricequotation.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_studentidcard.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_vacationchecklist.png
+share/apps/kspread/icons/crystalsvg/48x48/actions/template_worksheet.png
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_balancesheet.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_bmi.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_creditcardtracker.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_expensereport.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_invoice.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_menuplan.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_packingslip.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_pricequotation.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_studentidcard.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_vacationchecklist.svgz
+share/apps/kspread/icons/crystalsvg/scalable/actions/template_worksheet.svgz
+share/apps/kspread/kpartplugins/insertcalendar.rc
 share/apps/kspread/kspread.rc
 share/apps/kspread/kspread_readonly.rc
 share/apps/kspread/tablestyles/standard1.ksts
@@ -2270,11 +3098,6 @@ share/apps/kspread/tablestyles/standard2.ksts
 share/apps/kspread/tablestyles/standard2.png
 share/apps/kspread/tablestyles/standard2.xml
 share/apps/kspread/templates/Business/.directory
-share/apps/kspread/templates/Business/.icon/BalanceSheet.png
-share/apps/kspread/templates/Business/.icon/ExpenseReport.png
-share/apps/kspread/templates/Business/.icon/Invoice.png
-share/apps/kspread/templates/Business/.icon/PackingSlip.png
-share/apps/kspread/templates/Business/.icon/PriceQuotation.png
 share/apps/kspread/templates/Business/.source/BalanceSheet.kst
 share/apps/kspread/templates/Business/.source/ExpenseReport.kst
 share/apps/kspread/templates/Business/.source/Invoice.kst
@@ -2286,23 +3109,11 @@ share/apps/kspread/templates/Business/Invoice.desktop
 share/apps/kspread/templates/Business/PackingSlip.desktop
 share/apps/kspread/templates/Business/PriceQuotation.desktop
 share/apps/kspread/templates/General/.directory
-share/apps/kspread/templates/General/.icon/Calendar2003.png
-share/apps/kspread/templates/General/.icon/Calendar2004.png
-share/apps/kspread/templates/General/.icon/StudentIDCard.png
-share/apps/kspread/templates/General/.icon/Worksheet.png
-share/apps/kspread/templates/General/.source/Calendar2003.kst
-share/apps/kspread/templates/General/.source/Calendar2004.kst
 share/apps/kspread/templates/General/.source/StudentIDCard.kst
 share/apps/kspread/templates/General/.source/Worksheet.kst
-share/apps/kspread/templates/General/Calendar2003.desktop
-share/apps/kspread/templates/General/Calendar2004.desktop
 share/apps/kspread/templates/General/StudentIDCard.desktop
 share/apps/kspread/templates/General/Worksheet.desktop
 share/apps/kspread/templates/HomeFamily/.directory
-share/apps/kspread/templates/HomeFamily/.icon/BMI.png
-share/apps/kspread/templates/HomeFamily/.icon/CreditCardTracker.png
-share/apps/kspread/templates/HomeFamily/.icon/MenuPlan.png
-share/apps/kspread/templates/HomeFamily/.icon/VacationChecklist.png
 share/apps/kspread/templates/HomeFamily/.source/BMI.kst
 share/apps/kspread/templates/HomeFamily/.source/CreditCardTracker.kst
 share/apps/kspread/templates/HomeFamily/.source/MenuPlan.kst
@@ -2319,40 +3130,13 @@ share/apps/kudesigner/icons/crystalsvg/22x22/actions/ipf.png
 share/apps/kudesigner/icons/crystalsvg/22x22/actions/iph.png
 share/apps/kudesigner/icons/crystalsvg/22x22/actions/irf.png
 share/apps/kudesigner/icons/crystalsvg/22x22/actions/irh.png
+share/apps/kudesigner/icons/crystalsvg/48x48/actions/template_iso.png
+share/apps/kudesigner/icons/crystalsvg/48x48/actions/template_us.png
+share/apps/kudesigner/icons/crystalsvg/scalable/actions/template_iso.svgz
+share/apps/kudesigner/icons/crystalsvg/scalable/actions/template_us.svgz
 share/apps/kudesigner/kudesigner_readonly.rc
 share/apps/kudesigner/kudesignerui.rc
 share/apps/kudesigner/templates/General/.directory
-share/apps/kudesigner/templates/General/.icon/A0.png
-share/apps/kudesigner/templates/General/.icon/A1.png
-share/apps/kudesigner/templates/General/.icon/A2.png
-share/apps/kudesigner/templates/General/.icon/A3.png
-share/apps/kudesigner/templates/General/.icon/A4.png
-share/apps/kudesigner/templates/General/.icon/A5.png
-share/apps/kudesigner/templates/General/.icon/A6.png
-share/apps/kudesigner/templates/General/.icon/A7.png
-share/apps/kudesigner/templates/General/.icon/A8.png
-share/apps/kudesigner/templates/General/.icon/A9.png
-share/apps/kudesigner/templates/General/.icon/B0.png
-share/apps/kudesigner/templates/General/.icon/B1.png
-share/apps/kudesigner/templates/General/.icon/B10.png
-share/apps/kudesigner/templates/General/.icon/B2.png
-share/apps/kudesigner/templates/General/.icon/B3.png
-share/apps/kudesigner/templates/General/.icon/B4.png
-share/apps/kudesigner/templates/General/.icon/B5.png
-share/apps/kudesigner/templates/General/.icon/B6.png
-share/apps/kudesigner/templates/General/.icon/B7.png
-share/apps/kudesigner/templates/General/.icon/B8.png
-share/apps/kudesigner/templates/General/.icon/B9.png
-share/apps/kudesigner/templates/General/.icon/C5E.png
-share/apps/kudesigner/templates/General/.icon/Comm10E.png
-share/apps/kudesigner/templates/General/.icon/DLE.png
-share/apps/kudesigner/templates/General/.icon/Executive.png
-share/apps/kudesigner/templates/General/.icon/Folio.png
-share/apps/kudesigner/templates/General/.icon/Ledger.png
-share/apps/kudesigner/templates/General/.icon/Legal.png
-share/apps/kudesigner/templates/General/.icon/Letter.png
-share/apps/kudesigner/templates/General/.icon/NPageSize.png
-share/apps/kudesigner/templates/General/.icon/Tabloid.png
 share/apps/kudesigner/templates/General/.source/A0.ktm
 share/apps/kudesigner/templates/General/.source/A1.ktm
 share/apps/kudesigner/templates/General/.source/A2.ktm
@@ -2382,7 +3166,6 @@ share/apps/kudesigner/templates/General/.source/Folio.ktm
 share/apps/kudesigner/templates/General/.source/Ledger.ktm
 share/apps/kudesigner/templates/General/.source/Legal.ktm
 share/apps/kudesigner/templates/General/.source/Letter.ktm
-share/apps/kudesigner/templates/General/.source/NPageSize.ktm
 share/apps/kudesigner/templates/General/.source/Tabloid.ktm
 share/apps/kudesigner/templates/General/A0.desktop
 share/apps/kudesigner/templates/General/A1.desktop
@@ -2436,31 +3219,46 @@ share/apps/kword/icons/crystalsvg/22x22/actions/sl_addentry.png
 share/apps/kword/icons/crystalsvg/22x22/actions/sl_addrecord.png
 share/apps/kword/icons/crystalsvg/22x22/actions/sl_delentry.png
 share/apps/kword/icons/crystalsvg/22x22/actions/sl_delrecord.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_a4.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_businesscards10.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_empty.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_envelopec6.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_envelopedl.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_fax.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_labelsl16.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_letter.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_memo.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_plaintext.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_simplelayout.png
+share/apps/kword/icons/crystalsvg/48x48/actions/template_twocolumns.png
+share/apps/kword/icons/crystalsvg/scalable/actions/template_a4.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_businesscards10.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_empty.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_envelopec6.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_envelopedl.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_fax.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_labelsl16.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_letter.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_memo.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_plaintext.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_simplelayout.svgz
+share/apps/kword/icons/crystalsvg/scalable/actions/template_twocolumns.svgz
 share/apps/kword/kpartplugins/scan-kword.rc
 share/apps/kword/kword.rc
 share/apps/kword/kword_readonly.rc
 share/apps/kword/tablestyles.xml
 share/apps/kword/tabletemplates.xml
 share/apps/kword/templates/CardsAndLabels/.directory
-share/apps/kword/templates/CardsAndLabels/.icon/BusinessCards10.png
-share/apps/kword/templates/CardsAndLabels/.icon/LabelsL16.png
 share/apps/kword/templates/CardsAndLabels/.source/BusinessCards10.kwt
 share/apps/kword/templates/CardsAndLabels/.source/LabelsL16.kwt
 share/apps/kword/templates/CardsAndLabels/BusinessCards10.desktop
 share/apps/kword/templates/CardsAndLabels/LabelsL16.desktop
 share/apps/kword/templates/Envelopes/.directory
-share/apps/kword/templates/Envelopes/.icon/EnvelopeC6.png
-share/apps/kword/templates/Envelopes/.icon/EnvelopeDL.png
 share/apps/kword/templates/Envelopes/.source/EnvelopeC6.kwt
 share/apps/kword/templates/Envelopes/.source/EnvelopeDL.kwt
 share/apps/kword/templates/Envelopes/EnvelopeC6.desktop
 share/apps/kword/templates/Envelopes/EnvelopeDL.desktop
 share/apps/kword/templates/Normal/.directory
-share/apps/kword/templates/Normal/.icon/A4.png
-share/apps/kword/templates/Normal/.icon/Letter.png
-share/apps/kword/templates/Normal/.icon/Memo.png
-share/apps/kword/templates/Normal/.icon/PlainText.png
-share/apps/kword/templates/Normal/.icon/TwoColumns.png
 share/apps/kword/templates/Normal/.source/A4.kwt
 share/apps/kword/templates/Normal/.source/Letter.kwt
 share/apps/kword/templates/Normal/.source/Memo.kwt
@@ -2472,9 +3270,6 @@ share/apps/kword/templates/Normal/Memo.desktop
 share/apps/kword/templates/Normal/PlainText.desktop
 share/apps/kword/templates/Normal/TwoColumns.desktop
 share/apps/kword/templates/Publishing/.directory
-share/apps/kword/templates/Publishing/.icon/Empty.png
-share/apps/kword/templates/Publishing/.icon/SimpleLayout.png
-share/apps/kword/templates/Publishing/.icon/fax.png
 share/apps/kword/templates/Publishing/.source/Empty.kwt
 share/apps/kword/templates/Publishing/.source/SimpleLayout.kwt
 share/apps/kword/templates/Publishing/.source/fax.kwt
@@ -2484,14 +3279,46 @@ share/apps/kword/templates/Publishing/fax.desktop
 share/apps/thesaurus/thesaurus.txt
 share/apps/xsltfilter/export/kword/xslfo/kword2xslfo-table.xsl
 share/apps/xsltfilter/export/kword/xslfo/main.xsl
+share/config.kcfg/kivio.kcfg
+share/config.kcfg/koshell.kcfg
+share/config/kexirc
+share/config/magic/kexi.magic
 share/doc/HTML/en/kchart/common
+share/doc/HTML/en/kchart/cr22-action-chart_line.png
+share/doc/HTML/en/kchart/cr22-action-data.png
+share/doc/HTML/en/kchart/cr22-action-options.png
+share/doc/HTML/en/kchart/cr22-action-wizard.png
 share/doc/HTML/en/kchart/file-toolbar.png
 share/doc/HTML/en/kchart/file-toolbar2.png
 share/doc/HTML/en/kchart/frame_chart.png
 share/doc/HTML/en/kchart/index.cache.bz2
 share/doc/HTML/en/kchart/index.docbook
+share/doc/HTML/en/kchart/kchart-config1.png
+share/doc/HTML/en/kchart/kchart-config2.png
+share/doc/HTML/en/kchart/kchart-config3.png
+share/doc/HTML/en/kchart/kchart-config4.png
+share/doc/HTML/en/kchart/kchart-config5.png
+share/doc/HTML/en/kchart/kchart-config6.png
+share/doc/HTML/en/kchart/kchart-config7.png
+share/doc/HTML/en/kchart/kchart-config8.png
+share/doc/HTML/en/kchart/kchart-dataeditor.png
+share/doc/HTML/en/kchart/kchart-default.png
+share/doc/HTML/en/kchart/kchart-example1-1.png
+share/doc/HTML/en/kchart/kchart-example1-2.png
+share/doc/HTML/en/kchart/kchart-example1-3.png
+share/doc/HTML/en/kchart/kchart-example1-4.png
+share/doc/HTML/en/kchart/kchart-example1-5.png
+share/doc/HTML/en/kchart/kchart-example1-6.png
+share/doc/HTML/en/kchart/kchart-example1-7.png
+share/doc/HTML/en/kchart/kchart-example1-8.png
+share/doc/HTML/en/kchart/kchart-example1-9.png
 share/doc/HTML/en/kchart/kchart-kspread-bar.png
 share/doc/HTML/en/kchart/kchart-kspread.png
+share/doc/HTML/en/kchart/kchart-startupdialog.png
+share/doc/HTML/en/kchart/kchart-wizard1.png
+share/doc/HTML/en/kchart/kchart-wizard2.png
+share/doc/HTML/en/kchart/kchart-wizard3.png
+share/doc/HTML/en/kchart/kchart-wizard4.png
 share/doc/HTML/en/kchart/kchart.tar.gz
 share/doc/HTML/en/kchart/shortcut.png
 share/doc/HTML/en/kchart/toolbars.png
@@ -2538,6 +3365,7 @@ share/doc/HTML/en/kivio/usage.docbook
 share/doc/HTML/en/kivio/working.docbook
 share/doc/HTML/en/koffice-apidocs/common
 share/doc/HTML/en/koffice/README.documentation
+share/doc/HTML/en/koffice/TODO
 share/doc/HTML/en/koffice/common
 share/doc/HTML/en/koffice/index.cache.bz2
 share/doc/HTML/en/koffice/index.docbook
@@ -2545,7 +3373,6 @@ share/doc/HTML/en/koshell/common
 share/doc/HTML/en/koshell/index.cache.bz2
 share/doc/HTML/en/koshell/index.docbook
 share/doc/HTML/en/kpresenter/barstyle1.png
-share/doc/HTML/en/kpresenter/barstyle2.png
 share/doc/HTML/en/kpresenter/barstyle3.png
 share/doc/HTML/en/kpresenter/barstyle4.png
 share/doc/HTML/en/kpresenter/barstyle5.png
@@ -2558,6 +3385,7 @@ share/doc/HTML/en/kpresenter/guides.docbook
 share/doc/HTML/en/kpresenter/htmlshow00.png
 share/doc/HTML/en/kpresenter/htmlshow01.png
 share/doc/HTML/en/kpresenter/htmlshow02.png
+share/doc/HTML/en/kpresenter/htmlshow02a.png
 share/doc/HTML/en/kpresenter/htmlshow03.png
 share/doc/HTML/en/kpresenter/htmlshow04.png
 share/doc/HTML/en/kpresenter/htmlshow05.png
@@ -2565,6 +3393,10 @@ share/doc/HTML/en/kpresenter/htmlshow07.png
 share/doc/HTML/en/kpresenter/index.cache.bz2
 share/doc/HTML/en/kpresenter/index.docbook
 share/doc/HTML/en/kpresenter/menus.docbook
+share/doc/HTML/en/kpresenter/msexport1.png
+share/doc/HTML/en/kpresenter/msexport2.png
+share/doc/HTML/en/kpresenter/msexport3.png
+share/doc/HTML/en/kpresenter/msexport4.png
 share/doc/HTML/en/kpresenter/options.docbook
 share/doc/HTML/en/kpresenter/screen.docbook
 share/doc/HTML/en/kpresenter/settings01.png
@@ -2608,13 +3440,28 @@ share/doc/HTML/en/kpresenter/tut21.png
 share/doc/HTML/en/kpresenter/tut22.png
 share/doc/HTML/en/kpresenter/tut23.png
 share/doc/HTML/en/kpresenter/tutorial.docbook
+share/doc/HTML/en/kspread/advanced.docbook
+share/doc/HTML/en/kspread/basics.docbook
+share/doc/HTML/en/kspread/cellformat0.png
+share/doc/HTML/en/kspread/cellformat1.png
+share/doc/HTML/en/kspread/cellformat2.png
+share/doc/HTML/en/kspread/cellformat3.png
+share/doc/HTML/en/kspread/cellformat4.png
+share/doc/HTML/en/kspread/cellformat5.png
 share/doc/HTML/en/kspread/chart1.png
+share/doc/HTML/en/kspread/commands.docbook
 share/doc/HTML/en/kspread/common
+share/doc/HTML/en/kspread/config.docbook
+share/doc/HTML/en/kspread/configdialog.docbook
 share/doc/HTML/en/kspread/copy1.png
+share/doc/HTML/en/kspread/faq.docbook
+share/doc/HTML/en/kspread/format.docbook
+share/doc/HTML/en/kspread/importexport.docbook
 share/doc/HTML/en/kspread/index.cache.bz2
 share/doc/HTML/en/kspread/index.docbook
 share/doc/HTML/en/kspread/shortcut1.png
 share/doc/HTML/en/kspread/shortcut2.png
+share/doc/HTML/en/kspread/shortcut3.png
 share/doc/HTML/en/kspread/sort1.png
 share/doc/HTML/en/kspread/starting1.png
 share/doc/HTML/en/kugar/add_detail.png
@@ -2648,6 +3495,7 @@ share/doc/HTML/en/kword/Tut1.png
 share/doc/HTML/en/kword/Tut11a.png
 share/doc/HTML/en/kword/Tut11b.png
 share/doc/HTML/en/kword/Tut13.png
+share/doc/HTML/en/kword/Tut13a.png
 share/doc/HTML/en/kword/Tut14.png
 share/doc/HTML/en/kword/Tut14a.png
 share/doc/HTML/en/kword/Tut14b.png
@@ -2694,6 +3542,7 @@ share/doc/HTML/en/kword/bordtb.png
 share/doc/HTML/en/kword/bullist.png
 share/doc/HTML/en/kword/cftb.png
 share/doc/HTML/en/kword/chapnumb.docbook
+share/doc/HTML/en/kword/chcase.png
 share/doc/HTML/en/kword/chcolorbut.png
 share/doc/HTML/en/kword/chfontbut.png
 share/doc/HTML/en/kword/chsizebut.png
@@ -2730,6 +3579,7 @@ share/doc/HTML/en/kword/exst.png
 share/doc/HTML/en/kword/exul.png
 share/doc/HTML/en/kword/fchardlg.png
 share/doc/HTML/en/kword/fchardlg2.png
+share/doc/HTML/en/kword/fchardlg3.png
 share/doc/HTML/en/kword/filefloppy.png
 share/doc/HTML/en/kword/filenew2.png
 share/doc/HTML/en/kword/fileopen.png
@@ -2760,6 +3610,7 @@ share/doc/HTML/en/kword/forminteg.png
 share/doc/HTML/en/kword/formllind.png
 share/doc/HTML/en/kword/formlrind.png
 share/doc/HTML/en/kword/formmat.png
+share/doc/HTML/en/kword/formover.png
 share/doc/HTML/en/kword/formprod.png
 share/doc/HTML/en/kword/formsbrac.png
 share/doc/HTML/en/kword/formspecchar.png
@@ -2768,6 +3619,7 @@ share/doc/HTML/en/kword/formsum.png
 share/doc/HTML/en/kword/formtb.png
 share/doc/HTML/en/kword/formulas.docbook
 share/doc/HTML/en/kword/formulind.png
+share/doc/HTML/en/kword/formunder.png
 share/doc/HTML/en/kword/formurind.png
 share/doc/HTML/en/kword/forward.png
 share/doc/HTML/en/kword/fpara1.png
@@ -2775,7 +3627,6 @@ share/doc/HTML/en/kword/fpara2.png
 share/doc/HTML/en/kword/fpara3.png
 share/doc/HTML/en/kword/fpara4.png
 share/doc/HTML/en/kword/fpara5.png
-share/doc/HTML/en/kword/fpara6.png
 share/doc/HTML/en/kword/fpicture.png
 share/doc/HTML/en/kword/framers.png
 share/doc/HTML/en/kword/frames.docbook
@@ -2783,7 +3634,6 @@ share/doc/HTML/en/kword/framestylist.png
 share/doc/HTML/en/kword/fundimentals.docbook
 share/doc/HTML/en/kword/graphics.docbook
 share/doc/HTML/en/kword/headerfooter.docbook
-share/doc/HTML/en/kword/horizline.docbook
 share/doc/HTML/en/kword/incindbut.png
 share/doc/HTML/en/kword/index.cache.bz2
 share/doc/HTML/en/kword/index.docbook
@@ -2823,7 +3673,10 @@ share/doc/HTML/en/kword/mailmerge.docbook
 share/doc/HTML/en/kword/mbtb.docbook
 share/doc/HTML/en/kword/migrating.docbook
 share/doc/HTML/en/kword/mmerge1.png
+share/doc/HTML/en/kword/mmerge1a.png
 share/doc/HTML/en/kword/mmerge2.png
+share/doc/HTML/en/kword/mmergeab1.png
+share/doc/HTML/en/kword/mmergekspread1.png
 share/doc/HTML/en/kword/mmergesql1.png
 share/doc/HTML/en/kword/mmergesql2.png
 share/doc/HTML/en/kword/numtxtbut.png
@@ -2859,6 +3712,8 @@ share/doc/HTML/en/kword/saved1.png
 share/doc/HTML/en/kword/saved2.png
 share/doc/HTML/en/kword/savedlg.png
 share/doc/HTML/en/kword/savetmpl1.png
+share/doc/HTML/en/kword/scan.png
+share/doc/HTML/en/kword/scan2.png
 share/doc/HTML/en/kword/screen.png
 share/doc/HTML/en/kword/select1.png
 share/doc/HTML/en/kword/spell.png
@@ -2867,6 +3722,7 @@ share/doc/HTML/en/kword/stkout.png
 share/doc/HTML/en/kword/storeprint.docbook
 share/doc/HTML/en/kword/styldlg1.png
 share/doc/HTML/en/kword/styldlg2.png
+share/doc/HTML/en/kword/styleimport.png
 share/doc/HTML/en/kword/styles.docbook
 share/doc/HTML/en/kword/subscbut.png
 share/doc/HTML/en/kword/sum.png
@@ -2881,8 +3737,6 @@ share/doc/HTML/en/kword/tb2.png
 share/doc/HTML/en/kword/tb3.png
 share/doc/HTML/en/kword/tb4.png
 share/doc/HTML/en/kword/tblsty.png
-share/doc/HTML/en/kword/tbmax.png
-share/doc/HTML/en/kword/tbmin.png
 share/doc/HTML/en/kword/tbord.png
 share/doc/HTML/en/kword/techinfo.docbook
 share/doc/HTML/en/kword/tedittb.png
@@ -2895,6 +3749,8 @@ share/doc/HTML/en/kword/tutorial.docbook
 share/doc/HTML/en/kword/undl.png
 share/doc/HTML/en/kword/undo.png
 share/doc/HTML/en/kword/value.png
+share/doc/HTML/en/kword/viewsize.png
+share/doc/HTML/en/kword/wbw.png
 share/doc/HTML/en/kword/wpfmtpg1.png
 share/doc/HTML/en/kword/wpfmtpg2.png
 share/doc/HTML/en/kword/wpfmtpg3.png
@@ -2905,6 +3761,8 @@ share/doc/HTML/en/thesaurus/index.docbook
 share/icons/crystalsvg/16x16/actions/abs.png
 share/icons/crystalsvg/16x16/actions/brackets.png
 share/icons/crystalsvg/16x16/actions/frac.png
+share/icons/crystalsvg/16x16/actions/gsub.png
+share/icons/crystalsvg/16x16/actions/gsup.png
 share/icons/crystalsvg/16x16/actions/int.png
 share/icons/crystalsvg/16x16/actions/lsub.png
 share/icons/crystalsvg/16x16/actions/lsup.png
@@ -2919,18 +3777,14 @@ share/icons/crystalsvg/16x16/actions/rsup.png
 share/icons/crystalsvg/16x16/actions/sqrt.png
 share/icons/crystalsvg/16x16/actions/sum.png
 share/icons/crystalsvg/16x16/actions/under.png
-share/icons/crystalsvg/16x16/apps/karbon.png
-share/icons/crystalsvg/16x16/apps/kchart.png
-share/icons/crystalsvg/16x16/apps/kformula.png
-share/icons/crystalsvg/16x16/apps/kivio.png
-share/icons/crystalsvg/16x16/apps/kpresenter.png
-share/icons/crystalsvg/16x16/apps/kspread.png
-share/icons/crystalsvg/16x16/apps/kugar.png
-share/icons/crystalsvg/16x16/apps/kword.png
+share/icons/crystalsvg/16x16/mimetypes/kexiproject_sqlite.png
+share/icons/crystalsvg/16x16/mimetypes/kexiproject_sqlite2.png
 share/icons/crystalsvg/16x16/mimetypes/kugardata.png
 share/icons/crystalsvg/22x22/actions/abs.png
 share/icons/crystalsvg/22x22/actions/brackets.png
 share/icons/crystalsvg/22x22/actions/frac.png
+share/icons/crystalsvg/22x22/actions/gsub.png
+share/icons/crystalsvg/22x22/actions/gsup.png
 share/icons/crystalsvg/22x22/actions/inscol.png
 share/icons/crystalsvg/22x22/actions/insrow.png
 share/icons/crystalsvg/22x22/actions/int.png
@@ -2949,11 +3803,11 @@ share/icons/crystalsvg/22x22/actions/rsup.png
 share/icons/crystalsvg/22x22/actions/sqrt.png
 share/icons/crystalsvg/22x22/actions/sum.png
 share/icons/crystalsvg/22x22/actions/under.png
-share/icons/crystalsvg/22x22/apps/kivio.png
-share/icons/crystalsvg/22x22/apps/kugar.png
 share/icons/crystalsvg/32x32/actions/abs.png
 share/icons/crystalsvg/32x32/actions/brackets.png
 share/icons/crystalsvg/32x32/actions/frac.png
+share/icons/crystalsvg/32x32/actions/gsub.png
+share/icons/crystalsvg/32x32/actions/gsup.png
 share/icons/crystalsvg/32x32/actions/int.png
 share/icons/crystalsvg/32x32/actions/lsub.png
 share/icons/crystalsvg/32x32/actions/lsup.png
@@ -2968,28 +3822,59 @@ share/icons/crystalsvg/32x32/actions/rsup.png
 share/icons/crystalsvg/32x32/actions/sqrt.png
 share/icons/crystalsvg/32x32/actions/sum.png
 share/icons/crystalsvg/32x32/actions/under.png
-share/icons/crystalsvg/32x32/apps/karbon.png
-share/icons/crystalsvg/32x32/apps/kchart.png
-share/icons/crystalsvg/32x32/apps/kformula.png
-share/icons/crystalsvg/32x32/apps/kivio.png
-share/icons/crystalsvg/32x32/apps/kpresenter.png
-share/icons/crystalsvg/32x32/apps/kspread.png
-share/icons/crystalsvg/32x32/apps/kugar.png
-share/icons/crystalsvg/32x32/apps/kword.png
+share/icons/crystalsvg/32x32/mimetypes/kexiproject_shortcut.png
+share/icons/crystalsvg/32x32/mimetypes/kexiproject_sqlite.png
+share/icons/crystalsvg/32x32/mimetypes/kexiproject_sqlite2.png
 share/icons/crystalsvg/32x32/mimetypes/kugardata.png
-share/icons/crystalsvg/48x48/apps/karbon.png
-share/icons/crystalsvg/48x48/apps/kchart.png
-share/icons/crystalsvg/48x48/apps/kformula.png
-share/icons/crystalsvg/48x48/apps/kivio.png
-share/icons/crystalsvg/48x48/apps/kpresenter.png
-share/icons/crystalsvg/48x48/apps/kspread.png
-share/icons/crystalsvg/48x48/apps/kugar.png
-share/icons/crystalsvg/48x48/apps/kword.png
-share/icons/locolor/16x16/apps/kspreadcalc.png
+share/icons/hicolor/128x128/apps/krita.png
+share/icons/hicolor/16x16/apps/karbon.png
+share/icons/hicolor/16x16/apps/kchart.png
+share/icons/hicolor/16x16/apps/kexi.png
+share/icons/hicolor/16x16/apps/kformula.png
+share/icons/hicolor/16x16/apps/kivio.png
+share/icons/hicolor/16x16/apps/kpresenter.png
+share/icons/hicolor/16x16/apps/krita.png
+share/icons/hicolor/16x16/apps/kspread.png
+share/icons/hicolor/16x16/apps/kugar.png
+share/icons/hicolor/16x16/apps/kword.png
+share/icons/hicolor/22x22/apps/karbon.png
+share/icons/hicolor/22x22/apps/kexi.png
+share/icons/hicolor/22x22/apps/kformula.png
+share/icons/hicolor/22x22/apps/kivio.png
+share/icons/hicolor/22x22/apps/kpresenter.png
+share/icons/hicolor/22x22/apps/krita.png
+share/icons/hicolor/22x22/apps/kspread.png
+share/icons/hicolor/22x22/apps/kugar.png
+share/icons/hicolor/22x22/apps/kword.png
+share/icons/hicolor/32x32/apps/karbon.png
+share/icons/hicolor/32x32/apps/kchart.png
+share/icons/hicolor/32x32/apps/kexi.png
+share/icons/hicolor/32x32/apps/kformula.png
+share/icons/hicolor/32x32/apps/kivio.png
+share/icons/hicolor/32x32/apps/kpresenter.png
+share/icons/hicolor/32x32/apps/krita.png
+share/icons/hicolor/32x32/apps/kspread.png
+share/icons/hicolor/32x32/apps/kugar.png
+share/icons/hicolor/32x32/apps/kword.png
+share/icons/hicolor/48x48/apps/karbon.png
+share/icons/hicolor/48x48/apps/kchart.png
+share/icons/hicolor/48x48/apps/kexi.png
+share/icons/hicolor/48x48/apps/kformula.png
+share/icons/hicolor/48x48/apps/kivio.png
+share/icons/hicolor/48x48/apps/kpresenter.png
+share/icons/hicolor/48x48/apps/krita.png
+share/icons/hicolor/48x48/apps/kspread.png
+share/icons/hicolor/48x48/apps/kugar.png
+share/icons/hicolor/48x48/apps/kword.png
+share/icons/hicolor/64x64/apps/krita.png
+share/icons/hicolor/scalable/apps/karbon.svgz
+share/icons/hicolor/scalable/apps/kexi.svgz
 share/icons/locolor/16x16/apps/kudesigner.png
-share/icons/locolor/22x22/apps/kspreadcalc.png
-share/icons/locolor/32x32/apps/kspreadcalc.png
 share/icons/locolor/32x32/apps/kudesigner.png
+share/mimelnk/application/x-kexiproject-shortcut.desktop
+share/mimelnk/application/x-kexiproject-sqlite.desktop
+share/mimelnk/application/x-kexiproject-sqlite2.desktop
+share/mimelnk/application/x-kexiproject-sqlite3.desktop
 share/services/clipartthumbnail.desktop
 share/services/generic_filter.desktop
 share/services/karbon_ai_import.desktop
@@ -3005,9 +3890,28 @@ share/services/karbon_wmf_export.desktop
 share/services/karbon_wmf_import.desktop
 share/services/karbon_xcf_export.desktop
 share/services/karbonpart.desktop
+share/services/kchart_png_export.desktop
+share/services/kchart_svg_export.desktop
 share/services/kchartpart.desktop
+share/services/kexi/kexiformhandler.desktop
+share/services/kexi/keximigrationhandler.desktop
+share/services/kexi/kexiqueryhandler.desktop
+share/services/kexi/kexirelationhandler.desktop
+share/services/kexi/kexireporthandler.desktop
+share/services/kexi/kexiscripthandler.desktop
+share/services/kexi/kexitablehandler.desktop
+share/services/kexidb_mysqldriver.desktop
+share/services/kexidb_pqxxsqldriver.desktop
+share/services/kexidb_sqlite2driver.desktop
+share/services/kexidb_sqlite3driver.desktop
+share/services/keximigrate_mysql.desktop
+share/services/keximigrate_pqxx.desktop
 share/services/kfile_koffice.desktop
 share/services/kfile_ooo.desktop
+share/services/kformdesigner/containerfactory.desktop
+share/services/kformdesigner/kexidbfactory.desktop
+share/services/kformdesigner/stdwidgets.desktop
+share/services/kformdesigner_part.desktop
 share/services/kformula_latex_export.desktop
 share/services/kformula_mathml_export.desktop
 share/services/kformula_mathml_import.desktop
@@ -3016,6 +3920,7 @@ share/services/kformulapart.desktop
 share/services/kivioconnectortool.desktop
 share/services/kiviopart.desktop
 share/services/kivioselecttool.desktop
+share/services/kiviotargettool.desktop
 share/services/kiviotexttool.desktop
 share/services/kiviozoomtool.desktop
 share/services/kodocinfopropspage.desktop
@@ -3025,11 +3930,28 @@ share/services/kpresenter_ooimpress_export.desktop
 share/services/kpresenter_ooimpress_import.desktop
 share/services/kpresenterpart.desktop
 share/services/kprkword.desktop
-share/services/kspelltool.desktop
+share/services/krita_magick_export.desktop
+share/services/krita_magick_import.desktop
+share/services/kritacimg.desktop
+share/services/kritadefaultpaintops.desktop
+share/services/kritadefaulttools.desktop
+share/services/kritagrayplugin.desktop
+share/services/kritapart.desktop
+share/services/kritargbplugin.desktop
+share/services/kritaselectiontools.desktop
+share/services/kritatoolcrop.desktop
+share/services/kritatoolfilter.desktop
+share/services/kritatoolpolygon.desktop
+share/services/kritatoolpolyline.desktop
+share/services/kritatoolselectpicker.desktop
+share/services/kritatoolstar.desktop
+share/services/kritatooltransform.desktop
 share/services/kspread_applixspread_import.desktop
 share/services/kspread_csv_export.desktop
 share/services/kspread_csv_import.desktop
 share/services/kspread_dbase_import.desktop
+share/services/kspread_excel_export.desktop
+share/services/kspread_excel_import.desktop
 share/services/kspread_gnumeric_export.desktop
 share/services/kspread_gnumeric_import.desktop
 share/services/kspread_html_export.desktop
@@ -3037,10 +3959,11 @@ share/services/kspread_latex_export.desktop
 share/services/kspread_opencalc_export.desktop
 share/services/kspread_opencalc_import.desktop
 share/services/kspread_qpro_import.desktop
-share/services/kspreadcalc.desktop
 share/services/kspreadpart.desktop
 share/services/kugar_kugar_import.desktop
 share/services/kugarpart.desktop
+share/services/kwmailmerge_kabc.desktop
+share/services/kwmailmerge_kspread.desktop
 share/services/kword_abiword_export.desktop
 share/services/kword_abiword_import.desktop
 share/services/kword_amipro_export.desktop
@@ -3051,6 +3974,7 @@ share/services/kword_ascii_import.desktop
 share/services/kword_docbook_export.desktop
 share/services/kword_html_export.desktop
 share/services/kword_html_import.desktop
+share/services/kword_kword1dot3_import.desktop
 share/services/kword_latex_export.desktop
 share/services/kword_msword_import.desktop
 share/services/kword_mswrite_export.desktop
@@ -3076,15 +4000,28 @@ share/services/ole_winword97_import.desktop
 share/services/thesaurustool.desktop
 share/services/xslt_export.desktop
 share/services/xslt_import.desktop
+share/servicetypes/kexidb_driver.desktop
+share/servicetypes/kexifileimportfilter.desktop
+share/servicetypes/kexihandler.desktop
+share/servicetypes/kexiimportfilter.desktop
+share/servicetypes/keximigration_driver.desktop
+share/servicetypes/kexiserverimportfilter.desktop
+share/servicetypes/kexitablefilter.desktop
 share/servicetypes/kochart.desktop
 share/servicetypes/kofficepart.desktop
 share/servicetypes/kofilter.desktop
 share/servicetypes/kofilterwrapper.desktop
 share/servicetypes/koplugin.desktop
+share/servicetypes/krita_filter.desktop
+share/servicetypes/krita_module.desktop
+share/servicetypes/krita_paintop.desktop
+share/servicetypes/krita_plugin.desktop
+share/servicetypes/krita_tool.desktop
 share/servicetypes/kwmailmerge.desktop
+share/servicetypes/widgetfactory.desktop
 share/templates/.source/Illustration.karbon
 share/templates/.source/Presentation.kpt
-share/templates/.source/SpreadSheet.ksp
+share/templates/.source/SpreadSheet.kst
 share/templates/.source/TextDocument.kwt
 share/templates/Illustration.desktop
 share/templates/Presentation.desktop
@@ -3092,7 +4029,17 @@ share/templates/SpreadSheet.desktop
 share/templates/TextDocument.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/lib/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kdgantt/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/koffice-apidocs/kspread/html
+@dirrm share/services/kformdesigner
+@dirrm share/services/kexi
+@dirrm share/icons/hicolor/scalable/apps
+@dirrm share/icons/hicolor/scalable
 @dirrm share/doc/HTML/en/thesaurus
 @dirrm share/doc/HTML/en/kword
 @dirrm share/doc/HTML/en/kugar
@@ -3101,30 +4048,35 @@ share/templates/TextDocument.desktop
 @dirrm share/doc/HTML/en/koshell
 @dirrm share/doc/HTML/en/koffice-apidocs/lib/html
 @dirrm share/doc/HTML/en/koffice-apidocs/lib
+@dirrm share/doc/HTML/en/koffice-apidocs/kspread/html
+@dirrm share/doc/HTML/en/koffice-apidocs/kspread
+@dirrm share/doc/HTML/en/koffice-apidocs/kdgantt/html
+@dirrm share/doc/HTML/en/koffice-apidocs/kdgantt
 @dirrm share/doc/HTML/en/koffice-apidocs
 @dirrm share/doc/HTML/en/koffice
 @dirrm share/doc/HTML/en/kivio
 @dirrm share/doc/HTML/en/kformula
 @dirrm share/doc/HTML/en/kchart
+@dirrm share/config/magic
 @dirrm share/apps/xsltfilter/export/kword/xslfo
 @dirrm share/apps/xsltfilter/export/kword
 @dirrm share/apps/xsltfilter/export
 @dirrm share/apps/xsltfilter
 @dirrm share/apps/thesaurus
 @dirrm share/apps/kword/templates/Publishing/.source
-@dirrm share/apps/kword/templates/Publishing/.icon
 @dirrm share/apps/kword/templates/Publishing
 @dirrm share/apps/kword/templates/Normal/.source
-@dirrm share/apps/kword/templates/Normal/.icon
 @dirrm share/apps/kword/templates/Normal
 @dirrm share/apps/kword/templates/Envelopes/.source
-@dirrm share/apps/kword/templates/Envelopes/.icon
 @dirrm share/apps/kword/templates/Envelopes
 @dirrm share/apps/kword/templates/CardsAndLabels/.source
-@dirrm share/apps/kword/templates/CardsAndLabels/.icon
 @dirrm share/apps/kword/templates/CardsAndLabels
 @dirrm share/apps/kword/templates
 @dirrm share/apps/kword/kpartplugins
+@dirrm share/apps/kword/icons/crystalsvg/scalable/actions
+@dirrm share/apps/kword/icons/crystalsvg/scalable
+@dirrm share/apps/kword/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kword/icons/crystalsvg/48x48
 @dirrm share/apps/kword/icons/crystalsvg/22x22/actions
 @dirrm share/apps/kword/icons/crystalsvg/22x22
 @dirrm share/apps/kword/icons/crystalsvg
@@ -3136,26 +4088,30 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kugar/dtd
 @dirrm share/apps/kugar
 @dirrm share/apps/kudesigner/templates/General/.source
-@dirrm share/apps/kudesigner/templates/General/.icon
 @dirrm share/apps/kudesigner/templates/General
 @dirrm share/apps/kudesigner/templates
+@dirrm share/apps/kudesigner/icons/crystalsvg/scalable/actions
+@dirrm share/apps/kudesigner/icons/crystalsvg/scalable
+@dirrm share/apps/kudesigner/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kudesigner/icons/crystalsvg/48x48
 @dirrm share/apps/kudesigner/icons/crystalsvg/22x22/actions
 @dirrm share/apps/kudesigner/icons/crystalsvg/22x22
 @dirrm share/apps/kudesigner/icons/crystalsvg
 @dirrm share/apps/kudesigner/icons
 @dirrm share/apps/kudesigner
 @dirrm share/apps/kspread/templates/HomeFamily/.source
-@dirrm share/apps/kspread/templates/HomeFamily/.icon
 @dirrm share/apps/kspread/templates/HomeFamily
 @dirrm share/apps/kspread/templates/General/.source
-@dirrm share/apps/kspread/templates/General/.icon
 @dirrm share/apps/kspread/templates/General
 @dirrm share/apps/kspread/templates/Business/.source
-@dirrm share/apps/kspread/templates/Business/.icon
 @dirrm share/apps/kspread/templates/Business
 @dirrm share/apps/kspread/templates
 @dirrm share/apps/kspread/tablestyles
 @dirrm share/apps/kspread/kpartplugins
+@dirrm share/apps/kspread/icons/crystalsvg/scalable/actions
+@dirrm share/apps/kspread/icons/crystalsvg/scalable
+@dirrm share/apps/kspread/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kspread/icons/crystalsvg/48x48
 @dirrm share/apps/kspread/icons/crystalsvg/32x32/actions
 @dirrm share/apps/kspread/icons/crystalsvg/32x32
 @dirrm share/apps/kspread/icons/crystalsvg/22x22/actions
@@ -3167,14 +4123,33 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kspread/extensions
 @dirrm share/apps/kspread/dtd
 @dirrm share/apps/kspread
+@dirrm share/apps/krita/templates/rgb/.source
+@dirrm share/apps/krita/templates/rgb
+@dirrm share/apps/krita/templates/gray/.source
+@dirrm share/apps/krita/templates/gray
+@dirrm share/apps/krita/templates/empty/.source
+@dirrm share/apps/krita/templates/empty
+@dirrm share/apps/krita/templates
+@dirrm share/apps/krita/profiles
+@dirrm share/apps/krita/pics
+@dirrm share/apps/krita/patterns
+@dirrm share/apps/krita/palettes
 @dirrm share/apps/krita/kpartplugins
+@dirrm share/apps/krita/icons/crystalsvg/scalable/actions
+@dirrm share/apps/krita/icons/crystalsvg/scalable
+@dirrm share/apps/krita/icons/crystalsvg/48x48/actions
+@dirrm share/apps/krita/icons/crystalsvg/48x48
+@dirrm share/apps/krita/icons/crystalsvg
+@dirrm share/apps/krita/icons
+@dirrm share/apps/krita/gradients
+@dirrm share/apps/krita/dtd
+@dirrm share/apps/krita/brushes
 @dirrm share/apps/krita
 @dirrm share/apps/kpresenter/templates/letter/.source
 @dirrm share/apps/kpresenter/templates/letter
 @dirrm share/apps/kpresenter/templates/legal/.source
 @dirrm share/apps/kpresenter/templates/legal
 @dirrm share/apps/kpresenter/templates/Screenpresentations/.source
-@dirrm share/apps/kpresenter/templates/Screenpresentations/.icon
 @dirrm share/apps/kpresenter/templates/Screenpresentations
 @dirrm share/apps/kpresenter/templates/Screen/.source
 @dirrm share/apps/kpresenter/templates/Screen
@@ -3184,6 +4159,13 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kpresenter/slideshow
 @dirrm share/apps/kpresenter/pics
 @dirrm share/apps/kpresenter/kpartplugins
+@dirrm share/apps/kpresenter/icons/hicolor/48x48/actions
+@dirrm share/apps/kpresenter/icons/hicolor/48x48
+@dirrm share/apps/kpresenter/icons/hicolor
+@dirrm share/apps/kpresenter/icons/crystalsvg/scalable/actions
+@dirrm share/apps/kpresenter/icons/crystalsvg/scalable
+@dirrm share/apps/kpresenter/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kpresenter/icons/crystalsvg/48x48
 @dirrm share/apps/kpresenter/icons/crystalsvg/22x22/actions
 @dirrm share/apps/kpresenter/icons/crystalsvg/22x22
 @dirrm share/apps/kpresenter/icons/crystalsvg
@@ -3199,12 +4181,14 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kpresenter
 @dirrm share/apps/koshell
 @dirrm share/apps/koffice/pics
+@dirrm share/apps/koffice/icons/crystalsvg/scalable/actions
+@dirrm share/apps/koffice/icons/crystalsvg/scalable
 @dirrm share/apps/koffice/icons/crystalsvg/48x48/apps
+@dirrm share/apps/koffice/icons/crystalsvg/48x48/actions
 @dirrm share/apps/koffice/icons/crystalsvg/48x48
 @dirrm share/apps/koffice/icons/crystalsvg/32x32/apps
 @dirrm share/apps/koffice/icons/crystalsvg/32x32/actions
 @dirrm share/apps/koffice/icons/crystalsvg/32x32
-@dirrm share/apps/koffice/icons/crystalsvg/22x22/actions/part
 @dirrm share/apps/koffice/icons/crystalsvg/22x22/actions
 @dirrm share/apps/koffice/icons/crystalsvg/22x22
 @dirrm share/apps/koffice/icons/crystalsvg/16x16/apps
@@ -3216,7 +4200,6 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/koffice/autocorrect
 @dirrm share/apps/koffice
 @dirrm share/apps/kivio/templates/Basic/.source
-@dirrm share/apps/kivio/templates/Basic/.icon
 @dirrm share/apps/kivio/templates/Basic
 @dirrm share/apps/kivio/templates
 @dirrm share/apps/kivio/stencils/UML/ClassDiagrams
@@ -3224,6 +4207,7 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kivio/stencils/UML
 @dirrm share/apps/kivio/stencils/Miscellaneous/Transport
 @dirrm share/apps/kivio/stencils/Miscellaneous/People
+@dirrm share/apps/kivio/stencils/Miscellaneous/NassiShneiderman
 @dirrm share/apps/kivio/stencils/Miscellaneous/Buildings
 @dirrm share/apps/kivio/stencils/Miscellaneous/Arrows
 @dirrm share/apps/kivio/stencils/Miscellaneous
@@ -3260,6 +4244,10 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kivio/icons/hicolor/16x16/actions
 @dirrm share/apps/kivio/icons/hicolor/16x16
 @dirrm share/apps/kivio/icons/hicolor
+@dirrm share/apps/kivio/icons/crystalsvg/scalable/actions
+@dirrm share/apps/kivio/icons/crystalsvg/scalable
+@dirrm share/apps/kivio/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kivio/icons/crystalsvg/48x48
 @dirrm share/apps/kivio/icons/crystalsvg/32x32/actions
 @dirrm share/apps/kivio/icons/crystalsvg/32x32
 @dirrm share/apps/kivio/icons/crystalsvg/22x22/actions
@@ -3272,10 +4260,35 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kivio
 @dirrm share/apps/kformula/dtd
 @dirrm share/apps/kformula
+@dirrm share/apps/kformdesigner_part
+@dirrm share/apps/kformdesigner
+@dirrm share/apps/kexi/pics
+@dirrm share/apps/kexi/icons/crystalsvg/64x64/actions
+@dirrm share/apps/kexi/icons/crystalsvg/64x64
+@dirrm share/apps/kexi/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kexi/icons/crystalsvg/48x48
+@dirrm share/apps/kexi/icons/crystalsvg/32x32/actions
+@dirrm share/apps/kexi/icons/crystalsvg/32x32
+@dirrm share/apps/kexi/icons/crystalsvg/22x22/actions
+@dirrm share/apps/kexi/icons/crystalsvg/22x22
+@dirrm share/apps/kexi/icons/crystalsvg/16x16/actions
+@dirrm share/apps/kexi/icons/crystalsvg/16x16
+@dirrm share/apps/kexi/icons/crystalsvg/128x128/actions
+@dirrm share/apps/kexi/icons/crystalsvg/128x128
+@dirrm share/apps/kexi/icons/crystalsvg
+@dirrm share/apps/kexi/icons
+@dirrm share/apps/kexi
+@dirrm share/apps/kchart/templates/chart/.source
+@dirrm share/apps/kchart/templates/chart
+@dirrm share/apps/kchart/templates
 @dirrm share/apps/kchart/pics
 @dirrm share/apps/kchart/icons/locolor/16x16/actions
 @dirrm share/apps/kchart/icons/locolor/16x16
 @dirrm share/apps/kchart/icons/locolor
+@dirrm share/apps/kchart/icons/crystalsvg/scalable/actions
+@dirrm share/apps/kchart/icons/crystalsvg/scalable
+@dirrm share/apps/kchart/icons/crystalsvg/48x48/actions
+@dirrm share/apps/kchart/icons/crystalsvg/48x48
 @dirrm share/apps/kchart/icons/crystalsvg/32x32/actions
 @dirrm share/apps/kchart/icons/crystalsvg/32x32
 @dirrm share/apps/kchart/icons/crystalsvg/22x22/actions
@@ -3286,13 +4299,19 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/kchart/icons
 @dirrm share/apps/kchart
 @dirrm share/apps/karbon/kpartplugins
-@dirrm share/apps/karbon/icons/crystalsvg/48x48/apps
-@dirrm share/apps/karbon/icons/crystalsvg/48x48
-@dirrm share/apps/karbon/icons/crystalsvg/32x32/apps
-@dirrm share/apps/karbon/icons/crystalsvg/32x32
+@dirrm share/apps/karbon/icons/hicolor/scalable/apps
+@dirrm share/apps/karbon/icons/hicolor/scalable
+@dirrm share/apps/karbon/icons/hicolor/48x48/apps
+@dirrm share/apps/karbon/icons/hicolor/48x48
+@dirrm share/apps/karbon/icons/hicolor/32x32/apps
+@dirrm share/apps/karbon/icons/hicolor/32x32
+@dirrm share/apps/karbon/icons/hicolor/22x22/apps
+@dirrm share/apps/karbon/icons/hicolor/22x22
+@dirrm share/apps/karbon/icons/hicolor/16x16/apps
+@dirrm share/apps/karbon/icons/hicolor/16x16
+@dirrm share/apps/karbon/icons/hicolor
 @dirrm share/apps/karbon/icons/crystalsvg/22x22/actions
 @dirrm share/apps/karbon/icons/crystalsvg/22x22
-@dirrm share/apps/karbon/icons/crystalsvg/16x16/apps
 @dirrm share/apps/karbon/icons/crystalsvg/16x16/actions
 @dirrm share/apps/karbon/icons/crystalsvg/16x16
 @dirrm share/apps/karbon/icons/crystalsvg
@@ -3300,3 +4319,4 @@ share/templates/TextDocument.desktop
 @dirrm share/apps/karbon/gradients
 @dirrm share/apps/karbon
 @dirrm include/kword
+@dirrm include/kexidb