author: Michael Nottebrock <lofi@FreeBSD.org> 2005-03-20 18:17:55 +0000
committer: Michael Nottebrock <lofi@FreeBSD.org> 2005-03-20 18:17:55 +0000
commit: d57e6a82578ae8c5008de9b8a118e7286b5ac8bd (patch)
tree: 3242aa4d74a61f6856c81b2ca2de2e77f3bdfe80 /x11
parent: 6d03af1e2cf23cd31fdb26de95a70d7cfaa23986 (diff)
download: ports-d57e6a82578ae8c5008de9b8a118e7286b5ac8bd.tar.gz
ports-d57e6a82578ae8c5008de9b8a118e7286b5ac8bd.zip
100 files changed, 7440 insertions, 2780 deletions
diff --git a/x11/kde3/Makefile.kde b/x11/kde3/Makefile.kde
index 3fc622219a8a..256be2bf68a2 100644
--- a/x11/kde3/Makefile.kde
+++ b/x11/kde3/Makefile.kde
@@ -17,7 +17,6 @@ COPY=	-c -p
 # For ports that have I18N components only.
 .if defined(KDE_I18N)
 _NO_KDE_FINAL=	yes
-_NO_KDE_CLOSURE= yes
 _NO_KDE_NDEBUG=	yes
 DISTNAME?=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 # Since KDE 3.1.3, the kde-i18n tarballs have the ${KDE_VERSION}
@@ -42,10 +41,6 @@ post-extract:
 CONFIGURE_ARGS+=--enable-final
 .endif
 
-.if !defined(_NO_KDE_CLOSURE) && defined(WANT_KDE_CLOSURE)
-CONFIGURE_ARGS+=--enable-closure
-.endif
-
 .if !defined(_NO_KDE_NDEBUG)
 .if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index fdbd9bfc5636..4679a2d4d220 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,13 +18,16 @@ COMMENT=	Basic applications for the KDE system
 
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient \
+		usb:${PORTSDIR}/devel/libusb
 
-CONFLICTS=	kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.*
+CONFLICTS=	kdelibs-3.[0-3]* kdeutils-3.[0-2]*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
+USE_GETOPT_LONG=yes
 USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,8 +40,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-DO_NOT_COMPILE=	nsplugins
-CONFIGURE_ENV+=	RUN_KAPPFINDER=no
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -49,10 +50,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index a1ad17ecaaad..7a5b5d02fcce 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
-SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
+MD5 (KDE/kdebase-3.4.0.tar.bz2) = c88659e558ca98dc45377bf8ddfc26c9
+SIZE (KDE/kdebase-3.4.0.tar.bz2) = 22670772
diff --git a/x11/kde4-baseapps/files/patch-kcontrol-nics-nic.cpp b/x11/kde4-baseapps/files/patch-kcontrol-nics-nic.cpp
deleted file mode 100644
index e11c3de5032a..000000000000
--- a/x11/kde4-baseapps/files/patch-kcontrol-nics-nic.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kcontrol/nics/nic.cpp	15 Nov 2003 22:01:05 -0000	1.24
-+++ kcontrol/nics/nic.cpp	21 Jan 2004 13:38:46 -0000
-@@ -229,9 +229,14 @@ NICList* findNICs()
-       tmp->addr = buf;
- 
-       if (ifa->ifa_netmask != NULL) {
-+#ifdef Q_OS_FREEBSD
-+	struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask;
-+	tmp->netmask=inet_ntoa(sinptr->sin_addr);
-+#else
- 	bzero(buf, 128);
- 	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
- 	tmp->netmask = buf;
-+#endif
-       }
- 
-       if (ifa->ifa_flags & IFF_UP)
diff --git a/x11/kde4-baseapps/files/patch-kcontrol_konq_previews.cpp b/x11/kde4-baseapps/files/patch-kcontrol_konq_previews.cpp
deleted file mode 100644
index 7fe3246c2149..000000000000
--- a/x11/kde4-baseapps/files/patch-kcontrol_konq_previews.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcontrol/konq/previews.cpp.orig	Sun Oct 26 11:46:25 2003
-+++ kcontrol/konq/previews.cpp	Thu Jan 27 10:16:32 2005
-@@ -153,6 +153,11 @@
- 
-     for ( ; it.current() ; ++it ) {
-         QString protocol( it.current()->text() );
-+        if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) 
-+          // file should be enabled in case is not defined because if not so 
-+          // than preview's lost when size is changed from default one 
-+          it.current()->setOn( true ); 
-+        else 
-         it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
-     // config key is in bytes (default value 1MB), numinput is in MB
diff --git a/x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c b/x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c
deleted file mode 100644
index be29ec4d3416..000000000000
--- a/x11/kde4-baseapps/files/patch-kdm-backend-xdmcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/backend/xdmcp.c.orig	Wed May  8 14:21:31 2002
-+++ kdm/backend/xdmcp.c	Wed Jun 26 20:14:02 2002
-@@ -1012,7 +1012,7 @@
- 
-     sprintf (buf, "Session %ld failed for display %.260s: %s",
- 	     (long) sessionID, name, reason);
--    Debug ("send_failed(%\"s)\n", buf);
-+    Debug ("send_failed(\"%s\")\n", buf);
-     status.length = strlen (buf);
-     status.data = (CARD8Ptr) buf;
-     header.version = XDM_PROTOCOL_VERSION;
diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-config.def b/x11/kde4-baseapps/files/patch-kdm-kfrontend-config.def
deleted file mode 100644
index 3776abd3beae..000000000000
--- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-config.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/config.def.orig	Thu Nov 11 20:47:50 2004
-+++ kdm/kfrontend/config.def	Thu Nov 11 20:51:18 2004
-@@ -10,7 +10,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
index 4a3ac236fe1d..a6126b314d8e 100644
--- a/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-baseapps/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,6 +1,6 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
-@@ -578,7 +578,7 @@
+--- kdm/kfrontend/genkdmconf.c.orig	Wed Feb 23 12:26:01 2005
++++ kdm/kfrontend/genkdmconf.c	Sat Mar 19 16:43:49 2005
+@@ -562,7 +562,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
  "#\n"
@@ -9,7 +9,7 @@
  "\n"
  #ifdef _AIX
  "# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-@@ -619,8 +619,8 @@
+@@ -591,8 +591,8 @@
  "# Reassign ownership of the console to root, this should disallow\n"
  "# assignment of console output to any random users's xterm. See Xstartup.\n"
  "#\n"
@@ -19,8 +19,17 @@
 +/* "#chmod 622 /dev/console\n" */
  "\n"
  #ifdef _AIX
- "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,7 +667,9 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ "  */bash)\n"
+@@ -637,7 +639,9 @@
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
@@ -31,3 +40,232 @@
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
  "    [ -f /etc/profile ] && . /etc/profile\n"
+@@ -648,7 +652,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ "  \"\")\n"
+ "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ "    ;;\n"
+@@ -662,10 +666,10 @@
+ "    exec " KDE_BINDIR "/startkde\n"
+ "    ;;\n"
+ "  *)\n"
+-"    eval exec \"$1\"\n"
++"    eval exec \"$session\"\n"
+ "    ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +821,7 @@
+  * XXX this stuff is highly borked. it does not handle collisions at all.
+  */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ 	const char *tptr;
+ 	char *nname;
+@@ -840,12 +844,7 @@
+ 		fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ 		rt = 0;
+ 	} else {
+-		char *nbuf;
+-		int nlen;
+-
+-		if (!proc || !proc( &file, &nbuf, &nlen ) ||
+-		    (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+-		{
++		if (!proc || !proc( &file )) {
+ 			if (!use_destdir && !strcmp( ce->value, nname ))
+ 				linkedFile( nname );
+ 			else {
+@@ -855,7 +854,7 @@
+ 				copiedFile( ce->value );
+ 			}
+ 		} else {
+-			WriteOut( nname, mode, 0, nbuf, nlen );
++			WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ 			editedFile( ce->value );
+ 		}
+ 		if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1377,7 @@
+ 
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ 	// XXX remove any login*, chooser*, ... resources
+ 	return 0;
+@@ -1415,15 +1414,14 @@
+ 				paap = pap += 2;
+ 				while (!isspace( *pap ))
+ 					pap++;
+-				for (;;) {
+-					if (*pp++ != '/')
+-						goto no;
+-					for (bpp = pp; *pp != '/'; pp++)
+-						if (isspace( *pp ))
++				if (*pp != '/')
++					break;
++				for (;;)
++					for (bpp = ++pp; *pp != '/'; pp++)
++						if (!*pp || isspace( *pp ))
+ 							goto wbrk;
+-				}
+ 			  wbrk:
+-				if (memcmp( bpp, paap, pap - paap ))
++				if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ 					break;
+ 			} else if (*pap == '\t') {
+ 				pap++;
+@@ -1472,24 +1470,25 @@
+ static int mod_usebg;
+ 
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+-	putval( "UseBackground",
+-	        (delstr( file, "\n"
+-	                 "(\n"
+-	                 "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-	                 "  */kdmdesktop\t&\n"
+-	                 "  echo $! >$PIDFILE\n"
+-	                 "  wait $!\n"
+-	                 "  rm $PIDFILE\n"
+-	                 ")\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "*/kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\n" )) ? "true" : "false" );
+-	return 0;
++	int chg =
++		delstr( file, "\n"
++		        "(\n"
++		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++		        "  */kdmdesktop\t&\n"
++		        "  echo $! >$PIDFILE\n"
++		        "  wait $!\n"
++		        "  rm $PIDFILE\n"
++		        ")\t&\n" ) |
++		delstr( file, "\n"
++		        "*/kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\n" );
++	putval( "UseBackground", chg ? "true" : "false" );
++	return chg;
+ }
+ 
+ static void
+@@ -1515,19 +1514,22 @@
+ }
+ 
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++	int chg1 = 0, chg2 = 0;
++
+ 	if (mod_usebg &&
+-	    !delstr( file, "\n"
++	    (delstr( file, "\n"
+ 	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ 	             "if [[] -f $PIDFILE ] ; then\n"
+ 	             "	   kill `cat $PIDFILE`\n"
+-	             "fi\n" ))
+-		delstr( file, "\n"
+-		        "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-		        "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+-	if (oldver < 0x0203)
+-		putval( "UseSessReg", (
++	             "fi\n" ) ||
++	     delstr( file, "\n"
++	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++		chg1 = 1;
++	if (oldver < 0x0203) {
++		chg2 = 
+ #ifdef _AIX
+ 			delstr( file, "\n"
+ "# We create a pseudodevice for finger.  (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1554,11 @@
+ "  else\n"
+ "    exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ "  fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ 			delstr( file, "\n"
+@@ -1564,11 +1566,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+-		 ) ? "true" : "false");
+-	return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++		putval( "UseSessReg", chg2 ? "true" : "false");
++	}
++	return chg1 | chg2;
+ }
+ 
+ static void
+@@ -1592,29 +1595,29 @@
+ }
+ 
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++	return
+ #ifdef _AIX
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ "  devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ "  exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+-	delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++		delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+-	delstr( file, "\n"
++" $USER\n" ) |
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+-	return 0;
+ }
+ 
+ static void
diff --git a/x11/kde4-baseapps/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-baseapps/files/patch-konsole-konsole-konsole.cpp
deleted file mode 100644
index 553c411983a7..000000000000
--- a/x11/kde4-baseapps/files/patch-konsole-konsole-konsole.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
-+++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
-@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
-     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
-     setSchema(s->schemaNo());
-     tabwidget->setCurrentPage(tabwidget->count()-1);
--      disableMasterModeConnections(); // no duplicate connections, remove old
--      enableMasterModeConnections();
--    }
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    disableMasterModeConnections(); // no duplicate connections, remove old
-+    enableMasterModeConnections();
-+    if(m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+  }
- }
- 
- QString Konsole::currentSession()
-@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
-       rootxpms.remove(s->widget());
-     }
-     delete s->widget();
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    if (m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-   }
-   session2action.remove(s);
-   action2session.remove(ra);
diff --git a/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp
new file mode 100644
index 000000000000..55eed7247922
--- /dev/null
+++ b/x11/kde4-baseapps/files/patch-nsplugins-pluginscan.cpp
@@ -0,0 +1,10 @@
+--- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
++++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
+@@ -457,6 +457,7 @@
+ 	paths.append("/usr/lib64/netscape/plugins");
+ 	paths.append("/usr/lib64/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/local/lib/linux-flashplugin6");
+         config->writeEntry( "scanPaths", paths );
+     }
+ 
diff --git a/x11/kde4-baseapps/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-baseapps/files/patch-post-3.3.2-kdebase-htmlframes2
deleted file mode 100644
index f31b6341cf9c..000000000000
--- a/x11/kde4-baseapps/files/patch-post-3.3.2-kdebase-htmlframes2
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1342.2.14
-diff -u -p -r1.1342.2.14 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
-+++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
-@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
-     QString viewName = view->viewName();
-     kdDebug() << "       - viewName=" << viewName << "   "
-               << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+    // First look for a hostextension containing this frame name
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+      kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+      if (!ext)
-+         continue; // Don't use this window
-+    }
-+
-     if ( !viewName.isEmpty() && viewName == name )
-     {
-       kdDebug() << "found existing view by name: " << view << endl;
-@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
-       return view;
-     }
- 
--    // First look for a hostextension containing this frame name
--    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
--    if ( ext )
--    {
--      ext = ext->findFrameParent(callingPart, name);
--    }
--
- //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
diff --git a/x11/kde4-baseapps/pkg-plist b/x11/kde4-baseapps/pkg-plist
index 61e591e3cd68..1dabe06f9d62 100644
--- a/x11/kde4-baseapps/pkg-plist
+++ b/x11/kde4-baseapps/pkg-plist
@@ -4,11 +4,13 @@ bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kasbar
 bin/kate
 bin/kblankscrn.kss
+bin/kbookmarkmerger
 bin/kcheckpass
+bin/kcheckrunning
 bin/kcminit
-bin/kcmshell
 bin/kcontrol
 bin/kcontroledit
 bin/kdcop
@@ -32,16 +34,21 @@ bin/kfind
 bin/kfmclient
 bin/kfontinst
 bin/kfontview
+bin/khc_docbookdig.pl
+bin/khc_htdig.pl
+bin/khc_htsearch.pl
 bin/khc_indexbuilder
+bin/khc_mansearch.pl
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
 bin/kinfocenter
-bin/kio_devices_mounthelper
+bin/kio_media_mounthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
+bin/knetattach
 bin/konqueror
 bin/konsole
 bin/kpager
@@ -56,11 +63,13 @@ bin/kreadconfig
 bin/krootimage
 bin/ksmserver
 bin/ksplash
+bin/ksplashsimple
 bin/kstart
 bin/ksysguard
 bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
+bin/ktrash
 bin/kwebdesktop
 bin/kwin
 bin/kwin_killer_helper
@@ -68,6 +77,8 @@ bin/kwin_rules_dialog
 bin/kwrite
 bin/kwriteconfig
 bin/kxkb
+bin/nspluginscan
+bin/nspluginviewer
 bin/startkde
 etc/ksysguarddrc
 etc/rc.d/genkdmconf.sh
@@ -107,6 +118,7 @@ include/konq_dirpart.h
 include/konq_drag.h
 include/konq_events.h
 include/konq_faviconmgr.h
+include/konq_filetip.h
 include/konq_historycomm.h
 include/konq_historymgr.h
 include/konq_iconviewwidget.h
@@ -119,7 +131,6 @@ include/konq_undo.h
 include/konq_xmlguiclient.h
 include/konqbookmarkmanager.h
 include/konqsidebarplugin.h
-include/ksgrd/ColorPicker.h
 include/ksgrd/HostConnector.h
 include/ksgrd/SensorAgent.h
 include/ksgrd/SensorClient.h
@@ -135,22 +146,22 @@ include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
+include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/kicker-3.4-reverseLayout
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
-lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
 lib/kde3/cursorthumbnail.so
-lib/kde3/devices_panelapplet.la
-lib/kde3/devices_panelapplet.so
 lib/kde3/djvuthumbnail.la
 lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
 lib/kde3/dockbar_panelextension.so
+lib/kde3/exrthumbnail.la
+lib/kde3/exrthumbnail.so
 lib/kde3/extensionproxy.la
 lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
@@ -211,6 +222,8 @@ lib/kde3/kcm_kded.la
 lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
 lib/kde3/kcm_kdm.so
+lib/kde3/kcm_kdnssd.la
+lib/kde3/kcm_kdnssd.so
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keyboard.so
 lib/kde3/kcm_keys.la
@@ -247,6 +260,8 @@ lib/kde3/kcm_locale.la
 lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
 lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
@@ -267,36 +282,48 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
+lib/kde3/kcm_usb.la
+lib/kde3/kcm_usb.so
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
 lib/kde3/kcminit.so
-lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
 lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
 lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_khotkeys.la
+lib/kde3/kded_khotkeys.so
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_kwrited.so
-lib/kde3/kded_mountwatcher.la
-lib/kde3/kded_mountwatcher.so
+lib/kde3/kded_mediamanager.la
+lib/kde3/kded_mediamanager.so
+lib/kde3/kded_remotedirnotify.la
+lib/kde3/kded_remotedirnotify.so
+lib/kde3/kded_systemdirnotify.la
+lib/kde3/kded_systemdirnotify.so
 lib/kde3/kdesktop.la
 lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
 lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
 lib/kde3/kfile_font.so
+lib/kde3/kfile_media.la
+lib/kde3/kfile_media.so
+lib/kde3/kfile_trash.la
+lib/kde3/kfile_trash.so
 lib/kde3/kfmclient.la
 lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_classic.so
+lib/kde3/kgreet_winbind.la
+lib/kde3/kgreet_winbind.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
@@ -315,12 +342,14 @@ lib/kde3/kickermenu_prefmenu.la
 lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
 lib/kde3/kickermenu_recentdocs.so
+lib/kde3/kickermenu_remotemenu.la
+lib/kde3/kickermenu_remotemenu.so
+lib/kde3/kickermenu_systemmenu.la
+lib/kde3/kickermenu_systemmenu.so
 lib/kde3/kio_about.la
 lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
 lib/kde3/kio_cgi.so
-lib/kde3/kio_devices.la
-lib/kde3/kio_devices.so
 lib/kde3/kio_filter.la
 lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
@@ -331,8 +360,6 @@ lib/kde3/kio_floppy.la
 lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
 lib/kde3/kio_fonts.so
-lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
 lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
@@ -341,6 +368,8 @@ lib/kde3/kio_mac.la
 lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
 lib/kde3/kio_man.so
+lib/kde3/kio_media.la
+lib/kde3/kio_media.so
 lib/kde3/kio_nfs.la
 lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
@@ -349,6 +378,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_remote.la
+lib/kde3/kio_remote.so
 lib/kde3/kio_settings.la
 lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
@@ -357,10 +388,14 @@ lib/kde3/kio_smb.la
 lib/kde3/kio_smb.so
 lib/kde3/kio_smtp.la
 lib/kde3/kio_smtp.so
+lib/kde3/kio_system.la
+lib/kde3/kio_system.so
 lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
+lib/kde3/kio_trash.la
+lib/kde3/kio_trash.so
 lib/kde3/kjobviewer.la
 lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
@@ -423,6 +458,8 @@ lib/kde3/kwin3_laptop.la
 lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
 lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_plastik.la
+lib/kde3/kwin3_plastik.so
 lib/kde3/kwin3_quartz.la
 lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
@@ -437,6 +474,8 @@ lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
+lib/kde3/kwin_plastik_config.la
+lib/kde3/kwin_plastik_config.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
@@ -453,6 +492,8 @@ lib/kde3/libkfindpart.la
 lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
 lib/kde3/libkfontviewpart.so
+lib/kde3/libkhtmlkttsdplugin.la
+lib/kde3/libkhtmlkttsdplugin.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -465,8 +506,12 @@ lib/kde3/libkurisearchfilter.la
 lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/media_panelapplet.la
+lib/kde3/media_panelapplet.so
 lib/kde3/menu_panelapplet.la
 lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
@@ -489,6 +534,11 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
+lib/kde3/trash_panelapplet.la
+lib/kde3/trash_panelapplet.so
+lib/libkasbar.la
+lib/libkasbar.so
+lib/libkasbar.so.1
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -508,8 +558,6 @@ lib/libkdeinit_kate.la
 lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
 lib/libkdeinit_kcminit.so
-lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
 lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
@@ -604,6 +652,7 @@ share/applications/kde/ioports.desktop
 share/applications/kde/ioslaveinfo.desktop
 share/applications/kde/kappfinder.desktop
 share/applications/kde/kate.desktop
+share/applications/kde/kcm_kdnssd.desktop
 share/applications/kde/kcm_useraccount.desktop
 share/applications/kde/kcmaccess.desktop
 share/applications/kde/kcmcgi.desktop
@@ -617,6 +666,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -632,9 +682,12 @@ share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
+share/applications/kde/khtml_plugins.desktop
+share/applications/kde/kinfocenter.desktop
 share/applications/kde/kjobviewer.desktop
 share/applications/kde/klipper.desktop
 share/applications/kde/kmenuedit.desktop
+share/applications/kde/knetattach.desktop
 share/applications/kde/konqbrowser.desktop
 share/applications/kde/konquerorsu.desktop
 share/applications/kde/konsole.desktop
@@ -656,6 +709,7 @@ share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
 share/applications/kde/nic.desktop
+share/applications/kde/opengl.desktop
 share/applications/kde/panel.desktop
 share/applications/kde/panel_appearance.desktop
 share/applications/kde/partitions.desktop
@@ -672,6 +726,7 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/applnk/.hidden/.directory
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -692,6 +747,7 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
+share/applnk/.hidden/kwintranslucency.desktop
 share/applnk/.hidden/passwords.desktop
 share/applnk/.hidden/power.desktop
 share/applnk/.hidden/randr.desktop
@@ -701,7 +757,6 @@ share/applnk/.hidden/userinfo.desktop
 share/applnk/.hidden/virtualdesktops.desktop
 share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/KControl.desktop
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
@@ -713,7 +768,6 @@ share/applnk/Settingsmenu/printmgr.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/kpersonalizer.desktop
 share/applnk/Toys/ktip.desktop
@@ -800,6 +854,7 @@ share/apps/kappfinder/apps/Graphics/blender.desktop
 share/apps/kappfinder/apps/Graphics/ghostview.desktop
 share/apps/kappfinder/apps/Graphics/gimp.desktop
 share/apps/kappfinder/apps/Graphics/gv.desktop
+share/apps/kappfinder/apps/Graphics/inkscape.desktop
 share/apps/kappfinder/apps/Graphics/sodipodi.desktop
 share/apps/kappfinder/apps/Graphics/tgif.desktop
 share/apps/kappfinder/apps/Graphics/xdvi.desktop
@@ -952,9 +1007,11 @@ share/apps/kate/icons/locolor/22x22/actions/indent.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
 share/apps/kate/plugins/katedefaultproject/ui.rc
+share/apps/kate/plugins/katekttsd/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
 share/apps/kate/tips
+share/apps/katepart/kpartplugins/katepartkttsd.rc
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_browser.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -973,9 +1030,11 @@ share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
 share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
+share/apps/kcmusb/usb.ids
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
+share/apps/kconf_update/kate-2.4.upd
 share/apps/kconf_update/kcmdisplayrc.upd
 share/apps/kconf_update/kfmclient_3_2.upd
 share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -986,6 +1045,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqsidebartng.upd
 share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
@@ -995,14 +1055,20 @@ share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
+share/apps/kconf_update/kwin_focus2.sh
+share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwiniconify.upd
 share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/kwinupdatewindowsettings.upd
 share/apps/kconf_update/move_favicons.sh
+share/apps/kconf_update/move_konqsidebartng_entries.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
 share/apps/kconf_update/schemaStrip.pl
 share/apps/kconf_update/socks.upd
+share/apps/kcontrol/about/kcontrol.css
+share/apps/kcontrol/about/main.html
+share/apps/kcontrol/about/top-right-kcontrol.png
 share/apps/kcontrol/kcontrolui.rc
 share/apps/kcontrol/pics/energybig.png
 share/apps/kcontrol/pics/lo-energy.png
@@ -1011,9 +1077,6 @@ share/apps/kcontrol/pics/mini-world.png
 share/apps/kcontrol/pics/monitor.png
 share/apps/kcontrol/pics/onlyone.png
 share/apps/kcontrol/pics/overlapping.png
-share/apps/kcontrol/pics/part1.png
-share/apps/kcontrol/pics/part2.png
-share/apps/kcontrol/pics/part3.png
 share/apps/kcontrol/pics/play.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1022,25 +1085,42 @@ share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kcontroledit/kcontroleditui.rc
 share/apps/kdcop/kdcopui.rc
-share/apps/kdeprint/template/background.png
+share/apps/kdeprint/template/bar-bottom-left.png
+share/apps/kdeprint/template/bar-bottom-middle.png
+share/apps/kdeprint/template/bar-bottom-right.png
+share/apps/kdeprint/template/bar-middle-left.png
+share/apps/kdeprint/template/bar-middle-right.png
+share/apps/kdeprint/template/bar-top-left.png
+share/apps/kdeprint/template/bar-top-middle.png
+share/apps/kdeprint/template/bar-top-right.png
+share/apps/kdeprint/template/bottom-left.png
+share/apps/kdeprint/template/bottom-middle.png
+share/apps/kdeprint/template/bottom-right.png
+share/apps/kdeprint/template/box-bottom-left.png
+share/apps/kdeprint/template/box-bottom-middle.png
+share/apps/kdeprint/template/box-bottom-right.png
+share/apps/kdeprint/template/box-centre-kdeprint.png
+share/apps/kdeprint/template/box-middle-left.png
+share/apps/kdeprint/template/box-middle-right.png
+share/apps/kdeprint/template/box-top-left.png
+share/apps/kdeprint/template/box-top-middle.png
+share/apps/kdeprint/template/box-top-right.png
 share/apps/kdeprint/template/class.template
 share/apps/kdeprint/template/driver.template
 share/apps/kdeprint/template/htmlstyles.css
 share/apps/kdeprint/template/jobs.template
-share/apps/kdeprint/template/kdelogo2.png
-share/apps/kdeprint/template/kdeprint.png
-share/apps/kdeprint/template/lines.png
-share/apps/kdeprint/template/lines2.png
-share/apps/kdeprint/template/pointers.png
 share/apps/kdeprint/template/printer.template
 share/apps/kdeprint/template/pseudo.template
-share/apps/kdeprint/template/shadow1.png
+share/apps/kdeprint/template/top-left.png
+share/apps/kdeprint/template/top-middle.png
+share/apps/kdeprint/template/top-right-kdeprint.png
 share/apps/kdeprint_part/kdeprint_part.rc
 share/apps/kdeprintfax/anytops
 share/apps/kdeprintfax/faxfilters
 share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
 share/apps/kdeprintfax/kdeprintfaxui.rc
 share/apps/kdesktop/DesktopLinks/Home.desktop
+share/apps/kdesktop/DesktopLinks/System.desktop
 share/apps/kdesktop/directory.autostart
 share/apps/kdesktop/directory.desktop
 share/apps/kdesktop/directory.templates
@@ -1117,8 +1197,9 @@ share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-share/apps/kdm/pics/kdeflower.png
+share/apps/kdm/pics/kdelogo-crystal.png
 share/apps/kdm/pics/kdelogo.png
+share/apps/kdm/pics/shutdown.jpg
 share/apps/kdm/pics/users/Apple.png
 share/apps/kdm/pics/users/BeachBall.png
 share/apps/kdm/pics/users/Blowfish.png
@@ -1197,6 +1278,13 @@ share/apps/kdm/sessions/wm2.desktop
 share/apps/kdm/sessions/wmaker.desktop
 share/apps/kdm/sessions/xfce.desktop
 share/apps/kdm/sessions/xfce4.desktop
+share/apps/kdm/themes/circles/GdmGreeterTheme.desktop
+share/apps/kdm/themes/circles/background.svg
+share/apps/kdm/themes/circles/circles.xml
+share/apps/kdm/themes/circles/flower.png
+share/apps/kdm/themes/circles/help.png
+share/apps/kdm/themes/circles/options.png
+share/apps/kdm/themes/circles/screenshot.png
 share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
@@ -1207,6 +1295,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 share/apps/kfindpart/icons/locolor/22x22/actions/search.png
 share/apps/kfontview/kfontviewpart.rc
+share/apps/kfontview/kfontviewui.rc
 share/apps/khelpcenter/glossary.html.in
 share/apps/khelpcenter/glossary.xslt
 share/apps/khelpcenter/intro.html.in
@@ -1240,14 +1329,20 @@ share/apps/khelpcenter/plugins/links.desktop
 share/apps/khelpcenter/plugins/support.desktop
 share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
+share/apps/khelpcenter/searchhandlers/docbook.desktop
+share/apps/khelpcenter/searchhandlers/htdig.desktop
+share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+share/apps/khelpcenter/searchhandlers/man.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
 share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/apps/khtml/kpartplugins/khtmlkttsd.desktop
+share/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
 share/apps/kicker/applets/ksysguardapplet.desktop
 share/apps/kicker/applets/lockout.desktop
+share/apps/kicker/applets/mediaapplet.desktop
 share/apps/kicker/applets/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
@@ -1255,6 +1350,7 @@ share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/applets/runapplet.desktop
 share/apps/kicker/applets/systemtrayapplet.desktop
 share/apps/kicker/applets/taskbarapplet.desktop
+share/apps/kicker/applets/trashapplet.desktop
 share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
@@ -1271,6 +1367,8 @@ share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
 share/apps/kicker/menuext/recentdocs.desktop
+share/apps/kicker/menuext/remotemenu.desktop
+share/apps/kicker/menuext/systemmenu.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk10.png
 share/apps/kicker/pics/disk2.png
@@ -1416,14 +1514,12 @@ share/apps/konqsidebartng/dirtree/dirtree_module.desktop
 share/apps/konqsidebartng/dirtree/history_module.desktop
 share/apps/konqsidebartng/entries/.version
 share/apps/konqsidebartng/entries/bookmarks.desktop
-share/apps/konqsidebartng/entries/devices.desktop
 share/apps/konqsidebartng/entries/history.desktop
 share/apps/konqsidebartng/entries/home.desktop
 share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
-share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1436,35 +1532,25 @@ share/apps/konqsidebartng/virtual_folders/remote/web/.directory
 share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
+share/apps/konqsidebartng/virtual_folders/services/applications.desktop
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/konqsidebartng/virtual_folders/services/devices.desktop
 share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/konqsidebartng/virtual_folders/services/media.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop
+share/apps/konqsidebartng/virtual_folders/services/settings.desktop
 share/apps/konqsidebartng/websidebar/websidebar.html
-share/apps/konqueror/about/background.png
-share/apps/konqueror/about/background_rtl.png
-share/apps/konqueror/about/bgtable.png
-share/apps/konqueror/about/bgtable_rtl.png
+share/apps/konqueror/about/box-centre-konqueror.png
 share/apps/konqueror/about/intro.html
-share/apps/konqueror/about/intro_rtl.html
-share/apps/konqueror/about/kdelogo2.png
 share/apps/konqueror/about/konq.css
-share/apps/konqueror/about/konq_rtl.css
-share/apps/konqueror/about/konqueror.png
-share/apps/konqueror/about/konqueror_rtl.png
+share/apps/konqueror/about/launch.html
 share/apps/konqueror/about/lightning.png
-share/apps/konqueror/about/lines.png
-share/apps/konqueror/about/lines2.png
-share/apps/konqueror/about/more.png
 share/apps/konqueror/about/plugins.html
 share/apps/konqueror/about/plugins_rtl.html
-share/apps/konqueror/about/pointers.gif
-share/apps/konqueror/about/shadow1.png
 share/apps/konqueror/about/specs.html
-share/apps/konqueror/about/specs_rtl.html
 share/apps/konqueror/about/tips.html
-share/apps/konqueror/about/tips_rtl.html
+share/apps/konqueror/about/top-right-konqueror.png
 share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
@@ -1478,7 +1564,6 @@ share/apps/konqueror/pics/arrow_bottomleft.png
 share/apps/konqueror/pics/arrow_bottomright.png
 share/apps/konqueror/pics/arrow_topleft.png
 share/apps/konqueror/pics/arrow_topright.png
-share/apps/konqueror/pics/indicator_anchor.png
 share/apps/konqueror/pics/indicator_connect.png
 share/apps/konqueror/pics/indicator_empty.png
 share/apps/konqueror/pics/indicator_noconnect.png
@@ -1490,23 +1575,13 @@ share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/simplebrowser
 share/apps/konqueror/profiles/tabbedbrowsing
 share/apps/konqueror/profiles/webbrowsing
-share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
 share/apps/konqueror/servicemenus/installfont.desktop
 share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 share/apps/konqueror/servicemenus/konsolehere.desktop
-share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
+share/apps/konqueror/servicemenus/media_eject.desktop
+share/apps/konqueror/servicemenus/media_mount.desktop
+share/apps/konqueror/servicemenus/media_safelyremove.desktop
+share/apps/konqueror/servicemenus/media_unmount.desktop
 share/apps/konqueror/servicemenus/text-ada-print.desktop
 share/apps/konqueror/servicemenus/text-c++-print.desktop
 share/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1525,8 +1600,6 @@ share/apps/konqueror/servicemenus/text-tcl-print.desktop
 share/apps/konqueror/servicemenus/text-tex-print.desktop
 share/apps/konqueror/servicemenus/text-xml-print.desktop
 share/apps/konqueror/servicemenus/text-xslt-print.desktop
-share/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
 share/apps/konqueror/tiles/bluemorning.png
 share/apps/konqueror/tiles/canvas.png
 share/apps/konqueror/tiles/checker.png
@@ -1573,6 +1646,7 @@ share/apps/konsole/profiles/4shells
 share/apps/konsole/profiles/5shells
 share/apps/konsole/screen.desktop
 share/apps/konsole/shell.desktop
+share/apps/konsole/solaris.keytab
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
 share/apps/konsole/syscolor.schema
@@ -1598,9 +1672,12 @@ share/apps/ksplash/Themes/Default/splash_active_bar.png
 share/apps/ksplash/Themes/Default/splash_bottom.png
 share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 share/apps/ksplash/Themes/Default/splash_top.png
+share/apps/ksplash/Themes/None/Theme.rc
 share/apps/ksplash/Themes/Redmond/Background.png
 share/apps/ksplash/Themes/Redmond/Preview.png
 share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Simple/Preview.png
+share/apps/ksplash/Themes/Simple/Theme.rc
 share/apps/ksplash/Themes/Standard/Preview.png
 share/apps/ksplash/Themes/Standard/Theme.rc
 share/apps/ksplash/Themes/blue-bend/Preview.png
@@ -1626,6 +1703,30 @@ share/apps/ksysguard/pics/shell.png
 share/apps/ksysguard/pics/tools.png
 share/apps/ksysguard/pics/unknownapp.png
 share/apps/ksysguard/pics/waiting.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml
+share/apps/kthememanager/themes/Keramik/Keramik.preview.png
+share/apps/kthememanager/themes/Keramik/Keramik.xml
+share/apps/kthememanager/themes/Plastik/Plastik.preview.png
+share/apps/kthememanager/themes/Plastik/Plastik.xml
+share/apps/kthememanager/themes/Platinum/Platinum.preview.png
+share/apps/kthememanager/themes/Platinum/Platinum.xml
+share/apps/kthememanager/themes/Redmond/Redmond.preview.png
+share/apps/kthememanager/themes/Redmond/Redmond.xml
+share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png
+share/apps/kthememanager/themes/Sunshine/Sunshine.xml
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
 share/apps/kwin/keramik.desktop
@@ -1644,12 +1745,20 @@ share/apps/kwin/pics/menu.png
 share/apps/kwin/pics/pindown.png
 share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
+share/apps/kwin/plastik.desktop
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
+share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/smb-network.desktop
+share/apps/systemview/home.desktop
+share/apps/systemview/media.desktop
+share/apps/systemview/remote.desktop
+share/apps/systemview/settings.desktop
+share/apps/systemview/trash.desktop
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
@@ -1658,15 +1767,20 @@ share/autostart/ktip.desktop
 share/autostart/panel.desktop
 share/config.kcfg/kcm_useraccount.kcfg
 share/config.kcfg/kcm_useraccount_pass.kcfg
+share/config.kcfg/kdesktop.kcfg
+share/config.kcfg/khelpcenter.kcfg
+share/config.kcfg/klaunch.kcfg
 share/config.kcfg/konqueror.kcfg
+share/config.kcfg/kwebdesktop.kcfg
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/taskbar.kcfg
+share/config/katerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
 share/config/kxkb_groups
-share/config/mountwatcher.desktop
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -1689,6 +1803,7 @@ share/desktop-directories/kde-science.directory
 share/desktop-directories/kde-settings-accessibility.directory
 share/desktop-directories/kde-settings-components.directory
 share/desktop-directories/kde-settings-desktop.directory
+share/desktop-directories/kde-settings-hardware.directory
 share/desktop-directories/kde-settings-looknfeel.directory
 share/desktop-directories/kde-settings-network.directory
 share/desktop-directories/kde-settings-peripherals.directory
@@ -1706,6 +1821,7 @@ share/desktop-directories/kde-toys.directory
 share/desktop-directories/kde-unknown.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
+share/doc/HTML/en/kappfinder/man-kappfinder.1.docbook
 share/doc/HTML/en/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1866,6 +1982,9 @@ share/doc/HTML/en/kcontrol/useragent/index.docbook
 share/doc/HTML/en/kcontrol/windowmanagement/common
 share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/en/kdcop/common
+share/doc/HTML/en/kdcop/index.cache.bz2
+share/doc/HTML/en/kdcop/index.docbook
 share/doc/HTML/en/kdebase-apidocs/common
 share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.cache.bz2
@@ -1961,7 +2080,10 @@ share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/HTML/en/khelpcenter/faq/questions.docbook
+share/doc/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
 share/doc/HTML/en/khelpcenter/faq/winmng.docbook
 share/doc/HTML/en/khelpcenter/glossary/checkxrefs
 share/doc/HTML/en/khelpcenter/glossary/common
@@ -1982,20 +2104,84 @@ share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/shadow1.png
 share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/a-window.png
+share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
+share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
+share/doc/HTML/en/khelpcenter/userguide/amarok.png
+share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
 share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook
-share/doc/HTML/en/khelpcenter/userguide/history.docbook
+share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
+share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/en/khelpcenter/userguide/desktop.png
+share/doc/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
+share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
+share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
+share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
+share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/more-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/notices-trademarks.docbook
-share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/staff.docbook
-share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook
+share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
+share/doc/HTML/en/khelpcenter/userguide/juk.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
+share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
+share/doc/HTML/en/khelpcenter/userguide/kmag.png
+share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
+share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
+share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-start.png
+share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
+share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
+share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/kopete.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
+share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
+share/doc/HTML/en/khelpcenter/userguide/noatun.png
+share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
+share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
+share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
+share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
+share/doc/HTML/en/khelpcenter/userguide/rip.png
+share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
+share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
+share/doc/HTML/en/khelpcenter/userguide/services.png
+share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
+share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
+share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
@@ -2056,6 +2242,9 @@ share/doc/HTML/en/kinfocenter/memory/index.docbook
 share/doc/HTML/en/kinfocenter/nics/common
 share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
 share/doc/HTML/en/kinfocenter/nics/index.docbook
+share/doc/HTML/en/kinfocenter/opengl/common
+share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
+share/doc/HTML/en/kinfocenter/opengl/index.docbook
 share/doc/HTML/en/kinfocenter/partitions/common
 share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
 share/doc/HTML/en/kinfocenter/partitions/index.docbook
@@ -2086,7 +2275,6 @@ share/doc/HTML/en/kinfocenter/usb/index.docbook
 share/doc/HTML/en/kinfocenter/xserver/common
 share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
 share/doc/HTML/en/kinfocenter/xserver/index.docbook
-share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
@@ -2144,6 +2332,10 @@ share/doc/HTML/en/kmenuedit/i_paste.png
 share/doc/HTML/en/kmenuedit/icon_sets.png
 share/doc/HTML/en/kmenuedit/index.cache.bz2
 share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/knetattach/common
+share/doc/HTML/en/knetattach/index.cache.bz2
+share/doc/HTML/en/knetattach/index.docbook
+share/doc/HTML/en/knetattach/screenshot.png
 share/doc/HTML/en/konqueror/basics.docbook
 share/doc/HTML/en/konqueror/bookmarks.docbook
 share/doc/HTML/en/konqueror/browser.docbook
@@ -2160,6 +2352,7 @@ share/doc/HTML/en/konqueror/index.cache.bz2
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/introduction.docbook
 share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
 share/doc/HTML/en/konqueror/parts.png
 share/doc/HTML/en/konqueror/path-complete.docbook
 share/doc/HTML/en/konqueror/plugins.docbook
@@ -2171,6 +2364,7 @@ share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/konsole.png
+share/doc/HTML/en/konsole/tabbar.png
 share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
@@ -2203,8 +2397,10 @@ share/icons/crystalsvg/128x128/apps/bell.png
 share/icons/crystalsvg/128x128/apps/cache.png
 share/icons/crystalsvg/128x128/apps/clanbomber.png
 share/icons/crystalsvg/128x128/apps/clock.png
+share/icons/crystalsvg/128x128/apps/colors.png
 share/icons/crystalsvg/128x128/apps/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy.png
 share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
 share/icons/crystalsvg/128x128/apps/fonts.png
@@ -2215,19 +2411,20 @@ share/icons/crystalsvg/128x128/apps/kappfinder.png
 share/icons/crystalsvg/128x128/apps/kate.png
 share/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/icons/crystalsvg/128x128/apps/kcmdf.png
+share/icons/crystalsvg/128x128/apps/kcmkwm.png
 share/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/icons/crystalsvg/128x128/apps/kcmpci.png
 share/icons/crystalsvg/128x128/apps/kcontrol.png
 share/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/icons/crystalsvg/128x128/apps/kdmconfig.png
-share/icons/crystalsvg/128x128/apps/keditbookmarks.png
 share/icons/crystalsvg/128x128/apps/key_bindings.png
 share/icons/crystalsvg/128x128/apps/kfm_home.png
 share/icons/crystalsvg/128x128/apps/khelpcenter.png
 share/icons/crystalsvg/128x128/apps/kjobviewer.png
 share/icons/crystalsvg/128x128/apps/klipper.png
 share/icons/crystalsvg/128x128/apps/kmenu.png
+share/icons/crystalsvg/128x128/apps/knetattach.png
 share/icons/crystalsvg/128x128/apps/konqueror.png
 share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
@@ -2245,6 +2442,7 @@ share/icons/crystalsvg/128x128/apps/multimedia.png
 share/icons/crystalsvg/128x128/apps/netscape.png
 share/icons/crystalsvg/128x128/apps/package.png
 share/icons/crystalsvg/128x128/apps/package_applications.png
+share/icons/crystalsvg/128x128/apps/package_development.png
 share/icons/crystalsvg/128x128/apps/package_favourite.png
 share/icons/crystalsvg/128x128/apps/package_games.png
 share/icons/crystalsvg/128x128/apps/package_multimedia.png
@@ -2291,6 +2489,10 @@ share/icons/crystalsvg/16x16/apps/designer.png
 share/icons/crystalsvg/16x16/apps/dia.png
 share/icons/crystalsvg/16x16/apps/dlgedit.png
 share/icons/crystalsvg/16x16/apps/eclipse.png
+share/icons/crystalsvg/16x16/apps/edu_languages.png
+share/icons/crystalsvg/16x16/apps/edu_mathematics.png
+share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
+share/icons/crystalsvg/16x16/apps/edu_science.png
 share/icons/crystalsvg/16x16/apps/emacs.png
 share/icons/crystalsvg/16x16/apps/email.png
 share/icons/crystalsvg/16x16/apps/energy.png
@@ -2307,7 +2509,6 @@ share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/gnomemeeting.png
 share/icons/crystalsvg/16x16/apps/gnucash.png
 share/icons/crystalsvg/16x16/apps/gnumeric.png
-share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
 share/icons/crystalsvg/16x16/apps/help_index.png
@@ -2346,6 +2547,7 @@ share/icons/crystalsvg/16x16/apps/kjobviewer.png
 share/icons/crystalsvg/16x16/apps/klipper.png
 share/icons/crystalsvg/16x16/apps/kmenu.png
 share/icons/crystalsvg/16x16/apps/kmenuedit.png
+share/icons/crystalsvg/16x16/apps/knetattach.png
 share/icons/crystalsvg/16x16/apps/knotify.png
 share/icons/crystalsvg/16x16/apps/konqueror.png
 share/icons/crystalsvg/16x16/apps/konsole.png
@@ -2412,7 +2614,6 @@ share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
 share/icons/crystalsvg/16x16/apps/scribus.png
 share/icons/crystalsvg/16x16/apps/sodipodi.png
-share/icons/crystalsvg/16x16/apps/soffice.png
 share/icons/crystalsvg/16x16/apps/style.png
 share/icons/crystalsvg/16x16/apps/stylesheet.png
 share/icons/crystalsvg/16x16/apps/terminal.png
@@ -2423,7 +2624,6 @@ share/icons/crystalsvg/16x16/apps/vnc.png
 share/icons/crystalsvg/16x16/apps/wabi.png
 share/icons/crystalsvg/16x16/apps/window_list.png
 share/icons/crystalsvg/16x16/apps/wine.png
-share/icons/crystalsvg/16x16/apps/winprops.png
 share/icons/crystalsvg/16x16/apps/wp.png
 share/icons/crystalsvg/16x16/apps/xcalc.png
 share/icons/crystalsvg/16x16/apps/xchat.png
@@ -2441,18 +2641,54 @@ share/icons/crystalsvg/16x16/apps/xmms.png
 share/icons/crystalsvg/16x16/apps/xosview.png
 share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
-share/icons/crystalsvg/16x16/devices/print_printer.png
-share/icons/crystalsvg/16x16/filesystems/folder_print2.png
 share/icons/crystalsvg/22x22/actions/newfont.png
-share/icons/crystalsvg/22x22/actions/textwaterfall.png
+share/icons/crystalsvg/22x22/apps/access.png
+share/icons/crystalsvg/22x22/apps/agent.png
+share/icons/crystalsvg/22x22/apps/arts.png
+share/icons/crystalsvg/22x22/apps/background.png
+share/icons/crystalsvg/22x22/apps/bell.png
+share/icons/crystalsvg/22x22/apps/cache.png
+share/icons/crystalsvg/22x22/apps/colors.png
+share/icons/crystalsvg/22x22/apps/cookie.png
+share/icons/crystalsvg/22x22/apps/date.png
+share/icons/crystalsvg/22x22/apps/email.png
+share/icons/crystalsvg/22x22/apps/energy.png
+share/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/icons/crystalsvg/22x22/apps/filetypes.png
+share/icons/crystalsvg/22x22/apps/fonts.png
+share/icons/crystalsvg/22x22/apps/hwinfo.png
+share/icons/crystalsvg/22x22/apps/icons.png
+share/icons/crystalsvg/22x22/apps/iconthemes.png
+share/icons/crystalsvg/22x22/apps/kcmdevices.png
+share/icons/crystalsvg/22x22/apps/kcmkicker.png
+share/icons/crystalsvg/22x22/apps/kcmkwm.png
+share/icons/crystalsvg/22x22/apps/kcmx.png
+share/icons/crystalsvg/22x22/apps/kdmconfig.png
+share/icons/crystalsvg/22x22/apps/key_bindings.png
+share/icons/crystalsvg/22x22/apps/keyboard.png
+share/icons/crystalsvg/22x22/apps/kfm.png
+share/icons/crystalsvg/22x22/apps/khelpcenter.png
+share/icons/crystalsvg/22x22/apps/kjobviewer.png
 share/icons/crystalsvg/22x22/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/kmenu.png
+share/icons/crystalsvg/22x22/apps/knetattach.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/konsole.png
+share/icons/crystalsvg/22x22/apps/kscreensaver.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
+share/icons/crystalsvg/22x22/apps/kthememgr.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
+share/icons/crystalsvg/22x22/apps/locale.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/package_development.png
+share/icons/crystalsvg/22x22/apps/personal.png
+share/icons/crystalsvg/22x22/apps/printmgr.png
+share/icons/crystalsvg/22x22/apps/proxy.png
 share/icons/crystalsvg/22x22/apps/randr.png
+share/icons/crystalsvg/22x22/apps/samba.png
+share/icons/crystalsvg/22x22/apps/style.png
+share/icons/crystalsvg/22x22/apps/stylesheet.png
 share/icons/crystalsvg/32x32/actions/newfont.png
-share/icons/crystalsvg/32x32/actions/textwaterfall.png
 share/icons/crystalsvg/32x32/apps/abiword.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
@@ -2475,6 +2711,10 @@ share/icons/crystalsvg/32x32/apps/designer.png
 share/icons/crystalsvg/32x32/apps/dia.png
 share/icons/crystalsvg/32x32/apps/dlgedit.png
 share/icons/crystalsvg/32x32/apps/eclipse.png
+share/icons/crystalsvg/32x32/apps/edu_languages.png
+share/icons/crystalsvg/32x32/apps/edu_mathematics.png
+share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
+share/icons/crystalsvg/32x32/apps/edu_science.png
 share/icons/crystalsvg/32x32/apps/emacs.png
 share/icons/crystalsvg/32x32/apps/email.png
 share/icons/crystalsvg/32x32/apps/energy.png
@@ -2493,7 +2733,6 @@ share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/gnomemeeting.png
 share/icons/crystalsvg/32x32/apps/gnucash.png
 share/icons/crystalsvg/32x32/apps/gnumeric.png
-share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
 share/icons/crystalsvg/32x32/apps/help_index.png
@@ -2505,7 +2744,6 @@ share/icons/crystalsvg/32x32/apps/kappfinder.png
 share/icons/crystalsvg/32x32/apps/kate.png
 share/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
-share/icons/crystalsvg/32x32/apps/kcmfontinst.png
 share/icons/crystalsvg/32x32/apps/kcmkicker.png
 share/icons/crystalsvg/32x32/apps/kcmkwm.png
 share/icons/crystalsvg/32x32/apps/kcmmemory.png
@@ -2528,12 +2766,12 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 share/icons/crystalsvg/32x32/apps/kfind.png
 share/icons/crystalsvg/32x32/apps/kfm.png
 share/icons/crystalsvg/32x32/apps/kfm_home.png
-share/icons/crystalsvg/32x32/apps/kfontview.png
 share/icons/crystalsvg/32x32/apps/khelpcenter.png
 share/icons/crystalsvg/32x32/apps/kjobviewer.png
 share/icons/crystalsvg/32x32/apps/klipper.png
 share/icons/crystalsvg/32x32/apps/kmenu.png
 share/icons/crystalsvg/32x32/apps/kmenuedit.png
+share/icons/crystalsvg/32x32/apps/knetattach.png
 share/icons/crystalsvg/32x32/apps/knotify.png
 share/icons/crystalsvg/32x32/apps/konqueror.png
 share/icons/crystalsvg/32x32/apps/konsole.png
@@ -2565,6 +2803,7 @@ share/icons/crystalsvg/32x32/apps/netscape.png
 share/icons/crystalsvg/32x32/apps/opera.png
 share/icons/crystalsvg/32x32/apps/package.png
 share/icons/crystalsvg/32x32/apps/package_applications.png
+share/icons/crystalsvg/32x32/apps/package_development.png
 share/icons/crystalsvg/32x32/apps/package_editors.png
 share/icons/crystalsvg/32x32/apps/package_edutainment.png
 share/icons/crystalsvg/32x32/apps/package_favourite.png
@@ -2596,7 +2835,6 @@ share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/scribus.png
 share/icons/crystalsvg/32x32/apps/sodipodi.png
-share/icons/crystalsvg/32x32/apps/soffice.png
 share/icons/crystalsvg/32x32/apps/style.png
 share/icons/crystalsvg/32x32/apps/stylesheet.png
 share/icons/crystalsvg/32x32/apps/terminal.png
@@ -2607,7 +2845,6 @@ share/icons/crystalsvg/32x32/apps/vnc.png
 share/icons/crystalsvg/32x32/apps/wabi.png
 share/icons/crystalsvg/32x32/apps/window_list.png
 share/icons/crystalsvg/32x32/apps/wine.png
-share/icons/crystalsvg/32x32/apps/winprops.png
 share/icons/crystalsvg/32x32/apps/wp.png
 share/icons/crystalsvg/32x32/apps/x.png
 share/icons/crystalsvg/32x32/apps/xapp.png
@@ -2628,8 +2865,6 @@ share/icons/crystalsvg/32x32/apps/xmms.png
 share/icons/crystalsvg/32x32/apps/xosview.png
 share/icons/crystalsvg/32x32/apps/xpaint.png
 share/icons/crystalsvg/32x32/apps/xv.png
-share/icons/crystalsvg/32x32/devices/print_printer.png
-share/icons/crystalsvg/32x32/filesystems/folder_print2.png
 share/icons/crystalsvg/48x48/apps/abiword.png
 share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
@@ -2649,6 +2884,10 @@ share/icons/crystalsvg/48x48/apps/date.png
 share/icons/crystalsvg/48x48/apps/designer.png
 share/icons/crystalsvg/48x48/apps/dia.png
 share/icons/crystalsvg/48x48/apps/eclipse.png
+share/icons/crystalsvg/48x48/apps/edu_languages.png
+share/icons/crystalsvg/48x48/apps/edu_mathematics.png
+share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
+share/icons/crystalsvg/48x48/apps/edu_science.png
 share/icons/crystalsvg/48x48/apps/emacs.png
 share/icons/crystalsvg/48x48/apps/email.png
 share/icons/crystalsvg/48x48/apps/energy.png
@@ -2666,7 +2905,6 @@ share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/gnomemeeting.png
 share/icons/crystalsvg/48x48/apps/gnucash.png
 share/icons/crystalsvg/48x48/apps/gnumeric.png
-share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
 share/icons/crystalsvg/48x48/apps/hwinfo.png
@@ -2678,10 +2916,10 @@ share/icons/crystalsvg/48x48/apps/kate.png
 share/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/icons/crystalsvg/48x48/apps/kcmdf.png
 share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
-share/icons/crystalsvg/48x48/apps/kcmfontinst.png
 share/icons/crystalsvg/48x48/apps/kcmkwm.png
 share/icons/crystalsvg/48x48/apps/kcmmemory.png
 share/icons/crystalsvg/48x48/apps/kcmmidi.png
+share/icons/crystalsvg/48x48/apps/kcmopengl.png
 share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
@@ -2699,12 +2937,12 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 share/icons/crystalsvg/48x48/apps/kfind.png
 share/icons/crystalsvg/48x48/apps/kfm.png
 share/icons/crystalsvg/48x48/apps/kfm_home.png
-share/icons/crystalsvg/48x48/apps/kfontview.png
 share/icons/crystalsvg/48x48/apps/khelpcenter.png
 share/icons/crystalsvg/48x48/apps/kjobviewer.png
 share/icons/crystalsvg/48x48/apps/klipper.png
 share/icons/crystalsvg/48x48/apps/kmenu.png
 share/icons/crystalsvg/48x48/apps/kmenuedit.png
+share/icons/crystalsvg/48x48/apps/knetattach.png
 share/icons/crystalsvg/48x48/apps/knotify.png
 share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
@@ -2731,6 +2969,7 @@ share/icons/crystalsvg/48x48/apps/netscape.png
 share/icons/crystalsvg/48x48/apps/opera.png
 share/icons/crystalsvg/48x48/apps/package.png
 share/icons/crystalsvg/48x48/apps/package_applications.png
+share/icons/crystalsvg/48x48/apps/package_development.png
 share/icons/crystalsvg/48x48/apps/package_editors.png
 share/icons/crystalsvg/48x48/apps/package_edutainment.png
 share/icons/crystalsvg/48x48/apps/package_favourite.png
@@ -2760,7 +2999,6 @@ share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/scribus.png
 share/icons/crystalsvg/48x48/apps/sodipodi.png
-share/icons/crystalsvg/48x48/apps/soffice.png
 share/icons/crystalsvg/48x48/apps/staroffice.png
 share/icons/crystalsvg/48x48/apps/style.png
 share/icons/crystalsvg/48x48/apps/stylesheet.png
@@ -2770,7 +3008,6 @@ share/icons/crystalsvg/48x48/apps/usb.png
 share/icons/crystalsvg/48x48/apps/vnc.png
 share/icons/crystalsvg/48x48/apps/window_list.png
 share/icons/crystalsvg/48x48/apps/wine.png
-share/icons/crystalsvg/48x48/apps/winprops.png
 share/icons/crystalsvg/48x48/apps/wmaker_apps.png
 share/icons/crystalsvg/48x48/apps/wp.png
 share/icons/crystalsvg/48x48/apps/xchat.png
@@ -2780,8 +3017,7 @@ share/icons/crystalsvg/48x48/apps/xemacs.png
 share/icons/crystalsvg/48x48/apps/xfmail.png
 share/icons/crystalsvg/48x48/apps/xmag.png
 share/icons/crystalsvg/48x48/apps/xv.png
-share/icons/crystalsvg/48x48/devices/print_printer.png
-share/icons/crystalsvg/48x48/filesystems/folder_print2.png
+share/icons/crystalsvg/64x64/apps/access.png
 share/icons/crystalsvg/64x64/apps/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
 share/icons/crystalsvg/64x64/apps/arts.png
@@ -2790,9 +3026,13 @@ share/icons/crystalsvg/64x64/apps/bell.png
 share/icons/crystalsvg/64x64/apps/cache.png
 share/icons/crystalsvg/64x64/apps/clanbomber.png
 share/icons/crystalsvg/64x64/apps/clock.png
+share/icons/crystalsvg/64x64/apps/colors.png
+share/icons/crystalsvg/64x64/apps/cookie.png
 share/icons/crystalsvg/64x64/apps/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy.png
 share/icons/crystalsvg/64x64/apps/energy_star.png
+share/icons/crystalsvg/64x64/apps/enhanced_browsing.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
 share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
@@ -2804,6 +3044,7 @@ share/icons/crystalsvg/64x64/apps/kappfinder.png
 share/icons/crystalsvg/64x64/apps/kate.png
 share/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/icons/crystalsvg/64x64/apps/kcmdf.png
+share/icons/crystalsvg/64x64/apps/kcmkwm.png
 share/icons/crystalsvg/64x64/apps/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
@@ -2820,6 +3061,7 @@ share/icons/crystalsvg/64x64/apps/khelpcenter.png
 share/icons/crystalsvg/64x64/apps/kjobviewer.png
 share/icons/crystalsvg/64x64/apps/klipper.png
 share/icons/crystalsvg/64x64/apps/kmenu.png
+share/icons/crystalsvg/64x64/apps/knetattach.png
 share/icons/crystalsvg/64x64/apps/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
@@ -2840,6 +3082,7 @@ share/icons/crystalsvg/64x64/apps/nedit.png
 share/icons/crystalsvg/64x64/apps/netscape.png
 share/icons/crystalsvg/64x64/apps/package.png
 share/icons/crystalsvg/64x64/apps/package_applications.png
+share/icons/crystalsvg/64x64/apps/package_development.png
 share/icons/crystalsvg/64x64/apps/package_favourite.png
 share/icons/crystalsvg/64x64/apps/package_games.png
 share/icons/crystalsvg/64x64/apps/package_multimedia.png
@@ -2865,17 +3108,13 @@ share/icons/crystalsvg/64x64/apps/wp.png
 share/icons/crystalsvg/64x64/apps/xclock.png
 share/icons/crystalsvg/64x64/apps/xfmail.png
 share/icons/crystalsvg/64x64/apps/xmag.png
-share/icons/crystalsvg/64x64/devices/print_printer.png
 share/icons/crystalsvg/scalable/apps/access.svgz
 share/icons/crystalsvg/scalable/apps/acroread.svgz
 share/icons/crystalsvg/scalable/apps/aim.svgz
 share/icons/crystalsvg/scalable/apps/aktion.svgz
 share/icons/crystalsvg/scalable/apps/antivirus.svgz
 share/icons/crystalsvg/scalable/apps/applixware.svgz
-share/icons/crystalsvg/scalable/apps/ark.svgz
 share/icons/crystalsvg/scalable/apps/arts.svgz
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svgz
 share/icons/crystalsvg/scalable/apps/background.svgz
 share/icons/crystalsvg/scalable/apps/bell.svgz
 share/icons/crystalsvg/scalable/apps/browser.svgz
@@ -2894,48 +3133,41 @@ share/icons/crystalsvg/scalable/apps/error.svgz
 share/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/icons/crystalsvg/scalable/apps/fonts.svgz
 share/icons/crystalsvg/scalable/apps/galeon.svgz
-share/icons/crystalsvg/scalable/apps/gnome/apps.svgz
-share/icons/crystalsvg/scalable/apps/go.svgz
-share/icons/crystalsvg/scalable/apps/harddrive.svgz
+share/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/icons/crystalsvg/scalable/apps/hardware.svgz
 share/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/icons/crystalsvg/scalable/apps/karbon14.svgz
-share/icons/crystalsvg/scalable/apps/kate.svgz
-share/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/icons/crystalsvg/scalable/apps/kate2.svgz
 share/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+share/icons/crystalsvg/scalable/apps/kcmx.svgz
 share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/icons/crystalsvg/scalable/apps/kdict.svgz
-share/icons/crystalsvg/scalable/apps/kdvi.svgz
 share/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz
+share/icons/crystalsvg/scalable/apps/kjobviewer.svgz
 share/icons/crystalsvg/scalable/apps/klipper.svgz
-share/icons/crystalsvg/scalable/apps/kmail.svgz
+share/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/icons/crystalsvg/scalable/apps/knetattach.svgz
 share/icons/crystalsvg/scalable/apps/konqueror.svgz
 share/icons/crystalsvg/scalable/apps/konsole.svgz
-share/icons/crystalsvg/scalable/apps/kopete.svgz
-share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
-share/icons/crystalsvg/scalable/apps/kwrite.svgz
+share/icons/crystalsvg/scalable/apps/ktip.svgz
+share/icons/crystalsvg/scalable/apps/kwrite2.svgz
 share/icons/crystalsvg/scalable/apps/locale.svgz
-share/icons/crystalsvg/scalable/apps/mail.svgz
 share/icons/crystalsvg/scalable/apps/my_mac.svgz
-share/icons/crystalsvg/scalable/apps/mycomputer.svgz
 share/icons/crystalsvg/scalable/apps/netscape.svgz
 share/icons/crystalsvg/scalable/apps/openoffice.svgz
+share/icons/crystalsvg/scalable/apps/package_development.svgz
 share/icons/crystalsvg/scalable/apps/package_toys.svgz
-share/icons/crystalsvg/scalable/apps/package_utilities.svgz
 share/icons/crystalsvg/scalable/apps/penguin.svgz
+share/icons/crystalsvg/scalable/apps/personal.svgz
+share/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/icons/crystalsvg/scalable/apps/samba.svgz
 share/icons/crystalsvg/scalable/apps/shell.svgz
-share/icons/crystalsvg/scalable/apps/soffice.svgz
 share/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/icons/crystalsvg/scalable/apps/stylesheet.svgz
 share/icons/crystalsvg/scalable/apps/terminal.svgz
 share/icons/crystalsvg/scalable/apps/tux.svgz
 share/icons/crystalsvg/scalable/apps/wine.svgz
-share/icons/crystalsvg/scalable/apps/winprops.svgz
 share/icons/crystalsvg/scalable/apps/x.svgz
 share/icons/crystalsvg/scalable/apps/xapp.svgz
 share/icons/crystalsvg/scalable/apps/xcalc.svgz
@@ -2945,8 +3177,6 @@ share/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/icons/crystalsvg/scalable/apps/xpaint.svgz
 share/icons/hicolor/16x16/apps/khotkeys.png
 share/icons/hicolor/32x32/apps/khotkeys.png
-share/icons/locolor/16x16/apps/kcmfontinst.png
-share/icons/locolor/32x32/apps/kcmfontinst.png
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
@@ -3427,24 +3657,34 @@ share/mimelnk/application/x-smb-server.desktop
 share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
-share/mimelnk/kdedevice/cdrom_mounted.desktop
-share/mimelnk/kdedevice/cdrom_unmounted.desktop
-share/mimelnk/kdedevice/cdwriter_mounted.desktop
-share/mimelnk/kdedevice/cdwriter_unmounted.desktop
-share/mimelnk/kdedevice/dvd_mounted.desktop
-share/mimelnk/kdedevice/dvd_unmounted.desktop
-share/mimelnk/kdedevice/floppy5_mounted.desktop
-share/mimelnk/kdedevice/floppy5_unmounted.desktop
-share/mimelnk/kdedevice/floppy_mounted.desktop
-share/mimelnk/kdedevice/floppy_unmounted.desktop
-share/mimelnk/kdedevice/hdd_mounted.desktop
-share/mimelnk/kdedevice/hdd_unmounted.desktop
-share/mimelnk/kdedevice/nfs_mounted.desktop
-share/mimelnk/kdedevice/nfs_unmounted.desktop
-share/mimelnk/kdedevice/smb_mounted.desktop
-share/mimelnk/kdedevice/smb_unmounted.desktop
-share/mimelnk/kdedevice/zip_mounted.desktop
-share/mimelnk/kdedevice/zip_unmounted.desktop
+share/mimelnk/inode/system_directory.desktop
+share/mimelnk/media/audiocd.desktop
+share/mimelnk/media/blankcd.desktop
+share/mimelnk/media/blankdvd.desktop
+share/mimelnk/media/cdrom_mounted.desktop
+share/mimelnk/media/cdrom_unmounted.desktop
+share/mimelnk/media/cdwriter_mounted.desktop
+share/mimelnk/media/cdwriter_unmounted.desktop
+share/mimelnk/media/dvd_mounted.desktop
+share/mimelnk/media/dvd_unmounted.desktop
+share/mimelnk/media/dvdvideo.desktop
+share/mimelnk/media/floppy5_mounted.desktop
+share/mimelnk/media/floppy5_unmounted.desktop
+share/mimelnk/media/floppy_mounted.desktop
+share/mimelnk/media/floppy_unmounted.desktop
+share/mimelnk/media/gphoto2camera.desktop
+share/mimelnk/media/hdd_mounted.desktop
+share/mimelnk/media/hdd_unmounted.desktop
+share/mimelnk/media/nfs_mounted.desktop
+share/mimelnk/media/nfs_unmounted.desktop
+share/mimelnk/media/removable_mounted.desktop
+share/mimelnk/media/removable_unmounted.desktop
+share/mimelnk/media/smb_mounted.desktop
+share/mimelnk/media/smb_unmounted.desktop
+share/mimelnk/media/svcd.desktop
+share/mimelnk/media/vcd.desktop
+share/mimelnk/media/zip_mounted.desktop
+share/mimelnk/media/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
 share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
@@ -3453,13 +3693,14 @@ share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
 share/mimelnk/print/printermodel.desktop
 share/services/about.protocol
+share/services/applications.protocol
 share/services/ar.protocol
 share/services/bzip.protocol
 share/services/bzip2.protocol
 share/services/cgi.protocol
 share/services/cursorthumbnail.desktop
-share/services/devices.protocol
 share/services/djvuthumbnail.desktop
+share/services/exrthumbnail.desktop
 share/services/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
@@ -3468,17 +3709,21 @@ share/services/fontthumbnail.desktop
 share/services/gzip.protocol
 share/services/htmlthumbnail.desktop
 share/services/imagethumbnail.desktop
-share/services/imap4.protocol
-share/services/imaps.protocol
 share/services/info.protocol
 share/services/kaccess.desktop
 share/services/katedefaultproject.desktop
+share/services/katekttsd.desktop
 share/services/kded/favicons.desktop
+share/services/kded/khotkeys.desktop
 share/services/kded/konqy_preloader.desktop
 share/services/kded/kwrited.desktop
-share/services/kded/mountwatcher.desktop
+share/services/kded/mediamanager.desktop
+share/services/kded/remotedirnotify.desktop
+share/services/kded/systemdirnotify.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
+share/services/kfile_media.desktop
+share/services/kfile_trash.desktop
 share/services/kfindpart.desktop
 share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
@@ -3491,7 +3736,6 @@ share/services/konq_multicolumnview.desktop
 share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
-share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
@@ -3508,6 +3752,7 @@ share/services/ldaps.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
+share/services/media.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
 share/services/picturethumbnail.desktop
@@ -3516,23 +3761,27 @@ share/services/pop3s.protocol
 share/services/print.protocol
 share/services/printdb.protocol
 share/services/programs.protocol
+share/services/remote.protocol
 share/services/searchproviders/acronym.desktop
 share/services/searchproviders/alexa.desktop
 share/services/searchproviders/alexa_url.desktop
 share/services/searchproviders/alltheweb.desktop
 share/services/searchproviders/altavista.desktop
+share/services/searchproviders/amg.desktop
 share/services/searchproviders/appsy.desktop
 share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/backports.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.desktop
+share/services/searchproviders/cia.desktop
 share/services/searchproviders/citeseer.desktop
 share/services/searchproviders/cpan.desktop
 share/services/searchproviders/ctan.desktop
 share/services/searchproviders/ctan_cat.desktop
 share/services/searchproviders/dbug.desktop
 share/services/searchproviders/de2en.desktop
+share/services/searchproviders/de2fr.desktop
 share/services/searchproviders/deb.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
@@ -3545,10 +3794,12 @@ share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
 share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2de.desktop
 share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freedb.desktop
 share/services/searchproviders/freshmeat.desktop
 share/services/searchproviders/froogle.desktop
+share/services/searchproviders/fsd.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
@@ -3556,6 +3807,7 @@ share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
 share/services/searchproviders/google_news.desktop
 share/services/searchproviders/gracenote.desktop
+share/services/searchproviders/grec.desktop
 share/services/searchproviders/hotbot.desktop
 share/services/searchproviders/hyperdictionary.desktop
 share/services/searchproviders/hyperdictionary_thesaurus.desktop
@@ -3584,6 +3836,8 @@ share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
 share/services/searchproviders/thesaurus.desktop
+share/services/searchproviders/tvtome.desktop
+share/services/searchproviders/uspto.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
@@ -3599,24 +3853,30 @@ share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
+share/services/trash.protocol
+share/services/useragentstrings/firefoxoncurrent.desktop
+share/services/useragentstrings/googlebot.desktop
 share/services/useragentstrings/ie401onwinnt4.desktop
-share/services/useragentstrings/ie45onwinnt5.desktop
 share/services/useragentstrings/ie501onwinnt5.desktop
 share/services/useragentstrings/ie50onppc.desktop
-share/services/useragentstrings/ie50onwin95.desktop
 share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
+share/services/useragentstrings/ie60oncurrent.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
 share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozoncurrent12.desktop
 share/services/useragentstrings/mozoncurrent16.desktop
 share/services/useragentstrings/mozonwin2000.desktop
-share/services/useragentstrings/mozonwinnt4.desktop
+share/services/useragentstrings/mozonwinxp.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
+share/services/useragentstrings/ns71oncurrent.desktop
+share/services/useragentstrings/ns71onwinnt51.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/op75oncurrent.desktop
 share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
@@ -3645,6 +3905,8 @@ share/sounds/KDE_Beep_Connect.wav
 share/sounds/KDE_Beep_Digital_1.ogg
 share/sounds/KDE_Beep_Digital_2.ogg
 share/sounds/KDE_Beep_Door.wav
+share/sounds/KDE_Beep_Double.ogg
+share/sounds/KDE_Beep_Harsh.ogg
 share/sounds/KDE_Beep_Honk.wav
 share/sounds/KDE_Beep_Lightning.wav
 share/sounds/KDE_Beep_Phone_1.ogg
@@ -3689,6 +3951,7 @@ share/sounds/KDE_Drum_Break.ogg
 share/sounds/KDE_Error.wav
 share/sounds/KDE_Error_1.ogg
 share/sounds/KDE_Error_2.ogg
+share/sounds/KDE_Error_3.ogg
 share/sounds/KDE_Event_1.ogg
 share/sounds/KDE_Event_2.ogg
 share/sounds/KDE_Event_3.ogg
@@ -3766,27 +4029,69 @@ share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
 share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/All-Good-People-1.jpg.desktop
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Blkmarble.jpg.desktop
 share/wallpapers/Chicken-Songs-2.jpg
+share/wallpapers/Chicken-Songs-2.jpg.desktop
 share/wallpapers/Circuit.jpg
+share/wallpapers/Circuit.jpg.desktop
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Foggy1.jpg.desktop
 share/wallpapers/Island-of-Elba.jpg
+share/wallpapers/Island-of-Elba.jpg.desktop
+share/wallpapers/KDE34.png
+share/wallpapers/KDE34.png.desktop
 share/wallpapers/Marble01.jpg
+share/wallpapers/Marble01.jpg.desktop
 share/wallpapers/No-Ones-Laughing-3.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 share/wallpapers/Paper01.jpg
+share/wallpapers/Paper01.jpg.desktop
 share/wallpapers/Planning-And-Probing-1.jpg
+share/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/wallpapers/Totally-New-Product-1.jpg
+share/wallpapers/Totally-New-Product-1.jpg.desktop
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/wallpapers/andes-venezolanos.svgz
+share/wallpapers/andes-venezolanos.svgz.desktop
+share/wallpapers/aurora.svgz
+share/wallpapers/aurora.svgz.desktop
 share/wallpapers/blue-bend.jpg
+share/wallpapers/blue-bend.jpg.desktop
+share/wallpapers/celtic.svgz
+share/wallpapers/celtic.svgz.desktop
 share/wallpapers/default_blue.jpg
+share/wallpapers/default_blue.jpg.desktop
 share/wallpapers/default_gears.jpg
+share/wallpapers/default_gears.jpg.desktop
 share/wallpapers/fulmine.jpg
+share/wallpapers/fulmine.jpg.desktop
+share/wallpapers/gear-flowers.svgz
+share/wallpapers/gear-flowers.svgz.desktop
+share/wallpapers/globe.svgz
+share/wallpapers/globe.svgz.desktop
+share/wallpapers/here-gear.svgz
+share/wallpapers/here-gear.svgz.desktop
 share/wallpapers/kde_box.png
+share/wallpapers/kde_box.png.desktop
 share/wallpapers/kde_passion.jpg
+share/wallpapers/kde_passion.jpg.desktop
+share/wallpapers/konqui.svgz
+share/wallpapers/konqui.svgz.desktop
+share/wallpapers/lineart.svgz
+share/wallpapers/lineart.svgz.desktop
+share/wallpapers/moon.svgz
+share/wallpapers/moon.svgz.desktop
 share/wallpapers/only_k.jpg
+share/wallpapers/only_k.jpg.desktop
 share/wallpapers/seaofconero.jpg
+share/wallpapers/seaofconero.jpg.desktop
 share/wallpapers/triplegears.jpg
+share/wallpapers/triplegears.jpg.desktop
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@@ -3795,19 +4100,15 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/templates/.source/emptydir
 @dirrm share/mimelnk/print
-@dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/media
 @dirrm share/mimelnk/fonts
 @dirrm share/locale/l10n/zw
 @dirrm share/locale/l10n/zm
@@ -4036,7 +4337,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/crystalsvg/scalable/apps/gnome
+@dirrm share/fonts/override
+@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4045,6 +4347,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
+@dirrm share/doc/HTML/en/knetattach
 @dirrm share/doc/HTML/en/kmenuedit
 @dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kioslave
@@ -4058,6 +4361,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kinfocenter/pcmcia
 @dirrm share/doc/HTML/en/kinfocenter/pci
 @dirrm share/doc/HTML/en/kinfocenter/partitions
+@dirrm share/doc/HTML/en/kinfocenter/opengl
 @dirrm share/doc/HTML/en/kinfocenter/nics
 @dirrm share/doc/HTML/en/kinfocenter/memory
 @dirrm share/doc/HTML/en/kinfocenter/ioports
@@ -4083,12 +4387,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate
 @dirrm share/doc/HTML/en/kdebase-apidocs
+@dirrm share/doc/HTML/en/kdcop
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
 @dirrm share/doc/HTML/en/kcontrol/spellchecking
@@ -4134,16 +4436,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
 @dirrm share/doc/HTML/en/kate
+@dirrm share/doc/HTML/en/kappfinder
 @dirrm share/desktop-directories
+@dirrm share/apps/systemview
+@dirrm share/apps/remoteview
+@dirrm share/apps/plugin
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
+@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
+@dirrm share/apps/kthememanager/themes/YellowOnBlue
+@dirrm share/apps/kthememanager/themes/Sunshine
+@dirrm share/apps/kthememanager/themes/Redmond
+@dirrm share/apps/kthememanager/themes/Platinum
+@dirrm share/apps/kthememanager/themes/Plastik
+@dirrm share/apps/kthememanager/themes/Keramik
+@dirrm share/apps/kthememanager/themes/KDE_Classic
+@dirrm share/apps/kthememanager/themes/HighContrastLight-big
+@dirrm share/apps/kthememanager/themes/HighContrastLight
+@dirrm share/apps/kthememanager/themes/HighContrastDark-big
+@dirrm share/apps/kthememanager/themes/HighContrastDark
+@dirrm share/apps/kthememanager/themes
+@dirrm share/apps/kthememanager
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash/Themes/blue-bend
 @dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Simple
 @dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/None
 @dirrm share/apps/ksplash/Themes/Default/locolor
 @dirrm share/apps/ksplash/Themes/Default
 @dirrm share/apps/ksplash/Themes
@@ -4197,7 +4519,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
+@dirrm share/apps/khtml/kpartplugins
 @dirrm share/apps/khotkeys
+@dirrm share/apps/khelpcenter/searchhandlers/htdig
+@dirrm share/apps/khelpcenter/searchhandlers
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
@@ -4209,6 +4534,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/themes/circles
+@dirrm share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
@@ -4237,7 +4564,9 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcontroledit/icons
 @dirrm share/apps/kcontroledit
 @dirrm share/apps/kcontrol/pics
+@dirrm share/apps/kcontrol/about
 @dirrm share/apps/kcontrol
+@dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
 @dirrm share/apps/kcmkeys
@@ -4245,6 +4574,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
+@dirrm share/apps/katepart/kpartplugins
+@dirrm share/apps/kate/plugins/katekttsd
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index fdbd9bfc5636..4679a2d4d220 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,13 +18,16 @@ COMMENT=	Basic applications for the KDE system
 
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient \
+		usb:${PORTSDIR}/devel/libusb
 
-CONFLICTS=	kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.*
+CONFLICTS=	kdelibs-3.[0-3]* kdeutils-3.[0-2]*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
+USE_GETOPT_LONG=yes
 USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,8 +40,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-DO_NOT_COMPILE=	nsplugins
-CONFIGURE_ENV+=	RUN_KAPPFINDER=no
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -49,10 +50,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index a1ad17ecaaad..7a5b5d02fcce 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
-SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
+MD5 (KDE/kdebase-3.4.0.tar.bz2) = c88659e558ca98dc45377bf8ddfc26c9
+SIZE (KDE/kdebase-3.4.0.tar.bz2) = 22670772
diff --git a/x11/kde4-runtime/files/patch-kcontrol-nics-nic.cpp b/x11/kde4-runtime/files/patch-kcontrol-nics-nic.cpp
deleted file mode 100644
index e11c3de5032a..000000000000
--- a/x11/kde4-runtime/files/patch-kcontrol-nics-nic.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kcontrol/nics/nic.cpp	15 Nov 2003 22:01:05 -0000	1.24
-+++ kcontrol/nics/nic.cpp	21 Jan 2004 13:38:46 -0000
-@@ -229,9 +229,14 @@ NICList* findNICs()
-       tmp->addr = buf;
- 
-       if (ifa->ifa_netmask != NULL) {
-+#ifdef Q_OS_FREEBSD
-+	struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask;
-+	tmp->netmask=inet_ntoa(sinptr->sin_addr);
-+#else
- 	bzero(buf, 128);
- 	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
- 	tmp->netmask = buf;
-+#endif
-       }
- 
-       if (ifa->ifa_flags & IFF_UP)
diff --git a/x11/kde4-runtime/files/patch-kcontrol_konq_previews.cpp b/x11/kde4-runtime/files/patch-kcontrol_konq_previews.cpp
deleted file mode 100644
index 7fe3246c2149..000000000000
--- a/x11/kde4-runtime/files/patch-kcontrol_konq_previews.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcontrol/konq/previews.cpp.orig	Sun Oct 26 11:46:25 2003
-+++ kcontrol/konq/previews.cpp	Thu Jan 27 10:16:32 2005
-@@ -153,6 +153,11 @@
- 
-     for ( ; it.current() ; ++it ) {
-         QString protocol( it.current()->text() );
-+        if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) 
-+          // file should be enabled in case is not defined because if not so 
-+          // than preview's lost when size is changed from default one 
-+          it.current()->setOn( true ); 
-+        else 
-         it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
-     // config key is in bytes (default value 1MB), numinput is in MB
diff --git a/x11/kde4-runtime/files/patch-kdm-backend-xdmcp.c b/x11/kde4-runtime/files/patch-kdm-backend-xdmcp.c
deleted file mode 100644
index be29ec4d3416..000000000000
--- a/x11/kde4-runtime/files/patch-kdm-backend-xdmcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/backend/xdmcp.c.orig	Wed May  8 14:21:31 2002
-+++ kdm/backend/xdmcp.c	Wed Jun 26 20:14:02 2002
-@@ -1012,7 +1012,7 @@
- 
-     sprintf (buf, "Session %ld failed for display %.260s: %s",
- 	     (long) sessionID, name, reason);
--    Debug ("send_failed(%\"s)\n", buf);
-+    Debug ("send_failed(\"%s\")\n", buf);
-     status.length = strlen (buf);
-     status.data = (CARD8Ptr) buf;
-     header.version = XDM_PROTOCOL_VERSION;
diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def b/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def
deleted file mode 100644
index 3776abd3beae..000000000000
--- a/x11/kde4-runtime/files/patch-kdm-kfrontend-config.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/config.def.orig	Thu Nov 11 20:47:50 2004
-+++ kdm/kfrontend/config.def	Thu Nov 11 20:51:18 2004
-@@ -10,7 +10,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
index 4a3ac236fe1d..a6126b314d8e 100644
--- a/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,6 +1,6 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
-@@ -578,7 +578,7 @@
+--- kdm/kfrontend/genkdmconf.c.orig	Wed Feb 23 12:26:01 2005
++++ kdm/kfrontend/genkdmconf.c	Sat Mar 19 16:43:49 2005
+@@ -562,7 +562,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
  "#\n"
@@ -9,7 +9,7 @@
  "\n"
  #ifdef _AIX
  "# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-@@ -619,8 +619,8 @@
+@@ -591,8 +591,8 @@
  "# Reassign ownership of the console to root, this should disallow\n"
  "# assignment of console output to any random users's xterm. See Xstartup.\n"
  "#\n"
@@ -19,8 +19,17 @@
 +/* "#chmod 622 /dev/console\n" */
  "\n"
  #ifdef _AIX
- "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,7 +667,9 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ "  */bash)\n"
+@@ -637,7 +639,9 @@
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
@@ -31,3 +40,232 @@
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
  "    [ -f /etc/profile ] && . /etc/profile\n"
+@@ -648,7 +652,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ "  \"\")\n"
+ "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ "    ;;\n"
+@@ -662,10 +666,10 @@
+ "    exec " KDE_BINDIR "/startkde\n"
+ "    ;;\n"
+ "  *)\n"
+-"    eval exec \"$1\"\n"
++"    eval exec \"$session\"\n"
+ "    ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +821,7 @@
+  * XXX this stuff is highly borked. it does not handle collisions at all.
+  */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ 	const char *tptr;
+ 	char *nname;
+@@ -840,12 +844,7 @@
+ 		fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ 		rt = 0;
+ 	} else {
+-		char *nbuf;
+-		int nlen;
+-
+-		if (!proc || !proc( &file, &nbuf, &nlen ) ||
+-		    (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+-		{
++		if (!proc || !proc( &file )) {
+ 			if (!use_destdir && !strcmp( ce->value, nname ))
+ 				linkedFile( nname );
+ 			else {
+@@ -855,7 +854,7 @@
+ 				copiedFile( ce->value );
+ 			}
+ 		} else {
+-			WriteOut( nname, mode, 0, nbuf, nlen );
++			WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ 			editedFile( ce->value );
+ 		}
+ 		if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1377,7 @@
+ 
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ 	// XXX remove any login*, chooser*, ... resources
+ 	return 0;
+@@ -1415,15 +1414,14 @@
+ 				paap = pap += 2;
+ 				while (!isspace( *pap ))
+ 					pap++;
+-				for (;;) {
+-					if (*pp++ != '/')
+-						goto no;
+-					for (bpp = pp; *pp != '/'; pp++)
+-						if (isspace( *pp ))
++				if (*pp != '/')
++					break;
++				for (;;)
++					for (bpp = ++pp; *pp != '/'; pp++)
++						if (!*pp || isspace( *pp ))
+ 							goto wbrk;
+-				}
+ 			  wbrk:
+-				if (memcmp( bpp, paap, pap - paap ))
++				if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ 					break;
+ 			} else if (*pap == '\t') {
+ 				pap++;
+@@ -1472,24 +1470,25 @@
+ static int mod_usebg;
+ 
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+-	putval( "UseBackground",
+-	        (delstr( file, "\n"
+-	                 "(\n"
+-	                 "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-	                 "  */kdmdesktop\t&\n"
+-	                 "  echo $! >$PIDFILE\n"
+-	                 "  wait $!\n"
+-	                 "  rm $PIDFILE\n"
+-	                 ")\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "*/kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\n" )) ? "true" : "false" );
+-	return 0;
++	int chg =
++		delstr( file, "\n"
++		        "(\n"
++		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++		        "  */kdmdesktop\t&\n"
++		        "  echo $! >$PIDFILE\n"
++		        "  wait $!\n"
++		        "  rm $PIDFILE\n"
++		        ")\t&\n" ) |
++		delstr( file, "\n"
++		        "*/kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\n" );
++	putval( "UseBackground", chg ? "true" : "false" );
++	return chg;
+ }
+ 
+ static void
+@@ -1515,19 +1514,22 @@
+ }
+ 
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++	int chg1 = 0, chg2 = 0;
++
+ 	if (mod_usebg &&
+-	    !delstr( file, "\n"
++	    (delstr( file, "\n"
+ 	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ 	             "if [[] -f $PIDFILE ] ; then\n"
+ 	             "	   kill `cat $PIDFILE`\n"
+-	             "fi\n" ))
+-		delstr( file, "\n"
+-		        "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-		        "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+-	if (oldver < 0x0203)
+-		putval( "UseSessReg", (
++	             "fi\n" ) ||
++	     delstr( file, "\n"
++	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++		chg1 = 1;
++	if (oldver < 0x0203) {
++		chg2 = 
+ #ifdef _AIX
+ 			delstr( file, "\n"
+ "# We create a pseudodevice for finger.  (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1554,11 @@
+ "  else\n"
+ "    exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ "  fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ 			delstr( file, "\n"
+@@ -1564,11 +1566,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+-		 ) ? "true" : "false");
+-	return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++		putval( "UseSessReg", chg2 ? "true" : "false");
++	}
++	return chg1 | chg2;
+ }
+ 
+ static void
+@@ -1592,29 +1595,29 @@
+ }
+ 
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++	return
+ #ifdef _AIX
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ "  devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ "  exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+-	delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++		delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+-	delstr( file, "\n"
++" $USER\n" ) |
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+-	return 0;
+ }
+ 
+ static void
diff --git a/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp
deleted file mode 100644
index 553c411983a7..000000000000
--- a/x11/kde4-runtime/files/patch-konsole-konsole-konsole.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
-+++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
-@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
-     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
-     setSchema(s->schemaNo());
-     tabwidget->setCurrentPage(tabwidget->count()-1);
--      disableMasterModeConnections(); // no duplicate connections, remove old
--      enableMasterModeConnections();
--    }
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    disableMasterModeConnections(); // no duplicate connections, remove old
-+    enableMasterModeConnections();
-+    if(m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+  }
- }
- 
- QString Konsole::currentSession()
-@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
-       rootxpms.remove(s->widget());
-     }
-     delete s->widget();
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    if (m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-   }
-   session2action.remove(s);
-   action2session.remove(ra);
diff --git a/x11/kde4-runtime/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-runtime/files/patch-nsplugins-pluginscan.cpp
new file mode 100644
index 000000000000..55eed7247922
--- /dev/null
+++ b/x11/kde4-runtime/files/patch-nsplugins-pluginscan.cpp
@@ -0,0 +1,10 @@
+--- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
++++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
+@@ -457,6 +457,7 @@
+ 	paths.append("/usr/lib64/netscape/plugins");
+ 	paths.append("/usr/lib64/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/local/lib/linux-flashplugin6");
+         config->writeEntry( "scanPaths", paths );
+     }
+ 
diff --git a/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
deleted file mode 100644
index f31b6341cf9c..000000000000
--- a/x11/kde4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1342.2.14
-diff -u -p -r1.1342.2.14 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
-+++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
-@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
-     QString viewName = view->viewName();
-     kdDebug() << "       - viewName=" << viewName << "   "
-               << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+    // First look for a hostextension containing this frame name
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+      kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+      if (!ext)
-+         continue; // Don't use this window
-+    }
-+
-     if ( !viewName.isEmpty() && viewName == name )
-     {
-       kdDebug() << "found existing view by name: " << view << endl;
-@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
-       return view;
-     }
- 
--    // First look for a hostextension containing this frame name
--    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
--    if ( ext )
--    {
--      ext = ext->findFrameParent(callingPart, name);
--    }
--
- //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 61e591e3cd68..1dabe06f9d62 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -4,11 +4,13 @@ bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kasbar
 bin/kate
 bin/kblankscrn.kss
+bin/kbookmarkmerger
 bin/kcheckpass
+bin/kcheckrunning
 bin/kcminit
-bin/kcmshell
 bin/kcontrol
 bin/kcontroledit
 bin/kdcop
@@ -32,16 +34,21 @@ bin/kfind
 bin/kfmclient
 bin/kfontinst
 bin/kfontview
+bin/khc_docbookdig.pl
+bin/khc_htdig.pl
+bin/khc_htsearch.pl
 bin/khc_indexbuilder
+bin/khc_mansearch.pl
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
 bin/kinfocenter
-bin/kio_devices_mounthelper
+bin/kio_media_mounthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
+bin/knetattach
 bin/konqueror
 bin/konsole
 bin/kpager
@@ -56,11 +63,13 @@ bin/kreadconfig
 bin/krootimage
 bin/ksmserver
 bin/ksplash
+bin/ksplashsimple
 bin/kstart
 bin/ksysguard
 bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
+bin/ktrash
 bin/kwebdesktop
 bin/kwin
 bin/kwin_killer_helper
@@ -68,6 +77,8 @@ bin/kwin_rules_dialog
 bin/kwrite
 bin/kwriteconfig
 bin/kxkb
+bin/nspluginscan
+bin/nspluginviewer
 bin/startkde
 etc/ksysguarddrc
 etc/rc.d/genkdmconf.sh
@@ -107,6 +118,7 @@ include/konq_dirpart.h
 include/konq_drag.h
 include/konq_events.h
 include/konq_faviconmgr.h
+include/konq_filetip.h
 include/konq_historycomm.h
 include/konq_historymgr.h
 include/konq_iconviewwidget.h
@@ -119,7 +131,6 @@ include/konq_undo.h
 include/konq_xmlguiclient.h
 include/konqbookmarkmanager.h
 include/konqsidebarplugin.h
-include/ksgrd/ColorPicker.h
 include/ksgrd/HostConnector.h
 include/ksgrd/SensorAgent.h
 include/ksgrd/SensorClient.h
@@ -135,22 +146,22 @@ include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
+include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/kicker-3.4-reverseLayout
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
-lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
 lib/kde3/cursorthumbnail.so
-lib/kde3/devices_panelapplet.la
-lib/kde3/devices_panelapplet.so
 lib/kde3/djvuthumbnail.la
 lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
 lib/kde3/dockbar_panelextension.so
+lib/kde3/exrthumbnail.la
+lib/kde3/exrthumbnail.so
 lib/kde3/extensionproxy.la
 lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
@@ -211,6 +222,8 @@ lib/kde3/kcm_kded.la
 lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
 lib/kde3/kcm_kdm.so
+lib/kde3/kcm_kdnssd.la
+lib/kde3/kcm_kdnssd.so
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keyboard.so
 lib/kde3/kcm_keys.la
@@ -247,6 +260,8 @@ lib/kde3/kcm_locale.la
 lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
 lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
@@ -267,36 +282,48 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
+lib/kde3/kcm_usb.la
+lib/kde3/kcm_usb.so
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
 lib/kde3/kcminit.so
-lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
 lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
 lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_khotkeys.la
+lib/kde3/kded_khotkeys.so
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_kwrited.so
-lib/kde3/kded_mountwatcher.la
-lib/kde3/kded_mountwatcher.so
+lib/kde3/kded_mediamanager.la
+lib/kde3/kded_mediamanager.so
+lib/kde3/kded_remotedirnotify.la
+lib/kde3/kded_remotedirnotify.so
+lib/kde3/kded_systemdirnotify.la
+lib/kde3/kded_systemdirnotify.so
 lib/kde3/kdesktop.la
 lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
 lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
 lib/kde3/kfile_font.so
+lib/kde3/kfile_media.la
+lib/kde3/kfile_media.so
+lib/kde3/kfile_trash.la
+lib/kde3/kfile_trash.so
 lib/kde3/kfmclient.la
 lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_classic.so
+lib/kde3/kgreet_winbind.la
+lib/kde3/kgreet_winbind.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
@@ -315,12 +342,14 @@ lib/kde3/kickermenu_prefmenu.la
 lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
 lib/kde3/kickermenu_recentdocs.so
+lib/kde3/kickermenu_remotemenu.la
+lib/kde3/kickermenu_remotemenu.so
+lib/kde3/kickermenu_systemmenu.la
+lib/kde3/kickermenu_systemmenu.so
 lib/kde3/kio_about.la
 lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
 lib/kde3/kio_cgi.so
-lib/kde3/kio_devices.la
-lib/kde3/kio_devices.so
 lib/kde3/kio_filter.la
 lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
@@ -331,8 +360,6 @@ lib/kde3/kio_floppy.la
 lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
 lib/kde3/kio_fonts.so
-lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
 lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
@@ -341,6 +368,8 @@ lib/kde3/kio_mac.la
 lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
 lib/kde3/kio_man.so
+lib/kde3/kio_media.la
+lib/kde3/kio_media.so
 lib/kde3/kio_nfs.la
 lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
@@ -349,6 +378,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_remote.la
+lib/kde3/kio_remote.so
 lib/kde3/kio_settings.la
 lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
@@ -357,10 +388,14 @@ lib/kde3/kio_smb.la
 lib/kde3/kio_smb.so
 lib/kde3/kio_smtp.la
 lib/kde3/kio_smtp.so
+lib/kde3/kio_system.la
+lib/kde3/kio_system.so
 lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
+lib/kde3/kio_trash.la
+lib/kde3/kio_trash.so
 lib/kde3/kjobviewer.la
 lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
@@ -423,6 +458,8 @@ lib/kde3/kwin3_laptop.la
 lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
 lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_plastik.la
+lib/kde3/kwin3_plastik.so
 lib/kde3/kwin3_quartz.la
 lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
@@ -437,6 +474,8 @@ lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
+lib/kde3/kwin_plastik_config.la
+lib/kde3/kwin_plastik_config.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
@@ -453,6 +492,8 @@ lib/kde3/libkfindpart.la
 lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
 lib/kde3/libkfontviewpart.so
+lib/kde3/libkhtmlkttsdplugin.la
+lib/kde3/libkhtmlkttsdplugin.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -465,8 +506,12 @@ lib/kde3/libkurisearchfilter.la
 lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/media_panelapplet.la
+lib/kde3/media_panelapplet.so
 lib/kde3/menu_panelapplet.la
 lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
@@ -489,6 +534,11 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
+lib/kde3/trash_panelapplet.la
+lib/kde3/trash_panelapplet.so
+lib/libkasbar.la
+lib/libkasbar.so
+lib/libkasbar.so.1
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -508,8 +558,6 @@ lib/libkdeinit_kate.la
 lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
 lib/libkdeinit_kcminit.so
-lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
 lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
@@ -604,6 +652,7 @@ share/applications/kde/ioports.desktop
 share/applications/kde/ioslaveinfo.desktop
 share/applications/kde/kappfinder.desktop
 share/applications/kde/kate.desktop
+share/applications/kde/kcm_kdnssd.desktop
 share/applications/kde/kcm_useraccount.desktop
 share/applications/kde/kcmaccess.desktop
 share/applications/kde/kcmcgi.desktop
@@ -617,6 +666,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -632,9 +682,12 @@ share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
+share/applications/kde/khtml_plugins.desktop
+share/applications/kde/kinfocenter.desktop
 share/applications/kde/kjobviewer.desktop
 share/applications/kde/klipper.desktop
 share/applications/kde/kmenuedit.desktop
+share/applications/kde/knetattach.desktop
 share/applications/kde/konqbrowser.desktop
 share/applications/kde/konquerorsu.desktop
 share/applications/kde/konsole.desktop
@@ -656,6 +709,7 @@ share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
 share/applications/kde/nic.desktop
+share/applications/kde/opengl.desktop
 share/applications/kde/panel.desktop
 share/applications/kde/panel_appearance.desktop
 share/applications/kde/partitions.desktop
@@ -672,6 +726,7 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/applnk/.hidden/.directory
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -692,6 +747,7 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
+share/applnk/.hidden/kwintranslucency.desktop
 share/applnk/.hidden/passwords.desktop
 share/applnk/.hidden/power.desktop
 share/applnk/.hidden/randr.desktop
@@ -701,7 +757,6 @@ share/applnk/.hidden/userinfo.desktop
 share/applnk/.hidden/virtualdesktops.desktop
 share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/KControl.desktop
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
@@ -713,7 +768,6 @@ share/applnk/Settingsmenu/printmgr.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/kpersonalizer.desktop
 share/applnk/Toys/ktip.desktop
@@ -800,6 +854,7 @@ share/apps/kappfinder/apps/Graphics/blender.desktop
 share/apps/kappfinder/apps/Graphics/ghostview.desktop
 share/apps/kappfinder/apps/Graphics/gimp.desktop
 share/apps/kappfinder/apps/Graphics/gv.desktop
+share/apps/kappfinder/apps/Graphics/inkscape.desktop
 share/apps/kappfinder/apps/Graphics/sodipodi.desktop
 share/apps/kappfinder/apps/Graphics/tgif.desktop
 share/apps/kappfinder/apps/Graphics/xdvi.desktop
@@ -952,9 +1007,11 @@ share/apps/kate/icons/locolor/22x22/actions/indent.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
 share/apps/kate/plugins/katedefaultproject/ui.rc
+share/apps/kate/plugins/katekttsd/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
 share/apps/kate/tips
+share/apps/katepart/kpartplugins/katepartkttsd.rc
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_browser.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -973,9 +1030,11 @@ share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
 share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
+share/apps/kcmusb/usb.ids
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
+share/apps/kconf_update/kate-2.4.upd
 share/apps/kconf_update/kcmdisplayrc.upd
 share/apps/kconf_update/kfmclient_3_2.upd
 share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -986,6 +1045,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqsidebartng.upd
 share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
@@ -995,14 +1055,20 @@ share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
+share/apps/kconf_update/kwin_focus2.sh
+share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwiniconify.upd
 share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/kwinupdatewindowsettings.upd
 share/apps/kconf_update/move_favicons.sh
+share/apps/kconf_update/move_konqsidebartng_entries.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
 share/apps/kconf_update/schemaStrip.pl
 share/apps/kconf_update/socks.upd
+share/apps/kcontrol/about/kcontrol.css
+share/apps/kcontrol/about/main.html
+share/apps/kcontrol/about/top-right-kcontrol.png
 share/apps/kcontrol/kcontrolui.rc
 share/apps/kcontrol/pics/energybig.png
 share/apps/kcontrol/pics/lo-energy.png
@@ -1011,9 +1077,6 @@ share/apps/kcontrol/pics/mini-world.png
 share/apps/kcontrol/pics/monitor.png
 share/apps/kcontrol/pics/onlyone.png
 share/apps/kcontrol/pics/overlapping.png
-share/apps/kcontrol/pics/part1.png
-share/apps/kcontrol/pics/part2.png
-share/apps/kcontrol/pics/part3.png
 share/apps/kcontrol/pics/play.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1022,25 +1085,42 @@ share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kcontroledit/kcontroleditui.rc
 share/apps/kdcop/kdcopui.rc
-share/apps/kdeprint/template/background.png
+share/apps/kdeprint/template/bar-bottom-left.png
+share/apps/kdeprint/template/bar-bottom-middle.png
+share/apps/kdeprint/template/bar-bottom-right.png
+share/apps/kdeprint/template/bar-middle-left.png
+share/apps/kdeprint/template/bar-middle-right.png
+share/apps/kdeprint/template/bar-top-left.png
+share/apps/kdeprint/template/bar-top-middle.png
+share/apps/kdeprint/template/bar-top-right.png
+share/apps/kdeprint/template/bottom-left.png
+share/apps/kdeprint/template/bottom-middle.png
+share/apps/kdeprint/template/bottom-right.png
+share/apps/kdeprint/template/box-bottom-left.png
+share/apps/kdeprint/template/box-bottom-middle.png
+share/apps/kdeprint/template/box-bottom-right.png
+share/apps/kdeprint/template/box-centre-kdeprint.png
+share/apps/kdeprint/template/box-middle-left.png
+share/apps/kdeprint/template/box-middle-right.png
+share/apps/kdeprint/template/box-top-left.png
+share/apps/kdeprint/template/box-top-middle.png
+share/apps/kdeprint/template/box-top-right.png
 share/apps/kdeprint/template/class.template
 share/apps/kdeprint/template/driver.template
 share/apps/kdeprint/template/htmlstyles.css
 share/apps/kdeprint/template/jobs.template
-share/apps/kdeprint/template/kdelogo2.png
-share/apps/kdeprint/template/kdeprint.png
-share/apps/kdeprint/template/lines.png
-share/apps/kdeprint/template/lines2.png
-share/apps/kdeprint/template/pointers.png
 share/apps/kdeprint/template/printer.template
 share/apps/kdeprint/template/pseudo.template
-share/apps/kdeprint/template/shadow1.png
+share/apps/kdeprint/template/top-left.png
+share/apps/kdeprint/template/top-middle.png
+share/apps/kdeprint/template/top-right-kdeprint.png
 share/apps/kdeprint_part/kdeprint_part.rc
 share/apps/kdeprintfax/anytops
 share/apps/kdeprintfax/faxfilters
 share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
 share/apps/kdeprintfax/kdeprintfaxui.rc
 share/apps/kdesktop/DesktopLinks/Home.desktop
+share/apps/kdesktop/DesktopLinks/System.desktop
 share/apps/kdesktop/directory.autostart
 share/apps/kdesktop/directory.desktop
 share/apps/kdesktop/directory.templates
@@ -1117,8 +1197,9 @@ share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-share/apps/kdm/pics/kdeflower.png
+share/apps/kdm/pics/kdelogo-crystal.png
 share/apps/kdm/pics/kdelogo.png
+share/apps/kdm/pics/shutdown.jpg
 share/apps/kdm/pics/users/Apple.png
 share/apps/kdm/pics/users/BeachBall.png
 share/apps/kdm/pics/users/Blowfish.png
@@ -1197,6 +1278,13 @@ share/apps/kdm/sessions/wm2.desktop
 share/apps/kdm/sessions/wmaker.desktop
 share/apps/kdm/sessions/xfce.desktop
 share/apps/kdm/sessions/xfce4.desktop
+share/apps/kdm/themes/circles/GdmGreeterTheme.desktop
+share/apps/kdm/themes/circles/background.svg
+share/apps/kdm/themes/circles/circles.xml
+share/apps/kdm/themes/circles/flower.png
+share/apps/kdm/themes/circles/help.png
+share/apps/kdm/themes/circles/options.png
+share/apps/kdm/themes/circles/screenshot.png
 share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
@@ -1207,6 +1295,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 share/apps/kfindpart/icons/locolor/22x22/actions/search.png
 share/apps/kfontview/kfontviewpart.rc
+share/apps/kfontview/kfontviewui.rc
 share/apps/khelpcenter/glossary.html.in
 share/apps/khelpcenter/glossary.xslt
 share/apps/khelpcenter/intro.html.in
@@ -1240,14 +1329,20 @@ share/apps/khelpcenter/plugins/links.desktop
 share/apps/khelpcenter/plugins/support.desktop
 share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
+share/apps/khelpcenter/searchhandlers/docbook.desktop
+share/apps/khelpcenter/searchhandlers/htdig.desktop
+share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+share/apps/khelpcenter/searchhandlers/man.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
 share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/apps/khtml/kpartplugins/khtmlkttsd.desktop
+share/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
 share/apps/kicker/applets/ksysguardapplet.desktop
 share/apps/kicker/applets/lockout.desktop
+share/apps/kicker/applets/mediaapplet.desktop
 share/apps/kicker/applets/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
@@ -1255,6 +1350,7 @@ share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/applets/runapplet.desktop
 share/apps/kicker/applets/systemtrayapplet.desktop
 share/apps/kicker/applets/taskbarapplet.desktop
+share/apps/kicker/applets/trashapplet.desktop
 share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
@@ -1271,6 +1367,8 @@ share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
 share/apps/kicker/menuext/recentdocs.desktop
+share/apps/kicker/menuext/remotemenu.desktop
+share/apps/kicker/menuext/systemmenu.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk10.png
 share/apps/kicker/pics/disk2.png
@@ -1416,14 +1514,12 @@ share/apps/konqsidebartng/dirtree/dirtree_module.desktop
 share/apps/konqsidebartng/dirtree/history_module.desktop
 share/apps/konqsidebartng/entries/.version
 share/apps/konqsidebartng/entries/bookmarks.desktop
-share/apps/konqsidebartng/entries/devices.desktop
 share/apps/konqsidebartng/entries/history.desktop
 share/apps/konqsidebartng/entries/home.desktop
 share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
-share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1436,35 +1532,25 @@ share/apps/konqsidebartng/virtual_folders/remote/web/.directory
 share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
+share/apps/konqsidebartng/virtual_folders/services/applications.desktop
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/konqsidebartng/virtual_folders/services/devices.desktop
 share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/konqsidebartng/virtual_folders/services/media.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop
+share/apps/konqsidebartng/virtual_folders/services/settings.desktop
 share/apps/konqsidebartng/websidebar/websidebar.html
-share/apps/konqueror/about/background.png
-share/apps/konqueror/about/background_rtl.png
-share/apps/konqueror/about/bgtable.png
-share/apps/konqueror/about/bgtable_rtl.png
+share/apps/konqueror/about/box-centre-konqueror.png
 share/apps/konqueror/about/intro.html
-share/apps/konqueror/about/intro_rtl.html
-share/apps/konqueror/about/kdelogo2.png
 share/apps/konqueror/about/konq.css
-share/apps/konqueror/about/konq_rtl.css
-share/apps/konqueror/about/konqueror.png
-share/apps/konqueror/about/konqueror_rtl.png
+share/apps/konqueror/about/launch.html
 share/apps/konqueror/about/lightning.png
-share/apps/konqueror/about/lines.png
-share/apps/konqueror/about/lines2.png
-share/apps/konqueror/about/more.png
 share/apps/konqueror/about/plugins.html
 share/apps/konqueror/about/plugins_rtl.html
-share/apps/konqueror/about/pointers.gif
-share/apps/konqueror/about/shadow1.png
 share/apps/konqueror/about/specs.html
-share/apps/konqueror/about/specs_rtl.html
 share/apps/konqueror/about/tips.html
-share/apps/konqueror/about/tips_rtl.html
+share/apps/konqueror/about/top-right-konqueror.png
 share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
@@ -1478,7 +1564,6 @@ share/apps/konqueror/pics/arrow_bottomleft.png
 share/apps/konqueror/pics/arrow_bottomright.png
 share/apps/konqueror/pics/arrow_topleft.png
 share/apps/konqueror/pics/arrow_topright.png
-share/apps/konqueror/pics/indicator_anchor.png
 share/apps/konqueror/pics/indicator_connect.png
 share/apps/konqueror/pics/indicator_empty.png
 share/apps/konqueror/pics/indicator_noconnect.png
@@ -1490,23 +1575,13 @@ share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/simplebrowser
 share/apps/konqueror/profiles/tabbedbrowsing
 share/apps/konqueror/profiles/webbrowsing
-share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
 share/apps/konqueror/servicemenus/installfont.desktop
 share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 share/apps/konqueror/servicemenus/konsolehere.desktop
-share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
+share/apps/konqueror/servicemenus/media_eject.desktop
+share/apps/konqueror/servicemenus/media_mount.desktop
+share/apps/konqueror/servicemenus/media_safelyremove.desktop
+share/apps/konqueror/servicemenus/media_unmount.desktop
 share/apps/konqueror/servicemenus/text-ada-print.desktop
 share/apps/konqueror/servicemenus/text-c++-print.desktop
 share/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1525,8 +1600,6 @@ share/apps/konqueror/servicemenus/text-tcl-print.desktop
 share/apps/konqueror/servicemenus/text-tex-print.desktop
 share/apps/konqueror/servicemenus/text-xml-print.desktop
 share/apps/konqueror/servicemenus/text-xslt-print.desktop
-share/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
 share/apps/konqueror/tiles/bluemorning.png
 share/apps/konqueror/tiles/canvas.png
 share/apps/konqueror/tiles/checker.png
@@ -1573,6 +1646,7 @@ share/apps/konsole/profiles/4shells
 share/apps/konsole/profiles/5shells
 share/apps/konsole/screen.desktop
 share/apps/konsole/shell.desktop
+share/apps/konsole/solaris.keytab
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
 share/apps/konsole/syscolor.schema
@@ -1598,9 +1672,12 @@ share/apps/ksplash/Themes/Default/splash_active_bar.png
 share/apps/ksplash/Themes/Default/splash_bottom.png
 share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 share/apps/ksplash/Themes/Default/splash_top.png
+share/apps/ksplash/Themes/None/Theme.rc
 share/apps/ksplash/Themes/Redmond/Background.png
 share/apps/ksplash/Themes/Redmond/Preview.png
 share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Simple/Preview.png
+share/apps/ksplash/Themes/Simple/Theme.rc
 share/apps/ksplash/Themes/Standard/Preview.png
 share/apps/ksplash/Themes/Standard/Theme.rc
 share/apps/ksplash/Themes/blue-bend/Preview.png
@@ -1626,6 +1703,30 @@ share/apps/ksysguard/pics/shell.png
 share/apps/ksysguard/pics/tools.png
 share/apps/ksysguard/pics/unknownapp.png
 share/apps/ksysguard/pics/waiting.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml
+share/apps/kthememanager/themes/Keramik/Keramik.preview.png
+share/apps/kthememanager/themes/Keramik/Keramik.xml
+share/apps/kthememanager/themes/Plastik/Plastik.preview.png
+share/apps/kthememanager/themes/Plastik/Plastik.xml
+share/apps/kthememanager/themes/Platinum/Platinum.preview.png
+share/apps/kthememanager/themes/Platinum/Platinum.xml
+share/apps/kthememanager/themes/Redmond/Redmond.preview.png
+share/apps/kthememanager/themes/Redmond/Redmond.xml
+share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png
+share/apps/kthememanager/themes/Sunshine/Sunshine.xml
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
 share/apps/kwin/keramik.desktop
@@ -1644,12 +1745,20 @@ share/apps/kwin/pics/menu.png
 share/apps/kwin/pics/pindown.png
 share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
+share/apps/kwin/plastik.desktop
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
+share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/smb-network.desktop
+share/apps/systemview/home.desktop
+share/apps/systemview/media.desktop
+share/apps/systemview/remote.desktop
+share/apps/systemview/settings.desktop
+share/apps/systemview/trash.desktop
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
@@ -1658,15 +1767,20 @@ share/autostart/ktip.desktop
 share/autostart/panel.desktop
 share/config.kcfg/kcm_useraccount.kcfg
 share/config.kcfg/kcm_useraccount_pass.kcfg
+share/config.kcfg/kdesktop.kcfg
+share/config.kcfg/khelpcenter.kcfg
+share/config.kcfg/klaunch.kcfg
 share/config.kcfg/konqueror.kcfg
+share/config.kcfg/kwebdesktop.kcfg
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/taskbar.kcfg
+share/config/katerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
 share/config/kxkb_groups
-share/config/mountwatcher.desktop
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -1689,6 +1803,7 @@ share/desktop-directories/kde-science.directory
 share/desktop-directories/kde-settings-accessibility.directory
 share/desktop-directories/kde-settings-components.directory
 share/desktop-directories/kde-settings-desktop.directory
+share/desktop-directories/kde-settings-hardware.directory
 share/desktop-directories/kde-settings-looknfeel.directory
 share/desktop-directories/kde-settings-network.directory
 share/desktop-directories/kde-settings-peripherals.directory
@@ -1706,6 +1821,7 @@ share/desktop-directories/kde-toys.directory
 share/desktop-directories/kde-unknown.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
+share/doc/HTML/en/kappfinder/man-kappfinder.1.docbook
 share/doc/HTML/en/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1866,6 +1982,9 @@ share/doc/HTML/en/kcontrol/useragent/index.docbook
 share/doc/HTML/en/kcontrol/windowmanagement/common
 share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/en/kdcop/common
+share/doc/HTML/en/kdcop/index.cache.bz2
+share/doc/HTML/en/kdcop/index.docbook
 share/doc/HTML/en/kdebase-apidocs/common
 share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.cache.bz2
@@ -1961,7 +2080,10 @@ share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/HTML/en/khelpcenter/faq/questions.docbook
+share/doc/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
 share/doc/HTML/en/khelpcenter/faq/winmng.docbook
 share/doc/HTML/en/khelpcenter/glossary/checkxrefs
 share/doc/HTML/en/khelpcenter/glossary/common
@@ -1982,20 +2104,84 @@ share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/shadow1.png
 share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/a-window.png
+share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
+share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
+share/doc/HTML/en/khelpcenter/userguide/amarok.png
+share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
 share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook
-share/doc/HTML/en/khelpcenter/userguide/history.docbook
+share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
+share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/en/khelpcenter/userguide/desktop.png
+share/doc/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
+share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
+share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
+share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
+share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/more-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/notices-trademarks.docbook
-share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/staff.docbook
-share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook
+share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
+share/doc/HTML/en/khelpcenter/userguide/juk.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
+share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
+share/doc/HTML/en/khelpcenter/userguide/kmag.png
+share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
+share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
+share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-start.png
+share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
+share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
+share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/kopete.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
+share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
+share/doc/HTML/en/khelpcenter/userguide/noatun.png
+share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
+share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
+share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
+share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
+share/doc/HTML/en/khelpcenter/userguide/rip.png
+share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
+share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
+share/doc/HTML/en/khelpcenter/userguide/services.png
+share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
+share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
+share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
@@ -2056,6 +2242,9 @@ share/doc/HTML/en/kinfocenter/memory/index.docbook
 share/doc/HTML/en/kinfocenter/nics/common
 share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
 share/doc/HTML/en/kinfocenter/nics/index.docbook
+share/doc/HTML/en/kinfocenter/opengl/common
+share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
+share/doc/HTML/en/kinfocenter/opengl/index.docbook
 share/doc/HTML/en/kinfocenter/partitions/common
 share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
 share/doc/HTML/en/kinfocenter/partitions/index.docbook
@@ -2086,7 +2275,6 @@ share/doc/HTML/en/kinfocenter/usb/index.docbook
 share/doc/HTML/en/kinfocenter/xserver/common
 share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
 share/doc/HTML/en/kinfocenter/xserver/index.docbook
-share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
@@ -2144,6 +2332,10 @@ share/doc/HTML/en/kmenuedit/i_paste.png
 share/doc/HTML/en/kmenuedit/icon_sets.png
 share/doc/HTML/en/kmenuedit/index.cache.bz2
 share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/knetattach/common
+share/doc/HTML/en/knetattach/index.cache.bz2
+share/doc/HTML/en/knetattach/index.docbook
+share/doc/HTML/en/knetattach/screenshot.png
 share/doc/HTML/en/konqueror/basics.docbook
 share/doc/HTML/en/konqueror/bookmarks.docbook
 share/doc/HTML/en/konqueror/browser.docbook
@@ -2160,6 +2352,7 @@ share/doc/HTML/en/konqueror/index.cache.bz2
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/introduction.docbook
 share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
 share/doc/HTML/en/konqueror/parts.png
 share/doc/HTML/en/konqueror/path-complete.docbook
 share/doc/HTML/en/konqueror/plugins.docbook
@@ -2171,6 +2364,7 @@ share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/konsole.png
+share/doc/HTML/en/konsole/tabbar.png
 share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
@@ -2203,8 +2397,10 @@ share/icons/crystalsvg/128x128/apps/bell.png
 share/icons/crystalsvg/128x128/apps/cache.png
 share/icons/crystalsvg/128x128/apps/clanbomber.png
 share/icons/crystalsvg/128x128/apps/clock.png
+share/icons/crystalsvg/128x128/apps/colors.png
 share/icons/crystalsvg/128x128/apps/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy.png
 share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
 share/icons/crystalsvg/128x128/apps/fonts.png
@@ -2215,19 +2411,20 @@ share/icons/crystalsvg/128x128/apps/kappfinder.png
 share/icons/crystalsvg/128x128/apps/kate.png
 share/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/icons/crystalsvg/128x128/apps/kcmdf.png
+share/icons/crystalsvg/128x128/apps/kcmkwm.png
 share/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/icons/crystalsvg/128x128/apps/kcmpci.png
 share/icons/crystalsvg/128x128/apps/kcontrol.png
 share/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/icons/crystalsvg/128x128/apps/kdmconfig.png
-share/icons/crystalsvg/128x128/apps/keditbookmarks.png
 share/icons/crystalsvg/128x128/apps/key_bindings.png
 share/icons/crystalsvg/128x128/apps/kfm_home.png
 share/icons/crystalsvg/128x128/apps/khelpcenter.png
 share/icons/crystalsvg/128x128/apps/kjobviewer.png
 share/icons/crystalsvg/128x128/apps/klipper.png
 share/icons/crystalsvg/128x128/apps/kmenu.png
+share/icons/crystalsvg/128x128/apps/knetattach.png
 share/icons/crystalsvg/128x128/apps/konqueror.png
 share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
@@ -2245,6 +2442,7 @@ share/icons/crystalsvg/128x128/apps/multimedia.png
 share/icons/crystalsvg/128x128/apps/netscape.png
 share/icons/crystalsvg/128x128/apps/package.png
 share/icons/crystalsvg/128x128/apps/package_applications.png
+share/icons/crystalsvg/128x128/apps/package_development.png
 share/icons/crystalsvg/128x128/apps/package_favourite.png
 share/icons/crystalsvg/128x128/apps/package_games.png
 share/icons/crystalsvg/128x128/apps/package_multimedia.png
@@ -2291,6 +2489,10 @@ share/icons/crystalsvg/16x16/apps/designer.png
 share/icons/crystalsvg/16x16/apps/dia.png
 share/icons/crystalsvg/16x16/apps/dlgedit.png
 share/icons/crystalsvg/16x16/apps/eclipse.png
+share/icons/crystalsvg/16x16/apps/edu_languages.png
+share/icons/crystalsvg/16x16/apps/edu_mathematics.png
+share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
+share/icons/crystalsvg/16x16/apps/edu_science.png
 share/icons/crystalsvg/16x16/apps/emacs.png
 share/icons/crystalsvg/16x16/apps/email.png
 share/icons/crystalsvg/16x16/apps/energy.png
@@ -2307,7 +2509,6 @@ share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/gnomemeeting.png
 share/icons/crystalsvg/16x16/apps/gnucash.png
 share/icons/crystalsvg/16x16/apps/gnumeric.png
-share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
 share/icons/crystalsvg/16x16/apps/help_index.png
@@ -2346,6 +2547,7 @@ share/icons/crystalsvg/16x16/apps/kjobviewer.png
 share/icons/crystalsvg/16x16/apps/klipper.png
 share/icons/crystalsvg/16x16/apps/kmenu.png
 share/icons/crystalsvg/16x16/apps/kmenuedit.png
+share/icons/crystalsvg/16x16/apps/knetattach.png
 share/icons/crystalsvg/16x16/apps/knotify.png
 share/icons/crystalsvg/16x16/apps/konqueror.png
 share/icons/crystalsvg/16x16/apps/konsole.png
@@ -2412,7 +2614,6 @@ share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
 share/icons/crystalsvg/16x16/apps/scribus.png
 share/icons/crystalsvg/16x16/apps/sodipodi.png
-share/icons/crystalsvg/16x16/apps/soffice.png
 share/icons/crystalsvg/16x16/apps/style.png
 share/icons/crystalsvg/16x16/apps/stylesheet.png
 share/icons/crystalsvg/16x16/apps/terminal.png
@@ -2423,7 +2624,6 @@ share/icons/crystalsvg/16x16/apps/vnc.png
 share/icons/crystalsvg/16x16/apps/wabi.png
 share/icons/crystalsvg/16x16/apps/window_list.png
 share/icons/crystalsvg/16x16/apps/wine.png
-share/icons/crystalsvg/16x16/apps/winprops.png
 share/icons/crystalsvg/16x16/apps/wp.png
 share/icons/crystalsvg/16x16/apps/xcalc.png
 share/icons/crystalsvg/16x16/apps/xchat.png
@@ -2441,18 +2641,54 @@ share/icons/crystalsvg/16x16/apps/xmms.png
 share/icons/crystalsvg/16x16/apps/xosview.png
 share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
-share/icons/crystalsvg/16x16/devices/print_printer.png
-share/icons/crystalsvg/16x16/filesystems/folder_print2.png
 share/icons/crystalsvg/22x22/actions/newfont.png
-share/icons/crystalsvg/22x22/actions/textwaterfall.png
+share/icons/crystalsvg/22x22/apps/access.png
+share/icons/crystalsvg/22x22/apps/agent.png
+share/icons/crystalsvg/22x22/apps/arts.png
+share/icons/crystalsvg/22x22/apps/background.png
+share/icons/crystalsvg/22x22/apps/bell.png
+share/icons/crystalsvg/22x22/apps/cache.png
+share/icons/crystalsvg/22x22/apps/colors.png
+share/icons/crystalsvg/22x22/apps/cookie.png
+share/icons/crystalsvg/22x22/apps/date.png
+share/icons/crystalsvg/22x22/apps/email.png
+share/icons/crystalsvg/22x22/apps/energy.png
+share/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/icons/crystalsvg/22x22/apps/filetypes.png
+share/icons/crystalsvg/22x22/apps/fonts.png
+share/icons/crystalsvg/22x22/apps/hwinfo.png
+share/icons/crystalsvg/22x22/apps/icons.png
+share/icons/crystalsvg/22x22/apps/iconthemes.png
+share/icons/crystalsvg/22x22/apps/kcmdevices.png
+share/icons/crystalsvg/22x22/apps/kcmkicker.png
+share/icons/crystalsvg/22x22/apps/kcmkwm.png
+share/icons/crystalsvg/22x22/apps/kcmx.png
+share/icons/crystalsvg/22x22/apps/kdmconfig.png
+share/icons/crystalsvg/22x22/apps/key_bindings.png
+share/icons/crystalsvg/22x22/apps/keyboard.png
+share/icons/crystalsvg/22x22/apps/kfm.png
+share/icons/crystalsvg/22x22/apps/khelpcenter.png
+share/icons/crystalsvg/22x22/apps/kjobviewer.png
 share/icons/crystalsvg/22x22/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/kmenu.png
+share/icons/crystalsvg/22x22/apps/knetattach.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/konsole.png
+share/icons/crystalsvg/22x22/apps/kscreensaver.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
+share/icons/crystalsvg/22x22/apps/kthememgr.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
+share/icons/crystalsvg/22x22/apps/locale.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/package_development.png
+share/icons/crystalsvg/22x22/apps/personal.png
+share/icons/crystalsvg/22x22/apps/printmgr.png
+share/icons/crystalsvg/22x22/apps/proxy.png
 share/icons/crystalsvg/22x22/apps/randr.png
+share/icons/crystalsvg/22x22/apps/samba.png
+share/icons/crystalsvg/22x22/apps/style.png
+share/icons/crystalsvg/22x22/apps/stylesheet.png
 share/icons/crystalsvg/32x32/actions/newfont.png
-share/icons/crystalsvg/32x32/actions/textwaterfall.png
 share/icons/crystalsvg/32x32/apps/abiword.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
@@ -2475,6 +2711,10 @@ share/icons/crystalsvg/32x32/apps/designer.png
 share/icons/crystalsvg/32x32/apps/dia.png
 share/icons/crystalsvg/32x32/apps/dlgedit.png
 share/icons/crystalsvg/32x32/apps/eclipse.png
+share/icons/crystalsvg/32x32/apps/edu_languages.png
+share/icons/crystalsvg/32x32/apps/edu_mathematics.png
+share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
+share/icons/crystalsvg/32x32/apps/edu_science.png
 share/icons/crystalsvg/32x32/apps/emacs.png
 share/icons/crystalsvg/32x32/apps/email.png
 share/icons/crystalsvg/32x32/apps/energy.png
@@ -2493,7 +2733,6 @@ share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/gnomemeeting.png
 share/icons/crystalsvg/32x32/apps/gnucash.png
 share/icons/crystalsvg/32x32/apps/gnumeric.png
-share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
 share/icons/crystalsvg/32x32/apps/help_index.png
@@ -2505,7 +2744,6 @@ share/icons/crystalsvg/32x32/apps/kappfinder.png
 share/icons/crystalsvg/32x32/apps/kate.png
 share/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
-share/icons/crystalsvg/32x32/apps/kcmfontinst.png
 share/icons/crystalsvg/32x32/apps/kcmkicker.png
 share/icons/crystalsvg/32x32/apps/kcmkwm.png
 share/icons/crystalsvg/32x32/apps/kcmmemory.png
@@ -2528,12 +2766,12 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 share/icons/crystalsvg/32x32/apps/kfind.png
 share/icons/crystalsvg/32x32/apps/kfm.png
 share/icons/crystalsvg/32x32/apps/kfm_home.png
-share/icons/crystalsvg/32x32/apps/kfontview.png
 share/icons/crystalsvg/32x32/apps/khelpcenter.png
 share/icons/crystalsvg/32x32/apps/kjobviewer.png
 share/icons/crystalsvg/32x32/apps/klipper.png
 share/icons/crystalsvg/32x32/apps/kmenu.png
 share/icons/crystalsvg/32x32/apps/kmenuedit.png
+share/icons/crystalsvg/32x32/apps/knetattach.png
 share/icons/crystalsvg/32x32/apps/knotify.png
 share/icons/crystalsvg/32x32/apps/konqueror.png
 share/icons/crystalsvg/32x32/apps/konsole.png
@@ -2565,6 +2803,7 @@ share/icons/crystalsvg/32x32/apps/netscape.png
 share/icons/crystalsvg/32x32/apps/opera.png
 share/icons/crystalsvg/32x32/apps/package.png
 share/icons/crystalsvg/32x32/apps/package_applications.png
+share/icons/crystalsvg/32x32/apps/package_development.png
 share/icons/crystalsvg/32x32/apps/package_editors.png
 share/icons/crystalsvg/32x32/apps/package_edutainment.png
 share/icons/crystalsvg/32x32/apps/package_favourite.png
@@ -2596,7 +2835,6 @@ share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/scribus.png
 share/icons/crystalsvg/32x32/apps/sodipodi.png
-share/icons/crystalsvg/32x32/apps/soffice.png
 share/icons/crystalsvg/32x32/apps/style.png
 share/icons/crystalsvg/32x32/apps/stylesheet.png
 share/icons/crystalsvg/32x32/apps/terminal.png
@@ -2607,7 +2845,6 @@ share/icons/crystalsvg/32x32/apps/vnc.png
 share/icons/crystalsvg/32x32/apps/wabi.png
 share/icons/crystalsvg/32x32/apps/window_list.png
 share/icons/crystalsvg/32x32/apps/wine.png
-share/icons/crystalsvg/32x32/apps/winprops.png
 share/icons/crystalsvg/32x32/apps/wp.png
 share/icons/crystalsvg/32x32/apps/x.png
 share/icons/crystalsvg/32x32/apps/xapp.png
@@ -2628,8 +2865,6 @@ share/icons/crystalsvg/32x32/apps/xmms.png
 share/icons/crystalsvg/32x32/apps/xosview.png
 share/icons/crystalsvg/32x32/apps/xpaint.png
 share/icons/crystalsvg/32x32/apps/xv.png
-share/icons/crystalsvg/32x32/devices/print_printer.png
-share/icons/crystalsvg/32x32/filesystems/folder_print2.png
 share/icons/crystalsvg/48x48/apps/abiword.png
 share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
@@ -2649,6 +2884,10 @@ share/icons/crystalsvg/48x48/apps/date.png
 share/icons/crystalsvg/48x48/apps/designer.png
 share/icons/crystalsvg/48x48/apps/dia.png
 share/icons/crystalsvg/48x48/apps/eclipse.png
+share/icons/crystalsvg/48x48/apps/edu_languages.png
+share/icons/crystalsvg/48x48/apps/edu_mathematics.png
+share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
+share/icons/crystalsvg/48x48/apps/edu_science.png
 share/icons/crystalsvg/48x48/apps/emacs.png
 share/icons/crystalsvg/48x48/apps/email.png
 share/icons/crystalsvg/48x48/apps/energy.png
@@ -2666,7 +2905,6 @@ share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/gnomemeeting.png
 share/icons/crystalsvg/48x48/apps/gnucash.png
 share/icons/crystalsvg/48x48/apps/gnumeric.png
-share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
 share/icons/crystalsvg/48x48/apps/hwinfo.png
@@ -2678,10 +2916,10 @@ share/icons/crystalsvg/48x48/apps/kate.png
 share/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/icons/crystalsvg/48x48/apps/kcmdf.png
 share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
-share/icons/crystalsvg/48x48/apps/kcmfontinst.png
 share/icons/crystalsvg/48x48/apps/kcmkwm.png
 share/icons/crystalsvg/48x48/apps/kcmmemory.png
 share/icons/crystalsvg/48x48/apps/kcmmidi.png
+share/icons/crystalsvg/48x48/apps/kcmopengl.png
 share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
@@ -2699,12 +2937,12 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 share/icons/crystalsvg/48x48/apps/kfind.png
 share/icons/crystalsvg/48x48/apps/kfm.png
 share/icons/crystalsvg/48x48/apps/kfm_home.png
-share/icons/crystalsvg/48x48/apps/kfontview.png
 share/icons/crystalsvg/48x48/apps/khelpcenter.png
 share/icons/crystalsvg/48x48/apps/kjobviewer.png
 share/icons/crystalsvg/48x48/apps/klipper.png
 share/icons/crystalsvg/48x48/apps/kmenu.png
 share/icons/crystalsvg/48x48/apps/kmenuedit.png
+share/icons/crystalsvg/48x48/apps/knetattach.png
 share/icons/crystalsvg/48x48/apps/knotify.png
 share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
@@ -2731,6 +2969,7 @@ share/icons/crystalsvg/48x48/apps/netscape.png
 share/icons/crystalsvg/48x48/apps/opera.png
 share/icons/crystalsvg/48x48/apps/package.png
 share/icons/crystalsvg/48x48/apps/package_applications.png
+share/icons/crystalsvg/48x48/apps/package_development.png
 share/icons/crystalsvg/48x48/apps/package_editors.png
 share/icons/crystalsvg/48x48/apps/package_edutainment.png
 share/icons/crystalsvg/48x48/apps/package_favourite.png
@@ -2760,7 +2999,6 @@ share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/scribus.png
 share/icons/crystalsvg/48x48/apps/sodipodi.png
-share/icons/crystalsvg/48x48/apps/soffice.png
 share/icons/crystalsvg/48x48/apps/staroffice.png
 share/icons/crystalsvg/48x48/apps/style.png
 share/icons/crystalsvg/48x48/apps/stylesheet.png
@@ -2770,7 +3008,6 @@ share/icons/crystalsvg/48x48/apps/usb.png
 share/icons/crystalsvg/48x48/apps/vnc.png
 share/icons/crystalsvg/48x48/apps/window_list.png
 share/icons/crystalsvg/48x48/apps/wine.png
-share/icons/crystalsvg/48x48/apps/winprops.png
 share/icons/crystalsvg/48x48/apps/wmaker_apps.png
 share/icons/crystalsvg/48x48/apps/wp.png
 share/icons/crystalsvg/48x48/apps/xchat.png
@@ -2780,8 +3017,7 @@ share/icons/crystalsvg/48x48/apps/xemacs.png
 share/icons/crystalsvg/48x48/apps/xfmail.png
 share/icons/crystalsvg/48x48/apps/xmag.png
 share/icons/crystalsvg/48x48/apps/xv.png
-share/icons/crystalsvg/48x48/devices/print_printer.png
-share/icons/crystalsvg/48x48/filesystems/folder_print2.png
+share/icons/crystalsvg/64x64/apps/access.png
 share/icons/crystalsvg/64x64/apps/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
 share/icons/crystalsvg/64x64/apps/arts.png
@@ -2790,9 +3026,13 @@ share/icons/crystalsvg/64x64/apps/bell.png
 share/icons/crystalsvg/64x64/apps/cache.png
 share/icons/crystalsvg/64x64/apps/clanbomber.png
 share/icons/crystalsvg/64x64/apps/clock.png
+share/icons/crystalsvg/64x64/apps/colors.png
+share/icons/crystalsvg/64x64/apps/cookie.png
 share/icons/crystalsvg/64x64/apps/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy.png
 share/icons/crystalsvg/64x64/apps/energy_star.png
+share/icons/crystalsvg/64x64/apps/enhanced_browsing.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
 share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
@@ -2804,6 +3044,7 @@ share/icons/crystalsvg/64x64/apps/kappfinder.png
 share/icons/crystalsvg/64x64/apps/kate.png
 share/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/icons/crystalsvg/64x64/apps/kcmdf.png
+share/icons/crystalsvg/64x64/apps/kcmkwm.png
 share/icons/crystalsvg/64x64/apps/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
@@ -2820,6 +3061,7 @@ share/icons/crystalsvg/64x64/apps/khelpcenter.png
 share/icons/crystalsvg/64x64/apps/kjobviewer.png
 share/icons/crystalsvg/64x64/apps/klipper.png
 share/icons/crystalsvg/64x64/apps/kmenu.png
+share/icons/crystalsvg/64x64/apps/knetattach.png
 share/icons/crystalsvg/64x64/apps/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
@@ -2840,6 +3082,7 @@ share/icons/crystalsvg/64x64/apps/nedit.png
 share/icons/crystalsvg/64x64/apps/netscape.png
 share/icons/crystalsvg/64x64/apps/package.png
 share/icons/crystalsvg/64x64/apps/package_applications.png
+share/icons/crystalsvg/64x64/apps/package_development.png
 share/icons/crystalsvg/64x64/apps/package_favourite.png
 share/icons/crystalsvg/64x64/apps/package_games.png
 share/icons/crystalsvg/64x64/apps/package_multimedia.png
@@ -2865,17 +3108,13 @@ share/icons/crystalsvg/64x64/apps/wp.png
 share/icons/crystalsvg/64x64/apps/xclock.png
 share/icons/crystalsvg/64x64/apps/xfmail.png
 share/icons/crystalsvg/64x64/apps/xmag.png
-share/icons/crystalsvg/64x64/devices/print_printer.png
 share/icons/crystalsvg/scalable/apps/access.svgz
 share/icons/crystalsvg/scalable/apps/acroread.svgz
 share/icons/crystalsvg/scalable/apps/aim.svgz
 share/icons/crystalsvg/scalable/apps/aktion.svgz
 share/icons/crystalsvg/scalable/apps/antivirus.svgz
 share/icons/crystalsvg/scalable/apps/applixware.svgz
-share/icons/crystalsvg/scalable/apps/ark.svgz
 share/icons/crystalsvg/scalable/apps/arts.svgz
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svgz
 share/icons/crystalsvg/scalable/apps/background.svgz
 share/icons/crystalsvg/scalable/apps/bell.svgz
 share/icons/crystalsvg/scalable/apps/browser.svgz
@@ -2894,48 +3133,41 @@ share/icons/crystalsvg/scalable/apps/error.svgz
 share/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/icons/crystalsvg/scalable/apps/fonts.svgz
 share/icons/crystalsvg/scalable/apps/galeon.svgz
-share/icons/crystalsvg/scalable/apps/gnome/apps.svgz
-share/icons/crystalsvg/scalable/apps/go.svgz
-share/icons/crystalsvg/scalable/apps/harddrive.svgz
+share/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/icons/crystalsvg/scalable/apps/hardware.svgz
 share/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/icons/crystalsvg/scalable/apps/karbon14.svgz
-share/icons/crystalsvg/scalable/apps/kate.svgz
-share/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/icons/crystalsvg/scalable/apps/kate2.svgz
 share/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+share/icons/crystalsvg/scalable/apps/kcmx.svgz
 share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/icons/crystalsvg/scalable/apps/kdict.svgz
-share/icons/crystalsvg/scalable/apps/kdvi.svgz
 share/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz
+share/icons/crystalsvg/scalable/apps/kjobviewer.svgz
 share/icons/crystalsvg/scalable/apps/klipper.svgz
-share/icons/crystalsvg/scalable/apps/kmail.svgz
+share/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/icons/crystalsvg/scalable/apps/knetattach.svgz
 share/icons/crystalsvg/scalable/apps/konqueror.svgz
 share/icons/crystalsvg/scalable/apps/konsole.svgz
-share/icons/crystalsvg/scalable/apps/kopete.svgz
-share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
-share/icons/crystalsvg/scalable/apps/kwrite.svgz
+share/icons/crystalsvg/scalable/apps/ktip.svgz
+share/icons/crystalsvg/scalable/apps/kwrite2.svgz
 share/icons/crystalsvg/scalable/apps/locale.svgz
-share/icons/crystalsvg/scalable/apps/mail.svgz
 share/icons/crystalsvg/scalable/apps/my_mac.svgz
-share/icons/crystalsvg/scalable/apps/mycomputer.svgz
 share/icons/crystalsvg/scalable/apps/netscape.svgz
 share/icons/crystalsvg/scalable/apps/openoffice.svgz
+share/icons/crystalsvg/scalable/apps/package_development.svgz
 share/icons/crystalsvg/scalable/apps/package_toys.svgz
-share/icons/crystalsvg/scalable/apps/package_utilities.svgz
 share/icons/crystalsvg/scalable/apps/penguin.svgz
+share/icons/crystalsvg/scalable/apps/personal.svgz
+share/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/icons/crystalsvg/scalable/apps/samba.svgz
 share/icons/crystalsvg/scalable/apps/shell.svgz
-share/icons/crystalsvg/scalable/apps/soffice.svgz
 share/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/icons/crystalsvg/scalable/apps/stylesheet.svgz
 share/icons/crystalsvg/scalable/apps/terminal.svgz
 share/icons/crystalsvg/scalable/apps/tux.svgz
 share/icons/crystalsvg/scalable/apps/wine.svgz
-share/icons/crystalsvg/scalable/apps/winprops.svgz
 share/icons/crystalsvg/scalable/apps/x.svgz
 share/icons/crystalsvg/scalable/apps/xapp.svgz
 share/icons/crystalsvg/scalable/apps/xcalc.svgz
@@ -2945,8 +3177,6 @@ share/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/icons/crystalsvg/scalable/apps/xpaint.svgz
 share/icons/hicolor/16x16/apps/khotkeys.png
 share/icons/hicolor/32x32/apps/khotkeys.png
-share/icons/locolor/16x16/apps/kcmfontinst.png
-share/icons/locolor/32x32/apps/kcmfontinst.png
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
@@ -3427,24 +3657,34 @@ share/mimelnk/application/x-smb-server.desktop
 share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
-share/mimelnk/kdedevice/cdrom_mounted.desktop
-share/mimelnk/kdedevice/cdrom_unmounted.desktop
-share/mimelnk/kdedevice/cdwriter_mounted.desktop
-share/mimelnk/kdedevice/cdwriter_unmounted.desktop
-share/mimelnk/kdedevice/dvd_mounted.desktop
-share/mimelnk/kdedevice/dvd_unmounted.desktop
-share/mimelnk/kdedevice/floppy5_mounted.desktop
-share/mimelnk/kdedevice/floppy5_unmounted.desktop
-share/mimelnk/kdedevice/floppy_mounted.desktop
-share/mimelnk/kdedevice/floppy_unmounted.desktop
-share/mimelnk/kdedevice/hdd_mounted.desktop
-share/mimelnk/kdedevice/hdd_unmounted.desktop
-share/mimelnk/kdedevice/nfs_mounted.desktop
-share/mimelnk/kdedevice/nfs_unmounted.desktop
-share/mimelnk/kdedevice/smb_mounted.desktop
-share/mimelnk/kdedevice/smb_unmounted.desktop
-share/mimelnk/kdedevice/zip_mounted.desktop
-share/mimelnk/kdedevice/zip_unmounted.desktop
+share/mimelnk/inode/system_directory.desktop
+share/mimelnk/media/audiocd.desktop
+share/mimelnk/media/blankcd.desktop
+share/mimelnk/media/blankdvd.desktop
+share/mimelnk/media/cdrom_mounted.desktop
+share/mimelnk/media/cdrom_unmounted.desktop
+share/mimelnk/media/cdwriter_mounted.desktop
+share/mimelnk/media/cdwriter_unmounted.desktop
+share/mimelnk/media/dvd_mounted.desktop
+share/mimelnk/media/dvd_unmounted.desktop
+share/mimelnk/media/dvdvideo.desktop
+share/mimelnk/media/floppy5_mounted.desktop
+share/mimelnk/media/floppy5_unmounted.desktop
+share/mimelnk/media/floppy_mounted.desktop
+share/mimelnk/media/floppy_unmounted.desktop
+share/mimelnk/media/gphoto2camera.desktop
+share/mimelnk/media/hdd_mounted.desktop
+share/mimelnk/media/hdd_unmounted.desktop
+share/mimelnk/media/nfs_mounted.desktop
+share/mimelnk/media/nfs_unmounted.desktop
+share/mimelnk/media/removable_mounted.desktop
+share/mimelnk/media/removable_unmounted.desktop
+share/mimelnk/media/smb_mounted.desktop
+share/mimelnk/media/smb_unmounted.desktop
+share/mimelnk/media/svcd.desktop
+share/mimelnk/media/vcd.desktop
+share/mimelnk/media/zip_mounted.desktop
+share/mimelnk/media/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
 share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
@@ -3453,13 +3693,14 @@ share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
 share/mimelnk/print/printermodel.desktop
 share/services/about.protocol
+share/services/applications.protocol
 share/services/ar.protocol
 share/services/bzip.protocol
 share/services/bzip2.protocol
 share/services/cgi.protocol
 share/services/cursorthumbnail.desktop
-share/services/devices.protocol
 share/services/djvuthumbnail.desktop
+share/services/exrthumbnail.desktop
 share/services/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
@@ -3468,17 +3709,21 @@ share/services/fontthumbnail.desktop
 share/services/gzip.protocol
 share/services/htmlthumbnail.desktop
 share/services/imagethumbnail.desktop
-share/services/imap4.protocol
-share/services/imaps.protocol
 share/services/info.protocol
 share/services/kaccess.desktop
 share/services/katedefaultproject.desktop
+share/services/katekttsd.desktop
 share/services/kded/favicons.desktop
+share/services/kded/khotkeys.desktop
 share/services/kded/konqy_preloader.desktop
 share/services/kded/kwrited.desktop
-share/services/kded/mountwatcher.desktop
+share/services/kded/mediamanager.desktop
+share/services/kded/remotedirnotify.desktop
+share/services/kded/systemdirnotify.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
+share/services/kfile_media.desktop
+share/services/kfile_trash.desktop
 share/services/kfindpart.desktop
 share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
@@ -3491,7 +3736,6 @@ share/services/konq_multicolumnview.desktop
 share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
-share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
@@ -3508,6 +3752,7 @@ share/services/ldaps.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
+share/services/media.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
 share/services/picturethumbnail.desktop
@@ -3516,23 +3761,27 @@ share/services/pop3s.protocol
 share/services/print.protocol
 share/services/printdb.protocol
 share/services/programs.protocol
+share/services/remote.protocol
 share/services/searchproviders/acronym.desktop
 share/services/searchproviders/alexa.desktop
 share/services/searchproviders/alexa_url.desktop
 share/services/searchproviders/alltheweb.desktop
 share/services/searchproviders/altavista.desktop
+share/services/searchproviders/amg.desktop
 share/services/searchproviders/appsy.desktop
 share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/backports.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.desktop
+share/services/searchproviders/cia.desktop
 share/services/searchproviders/citeseer.desktop
 share/services/searchproviders/cpan.desktop
 share/services/searchproviders/ctan.desktop
 share/services/searchproviders/ctan_cat.desktop
 share/services/searchproviders/dbug.desktop
 share/services/searchproviders/de2en.desktop
+share/services/searchproviders/de2fr.desktop
 share/services/searchproviders/deb.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
@@ -3545,10 +3794,12 @@ share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
 share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2de.desktop
 share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freedb.desktop
 share/services/searchproviders/freshmeat.desktop
 share/services/searchproviders/froogle.desktop
+share/services/searchproviders/fsd.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
@@ -3556,6 +3807,7 @@ share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
 share/services/searchproviders/google_news.desktop
 share/services/searchproviders/gracenote.desktop
+share/services/searchproviders/grec.desktop
 share/services/searchproviders/hotbot.desktop
 share/services/searchproviders/hyperdictionary.desktop
 share/services/searchproviders/hyperdictionary_thesaurus.desktop
@@ -3584,6 +3836,8 @@ share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
 share/services/searchproviders/thesaurus.desktop
+share/services/searchproviders/tvtome.desktop
+share/services/searchproviders/uspto.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
@@ -3599,24 +3853,30 @@ share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
+share/services/trash.protocol
+share/services/useragentstrings/firefoxoncurrent.desktop
+share/services/useragentstrings/googlebot.desktop
 share/services/useragentstrings/ie401onwinnt4.desktop
-share/services/useragentstrings/ie45onwinnt5.desktop
 share/services/useragentstrings/ie501onwinnt5.desktop
 share/services/useragentstrings/ie50onppc.desktop
-share/services/useragentstrings/ie50onwin95.desktop
 share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
+share/services/useragentstrings/ie60oncurrent.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
 share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozoncurrent12.desktop
 share/services/useragentstrings/mozoncurrent16.desktop
 share/services/useragentstrings/mozonwin2000.desktop
-share/services/useragentstrings/mozonwinnt4.desktop
+share/services/useragentstrings/mozonwinxp.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
+share/services/useragentstrings/ns71oncurrent.desktop
+share/services/useragentstrings/ns71onwinnt51.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/op75oncurrent.desktop
 share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
@@ -3645,6 +3905,8 @@ share/sounds/KDE_Beep_Connect.wav
 share/sounds/KDE_Beep_Digital_1.ogg
 share/sounds/KDE_Beep_Digital_2.ogg
 share/sounds/KDE_Beep_Door.wav
+share/sounds/KDE_Beep_Double.ogg
+share/sounds/KDE_Beep_Harsh.ogg
 share/sounds/KDE_Beep_Honk.wav
 share/sounds/KDE_Beep_Lightning.wav
 share/sounds/KDE_Beep_Phone_1.ogg
@@ -3689,6 +3951,7 @@ share/sounds/KDE_Drum_Break.ogg
 share/sounds/KDE_Error.wav
 share/sounds/KDE_Error_1.ogg
 share/sounds/KDE_Error_2.ogg
+share/sounds/KDE_Error_3.ogg
 share/sounds/KDE_Event_1.ogg
 share/sounds/KDE_Event_2.ogg
 share/sounds/KDE_Event_3.ogg
@@ -3766,27 +4029,69 @@ share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
 share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/All-Good-People-1.jpg.desktop
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Blkmarble.jpg.desktop
 share/wallpapers/Chicken-Songs-2.jpg
+share/wallpapers/Chicken-Songs-2.jpg.desktop
 share/wallpapers/Circuit.jpg
+share/wallpapers/Circuit.jpg.desktop
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Foggy1.jpg.desktop
 share/wallpapers/Island-of-Elba.jpg
+share/wallpapers/Island-of-Elba.jpg.desktop
+share/wallpapers/KDE34.png
+share/wallpapers/KDE34.png.desktop
 share/wallpapers/Marble01.jpg
+share/wallpapers/Marble01.jpg.desktop
 share/wallpapers/No-Ones-Laughing-3.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 share/wallpapers/Paper01.jpg
+share/wallpapers/Paper01.jpg.desktop
 share/wallpapers/Planning-And-Probing-1.jpg
+share/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/wallpapers/Totally-New-Product-1.jpg
+share/wallpapers/Totally-New-Product-1.jpg.desktop
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/wallpapers/andes-venezolanos.svgz
+share/wallpapers/andes-venezolanos.svgz.desktop
+share/wallpapers/aurora.svgz
+share/wallpapers/aurora.svgz.desktop
 share/wallpapers/blue-bend.jpg
+share/wallpapers/blue-bend.jpg.desktop
+share/wallpapers/celtic.svgz
+share/wallpapers/celtic.svgz.desktop
 share/wallpapers/default_blue.jpg
+share/wallpapers/default_blue.jpg.desktop
 share/wallpapers/default_gears.jpg
+share/wallpapers/default_gears.jpg.desktop
 share/wallpapers/fulmine.jpg
+share/wallpapers/fulmine.jpg.desktop
+share/wallpapers/gear-flowers.svgz
+share/wallpapers/gear-flowers.svgz.desktop
+share/wallpapers/globe.svgz
+share/wallpapers/globe.svgz.desktop
+share/wallpapers/here-gear.svgz
+share/wallpapers/here-gear.svgz.desktop
 share/wallpapers/kde_box.png
+share/wallpapers/kde_box.png.desktop
 share/wallpapers/kde_passion.jpg
+share/wallpapers/kde_passion.jpg.desktop
+share/wallpapers/konqui.svgz
+share/wallpapers/konqui.svgz.desktop
+share/wallpapers/lineart.svgz
+share/wallpapers/lineart.svgz.desktop
+share/wallpapers/moon.svgz
+share/wallpapers/moon.svgz.desktop
 share/wallpapers/only_k.jpg
+share/wallpapers/only_k.jpg.desktop
 share/wallpapers/seaofconero.jpg
+share/wallpapers/seaofconero.jpg.desktop
 share/wallpapers/triplegears.jpg
+share/wallpapers/triplegears.jpg.desktop
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@@ -3795,19 +4100,15 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/templates/.source/emptydir
 @dirrm share/mimelnk/print
-@dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/media
 @dirrm share/mimelnk/fonts
 @dirrm share/locale/l10n/zw
 @dirrm share/locale/l10n/zm
@@ -4036,7 +4337,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/crystalsvg/scalable/apps/gnome
+@dirrm share/fonts/override
+@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4045,6 +4347,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
+@dirrm share/doc/HTML/en/knetattach
 @dirrm share/doc/HTML/en/kmenuedit
 @dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kioslave
@@ -4058,6 +4361,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kinfocenter/pcmcia
 @dirrm share/doc/HTML/en/kinfocenter/pci
 @dirrm share/doc/HTML/en/kinfocenter/partitions
+@dirrm share/doc/HTML/en/kinfocenter/opengl
 @dirrm share/doc/HTML/en/kinfocenter/nics
 @dirrm share/doc/HTML/en/kinfocenter/memory
 @dirrm share/doc/HTML/en/kinfocenter/ioports
@@ -4083,12 +4387,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate
 @dirrm share/doc/HTML/en/kdebase-apidocs
+@dirrm share/doc/HTML/en/kdcop
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
 @dirrm share/doc/HTML/en/kcontrol/spellchecking
@@ -4134,16 +4436,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
 @dirrm share/doc/HTML/en/kate
+@dirrm share/doc/HTML/en/kappfinder
 @dirrm share/desktop-directories
+@dirrm share/apps/systemview
+@dirrm share/apps/remoteview
+@dirrm share/apps/plugin
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
+@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
+@dirrm share/apps/kthememanager/themes/YellowOnBlue
+@dirrm share/apps/kthememanager/themes/Sunshine
+@dirrm share/apps/kthememanager/themes/Redmond
+@dirrm share/apps/kthememanager/themes/Platinum
+@dirrm share/apps/kthememanager/themes/Plastik
+@dirrm share/apps/kthememanager/themes/Keramik
+@dirrm share/apps/kthememanager/themes/KDE_Classic
+@dirrm share/apps/kthememanager/themes/HighContrastLight-big
+@dirrm share/apps/kthememanager/themes/HighContrastLight
+@dirrm share/apps/kthememanager/themes/HighContrastDark-big
+@dirrm share/apps/kthememanager/themes/HighContrastDark
+@dirrm share/apps/kthememanager/themes
+@dirrm share/apps/kthememanager
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash/Themes/blue-bend
 @dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Simple
 @dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/None
 @dirrm share/apps/ksplash/Themes/Default/locolor
 @dirrm share/apps/ksplash/Themes/Default
 @dirrm share/apps/ksplash/Themes
@@ -4197,7 +4519,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
+@dirrm share/apps/khtml/kpartplugins
 @dirrm share/apps/khotkeys
+@dirrm share/apps/khelpcenter/searchhandlers/htdig
+@dirrm share/apps/khelpcenter/searchhandlers
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
@@ -4209,6 +4534,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/themes/circles
+@dirrm share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
@@ -4237,7 +4564,9 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcontroledit/icons
 @dirrm share/apps/kcontroledit
 @dirrm share/apps/kcontrol/pics
+@dirrm share/apps/kcontrol/about
 @dirrm share/apps/kcontrol
+@dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
 @dirrm share/apps/kcmkeys
@@ -4245,6 +4574,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
+@dirrm share/apps/katepart/kpartplugins
+@dirrm share/apps/kate/plugins/katekttsd
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index fdbd9bfc5636..4679a2d4d220 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,13 +18,16 @@ COMMENT=	Basic applications for the KDE system
 
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient \
+		usb:${PORTSDIR}/devel/libusb
 
-CONFLICTS=	kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.*
+CONFLICTS=	kdelibs-3.[0-3]* kdeutils-3.[0-2]*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
+USE_GETOPT_LONG=yes
 USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,8 +40,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-DO_NOT_COMPILE=	nsplugins
-CONFIGURE_ENV+=	RUN_KAPPFINDER=no
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -49,10 +50,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index a1ad17ecaaad..7a5b5d02fcce 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
-SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
+MD5 (KDE/kdebase-3.4.0.tar.bz2) = c88659e558ca98dc45377bf8ddfc26c9
+SIZE (KDE/kdebase-3.4.0.tar.bz2) = 22670772
diff --git a/x11/kde4-workspace/files/patch-kcontrol-nics-nic.cpp b/x11/kde4-workspace/files/patch-kcontrol-nics-nic.cpp
deleted file mode 100644
index e11c3de5032a..000000000000
--- a/x11/kde4-workspace/files/patch-kcontrol-nics-nic.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kcontrol/nics/nic.cpp	15 Nov 2003 22:01:05 -0000	1.24
-+++ kcontrol/nics/nic.cpp	21 Jan 2004 13:38:46 -0000
-@@ -229,9 +229,14 @@ NICList* findNICs()
-       tmp->addr = buf;
- 
-       if (ifa->ifa_netmask != NULL) {
-+#ifdef Q_OS_FREEBSD
-+	struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask;
-+	tmp->netmask=inet_ntoa(sinptr->sin_addr);
-+#else
- 	bzero(buf, 128);
- 	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
- 	tmp->netmask = buf;
-+#endif
-       }
- 
-       if (ifa->ifa_flags & IFF_UP)
diff --git a/x11/kde4-workspace/files/patch-kcontrol_konq_previews.cpp b/x11/kde4-workspace/files/patch-kcontrol_konq_previews.cpp
deleted file mode 100644
index 7fe3246c2149..000000000000
--- a/x11/kde4-workspace/files/patch-kcontrol_konq_previews.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcontrol/konq/previews.cpp.orig	Sun Oct 26 11:46:25 2003
-+++ kcontrol/konq/previews.cpp	Thu Jan 27 10:16:32 2005
-@@ -153,6 +153,11 @@
- 
-     for ( ; it.current() ; ++it ) {
-         QString protocol( it.current()->text() );
-+        if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) 
-+          // file should be enabled in case is not defined because if not so 
-+          // than preview's lost when size is changed from default one 
-+          it.current()->setOn( true ); 
-+        else 
-         it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
-     // config key is in bytes (default value 1MB), numinput is in MB
diff --git a/x11/kde4-workspace/files/patch-kdm-backend-xdmcp.c b/x11/kde4-workspace/files/patch-kdm-backend-xdmcp.c
deleted file mode 100644
index be29ec4d3416..000000000000
--- a/x11/kde4-workspace/files/patch-kdm-backend-xdmcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/backend/xdmcp.c.orig	Wed May  8 14:21:31 2002
-+++ kdm/backend/xdmcp.c	Wed Jun 26 20:14:02 2002
-@@ -1012,7 +1012,7 @@
- 
-     sprintf (buf, "Session %ld failed for display %.260s: %s",
- 	     (long) sessionID, name, reason);
--    Debug ("send_failed(%\"s)\n", buf);
-+    Debug ("send_failed(\"%s\")\n", buf);
-     status.length = strlen (buf);
-     status.data = (CARD8Ptr) buf;
-     header.version = XDM_PROTOCOL_VERSION;
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-config.def b/x11/kde4-workspace/files/patch-kdm-kfrontend-config.def
deleted file mode 100644
index 3776abd3beae..000000000000
--- a/x11/kde4-workspace/files/patch-kdm-kfrontend-config.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/config.def.orig	Thu Nov 11 20:47:50 2004
-+++ kdm/kfrontend/config.def	Thu Nov 11 20:51:18 2004
-@@ -10,7 +10,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index 4a3ac236fe1d..a6126b314d8e 100644
--- a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,6 +1,6 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
-@@ -578,7 +578,7 @@
+--- kdm/kfrontend/genkdmconf.c.orig	Wed Feb 23 12:26:01 2005
++++ kdm/kfrontend/genkdmconf.c	Sat Mar 19 16:43:49 2005
+@@ -562,7 +562,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
  "#\n"
@@ -9,7 +9,7 @@
  "\n"
  #ifdef _AIX
  "# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-@@ -619,8 +619,8 @@
+@@ -591,8 +591,8 @@
  "# Reassign ownership of the console to root, this should disallow\n"
  "# assignment of console output to any random users's xterm. See Xstartup.\n"
  "#\n"
@@ -19,8 +19,17 @@
 +/* "#chmod 622 /dev/console\n" */
  "\n"
  #ifdef _AIX
- "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,7 +667,9 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ "  */bash)\n"
+@@ -637,7 +639,9 @@
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
@@ -31,3 +40,232 @@
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
  "    [ -f /etc/profile ] && . /etc/profile\n"
+@@ -648,7 +652,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ "  \"\")\n"
+ "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ "    ;;\n"
+@@ -662,10 +666,10 @@
+ "    exec " KDE_BINDIR "/startkde\n"
+ "    ;;\n"
+ "  *)\n"
+-"    eval exec \"$1\"\n"
++"    eval exec \"$session\"\n"
+ "    ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +821,7 @@
+  * XXX this stuff is highly borked. it does not handle collisions at all.
+  */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ 	const char *tptr;
+ 	char *nname;
+@@ -840,12 +844,7 @@
+ 		fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ 		rt = 0;
+ 	} else {
+-		char *nbuf;
+-		int nlen;
+-
+-		if (!proc || !proc( &file, &nbuf, &nlen ) ||
+-		    (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+-		{
++		if (!proc || !proc( &file )) {
+ 			if (!use_destdir && !strcmp( ce->value, nname ))
+ 				linkedFile( nname );
+ 			else {
+@@ -855,7 +854,7 @@
+ 				copiedFile( ce->value );
+ 			}
+ 		} else {
+-			WriteOut( nname, mode, 0, nbuf, nlen );
++			WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ 			editedFile( ce->value );
+ 		}
+ 		if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1377,7 @@
+ 
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ 	// XXX remove any login*, chooser*, ... resources
+ 	return 0;
+@@ -1415,15 +1414,14 @@
+ 				paap = pap += 2;
+ 				while (!isspace( *pap ))
+ 					pap++;
+-				for (;;) {
+-					if (*pp++ != '/')
+-						goto no;
+-					for (bpp = pp; *pp != '/'; pp++)
+-						if (isspace( *pp ))
++				if (*pp != '/')
++					break;
++				for (;;)
++					for (bpp = ++pp; *pp != '/'; pp++)
++						if (!*pp || isspace( *pp ))
+ 							goto wbrk;
+-				}
+ 			  wbrk:
+-				if (memcmp( bpp, paap, pap - paap ))
++				if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ 					break;
+ 			} else if (*pap == '\t') {
+ 				pap++;
+@@ -1472,24 +1470,25 @@
+ static int mod_usebg;
+ 
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+-	putval( "UseBackground",
+-	        (delstr( file, "\n"
+-	                 "(\n"
+-	                 "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-	                 "  */kdmdesktop\t&\n"
+-	                 "  echo $! >$PIDFILE\n"
+-	                 "  wait $!\n"
+-	                 "  rm $PIDFILE\n"
+-	                 ")\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "*/kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\n" )) ? "true" : "false" );
+-	return 0;
++	int chg =
++		delstr( file, "\n"
++		        "(\n"
++		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++		        "  */kdmdesktop\t&\n"
++		        "  echo $! >$PIDFILE\n"
++		        "  wait $!\n"
++		        "  rm $PIDFILE\n"
++		        ")\t&\n" ) |
++		delstr( file, "\n"
++		        "*/kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\n" );
++	putval( "UseBackground", chg ? "true" : "false" );
++	return chg;
+ }
+ 
+ static void
+@@ -1515,19 +1514,22 @@
+ }
+ 
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++	int chg1 = 0, chg2 = 0;
++
+ 	if (mod_usebg &&
+-	    !delstr( file, "\n"
++	    (delstr( file, "\n"
+ 	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ 	             "if [[] -f $PIDFILE ] ; then\n"
+ 	             "	   kill `cat $PIDFILE`\n"
+-	             "fi\n" ))
+-		delstr( file, "\n"
+-		        "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-		        "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+-	if (oldver < 0x0203)
+-		putval( "UseSessReg", (
++	             "fi\n" ) ||
++	     delstr( file, "\n"
++	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++		chg1 = 1;
++	if (oldver < 0x0203) {
++		chg2 = 
+ #ifdef _AIX
+ 			delstr( file, "\n"
+ "# We create a pseudodevice for finger.  (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1554,11 @@
+ "  else\n"
+ "    exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ "  fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ 			delstr( file, "\n"
+@@ -1564,11 +1566,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+-		 ) ? "true" : "false");
+-	return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++		putval( "UseSessReg", chg2 ? "true" : "false");
++	}
++	return chg1 | chg2;
+ }
+ 
+ static void
+@@ -1592,29 +1595,29 @@
+ }
+ 
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++	return
+ #ifdef _AIX
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ "  devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ "  exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+-	delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++		delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+-	delstr( file, "\n"
++" $USER\n" ) |
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+-	return 0;
+ }
+ 
+ static void
diff --git a/x11/kde4-workspace/files/patch-konsole-konsole-konsole.cpp b/x11/kde4-workspace/files/patch-konsole-konsole-konsole.cpp
deleted file mode 100644
index 553c411983a7..000000000000
--- a/x11/kde4-workspace/files/patch-konsole-konsole-konsole.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
-+++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
-@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
-     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
-     setSchema(s->schemaNo());
-     tabwidget->setCurrentPage(tabwidget->count()-1);
--      disableMasterModeConnections(); // no duplicate connections, remove old
--      enableMasterModeConnections();
--    }
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    disableMasterModeConnections(); // no duplicate connections, remove old
-+    enableMasterModeConnections();
-+    if(m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+  }
- }
- 
- QString Konsole::currentSession()
-@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
-       rootxpms.remove(s->widget());
-     }
-     delete s->widget();
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    if (m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-   }
-   session2action.remove(s);
-   action2session.remove(ra);
diff --git a/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp b/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp
new file mode 100644
index 000000000000..55eed7247922
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-nsplugins-pluginscan.cpp
@@ -0,0 +1,10 @@
+--- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
++++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
+@@ -457,6 +457,7 @@
+ 	paths.append("/usr/lib64/netscape/plugins");
+ 	paths.append("/usr/lib64/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/local/lib/linux-flashplugin6");
+         config->writeEntry( "scanPaths", paths );
+     }
+ 
diff --git a/x11/kde4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kde4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
deleted file mode 100644
index f31b6341cf9c..000000000000
--- a/x11/kde4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1342.2.14
-diff -u -p -r1.1342.2.14 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
-+++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
-@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
-     QString viewName = view->viewName();
-     kdDebug() << "       - viewName=" << viewName << "   "
-               << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+    // First look for a hostextension containing this frame name
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+      kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+      if (!ext)
-+         continue; // Don't use this window
-+    }
-+
-     if ( !viewName.isEmpty() && viewName == name )
-     {
-       kdDebug() << "found existing view by name: " << view << endl;
-@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
-       return view;
-     }
- 
--    // First look for a hostextension containing this frame name
--    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
--    if ( ext )
--    {
--      ext = ext->findFrameParent(callingPart, name);
--    }
--
- //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 61e591e3cd68..1dabe06f9d62 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -4,11 +4,13 @@ bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kasbar
 bin/kate
 bin/kblankscrn.kss
+bin/kbookmarkmerger
 bin/kcheckpass
+bin/kcheckrunning
 bin/kcminit
-bin/kcmshell
 bin/kcontrol
 bin/kcontroledit
 bin/kdcop
@@ -32,16 +34,21 @@ bin/kfind
 bin/kfmclient
 bin/kfontinst
 bin/kfontview
+bin/khc_docbookdig.pl
+bin/khc_htdig.pl
+bin/khc_htsearch.pl
 bin/khc_indexbuilder
+bin/khc_mansearch.pl
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
 bin/kinfocenter
-bin/kio_devices_mounthelper
+bin/kio_media_mounthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
+bin/knetattach
 bin/konqueror
 bin/konsole
 bin/kpager
@@ -56,11 +63,13 @@ bin/kreadconfig
 bin/krootimage
 bin/ksmserver
 bin/ksplash
+bin/ksplashsimple
 bin/kstart
 bin/ksysguard
 bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
+bin/ktrash
 bin/kwebdesktop
 bin/kwin
 bin/kwin_killer_helper
@@ -68,6 +77,8 @@ bin/kwin_rules_dialog
 bin/kwrite
 bin/kwriteconfig
 bin/kxkb
+bin/nspluginscan
+bin/nspluginviewer
 bin/startkde
 etc/ksysguarddrc
 etc/rc.d/genkdmconf.sh
@@ -107,6 +118,7 @@ include/konq_dirpart.h
 include/konq_drag.h
 include/konq_events.h
 include/konq_faviconmgr.h
+include/konq_filetip.h
 include/konq_historycomm.h
 include/konq_historymgr.h
 include/konq_iconviewwidget.h
@@ -119,7 +131,6 @@ include/konq_undo.h
 include/konq_xmlguiclient.h
 include/konqbookmarkmanager.h
 include/konqsidebarplugin.h
-include/ksgrd/ColorPicker.h
 include/ksgrd/HostConnector.h
 include/ksgrd/SensorAgent.h
 include/ksgrd/SensorClient.h
@@ -135,22 +146,22 @@ include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
+include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/kicker-3.4-reverseLayout
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
-lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
 lib/kde3/cursorthumbnail.so
-lib/kde3/devices_panelapplet.la
-lib/kde3/devices_panelapplet.so
 lib/kde3/djvuthumbnail.la
 lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
 lib/kde3/dockbar_panelextension.so
+lib/kde3/exrthumbnail.la
+lib/kde3/exrthumbnail.so
 lib/kde3/extensionproxy.la
 lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
@@ -211,6 +222,8 @@ lib/kde3/kcm_kded.la
 lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
 lib/kde3/kcm_kdm.so
+lib/kde3/kcm_kdnssd.la
+lib/kde3/kcm_kdnssd.so
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keyboard.so
 lib/kde3/kcm_keys.la
@@ -247,6 +260,8 @@ lib/kde3/kcm_locale.la
 lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
 lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
@@ -267,36 +282,48 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
+lib/kde3/kcm_usb.la
+lib/kde3/kcm_usb.so
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
 lib/kde3/kcminit.so
-lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
 lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
 lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_khotkeys.la
+lib/kde3/kded_khotkeys.so
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_kwrited.so
-lib/kde3/kded_mountwatcher.la
-lib/kde3/kded_mountwatcher.so
+lib/kde3/kded_mediamanager.la
+lib/kde3/kded_mediamanager.so
+lib/kde3/kded_remotedirnotify.la
+lib/kde3/kded_remotedirnotify.so
+lib/kde3/kded_systemdirnotify.la
+lib/kde3/kded_systemdirnotify.so
 lib/kde3/kdesktop.la
 lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
 lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
 lib/kde3/kfile_font.so
+lib/kde3/kfile_media.la
+lib/kde3/kfile_media.so
+lib/kde3/kfile_trash.la
+lib/kde3/kfile_trash.so
 lib/kde3/kfmclient.la
 lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_classic.so
+lib/kde3/kgreet_winbind.la
+lib/kde3/kgreet_winbind.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
@@ -315,12 +342,14 @@ lib/kde3/kickermenu_prefmenu.la
 lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
 lib/kde3/kickermenu_recentdocs.so
+lib/kde3/kickermenu_remotemenu.la
+lib/kde3/kickermenu_remotemenu.so
+lib/kde3/kickermenu_systemmenu.la
+lib/kde3/kickermenu_systemmenu.so
 lib/kde3/kio_about.la
 lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
 lib/kde3/kio_cgi.so
-lib/kde3/kio_devices.la
-lib/kde3/kio_devices.so
 lib/kde3/kio_filter.la
 lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
@@ -331,8 +360,6 @@ lib/kde3/kio_floppy.la
 lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
 lib/kde3/kio_fonts.so
-lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
 lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
@@ -341,6 +368,8 @@ lib/kde3/kio_mac.la
 lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
 lib/kde3/kio_man.so
+lib/kde3/kio_media.la
+lib/kde3/kio_media.so
 lib/kde3/kio_nfs.la
 lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
@@ -349,6 +378,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_remote.la
+lib/kde3/kio_remote.so
 lib/kde3/kio_settings.la
 lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
@@ -357,10 +388,14 @@ lib/kde3/kio_smb.la
 lib/kde3/kio_smb.so
 lib/kde3/kio_smtp.la
 lib/kde3/kio_smtp.so
+lib/kde3/kio_system.la
+lib/kde3/kio_system.so
 lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
+lib/kde3/kio_trash.la
+lib/kde3/kio_trash.so
 lib/kde3/kjobviewer.la
 lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
@@ -423,6 +458,8 @@ lib/kde3/kwin3_laptop.la
 lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
 lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_plastik.la
+lib/kde3/kwin3_plastik.so
 lib/kde3/kwin3_quartz.la
 lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
@@ -437,6 +474,8 @@ lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
+lib/kde3/kwin_plastik_config.la
+lib/kde3/kwin_plastik_config.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
@@ -453,6 +492,8 @@ lib/kde3/libkfindpart.la
 lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
 lib/kde3/libkfontviewpart.so
+lib/kde3/libkhtmlkttsdplugin.la
+lib/kde3/libkhtmlkttsdplugin.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -465,8 +506,12 @@ lib/kde3/libkurisearchfilter.la
 lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/media_panelapplet.la
+lib/kde3/media_panelapplet.so
 lib/kde3/menu_panelapplet.la
 lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
@@ -489,6 +534,11 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
+lib/kde3/trash_panelapplet.la
+lib/kde3/trash_panelapplet.so
+lib/libkasbar.la
+lib/libkasbar.so
+lib/libkasbar.so.1
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -508,8 +558,6 @@ lib/libkdeinit_kate.la
 lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
 lib/libkdeinit_kcminit.so
-lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
 lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
@@ -604,6 +652,7 @@ share/applications/kde/ioports.desktop
 share/applications/kde/ioslaveinfo.desktop
 share/applications/kde/kappfinder.desktop
 share/applications/kde/kate.desktop
+share/applications/kde/kcm_kdnssd.desktop
 share/applications/kde/kcm_useraccount.desktop
 share/applications/kde/kcmaccess.desktop
 share/applications/kde/kcmcgi.desktop
@@ -617,6 +666,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -632,9 +682,12 @@ share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
+share/applications/kde/khtml_plugins.desktop
+share/applications/kde/kinfocenter.desktop
 share/applications/kde/kjobviewer.desktop
 share/applications/kde/klipper.desktop
 share/applications/kde/kmenuedit.desktop
+share/applications/kde/knetattach.desktop
 share/applications/kde/konqbrowser.desktop
 share/applications/kde/konquerorsu.desktop
 share/applications/kde/konsole.desktop
@@ -656,6 +709,7 @@ share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
 share/applications/kde/nic.desktop
+share/applications/kde/opengl.desktop
 share/applications/kde/panel.desktop
 share/applications/kde/panel_appearance.desktop
 share/applications/kde/partitions.desktop
@@ -672,6 +726,7 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/applnk/.hidden/.directory
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -692,6 +747,7 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
+share/applnk/.hidden/kwintranslucency.desktop
 share/applnk/.hidden/passwords.desktop
 share/applnk/.hidden/power.desktop
 share/applnk/.hidden/randr.desktop
@@ -701,7 +757,6 @@ share/applnk/.hidden/userinfo.desktop
 share/applnk/.hidden/virtualdesktops.desktop
 share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/KControl.desktop
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
@@ -713,7 +768,6 @@ share/applnk/Settingsmenu/printmgr.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/kpersonalizer.desktop
 share/applnk/Toys/ktip.desktop
@@ -800,6 +854,7 @@ share/apps/kappfinder/apps/Graphics/blender.desktop
 share/apps/kappfinder/apps/Graphics/ghostview.desktop
 share/apps/kappfinder/apps/Graphics/gimp.desktop
 share/apps/kappfinder/apps/Graphics/gv.desktop
+share/apps/kappfinder/apps/Graphics/inkscape.desktop
 share/apps/kappfinder/apps/Graphics/sodipodi.desktop
 share/apps/kappfinder/apps/Graphics/tgif.desktop
 share/apps/kappfinder/apps/Graphics/xdvi.desktop
@@ -952,9 +1007,11 @@ share/apps/kate/icons/locolor/22x22/actions/indent.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
 share/apps/kate/plugins/katedefaultproject/ui.rc
+share/apps/kate/plugins/katekttsd/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
 share/apps/kate/tips
+share/apps/katepart/kpartplugins/katepartkttsd.rc
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_browser.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -973,9 +1030,11 @@ share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
 share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
+share/apps/kcmusb/usb.ids
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
+share/apps/kconf_update/kate-2.4.upd
 share/apps/kconf_update/kcmdisplayrc.upd
 share/apps/kconf_update/kfmclient_3_2.upd
 share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -986,6 +1045,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqsidebartng.upd
 share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
@@ -995,14 +1055,20 @@ share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
+share/apps/kconf_update/kwin_focus2.sh
+share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwiniconify.upd
 share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/kwinupdatewindowsettings.upd
 share/apps/kconf_update/move_favicons.sh
+share/apps/kconf_update/move_konqsidebartng_entries.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
 share/apps/kconf_update/schemaStrip.pl
 share/apps/kconf_update/socks.upd
+share/apps/kcontrol/about/kcontrol.css
+share/apps/kcontrol/about/main.html
+share/apps/kcontrol/about/top-right-kcontrol.png
 share/apps/kcontrol/kcontrolui.rc
 share/apps/kcontrol/pics/energybig.png
 share/apps/kcontrol/pics/lo-energy.png
@@ -1011,9 +1077,6 @@ share/apps/kcontrol/pics/mini-world.png
 share/apps/kcontrol/pics/monitor.png
 share/apps/kcontrol/pics/onlyone.png
 share/apps/kcontrol/pics/overlapping.png
-share/apps/kcontrol/pics/part1.png
-share/apps/kcontrol/pics/part2.png
-share/apps/kcontrol/pics/part3.png
 share/apps/kcontrol/pics/play.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1022,25 +1085,42 @@ share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kcontroledit/kcontroleditui.rc
 share/apps/kdcop/kdcopui.rc
-share/apps/kdeprint/template/background.png
+share/apps/kdeprint/template/bar-bottom-left.png
+share/apps/kdeprint/template/bar-bottom-middle.png
+share/apps/kdeprint/template/bar-bottom-right.png
+share/apps/kdeprint/template/bar-middle-left.png
+share/apps/kdeprint/template/bar-middle-right.png
+share/apps/kdeprint/template/bar-top-left.png
+share/apps/kdeprint/template/bar-top-middle.png
+share/apps/kdeprint/template/bar-top-right.png
+share/apps/kdeprint/template/bottom-left.png
+share/apps/kdeprint/template/bottom-middle.png
+share/apps/kdeprint/template/bottom-right.png
+share/apps/kdeprint/template/box-bottom-left.png
+share/apps/kdeprint/template/box-bottom-middle.png
+share/apps/kdeprint/template/box-bottom-right.png
+share/apps/kdeprint/template/box-centre-kdeprint.png
+share/apps/kdeprint/template/box-middle-left.png
+share/apps/kdeprint/template/box-middle-right.png
+share/apps/kdeprint/template/box-top-left.png
+share/apps/kdeprint/template/box-top-middle.png
+share/apps/kdeprint/template/box-top-right.png
 share/apps/kdeprint/template/class.template
 share/apps/kdeprint/template/driver.template
 share/apps/kdeprint/template/htmlstyles.css
 share/apps/kdeprint/template/jobs.template
-share/apps/kdeprint/template/kdelogo2.png
-share/apps/kdeprint/template/kdeprint.png
-share/apps/kdeprint/template/lines.png
-share/apps/kdeprint/template/lines2.png
-share/apps/kdeprint/template/pointers.png
 share/apps/kdeprint/template/printer.template
 share/apps/kdeprint/template/pseudo.template
-share/apps/kdeprint/template/shadow1.png
+share/apps/kdeprint/template/top-left.png
+share/apps/kdeprint/template/top-middle.png
+share/apps/kdeprint/template/top-right-kdeprint.png
 share/apps/kdeprint_part/kdeprint_part.rc
 share/apps/kdeprintfax/anytops
 share/apps/kdeprintfax/faxfilters
 share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
 share/apps/kdeprintfax/kdeprintfaxui.rc
 share/apps/kdesktop/DesktopLinks/Home.desktop
+share/apps/kdesktop/DesktopLinks/System.desktop
 share/apps/kdesktop/directory.autostart
 share/apps/kdesktop/directory.desktop
 share/apps/kdesktop/directory.templates
@@ -1117,8 +1197,9 @@ share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-share/apps/kdm/pics/kdeflower.png
+share/apps/kdm/pics/kdelogo-crystal.png
 share/apps/kdm/pics/kdelogo.png
+share/apps/kdm/pics/shutdown.jpg
 share/apps/kdm/pics/users/Apple.png
 share/apps/kdm/pics/users/BeachBall.png
 share/apps/kdm/pics/users/Blowfish.png
@@ -1197,6 +1278,13 @@ share/apps/kdm/sessions/wm2.desktop
 share/apps/kdm/sessions/wmaker.desktop
 share/apps/kdm/sessions/xfce.desktop
 share/apps/kdm/sessions/xfce4.desktop
+share/apps/kdm/themes/circles/GdmGreeterTheme.desktop
+share/apps/kdm/themes/circles/background.svg
+share/apps/kdm/themes/circles/circles.xml
+share/apps/kdm/themes/circles/flower.png
+share/apps/kdm/themes/circles/help.png
+share/apps/kdm/themes/circles/options.png
+share/apps/kdm/themes/circles/screenshot.png
 share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
@@ -1207,6 +1295,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 share/apps/kfindpart/icons/locolor/22x22/actions/search.png
 share/apps/kfontview/kfontviewpart.rc
+share/apps/kfontview/kfontviewui.rc
 share/apps/khelpcenter/glossary.html.in
 share/apps/khelpcenter/glossary.xslt
 share/apps/khelpcenter/intro.html.in
@@ -1240,14 +1329,20 @@ share/apps/khelpcenter/plugins/links.desktop
 share/apps/khelpcenter/plugins/support.desktop
 share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
+share/apps/khelpcenter/searchhandlers/docbook.desktop
+share/apps/khelpcenter/searchhandlers/htdig.desktop
+share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+share/apps/khelpcenter/searchhandlers/man.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
 share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/apps/khtml/kpartplugins/khtmlkttsd.desktop
+share/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
 share/apps/kicker/applets/ksysguardapplet.desktop
 share/apps/kicker/applets/lockout.desktop
+share/apps/kicker/applets/mediaapplet.desktop
 share/apps/kicker/applets/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
@@ -1255,6 +1350,7 @@ share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/applets/runapplet.desktop
 share/apps/kicker/applets/systemtrayapplet.desktop
 share/apps/kicker/applets/taskbarapplet.desktop
+share/apps/kicker/applets/trashapplet.desktop
 share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
@@ -1271,6 +1367,8 @@ share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
 share/apps/kicker/menuext/recentdocs.desktop
+share/apps/kicker/menuext/remotemenu.desktop
+share/apps/kicker/menuext/systemmenu.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk10.png
 share/apps/kicker/pics/disk2.png
@@ -1416,14 +1514,12 @@ share/apps/konqsidebartng/dirtree/dirtree_module.desktop
 share/apps/konqsidebartng/dirtree/history_module.desktop
 share/apps/konqsidebartng/entries/.version
 share/apps/konqsidebartng/entries/bookmarks.desktop
-share/apps/konqsidebartng/entries/devices.desktop
 share/apps/konqsidebartng/entries/history.desktop
 share/apps/konqsidebartng/entries/home.desktop
 share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
-share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1436,35 +1532,25 @@ share/apps/konqsidebartng/virtual_folders/remote/web/.directory
 share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
+share/apps/konqsidebartng/virtual_folders/services/applications.desktop
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/konqsidebartng/virtual_folders/services/devices.desktop
 share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/konqsidebartng/virtual_folders/services/media.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop
+share/apps/konqsidebartng/virtual_folders/services/settings.desktop
 share/apps/konqsidebartng/websidebar/websidebar.html
-share/apps/konqueror/about/background.png
-share/apps/konqueror/about/background_rtl.png
-share/apps/konqueror/about/bgtable.png
-share/apps/konqueror/about/bgtable_rtl.png
+share/apps/konqueror/about/box-centre-konqueror.png
 share/apps/konqueror/about/intro.html
-share/apps/konqueror/about/intro_rtl.html
-share/apps/konqueror/about/kdelogo2.png
 share/apps/konqueror/about/konq.css
-share/apps/konqueror/about/konq_rtl.css
-share/apps/konqueror/about/konqueror.png
-share/apps/konqueror/about/konqueror_rtl.png
+share/apps/konqueror/about/launch.html
 share/apps/konqueror/about/lightning.png
-share/apps/konqueror/about/lines.png
-share/apps/konqueror/about/lines2.png
-share/apps/konqueror/about/more.png
 share/apps/konqueror/about/plugins.html
 share/apps/konqueror/about/plugins_rtl.html
-share/apps/konqueror/about/pointers.gif
-share/apps/konqueror/about/shadow1.png
 share/apps/konqueror/about/specs.html
-share/apps/konqueror/about/specs_rtl.html
 share/apps/konqueror/about/tips.html
-share/apps/konqueror/about/tips_rtl.html
+share/apps/konqueror/about/top-right-konqueror.png
 share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
@@ -1478,7 +1564,6 @@ share/apps/konqueror/pics/arrow_bottomleft.png
 share/apps/konqueror/pics/arrow_bottomright.png
 share/apps/konqueror/pics/arrow_topleft.png
 share/apps/konqueror/pics/arrow_topright.png
-share/apps/konqueror/pics/indicator_anchor.png
 share/apps/konqueror/pics/indicator_connect.png
 share/apps/konqueror/pics/indicator_empty.png
 share/apps/konqueror/pics/indicator_noconnect.png
@@ -1490,23 +1575,13 @@ share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/simplebrowser
 share/apps/konqueror/profiles/tabbedbrowsing
 share/apps/konqueror/profiles/webbrowsing
-share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
 share/apps/konqueror/servicemenus/installfont.desktop
 share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 share/apps/konqueror/servicemenus/konsolehere.desktop
-share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
+share/apps/konqueror/servicemenus/media_eject.desktop
+share/apps/konqueror/servicemenus/media_mount.desktop
+share/apps/konqueror/servicemenus/media_safelyremove.desktop
+share/apps/konqueror/servicemenus/media_unmount.desktop
 share/apps/konqueror/servicemenus/text-ada-print.desktop
 share/apps/konqueror/servicemenus/text-c++-print.desktop
 share/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1525,8 +1600,6 @@ share/apps/konqueror/servicemenus/text-tcl-print.desktop
 share/apps/konqueror/servicemenus/text-tex-print.desktop
 share/apps/konqueror/servicemenus/text-xml-print.desktop
 share/apps/konqueror/servicemenus/text-xslt-print.desktop
-share/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
 share/apps/konqueror/tiles/bluemorning.png
 share/apps/konqueror/tiles/canvas.png
 share/apps/konqueror/tiles/checker.png
@@ -1573,6 +1646,7 @@ share/apps/konsole/profiles/4shells
 share/apps/konsole/profiles/5shells
 share/apps/konsole/screen.desktop
 share/apps/konsole/shell.desktop
+share/apps/konsole/solaris.keytab
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
 share/apps/konsole/syscolor.schema
@@ -1598,9 +1672,12 @@ share/apps/ksplash/Themes/Default/splash_active_bar.png
 share/apps/ksplash/Themes/Default/splash_bottom.png
 share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 share/apps/ksplash/Themes/Default/splash_top.png
+share/apps/ksplash/Themes/None/Theme.rc
 share/apps/ksplash/Themes/Redmond/Background.png
 share/apps/ksplash/Themes/Redmond/Preview.png
 share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Simple/Preview.png
+share/apps/ksplash/Themes/Simple/Theme.rc
 share/apps/ksplash/Themes/Standard/Preview.png
 share/apps/ksplash/Themes/Standard/Theme.rc
 share/apps/ksplash/Themes/blue-bend/Preview.png
@@ -1626,6 +1703,30 @@ share/apps/ksysguard/pics/shell.png
 share/apps/ksysguard/pics/tools.png
 share/apps/ksysguard/pics/unknownapp.png
 share/apps/ksysguard/pics/waiting.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml
+share/apps/kthememanager/themes/Keramik/Keramik.preview.png
+share/apps/kthememanager/themes/Keramik/Keramik.xml
+share/apps/kthememanager/themes/Plastik/Plastik.preview.png
+share/apps/kthememanager/themes/Plastik/Plastik.xml
+share/apps/kthememanager/themes/Platinum/Platinum.preview.png
+share/apps/kthememanager/themes/Platinum/Platinum.xml
+share/apps/kthememanager/themes/Redmond/Redmond.preview.png
+share/apps/kthememanager/themes/Redmond/Redmond.xml
+share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png
+share/apps/kthememanager/themes/Sunshine/Sunshine.xml
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
 share/apps/kwin/keramik.desktop
@@ -1644,12 +1745,20 @@ share/apps/kwin/pics/menu.png
 share/apps/kwin/pics/pindown.png
 share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
+share/apps/kwin/plastik.desktop
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
+share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/smb-network.desktop
+share/apps/systemview/home.desktop
+share/apps/systemview/media.desktop
+share/apps/systemview/remote.desktop
+share/apps/systemview/settings.desktop
+share/apps/systemview/trash.desktop
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
@@ -1658,15 +1767,20 @@ share/autostart/ktip.desktop
 share/autostart/panel.desktop
 share/config.kcfg/kcm_useraccount.kcfg
 share/config.kcfg/kcm_useraccount_pass.kcfg
+share/config.kcfg/kdesktop.kcfg
+share/config.kcfg/khelpcenter.kcfg
+share/config.kcfg/klaunch.kcfg
 share/config.kcfg/konqueror.kcfg
+share/config.kcfg/kwebdesktop.kcfg
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/taskbar.kcfg
+share/config/katerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
 share/config/kxkb_groups
-share/config/mountwatcher.desktop
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -1689,6 +1803,7 @@ share/desktop-directories/kde-science.directory
 share/desktop-directories/kde-settings-accessibility.directory
 share/desktop-directories/kde-settings-components.directory
 share/desktop-directories/kde-settings-desktop.directory
+share/desktop-directories/kde-settings-hardware.directory
 share/desktop-directories/kde-settings-looknfeel.directory
 share/desktop-directories/kde-settings-network.directory
 share/desktop-directories/kde-settings-peripherals.directory
@@ -1706,6 +1821,7 @@ share/desktop-directories/kde-toys.directory
 share/desktop-directories/kde-unknown.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
+share/doc/HTML/en/kappfinder/man-kappfinder.1.docbook
 share/doc/HTML/en/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1866,6 +1982,9 @@ share/doc/HTML/en/kcontrol/useragent/index.docbook
 share/doc/HTML/en/kcontrol/windowmanagement/common
 share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/en/kdcop/common
+share/doc/HTML/en/kdcop/index.cache.bz2
+share/doc/HTML/en/kdcop/index.docbook
 share/doc/HTML/en/kdebase-apidocs/common
 share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.cache.bz2
@@ -1961,7 +2080,10 @@ share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/HTML/en/khelpcenter/faq/questions.docbook
+share/doc/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
 share/doc/HTML/en/khelpcenter/faq/winmng.docbook
 share/doc/HTML/en/khelpcenter/glossary/checkxrefs
 share/doc/HTML/en/khelpcenter/glossary/common
@@ -1982,20 +2104,84 @@ share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/shadow1.png
 share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/a-window.png
+share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
+share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
+share/doc/HTML/en/khelpcenter/userguide/amarok.png
+share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
 share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook
-share/doc/HTML/en/khelpcenter/userguide/history.docbook
+share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
+share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/en/khelpcenter/userguide/desktop.png
+share/doc/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
+share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
+share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
+share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
+share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/more-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/notices-trademarks.docbook
-share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/staff.docbook
-share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook
+share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
+share/doc/HTML/en/khelpcenter/userguide/juk.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
+share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
+share/doc/HTML/en/khelpcenter/userguide/kmag.png
+share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
+share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
+share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-start.png
+share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
+share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
+share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/kopete.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
+share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
+share/doc/HTML/en/khelpcenter/userguide/noatun.png
+share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
+share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
+share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
+share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
+share/doc/HTML/en/khelpcenter/userguide/rip.png
+share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
+share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
+share/doc/HTML/en/khelpcenter/userguide/services.png
+share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
+share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
+share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
@@ -2056,6 +2242,9 @@ share/doc/HTML/en/kinfocenter/memory/index.docbook
 share/doc/HTML/en/kinfocenter/nics/common
 share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
 share/doc/HTML/en/kinfocenter/nics/index.docbook
+share/doc/HTML/en/kinfocenter/opengl/common
+share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
+share/doc/HTML/en/kinfocenter/opengl/index.docbook
 share/doc/HTML/en/kinfocenter/partitions/common
 share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
 share/doc/HTML/en/kinfocenter/partitions/index.docbook
@@ -2086,7 +2275,6 @@ share/doc/HTML/en/kinfocenter/usb/index.docbook
 share/doc/HTML/en/kinfocenter/xserver/common
 share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
 share/doc/HTML/en/kinfocenter/xserver/index.docbook
-share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
@@ -2144,6 +2332,10 @@ share/doc/HTML/en/kmenuedit/i_paste.png
 share/doc/HTML/en/kmenuedit/icon_sets.png
 share/doc/HTML/en/kmenuedit/index.cache.bz2
 share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/knetattach/common
+share/doc/HTML/en/knetattach/index.cache.bz2
+share/doc/HTML/en/knetattach/index.docbook
+share/doc/HTML/en/knetattach/screenshot.png
 share/doc/HTML/en/konqueror/basics.docbook
 share/doc/HTML/en/konqueror/bookmarks.docbook
 share/doc/HTML/en/konqueror/browser.docbook
@@ -2160,6 +2352,7 @@ share/doc/HTML/en/konqueror/index.cache.bz2
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/introduction.docbook
 share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
 share/doc/HTML/en/konqueror/parts.png
 share/doc/HTML/en/konqueror/path-complete.docbook
 share/doc/HTML/en/konqueror/plugins.docbook
@@ -2171,6 +2364,7 @@ share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/konsole.png
+share/doc/HTML/en/konsole/tabbar.png
 share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
@@ -2203,8 +2397,10 @@ share/icons/crystalsvg/128x128/apps/bell.png
 share/icons/crystalsvg/128x128/apps/cache.png
 share/icons/crystalsvg/128x128/apps/clanbomber.png
 share/icons/crystalsvg/128x128/apps/clock.png
+share/icons/crystalsvg/128x128/apps/colors.png
 share/icons/crystalsvg/128x128/apps/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy.png
 share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
 share/icons/crystalsvg/128x128/apps/fonts.png
@@ -2215,19 +2411,20 @@ share/icons/crystalsvg/128x128/apps/kappfinder.png
 share/icons/crystalsvg/128x128/apps/kate.png
 share/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/icons/crystalsvg/128x128/apps/kcmdf.png
+share/icons/crystalsvg/128x128/apps/kcmkwm.png
 share/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/icons/crystalsvg/128x128/apps/kcmpci.png
 share/icons/crystalsvg/128x128/apps/kcontrol.png
 share/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/icons/crystalsvg/128x128/apps/kdmconfig.png
-share/icons/crystalsvg/128x128/apps/keditbookmarks.png
 share/icons/crystalsvg/128x128/apps/key_bindings.png
 share/icons/crystalsvg/128x128/apps/kfm_home.png
 share/icons/crystalsvg/128x128/apps/khelpcenter.png
 share/icons/crystalsvg/128x128/apps/kjobviewer.png
 share/icons/crystalsvg/128x128/apps/klipper.png
 share/icons/crystalsvg/128x128/apps/kmenu.png
+share/icons/crystalsvg/128x128/apps/knetattach.png
 share/icons/crystalsvg/128x128/apps/konqueror.png
 share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
@@ -2245,6 +2442,7 @@ share/icons/crystalsvg/128x128/apps/multimedia.png
 share/icons/crystalsvg/128x128/apps/netscape.png
 share/icons/crystalsvg/128x128/apps/package.png
 share/icons/crystalsvg/128x128/apps/package_applications.png
+share/icons/crystalsvg/128x128/apps/package_development.png
 share/icons/crystalsvg/128x128/apps/package_favourite.png
 share/icons/crystalsvg/128x128/apps/package_games.png
 share/icons/crystalsvg/128x128/apps/package_multimedia.png
@@ -2291,6 +2489,10 @@ share/icons/crystalsvg/16x16/apps/designer.png
 share/icons/crystalsvg/16x16/apps/dia.png
 share/icons/crystalsvg/16x16/apps/dlgedit.png
 share/icons/crystalsvg/16x16/apps/eclipse.png
+share/icons/crystalsvg/16x16/apps/edu_languages.png
+share/icons/crystalsvg/16x16/apps/edu_mathematics.png
+share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
+share/icons/crystalsvg/16x16/apps/edu_science.png
 share/icons/crystalsvg/16x16/apps/emacs.png
 share/icons/crystalsvg/16x16/apps/email.png
 share/icons/crystalsvg/16x16/apps/energy.png
@@ -2307,7 +2509,6 @@ share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/gnomemeeting.png
 share/icons/crystalsvg/16x16/apps/gnucash.png
 share/icons/crystalsvg/16x16/apps/gnumeric.png
-share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
 share/icons/crystalsvg/16x16/apps/help_index.png
@@ -2346,6 +2547,7 @@ share/icons/crystalsvg/16x16/apps/kjobviewer.png
 share/icons/crystalsvg/16x16/apps/klipper.png
 share/icons/crystalsvg/16x16/apps/kmenu.png
 share/icons/crystalsvg/16x16/apps/kmenuedit.png
+share/icons/crystalsvg/16x16/apps/knetattach.png
 share/icons/crystalsvg/16x16/apps/knotify.png
 share/icons/crystalsvg/16x16/apps/konqueror.png
 share/icons/crystalsvg/16x16/apps/konsole.png
@@ -2412,7 +2614,6 @@ share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
 share/icons/crystalsvg/16x16/apps/scribus.png
 share/icons/crystalsvg/16x16/apps/sodipodi.png
-share/icons/crystalsvg/16x16/apps/soffice.png
 share/icons/crystalsvg/16x16/apps/style.png
 share/icons/crystalsvg/16x16/apps/stylesheet.png
 share/icons/crystalsvg/16x16/apps/terminal.png
@@ -2423,7 +2624,6 @@ share/icons/crystalsvg/16x16/apps/vnc.png
 share/icons/crystalsvg/16x16/apps/wabi.png
 share/icons/crystalsvg/16x16/apps/window_list.png
 share/icons/crystalsvg/16x16/apps/wine.png
-share/icons/crystalsvg/16x16/apps/winprops.png
 share/icons/crystalsvg/16x16/apps/wp.png
 share/icons/crystalsvg/16x16/apps/xcalc.png
 share/icons/crystalsvg/16x16/apps/xchat.png
@@ -2441,18 +2641,54 @@ share/icons/crystalsvg/16x16/apps/xmms.png
 share/icons/crystalsvg/16x16/apps/xosview.png
 share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
-share/icons/crystalsvg/16x16/devices/print_printer.png
-share/icons/crystalsvg/16x16/filesystems/folder_print2.png
 share/icons/crystalsvg/22x22/actions/newfont.png
-share/icons/crystalsvg/22x22/actions/textwaterfall.png
+share/icons/crystalsvg/22x22/apps/access.png
+share/icons/crystalsvg/22x22/apps/agent.png
+share/icons/crystalsvg/22x22/apps/arts.png
+share/icons/crystalsvg/22x22/apps/background.png
+share/icons/crystalsvg/22x22/apps/bell.png
+share/icons/crystalsvg/22x22/apps/cache.png
+share/icons/crystalsvg/22x22/apps/colors.png
+share/icons/crystalsvg/22x22/apps/cookie.png
+share/icons/crystalsvg/22x22/apps/date.png
+share/icons/crystalsvg/22x22/apps/email.png
+share/icons/crystalsvg/22x22/apps/energy.png
+share/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/icons/crystalsvg/22x22/apps/filetypes.png
+share/icons/crystalsvg/22x22/apps/fonts.png
+share/icons/crystalsvg/22x22/apps/hwinfo.png
+share/icons/crystalsvg/22x22/apps/icons.png
+share/icons/crystalsvg/22x22/apps/iconthemes.png
+share/icons/crystalsvg/22x22/apps/kcmdevices.png
+share/icons/crystalsvg/22x22/apps/kcmkicker.png
+share/icons/crystalsvg/22x22/apps/kcmkwm.png
+share/icons/crystalsvg/22x22/apps/kcmx.png
+share/icons/crystalsvg/22x22/apps/kdmconfig.png
+share/icons/crystalsvg/22x22/apps/key_bindings.png
+share/icons/crystalsvg/22x22/apps/keyboard.png
+share/icons/crystalsvg/22x22/apps/kfm.png
+share/icons/crystalsvg/22x22/apps/khelpcenter.png
+share/icons/crystalsvg/22x22/apps/kjobviewer.png
 share/icons/crystalsvg/22x22/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/kmenu.png
+share/icons/crystalsvg/22x22/apps/knetattach.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/konsole.png
+share/icons/crystalsvg/22x22/apps/kscreensaver.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
+share/icons/crystalsvg/22x22/apps/kthememgr.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
+share/icons/crystalsvg/22x22/apps/locale.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/package_development.png
+share/icons/crystalsvg/22x22/apps/personal.png
+share/icons/crystalsvg/22x22/apps/printmgr.png
+share/icons/crystalsvg/22x22/apps/proxy.png
 share/icons/crystalsvg/22x22/apps/randr.png
+share/icons/crystalsvg/22x22/apps/samba.png
+share/icons/crystalsvg/22x22/apps/style.png
+share/icons/crystalsvg/22x22/apps/stylesheet.png
 share/icons/crystalsvg/32x32/actions/newfont.png
-share/icons/crystalsvg/32x32/actions/textwaterfall.png
 share/icons/crystalsvg/32x32/apps/abiword.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
@@ -2475,6 +2711,10 @@ share/icons/crystalsvg/32x32/apps/designer.png
 share/icons/crystalsvg/32x32/apps/dia.png
 share/icons/crystalsvg/32x32/apps/dlgedit.png
 share/icons/crystalsvg/32x32/apps/eclipse.png
+share/icons/crystalsvg/32x32/apps/edu_languages.png
+share/icons/crystalsvg/32x32/apps/edu_mathematics.png
+share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
+share/icons/crystalsvg/32x32/apps/edu_science.png
 share/icons/crystalsvg/32x32/apps/emacs.png
 share/icons/crystalsvg/32x32/apps/email.png
 share/icons/crystalsvg/32x32/apps/energy.png
@@ -2493,7 +2733,6 @@ share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/gnomemeeting.png
 share/icons/crystalsvg/32x32/apps/gnucash.png
 share/icons/crystalsvg/32x32/apps/gnumeric.png
-share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
 share/icons/crystalsvg/32x32/apps/help_index.png
@@ -2505,7 +2744,6 @@ share/icons/crystalsvg/32x32/apps/kappfinder.png
 share/icons/crystalsvg/32x32/apps/kate.png
 share/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
-share/icons/crystalsvg/32x32/apps/kcmfontinst.png
 share/icons/crystalsvg/32x32/apps/kcmkicker.png
 share/icons/crystalsvg/32x32/apps/kcmkwm.png
 share/icons/crystalsvg/32x32/apps/kcmmemory.png
@@ -2528,12 +2766,12 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 share/icons/crystalsvg/32x32/apps/kfind.png
 share/icons/crystalsvg/32x32/apps/kfm.png
 share/icons/crystalsvg/32x32/apps/kfm_home.png
-share/icons/crystalsvg/32x32/apps/kfontview.png
 share/icons/crystalsvg/32x32/apps/khelpcenter.png
 share/icons/crystalsvg/32x32/apps/kjobviewer.png
 share/icons/crystalsvg/32x32/apps/klipper.png
 share/icons/crystalsvg/32x32/apps/kmenu.png
 share/icons/crystalsvg/32x32/apps/kmenuedit.png
+share/icons/crystalsvg/32x32/apps/knetattach.png
 share/icons/crystalsvg/32x32/apps/knotify.png
 share/icons/crystalsvg/32x32/apps/konqueror.png
 share/icons/crystalsvg/32x32/apps/konsole.png
@@ -2565,6 +2803,7 @@ share/icons/crystalsvg/32x32/apps/netscape.png
 share/icons/crystalsvg/32x32/apps/opera.png
 share/icons/crystalsvg/32x32/apps/package.png
 share/icons/crystalsvg/32x32/apps/package_applications.png
+share/icons/crystalsvg/32x32/apps/package_development.png
 share/icons/crystalsvg/32x32/apps/package_editors.png
 share/icons/crystalsvg/32x32/apps/package_edutainment.png
 share/icons/crystalsvg/32x32/apps/package_favourite.png
@@ -2596,7 +2835,6 @@ share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/scribus.png
 share/icons/crystalsvg/32x32/apps/sodipodi.png
-share/icons/crystalsvg/32x32/apps/soffice.png
 share/icons/crystalsvg/32x32/apps/style.png
 share/icons/crystalsvg/32x32/apps/stylesheet.png
 share/icons/crystalsvg/32x32/apps/terminal.png
@@ -2607,7 +2845,6 @@ share/icons/crystalsvg/32x32/apps/vnc.png
 share/icons/crystalsvg/32x32/apps/wabi.png
 share/icons/crystalsvg/32x32/apps/window_list.png
 share/icons/crystalsvg/32x32/apps/wine.png
-share/icons/crystalsvg/32x32/apps/winprops.png
 share/icons/crystalsvg/32x32/apps/wp.png
 share/icons/crystalsvg/32x32/apps/x.png
 share/icons/crystalsvg/32x32/apps/xapp.png
@@ -2628,8 +2865,6 @@ share/icons/crystalsvg/32x32/apps/xmms.png
 share/icons/crystalsvg/32x32/apps/xosview.png
 share/icons/crystalsvg/32x32/apps/xpaint.png
 share/icons/crystalsvg/32x32/apps/xv.png
-share/icons/crystalsvg/32x32/devices/print_printer.png
-share/icons/crystalsvg/32x32/filesystems/folder_print2.png
 share/icons/crystalsvg/48x48/apps/abiword.png
 share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
@@ -2649,6 +2884,10 @@ share/icons/crystalsvg/48x48/apps/date.png
 share/icons/crystalsvg/48x48/apps/designer.png
 share/icons/crystalsvg/48x48/apps/dia.png
 share/icons/crystalsvg/48x48/apps/eclipse.png
+share/icons/crystalsvg/48x48/apps/edu_languages.png
+share/icons/crystalsvg/48x48/apps/edu_mathematics.png
+share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
+share/icons/crystalsvg/48x48/apps/edu_science.png
 share/icons/crystalsvg/48x48/apps/emacs.png
 share/icons/crystalsvg/48x48/apps/email.png
 share/icons/crystalsvg/48x48/apps/energy.png
@@ -2666,7 +2905,6 @@ share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/gnomemeeting.png
 share/icons/crystalsvg/48x48/apps/gnucash.png
 share/icons/crystalsvg/48x48/apps/gnumeric.png
-share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
 share/icons/crystalsvg/48x48/apps/hwinfo.png
@@ -2678,10 +2916,10 @@ share/icons/crystalsvg/48x48/apps/kate.png
 share/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/icons/crystalsvg/48x48/apps/kcmdf.png
 share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
-share/icons/crystalsvg/48x48/apps/kcmfontinst.png
 share/icons/crystalsvg/48x48/apps/kcmkwm.png
 share/icons/crystalsvg/48x48/apps/kcmmemory.png
 share/icons/crystalsvg/48x48/apps/kcmmidi.png
+share/icons/crystalsvg/48x48/apps/kcmopengl.png
 share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
@@ -2699,12 +2937,12 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 share/icons/crystalsvg/48x48/apps/kfind.png
 share/icons/crystalsvg/48x48/apps/kfm.png
 share/icons/crystalsvg/48x48/apps/kfm_home.png
-share/icons/crystalsvg/48x48/apps/kfontview.png
 share/icons/crystalsvg/48x48/apps/khelpcenter.png
 share/icons/crystalsvg/48x48/apps/kjobviewer.png
 share/icons/crystalsvg/48x48/apps/klipper.png
 share/icons/crystalsvg/48x48/apps/kmenu.png
 share/icons/crystalsvg/48x48/apps/kmenuedit.png
+share/icons/crystalsvg/48x48/apps/knetattach.png
 share/icons/crystalsvg/48x48/apps/knotify.png
 share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
@@ -2731,6 +2969,7 @@ share/icons/crystalsvg/48x48/apps/netscape.png
 share/icons/crystalsvg/48x48/apps/opera.png
 share/icons/crystalsvg/48x48/apps/package.png
 share/icons/crystalsvg/48x48/apps/package_applications.png
+share/icons/crystalsvg/48x48/apps/package_development.png
 share/icons/crystalsvg/48x48/apps/package_editors.png
 share/icons/crystalsvg/48x48/apps/package_edutainment.png
 share/icons/crystalsvg/48x48/apps/package_favourite.png
@@ -2760,7 +2999,6 @@ share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/scribus.png
 share/icons/crystalsvg/48x48/apps/sodipodi.png
-share/icons/crystalsvg/48x48/apps/soffice.png
 share/icons/crystalsvg/48x48/apps/staroffice.png
 share/icons/crystalsvg/48x48/apps/style.png
 share/icons/crystalsvg/48x48/apps/stylesheet.png
@@ -2770,7 +3008,6 @@ share/icons/crystalsvg/48x48/apps/usb.png
 share/icons/crystalsvg/48x48/apps/vnc.png
 share/icons/crystalsvg/48x48/apps/window_list.png
 share/icons/crystalsvg/48x48/apps/wine.png
-share/icons/crystalsvg/48x48/apps/winprops.png
 share/icons/crystalsvg/48x48/apps/wmaker_apps.png
 share/icons/crystalsvg/48x48/apps/wp.png
 share/icons/crystalsvg/48x48/apps/xchat.png
@@ -2780,8 +3017,7 @@ share/icons/crystalsvg/48x48/apps/xemacs.png
 share/icons/crystalsvg/48x48/apps/xfmail.png
 share/icons/crystalsvg/48x48/apps/xmag.png
 share/icons/crystalsvg/48x48/apps/xv.png
-share/icons/crystalsvg/48x48/devices/print_printer.png
-share/icons/crystalsvg/48x48/filesystems/folder_print2.png
+share/icons/crystalsvg/64x64/apps/access.png
 share/icons/crystalsvg/64x64/apps/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
 share/icons/crystalsvg/64x64/apps/arts.png
@@ -2790,9 +3026,13 @@ share/icons/crystalsvg/64x64/apps/bell.png
 share/icons/crystalsvg/64x64/apps/cache.png
 share/icons/crystalsvg/64x64/apps/clanbomber.png
 share/icons/crystalsvg/64x64/apps/clock.png
+share/icons/crystalsvg/64x64/apps/colors.png
+share/icons/crystalsvg/64x64/apps/cookie.png
 share/icons/crystalsvg/64x64/apps/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy.png
 share/icons/crystalsvg/64x64/apps/energy_star.png
+share/icons/crystalsvg/64x64/apps/enhanced_browsing.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
 share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
@@ -2804,6 +3044,7 @@ share/icons/crystalsvg/64x64/apps/kappfinder.png
 share/icons/crystalsvg/64x64/apps/kate.png
 share/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/icons/crystalsvg/64x64/apps/kcmdf.png
+share/icons/crystalsvg/64x64/apps/kcmkwm.png
 share/icons/crystalsvg/64x64/apps/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
@@ -2820,6 +3061,7 @@ share/icons/crystalsvg/64x64/apps/khelpcenter.png
 share/icons/crystalsvg/64x64/apps/kjobviewer.png
 share/icons/crystalsvg/64x64/apps/klipper.png
 share/icons/crystalsvg/64x64/apps/kmenu.png
+share/icons/crystalsvg/64x64/apps/knetattach.png
 share/icons/crystalsvg/64x64/apps/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
@@ -2840,6 +3082,7 @@ share/icons/crystalsvg/64x64/apps/nedit.png
 share/icons/crystalsvg/64x64/apps/netscape.png
 share/icons/crystalsvg/64x64/apps/package.png
 share/icons/crystalsvg/64x64/apps/package_applications.png
+share/icons/crystalsvg/64x64/apps/package_development.png
 share/icons/crystalsvg/64x64/apps/package_favourite.png
 share/icons/crystalsvg/64x64/apps/package_games.png
 share/icons/crystalsvg/64x64/apps/package_multimedia.png
@@ -2865,17 +3108,13 @@ share/icons/crystalsvg/64x64/apps/wp.png
 share/icons/crystalsvg/64x64/apps/xclock.png
 share/icons/crystalsvg/64x64/apps/xfmail.png
 share/icons/crystalsvg/64x64/apps/xmag.png
-share/icons/crystalsvg/64x64/devices/print_printer.png
 share/icons/crystalsvg/scalable/apps/access.svgz
 share/icons/crystalsvg/scalable/apps/acroread.svgz
 share/icons/crystalsvg/scalable/apps/aim.svgz
 share/icons/crystalsvg/scalable/apps/aktion.svgz
 share/icons/crystalsvg/scalable/apps/antivirus.svgz
 share/icons/crystalsvg/scalable/apps/applixware.svgz
-share/icons/crystalsvg/scalable/apps/ark.svgz
 share/icons/crystalsvg/scalable/apps/arts.svgz
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svgz
 share/icons/crystalsvg/scalable/apps/background.svgz
 share/icons/crystalsvg/scalable/apps/bell.svgz
 share/icons/crystalsvg/scalable/apps/browser.svgz
@@ -2894,48 +3133,41 @@ share/icons/crystalsvg/scalable/apps/error.svgz
 share/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/icons/crystalsvg/scalable/apps/fonts.svgz
 share/icons/crystalsvg/scalable/apps/galeon.svgz
-share/icons/crystalsvg/scalable/apps/gnome/apps.svgz
-share/icons/crystalsvg/scalable/apps/go.svgz
-share/icons/crystalsvg/scalable/apps/harddrive.svgz
+share/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/icons/crystalsvg/scalable/apps/hardware.svgz
 share/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/icons/crystalsvg/scalable/apps/karbon14.svgz
-share/icons/crystalsvg/scalable/apps/kate.svgz
-share/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/icons/crystalsvg/scalable/apps/kate2.svgz
 share/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+share/icons/crystalsvg/scalable/apps/kcmx.svgz
 share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/icons/crystalsvg/scalable/apps/kdict.svgz
-share/icons/crystalsvg/scalable/apps/kdvi.svgz
 share/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz
+share/icons/crystalsvg/scalable/apps/kjobviewer.svgz
 share/icons/crystalsvg/scalable/apps/klipper.svgz
-share/icons/crystalsvg/scalable/apps/kmail.svgz
+share/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/icons/crystalsvg/scalable/apps/knetattach.svgz
 share/icons/crystalsvg/scalable/apps/konqueror.svgz
 share/icons/crystalsvg/scalable/apps/konsole.svgz
-share/icons/crystalsvg/scalable/apps/kopete.svgz
-share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
-share/icons/crystalsvg/scalable/apps/kwrite.svgz
+share/icons/crystalsvg/scalable/apps/ktip.svgz
+share/icons/crystalsvg/scalable/apps/kwrite2.svgz
 share/icons/crystalsvg/scalable/apps/locale.svgz
-share/icons/crystalsvg/scalable/apps/mail.svgz
 share/icons/crystalsvg/scalable/apps/my_mac.svgz
-share/icons/crystalsvg/scalable/apps/mycomputer.svgz
 share/icons/crystalsvg/scalable/apps/netscape.svgz
 share/icons/crystalsvg/scalable/apps/openoffice.svgz
+share/icons/crystalsvg/scalable/apps/package_development.svgz
 share/icons/crystalsvg/scalable/apps/package_toys.svgz
-share/icons/crystalsvg/scalable/apps/package_utilities.svgz
 share/icons/crystalsvg/scalable/apps/penguin.svgz
+share/icons/crystalsvg/scalable/apps/personal.svgz
+share/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/icons/crystalsvg/scalable/apps/samba.svgz
 share/icons/crystalsvg/scalable/apps/shell.svgz
-share/icons/crystalsvg/scalable/apps/soffice.svgz
 share/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/icons/crystalsvg/scalable/apps/stylesheet.svgz
 share/icons/crystalsvg/scalable/apps/terminal.svgz
 share/icons/crystalsvg/scalable/apps/tux.svgz
 share/icons/crystalsvg/scalable/apps/wine.svgz
-share/icons/crystalsvg/scalable/apps/winprops.svgz
 share/icons/crystalsvg/scalable/apps/x.svgz
 share/icons/crystalsvg/scalable/apps/xapp.svgz
 share/icons/crystalsvg/scalable/apps/xcalc.svgz
@@ -2945,8 +3177,6 @@ share/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/icons/crystalsvg/scalable/apps/xpaint.svgz
 share/icons/hicolor/16x16/apps/khotkeys.png
 share/icons/hicolor/32x32/apps/khotkeys.png
-share/icons/locolor/16x16/apps/kcmfontinst.png
-share/icons/locolor/32x32/apps/kcmfontinst.png
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
@@ -3427,24 +3657,34 @@ share/mimelnk/application/x-smb-server.desktop
 share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
-share/mimelnk/kdedevice/cdrom_mounted.desktop
-share/mimelnk/kdedevice/cdrom_unmounted.desktop
-share/mimelnk/kdedevice/cdwriter_mounted.desktop
-share/mimelnk/kdedevice/cdwriter_unmounted.desktop
-share/mimelnk/kdedevice/dvd_mounted.desktop
-share/mimelnk/kdedevice/dvd_unmounted.desktop
-share/mimelnk/kdedevice/floppy5_mounted.desktop
-share/mimelnk/kdedevice/floppy5_unmounted.desktop
-share/mimelnk/kdedevice/floppy_mounted.desktop
-share/mimelnk/kdedevice/floppy_unmounted.desktop
-share/mimelnk/kdedevice/hdd_mounted.desktop
-share/mimelnk/kdedevice/hdd_unmounted.desktop
-share/mimelnk/kdedevice/nfs_mounted.desktop
-share/mimelnk/kdedevice/nfs_unmounted.desktop
-share/mimelnk/kdedevice/smb_mounted.desktop
-share/mimelnk/kdedevice/smb_unmounted.desktop
-share/mimelnk/kdedevice/zip_mounted.desktop
-share/mimelnk/kdedevice/zip_unmounted.desktop
+share/mimelnk/inode/system_directory.desktop
+share/mimelnk/media/audiocd.desktop
+share/mimelnk/media/blankcd.desktop
+share/mimelnk/media/blankdvd.desktop
+share/mimelnk/media/cdrom_mounted.desktop
+share/mimelnk/media/cdrom_unmounted.desktop
+share/mimelnk/media/cdwriter_mounted.desktop
+share/mimelnk/media/cdwriter_unmounted.desktop
+share/mimelnk/media/dvd_mounted.desktop
+share/mimelnk/media/dvd_unmounted.desktop
+share/mimelnk/media/dvdvideo.desktop
+share/mimelnk/media/floppy5_mounted.desktop
+share/mimelnk/media/floppy5_unmounted.desktop
+share/mimelnk/media/floppy_mounted.desktop
+share/mimelnk/media/floppy_unmounted.desktop
+share/mimelnk/media/gphoto2camera.desktop
+share/mimelnk/media/hdd_mounted.desktop
+share/mimelnk/media/hdd_unmounted.desktop
+share/mimelnk/media/nfs_mounted.desktop
+share/mimelnk/media/nfs_unmounted.desktop
+share/mimelnk/media/removable_mounted.desktop
+share/mimelnk/media/removable_unmounted.desktop
+share/mimelnk/media/smb_mounted.desktop
+share/mimelnk/media/smb_unmounted.desktop
+share/mimelnk/media/svcd.desktop
+share/mimelnk/media/vcd.desktop
+share/mimelnk/media/zip_mounted.desktop
+share/mimelnk/media/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
 share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
@@ -3453,13 +3693,14 @@ share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
 share/mimelnk/print/printermodel.desktop
 share/services/about.protocol
+share/services/applications.protocol
 share/services/ar.protocol
 share/services/bzip.protocol
 share/services/bzip2.protocol
 share/services/cgi.protocol
 share/services/cursorthumbnail.desktop
-share/services/devices.protocol
 share/services/djvuthumbnail.desktop
+share/services/exrthumbnail.desktop
 share/services/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
@@ -3468,17 +3709,21 @@ share/services/fontthumbnail.desktop
 share/services/gzip.protocol
 share/services/htmlthumbnail.desktop
 share/services/imagethumbnail.desktop
-share/services/imap4.protocol
-share/services/imaps.protocol
 share/services/info.protocol
 share/services/kaccess.desktop
 share/services/katedefaultproject.desktop
+share/services/katekttsd.desktop
 share/services/kded/favicons.desktop
+share/services/kded/khotkeys.desktop
 share/services/kded/konqy_preloader.desktop
 share/services/kded/kwrited.desktop
-share/services/kded/mountwatcher.desktop
+share/services/kded/mediamanager.desktop
+share/services/kded/remotedirnotify.desktop
+share/services/kded/systemdirnotify.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
+share/services/kfile_media.desktop
+share/services/kfile_trash.desktop
 share/services/kfindpart.desktop
 share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
@@ -3491,7 +3736,6 @@ share/services/konq_multicolumnview.desktop
 share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
-share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
@@ -3508,6 +3752,7 @@ share/services/ldaps.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
+share/services/media.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
 share/services/picturethumbnail.desktop
@@ -3516,23 +3761,27 @@ share/services/pop3s.protocol
 share/services/print.protocol
 share/services/printdb.protocol
 share/services/programs.protocol
+share/services/remote.protocol
 share/services/searchproviders/acronym.desktop
 share/services/searchproviders/alexa.desktop
 share/services/searchproviders/alexa_url.desktop
 share/services/searchproviders/alltheweb.desktop
 share/services/searchproviders/altavista.desktop
+share/services/searchproviders/amg.desktop
 share/services/searchproviders/appsy.desktop
 share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/backports.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.desktop
+share/services/searchproviders/cia.desktop
 share/services/searchproviders/citeseer.desktop
 share/services/searchproviders/cpan.desktop
 share/services/searchproviders/ctan.desktop
 share/services/searchproviders/ctan_cat.desktop
 share/services/searchproviders/dbug.desktop
 share/services/searchproviders/de2en.desktop
+share/services/searchproviders/de2fr.desktop
 share/services/searchproviders/deb.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
@@ -3545,10 +3794,12 @@ share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
 share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2de.desktop
 share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freedb.desktop
 share/services/searchproviders/freshmeat.desktop
 share/services/searchproviders/froogle.desktop
+share/services/searchproviders/fsd.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
@@ -3556,6 +3807,7 @@ share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
 share/services/searchproviders/google_news.desktop
 share/services/searchproviders/gracenote.desktop
+share/services/searchproviders/grec.desktop
 share/services/searchproviders/hotbot.desktop
 share/services/searchproviders/hyperdictionary.desktop
 share/services/searchproviders/hyperdictionary_thesaurus.desktop
@@ -3584,6 +3836,8 @@ share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
 share/services/searchproviders/thesaurus.desktop
+share/services/searchproviders/tvtome.desktop
+share/services/searchproviders/uspto.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
@@ -3599,24 +3853,30 @@ share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
+share/services/trash.protocol
+share/services/useragentstrings/firefoxoncurrent.desktop
+share/services/useragentstrings/googlebot.desktop
 share/services/useragentstrings/ie401onwinnt4.desktop
-share/services/useragentstrings/ie45onwinnt5.desktop
 share/services/useragentstrings/ie501onwinnt5.desktop
 share/services/useragentstrings/ie50onppc.desktop
-share/services/useragentstrings/ie50onwin95.desktop
 share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
+share/services/useragentstrings/ie60oncurrent.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
 share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozoncurrent12.desktop
 share/services/useragentstrings/mozoncurrent16.desktop
 share/services/useragentstrings/mozonwin2000.desktop
-share/services/useragentstrings/mozonwinnt4.desktop
+share/services/useragentstrings/mozonwinxp.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
+share/services/useragentstrings/ns71oncurrent.desktop
+share/services/useragentstrings/ns71onwinnt51.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/op75oncurrent.desktop
 share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
@@ -3645,6 +3905,8 @@ share/sounds/KDE_Beep_Connect.wav
 share/sounds/KDE_Beep_Digital_1.ogg
 share/sounds/KDE_Beep_Digital_2.ogg
 share/sounds/KDE_Beep_Door.wav
+share/sounds/KDE_Beep_Double.ogg
+share/sounds/KDE_Beep_Harsh.ogg
 share/sounds/KDE_Beep_Honk.wav
 share/sounds/KDE_Beep_Lightning.wav
 share/sounds/KDE_Beep_Phone_1.ogg
@@ -3689,6 +3951,7 @@ share/sounds/KDE_Drum_Break.ogg
 share/sounds/KDE_Error.wav
 share/sounds/KDE_Error_1.ogg
 share/sounds/KDE_Error_2.ogg
+share/sounds/KDE_Error_3.ogg
 share/sounds/KDE_Event_1.ogg
 share/sounds/KDE_Event_2.ogg
 share/sounds/KDE_Event_3.ogg
@@ -3766,27 +4029,69 @@ share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
 share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/All-Good-People-1.jpg.desktop
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Blkmarble.jpg.desktop
 share/wallpapers/Chicken-Songs-2.jpg
+share/wallpapers/Chicken-Songs-2.jpg.desktop
 share/wallpapers/Circuit.jpg
+share/wallpapers/Circuit.jpg.desktop
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Foggy1.jpg.desktop
 share/wallpapers/Island-of-Elba.jpg
+share/wallpapers/Island-of-Elba.jpg.desktop
+share/wallpapers/KDE34.png
+share/wallpapers/KDE34.png.desktop
 share/wallpapers/Marble01.jpg
+share/wallpapers/Marble01.jpg.desktop
 share/wallpapers/No-Ones-Laughing-3.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 share/wallpapers/Paper01.jpg
+share/wallpapers/Paper01.jpg.desktop
 share/wallpapers/Planning-And-Probing-1.jpg
+share/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/wallpapers/Totally-New-Product-1.jpg
+share/wallpapers/Totally-New-Product-1.jpg.desktop
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/wallpapers/andes-venezolanos.svgz
+share/wallpapers/andes-venezolanos.svgz.desktop
+share/wallpapers/aurora.svgz
+share/wallpapers/aurora.svgz.desktop
 share/wallpapers/blue-bend.jpg
+share/wallpapers/blue-bend.jpg.desktop
+share/wallpapers/celtic.svgz
+share/wallpapers/celtic.svgz.desktop
 share/wallpapers/default_blue.jpg
+share/wallpapers/default_blue.jpg.desktop
 share/wallpapers/default_gears.jpg
+share/wallpapers/default_gears.jpg.desktop
 share/wallpapers/fulmine.jpg
+share/wallpapers/fulmine.jpg.desktop
+share/wallpapers/gear-flowers.svgz
+share/wallpapers/gear-flowers.svgz.desktop
+share/wallpapers/globe.svgz
+share/wallpapers/globe.svgz.desktop
+share/wallpapers/here-gear.svgz
+share/wallpapers/here-gear.svgz.desktop
 share/wallpapers/kde_box.png
+share/wallpapers/kde_box.png.desktop
 share/wallpapers/kde_passion.jpg
+share/wallpapers/kde_passion.jpg.desktop
+share/wallpapers/konqui.svgz
+share/wallpapers/konqui.svgz.desktop
+share/wallpapers/lineart.svgz
+share/wallpapers/lineart.svgz.desktop
+share/wallpapers/moon.svgz
+share/wallpapers/moon.svgz.desktop
 share/wallpapers/only_k.jpg
+share/wallpapers/only_k.jpg.desktop
 share/wallpapers/seaofconero.jpg
+share/wallpapers/seaofconero.jpg.desktop
 share/wallpapers/triplegears.jpg
+share/wallpapers/triplegears.jpg.desktop
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@@ -3795,19 +4100,15 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/templates/.source/emptydir
 @dirrm share/mimelnk/print
-@dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/media
 @dirrm share/mimelnk/fonts
 @dirrm share/locale/l10n/zw
 @dirrm share/locale/l10n/zm
@@ -4036,7 +4337,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/crystalsvg/scalable/apps/gnome
+@dirrm share/fonts/override
+@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4045,6 +4347,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
+@dirrm share/doc/HTML/en/knetattach
 @dirrm share/doc/HTML/en/kmenuedit
 @dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kioslave
@@ -4058,6 +4361,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kinfocenter/pcmcia
 @dirrm share/doc/HTML/en/kinfocenter/pci
 @dirrm share/doc/HTML/en/kinfocenter/partitions
+@dirrm share/doc/HTML/en/kinfocenter/opengl
 @dirrm share/doc/HTML/en/kinfocenter/nics
 @dirrm share/doc/HTML/en/kinfocenter/memory
 @dirrm share/doc/HTML/en/kinfocenter/ioports
@@ -4083,12 +4387,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate
 @dirrm share/doc/HTML/en/kdebase-apidocs
+@dirrm share/doc/HTML/en/kdcop
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
 @dirrm share/doc/HTML/en/kcontrol/spellchecking
@@ -4134,16 +4436,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
 @dirrm share/doc/HTML/en/kate
+@dirrm share/doc/HTML/en/kappfinder
 @dirrm share/desktop-directories
+@dirrm share/apps/systemview
+@dirrm share/apps/remoteview
+@dirrm share/apps/plugin
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
+@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
+@dirrm share/apps/kthememanager/themes/YellowOnBlue
+@dirrm share/apps/kthememanager/themes/Sunshine
+@dirrm share/apps/kthememanager/themes/Redmond
+@dirrm share/apps/kthememanager/themes/Platinum
+@dirrm share/apps/kthememanager/themes/Plastik
+@dirrm share/apps/kthememanager/themes/Keramik
+@dirrm share/apps/kthememanager/themes/KDE_Classic
+@dirrm share/apps/kthememanager/themes/HighContrastLight-big
+@dirrm share/apps/kthememanager/themes/HighContrastLight
+@dirrm share/apps/kthememanager/themes/HighContrastDark-big
+@dirrm share/apps/kthememanager/themes/HighContrastDark
+@dirrm share/apps/kthememanager/themes
+@dirrm share/apps/kthememanager
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash/Themes/blue-bend
 @dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Simple
 @dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/None
 @dirrm share/apps/ksplash/Themes/Default/locolor
 @dirrm share/apps/ksplash/Themes/Default
 @dirrm share/apps/ksplash/Themes
@@ -4197,7 +4519,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
+@dirrm share/apps/khtml/kpartplugins
 @dirrm share/apps/khotkeys
+@dirrm share/apps/khelpcenter/searchhandlers/htdig
+@dirrm share/apps/khelpcenter/searchhandlers
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
@@ -4209,6 +4534,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/themes/circles
+@dirrm share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
@@ -4237,7 +4564,9 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcontroledit/icons
 @dirrm share/apps/kcontroledit
 @dirrm share/apps/kcontrol/pics
+@dirrm share/apps/kcontrol/about
 @dirrm share/apps/kcontrol
+@dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
 @dirrm share/apps/kcmkeys
@@ -4245,6 +4574,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
+@dirrm share/apps/katepart/kpartplugins
+@dirrm share/apps/kate/plugins/katekttsd
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
diff --git a/x11/kde4/Makefile.kde b/x11/kde4/Makefile.kde
index 3fc622219a8a..256be2bf68a2 100644
--- a/x11/kde4/Makefile.kde
+++ b/x11/kde4/Makefile.kde
@@ -17,7 +17,6 @@ COPY=	-c -p
 # For ports that have I18N components only.
 .if defined(KDE_I18N)
 _NO_KDE_FINAL=	yes
-_NO_KDE_CLOSURE= yes
 _NO_KDE_NDEBUG=	yes
 DISTNAME?=	${PORTNAME}-${PKGNAMEPREFIX:S/-$//}-${PORTVERSION}
 # Since KDE 3.1.3, the kde-i18n tarballs have the ${KDE_VERSION}
@@ -42,10 +41,6 @@ post-extract:
 CONFIGURE_ARGS+=--enable-final
 .endif
 
-.if !defined(_NO_KDE_CLOSURE) && defined(WANT_KDE_CLOSURE)
-CONFIGURE_ARGS+=--enable-closure
-.endif
-
 .if !defined(_NO_KDE_NDEBUG)
 .if defined(PARALLEL_PACKAGE_BUILD) || !defined(WANT_KDE_DEBUG)
 CONFIGURE_ARGS+=--disable-debug
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index fdbd9bfc5636..4679a2d4d220 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,13 +18,16 @@ COMMENT=	Basic applications for the KDE system
 
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient \
+		usb:${PORTSDIR}/devel/libusb
 
-CONFLICTS=	kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.*
+CONFLICTS=	kdelibs-3.[0-3]* kdeutils-3.[0-2]*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
+USE_GETOPT_LONG=yes
 USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,8 +40,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-DO_NOT_COMPILE=	nsplugins
-CONFIGURE_ENV+=	RUN_KAPPFINDER=no
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -49,10 +50,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index a1ad17ecaaad..7a5b5d02fcce 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
-SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
+MD5 (KDE/kdebase-3.4.0.tar.bz2) = c88659e558ca98dc45377bf8ddfc26c9
+SIZE (KDE/kdebase-3.4.0.tar.bz2) = 22670772
diff --git a/x11/kdebase3/files/patch-kcontrol-nics-nic.cpp b/x11/kdebase3/files/patch-kcontrol-nics-nic.cpp
deleted file mode 100644
index e11c3de5032a..000000000000
--- a/x11/kdebase3/files/patch-kcontrol-nics-nic.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kcontrol/nics/nic.cpp	15 Nov 2003 22:01:05 -0000	1.24
-+++ kcontrol/nics/nic.cpp	21 Jan 2004 13:38:46 -0000
-@@ -229,9 +229,14 @@ NICList* findNICs()
-       tmp->addr = buf;
- 
-       if (ifa->ifa_netmask != NULL) {
-+#ifdef Q_OS_FREEBSD
-+	struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask;
-+	tmp->netmask=inet_ntoa(sinptr->sin_addr);
-+#else
- 	bzero(buf, 128);
- 	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
- 	tmp->netmask = buf;
-+#endif
-       }
- 
-       if (ifa->ifa_flags & IFF_UP)
diff --git a/x11/kdebase3/files/patch-kcontrol_konq_previews.cpp b/x11/kdebase3/files/patch-kcontrol_konq_previews.cpp
deleted file mode 100644
index 7fe3246c2149..000000000000
--- a/x11/kdebase3/files/patch-kcontrol_konq_previews.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcontrol/konq/previews.cpp.orig	Sun Oct 26 11:46:25 2003
-+++ kcontrol/konq/previews.cpp	Thu Jan 27 10:16:32 2005
-@@ -153,6 +153,11 @@
- 
-     for ( ; it.current() ; ++it ) {
-         QString protocol( it.current()->text() );
-+        if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) 
-+          // file should be enabled in case is not defined because if not so 
-+          // than preview's lost when size is changed from default one 
-+          it.current()->setOn( true ); 
-+        else 
-         it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
-     // config key is in bytes (default value 1MB), numinput is in MB
diff --git a/x11/kdebase3/files/patch-kdm-backend-xdmcp.c b/x11/kdebase3/files/patch-kdm-backend-xdmcp.c
deleted file mode 100644
index be29ec4d3416..000000000000
--- a/x11/kdebase3/files/patch-kdm-backend-xdmcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/backend/xdmcp.c.orig	Wed May  8 14:21:31 2002
-+++ kdm/backend/xdmcp.c	Wed Jun 26 20:14:02 2002
-@@ -1012,7 +1012,7 @@
- 
-     sprintf (buf, "Session %ld failed for display %.260s: %s",
- 	     (long) sessionID, name, reason);
--    Debug ("send_failed(%\"s)\n", buf);
-+    Debug ("send_failed(\"%s\")\n", buf);
-     status.length = strlen (buf);
-     status.data = (CARD8Ptr) buf;
-     header.version = XDM_PROTOCOL_VERSION;
diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-config.def b/x11/kdebase3/files/patch-kdm-kfrontend-config.def
deleted file mode 100644
index 3776abd3beae..000000000000
--- a/x11/kdebase3/files/patch-kdm-kfrontend-config.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/config.def.orig	Thu Nov 11 20:47:50 2004
-+++ kdm/kfrontend/config.def	Thu Nov 11 20:51:18 2004
-@@ -10,7 +10,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
index 4a3ac236fe1d..a6126b314d8e 100644
--- a/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase3/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,6 +1,6 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
-@@ -578,7 +578,7 @@
+--- kdm/kfrontend/genkdmconf.c.orig	Wed Feb 23 12:26:01 2005
++++ kdm/kfrontend/genkdmconf.c	Sat Mar 19 16:43:49 2005
+@@ -562,7 +562,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
  "#\n"
@@ -9,7 +9,7 @@
  "\n"
  #ifdef _AIX
  "# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-@@ -619,8 +619,8 @@
+@@ -591,8 +591,8 @@
  "# Reassign ownership of the console to root, this should disallow\n"
  "# assignment of console output to any random users's xterm. See Xstartup.\n"
  "#\n"
@@ -19,8 +19,17 @@
 +/* "#chmod 622 /dev/console\n" */
  "\n"
  #ifdef _AIX
- "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,7 +667,9 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ "  */bash)\n"
+@@ -637,7 +639,9 @@
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
@@ -31,3 +40,232 @@
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
  "    [ -f /etc/profile ] && . /etc/profile\n"
+@@ -648,7 +652,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ "  \"\")\n"
+ "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ "    ;;\n"
+@@ -662,10 +666,10 @@
+ "    exec " KDE_BINDIR "/startkde\n"
+ "    ;;\n"
+ "  *)\n"
+-"    eval exec \"$1\"\n"
++"    eval exec \"$session\"\n"
+ "    ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +821,7 @@
+  * XXX this stuff is highly borked. it does not handle collisions at all.
+  */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ 	const char *tptr;
+ 	char *nname;
+@@ -840,12 +844,7 @@
+ 		fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ 		rt = 0;
+ 	} else {
+-		char *nbuf;
+-		int nlen;
+-
+-		if (!proc || !proc( &file, &nbuf, &nlen ) ||
+-		    (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+-		{
++		if (!proc || !proc( &file )) {
+ 			if (!use_destdir && !strcmp( ce->value, nname ))
+ 				linkedFile( nname );
+ 			else {
+@@ -855,7 +854,7 @@
+ 				copiedFile( ce->value );
+ 			}
+ 		} else {
+-			WriteOut( nname, mode, 0, nbuf, nlen );
++			WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ 			editedFile( ce->value );
+ 		}
+ 		if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1377,7 @@
+ 
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ 	// XXX remove any login*, chooser*, ... resources
+ 	return 0;
+@@ -1415,15 +1414,14 @@
+ 				paap = pap += 2;
+ 				while (!isspace( *pap ))
+ 					pap++;
+-				for (;;) {
+-					if (*pp++ != '/')
+-						goto no;
+-					for (bpp = pp; *pp != '/'; pp++)
+-						if (isspace( *pp ))
++				if (*pp != '/')
++					break;
++				for (;;)
++					for (bpp = ++pp; *pp != '/'; pp++)
++						if (!*pp || isspace( *pp ))
+ 							goto wbrk;
+-				}
+ 			  wbrk:
+-				if (memcmp( bpp, paap, pap - paap ))
++				if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ 					break;
+ 			} else if (*pap == '\t') {
+ 				pap++;
+@@ -1472,24 +1470,25 @@
+ static int mod_usebg;
+ 
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+-	putval( "UseBackground",
+-	        (delstr( file, "\n"
+-	                 "(\n"
+-	                 "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-	                 "  */kdmdesktop\t&\n"
+-	                 "  echo $! >$PIDFILE\n"
+-	                 "  wait $!\n"
+-	                 "  rm $PIDFILE\n"
+-	                 ")\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "*/kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\n" )) ? "true" : "false" );
+-	return 0;
++	int chg =
++		delstr( file, "\n"
++		        "(\n"
++		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++		        "  */kdmdesktop\t&\n"
++		        "  echo $! >$PIDFILE\n"
++		        "  wait $!\n"
++		        "  rm $PIDFILE\n"
++		        ")\t&\n" ) |
++		delstr( file, "\n"
++		        "*/kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\n" );
++	putval( "UseBackground", chg ? "true" : "false" );
++	return chg;
+ }
+ 
+ static void
+@@ -1515,19 +1514,22 @@
+ }
+ 
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++	int chg1 = 0, chg2 = 0;
++
+ 	if (mod_usebg &&
+-	    !delstr( file, "\n"
++	    (delstr( file, "\n"
+ 	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ 	             "if [[] -f $PIDFILE ] ; then\n"
+ 	             "	   kill `cat $PIDFILE`\n"
+-	             "fi\n" ))
+-		delstr( file, "\n"
+-		        "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-		        "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+-	if (oldver < 0x0203)
+-		putval( "UseSessReg", (
++	             "fi\n" ) ||
++	     delstr( file, "\n"
++	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++		chg1 = 1;
++	if (oldver < 0x0203) {
++		chg2 = 
+ #ifdef _AIX
+ 			delstr( file, "\n"
+ "# We create a pseudodevice for finger.  (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1554,11 @@
+ "  else\n"
+ "    exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ "  fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ 			delstr( file, "\n"
+@@ -1564,11 +1566,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+-		 ) ? "true" : "false");
+-	return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++		putval( "UseSessReg", chg2 ? "true" : "false");
++	}
++	return chg1 | chg2;
+ }
+ 
+ static void
+@@ -1592,29 +1595,29 @@
+ }
+ 
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++	return
+ #ifdef _AIX
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ "  devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ "  exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+-	delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++		delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+-	delstr( file, "\n"
++" $USER\n" ) |
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+-	return 0;
+ }
+ 
+ static void
diff --git a/x11/kdebase3/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase3/files/patch-konsole-konsole-konsole.cpp
deleted file mode 100644
index 553c411983a7..000000000000
--- a/x11/kdebase3/files/patch-konsole-konsole-konsole.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
-+++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
-@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
-     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
-     setSchema(s->schemaNo());
-     tabwidget->setCurrentPage(tabwidget->count()-1);
--      disableMasterModeConnections(); // no duplicate connections, remove old
--      enableMasterModeConnections();
--    }
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    disableMasterModeConnections(); // no duplicate connections, remove old
-+    enableMasterModeConnections();
-+    if(m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+  }
- }
- 
- QString Konsole::currentSession()
-@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
-       rootxpms.remove(s->widget());
-     }
-     delete s->widget();
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    if (m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-   }
-   session2action.remove(s);
-   action2session.remove(ra);
diff --git a/x11/kdebase3/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase3/files/patch-nsplugins-pluginscan.cpp
new file mode 100644
index 000000000000..55eed7247922
--- /dev/null
+++ b/x11/kdebase3/files/patch-nsplugins-pluginscan.cpp
@@ -0,0 +1,10 @@
+--- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
++++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
+@@ -457,6 +457,7 @@
+ 	paths.append("/usr/lib64/netscape/plugins");
+ 	paths.append("/usr/lib64/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/local/lib/linux-flashplugin6");
+         config->writeEntry( "scanPaths", paths );
+     }
+ 
diff --git a/x11/kdebase3/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase3/files/patch-post-3.3.2-kdebase-htmlframes2
deleted file mode 100644
index f31b6341cf9c..000000000000
--- a/x11/kdebase3/files/patch-post-3.3.2-kdebase-htmlframes2
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1342.2.14
-diff -u -p -r1.1342.2.14 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
-+++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
-@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
-     QString viewName = view->viewName();
-     kdDebug() << "       - viewName=" << viewName << "   "
-               << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+    // First look for a hostextension containing this frame name
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+      kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+      if (!ext)
-+         continue; // Don't use this window
-+    }
-+
-     if ( !viewName.isEmpty() && viewName == name )
-     {
-       kdDebug() << "found existing view by name: " << view << endl;
-@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
-       return view;
-     }
- 
--    // First look for a hostextension containing this frame name
--    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
--    if ( ext )
--    {
--      ext = ext->findFrameParent(callingPart, name);
--    }
--
- //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
diff --git a/x11/kdebase3/pkg-plist b/x11/kdebase3/pkg-plist
index 61e591e3cd68..1dabe06f9d62 100644
--- a/x11/kdebase3/pkg-plist
+++ b/x11/kdebase3/pkg-plist
@@ -4,11 +4,13 @@ bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kasbar
 bin/kate
 bin/kblankscrn.kss
+bin/kbookmarkmerger
 bin/kcheckpass
+bin/kcheckrunning
 bin/kcminit
-bin/kcmshell
 bin/kcontrol
 bin/kcontroledit
 bin/kdcop
@@ -32,16 +34,21 @@ bin/kfind
 bin/kfmclient
 bin/kfontinst
 bin/kfontview
+bin/khc_docbookdig.pl
+bin/khc_htdig.pl
+bin/khc_htsearch.pl
 bin/khc_indexbuilder
+bin/khc_mansearch.pl
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
 bin/kinfocenter
-bin/kio_devices_mounthelper
+bin/kio_media_mounthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
+bin/knetattach
 bin/konqueror
 bin/konsole
 bin/kpager
@@ -56,11 +63,13 @@ bin/kreadconfig
 bin/krootimage
 bin/ksmserver
 bin/ksplash
+bin/ksplashsimple
 bin/kstart
 bin/ksysguard
 bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
+bin/ktrash
 bin/kwebdesktop
 bin/kwin
 bin/kwin_killer_helper
@@ -68,6 +77,8 @@ bin/kwin_rules_dialog
 bin/kwrite
 bin/kwriteconfig
 bin/kxkb
+bin/nspluginscan
+bin/nspluginviewer
 bin/startkde
 etc/ksysguarddrc
 etc/rc.d/genkdmconf.sh
@@ -107,6 +118,7 @@ include/konq_dirpart.h
 include/konq_drag.h
 include/konq_events.h
 include/konq_faviconmgr.h
+include/konq_filetip.h
 include/konq_historycomm.h
 include/konq_historymgr.h
 include/konq_iconviewwidget.h
@@ -119,7 +131,6 @@ include/konq_undo.h
 include/konq_xmlguiclient.h
 include/konqbookmarkmanager.h
 include/konqsidebarplugin.h
-include/ksgrd/ColorPicker.h
 include/ksgrd/HostConnector.h
 include/ksgrd/SensorAgent.h
 include/ksgrd/SensorClient.h
@@ -135,22 +146,22 @@ include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
+include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/kicker-3.4-reverseLayout
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
-lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
 lib/kde3/cursorthumbnail.so
-lib/kde3/devices_panelapplet.la
-lib/kde3/devices_panelapplet.so
 lib/kde3/djvuthumbnail.la
 lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
 lib/kde3/dockbar_panelextension.so
+lib/kde3/exrthumbnail.la
+lib/kde3/exrthumbnail.so
 lib/kde3/extensionproxy.la
 lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
@@ -211,6 +222,8 @@ lib/kde3/kcm_kded.la
 lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
 lib/kde3/kcm_kdm.so
+lib/kde3/kcm_kdnssd.la
+lib/kde3/kcm_kdnssd.so
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keyboard.so
 lib/kde3/kcm_keys.la
@@ -247,6 +260,8 @@ lib/kde3/kcm_locale.la
 lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
 lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
@@ -267,36 +282,48 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
+lib/kde3/kcm_usb.la
+lib/kde3/kcm_usb.so
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
 lib/kde3/kcminit.so
-lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
 lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
 lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_khotkeys.la
+lib/kde3/kded_khotkeys.so
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_kwrited.so
-lib/kde3/kded_mountwatcher.la
-lib/kde3/kded_mountwatcher.so
+lib/kde3/kded_mediamanager.la
+lib/kde3/kded_mediamanager.so
+lib/kde3/kded_remotedirnotify.la
+lib/kde3/kded_remotedirnotify.so
+lib/kde3/kded_systemdirnotify.la
+lib/kde3/kded_systemdirnotify.so
 lib/kde3/kdesktop.la
 lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
 lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
 lib/kde3/kfile_font.so
+lib/kde3/kfile_media.la
+lib/kde3/kfile_media.so
+lib/kde3/kfile_trash.la
+lib/kde3/kfile_trash.so
 lib/kde3/kfmclient.la
 lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_classic.so
+lib/kde3/kgreet_winbind.la
+lib/kde3/kgreet_winbind.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
@@ -315,12 +342,14 @@ lib/kde3/kickermenu_prefmenu.la
 lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
 lib/kde3/kickermenu_recentdocs.so
+lib/kde3/kickermenu_remotemenu.la
+lib/kde3/kickermenu_remotemenu.so
+lib/kde3/kickermenu_systemmenu.la
+lib/kde3/kickermenu_systemmenu.so
 lib/kde3/kio_about.la
 lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
 lib/kde3/kio_cgi.so
-lib/kde3/kio_devices.la
-lib/kde3/kio_devices.so
 lib/kde3/kio_filter.la
 lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
@@ -331,8 +360,6 @@ lib/kde3/kio_floppy.la
 lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
 lib/kde3/kio_fonts.so
-lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
 lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
@@ -341,6 +368,8 @@ lib/kde3/kio_mac.la
 lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
 lib/kde3/kio_man.so
+lib/kde3/kio_media.la
+lib/kde3/kio_media.so
 lib/kde3/kio_nfs.la
 lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
@@ -349,6 +378,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_remote.la
+lib/kde3/kio_remote.so
 lib/kde3/kio_settings.la
 lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
@@ -357,10 +388,14 @@ lib/kde3/kio_smb.la
 lib/kde3/kio_smb.so
 lib/kde3/kio_smtp.la
 lib/kde3/kio_smtp.so
+lib/kde3/kio_system.la
+lib/kde3/kio_system.so
 lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
+lib/kde3/kio_trash.la
+lib/kde3/kio_trash.so
 lib/kde3/kjobviewer.la
 lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
@@ -423,6 +458,8 @@ lib/kde3/kwin3_laptop.la
 lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
 lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_plastik.la
+lib/kde3/kwin3_plastik.so
 lib/kde3/kwin3_quartz.la
 lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
@@ -437,6 +474,8 @@ lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
+lib/kde3/kwin_plastik_config.la
+lib/kde3/kwin_plastik_config.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
@@ -453,6 +492,8 @@ lib/kde3/libkfindpart.la
 lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
 lib/kde3/libkfontviewpart.so
+lib/kde3/libkhtmlkttsdplugin.la
+lib/kde3/libkhtmlkttsdplugin.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -465,8 +506,12 @@ lib/kde3/libkurisearchfilter.la
 lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/media_panelapplet.la
+lib/kde3/media_panelapplet.so
 lib/kde3/menu_panelapplet.la
 lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
@@ -489,6 +534,11 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
+lib/kde3/trash_panelapplet.la
+lib/kde3/trash_panelapplet.so
+lib/libkasbar.la
+lib/libkasbar.so
+lib/libkasbar.so.1
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -508,8 +558,6 @@ lib/libkdeinit_kate.la
 lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
 lib/libkdeinit_kcminit.so
-lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
 lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
@@ -604,6 +652,7 @@ share/applications/kde/ioports.desktop
 share/applications/kde/ioslaveinfo.desktop
 share/applications/kde/kappfinder.desktop
 share/applications/kde/kate.desktop
+share/applications/kde/kcm_kdnssd.desktop
 share/applications/kde/kcm_useraccount.desktop
 share/applications/kde/kcmaccess.desktop
 share/applications/kde/kcmcgi.desktop
@@ -617,6 +666,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -632,9 +682,12 @@ share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
+share/applications/kde/khtml_plugins.desktop
+share/applications/kde/kinfocenter.desktop
 share/applications/kde/kjobviewer.desktop
 share/applications/kde/klipper.desktop
 share/applications/kde/kmenuedit.desktop
+share/applications/kde/knetattach.desktop
 share/applications/kde/konqbrowser.desktop
 share/applications/kde/konquerorsu.desktop
 share/applications/kde/konsole.desktop
@@ -656,6 +709,7 @@ share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
 share/applications/kde/nic.desktop
+share/applications/kde/opengl.desktop
 share/applications/kde/panel.desktop
 share/applications/kde/panel_appearance.desktop
 share/applications/kde/partitions.desktop
@@ -672,6 +726,7 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/applnk/.hidden/.directory
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -692,6 +747,7 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
+share/applnk/.hidden/kwintranslucency.desktop
 share/applnk/.hidden/passwords.desktop
 share/applnk/.hidden/power.desktop
 share/applnk/.hidden/randr.desktop
@@ -701,7 +757,6 @@ share/applnk/.hidden/userinfo.desktop
 share/applnk/.hidden/virtualdesktops.desktop
 share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/KControl.desktop
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
@@ -713,7 +768,6 @@ share/applnk/Settingsmenu/printmgr.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/kpersonalizer.desktop
 share/applnk/Toys/ktip.desktop
@@ -800,6 +854,7 @@ share/apps/kappfinder/apps/Graphics/blender.desktop
 share/apps/kappfinder/apps/Graphics/ghostview.desktop
 share/apps/kappfinder/apps/Graphics/gimp.desktop
 share/apps/kappfinder/apps/Graphics/gv.desktop
+share/apps/kappfinder/apps/Graphics/inkscape.desktop
 share/apps/kappfinder/apps/Graphics/sodipodi.desktop
 share/apps/kappfinder/apps/Graphics/tgif.desktop
 share/apps/kappfinder/apps/Graphics/xdvi.desktop
@@ -952,9 +1007,11 @@ share/apps/kate/icons/locolor/22x22/actions/indent.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
 share/apps/kate/plugins/katedefaultproject/ui.rc
+share/apps/kate/plugins/katekttsd/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
 share/apps/kate/tips
+share/apps/katepart/kpartplugins/katepartkttsd.rc
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_browser.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -973,9 +1030,11 @@ share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
 share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
+share/apps/kcmusb/usb.ids
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
+share/apps/kconf_update/kate-2.4.upd
 share/apps/kconf_update/kcmdisplayrc.upd
 share/apps/kconf_update/kfmclient_3_2.upd
 share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -986,6 +1045,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqsidebartng.upd
 share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
@@ -995,14 +1055,20 @@ share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
+share/apps/kconf_update/kwin_focus2.sh
+share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwiniconify.upd
 share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/kwinupdatewindowsettings.upd
 share/apps/kconf_update/move_favicons.sh
+share/apps/kconf_update/move_konqsidebartng_entries.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
 share/apps/kconf_update/schemaStrip.pl
 share/apps/kconf_update/socks.upd
+share/apps/kcontrol/about/kcontrol.css
+share/apps/kcontrol/about/main.html
+share/apps/kcontrol/about/top-right-kcontrol.png
 share/apps/kcontrol/kcontrolui.rc
 share/apps/kcontrol/pics/energybig.png
 share/apps/kcontrol/pics/lo-energy.png
@@ -1011,9 +1077,6 @@ share/apps/kcontrol/pics/mini-world.png
 share/apps/kcontrol/pics/monitor.png
 share/apps/kcontrol/pics/onlyone.png
 share/apps/kcontrol/pics/overlapping.png
-share/apps/kcontrol/pics/part1.png
-share/apps/kcontrol/pics/part2.png
-share/apps/kcontrol/pics/part3.png
 share/apps/kcontrol/pics/play.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1022,25 +1085,42 @@ share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kcontroledit/kcontroleditui.rc
 share/apps/kdcop/kdcopui.rc
-share/apps/kdeprint/template/background.png
+share/apps/kdeprint/template/bar-bottom-left.png
+share/apps/kdeprint/template/bar-bottom-middle.png
+share/apps/kdeprint/template/bar-bottom-right.png
+share/apps/kdeprint/template/bar-middle-left.png
+share/apps/kdeprint/template/bar-middle-right.png
+share/apps/kdeprint/template/bar-top-left.png
+share/apps/kdeprint/template/bar-top-middle.png
+share/apps/kdeprint/template/bar-top-right.png
+share/apps/kdeprint/template/bottom-left.png
+share/apps/kdeprint/template/bottom-middle.png
+share/apps/kdeprint/template/bottom-right.png
+share/apps/kdeprint/template/box-bottom-left.png
+share/apps/kdeprint/template/box-bottom-middle.png
+share/apps/kdeprint/template/box-bottom-right.png
+share/apps/kdeprint/template/box-centre-kdeprint.png
+share/apps/kdeprint/template/box-middle-left.png
+share/apps/kdeprint/template/box-middle-right.png
+share/apps/kdeprint/template/box-top-left.png
+share/apps/kdeprint/template/box-top-middle.png
+share/apps/kdeprint/template/box-top-right.png
 share/apps/kdeprint/template/class.template
 share/apps/kdeprint/template/driver.template
 share/apps/kdeprint/template/htmlstyles.css
 share/apps/kdeprint/template/jobs.template
-share/apps/kdeprint/template/kdelogo2.png
-share/apps/kdeprint/template/kdeprint.png
-share/apps/kdeprint/template/lines.png
-share/apps/kdeprint/template/lines2.png
-share/apps/kdeprint/template/pointers.png
 share/apps/kdeprint/template/printer.template
 share/apps/kdeprint/template/pseudo.template
-share/apps/kdeprint/template/shadow1.png
+share/apps/kdeprint/template/top-left.png
+share/apps/kdeprint/template/top-middle.png
+share/apps/kdeprint/template/top-right-kdeprint.png
 share/apps/kdeprint_part/kdeprint_part.rc
 share/apps/kdeprintfax/anytops
 share/apps/kdeprintfax/faxfilters
 share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
 share/apps/kdeprintfax/kdeprintfaxui.rc
 share/apps/kdesktop/DesktopLinks/Home.desktop
+share/apps/kdesktop/DesktopLinks/System.desktop
 share/apps/kdesktop/directory.autostart
 share/apps/kdesktop/directory.desktop
 share/apps/kdesktop/directory.templates
@@ -1117,8 +1197,9 @@ share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-share/apps/kdm/pics/kdeflower.png
+share/apps/kdm/pics/kdelogo-crystal.png
 share/apps/kdm/pics/kdelogo.png
+share/apps/kdm/pics/shutdown.jpg
 share/apps/kdm/pics/users/Apple.png
 share/apps/kdm/pics/users/BeachBall.png
 share/apps/kdm/pics/users/Blowfish.png
@@ -1197,6 +1278,13 @@ share/apps/kdm/sessions/wm2.desktop
 share/apps/kdm/sessions/wmaker.desktop
 share/apps/kdm/sessions/xfce.desktop
 share/apps/kdm/sessions/xfce4.desktop
+share/apps/kdm/themes/circles/GdmGreeterTheme.desktop
+share/apps/kdm/themes/circles/background.svg
+share/apps/kdm/themes/circles/circles.xml
+share/apps/kdm/themes/circles/flower.png
+share/apps/kdm/themes/circles/help.png
+share/apps/kdm/themes/circles/options.png
+share/apps/kdm/themes/circles/screenshot.png
 share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
@@ -1207,6 +1295,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 share/apps/kfindpart/icons/locolor/22x22/actions/search.png
 share/apps/kfontview/kfontviewpart.rc
+share/apps/kfontview/kfontviewui.rc
 share/apps/khelpcenter/glossary.html.in
 share/apps/khelpcenter/glossary.xslt
 share/apps/khelpcenter/intro.html.in
@@ -1240,14 +1329,20 @@ share/apps/khelpcenter/plugins/links.desktop
 share/apps/khelpcenter/plugins/support.desktop
 share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
+share/apps/khelpcenter/searchhandlers/docbook.desktop
+share/apps/khelpcenter/searchhandlers/htdig.desktop
+share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+share/apps/khelpcenter/searchhandlers/man.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
 share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/apps/khtml/kpartplugins/khtmlkttsd.desktop
+share/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
 share/apps/kicker/applets/ksysguardapplet.desktop
 share/apps/kicker/applets/lockout.desktop
+share/apps/kicker/applets/mediaapplet.desktop
 share/apps/kicker/applets/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
@@ -1255,6 +1350,7 @@ share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/applets/runapplet.desktop
 share/apps/kicker/applets/systemtrayapplet.desktop
 share/apps/kicker/applets/taskbarapplet.desktop
+share/apps/kicker/applets/trashapplet.desktop
 share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
@@ -1271,6 +1367,8 @@ share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
 share/apps/kicker/menuext/recentdocs.desktop
+share/apps/kicker/menuext/remotemenu.desktop
+share/apps/kicker/menuext/systemmenu.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk10.png
 share/apps/kicker/pics/disk2.png
@@ -1416,14 +1514,12 @@ share/apps/konqsidebartng/dirtree/dirtree_module.desktop
 share/apps/konqsidebartng/dirtree/history_module.desktop
 share/apps/konqsidebartng/entries/.version
 share/apps/konqsidebartng/entries/bookmarks.desktop
-share/apps/konqsidebartng/entries/devices.desktop
 share/apps/konqsidebartng/entries/history.desktop
 share/apps/konqsidebartng/entries/home.desktop
 share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
-share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1436,35 +1532,25 @@ share/apps/konqsidebartng/virtual_folders/remote/web/.directory
 share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
+share/apps/konqsidebartng/virtual_folders/services/applications.desktop
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/konqsidebartng/virtual_folders/services/devices.desktop
 share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/konqsidebartng/virtual_folders/services/media.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop
+share/apps/konqsidebartng/virtual_folders/services/settings.desktop
 share/apps/konqsidebartng/websidebar/websidebar.html
-share/apps/konqueror/about/background.png
-share/apps/konqueror/about/background_rtl.png
-share/apps/konqueror/about/bgtable.png
-share/apps/konqueror/about/bgtable_rtl.png
+share/apps/konqueror/about/box-centre-konqueror.png
 share/apps/konqueror/about/intro.html
-share/apps/konqueror/about/intro_rtl.html
-share/apps/konqueror/about/kdelogo2.png
 share/apps/konqueror/about/konq.css
-share/apps/konqueror/about/konq_rtl.css
-share/apps/konqueror/about/konqueror.png
-share/apps/konqueror/about/konqueror_rtl.png
+share/apps/konqueror/about/launch.html
 share/apps/konqueror/about/lightning.png
-share/apps/konqueror/about/lines.png
-share/apps/konqueror/about/lines2.png
-share/apps/konqueror/about/more.png
 share/apps/konqueror/about/plugins.html
 share/apps/konqueror/about/plugins_rtl.html
-share/apps/konqueror/about/pointers.gif
-share/apps/konqueror/about/shadow1.png
 share/apps/konqueror/about/specs.html
-share/apps/konqueror/about/specs_rtl.html
 share/apps/konqueror/about/tips.html
-share/apps/konqueror/about/tips_rtl.html
+share/apps/konqueror/about/top-right-konqueror.png
 share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
@@ -1478,7 +1564,6 @@ share/apps/konqueror/pics/arrow_bottomleft.png
 share/apps/konqueror/pics/arrow_bottomright.png
 share/apps/konqueror/pics/arrow_topleft.png
 share/apps/konqueror/pics/arrow_topright.png
-share/apps/konqueror/pics/indicator_anchor.png
 share/apps/konqueror/pics/indicator_connect.png
 share/apps/konqueror/pics/indicator_empty.png
 share/apps/konqueror/pics/indicator_noconnect.png
@@ -1490,23 +1575,13 @@ share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/simplebrowser
 share/apps/konqueror/profiles/tabbedbrowsing
 share/apps/konqueror/profiles/webbrowsing
-share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
 share/apps/konqueror/servicemenus/installfont.desktop
 share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 share/apps/konqueror/servicemenus/konsolehere.desktop
-share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
+share/apps/konqueror/servicemenus/media_eject.desktop
+share/apps/konqueror/servicemenus/media_mount.desktop
+share/apps/konqueror/servicemenus/media_safelyremove.desktop
+share/apps/konqueror/servicemenus/media_unmount.desktop
 share/apps/konqueror/servicemenus/text-ada-print.desktop
 share/apps/konqueror/servicemenus/text-c++-print.desktop
 share/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1525,8 +1600,6 @@ share/apps/konqueror/servicemenus/text-tcl-print.desktop
 share/apps/konqueror/servicemenus/text-tex-print.desktop
 share/apps/konqueror/servicemenus/text-xml-print.desktop
 share/apps/konqueror/servicemenus/text-xslt-print.desktop
-share/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
 share/apps/konqueror/tiles/bluemorning.png
 share/apps/konqueror/tiles/canvas.png
 share/apps/konqueror/tiles/checker.png
@@ -1573,6 +1646,7 @@ share/apps/konsole/profiles/4shells
 share/apps/konsole/profiles/5shells
 share/apps/konsole/screen.desktop
 share/apps/konsole/shell.desktop
+share/apps/konsole/solaris.keytab
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
 share/apps/konsole/syscolor.schema
@@ -1598,9 +1672,12 @@ share/apps/ksplash/Themes/Default/splash_active_bar.png
 share/apps/ksplash/Themes/Default/splash_bottom.png
 share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 share/apps/ksplash/Themes/Default/splash_top.png
+share/apps/ksplash/Themes/None/Theme.rc
 share/apps/ksplash/Themes/Redmond/Background.png
 share/apps/ksplash/Themes/Redmond/Preview.png
 share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Simple/Preview.png
+share/apps/ksplash/Themes/Simple/Theme.rc
 share/apps/ksplash/Themes/Standard/Preview.png
 share/apps/ksplash/Themes/Standard/Theme.rc
 share/apps/ksplash/Themes/blue-bend/Preview.png
@@ -1626,6 +1703,30 @@ share/apps/ksysguard/pics/shell.png
 share/apps/ksysguard/pics/tools.png
 share/apps/ksysguard/pics/unknownapp.png
 share/apps/ksysguard/pics/waiting.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml
+share/apps/kthememanager/themes/Keramik/Keramik.preview.png
+share/apps/kthememanager/themes/Keramik/Keramik.xml
+share/apps/kthememanager/themes/Plastik/Plastik.preview.png
+share/apps/kthememanager/themes/Plastik/Plastik.xml
+share/apps/kthememanager/themes/Platinum/Platinum.preview.png
+share/apps/kthememanager/themes/Platinum/Platinum.xml
+share/apps/kthememanager/themes/Redmond/Redmond.preview.png
+share/apps/kthememanager/themes/Redmond/Redmond.xml
+share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png
+share/apps/kthememanager/themes/Sunshine/Sunshine.xml
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
 share/apps/kwin/keramik.desktop
@@ -1644,12 +1745,20 @@ share/apps/kwin/pics/menu.png
 share/apps/kwin/pics/pindown.png
 share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
+share/apps/kwin/plastik.desktop
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
+share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/smb-network.desktop
+share/apps/systemview/home.desktop
+share/apps/systemview/media.desktop
+share/apps/systemview/remote.desktop
+share/apps/systemview/settings.desktop
+share/apps/systemview/trash.desktop
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
@@ -1658,15 +1767,20 @@ share/autostart/ktip.desktop
 share/autostart/panel.desktop
 share/config.kcfg/kcm_useraccount.kcfg
 share/config.kcfg/kcm_useraccount_pass.kcfg
+share/config.kcfg/kdesktop.kcfg
+share/config.kcfg/khelpcenter.kcfg
+share/config.kcfg/klaunch.kcfg
 share/config.kcfg/konqueror.kcfg
+share/config.kcfg/kwebdesktop.kcfg
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/taskbar.kcfg
+share/config/katerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
 share/config/kxkb_groups
-share/config/mountwatcher.desktop
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -1689,6 +1803,7 @@ share/desktop-directories/kde-science.directory
 share/desktop-directories/kde-settings-accessibility.directory
 share/desktop-directories/kde-settings-components.directory
 share/desktop-directories/kde-settings-desktop.directory
+share/desktop-directories/kde-settings-hardware.directory
 share/desktop-directories/kde-settings-looknfeel.directory
 share/desktop-directories/kde-settings-network.directory
 share/desktop-directories/kde-settings-peripherals.directory
@@ -1706,6 +1821,7 @@ share/desktop-directories/kde-toys.directory
 share/desktop-directories/kde-unknown.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
+share/doc/HTML/en/kappfinder/man-kappfinder.1.docbook
 share/doc/HTML/en/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1866,6 +1982,9 @@ share/doc/HTML/en/kcontrol/useragent/index.docbook
 share/doc/HTML/en/kcontrol/windowmanagement/common
 share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/en/kdcop/common
+share/doc/HTML/en/kdcop/index.cache.bz2
+share/doc/HTML/en/kdcop/index.docbook
 share/doc/HTML/en/kdebase-apidocs/common
 share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.cache.bz2
@@ -1961,7 +2080,10 @@ share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/HTML/en/khelpcenter/faq/questions.docbook
+share/doc/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
 share/doc/HTML/en/khelpcenter/faq/winmng.docbook
 share/doc/HTML/en/khelpcenter/glossary/checkxrefs
 share/doc/HTML/en/khelpcenter/glossary/common
@@ -1982,20 +2104,84 @@ share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/shadow1.png
 share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/a-window.png
+share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
+share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
+share/doc/HTML/en/khelpcenter/userguide/amarok.png
+share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
 share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook
-share/doc/HTML/en/khelpcenter/userguide/history.docbook
+share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
+share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/en/khelpcenter/userguide/desktop.png
+share/doc/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
+share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
+share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
+share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
+share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/more-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/notices-trademarks.docbook
-share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/staff.docbook
-share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook
+share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
+share/doc/HTML/en/khelpcenter/userguide/juk.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
+share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
+share/doc/HTML/en/khelpcenter/userguide/kmag.png
+share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
+share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
+share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-start.png
+share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
+share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
+share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/kopete.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
+share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
+share/doc/HTML/en/khelpcenter/userguide/noatun.png
+share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
+share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
+share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
+share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
+share/doc/HTML/en/khelpcenter/userguide/rip.png
+share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
+share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
+share/doc/HTML/en/khelpcenter/userguide/services.png
+share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
+share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
+share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
@@ -2056,6 +2242,9 @@ share/doc/HTML/en/kinfocenter/memory/index.docbook
 share/doc/HTML/en/kinfocenter/nics/common
 share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
 share/doc/HTML/en/kinfocenter/nics/index.docbook
+share/doc/HTML/en/kinfocenter/opengl/common
+share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
+share/doc/HTML/en/kinfocenter/opengl/index.docbook
 share/doc/HTML/en/kinfocenter/partitions/common
 share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
 share/doc/HTML/en/kinfocenter/partitions/index.docbook
@@ -2086,7 +2275,6 @@ share/doc/HTML/en/kinfocenter/usb/index.docbook
 share/doc/HTML/en/kinfocenter/xserver/common
 share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
 share/doc/HTML/en/kinfocenter/xserver/index.docbook
-share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
@@ -2144,6 +2332,10 @@ share/doc/HTML/en/kmenuedit/i_paste.png
 share/doc/HTML/en/kmenuedit/icon_sets.png
 share/doc/HTML/en/kmenuedit/index.cache.bz2
 share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/knetattach/common
+share/doc/HTML/en/knetattach/index.cache.bz2
+share/doc/HTML/en/knetattach/index.docbook
+share/doc/HTML/en/knetattach/screenshot.png
 share/doc/HTML/en/konqueror/basics.docbook
 share/doc/HTML/en/konqueror/bookmarks.docbook
 share/doc/HTML/en/konqueror/browser.docbook
@@ -2160,6 +2352,7 @@ share/doc/HTML/en/konqueror/index.cache.bz2
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/introduction.docbook
 share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
 share/doc/HTML/en/konqueror/parts.png
 share/doc/HTML/en/konqueror/path-complete.docbook
 share/doc/HTML/en/konqueror/plugins.docbook
@@ -2171,6 +2364,7 @@ share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/konsole.png
+share/doc/HTML/en/konsole/tabbar.png
 share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
@@ -2203,8 +2397,10 @@ share/icons/crystalsvg/128x128/apps/bell.png
 share/icons/crystalsvg/128x128/apps/cache.png
 share/icons/crystalsvg/128x128/apps/clanbomber.png
 share/icons/crystalsvg/128x128/apps/clock.png
+share/icons/crystalsvg/128x128/apps/colors.png
 share/icons/crystalsvg/128x128/apps/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy.png
 share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
 share/icons/crystalsvg/128x128/apps/fonts.png
@@ -2215,19 +2411,20 @@ share/icons/crystalsvg/128x128/apps/kappfinder.png
 share/icons/crystalsvg/128x128/apps/kate.png
 share/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/icons/crystalsvg/128x128/apps/kcmdf.png
+share/icons/crystalsvg/128x128/apps/kcmkwm.png
 share/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/icons/crystalsvg/128x128/apps/kcmpci.png
 share/icons/crystalsvg/128x128/apps/kcontrol.png
 share/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/icons/crystalsvg/128x128/apps/kdmconfig.png
-share/icons/crystalsvg/128x128/apps/keditbookmarks.png
 share/icons/crystalsvg/128x128/apps/key_bindings.png
 share/icons/crystalsvg/128x128/apps/kfm_home.png
 share/icons/crystalsvg/128x128/apps/khelpcenter.png
 share/icons/crystalsvg/128x128/apps/kjobviewer.png
 share/icons/crystalsvg/128x128/apps/klipper.png
 share/icons/crystalsvg/128x128/apps/kmenu.png
+share/icons/crystalsvg/128x128/apps/knetattach.png
 share/icons/crystalsvg/128x128/apps/konqueror.png
 share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
@@ -2245,6 +2442,7 @@ share/icons/crystalsvg/128x128/apps/multimedia.png
 share/icons/crystalsvg/128x128/apps/netscape.png
 share/icons/crystalsvg/128x128/apps/package.png
 share/icons/crystalsvg/128x128/apps/package_applications.png
+share/icons/crystalsvg/128x128/apps/package_development.png
 share/icons/crystalsvg/128x128/apps/package_favourite.png
 share/icons/crystalsvg/128x128/apps/package_games.png
 share/icons/crystalsvg/128x128/apps/package_multimedia.png
@@ -2291,6 +2489,10 @@ share/icons/crystalsvg/16x16/apps/designer.png
 share/icons/crystalsvg/16x16/apps/dia.png
 share/icons/crystalsvg/16x16/apps/dlgedit.png
 share/icons/crystalsvg/16x16/apps/eclipse.png
+share/icons/crystalsvg/16x16/apps/edu_languages.png
+share/icons/crystalsvg/16x16/apps/edu_mathematics.png
+share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
+share/icons/crystalsvg/16x16/apps/edu_science.png
 share/icons/crystalsvg/16x16/apps/emacs.png
 share/icons/crystalsvg/16x16/apps/email.png
 share/icons/crystalsvg/16x16/apps/energy.png
@@ -2307,7 +2509,6 @@ share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/gnomemeeting.png
 share/icons/crystalsvg/16x16/apps/gnucash.png
 share/icons/crystalsvg/16x16/apps/gnumeric.png
-share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
 share/icons/crystalsvg/16x16/apps/help_index.png
@@ -2346,6 +2547,7 @@ share/icons/crystalsvg/16x16/apps/kjobviewer.png
 share/icons/crystalsvg/16x16/apps/klipper.png
 share/icons/crystalsvg/16x16/apps/kmenu.png
 share/icons/crystalsvg/16x16/apps/kmenuedit.png
+share/icons/crystalsvg/16x16/apps/knetattach.png
 share/icons/crystalsvg/16x16/apps/knotify.png
 share/icons/crystalsvg/16x16/apps/konqueror.png
 share/icons/crystalsvg/16x16/apps/konsole.png
@@ -2412,7 +2614,6 @@ share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
 share/icons/crystalsvg/16x16/apps/scribus.png
 share/icons/crystalsvg/16x16/apps/sodipodi.png
-share/icons/crystalsvg/16x16/apps/soffice.png
 share/icons/crystalsvg/16x16/apps/style.png
 share/icons/crystalsvg/16x16/apps/stylesheet.png
 share/icons/crystalsvg/16x16/apps/terminal.png
@@ -2423,7 +2624,6 @@ share/icons/crystalsvg/16x16/apps/vnc.png
 share/icons/crystalsvg/16x16/apps/wabi.png
 share/icons/crystalsvg/16x16/apps/window_list.png
 share/icons/crystalsvg/16x16/apps/wine.png
-share/icons/crystalsvg/16x16/apps/winprops.png
 share/icons/crystalsvg/16x16/apps/wp.png
 share/icons/crystalsvg/16x16/apps/xcalc.png
 share/icons/crystalsvg/16x16/apps/xchat.png
@@ -2441,18 +2641,54 @@ share/icons/crystalsvg/16x16/apps/xmms.png
 share/icons/crystalsvg/16x16/apps/xosview.png
 share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
-share/icons/crystalsvg/16x16/devices/print_printer.png
-share/icons/crystalsvg/16x16/filesystems/folder_print2.png
 share/icons/crystalsvg/22x22/actions/newfont.png
-share/icons/crystalsvg/22x22/actions/textwaterfall.png
+share/icons/crystalsvg/22x22/apps/access.png
+share/icons/crystalsvg/22x22/apps/agent.png
+share/icons/crystalsvg/22x22/apps/arts.png
+share/icons/crystalsvg/22x22/apps/background.png
+share/icons/crystalsvg/22x22/apps/bell.png
+share/icons/crystalsvg/22x22/apps/cache.png
+share/icons/crystalsvg/22x22/apps/colors.png
+share/icons/crystalsvg/22x22/apps/cookie.png
+share/icons/crystalsvg/22x22/apps/date.png
+share/icons/crystalsvg/22x22/apps/email.png
+share/icons/crystalsvg/22x22/apps/energy.png
+share/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/icons/crystalsvg/22x22/apps/filetypes.png
+share/icons/crystalsvg/22x22/apps/fonts.png
+share/icons/crystalsvg/22x22/apps/hwinfo.png
+share/icons/crystalsvg/22x22/apps/icons.png
+share/icons/crystalsvg/22x22/apps/iconthemes.png
+share/icons/crystalsvg/22x22/apps/kcmdevices.png
+share/icons/crystalsvg/22x22/apps/kcmkicker.png
+share/icons/crystalsvg/22x22/apps/kcmkwm.png
+share/icons/crystalsvg/22x22/apps/kcmx.png
+share/icons/crystalsvg/22x22/apps/kdmconfig.png
+share/icons/crystalsvg/22x22/apps/key_bindings.png
+share/icons/crystalsvg/22x22/apps/keyboard.png
+share/icons/crystalsvg/22x22/apps/kfm.png
+share/icons/crystalsvg/22x22/apps/khelpcenter.png
+share/icons/crystalsvg/22x22/apps/kjobviewer.png
 share/icons/crystalsvg/22x22/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/kmenu.png
+share/icons/crystalsvg/22x22/apps/knetattach.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/konsole.png
+share/icons/crystalsvg/22x22/apps/kscreensaver.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
+share/icons/crystalsvg/22x22/apps/kthememgr.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
+share/icons/crystalsvg/22x22/apps/locale.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/package_development.png
+share/icons/crystalsvg/22x22/apps/personal.png
+share/icons/crystalsvg/22x22/apps/printmgr.png
+share/icons/crystalsvg/22x22/apps/proxy.png
 share/icons/crystalsvg/22x22/apps/randr.png
+share/icons/crystalsvg/22x22/apps/samba.png
+share/icons/crystalsvg/22x22/apps/style.png
+share/icons/crystalsvg/22x22/apps/stylesheet.png
 share/icons/crystalsvg/32x32/actions/newfont.png
-share/icons/crystalsvg/32x32/actions/textwaterfall.png
 share/icons/crystalsvg/32x32/apps/abiword.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
@@ -2475,6 +2711,10 @@ share/icons/crystalsvg/32x32/apps/designer.png
 share/icons/crystalsvg/32x32/apps/dia.png
 share/icons/crystalsvg/32x32/apps/dlgedit.png
 share/icons/crystalsvg/32x32/apps/eclipse.png
+share/icons/crystalsvg/32x32/apps/edu_languages.png
+share/icons/crystalsvg/32x32/apps/edu_mathematics.png
+share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
+share/icons/crystalsvg/32x32/apps/edu_science.png
 share/icons/crystalsvg/32x32/apps/emacs.png
 share/icons/crystalsvg/32x32/apps/email.png
 share/icons/crystalsvg/32x32/apps/energy.png
@@ -2493,7 +2733,6 @@ share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/gnomemeeting.png
 share/icons/crystalsvg/32x32/apps/gnucash.png
 share/icons/crystalsvg/32x32/apps/gnumeric.png
-share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
 share/icons/crystalsvg/32x32/apps/help_index.png
@@ -2505,7 +2744,6 @@ share/icons/crystalsvg/32x32/apps/kappfinder.png
 share/icons/crystalsvg/32x32/apps/kate.png
 share/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
-share/icons/crystalsvg/32x32/apps/kcmfontinst.png
 share/icons/crystalsvg/32x32/apps/kcmkicker.png
 share/icons/crystalsvg/32x32/apps/kcmkwm.png
 share/icons/crystalsvg/32x32/apps/kcmmemory.png
@@ -2528,12 +2766,12 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 share/icons/crystalsvg/32x32/apps/kfind.png
 share/icons/crystalsvg/32x32/apps/kfm.png
 share/icons/crystalsvg/32x32/apps/kfm_home.png
-share/icons/crystalsvg/32x32/apps/kfontview.png
 share/icons/crystalsvg/32x32/apps/khelpcenter.png
 share/icons/crystalsvg/32x32/apps/kjobviewer.png
 share/icons/crystalsvg/32x32/apps/klipper.png
 share/icons/crystalsvg/32x32/apps/kmenu.png
 share/icons/crystalsvg/32x32/apps/kmenuedit.png
+share/icons/crystalsvg/32x32/apps/knetattach.png
 share/icons/crystalsvg/32x32/apps/knotify.png
 share/icons/crystalsvg/32x32/apps/konqueror.png
 share/icons/crystalsvg/32x32/apps/konsole.png
@@ -2565,6 +2803,7 @@ share/icons/crystalsvg/32x32/apps/netscape.png
 share/icons/crystalsvg/32x32/apps/opera.png
 share/icons/crystalsvg/32x32/apps/package.png
 share/icons/crystalsvg/32x32/apps/package_applications.png
+share/icons/crystalsvg/32x32/apps/package_development.png
 share/icons/crystalsvg/32x32/apps/package_editors.png
 share/icons/crystalsvg/32x32/apps/package_edutainment.png
 share/icons/crystalsvg/32x32/apps/package_favourite.png
@@ -2596,7 +2835,6 @@ share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/scribus.png
 share/icons/crystalsvg/32x32/apps/sodipodi.png
-share/icons/crystalsvg/32x32/apps/soffice.png
 share/icons/crystalsvg/32x32/apps/style.png
 share/icons/crystalsvg/32x32/apps/stylesheet.png
 share/icons/crystalsvg/32x32/apps/terminal.png
@@ -2607,7 +2845,6 @@ share/icons/crystalsvg/32x32/apps/vnc.png
 share/icons/crystalsvg/32x32/apps/wabi.png
 share/icons/crystalsvg/32x32/apps/window_list.png
 share/icons/crystalsvg/32x32/apps/wine.png
-share/icons/crystalsvg/32x32/apps/winprops.png
 share/icons/crystalsvg/32x32/apps/wp.png
 share/icons/crystalsvg/32x32/apps/x.png
 share/icons/crystalsvg/32x32/apps/xapp.png
@@ -2628,8 +2865,6 @@ share/icons/crystalsvg/32x32/apps/xmms.png
 share/icons/crystalsvg/32x32/apps/xosview.png
 share/icons/crystalsvg/32x32/apps/xpaint.png
 share/icons/crystalsvg/32x32/apps/xv.png
-share/icons/crystalsvg/32x32/devices/print_printer.png
-share/icons/crystalsvg/32x32/filesystems/folder_print2.png
 share/icons/crystalsvg/48x48/apps/abiword.png
 share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
@@ -2649,6 +2884,10 @@ share/icons/crystalsvg/48x48/apps/date.png
 share/icons/crystalsvg/48x48/apps/designer.png
 share/icons/crystalsvg/48x48/apps/dia.png
 share/icons/crystalsvg/48x48/apps/eclipse.png
+share/icons/crystalsvg/48x48/apps/edu_languages.png
+share/icons/crystalsvg/48x48/apps/edu_mathematics.png
+share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
+share/icons/crystalsvg/48x48/apps/edu_science.png
 share/icons/crystalsvg/48x48/apps/emacs.png
 share/icons/crystalsvg/48x48/apps/email.png
 share/icons/crystalsvg/48x48/apps/energy.png
@@ -2666,7 +2905,6 @@ share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/gnomemeeting.png
 share/icons/crystalsvg/48x48/apps/gnucash.png
 share/icons/crystalsvg/48x48/apps/gnumeric.png
-share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
 share/icons/crystalsvg/48x48/apps/hwinfo.png
@@ -2678,10 +2916,10 @@ share/icons/crystalsvg/48x48/apps/kate.png
 share/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/icons/crystalsvg/48x48/apps/kcmdf.png
 share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
-share/icons/crystalsvg/48x48/apps/kcmfontinst.png
 share/icons/crystalsvg/48x48/apps/kcmkwm.png
 share/icons/crystalsvg/48x48/apps/kcmmemory.png
 share/icons/crystalsvg/48x48/apps/kcmmidi.png
+share/icons/crystalsvg/48x48/apps/kcmopengl.png
 share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
@@ -2699,12 +2937,12 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 share/icons/crystalsvg/48x48/apps/kfind.png
 share/icons/crystalsvg/48x48/apps/kfm.png
 share/icons/crystalsvg/48x48/apps/kfm_home.png
-share/icons/crystalsvg/48x48/apps/kfontview.png
 share/icons/crystalsvg/48x48/apps/khelpcenter.png
 share/icons/crystalsvg/48x48/apps/kjobviewer.png
 share/icons/crystalsvg/48x48/apps/klipper.png
 share/icons/crystalsvg/48x48/apps/kmenu.png
 share/icons/crystalsvg/48x48/apps/kmenuedit.png
+share/icons/crystalsvg/48x48/apps/knetattach.png
 share/icons/crystalsvg/48x48/apps/knotify.png
 share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
@@ -2731,6 +2969,7 @@ share/icons/crystalsvg/48x48/apps/netscape.png
 share/icons/crystalsvg/48x48/apps/opera.png
 share/icons/crystalsvg/48x48/apps/package.png
 share/icons/crystalsvg/48x48/apps/package_applications.png
+share/icons/crystalsvg/48x48/apps/package_development.png
 share/icons/crystalsvg/48x48/apps/package_editors.png
 share/icons/crystalsvg/48x48/apps/package_edutainment.png
 share/icons/crystalsvg/48x48/apps/package_favourite.png
@@ -2760,7 +2999,6 @@ share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/scribus.png
 share/icons/crystalsvg/48x48/apps/sodipodi.png
-share/icons/crystalsvg/48x48/apps/soffice.png
 share/icons/crystalsvg/48x48/apps/staroffice.png
 share/icons/crystalsvg/48x48/apps/style.png
 share/icons/crystalsvg/48x48/apps/stylesheet.png
@@ -2770,7 +3008,6 @@ share/icons/crystalsvg/48x48/apps/usb.png
 share/icons/crystalsvg/48x48/apps/vnc.png
 share/icons/crystalsvg/48x48/apps/window_list.png
 share/icons/crystalsvg/48x48/apps/wine.png
-share/icons/crystalsvg/48x48/apps/winprops.png
 share/icons/crystalsvg/48x48/apps/wmaker_apps.png
 share/icons/crystalsvg/48x48/apps/wp.png
 share/icons/crystalsvg/48x48/apps/xchat.png
@@ -2780,8 +3017,7 @@ share/icons/crystalsvg/48x48/apps/xemacs.png
 share/icons/crystalsvg/48x48/apps/xfmail.png
 share/icons/crystalsvg/48x48/apps/xmag.png
 share/icons/crystalsvg/48x48/apps/xv.png
-share/icons/crystalsvg/48x48/devices/print_printer.png
-share/icons/crystalsvg/48x48/filesystems/folder_print2.png
+share/icons/crystalsvg/64x64/apps/access.png
 share/icons/crystalsvg/64x64/apps/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
 share/icons/crystalsvg/64x64/apps/arts.png
@@ -2790,9 +3026,13 @@ share/icons/crystalsvg/64x64/apps/bell.png
 share/icons/crystalsvg/64x64/apps/cache.png
 share/icons/crystalsvg/64x64/apps/clanbomber.png
 share/icons/crystalsvg/64x64/apps/clock.png
+share/icons/crystalsvg/64x64/apps/colors.png
+share/icons/crystalsvg/64x64/apps/cookie.png
 share/icons/crystalsvg/64x64/apps/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy.png
 share/icons/crystalsvg/64x64/apps/energy_star.png
+share/icons/crystalsvg/64x64/apps/enhanced_browsing.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
 share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
@@ -2804,6 +3044,7 @@ share/icons/crystalsvg/64x64/apps/kappfinder.png
 share/icons/crystalsvg/64x64/apps/kate.png
 share/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/icons/crystalsvg/64x64/apps/kcmdf.png
+share/icons/crystalsvg/64x64/apps/kcmkwm.png
 share/icons/crystalsvg/64x64/apps/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
@@ -2820,6 +3061,7 @@ share/icons/crystalsvg/64x64/apps/khelpcenter.png
 share/icons/crystalsvg/64x64/apps/kjobviewer.png
 share/icons/crystalsvg/64x64/apps/klipper.png
 share/icons/crystalsvg/64x64/apps/kmenu.png
+share/icons/crystalsvg/64x64/apps/knetattach.png
 share/icons/crystalsvg/64x64/apps/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
@@ -2840,6 +3082,7 @@ share/icons/crystalsvg/64x64/apps/nedit.png
 share/icons/crystalsvg/64x64/apps/netscape.png
 share/icons/crystalsvg/64x64/apps/package.png
 share/icons/crystalsvg/64x64/apps/package_applications.png
+share/icons/crystalsvg/64x64/apps/package_development.png
 share/icons/crystalsvg/64x64/apps/package_favourite.png
 share/icons/crystalsvg/64x64/apps/package_games.png
 share/icons/crystalsvg/64x64/apps/package_multimedia.png
@@ -2865,17 +3108,13 @@ share/icons/crystalsvg/64x64/apps/wp.png
 share/icons/crystalsvg/64x64/apps/xclock.png
 share/icons/crystalsvg/64x64/apps/xfmail.png
 share/icons/crystalsvg/64x64/apps/xmag.png
-share/icons/crystalsvg/64x64/devices/print_printer.png
 share/icons/crystalsvg/scalable/apps/access.svgz
 share/icons/crystalsvg/scalable/apps/acroread.svgz
 share/icons/crystalsvg/scalable/apps/aim.svgz
 share/icons/crystalsvg/scalable/apps/aktion.svgz
 share/icons/crystalsvg/scalable/apps/antivirus.svgz
 share/icons/crystalsvg/scalable/apps/applixware.svgz
-share/icons/crystalsvg/scalable/apps/ark.svgz
 share/icons/crystalsvg/scalable/apps/arts.svgz
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svgz
 share/icons/crystalsvg/scalable/apps/background.svgz
 share/icons/crystalsvg/scalable/apps/bell.svgz
 share/icons/crystalsvg/scalable/apps/browser.svgz
@@ -2894,48 +3133,41 @@ share/icons/crystalsvg/scalable/apps/error.svgz
 share/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/icons/crystalsvg/scalable/apps/fonts.svgz
 share/icons/crystalsvg/scalable/apps/galeon.svgz
-share/icons/crystalsvg/scalable/apps/gnome/apps.svgz
-share/icons/crystalsvg/scalable/apps/go.svgz
-share/icons/crystalsvg/scalable/apps/harddrive.svgz
+share/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/icons/crystalsvg/scalable/apps/hardware.svgz
 share/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/icons/crystalsvg/scalable/apps/karbon14.svgz
-share/icons/crystalsvg/scalable/apps/kate.svgz
-share/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/icons/crystalsvg/scalable/apps/kate2.svgz
 share/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+share/icons/crystalsvg/scalable/apps/kcmx.svgz
 share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/icons/crystalsvg/scalable/apps/kdict.svgz
-share/icons/crystalsvg/scalable/apps/kdvi.svgz
 share/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz
+share/icons/crystalsvg/scalable/apps/kjobviewer.svgz
 share/icons/crystalsvg/scalable/apps/klipper.svgz
-share/icons/crystalsvg/scalable/apps/kmail.svgz
+share/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/icons/crystalsvg/scalable/apps/knetattach.svgz
 share/icons/crystalsvg/scalable/apps/konqueror.svgz
 share/icons/crystalsvg/scalable/apps/konsole.svgz
-share/icons/crystalsvg/scalable/apps/kopete.svgz
-share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
-share/icons/crystalsvg/scalable/apps/kwrite.svgz
+share/icons/crystalsvg/scalable/apps/ktip.svgz
+share/icons/crystalsvg/scalable/apps/kwrite2.svgz
 share/icons/crystalsvg/scalable/apps/locale.svgz
-share/icons/crystalsvg/scalable/apps/mail.svgz
 share/icons/crystalsvg/scalable/apps/my_mac.svgz
-share/icons/crystalsvg/scalable/apps/mycomputer.svgz
 share/icons/crystalsvg/scalable/apps/netscape.svgz
 share/icons/crystalsvg/scalable/apps/openoffice.svgz
+share/icons/crystalsvg/scalable/apps/package_development.svgz
 share/icons/crystalsvg/scalable/apps/package_toys.svgz
-share/icons/crystalsvg/scalable/apps/package_utilities.svgz
 share/icons/crystalsvg/scalable/apps/penguin.svgz
+share/icons/crystalsvg/scalable/apps/personal.svgz
+share/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/icons/crystalsvg/scalable/apps/samba.svgz
 share/icons/crystalsvg/scalable/apps/shell.svgz
-share/icons/crystalsvg/scalable/apps/soffice.svgz
 share/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/icons/crystalsvg/scalable/apps/stylesheet.svgz
 share/icons/crystalsvg/scalable/apps/terminal.svgz
 share/icons/crystalsvg/scalable/apps/tux.svgz
 share/icons/crystalsvg/scalable/apps/wine.svgz
-share/icons/crystalsvg/scalable/apps/winprops.svgz
 share/icons/crystalsvg/scalable/apps/x.svgz
 share/icons/crystalsvg/scalable/apps/xapp.svgz
 share/icons/crystalsvg/scalable/apps/xcalc.svgz
@@ -2945,8 +3177,6 @@ share/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/icons/crystalsvg/scalable/apps/xpaint.svgz
 share/icons/hicolor/16x16/apps/khotkeys.png
 share/icons/hicolor/32x32/apps/khotkeys.png
-share/icons/locolor/16x16/apps/kcmfontinst.png
-share/icons/locolor/32x32/apps/kcmfontinst.png
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
@@ -3427,24 +3657,34 @@ share/mimelnk/application/x-smb-server.desktop
 share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
-share/mimelnk/kdedevice/cdrom_mounted.desktop
-share/mimelnk/kdedevice/cdrom_unmounted.desktop
-share/mimelnk/kdedevice/cdwriter_mounted.desktop
-share/mimelnk/kdedevice/cdwriter_unmounted.desktop
-share/mimelnk/kdedevice/dvd_mounted.desktop
-share/mimelnk/kdedevice/dvd_unmounted.desktop
-share/mimelnk/kdedevice/floppy5_mounted.desktop
-share/mimelnk/kdedevice/floppy5_unmounted.desktop
-share/mimelnk/kdedevice/floppy_mounted.desktop
-share/mimelnk/kdedevice/floppy_unmounted.desktop
-share/mimelnk/kdedevice/hdd_mounted.desktop
-share/mimelnk/kdedevice/hdd_unmounted.desktop
-share/mimelnk/kdedevice/nfs_mounted.desktop
-share/mimelnk/kdedevice/nfs_unmounted.desktop
-share/mimelnk/kdedevice/smb_mounted.desktop
-share/mimelnk/kdedevice/smb_unmounted.desktop
-share/mimelnk/kdedevice/zip_mounted.desktop
-share/mimelnk/kdedevice/zip_unmounted.desktop
+share/mimelnk/inode/system_directory.desktop
+share/mimelnk/media/audiocd.desktop
+share/mimelnk/media/blankcd.desktop
+share/mimelnk/media/blankdvd.desktop
+share/mimelnk/media/cdrom_mounted.desktop
+share/mimelnk/media/cdrom_unmounted.desktop
+share/mimelnk/media/cdwriter_mounted.desktop
+share/mimelnk/media/cdwriter_unmounted.desktop
+share/mimelnk/media/dvd_mounted.desktop
+share/mimelnk/media/dvd_unmounted.desktop
+share/mimelnk/media/dvdvideo.desktop
+share/mimelnk/media/floppy5_mounted.desktop
+share/mimelnk/media/floppy5_unmounted.desktop
+share/mimelnk/media/floppy_mounted.desktop
+share/mimelnk/media/floppy_unmounted.desktop
+share/mimelnk/media/gphoto2camera.desktop
+share/mimelnk/media/hdd_mounted.desktop
+share/mimelnk/media/hdd_unmounted.desktop
+share/mimelnk/media/nfs_mounted.desktop
+share/mimelnk/media/nfs_unmounted.desktop
+share/mimelnk/media/removable_mounted.desktop
+share/mimelnk/media/removable_unmounted.desktop
+share/mimelnk/media/smb_mounted.desktop
+share/mimelnk/media/smb_unmounted.desktop
+share/mimelnk/media/svcd.desktop
+share/mimelnk/media/vcd.desktop
+share/mimelnk/media/zip_mounted.desktop
+share/mimelnk/media/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
 share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
@@ -3453,13 +3693,14 @@ share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
 share/mimelnk/print/printermodel.desktop
 share/services/about.protocol
+share/services/applications.protocol
 share/services/ar.protocol
 share/services/bzip.protocol
 share/services/bzip2.protocol
 share/services/cgi.protocol
 share/services/cursorthumbnail.desktop
-share/services/devices.protocol
 share/services/djvuthumbnail.desktop
+share/services/exrthumbnail.desktop
 share/services/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
@@ -3468,17 +3709,21 @@ share/services/fontthumbnail.desktop
 share/services/gzip.protocol
 share/services/htmlthumbnail.desktop
 share/services/imagethumbnail.desktop
-share/services/imap4.protocol
-share/services/imaps.protocol
 share/services/info.protocol
 share/services/kaccess.desktop
 share/services/katedefaultproject.desktop
+share/services/katekttsd.desktop
 share/services/kded/favicons.desktop
+share/services/kded/khotkeys.desktop
 share/services/kded/konqy_preloader.desktop
 share/services/kded/kwrited.desktop
-share/services/kded/mountwatcher.desktop
+share/services/kded/mediamanager.desktop
+share/services/kded/remotedirnotify.desktop
+share/services/kded/systemdirnotify.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
+share/services/kfile_media.desktop
+share/services/kfile_trash.desktop
 share/services/kfindpart.desktop
 share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
@@ -3491,7 +3736,6 @@ share/services/konq_multicolumnview.desktop
 share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
-share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
@@ -3508,6 +3752,7 @@ share/services/ldaps.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
+share/services/media.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
 share/services/picturethumbnail.desktop
@@ -3516,23 +3761,27 @@ share/services/pop3s.protocol
 share/services/print.protocol
 share/services/printdb.protocol
 share/services/programs.protocol
+share/services/remote.protocol
 share/services/searchproviders/acronym.desktop
 share/services/searchproviders/alexa.desktop
 share/services/searchproviders/alexa_url.desktop
 share/services/searchproviders/alltheweb.desktop
 share/services/searchproviders/altavista.desktop
+share/services/searchproviders/amg.desktop
 share/services/searchproviders/appsy.desktop
 share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/backports.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.desktop
+share/services/searchproviders/cia.desktop
 share/services/searchproviders/citeseer.desktop
 share/services/searchproviders/cpan.desktop
 share/services/searchproviders/ctan.desktop
 share/services/searchproviders/ctan_cat.desktop
 share/services/searchproviders/dbug.desktop
 share/services/searchproviders/de2en.desktop
+share/services/searchproviders/de2fr.desktop
 share/services/searchproviders/deb.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
@@ -3545,10 +3794,12 @@ share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
 share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2de.desktop
 share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freedb.desktop
 share/services/searchproviders/freshmeat.desktop
 share/services/searchproviders/froogle.desktop
+share/services/searchproviders/fsd.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
@@ -3556,6 +3807,7 @@ share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
 share/services/searchproviders/google_news.desktop
 share/services/searchproviders/gracenote.desktop
+share/services/searchproviders/grec.desktop
 share/services/searchproviders/hotbot.desktop
 share/services/searchproviders/hyperdictionary.desktop
 share/services/searchproviders/hyperdictionary_thesaurus.desktop
@@ -3584,6 +3836,8 @@ share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
 share/services/searchproviders/thesaurus.desktop
+share/services/searchproviders/tvtome.desktop
+share/services/searchproviders/uspto.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
@@ -3599,24 +3853,30 @@ share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
+share/services/trash.protocol
+share/services/useragentstrings/firefoxoncurrent.desktop
+share/services/useragentstrings/googlebot.desktop
 share/services/useragentstrings/ie401onwinnt4.desktop
-share/services/useragentstrings/ie45onwinnt5.desktop
 share/services/useragentstrings/ie501onwinnt5.desktop
 share/services/useragentstrings/ie50onppc.desktop
-share/services/useragentstrings/ie50onwin95.desktop
 share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
+share/services/useragentstrings/ie60oncurrent.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
 share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozoncurrent12.desktop
 share/services/useragentstrings/mozoncurrent16.desktop
 share/services/useragentstrings/mozonwin2000.desktop
-share/services/useragentstrings/mozonwinnt4.desktop
+share/services/useragentstrings/mozonwinxp.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
+share/services/useragentstrings/ns71oncurrent.desktop
+share/services/useragentstrings/ns71onwinnt51.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/op75oncurrent.desktop
 share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
@@ -3645,6 +3905,8 @@ share/sounds/KDE_Beep_Connect.wav
 share/sounds/KDE_Beep_Digital_1.ogg
 share/sounds/KDE_Beep_Digital_2.ogg
 share/sounds/KDE_Beep_Door.wav
+share/sounds/KDE_Beep_Double.ogg
+share/sounds/KDE_Beep_Harsh.ogg
 share/sounds/KDE_Beep_Honk.wav
 share/sounds/KDE_Beep_Lightning.wav
 share/sounds/KDE_Beep_Phone_1.ogg
@@ -3689,6 +3951,7 @@ share/sounds/KDE_Drum_Break.ogg
 share/sounds/KDE_Error.wav
 share/sounds/KDE_Error_1.ogg
 share/sounds/KDE_Error_2.ogg
+share/sounds/KDE_Error_3.ogg
 share/sounds/KDE_Event_1.ogg
 share/sounds/KDE_Event_2.ogg
 share/sounds/KDE_Event_3.ogg
@@ -3766,27 +4029,69 @@ share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
 share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/All-Good-People-1.jpg.desktop
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Blkmarble.jpg.desktop
 share/wallpapers/Chicken-Songs-2.jpg
+share/wallpapers/Chicken-Songs-2.jpg.desktop
 share/wallpapers/Circuit.jpg
+share/wallpapers/Circuit.jpg.desktop
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Foggy1.jpg.desktop
 share/wallpapers/Island-of-Elba.jpg
+share/wallpapers/Island-of-Elba.jpg.desktop
+share/wallpapers/KDE34.png
+share/wallpapers/KDE34.png.desktop
 share/wallpapers/Marble01.jpg
+share/wallpapers/Marble01.jpg.desktop
 share/wallpapers/No-Ones-Laughing-3.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 share/wallpapers/Paper01.jpg
+share/wallpapers/Paper01.jpg.desktop
 share/wallpapers/Planning-And-Probing-1.jpg
+share/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/wallpapers/Totally-New-Product-1.jpg
+share/wallpapers/Totally-New-Product-1.jpg.desktop
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/wallpapers/andes-venezolanos.svgz
+share/wallpapers/andes-venezolanos.svgz.desktop
+share/wallpapers/aurora.svgz
+share/wallpapers/aurora.svgz.desktop
 share/wallpapers/blue-bend.jpg
+share/wallpapers/blue-bend.jpg.desktop
+share/wallpapers/celtic.svgz
+share/wallpapers/celtic.svgz.desktop
 share/wallpapers/default_blue.jpg
+share/wallpapers/default_blue.jpg.desktop
 share/wallpapers/default_gears.jpg
+share/wallpapers/default_gears.jpg.desktop
 share/wallpapers/fulmine.jpg
+share/wallpapers/fulmine.jpg.desktop
+share/wallpapers/gear-flowers.svgz
+share/wallpapers/gear-flowers.svgz.desktop
+share/wallpapers/globe.svgz
+share/wallpapers/globe.svgz.desktop
+share/wallpapers/here-gear.svgz
+share/wallpapers/here-gear.svgz.desktop
 share/wallpapers/kde_box.png
+share/wallpapers/kde_box.png.desktop
 share/wallpapers/kde_passion.jpg
+share/wallpapers/kde_passion.jpg.desktop
+share/wallpapers/konqui.svgz
+share/wallpapers/konqui.svgz.desktop
+share/wallpapers/lineart.svgz
+share/wallpapers/lineart.svgz.desktop
+share/wallpapers/moon.svgz
+share/wallpapers/moon.svgz.desktop
 share/wallpapers/only_k.jpg
+share/wallpapers/only_k.jpg.desktop
 share/wallpapers/seaofconero.jpg
+share/wallpapers/seaofconero.jpg.desktop
 share/wallpapers/triplegears.jpg
+share/wallpapers/triplegears.jpg.desktop
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@@ -3795,19 +4100,15 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/templates/.source/emptydir
 @dirrm share/mimelnk/print
-@dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/media
 @dirrm share/mimelnk/fonts
 @dirrm share/locale/l10n/zw
 @dirrm share/locale/l10n/zm
@@ -4036,7 +4337,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/crystalsvg/scalable/apps/gnome
+@dirrm share/fonts/override
+@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4045,6 +4347,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
+@dirrm share/doc/HTML/en/knetattach
 @dirrm share/doc/HTML/en/kmenuedit
 @dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kioslave
@@ -4058,6 +4361,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kinfocenter/pcmcia
 @dirrm share/doc/HTML/en/kinfocenter/pci
 @dirrm share/doc/HTML/en/kinfocenter/partitions
+@dirrm share/doc/HTML/en/kinfocenter/opengl
 @dirrm share/doc/HTML/en/kinfocenter/nics
 @dirrm share/doc/HTML/en/kinfocenter/memory
 @dirrm share/doc/HTML/en/kinfocenter/ioports
@@ -4083,12 +4387,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate
 @dirrm share/doc/HTML/en/kdebase-apidocs
+@dirrm share/doc/HTML/en/kdcop
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
 @dirrm share/doc/HTML/en/kcontrol/spellchecking
@@ -4134,16 +4436,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
 @dirrm share/doc/HTML/en/kate
+@dirrm share/doc/HTML/en/kappfinder
 @dirrm share/desktop-directories
+@dirrm share/apps/systemview
+@dirrm share/apps/remoteview
+@dirrm share/apps/plugin
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
+@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
+@dirrm share/apps/kthememanager/themes/YellowOnBlue
+@dirrm share/apps/kthememanager/themes/Sunshine
+@dirrm share/apps/kthememanager/themes/Redmond
+@dirrm share/apps/kthememanager/themes/Platinum
+@dirrm share/apps/kthememanager/themes/Plastik
+@dirrm share/apps/kthememanager/themes/Keramik
+@dirrm share/apps/kthememanager/themes/KDE_Classic
+@dirrm share/apps/kthememanager/themes/HighContrastLight-big
+@dirrm share/apps/kthememanager/themes/HighContrastLight
+@dirrm share/apps/kthememanager/themes/HighContrastDark-big
+@dirrm share/apps/kthememanager/themes/HighContrastDark
+@dirrm share/apps/kthememanager/themes
+@dirrm share/apps/kthememanager
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash/Themes/blue-bend
 @dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Simple
 @dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/None
 @dirrm share/apps/ksplash/Themes/Default/locolor
 @dirrm share/apps/ksplash/Themes/Default
 @dirrm share/apps/ksplash/Themes
@@ -4197,7 +4519,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
+@dirrm share/apps/khtml/kpartplugins
 @dirrm share/apps/khotkeys
+@dirrm share/apps/khelpcenter/searchhandlers/htdig
+@dirrm share/apps/khelpcenter/searchhandlers
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
@@ -4209,6 +4534,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/themes/circles
+@dirrm share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
@@ -4237,7 +4564,9 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcontroledit/icons
 @dirrm share/apps/kcontroledit
 @dirrm share/apps/kcontrol/pics
+@dirrm share/apps/kcontrol/about
 @dirrm share/apps/kcontrol
+@dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
 @dirrm share/apps/kcmkeys
@@ -4245,6 +4574,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
+@dirrm share/apps/katepart/kpartplugins
+@dirrm share/apps/kate/plugins/katekttsd
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index fdbd9bfc5636..4679a2d4d220 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,13 +18,16 @@ COMMENT=	Basic applications for the KDE system
 
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient \
+		usb:${PORTSDIR}/devel/libusb
 
-CONFLICTS=	kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.*
+CONFLICTS=	kdelibs-3.[0-3]* kdeutils-3.[0-2]*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
+USE_GETOPT_LONG=yes
 USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,8 +40,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-DO_NOT_COMPILE=	nsplugins
-CONFIGURE_ENV+=	RUN_KAPPFINDER=no
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -49,10 +50,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index a1ad17ecaaad..7a5b5d02fcce 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
-SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
+MD5 (KDE/kdebase-3.4.0.tar.bz2) = c88659e558ca98dc45377bf8ddfc26c9
+SIZE (KDE/kdebase-3.4.0.tar.bz2) = 22670772
diff --git a/x11/kdebase4-runtime/files/patch-kcontrol-nics-nic.cpp b/x11/kdebase4-runtime/files/patch-kcontrol-nics-nic.cpp
deleted file mode 100644
index e11c3de5032a..000000000000
--- a/x11/kdebase4-runtime/files/patch-kcontrol-nics-nic.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kcontrol/nics/nic.cpp	15 Nov 2003 22:01:05 -0000	1.24
-+++ kcontrol/nics/nic.cpp	21 Jan 2004 13:38:46 -0000
-@@ -229,9 +229,14 @@ NICList* findNICs()
-       tmp->addr = buf;
- 
-       if (ifa->ifa_netmask != NULL) {
-+#ifdef Q_OS_FREEBSD
-+	struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask;
-+	tmp->netmask=inet_ntoa(sinptr->sin_addr);
-+#else
- 	bzero(buf, 128);
- 	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
- 	tmp->netmask = buf;
-+#endif
-       }
- 
-       if (ifa->ifa_flags & IFF_UP)
diff --git a/x11/kdebase4-runtime/files/patch-kcontrol_konq_previews.cpp b/x11/kdebase4-runtime/files/patch-kcontrol_konq_previews.cpp
deleted file mode 100644
index 7fe3246c2149..000000000000
--- a/x11/kdebase4-runtime/files/patch-kcontrol_konq_previews.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcontrol/konq/previews.cpp.orig	Sun Oct 26 11:46:25 2003
-+++ kcontrol/konq/previews.cpp	Thu Jan 27 10:16:32 2005
-@@ -153,6 +153,11 @@
- 
-     for ( ; it.current() ; ++it ) {
-         QString protocol( it.current()->text() );
-+        if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) 
-+          // file should be enabled in case is not defined because if not so 
-+          // than preview's lost when size is changed from default one 
-+          it.current()->setOn( true ); 
-+        else 
-         it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
-     // config key is in bytes (default value 1MB), numinput is in MB
diff --git a/x11/kdebase4-runtime/files/patch-kdm-backend-xdmcp.c b/x11/kdebase4-runtime/files/patch-kdm-backend-xdmcp.c
deleted file mode 100644
index be29ec4d3416..000000000000
--- a/x11/kdebase4-runtime/files/patch-kdm-backend-xdmcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/backend/xdmcp.c.orig	Wed May  8 14:21:31 2002
-+++ kdm/backend/xdmcp.c	Wed Jun 26 20:14:02 2002
-@@ -1012,7 +1012,7 @@
- 
-     sprintf (buf, "Session %ld failed for display %.260s: %s",
- 	     (long) sessionID, name, reason);
--    Debug ("send_failed(%\"s)\n", buf);
-+    Debug ("send_failed(\"%s\")\n", buf);
-     status.length = strlen (buf);
-     status.data = (CARD8Ptr) buf;
-     header.version = XDM_PROTOCOL_VERSION;
diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def
deleted file mode 100644
index 3776abd3beae..000000000000
--- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-config.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/config.def.orig	Thu Nov 11 20:47:50 2004
-+++ kdm/kfrontend/config.def	Thu Nov 11 20:51:18 2004
-@@ -10,7 +10,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
index 4a3ac236fe1d..a6126b314d8e 100644
--- a/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-runtime/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,6 +1,6 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
-@@ -578,7 +578,7 @@
+--- kdm/kfrontend/genkdmconf.c.orig	Wed Feb 23 12:26:01 2005
++++ kdm/kfrontend/genkdmconf.c	Sat Mar 19 16:43:49 2005
+@@ -562,7 +562,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
  "#\n"
@@ -9,7 +9,7 @@
  "\n"
  #ifdef _AIX
  "# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-@@ -619,8 +619,8 @@
+@@ -591,8 +591,8 @@
  "# Reassign ownership of the console to root, this should disallow\n"
  "# assignment of console output to any random users's xterm. See Xstartup.\n"
  "#\n"
@@ -19,8 +19,17 @@
 +/* "#chmod 622 /dev/console\n" */
  "\n"
  #ifdef _AIX
- "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,7 +667,9 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ "  */bash)\n"
+@@ -637,7 +639,9 @@
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
@@ -31,3 +40,232 @@
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
  "    [ -f /etc/profile ] && . /etc/profile\n"
+@@ -648,7 +652,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ "  \"\")\n"
+ "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ "    ;;\n"
+@@ -662,10 +666,10 @@
+ "    exec " KDE_BINDIR "/startkde\n"
+ "    ;;\n"
+ "  *)\n"
+-"    eval exec \"$1\"\n"
++"    eval exec \"$session\"\n"
+ "    ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +821,7 @@
+  * XXX this stuff is highly borked. it does not handle collisions at all.
+  */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ 	const char *tptr;
+ 	char *nname;
+@@ -840,12 +844,7 @@
+ 		fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ 		rt = 0;
+ 	} else {
+-		char *nbuf;
+-		int nlen;
+-
+-		if (!proc || !proc( &file, &nbuf, &nlen ) ||
+-		    (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+-		{
++		if (!proc || !proc( &file )) {
+ 			if (!use_destdir && !strcmp( ce->value, nname ))
+ 				linkedFile( nname );
+ 			else {
+@@ -855,7 +854,7 @@
+ 				copiedFile( ce->value );
+ 			}
+ 		} else {
+-			WriteOut( nname, mode, 0, nbuf, nlen );
++			WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ 			editedFile( ce->value );
+ 		}
+ 		if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1377,7 @@
+ 
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ 	// XXX remove any login*, chooser*, ... resources
+ 	return 0;
+@@ -1415,15 +1414,14 @@
+ 				paap = pap += 2;
+ 				while (!isspace( *pap ))
+ 					pap++;
+-				for (;;) {
+-					if (*pp++ != '/')
+-						goto no;
+-					for (bpp = pp; *pp != '/'; pp++)
+-						if (isspace( *pp ))
++				if (*pp != '/')
++					break;
++				for (;;)
++					for (bpp = ++pp; *pp != '/'; pp++)
++						if (!*pp || isspace( *pp ))
+ 							goto wbrk;
+-				}
+ 			  wbrk:
+-				if (memcmp( bpp, paap, pap - paap ))
++				if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ 					break;
+ 			} else if (*pap == '\t') {
+ 				pap++;
+@@ -1472,24 +1470,25 @@
+ static int mod_usebg;
+ 
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+-	putval( "UseBackground",
+-	        (delstr( file, "\n"
+-	                 "(\n"
+-	                 "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-	                 "  */kdmdesktop\t&\n"
+-	                 "  echo $! >$PIDFILE\n"
+-	                 "  wait $!\n"
+-	                 "  rm $PIDFILE\n"
+-	                 ")\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "*/kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\n" )) ? "true" : "false" );
+-	return 0;
++	int chg =
++		delstr( file, "\n"
++		        "(\n"
++		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++		        "  */kdmdesktop\t&\n"
++		        "  echo $! >$PIDFILE\n"
++		        "  wait $!\n"
++		        "  rm $PIDFILE\n"
++		        ")\t&\n" ) |
++		delstr( file, "\n"
++		        "*/kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\n" );
++	putval( "UseBackground", chg ? "true" : "false" );
++	return chg;
+ }
+ 
+ static void
+@@ -1515,19 +1514,22 @@
+ }
+ 
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++	int chg1 = 0, chg2 = 0;
++
+ 	if (mod_usebg &&
+-	    !delstr( file, "\n"
++	    (delstr( file, "\n"
+ 	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ 	             "if [[] -f $PIDFILE ] ; then\n"
+ 	             "	   kill `cat $PIDFILE`\n"
+-	             "fi\n" ))
+-		delstr( file, "\n"
+-		        "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-		        "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+-	if (oldver < 0x0203)
+-		putval( "UseSessReg", (
++	             "fi\n" ) ||
++	     delstr( file, "\n"
++	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++		chg1 = 1;
++	if (oldver < 0x0203) {
++		chg2 = 
+ #ifdef _AIX
+ 			delstr( file, "\n"
+ "# We create a pseudodevice for finger.  (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1554,11 @@
+ "  else\n"
+ "    exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ "  fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ 			delstr( file, "\n"
+@@ -1564,11 +1566,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+-		 ) ? "true" : "false");
+-	return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++		putval( "UseSessReg", chg2 ? "true" : "false");
++	}
++	return chg1 | chg2;
+ }
+ 
+ static void
+@@ -1592,29 +1595,29 @@
+ }
+ 
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++	return
+ #ifdef _AIX
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ "  devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ "  exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+-	delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++		delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+-	delstr( file, "\n"
++" $USER\n" ) |
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+-	return 0;
+ }
+ 
+ static void
diff --git a/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp
deleted file mode 100644
index 553c411983a7..000000000000
--- a/x11/kdebase4-runtime/files/patch-konsole-konsole-konsole.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
-+++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
-@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
-     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
-     setSchema(s->schemaNo());
-     tabwidget->setCurrentPage(tabwidget->count()-1);
--      disableMasterModeConnections(); // no duplicate connections, remove old
--      enableMasterModeConnections();
--    }
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    disableMasterModeConnections(); // no duplicate connections, remove old
-+    enableMasterModeConnections();
-+    if(m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+  }
- }
- 
- QString Konsole::currentSession()
-@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
-       rootxpms.remove(s->widget());
-     }
-     delete s->widget();
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    if (m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-   }
-   session2action.remove(s);
-   action2session.remove(ra);
diff --git a/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp
new file mode 100644
index 000000000000..55eed7247922
--- /dev/null
+++ b/x11/kdebase4-runtime/files/patch-nsplugins-pluginscan.cpp
@@ -0,0 +1,10 @@
+--- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
++++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
+@@ -457,6 +457,7 @@
+ 	paths.append("/usr/lib64/netscape/plugins");
+ 	paths.append("/usr/lib64/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/local/lib/linux-flashplugin6");
+         config->writeEntry( "scanPaths", paths );
+     }
+ 
diff --git a/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
deleted file mode 100644
index f31b6341cf9c..000000000000
--- a/x11/kdebase4-runtime/files/patch-post-3.3.2-kdebase-htmlframes2
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1342.2.14
-diff -u -p -r1.1342.2.14 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
-+++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
-@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
-     QString viewName = view->viewName();
-     kdDebug() << "       - viewName=" << viewName << "   "
-               << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+    // First look for a hostextension containing this frame name
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+      kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+      if (!ext)
-+         continue; // Don't use this window
-+    }
-+
-     if ( !viewName.isEmpty() && viewName == name )
-     {
-       kdDebug() << "found existing view by name: " << view << endl;
-@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
-       return view;
-     }
- 
--    // First look for a hostextension containing this frame name
--    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
--    if ( ext )
--    {
--      ext = ext->findFrameParent(callingPart, name);
--    }
--
- //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 61e591e3cd68..1dabe06f9d62 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -4,11 +4,13 @@ bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kasbar
 bin/kate
 bin/kblankscrn.kss
+bin/kbookmarkmerger
 bin/kcheckpass
+bin/kcheckrunning
 bin/kcminit
-bin/kcmshell
 bin/kcontrol
 bin/kcontroledit
 bin/kdcop
@@ -32,16 +34,21 @@ bin/kfind
 bin/kfmclient
 bin/kfontinst
 bin/kfontview
+bin/khc_docbookdig.pl
+bin/khc_htdig.pl
+bin/khc_htsearch.pl
 bin/khc_indexbuilder
+bin/khc_mansearch.pl
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
 bin/kinfocenter
-bin/kio_devices_mounthelper
+bin/kio_media_mounthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
+bin/knetattach
 bin/konqueror
 bin/konsole
 bin/kpager
@@ -56,11 +63,13 @@ bin/kreadconfig
 bin/krootimage
 bin/ksmserver
 bin/ksplash
+bin/ksplashsimple
 bin/kstart
 bin/ksysguard
 bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
+bin/ktrash
 bin/kwebdesktop
 bin/kwin
 bin/kwin_killer_helper
@@ -68,6 +77,8 @@ bin/kwin_rules_dialog
 bin/kwrite
 bin/kwriteconfig
 bin/kxkb
+bin/nspluginscan
+bin/nspluginviewer
 bin/startkde
 etc/ksysguarddrc
 etc/rc.d/genkdmconf.sh
@@ -107,6 +118,7 @@ include/konq_dirpart.h
 include/konq_drag.h
 include/konq_events.h
 include/konq_faviconmgr.h
+include/konq_filetip.h
 include/konq_historycomm.h
 include/konq_historymgr.h
 include/konq_iconviewwidget.h
@@ -119,7 +131,6 @@ include/konq_undo.h
 include/konq_xmlguiclient.h
 include/konqbookmarkmanager.h
 include/konqsidebarplugin.h
-include/ksgrd/ColorPicker.h
 include/ksgrd/HostConnector.h
 include/ksgrd/SensorAgent.h
 include/ksgrd/SensorClient.h
@@ -135,22 +146,22 @@ include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
+include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/kicker-3.4-reverseLayout
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
-lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
 lib/kde3/cursorthumbnail.so
-lib/kde3/devices_panelapplet.la
-lib/kde3/devices_panelapplet.so
 lib/kde3/djvuthumbnail.la
 lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
 lib/kde3/dockbar_panelextension.so
+lib/kde3/exrthumbnail.la
+lib/kde3/exrthumbnail.so
 lib/kde3/extensionproxy.la
 lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
@@ -211,6 +222,8 @@ lib/kde3/kcm_kded.la
 lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
 lib/kde3/kcm_kdm.so
+lib/kde3/kcm_kdnssd.la
+lib/kde3/kcm_kdnssd.so
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keyboard.so
 lib/kde3/kcm_keys.la
@@ -247,6 +260,8 @@ lib/kde3/kcm_locale.la
 lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
 lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
@@ -267,36 +282,48 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
+lib/kde3/kcm_usb.la
+lib/kde3/kcm_usb.so
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
 lib/kde3/kcminit.so
-lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
 lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
 lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_khotkeys.la
+lib/kde3/kded_khotkeys.so
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_kwrited.so
-lib/kde3/kded_mountwatcher.la
-lib/kde3/kded_mountwatcher.so
+lib/kde3/kded_mediamanager.la
+lib/kde3/kded_mediamanager.so
+lib/kde3/kded_remotedirnotify.la
+lib/kde3/kded_remotedirnotify.so
+lib/kde3/kded_systemdirnotify.la
+lib/kde3/kded_systemdirnotify.so
 lib/kde3/kdesktop.la
 lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
 lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
 lib/kde3/kfile_font.so
+lib/kde3/kfile_media.la
+lib/kde3/kfile_media.so
+lib/kde3/kfile_trash.la
+lib/kde3/kfile_trash.so
 lib/kde3/kfmclient.la
 lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_classic.so
+lib/kde3/kgreet_winbind.la
+lib/kde3/kgreet_winbind.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
@@ -315,12 +342,14 @@ lib/kde3/kickermenu_prefmenu.la
 lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
 lib/kde3/kickermenu_recentdocs.so
+lib/kde3/kickermenu_remotemenu.la
+lib/kde3/kickermenu_remotemenu.so
+lib/kde3/kickermenu_systemmenu.la
+lib/kde3/kickermenu_systemmenu.so
 lib/kde3/kio_about.la
 lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
 lib/kde3/kio_cgi.so
-lib/kde3/kio_devices.la
-lib/kde3/kio_devices.so
 lib/kde3/kio_filter.la
 lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
@@ -331,8 +360,6 @@ lib/kde3/kio_floppy.la
 lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
 lib/kde3/kio_fonts.so
-lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
 lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
@@ -341,6 +368,8 @@ lib/kde3/kio_mac.la
 lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
 lib/kde3/kio_man.so
+lib/kde3/kio_media.la
+lib/kde3/kio_media.so
 lib/kde3/kio_nfs.la
 lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
@@ -349,6 +378,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_remote.la
+lib/kde3/kio_remote.so
 lib/kde3/kio_settings.la
 lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
@@ -357,10 +388,14 @@ lib/kde3/kio_smb.la
 lib/kde3/kio_smb.so
 lib/kde3/kio_smtp.la
 lib/kde3/kio_smtp.so
+lib/kde3/kio_system.la
+lib/kde3/kio_system.so
 lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
+lib/kde3/kio_trash.la
+lib/kde3/kio_trash.so
 lib/kde3/kjobviewer.la
 lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
@@ -423,6 +458,8 @@ lib/kde3/kwin3_laptop.la
 lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
 lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_plastik.la
+lib/kde3/kwin3_plastik.so
 lib/kde3/kwin3_quartz.la
 lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
@@ -437,6 +474,8 @@ lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
+lib/kde3/kwin_plastik_config.la
+lib/kde3/kwin_plastik_config.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
@@ -453,6 +492,8 @@ lib/kde3/libkfindpart.la
 lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
 lib/kde3/libkfontviewpart.so
+lib/kde3/libkhtmlkttsdplugin.la
+lib/kde3/libkhtmlkttsdplugin.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -465,8 +506,12 @@ lib/kde3/libkurisearchfilter.la
 lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/media_panelapplet.la
+lib/kde3/media_panelapplet.so
 lib/kde3/menu_panelapplet.la
 lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
@@ -489,6 +534,11 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
+lib/kde3/trash_panelapplet.la
+lib/kde3/trash_panelapplet.so
+lib/libkasbar.la
+lib/libkasbar.so
+lib/libkasbar.so.1
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -508,8 +558,6 @@ lib/libkdeinit_kate.la
 lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
 lib/libkdeinit_kcminit.so
-lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
 lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
@@ -604,6 +652,7 @@ share/applications/kde/ioports.desktop
 share/applications/kde/ioslaveinfo.desktop
 share/applications/kde/kappfinder.desktop
 share/applications/kde/kate.desktop
+share/applications/kde/kcm_kdnssd.desktop
 share/applications/kde/kcm_useraccount.desktop
 share/applications/kde/kcmaccess.desktop
 share/applications/kde/kcmcgi.desktop
@@ -617,6 +666,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -632,9 +682,12 @@ share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
+share/applications/kde/khtml_plugins.desktop
+share/applications/kde/kinfocenter.desktop
 share/applications/kde/kjobviewer.desktop
 share/applications/kde/klipper.desktop
 share/applications/kde/kmenuedit.desktop
+share/applications/kde/knetattach.desktop
 share/applications/kde/konqbrowser.desktop
 share/applications/kde/konquerorsu.desktop
 share/applications/kde/konsole.desktop
@@ -656,6 +709,7 @@ share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
 share/applications/kde/nic.desktop
+share/applications/kde/opengl.desktop
 share/applications/kde/panel.desktop
 share/applications/kde/panel_appearance.desktop
 share/applications/kde/partitions.desktop
@@ -672,6 +726,7 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/applnk/.hidden/.directory
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -692,6 +747,7 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
+share/applnk/.hidden/kwintranslucency.desktop
 share/applnk/.hidden/passwords.desktop
 share/applnk/.hidden/power.desktop
 share/applnk/.hidden/randr.desktop
@@ -701,7 +757,6 @@ share/applnk/.hidden/userinfo.desktop
 share/applnk/.hidden/virtualdesktops.desktop
 share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/KControl.desktop
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
@@ -713,7 +768,6 @@ share/applnk/Settingsmenu/printmgr.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/kpersonalizer.desktop
 share/applnk/Toys/ktip.desktop
@@ -800,6 +854,7 @@ share/apps/kappfinder/apps/Graphics/blender.desktop
 share/apps/kappfinder/apps/Graphics/ghostview.desktop
 share/apps/kappfinder/apps/Graphics/gimp.desktop
 share/apps/kappfinder/apps/Graphics/gv.desktop
+share/apps/kappfinder/apps/Graphics/inkscape.desktop
 share/apps/kappfinder/apps/Graphics/sodipodi.desktop
 share/apps/kappfinder/apps/Graphics/tgif.desktop
 share/apps/kappfinder/apps/Graphics/xdvi.desktop
@@ -952,9 +1007,11 @@ share/apps/kate/icons/locolor/22x22/actions/indent.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
 share/apps/kate/plugins/katedefaultproject/ui.rc
+share/apps/kate/plugins/katekttsd/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
 share/apps/kate/tips
+share/apps/katepart/kpartplugins/katepartkttsd.rc
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_browser.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -973,9 +1030,11 @@ share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
 share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
+share/apps/kcmusb/usb.ids
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
+share/apps/kconf_update/kate-2.4.upd
 share/apps/kconf_update/kcmdisplayrc.upd
 share/apps/kconf_update/kfmclient_3_2.upd
 share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -986,6 +1045,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqsidebartng.upd
 share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
@@ -995,14 +1055,20 @@ share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
+share/apps/kconf_update/kwin_focus2.sh
+share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwiniconify.upd
 share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/kwinupdatewindowsettings.upd
 share/apps/kconf_update/move_favicons.sh
+share/apps/kconf_update/move_konqsidebartng_entries.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
 share/apps/kconf_update/schemaStrip.pl
 share/apps/kconf_update/socks.upd
+share/apps/kcontrol/about/kcontrol.css
+share/apps/kcontrol/about/main.html
+share/apps/kcontrol/about/top-right-kcontrol.png
 share/apps/kcontrol/kcontrolui.rc
 share/apps/kcontrol/pics/energybig.png
 share/apps/kcontrol/pics/lo-energy.png
@@ -1011,9 +1077,6 @@ share/apps/kcontrol/pics/mini-world.png
 share/apps/kcontrol/pics/monitor.png
 share/apps/kcontrol/pics/onlyone.png
 share/apps/kcontrol/pics/overlapping.png
-share/apps/kcontrol/pics/part1.png
-share/apps/kcontrol/pics/part2.png
-share/apps/kcontrol/pics/part3.png
 share/apps/kcontrol/pics/play.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1022,25 +1085,42 @@ share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kcontroledit/kcontroleditui.rc
 share/apps/kdcop/kdcopui.rc
-share/apps/kdeprint/template/background.png
+share/apps/kdeprint/template/bar-bottom-left.png
+share/apps/kdeprint/template/bar-bottom-middle.png
+share/apps/kdeprint/template/bar-bottom-right.png
+share/apps/kdeprint/template/bar-middle-left.png
+share/apps/kdeprint/template/bar-middle-right.png
+share/apps/kdeprint/template/bar-top-left.png
+share/apps/kdeprint/template/bar-top-middle.png
+share/apps/kdeprint/template/bar-top-right.png
+share/apps/kdeprint/template/bottom-left.png
+share/apps/kdeprint/template/bottom-middle.png
+share/apps/kdeprint/template/bottom-right.png
+share/apps/kdeprint/template/box-bottom-left.png
+share/apps/kdeprint/template/box-bottom-middle.png
+share/apps/kdeprint/template/box-bottom-right.png
+share/apps/kdeprint/template/box-centre-kdeprint.png
+share/apps/kdeprint/template/box-middle-left.png
+share/apps/kdeprint/template/box-middle-right.png
+share/apps/kdeprint/template/box-top-left.png
+share/apps/kdeprint/template/box-top-middle.png
+share/apps/kdeprint/template/box-top-right.png
 share/apps/kdeprint/template/class.template
 share/apps/kdeprint/template/driver.template
 share/apps/kdeprint/template/htmlstyles.css
 share/apps/kdeprint/template/jobs.template
-share/apps/kdeprint/template/kdelogo2.png
-share/apps/kdeprint/template/kdeprint.png
-share/apps/kdeprint/template/lines.png
-share/apps/kdeprint/template/lines2.png
-share/apps/kdeprint/template/pointers.png
 share/apps/kdeprint/template/printer.template
 share/apps/kdeprint/template/pseudo.template
-share/apps/kdeprint/template/shadow1.png
+share/apps/kdeprint/template/top-left.png
+share/apps/kdeprint/template/top-middle.png
+share/apps/kdeprint/template/top-right-kdeprint.png
 share/apps/kdeprint_part/kdeprint_part.rc
 share/apps/kdeprintfax/anytops
 share/apps/kdeprintfax/faxfilters
 share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
 share/apps/kdeprintfax/kdeprintfaxui.rc
 share/apps/kdesktop/DesktopLinks/Home.desktop
+share/apps/kdesktop/DesktopLinks/System.desktop
 share/apps/kdesktop/directory.autostart
 share/apps/kdesktop/directory.desktop
 share/apps/kdesktop/directory.templates
@@ -1117,8 +1197,9 @@ share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-share/apps/kdm/pics/kdeflower.png
+share/apps/kdm/pics/kdelogo-crystal.png
 share/apps/kdm/pics/kdelogo.png
+share/apps/kdm/pics/shutdown.jpg
 share/apps/kdm/pics/users/Apple.png
 share/apps/kdm/pics/users/BeachBall.png
 share/apps/kdm/pics/users/Blowfish.png
@@ -1197,6 +1278,13 @@ share/apps/kdm/sessions/wm2.desktop
 share/apps/kdm/sessions/wmaker.desktop
 share/apps/kdm/sessions/xfce.desktop
 share/apps/kdm/sessions/xfce4.desktop
+share/apps/kdm/themes/circles/GdmGreeterTheme.desktop
+share/apps/kdm/themes/circles/background.svg
+share/apps/kdm/themes/circles/circles.xml
+share/apps/kdm/themes/circles/flower.png
+share/apps/kdm/themes/circles/help.png
+share/apps/kdm/themes/circles/options.png
+share/apps/kdm/themes/circles/screenshot.png
 share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
@@ -1207,6 +1295,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 share/apps/kfindpart/icons/locolor/22x22/actions/search.png
 share/apps/kfontview/kfontviewpart.rc
+share/apps/kfontview/kfontviewui.rc
 share/apps/khelpcenter/glossary.html.in
 share/apps/khelpcenter/glossary.xslt
 share/apps/khelpcenter/intro.html.in
@@ -1240,14 +1329,20 @@ share/apps/khelpcenter/plugins/links.desktop
 share/apps/khelpcenter/plugins/support.desktop
 share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
+share/apps/khelpcenter/searchhandlers/docbook.desktop
+share/apps/khelpcenter/searchhandlers/htdig.desktop
+share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+share/apps/khelpcenter/searchhandlers/man.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
 share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/apps/khtml/kpartplugins/khtmlkttsd.desktop
+share/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
 share/apps/kicker/applets/ksysguardapplet.desktop
 share/apps/kicker/applets/lockout.desktop
+share/apps/kicker/applets/mediaapplet.desktop
 share/apps/kicker/applets/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
@@ -1255,6 +1350,7 @@ share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/applets/runapplet.desktop
 share/apps/kicker/applets/systemtrayapplet.desktop
 share/apps/kicker/applets/taskbarapplet.desktop
+share/apps/kicker/applets/trashapplet.desktop
 share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
@@ -1271,6 +1367,8 @@ share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
 share/apps/kicker/menuext/recentdocs.desktop
+share/apps/kicker/menuext/remotemenu.desktop
+share/apps/kicker/menuext/systemmenu.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk10.png
 share/apps/kicker/pics/disk2.png
@@ -1416,14 +1514,12 @@ share/apps/konqsidebartng/dirtree/dirtree_module.desktop
 share/apps/konqsidebartng/dirtree/history_module.desktop
 share/apps/konqsidebartng/entries/.version
 share/apps/konqsidebartng/entries/bookmarks.desktop
-share/apps/konqsidebartng/entries/devices.desktop
 share/apps/konqsidebartng/entries/history.desktop
 share/apps/konqsidebartng/entries/home.desktop
 share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
-share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1436,35 +1532,25 @@ share/apps/konqsidebartng/virtual_folders/remote/web/.directory
 share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
+share/apps/konqsidebartng/virtual_folders/services/applications.desktop
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/konqsidebartng/virtual_folders/services/devices.desktop
 share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/konqsidebartng/virtual_folders/services/media.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop
+share/apps/konqsidebartng/virtual_folders/services/settings.desktop
 share/apps/konqsidebartng/websidebar/websidebar.html
-share/apps/konqueror/about/background.png
-share/apps/konqueror/about/background_rtl.png
-share/apps/konqueror/about/bgtable.png
-share/apps/konqueror/about/bgtable_rtl.png
+share/apps/konqueror/about/box-centre-konqueror.png
 share/apps/konqueror/about/intro.html
-share/apps/konqueror/about/intro_rtl.html
-share/apps/konqueror/about/kdelogo2.png
 share/apps/konqueror/about/konq.css
-share/apps/konqueror/about/konq_rtl.css
-share/apps/konqueror/about/konqueror.png
-share/apps/konqueror/about/konqueror_rtl.png
+share/apps/konqueror/about/launch.html
 share/apps/konqueror/about/lightning.png
-share/apps/konqueror/about/lines.png
-share/apps/konqueror/about/lines2.png
-share/apps/konqueror/about/more.png
 share/apps/konqueror/about/plugins.html
 share/apps/konqueror/about/plugins_rtl.html
-share/apps/konqueror/about/pointers.gif
-share/apps/konqueror/about/shadow1.png
 share/apps/konqueror/about/specs.html
-share/apps/konqueror/about/specs_rtl.html
 share/apps/konqueror/about/tips.html
-share/apps/konqueror/about/tips_rtl.html
+share/apps/konqueror/about/top-right-konqueror.png
 share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
@@ -1478,7 +1564,6 @@ share/apps/konqueror/pics/arrow_bottomleft.png
 share/apps/konqueror/pics/arrow_bottomright.png
 share/apps/konqueror/pics/arrow_topleft.png
 share/apps/konqueror/pics/arrow_topright.png
-share/apps/konqueror/pics/indicator_anchor.png
 share/apps/konqueror/pics/indicator_connect.png
 share/apps/konqueror/pics/indicator_empty.png
 share/apps/konqueror/pics/indicator_noconnect.png
@@ -1490,23 +1575,13 @@ share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/simplebrowser
 share/apps/konqueror/profiles/tabbedbrowsing
 share/apps/konqueror/profiles/webbrowsing
-share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
 share/apps/konqueror/servicemenus/installfont.desktop
 share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 share/apps/konqueror/servicemenus/konsolehere.desktop
-share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
+share/apps/konqueror/servicemenus/media_eject.desktop
+share/apps/konqueror/servicemenus/media_mount.desktop
+share/apps/konqueror/servicemenus/media_safelyremove.desktop
+share/apps/konqueror/servicemenus/media_unmount.desktop
 share/apps/konqueror/servicemenus/text-ada-print.desktop
 share/apps/konqueror/servicemenus/text-c++-print.desktop
 share/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1525,8 +1600,6 @@ share/apps/konqueror/servicemenus/text-tcl-print.desktop
 share/apps/konqueror/servicemenus/text-tex-print.desktop
 share/apps/konqueror/servicemenus/text-xml-print.desktop
 share/apps/konqueror/servicemenus/text-xslt-print.desktop
-share/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
 share/apps/konqueror/tiles/bluemorning.png
 share/apps/konqueror/tiles/canvas.png
 share/apps/konqueror/tiles/checker.png
@@ -1573,6 +1646,7 @@ share/apps/konsole/profiles/4shells
 share/apps/konsole/profiles/5shells
 share/apps/konsole/screen.desktop
 share/apps/konsole/shell.desktop
+share/apps/konsole/solaris.keytab
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
 share/apps/konsole/syscolor.schema
@@ -1598,9 +1672,12 @@ share/apps/ksplash/Themes/Default/splash_active_bar.png
 share/apps/ksplash/Themes/Default/splash_bottom.png
 share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 share/apps/ksplash/Themes/Default/splash_top.png
+share/apps/ksplash/Themes/None/Theme.rc
 share/apps/ksplash/Themes/Redmond/Background.png
 share/apps/ksplash/Themes/Redmond/Preview.png
 share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Simple/Preview.png
+share/apps/ksplash/Themes/Simple/Theme.rc
 share/apps/ksplash/Themes/Standard/Preview.png
 share/apps/ksplash/Themes/Standard/Theme.rc
 share/apps/ksplash/Themes/blue-bend/Preview.png
@@ -1626,6 +1703,30 @@ share/apps/ksysguard/pics/shell.png
 share/apps/ksysguard/pics/tools.png
 share/apps/ksysguard/pics/unknownapp.png
 share/apps/ksysguard/pics/waiting.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml
+share/apps/kthememanager/themes/Keramik/Keramik.preview.png
+share/apps/kthememanager/themes/Keramik/Keramik.xml
+share/apps/kthememanager/themes/Plastik/Plastik.preview.png
+share/apps/kthememanager/themes/Plastik/Plastik.xml
+share/apps/kthememanager/themes/Platinum/Platinum.preview.png
+share/apps/kthememanager/themes/Platinum/Platinum.xml
+share/apps/kthememanager/themes/Redmond/Redmond.preview.png
+share/apps/kthememanager/themes/Redmond/Redmond.xml
+share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png
+share/apps/kthememanager/themes/Sunshine/Sunshine.xml
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
 share/apps/kwin/keramik.desktop
@@ -1644,12 +1745,20 @@ share/apps/kwin/pics/menu.png
 share/apps/kwin/pics/pindown.png
 share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
+share/apps/kwin/plastik.desktop
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
+share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/smb-network.desktop
+share/apps/systemview/home.desktop
+share/apps/systemview/media.desktop
+share/apps/systemview/remote.desktop
+share/apps/systemview/settings.desktop
+share/apps/systemview/trash.desktop
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
@@ -1658,15 +1767,20 @@ share/autostart/ktip.desktop
 share/autostart/panel.desktop
 share/config.kcfg/kcm_useraccount.kcfg
 share/config.kcfg/kcm_useraccount_pass.kcfg
+share/config.kcfg/kdesktop.kcfg
+share/config.kcfg/khelpcenter.kcfg
+share/config.kcfg/klaunch.kcfg
 share/config.kcfg/konqueror.kcfg
+share/config.kcfg/kwebdesktop.kcfg
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/taskbar.kcfg
+share/config/katerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
 share/config/kxkb_groups
-share/config/mountwatcher.desktop
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -1689,6 +1803,7 @@ share/desktop-directories/kde-science.directory
 share/desktop-directories/kde-settings-accessibility.directory
 share/desktop-directories/kde-settings-components.directory
 share/desktop-directories/kde-settings-desktop.directory
+share/desktop-directories/kde-settings-hardware.directory
 share/desktop-directories/kde-settings-looknfeel.directory
 share/desktop-directories/kde-settings-network.directory
 share/desktop-directories/kde-settings-peripherals.directory
@@ -1706,6 +1821,7 @@ share/desktop-directories/kde-toys.directory
 share/desktop-directories/kde-unknown.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
+share/doc/HTML/en/kappfinder/man-kappfinder.1.docbook
 share/doc/HTML/en/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1866,6 +1982,9 @@ share/doc/HTML/en/kcontrol/useragent/index.docbook
 share/doc/HTML/en/kcontrol/windowmanagement/common
 share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/en/kdcop/common
+share/doc/HTML/en/kdcop/index.cache.bz2
+share/doc/HTML/en/kdcop/index.docbook
 share/doc/HTML/en/kdebase-apidocs/common
 share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.cache.bz2
@@ -1961,7 +2080,10 @@ share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/HTML/en/khelpcenter/faq/questions.docbook
+share/doc/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
 share/doc/HTML/en/khelpcenter/faq/winmng.docbook
 share/doc/HTML/en/khelpcenter/glossary/checkxrefs
 share/doc/HTML/en/khelpcenter/glossary/common
@@ -1982,20 +2104,84 @@ share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/shadow1.png
 share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/a-window.png
+share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
+share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
+share/doc/HTML/en/khelpcenter/userguide/amarok.png
+share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
 share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook
-share/doc/HTML/en/khelpcenter/userguide/history.docbook
+share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
+share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/en/khelpcenter/userguide/desktop.png
+share/doc/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
+share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
+share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
+share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
+share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/more-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/notices-trademarks.docbook
-share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/staff.docbook
-share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook
+share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
+share/doc/HTML/en/khelpcenter/userguide/juk.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
+share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
+share/doc/HTML/en/khelpcenter/userguide/kmag.png
+share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
+share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
+share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-start.png
+share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
+share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
+share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/kopete.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
+share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
+share/doc/HTML/en/khelpcenter/userguide/noatun.png
+share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
+share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
+share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
+share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
+share/doc/HTML/en/khelpcenter/userguide/rip.png
+share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
+share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
+share/doc/HTML/en/khelpcenter/userguide/services.png
+share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
+share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
+share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
@@ -2056,6 +2242,9 @@ share/doc/HTML/en/kinfocenter/memory/index.docbook
 share/doc/HTML/en/kinfocenter/nics/common
 share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
 share/doc/HTML/en/kinfocenter/nics/index.docbook
+share/doc/HTML/en/kinfocenter/opengl/common
+share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
+share/doc/HTML/en/kinfocenter/opengl/index.docbook
 share/doc/HTML/en/kinfocenter/partitions/common
 share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
 share/doc/HTML/en/kinfocenter/partitions/index.docbook
@@ -2086,7 +2275,6 @@ share/doc/HTML/en/kinfocenter/usb/index.docbook
 share/doc/HTML/en/kinfocenter/xserver/common
 share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
 share/doc/HTML/en/kinfocenter/xserver/index.docbook
-share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
@@ -2144,6 +2332,10 @@ share/doc/HTML/en/kmenuedit/i_paste.png
 share/doc/HTML/en/kmenuedit/icon_sets.png
 share/doc/HTML/en/kmenuedit/index.cache.bz2
 share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/knetattach/common
+share/doc/HTML/en/knetattach/index.cache.bz2
+share/doc/HTML/en/knetattach/index.docbook
+share/doc/HTML/en/knetattach/screenshot.png
 share/doc/HTML/en/konqueror/basics.docbook
 share/doc/HTML/en/konqueror/bookmarks.docbook
 share/doc/HTML/en/konqueror/browser.docbook
@@ -2160,6 +2352,7 @@ share/doc/HTML/en/konqueror/index.cache.bz2
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/introduction.docbook
 share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
 share/doc/HTML/en/konqueror/parts.png
 share/doc/HTML/en/konqueror/path-complete.docbook
 share/doc/HTML/en/konqueror/plugins.docbook
@@ -2171,6 +2364,7 @@ share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/konsole.png
+share/doc/HTML/en/konsole/tabbar.png
 share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
@@ -2203,8 +2397,10 @@ share/icons/crystalsvg/128x128/apps/bell.png
 share/icons/crystalsvg/128x128/apps/cache.png
 share/icons/crystalsvg/128x128/apps/clanbomber.png
 share/icons/crystalsvg/128x128/apps/clock.png
+share/icons/crystalsvg/128x128/apps/colors.png
 share/icons/crystalsvg/128x128/apps/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy.png
 share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
 share/icons/crystalsvg/128x128/apps/fonts.png
@@ -2215,19 +2411,20 @@ share/icons/crystalsvg/128x128/apps/kappfinder.png
 share/icons/crystalsvg/128x128/apps/kate.png
 share/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/icons/crystalsvg/128x128/apps/kcmdf.png
+share/icons/crystalsvg/128x128/apps/kcmkwm.png
 share/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/icons/crystalsvg/128x128/apps/kcmpci.png
 share/icons/crystalsvg/128x128/apps/kcontrol.png
 share/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/icons/crystalsvg/128x128/apps/kdmconfig.png
-share/icons/crystalsvg/128x128/apps/keditbookmarks.png
 share/icons/crystalsvg/128x128/apps/key_bindings.png
 share/icons/crystalsvg/128x128/apps/kfm_home.png
 share/icons/crystalsvg/128x128/apps/khelpcenter.png
 share/icons/crystalsvg/128x128/apps/kjobviewer.png
 share/icons/crystalsvg/128x128/apps/klipper.png
 share/icons/crystalsvg/128x128/apps/kmenu.png
+share/icons/crystalsvg/128x128/apps/knetattach.png
 share/icons/crystalsvg/128x128/apps/konqueror.png
 share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
@@ -2245,6 +2442,7 @@ share/icons/crystalsvg/128x128/apps/multimedia.png
 share/icons/crystalsvg/128x128/apps/netscape.png
 share/icons/crystalsvg/128x128/apps/package.png
 share/icons/crystalsvg/128x128/apps/package_applications.png
+share/icons/crystalsvg/128x128/apps/package_development.png
 share/icons/crystalsvg/128x128/apps/package_favourite.png
 share/icons/crystalsvg/128x128/apps/package_games.png
 share/icons/crystalsvg/128x128/apps/package_multimedia.png
@@ -2291,6 +2489,10 @@ share/icons/crystalsvg/16x16/apps/designer.png
 share/icons/crystalsvg/16x16/apps/dia.png
 share/icons/crystalsvg/16x16/apps/dlgedit.png
 share/icons/crystalsvg/16x16/apps/eclipse.png
+share/icons/crystalsvg/16x16/apps/edu_languages.png
+share/icons/crystalsvg/16x16/apps/edu_mathematics.png
+share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
+share/icons/crystalsvg/16x16/apps/edu_science.png
 share/icons/crystalsvg/16x16/apps/emacs.png
 share/icons/crystalsvg/16x16/apps/email.png
 share/icons/crystalsvg/16x16/apps/energy.png
@@ -2307,7 +2509,6 @@ share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/gnomemeeting.png
 share/icons/crystalsvg/16x16/apps/gnucash.png
 share/icons/crystalsvg/16x16/apps/gnumeric.png
-share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
 share/icons/crystalsvg/16x16/apps/help_index.png
@@ -2346,6 +2547,7 @@ share/icons/crystalsvg/16x16/apps/kjobviewer.png
 share/icons/crystalsvg/16x16/apps/klipper.png
 share/icons/crystalsvg/16x16/apps/kmenu.png
 share/icons/crystalsvg/16x16/apps/kmenuedit.png
+share/icons/crystalsvg/16x16/apps/knetattach.png
 share/icons/crystalsvg/16x16/apps/knotify.png
 share/icons/crystalsvg/16x16/apps/konqueror.png
 share/icons/crystalsvg/16x16/apps/konsole.png
@@ -2412,7 +2614,6 @@ share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
 share/icons/crystalsvg/16x16/apps/scribus.png
 share/icons/crystalsvg/16x16/apps/sodipodi.png
-share/icons/crystalsvg/16x16/apps/soffice.png
 share/icons/crystalsvg/16x16/apps/style.png
 share/icons/crystalsvg/16x16/apps/stylesheet.png
 share/icons/crystalsvg/16x16/apps/terminal.png
@@ -2423,7 +2624,6 @@ share/icons/crystalsvg/16x16/apps/vnc.png
 share/icons/crystalsvg/16x16/apps/wabi.png
 share/icons/crystalsvg/16x16/apps/window_list.png
 share/icons/crystalsvg/16x16/apps/wine.png
-share/icons/crystalsvg/16x16/apps/winprops.png
 share/icons/crystalsvg/16x16/apps/wp.png
 share/icons/crystalsvg/16x16/apps/xcalc.png
 share/icons/crystalsvg/16x16/apps/xchat.png
@@ -2441,18 +2641,54 @@ share/icons/crystalsvg/16x16/apps/xmms.png
 share/icons/crystalsvg/16x16/apps/xosview.png
 share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
-share/icons/crystalsvg/16x16/devices/print_printer.png
-share/icons/crystalsvg/16x16/filesystems/folder_print2.png
 share/icons/crystalsvg/22x22/actions/newfont.png
-share/icons/crystalsvg/22x22/actions/textwaterfall.png
+share/icons/crystalsvg/22x22/apps/access.png
+share/icons/crystalsvg/22x22/apps/agent.png
+share/icons/crystalsvg/22x22/apps/arts.png
+share/icons/crystalsvg/22x22/apps/background.png
+share/icons/crystalsvg/22x22/apps/bell.png
+share/icons/crystalsvg/22x22/apps/cache.png
+share/icons/crystalsvg/22x22/apps/colors.png
+share/icons/crystalsvg/22x22/apps/cookie.png
+share/icons/crystalsvg/22x22/apps/date.png
+share/icons/crystalsvg/22x22/apps/email.png
+share/icons/crystalsvg/22x22/apps/energy.png
+share/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/icons/crystalsvg/22x22/apps/filetypes.png
+share/icons/crystalsvg/22x22/apps/fonts.png
+share/icons/crystalsvg/22x22/apps/hwinfo.png
+share/icons/crystalsvg/22x22/apps/icons.png
+share/icons/crystalsvg/22x22/apps/iconthemes.png
+share/icons/crystalsvg/22x22/apps/kcmdevices.png
+share/icons/crystalsvg/22x22/apps/kcmkicker.png
+share/icons/crystalsvg/22x22/apps/kcmkwm.png
+share/icons/crystalsvg/22x22/apps/kcmx.png
+share/icons/crystalsvg/22x22/apps/kdmconfig.png
+share/icons/crystalsvg/22x22/apps/key_bindings.png
+share/icons/crystalsvg/22x22/apps/keyboard.png
+share/icons/crystalsvg/22x22/apps/kfm.png
+share/icons/crystalsvg/22x22/apps/khelpcenter.png
+share/icons/crystalsvg/22x22/apps/kjobviewer.png
 share/icons/crystalsvg/22x22/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/kmenu.png
+share/icons/crystalsvg/22x22/apps/knetattach.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/konsole.png
+share/icons/crystalsvg/22x22/apps/kscreensaver.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
+share/icons/crystalsvg/22x22/apps/kthememgr.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
+share/icons/crystalsvg/22x22/apps/locale.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/package_development.png
+share/icons/crystalsvg/22x22/apps/personal.png
+share/icons/crystalsvg/22x22/apps/printmgr.png
+share/icons/crystalsvg/22x22/apps/proxy.png
 share/icons/crystalsvg/22x22/apps/randr.png
+share/icons/crystalsvg/22x22/apps/samba.png
+share/icons/crystalsvg/22x22/apps/style.png
+share/icons/crystalsvg/22x22/apps/stylesheet.png
 share/icons/crystalsvg/32x32/actions/newfont.png
-share/icons/crystalsvg/32x32/actions/textwaterfall.png
 share/icons/crystalsvg/32x32/apps/abiword.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
@@ -2475,6 +2711,10 @@ share/icons/crystalsvg/32x32/apps/designer.png
 share/icons/crystalsvg/32x32/apps/dia.png
 share/icons/crystalsvg/32x32/apps/dlgedit.png
 share/icons/crystalsvg/32x32/apps/eclipse.png
+share/icons/crystalsvg/32x32/apps/edu_languages.png
+share/icons/crystalsvg/32x32/apps/edu_mathematics.png
+share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
+share/icons/crystalsvg/32x32/apps/edu_science.png
 share/icons/crystalsvg/32x32/apps/emacs.png
 share/icons/crystalsvg/32x32/apps/email.png
 share/icons/crystalsvg/32x32/apps/energy.png
@@ -2493,7 +2733,6 @@ share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/gnomemeeting.png
 share/icons/crystalsvg/32x32/apps/gnucash.png
 share/icons/crystalsvg/32x32/apps/gnumeric.png
-share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
 share/icons/crystalsvg/32x32/apps/help_index.png
@@ -2505,7 +2744,6 @@ share/icons/crystalsvg/32x32/apps/kappfinder.png
 share/icons/crystalsvg/32x32/apps/kate.png
 share/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
-share/icons/crystalsvg/32x32/apps/kcmfontinst.png
 share/icons/crystalsvg/32x32/apps/kcmkicker.png
 share/icons/crystalsvg/32x32/apps/kcmkwm.png
 share/icons/crystalsvg/32x32/apps/kcmmemory.png
@@ -2528,12 +2766,12 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 share/icons/crystalsvg/32x32/apps/kfind.png
 share/icons/crystalsvg/32x32/apps/kfm.png
 share/icons/crystalsvg/32x32/apps/kfm_home.png
-share/icons/crystalsvg/32x32/apps/kfontview.png
 share/icons/crystalsvg/32x32/apps/khelpcenter.png
 share/icons/crystalsvg/32x32/apps/kjobviewer.png
 share/icons/crystalsvg/32x32/apps/klipper.png
 share/icons/crystalsvg/32x32/apps/kmenu.png
 share/icons/crystalsvg/32x32/apps/kmenuedit.png
+share/icons/crystalsvg/32x32/apps/knetattach.png
 share/icons/crystalsvg/32x32/apps/knotify.png
 share/icons/crystalsvg/32x32/apps/konqueror.png
 share/icons/crystalsvg/32x32/apps/konsole.png
@@ -2565,6 +2803,7 @@ share/icons/crystalsvg/32x32/apps/netscape.png
 share/icons/crystalsvg/32x32/apps/opera.png
 share/icons/crystalsvg/32x32/apps/package.png
 share/icons/crystalsvg/32x32/apps/package_applications.png
+share/icons/crystalsvg/32x32/apps/package_development.png
 share/icons/crystalsvg/32x32/apps/package_editors.png
 share/icons/crystalsvg/32x32/apps/package_edutainment.png
 share/icons/crystalsvg/32x32/apps/package_favourite.png
@@ -2596,7 +2835,6 @@ share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/scribus.png
 share/icons/crystalsvg/32x32/apps/sodipodi.png
-share/icons/crystalsvg/32x32/apps/soffice.png
 share/icons/crystalsvg/32x32/apps/style.png
 share/icons/crystalsvg/32x32/apps/stylesheet.png
 share/icons/crystalsvg/32x32/apps/terminal.png
@@ -2607,7 +2845,6 @@ share/icons/crystalsvg/32x32/apps/vnc.png
 share/icons/crystalsvg/32x32/apps/wabi.png
 share/icons/crystalsvg/32x32/apps/window_list.png
 share/icons/crystalsvg/32x32/apps/wine.png
-share/icons/crystalsvg/32x32/apps/winprops.png
 share/icons/crystalsvg/32x32/apps/wp.png
 share/icons/crystalsvg/32x32/apps/x.png
 share/icons/crystalsvg/32x32/apps/xapp.png
@@ -2628,8 +2865,6 @@ share/icons/crystalsvg/32x32/apps/xmms.png
 share/icons/crystalsvg/32x32/apps/xosview.png
 share/icons/crystalsvg/32x32/apps/xpaint.png
 share/icons/crystalsvg/32x32/apps/xv.png
-share/icons/crystalsvg/32x32/devices/print_printer.png
-share/icons/crystalsvg/32x32/filesystems/folder_print2.png
 share/icons/crystalsvg/48x48/apps/abiword.png
 share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
@@ -2649,6 +2884,10 @@ share/icons/crystalsvg/48x48/apps/date.png
 share/icons/crystalsvg/48x48/apps/designer.png
 share/icons/crystalsvg/48x48/apps/dia.png
 share/icons/crystalsvg/48x48/apps/eclipse.png
+share/icons/crystalsvg/48x48/apps/edu_languages.png
+share/icons/crystalsvg/48x48/apps/edu_mathematics.png
+share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
+share/icons/crystalsvg/48x48/apps/edu_science.png
 share/icons/crystalsvg/48x48/apps/emacs.png
 share/icons/crystalsvg/48x48/apps/email.png
 share/icons/crystalsvg/48x48/apps/energy.png
@@ -2666,7 +2905,6 @@ share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/gnomemeeting.png
 share/icons/crystalsvg/48x48/apps/gnucash.png
 share/icons/crystalsvg/48x48/apps/gnumeric.png
-share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
 share/icons/crystalsvg/48x48/apps/hwinfo.png
@@ -2678,10 +2916,10 @@ share/icons/crystalsvg/48x48/apps/kate.png
 share/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/icons/crystalsvg/48x48/apps/kcmdf.png
 share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
-share/icons/crystalsvg/48x48/apps/kcmfontinst.png
 share/icons/crystalsvg/48x48/apps/kcmkwm.png
 share/icons/crystalsvg/48x48/apps/kcmmemory.png
 share/icons/crystalsvg/48x48/apps/kcmmidi.png
+share/icons/crystalsvg/48x48/apps/kcmopengl.png
 share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
@@ -2699,12 +2937,12 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 share/icons/crystalsvg/48x48/apps/kfind.png
 share/icons/crystalsvg/48x48/apps/kfm.png
 share/icons/crystalsvg/48x48/apps/kfm_home.png
-share/icons/crystalsvg/48x48/apps/kfontview.png
 share/icons/crystalsvg/48x48/apps/khelpcenter.png
 share/icons/crystalsvg/48x48/apps/kjobviewer.png
 share/icons/crystalsvg/48x48/apps/klipper.png
 share/icons/crystalsvg/48x48/apps/kmenu.png
 share/icons/crystalsvg/48x48/apps/kmenuedit.png
+share/icons/crystalsvg/48x48/apps/knetattach.png
 share/icons/crystalsvg/48x48/apps/knotify.png
 share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
@@ -2731,6 +2969,7 @@ share/icons/crystalsvg/48x48/apps/netscape.png
 share/icons/crystalsvg/48x48/apps/opera.png
 share/icons/crystalsvg/48x48/apps/package.png
 share/icons/crystalsvg/48x48/apps/package_applications.png
+share/icons/crystalsvg/48x48/apps/package_development.png
 share/icons/crystalsvg/48x48/apps/package_editors.png
 share/icons/crystalsvg/48x48/apps/package_edutainment.png
 share/icons/crystalsvg/48x48/apps/package_favourite.png
@@ -2760,7 +2999,6 @@ share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/scribus.png
 share/icons/crystalsvg/48x48/apps/sodipodi.png
-share/icons/crystalsvg/48x48/apps/soffice.png
 share/icons/crystalsvg/48x48/apps/staroffice.png
 share/icons/crystalsvg/48x48/apps/style.png
 share/icons/crystalsvg/48x48/apps/stylesheet.png
@@ -2770,7 +3008,6 @@ share/icons/crystalsvg/48x48/apps/usb.png
 share/icons/crystalsvg/48x48/apps/vnc.png
 share/icons/crystalsvg/48x48/apps/window_list.png
 share/icons/crystalsvg/48x48/apps/wine.png
-share/icons/crystalsvg/48x48/apps/winprops.png
 share/icons/crystalsvg/48x48/apps/wmaker_apps.png
 share/icons/crystalsvg/48x48/apps/wp.png
 share/icons/crystalsvg/48x48/apps/xchat.png
@@ -2780,8 +3017,7 @@ share/icons/crystalsvg/48x48/apps/xemacs.png
 share/icons/crystalsvg/48x48/apps/xfmail.png
 share/icons/crystalsvg/48x48/apps/xmag.png
 share/icons/crystalsvg/48x48/apps/xv.png
-share/icons/crystalsvg/48x48/devices/print_printer.png
-share/icons/crystalsvg/48x48/filesystems/folder_print2.png
+share/icons/crystalsvg/64x64/apps/access.png
 share/icons/crystalsvg/64x64/apps/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
 share/icons/crystalsvg/64x64/apps/arts.png
@@ -2790,9 +3026,13 @@ share/icons/crystalsvg/64x64/apps/bell.png
 share/icons/crystalsvg/64x64/apps/cache.png
 share/icons/crystalsvg/64x64/apps/clanbomber.png
 share/icons/crystalsvg/64x64/apps/clock.png
+share/icons/crystalsvg/64x64/apps/colors.png
+share/icons/crystalsvg/64x64/apps/cookie.png
 share/icons/crystalsvg/64x64/apps/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy.png
 share/icons/crystalsvg/64x64/apps/energy_star.png
+share/icons/crystalsvg/64x64/apps/enhanced_browsing.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
 share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
@@ -2804,6 +3044,7 @@ share/icons/crystalsvg/64x64/apps/kappfinder.png
 share/icons/crystalsvg/64x64/apps/kate.png
 share/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/icons/crystalsvg/64x64/apps/kcmdf.png
+share/icons/crystalsvg/64x64/apps/kcmkwm.png
 share/icons/crystalsvg/64x64/apps/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
@@ -2820,6 +3061,7 @@ share/icons/crystalsvg/64x64/apps/khelpcenter.png
 share/icons/crystalsvg/64x64/apps/kjobviewer.png
 share/icons/crystalsvg/64x64/apps/klipper.png
 share/icons/crystalsvg/64x64/apps/kmenu.png
+share/icons/crystalsvg/64x64/apps/knetattach.png
 share/icons/crystalsvg/64x64/apps/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
@@ -2840,6 +3082,7 @@ share/icons/crystalsvg/64x64/apps/nedit.png
 share/icons/crystalsvg/64x64/apps/netscape.png
 share/icons/crystalsvg/64x64/apps/package.png
 share/icons/crystalsvg/64x64/apps/package_applications.png
+share/icons/crystalsvg/64x64/apps/package_development.png
 share/icons/crystalsvg/64x64/apps/package_favourite.png
 share/icons/crystalsvg/64x64/apps/package_games.png
 share/icons/crystalsvg/64x64/apps/package_multimedia.png
@@ -2865,17 +3108,13 @@ share/icons/crystalsvg/64x64/apps/wp.png
 share/icons/crystalsvg/64x64/apps/xclock.png
 share/icons/crystalsvg/64x64/apps/xfmail.png
 share/icons/crystalsvg/64x64/apps/xmag.png
-share/icons/crystalsvg/64x64/devices/print_printer.png
 share/icons/crystalsvg/scalable/apps/access.svgz
 share/icons/crystalsvg/scalable/apps/acroread.svgz
 share/icons/crystalsvg/scalable/apps/aim.svgz
 share/icons/crystalsvg/scalable/apps/aktion.svgz
 share/icons/crystalsvg/scalable/apps/antivirus.svgz
 share/icons/crystalsvg/scalable/apps/applixware.svgz
-share/icons/crystalsvg/scalable/apps/ark.svgz
 share/icons/crystalsvg/scalable/apps/arts.svgz
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svgz
 share/icons/crystalsvg/scalable/apps/background.svgz
 share/icons/crystalsvg/scalable/apps/bell.svgz
 share/icons/crystalsvg/scalable/apps/browser.svgz
@@ -2894,48 +3133,41 @@ share/icons/crystalsvg/scalable/apps/error.svgz
 share/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/icons/crystalsvg/scalable/apps/fonts.svgz
 share/icons/crystalsvg/scalable/apps/galeon.svgz
-share/icons/crystalsvg/scalable/apps/gnome/apps.svgz
-share/icons/crystalsvg/scalable/apps/go.svgz
-share/icons/crystalsvg/scalable/apps/harddrive.svgz
+share/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/icons/crystalsvg/scalable/apps/hardware.svgz
 share/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/icons/crystalsvg/scalable/apps/karbon14.svgz
-share/icons/crystalsvg/scalable/apps/kate.svgz
-share/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/icons/crystalsvg/scalable/apps/kate2.svgz
 share/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+share/icons/crystalsvg/scalable/apps/kcmx.svgz
 share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/icons/crystalsvg/scalable/apps/kdict.svgz
-share/icons/crystalsvg/scalable/apps/kdvi.svgz
 share/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz
+share/icons/crystalsvg/scalable/apps/kjobviewer.svgz
 share/icons/crystalsvg/scalable/apps/klipper.svgz
-share/icons/crystalsvg/scalable/apps/kmail.svgz
+share/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/icons/crystalsvg/scalable/apps/knetattach.svgz
 share/icons/crystalsvg/scalable/apps/konqueror.svgz
 share/icons/crystalsvg/scalable/apps/konsole.svgz
-share/icons/crystalsvg/scalable/apps/kopete.svgz
-share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
-share/icons/crystalsvg/scalable/apps/kwrite.svgz
+share/icons/crystalsvg/scalable/apps/ktip.svgz
+share/icons/crystalsvg/scalable/apps/kwrite2.svgz
 share/icons/crystalsvg/scalable/apps/locale.svgz
-share/icons/crystalsvg/scalable/apps/mail.svgz
 share/icons/crystalsvg/scalable/apps/my_mac.svgz
-share/icons/crystalsvg/scalable/apps/mycomputer.svgz
 share/icons/crystalsvg/scalable/apps/netscape.svgz
 share/icons/crystalsvg/scalable/apps/openoffice.svgz
+share/icons/crystalsvg/scalable/apps/package_development.svgz
 share/icons/crystalsvg/scalable/apps/package_toys.svgz
-share/icons/crystalsvg/scalable/apps/package_utilities.svgz
 share/icons/crystalsvg/scalable/apps/penguin.svgz
+share/icons/crystalsvg/scalable/apps/personal.svgz
+share/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/icons/crystalsvg/scalable/apps/samba.svgz
 share/icons/crystalsvg/scalable/apps/shell.svgz
-share/icons/crystalsvg/scalable/apps/soffice.svgz
 share/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/icons/crystalsvg/scalable/apps/stylesheet.svgz
 share/icons/crystalsvg/scalable/apps/terminal.svgz
 share/icons/crystalsvg/scalable/apps/tux.svgz
 share/icons/crystalsvg/scalable/apps/wine.svgz
-share/icons/crystalsvg/scalable/apps/winprops.svgz
 share/icons/crystalsvg/scalable/apps/x.svgz
 share/icons/crystalsvg/scalable/apps/xapp.svgz
 share/icons/crystalsvg/scalable/apps/xcalc.svgz
@@ -2945,8 +3177,6 @@ share/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/icons/crystalsvg/scalable/apps/xpaint.svgz
 share/icons/hicolor/16x16/apps/khotkeys.png
 share/icons/hicolor/32x32/apps/khotkeys.png
-share/icons/locolor/16x16/apps/kcmfontinst.png
-share/icons/locolor/32x32/apps/kcmfontinst.png
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
@@ -3427,24 +3657,34 @@ share/mimelnk/application/x-smb-server.desktop
 share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
-share/mimelnk/kdedevice/cdrom_mounted.desktop
-share/mimelnk/kdedevice/cdrom_unmounted.desktop
-share/mimelnk/kdedevice/cdwriter_mounted.desktop
-share/mimelnk/kdedevice/cdwriter_unmounted.desktop
-share/mimelnk/kdedevice/dvd_mounted.desktop
-share/mimelnk/kdedevice/dvd_unmounted.desktop
-share/mimelnk/kdedevice/floppy5_mounted.desktop
-share/mimelnk/kdedevice/floppy5_unmounted.desktop
-share/mimelnk/kdedevice/floppy_mounted.desktop
-share/mimelnk/kdedevice/floppy_unmounted.desktop
-share/mimelnk/kdedevice/hdd_mounted.desktop
-share/mimelnk/kdedevice/hdd_unmounted.desktop
-share/mimelnk/kdedevice/nfs_mounted.desktop
-share/mimelnk/kdedevice/nfs_unmounted.desktop
-share/mimelnk/kdedevice/smb_mounted.desktop
-share/mimelnk/kdedevice/smb_unmounted.desktop
-share/mimelnk/kdedevice/zip_mounted.desktop
-share/mimelnk/kdedevice/zip_unmounted.desktop
+share/mimelnk/inode/system_directory.desktop
+share/mimelnk/media/audiocd.desktop
+share/mimelnk/media/blankcd.desktop
+share/mimelnk/media/blankdvd.desktop
+share/mimelnk/media/cdrom_mounted.desktop
+share/mimelnk/media/cdrom_unmounted.desktop
+share/mimelnk/media/cdwriter_mounted.desktop
+share/mimelnk/media/cdwriter_unmounted.desktop
+share/mimelnk/media/dvd_mounted.desktop
+share/mimelnk/media/dvd_unmounted.desktop
+share/mimelnk/media/dvdvideo.desktop
+share/mimelnk/media/floppy5_mounted.desktop
+share/mimelnk/media/floppy5_unmounted.desktop
+share/mimelnk/media/floppy_mounted.desktop
+share/mimelnk/media/floppy_unmounted.desktop
+share/mimelnk/media/gphoto2camera.desktop
+share/mimelnk/media/hdd_mounted.desktop
+share/mimelnk/media/hdd_unmounted.desktop
+share/mimelnk/media/nfs_mounted.desktop
+share/mimelnk/media/nfs_unmounted.desktop
+share/mimelnk/media/removable_mounted.desktop
+share/mimelnk/media/removable_unmounted.desktop
+share/mimelnk/media/smb_mounted.desktop
+share/mimelnk/media/smb_unmounted.desktop
+share/mimelnk/media/svcd.desktop
+share/mimelnk/media/vcd.desktop
+share/mimelnk/media/zip_mounted.desktop
+share/mimelnk/media/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
 share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
@@ -3453,13 +3693,14 @@ share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
 share/mimelnk/print/printermodel.desktop
 share/services/about.protocol
+share/services/applications.protocol
 share/services/ar.protocol
 share/services/bzip.protocol
 share/services/bzip2.protocol
 share/services/cgi.protocol
 share/services/cursorthumbnail.desktop
-share/services/devices.protocol
 share/services/djvuthumbnail.desktop
+share/services/exrthumbnail.desktop
 share/services/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
@@ -3468,17 +3709,21 @@ share/services/fontthumbnail.desktop
 share/services/gzip.protocol
 share/services/htmlthumbnail.desktop
 share/services/imagethumbnail.desktop
-share/services/imap4.protocol
-share/services/imaps.protocol
 share/services/info.protocol
 share/services/kaccess.desktop
 share/services/katedefaultproject.desktop
+share/services/katekttsd.desktop
 share/services/kded/favicons.desktop
+share/services/kded/khotkeys.desktop
 share/services/kded/konqy_preloader.desktop
 share/services/kded/kwrited.desktop
-share/services/kded/mountwatcher.desktop
+share/services/kded/mediamanager.desktop
+share/services/kded/remotedirnotify.desktop
+share/services/kded/systemdirnotify.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
+share/services/kfile_media.desktop
+share/services/kfile_trash.desktop
 share/services/kfindpart.desktop
 share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
@@ -3491,7 +3736,6 @@ share/services/konq_multicolumnview.desktop
 share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
-share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
@@ -3508,6 +3752,7 @@ share/services/ldaps.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
+share/services/media.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
 share/services/picturethumbnail.desktop
@@ -3516,23 +3761,27 @@ share/services/pop3s.protocol
 share/services/print.protocol
 share/services/printdb.protocol
 share/services/programs.protocol
+share/services/remote.protocol
 share/services/searchproviders/acronym.desktop
 share/services/searchproviders/alexa.desktop
 share/services/searchproviders/alexa_url.desktop
 share/services/searchproviders/alltheweb.desktop
 share/services/searchproviders/altavista.desktop
+share/services/searchproviders/amg.desktop
 share/services/searchproviders/appsy.desktop
 share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/backports.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.desktop
+share/services/searchproviders/cia.desktop
 share/services/searchproviders/citeseer.desktop
 share/services/searchproviders/cpan.desktop
 share/services/searchproviders/ctan.desktop
 share/services/searchproviders/ctan_cat.desktop
 share/services/searchproviders/dbug.desktop
 share/services/searchproviders/de2en.desktop
+share/services/searchproviders/de2fr.desktop
 share/services/searchproviders/deb.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
@@ -3545,10 +3794,12 @@ share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
 share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2de.desktop
 share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freedb.desktop
 share/services/searchproviders/freshmeat.desktop
 share/services/searchproviders/froogle.desktop
+share/services/searchproviders/fsd.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
@@ -3556,6 +3807,7 @@ share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
 share/services/searchproviders/google_news.desktop
 share/services/searchproviders/gracenote.desktop
+share/services/searchproviders/grec.desktop
 share/services/searchproviders/hotbot.desktop
 share/services/searchproviders/hyperdictionary.desktop
 share/services/searchproviders/hyperdictionary_thesaurus.desktop
@@ -3584,6 +3836,8 @@ share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
 share/services/searchproviders/thesaurus.desktop
+share/services/searchproviders/tvtome.desktop
+share/services/searchproviders/uspto.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
@@ -3599,24 +3853,30 @@ share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
+share/services/trash.protocol
+share/services/useragentstrings/firefoxoncurrent.desktop
+share/services/useragentstrings/googlebot.desktop
 share/services/useragentstrings/ie401onwinnt4.desktop
-share/services/useragentstrings/ie45onwinnt5.desktop
 share/services/useragentstrings/ie501onwinnt5.desktop
 share/services/useragentstrings/ie50onppc.desktop
-share/services/useragentstrings/ie50onwin95.desktop
 share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
+share/services/useragentstrings/ie60oncurrent.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
 share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozoncurrent12.desktop
 share/services/useragentstrings/mozoncurrent16.desktop
 share/services/useragentstrings/mozonwin2000.desktop
-share/services/useragentstrings/mozonwinnt4.desktop
+share/services/useragentstrings/mozonwinxp.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
+share/services/useragentstrings/ns71oncurrent.desktop
+share/services/useragentstrings/ns71onwinnt51.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/op75oncurrent.desktop
 share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
@@ -3645,6 +3905,8 @@ share/sounds/KDE_Beep_Connect.wav
 share/sounds/KDE_Beep_Digital_1.ogg
 share/sounds/KDE_Beep_Digital_2.ogg
 share/sounds/KDE_Beep_Door.wav
+share/sounds/KDE_Beep_Double.ogg
+share/sounds/KDE_Beep_Harsh.ogg
 share/sounds/KDE_Beep_Honk.wav
 share/sounds/KDE_Beep_Lightning.wav
 share/sounds/KDE_Beep_Phone_1.ogg
@@ -3689,6 +3951,7 @@ share/sounds/KDE_Drum_Break.ogg
 share/sounds/KDE_Error.wav
 share/sounds/KDE_Error_1.ogg
 share/sounds/KDE_Error_2.ogg
+share/sounds/KDE_Error_3.ogg
 share/sounds/KDE_Event_1.ogg
 share/sounds/KDE_Event_2.ogg
 share/sounds/KDE_Event_3.ogg
@@ -3766,27 +4029,69 @@ share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
 share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/All-Good-People-1.jpg.desktop
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Blkmarble.jpg.desktop
 share/wallpapers/Chicken-Songs-2.jpg
+share/wallpapers/Chicken-Songs-2.jpg.desktop
 share/wallpapers/Circuit.jpg
+share/wallpapers/Circuit.jpg.desktop
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Foggy1.jpg.desktop
 share/wallpapers/Island-of-Elba.jpg
+share/wallpapers/Island-of-Elba.jpg.desktop
+share/wallpapers/KDE34.png
+share/wallpapers/KDE34.png.desktop
 share/wallpapers/Marble01.jpg
+share/wallpapers/Marble01.jpg.desktop
 share/wallpapers/No-Ones-Laughing-3.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 share/wallpapers/Paper01.jpg
+share/wallpapers/Paper01.jpg.desktop
 share/wallpapers/Planning-And-Probing-1.jpg
+share/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/wallpapers/Totally-New-Product-1.jpg
+share/wallpapers/Totally-New-Product-1.jpg.desktop
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/wallpapers/andes-venezolanos.svgz
+share/wallpapers/andes-venezolanos.svgz.desktop
+share/wallpapers/aurora.svgz
+share/wallpapers/aurora.svgz.desktop
 share/wallpapers/blue-bend.jpg
+share/wallpapers/blue-bend.jpg.desktop
+share/wallpapers/celtic.svgz
+share/wallpapers/celtic.svgz.desktop
 share/wallpapers/default_blue.jpg
+share/wallpapers/default_blue.jpg.desktop
 share/wallpapers/default_gears.jpg
+share/wallpapers/default_gears.jpg.desktop
 share/wallpapers/fulmine.jpg
+share/wallpapers/fulmine.jpg.desktop
+share/wallpapers/gear-flowers.svgz
+share/wallpapers/gear-flowers.svgz.desktop
+share/wallpapers/globe.svgz
+share/wallpapers/globe.svgz.desktop
+share/wallpapers/here-gear.svgz
+share/wallpapers/here-gear.svgz.desktop
 share/wallpapers/kde_box.png
+share/wallpapers/kde_box.png.desktop
 share/wallpapers/kde_passion.jpg
+share/wallpapers/kde_passion.jpg.desktop
+share/wallpapers/konqui.svgz
+share/wallpapers/konqui.svgz.desktop
+share/wallpapers/lineart.svgz
+share/wallpapers/lineart.svgz.desktop
+share/wallpapers/moon.svgz
+share/wallpapers/moon.svgz.desktop
 share/wallpapers/only_k.jpg
+share/wallpapers/only_k.jpg.desktop
 share/wallpapers/seaofconero.jpg
+share/wallpapers/seaofconero.jpg.desktop
 share/wallpapers/triplegears.jpg
+share/wallpapers/triplegears.jpg.desktop
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@@ -3795,19 +4100,15 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/templates/.source/emptydir
 @dirrm share/mimelnk/print
-@dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/media
 @dirrm share/mimelnk/fonts
 @dirrm share/locale/l10n/zw
 @dirrm share/locale/l10n/zm
@@ -4036,7 +4337,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/crystalsvg/scalable/apps/gnome
+@dirrm share/fonts/override
+@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4045,6 +4347,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
+@dirrm share/doc/HTML/en/knetattach
 @dirrm share/doc/HTML/en/kmenuedit
 @dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kioslave
@@ -4058,6 +4361,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kinfocenter/pcmcia
 @dirrm share/doc/HTML/en/kinfocenter/pci
 @dirrm share/doc/HTML/en/kinfocenter/partitions
+@dirrm share/doc/HTML/en/kinfocenter/opengl
 @dirrm share/doc/HTML/en/kinfocenter/nics
 @dirrm share/doc/HTML/en/kinfocenter/memory
 @dirrm share/doc/HTML/en/kinfocenter/ioports
@@ -4083,12 +4387,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate
 @dirrm share/doc/HTML/en/kdebase-apidocs
+@dirrm share/doc/HTML/en/kdcop
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
 @dirrm share/doc/HTML/en/kcontrol/spellchecking
@@ -4134,16 +4436,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
 @dirrm share/doc/HTML/en/kate
+@dirrm share/doc/HTML/en/kappfinder
 @dirrm share/desktop-directories
+@dirrm share/apps/systemview
+@dirrm share/apps/remoteview
+@dirrm share/apps/plugin
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
+@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
+@dirrm share/apps/kthememanager/themes/YellowOnBlue
+@dirrm share/apps/kthememanager/themes/Sunshine
+@dirrm share/apps/kthememanager/themes/Redmond
+@dirrm share/apps/kthememanager/themes/Platinum
+@dirrm share/apps/kthememanager/themes/Plastik
+@dirrm share/apps/kthememanager/themes/Keramik
+@dirrm share/apps/kthememanager/themes/KDE_Classic
+@dirrm share/apps/kthememanager/themes/HighContrastLight-big
+@dirrm share/apps/kthememanager/themes/HighContrastLight
+@dirrm share/apps/kthememanager/themes/HighContrastDark-big
+@dirrm share/apps/kthememanager/themes/HighContrastDark
+@dirrm share/apps/kthememanager/themes
+@dirrm share/apps/kthememanager
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash/Themes/blue-bend
 @dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Simple
 @dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/None
 @dirrm share/apps/ksplash/Themes/Default/locolor
 @dirrm share/apps/ksplash/Themes/Default
 @dirrm share/apps/ksplash/Themes
@@ -4197,7 +4519,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
+@dirrm share/apps/khtml/kpartplugins
 @dirrm share/apps/khotkeys
+@dirrm share/apps/khelpcenter/searchhandlers/htdig
+@dirrm share/apps/khelpcenter/searchhandlers
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
@@ -4209,6 +4534,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/themes/circles
+@dirrm share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
@@ -4237,7 +4564,9 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcontroledit/icons
 @dirrm share/apps/kcontroledit
 @dirrm share/apps/kcontrol/pics
+@dirrm share/apps/kcontrol/about
 @dirrm share/apps/kcontrol
+@dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
 @dirrm share/apps/kcmkeys
@@ -4245,6 +4574,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
+@dirrm share/apps/katepart/kpartplugins
+@dirrm share/apps/kate/plugins/katekttsd
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index fdbd9bfc5636..4679a2d4d220 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,13 +18,16 @@ COMMENT=	Basic applications for the KDE system
 
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient \
+		usb:${PORTSDIR}/devel/libusb
 
-CONFLICTS=	kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.*
+CONFLICTS=	kdelibs-3.[0-3]* kdeutils-3.[0-2]*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
+USE_GETOPT_LONG=yes
 USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,8 +40,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-DO_NOT_COMPILE=	nsplugins
-CONFIGURE_ENV+=	RUN_KAPPFINDER=no
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -49,10 +50,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index a1ad17ecaaad..7a5b5d02fcce 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
-SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
+MD5 (KDE/kdebase-3.4.0.tar.bz2) = c88659e558ca98dc45377bf8ddfc26c9
+SIZE (KDE/kdebase-3.4.0.tar.bz2) = 22670772
diff --git a/x11/kdebase4-workspace/files/patch-kcontrol-nics-nic.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-nics-nic.cpp
deleted file mode 100644
index e11c3de5032a..000000000000
--- a/x11/kdebase4-workspace/files/patch-kcontrol-nics-nic.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kcontrol/nics/nic.cpp	15 Nov 2003 22:01:05 -0000	1.24
-+++ kcontrol/nics/nic.cpp	21 Jan 2004 13:38:46 -0000
-@@ -229,9 +229,14 @@ NICList* findNICs()
-       tmp->addr = buf;
- 
-       if (ifa->ifa_netmask != NULL) {
-+#ifdef Q_OS_FREEBSD
-+	struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask;
-+	tmp->netmask=inet_ntoa(sinptr->sin_addr);
-+#else
- 	bzero(buf, 128);
- 	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
- 	tmp->netmask = buf;
-+#endif
-       }
- 
-       if (ifa->ifa_flags & IFF_UP)
diff --git a/x11/kdebase4-workspace/files/patch-kcontrol_konq_previews.cpp b/x11/kdebase4-workspace/files/patch-kcontrol_konq_previews.cpp
deleted file mode 100644
index 7fe3246c2149..000000000000
--- a/x11/kdebase4-workspace/files/patch-kcontrol_konq_previews.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcontrol/konq/previews.cpp.orig	Sun Oct 26 11:46:25 2003
-+++ kcontrol/konq/previews.cpp	Thu Jan 27 10:16:32 2005
-@@ -153,6 +153,11 @@
- 
-     for ( ; it.current() ; ++it ) {
-         QString protocol( it.current()->text() );
-+        if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) 
-+          // file should be enabled in case is not defined because if not so 
-+          // than preview's lost when size is changed from default one 
-+          it.current()->setOn( true ); 
-+        else 
-         it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
-     // config key is in bytes (default value 1MB), numinput is in MB
diff --git a/x11/kdebase4-workspace/files/patch-kdm-backend-xdmcp.c b/x11/kdebase4-workspace/files/patch-kdm-backend-xdmcp.c
deleted file mode 100644
index be29ec4d3416..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdm-backend-xdmcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/backend/xdmcp.c.orig	Wed May  8 14:21:31 2002
-+++ kdm/backend/xdmcp.c	Wed Jun 26 20:14:02 2002
-@@ -1012,7 +1012,7 @@
- 
-     sprintf (buf, "Session %ld failed for display %.260s: %s",
- 	     (long) sessionID, name, reason);
--    Debug ("send_failed(%\"s)\n", buf);
-+    Debug ("send_failed(\"%s\")\n", buf);
-     status.length = strlen (buf);
-     status.data = (CARD8Ptr) buf;
-     header.version = XDM_PROTOCOL_VERSION;
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def
deleted file mode 100644
index 3776abd3beae..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-config.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/config.def.orig	Thu Nov 11 20:47:50 2004
-+++ kdm/kfrontend/config.def	Thu Nov 11 20:51:18 2004
-@@ -10,7 +10,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
index 4a3ac236fe1d..a6126b314d8e 100644
--- a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,6 +1,6 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
-@@ -578,7 +578,7 @@
+--- kdm/kfrontend/genkdmconf.c.orig	Wed Feb 23 12:26:01 2005
++++ kdm/kfrontend/genkdmconf.c	Sat Mar 19 16:43:49 2005
+@@ -562,7 +562,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
  "#\n"
@@ -9,7 +9,7 @@
  "\n"
  #ifdef _AIX
  "# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-@@ -619,8 +619,8 @@
+@@ -591,8 +591,8 @@
  "# Reassign ownership of the console to root, this should disallow\n"
  "# assignment of console output to any random users's xterm. See Xstartup.\n"
  "#\n"
@@ -19,8 +19,17 @@
 +/* "#chmod 622 /dev/console\n" */
  "\n"
  #ifdef _AIX
- "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,7 +667,9 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ "  */bash)\n"
+@@ -637,7 +639,9 @@
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
@@ -31,3 +40,232 @@
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
  "    [ -f /etc/profile ] && . /etc/profile\n"
+@@ -648,7 +652,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ "  \"\")\n"
+ "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ "    ;;\n"
+@@ -662,10 +666,10 @@
+ "    exec " KDE_BINDIR "/startkde\n"
+ "    ;;\n"
+ "  *)\n"
+-"    eval exec \"$1\"\n"
++"    eval exec \"$session\"\n"
+ "    ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +821,7 @@
+  * XXX this stuff is highly borked. it does not handle collisions at all.
+  */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ 	const char *tptr;
+ 	char *nname;
+@@ -840,12 +844,7 @@
+ 		fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ 		rt = 0;
+ 	} else {
+-		char *nbuf;
+-		int nlen;
+-
+-		if (!proc || !proc( &file, &nbuf, &nlen ) ||
+-		    (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+-		{
++		if (!proc || !proc( &file )) {
+ 			if (!use_destdir && !strcmp( ce->value, nname ))
+ 				linkedFile( nname );
+ 			else {
+@@ -855,7 +854,7 @@
+ 				copiedFile( ce->value );
+ 			}
+ 		} else {
+-			WriteOut( nname, mode, 0, nbuf, nlen );
++			WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ 			editedFile( ce->value );
+ 		}
+ 		if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1377,7 @@
+ 
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ 	// XXX remove any login*, chooser*, ... resources
+ 	return 0;
+@@ -1415,15 +1414,14 @@
+ 				paap = pap += 2;
+ 				while (!isspace( *pap ))
+ 					pap++;
+-				for (;;) {
+-					if (*pp++ != '/')
+-						goto no;
+-					for (bpp = pp; *pp != '/'; pp++)
+-						if (isspace( *pp ))
++				if (*pp != '/')
++					break;
++				for (;;)
++					for (bpp = ++pp; *pp != '/'; pp++)
++						if (!*pp || isspace( *pp ))
+ 							goto wbrk;
+-				}
+ 			  wbrk:
+-				if (memcmp( bpp, paap, pap - paap ))
++				if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ 					break;
+ 			} else if (*pap == '\t') {
+ 				pap++;
+@@ -1472,24 +1470,25 @@
+ static int mod_usebg;
+ 
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+-	putval( "UseBackground",
+-	        (delstr( file, "\n"
+-	                 "(\n"
+-	                 "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-	                 "  */kdmdesktop\t&\n"
+-	                 "  echo $! >$PIDFILE\n"
+-	                 "  wait $!\n"
+-	                 "  rm $PIDFILE\n"
+-	                 ")\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "*/kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\n" )) ? "true" : "false" );
+-	return 0;
++	int chg =
++		delstr( file, "\n"
++		        "(\n"
++		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++		        "  */kdmdesktop\t&\n"
++		        "  echo $! >$PIDFILE\n"
++		        "  wait $!\n"
++		        "  rm $PIDFILE\n"
++		        ")\t&\n" ) |
++		delstr( file, "\n"
++		        "*/kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\n" );
++	putval( "UseBackground", chg ? "true" : "false" );
++	return chg;
+ }
+ 
+ static void
+@@ -1515,19 +1514,22 @@
+ }
+ 
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++	int chg1 = 0, chg2 = 0;
++
+ 	if (mod_usebg &&
+-	    !delstr( file, "\n"
++	    (delstr( file, "\n"
+ 	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ 	             "if [[] -f $PIDFILE ] ; then\n"
+ 	             "	   kill `cat $PIDFILE`\n"
+-	             "fi\n" ))
+-		delstr( file, "\n"
+-		        "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-		        "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+-	if (oldver < 0x0203)
+-		putval( "UseSessReg", (
++	             "fi\n" ) ||
++	     delstr( file, "\n"
++	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++		chg1 = 1;
++	if (oldver < 0x0203) {
++		chg2 = 
+ #ifdef _AIX
+ 			delstr( file, "\n"
+ "# We create a pseudodevice for finger.  (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1554,11 @@
+ "  else\n"
+ "    exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ "  fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ 			delstr( file, "\n"
+@@ -1564,11 +1566,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+-		 ) ? "true" : "false");
+-	return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++		putval( "UseSessReg", chg2 ? "true" : "false");
++	}
++	return chg1 | chg2;
+ }
+ 
+ static void
+@@ -1592,29 +1595,29 @@
+ }
+ 
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++	return
+ #ifdef _AIX
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ "  devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ "  exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+-	delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++		delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+-	delstr( file, "\n"
++" $USER\n" ) |
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+-	return 0;
+ }
+ 
+ static void
diff --git a/x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp
deleted file mode 100644
index 553c411983a7..000000000000
--- a/x11/kdebase4-workspace/files/patch-konsole-konsole-konsole.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
-+++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
-@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
-     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
-     setSchema(s->schemaNo());
-     tabwidget->setCurrentPage(tabwidget->count()-1);
--      disableMasterModeConnections(); // no duplicate connections, remove old
--      enableMasterModeConnections();
--    }
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    disableMasterModeConnections(); // no duplicate connections, remove old
-+    enableMasterModeConnections();
-+    if(m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+  }
- }
- 
- QString Konsole::currentSession()
-@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
-       rootxpms.remove(s->widget());
-     }
-     delete s->widget();
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    if (m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-   }
-   session2action.remove(s);
-   action2session.remove(ra);
diff --git a/x11/kdebase4-workspace/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4-workspace/files/patch-nsplugins-pluginscan.cpp
new file mode 100644
index 000000000000..55eed7247922
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-nsplugins-pluginscan.cpp
@@ -0,0 +1,10 @@
+--- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
++++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
+@@ -457,6 +457,7 @@
+ 	paths.append("/usr/lib64/netscape/plugins");
+ 	paths.append("/usr/lib64/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/local/lib/linux-flashplugin6");
+         config->writeEntry( "scanPaths", paths );
+     }
+ 
diff --git a/x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
deleted file mode 100644
index f31b6341cf9c..000000000000
--- a/x11/kdebase4-workspace/files/patch-post-3.3.2-kdebase-htmlframes2
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1342.2.14
-diff -u -p -r1.1342.2.14 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
-+++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
-@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
-     QString viewName = view->viewName();
-     kdDebug() << "       - viewName=" << viewName << "   "
-               << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+    // First look for a hostextension containing this frame name
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+      kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+      if (!ext)
-+         continue; // Don't use this window
-+    }
-+
-     if ( !viewName.isEmpty() && viewName == name )
-     {
-       kdDebug() << "found existing view by name: " << view << endl;
-@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
-       return view;
-     }
- 
--    // First look for a hostextension containing this frame name
--    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
--    if ( ext )
--    {
--      ext = ext->findFrameParent(callingPart, name);
--    }
--
- //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 61e591e3cd68..1dabe06f9d62 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -4,11 +4,13 @@ bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kasbar
 bin/kate
 bin/kblankscrn.kss
+bin/kbookmarkmerger
 bin/kcheckpass
+bin/kcheckrunning
 bin/kcminit
-bin/kcmshell
 bin/kcontrol
 bin/kcontroledit
 bin/kdcop
@@ -32,16 +34,21 @@ bin/kfind
 bin/kfmclient
 bin/kfontinst
 bin/kfontview
+bin/khc_docbookdig.pl
+bin/khc_htdig.pl
+bin/khc_htsearch.pl
 bin/khc_indexbuilder
+bin/khc_mansearch.pl
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
 bin/kinfocenter
-bin/kio_devices_mounthelper
+bin/kio_media_mounthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
+bin/knetattach
 bin/konqueror
 bin/konsole
 bin/kpager
@@ -56,11 +63,13 @@ bin/kreadconfig
 bin/krootimage
 bin/ksmserver
 bin/ksplash
+bin/ksplashsimple
 bin/kstart
 bin/ksysguard
 bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
+bin/ktrash
 bin/kwebdesktop
 bin/kwin
 bin/kwin_killer_helper
@@ -68,6 +77,8 @@ bin/kwin_rules_dialog
 bin/kwrite
 bin/kwriteconfig
 bin/kxkb
+bin/nspluginscan
+bin/nspluginviewer
 bin/startkde
 etc/ksysguarddrc
 etc/rc.d/genkdmconf.sh
@@ -107,6 +118,7 @@ include/konq_dirpart.h
 include/konq_drag.h
 include/konq_events.h
 include/konq_faviconmgr.h
+include/konq_filetip.h
 include/konq_historycomm.h
 include/konq_historymgr.h
 include/konq_iconviewwidget.h
@@ -119,7 +131,6 @@ include/konq_undo.h
 include/konq_xmlguiclient.h
 include/konqbookmarkmanager.h
 include/konqsidebarplugin.h
-include/ksgrd/ColorPicker.h
 include/ksgrd/HostConnector.h
 include/ksgrd/SensorAgent.h
 include/ksgrd/SensorClient.h
@@ -135,22 +146,22 @@ include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
+include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/kicker-3.4-reverseLayout
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
-lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
 lib/kde3/cursorthumbnail.so
-lib/kde3/devices_panelapplet.la
-lib/kde3/devices_panelapplet.so
 lib/kde3/djvuthumbnail.la
 lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
 lib/kde3/dockbar_panelextension.so
+lib/kde3/exrthumbnail.la
+lib/kde3/exrthumbnail.so
 lib/kde3/extensionproxy.la
 lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
@@ -211,6 +222,8 @@ lib/kde3/kcm_kded.la
 lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
 lib/kde3/kcm_kdm.so
+lib/kde3/kcm_kdnssd.la
+lib/kde3/kcm_kdnssd.so
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keyboard.so
 lib/kde3/kcm_keys.la
@@ -247,6 +260,8 @@ lib/kde3/kcm_locale.la
 lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
 lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
@@ -267,36 +282,48 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
+lib/kde3/kcm_usb.la
+lib/kde3/kcm_usb.so
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
 lib/kde3/kcminit.so
-lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
 lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
 lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_khotkeys.la
+lib/kde3/kded_khotkeys.so
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_kwrited.so
-lib/kde3/kded_mountwatcher.la
-lib/kde3/kded_mountwatcher.so
+lib/kde3/kded_mediamanager.la
+lib/kde3/kded_mediamanager.so
+lib/kde3/kded_remotedirnotify.la
+lib/kde3/kded_remotedirnotify.so
+lib/kde3/kded_systemdirnotify.la
+lib/kde3/kded_systemdirnotify.so
 lib/kde3/kdesktop.la
 lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
 lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
 lib/kde3/kfile_font.so
+lib/kde3/kfile_media.la
+lib/kde3/kfile_media.so
+lib/kde3/kfile_trash.la
+lib/kde3/kfile_trash.so
 lib/kde3/kfmclient.la
 lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_classic.so
+lib/kde3/kgreet_winbind.la
+lib/kde3/kgreet_winbind.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
@@ -315,12 +342,14 @@ lib/kde3/kickermenu_prefmenu.la
 lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
 lib/kde3/kickermenu_recentdocs.so
+lib/kde3/kickermenu_remotemenu.la
+lib/kde3/kickermenu_remotemenu.so
+lib/kde3/kickermenu_systemmenu.la
+lib/kde3/kickermenu_systemmenu.so
 lib/kde3/kio_about.la
 lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
 lib/kde3/kio_cgi.so
-lib/kde3/kio_devices.la
-lib/kde3/kio_devices.so
 lib/kde3/kio_filter.la
 lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
@@ -331,8 +360,6 @@ lib/kde3/kio_floppy.la
 lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
 lib/kde3/kio_fonts.so
-lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
 lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
@@ -341,6 +368,8 @@ lib/kde3/kio_mac.la
 lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
 lib/kde3/kio_man.so
+lib/kde3/kio_media.la
+lib/kde3/kio_media.so
 lib/kde3/kio_nfs.la
 lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
@@ -349,6 +378,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_remote.la
+lib/kde3/kio_remote.so
 lib/kde3/kio_settings.la
 lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
@@ -357,10 +388,14 @@ lib/kde3/kio_smb.la
 lib/kde3/kio_smb.so
 lib/kde3/kio_smtp.la
 lib/kde3/kio_smtp.so
+lib/kde3/kio_system.la
+lib/kde3/kio_system.so
 lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
+lib/kde3/kio_trash.la
+lib/kde3/kio_trash.so
 lib/kde3/kjobviewer.la
 lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
@@ -423,6 +458,8 @@ lib/kde3/kwin3_laptop.la
 lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
 lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_plastik.la
+lib/kde3/kwin3_plastik.so
 lib/kde3/kwin3_quartz.la
 lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
@@ -437,6 +474,8 @@ lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
+lib/kde3/kwin_plastik_config.la
+lib/kde3/kwin_plastik_config.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
@@ -453,6 +492,8 @@ lib/kde3/libkfindpart.la
 lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
 lib/kde3/libkfontviewpart.so
+lib/kde3/libkhtmlkttsdplugin.la
+lib/kde3/libkhtmlkttsdplugin.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -465,8 +506,12 @@ lib/kde3/libkurisearchfilter.la
 lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/media_panelapplet.la
+lib/kde3/media_panelapplet.so
 lib/kde3/menu_panelapplet.la
 lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
@@ -489,6 +534,11 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
+lib/kde3/trash_panelapplet.la
+lib/kde3/trash_panelapplet.so
+lib/libkasbar.la
+lib/libkasbar.so
+lib/libkasbar.so.1
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -508,8 +558,6 @@ lib/libkdeinit_kate.la
 lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
 lib/libkdeinit_kcminit.so
-lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
 lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
@@ -604,6 +652,7 @@ share/applications/kde/ioports.desktop
 share/applications/kde/ioslaveinfo.desktop
 share/applications/kde/kappfinder.desktop
 share/applications/kde/kate.desktop
+share/applications/kde/kcm_kdnssd.desktop
 share/applications/kde/kcm_useraccount.desktop
 share/applications/kde/kcmaccess.desktop
 share/applications/kde/kcmcgi.desktop
@@ -617,6 +666,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -632,9 +682,12 @@ share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
+share/applications/kde/khtml_plugins.desktop
+share/applications/kde/kinfocenter.desktop
 share/applications/kde/kjobviewer.desktop
 share/applications/kde/klipper.desktop
 share/applications/kde/kmenuedit.desktop
+share/applications/kde/knetattach.desktop
 share/applications/kde/konqbrowser.desktop
 share/applications/kde/konquerorsu.desktop
 share/applications/kde/konsole.desktop
@@ -656,6 +709,7 @@ share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
 share/applications/kde/nic.desktop
+share/applications/kde/opengl.desktop
 share/applications/kde/panel.desktop
 share/applications/kde/panel_appearance.desktop
 share/applications/kde/partitions.desktop
@@ -672,6 +726,7 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/applnk/.hidden/.directory
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -692,6 +747,7 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
+share/applnk/.hidden/kwintranslucency.desktop
 share/applnk/.hidden/passwords.desktop
 share/applnk/.hidden/power.desktop
 share/applnk/.hidden/randr.desktop
@@ -701,7 +757,6 @@ share/applnk/.hidden/userinfo.desktop
 share/applnk/.hidden/virtualdesktops.desktop
 share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/KControl.desktop
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
@@ -713,7 +768,6 @@ share/applnk/Settingsmenu/printmgr.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/kpersonalizer.desktop
 share/applnk/Toys/ktip.desktop
@@ -800,6 +854,7 @@ share/apps/kappfinder/apps/Graphics/blender.desktop
 share/apps/kappfinder/apps/Graphics/ghostview.desktop
 share/apps/kappfinder/apps/Graphics/gimp.desktop
 share/apps/kappfinder/apps/Graphics/gv.desktop
+share/apps/kappfinder/apps/Graphics/inkscape.desktop
 share/apps/kappfinder/apps/Graphics/sodipodi.desktop
 share/apps/kappfinder/apps/Graphics/tgif.desktop
 share/apps/kappfinder/apps/Graphics/xdvi.desktop
@@ -952,9 +1007,11 @@ share/apps/kate/icons/locolor/22x22/actions/indent.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
 share/apps/kate/plugins/katedefaultproject/ui.rc
+share/apps/kate/plugins/katekttsd/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
 share/apps/kate/tips
+share/apps/katepart/kpartplugins/katepartkttsd.rc
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_browser.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -973,9 +1030,11 @@ share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
 share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
+share/apps/kcmusb/usb.ids
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
+share/apps/kconf_update/kate-2.4.upd
 share/apps/kconf_update/kcmdisplayrc.upd
 share/apps/kconf_update/kfmclient_3_2.upd
 share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -986,6 +1045,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqsidebartng.upd
 share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
@@ -995,14 +1055,20 @@ share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
+share/apps/kconf_update/kwin_focus2.sh
+share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwiniconify.upd
 share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/kwinupdatewindowsettings.upd
 share/apps/kconf_update/move_favicons.sh
+share/apps/kconf_update/move_konqsidebartng_entries.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
 share/apps/kconf_update/schemaStrip.pl
 share/apps/kconf_update/socks.upd
+share/apps/kcontrol/about/kcontrol.css
+share/apps/kcontrol/about/main.html
+share/apps/kcontrol/about/top-right-kcontrol.png
 share/apps/kcontrol/kcontrolui.rc
 share/apps/kcontrol/pics/energybig.png
 share/apps/kcontrol/pics/lo-energy.png
@@ -1011,9 +1077,6 @@ share/apps/kcontrol/pics/mini-world.png
 share/apps/kcontrol/pics/monitor.png
 share/apps/kcontrol/pics/onlyone.png
 share/apps/kcontrol/pics/overlapping.png
-share/apps/kcontrol/pics/part1.png
-share/apps/kcontrol/pics/part2.png
-share/apps/kcontrol/pics/part3.png
 share/apps/kcontrol/pics/play.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1022,25 +1085,42 @@ share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kcontroledit/kcontroleditui.rc
 share/apps/kdcop/kdcopui.rc
-share/apps/kdeprint/template/background.png
+share/apps/kdeprint/template/bar-bottom-left.png
+share/apps/kdeprint/template/bar-bottom-middle.png
+share/apps/kdeprint/template/bar-bottom-right.png
+share/apps/kdeprint/template/bar-middle-left.png
+share/apps/kdeprint/template/bar-middle-right.png
+share/apps/kdeprint/template/bar-top-left.png
+share/apps/kdeprint/template/bar-top-middle.png
+share/apps/kdeprint/template/bar-top-right.png
+share/apps/kdeprint/template/bottom-left.png
+share/apps/kdeprint/template/bottom-middle.png
+share/apps/kdeprint/template/bottom-right.png
+share/apps/kdeprint/template/box-bottom-left.png
+share/apps/kdeprint/template/box-bottom-middle.png
+share/apps/kdeprint/template/box-bottom-right.png
+share/apps/kdeprint/template/box-centre-kdeprint.png
+share/apps/kdeprint/template/box-middle-left.png
+share/apps/kdeprint/template/box-middle-right.png
+share/apps/kdeprint/template/box-top-left.png
+share/apps/kdeprint/template/box-top-middle.png
+share/apps/kdeprint/template/box-top-right.png
 share/apps/kdeprint/template/class.template
 share/apps/kdeprint/template/driver.template
 share/apps/kdeprint/template/htmlstyles.css
 share/apps/kdeprint/template/jobs.template
-share/apps/kdeprint/template/kdelogo2.png
-share/apps/kdeprint/template/kdeprint.png
-share/apps/kdeprint/template/lines.png
-share/apps/kdeprint/template/lines2.png
-share/apps/kdeprint/template/pointers.png
 share/apps/kdeprint/template/printer.template
 share/apps/kdeprint/template/pseudo.template
-share/apps/kdeprint/template/shadow1.png
+share/apps/kdeprint/template/top-left.png
+share/apps/kdeprint/template/top-middle.png
+share/apps/kdeprint/template/top-right-kdeprint.png
 share/apps/kdeprint_part/kdeprint_part.rc
 share/apps/kdeprintfax/anytops
 share/apps/kdeprintfax/faxfilters
 share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
 share/apps/kdeprintfax/kdeprintfaxui.rc
 share/apps/kdesktop/DesktopLinks/Home.desktop
+share/apps/kdesktop/DesktopLinks/System.desktop
 share/apps/kdesktop/directory.autostart
 share/apps/kdesktop/directory.desktop
 share/apps/kdesktop/directory.templates
@@ -1117,8 +1197,9 @@ share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-share/apps/kdm/pics/kdeflower.png
+share/apps/kdm/pics/kdelogo-crystal.png
 share/apps/kdm/pics/kdelogo.png
+share/apps/kdm/pics/shutdown.jpg
 share/apps/kdm/pics/users/Apple.png
 share/apps/kdm/pics/users/BeachBall.png
 share/apps/kdm/pics/users/Blowfish.png
@@ -1197,6 +1278,13 @@ share/apps/kdm/sessions/wm2.desktop
 share/apps/kdm/sessions/wmaker.desktop
 share/apps/kdm/sessions/xfce.desktop
 share/apps/kdm/sessions/xfce4.desktop
+share/apps/kdm/themes/circles/GdmGreeterTheme.desktop
+share/apps/kdm/themes/circles/background.svg
+share/apps/kdm/themes/circles/circles.xml
+share/apps/kdm/themes/circles/flower.png
+share/apps/kdm/themes/circles/help.png
+share/apps/kdm/themes/circles/options.png
+share/apps/kdm/themes/circles/screenshot.png
 share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
@@ -1207,6 +1295,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 share/apps/kfindpart/icons/locolor/22x22/actions/search.png
 share/apps/kfontview/kfontviewpart.rc
+share/apps/kfontview/kfontviewui.rc
 share/apps/khelpcenter/glossary.html.in
 share/apps/khelpcenter/glossary.xslt
 share/apps/khelpcenter/intro.html.in
@@ -1240,14 +1329,20 @@ share/apps/khelpcenter/plugins/links.desktop
 share/apps/khelpcenter/plugins/support.desktop
 share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
+share/apps/khelpcenter/searchhandlers/docbook.desktop
+share/apps/khelpcenter/searchhandlers/htdig.desktop
+share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+share/apps/khelpcenter/searchhandlers/man.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
 share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/apps/khtml/kpartplugins/khtmlkttsd.desktop
+share/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
 share/apps/kicker/applets/ksysguardapplet.desktop
 share/apps/kicker/applets/lockout.desktop
+share/apps/kicker/applets/mediaapplet.desktop
 share/apps/kicker/applets/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
@@ -1255,6 +1350,7 @@ share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/applets/runapplet.desktop
 share/apps/kicker/applets/systemtrayapplet.desktop
 share/apps/kicker/applets/taskbarapplet.desktop
+share/apps/kicker/applets/trashapplet.desktop
 share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
@@ -1271,6 +1367,8 @@ share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
 share/apps/kicker/menuext/recentdocs.desktop
+share/apps/kicker/menuext/remotemenu.desktop
+share/apps/kicker/menuext/systemmenu.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk10.png
 share/apps/kicker/pics/disk2.png
@@ -1416,14 +1514,12 @@ share/apps/konqsidebartng/dirtree/dirtree_module.desktop
 share/apps/konqsidebartng/dirtree/history_module.desktop
 share/apps/konqsidebartng/entries/.version
 share/apps/konqsidebartng/entries/bookmarks.desktop
-share/apps/konqsidebartng/entries/devices.desktop
 share/apps/konqsidebartng/entries/history.desktop
 share/apps/konqsidebartng/entries/home.desktop
 share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
-share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1436,35 +1532,25 @@ share/apps/konqsidebartng/virtual_folders/remote/web/.directory
 share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
+share/apps/konqsidebartng/virtual_folders/services/applications.desktop
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/konqsidebartng/virtual_folders/services/devices.desktop
 share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/konqsidebartng/virtual_folders/services/media.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop
+share/apps/konqsidebartng/virtual_folders/services/settings.desktop
 share/apps/konqsidebartng/websidebar/websidebar.html
-share/apps/konqueror/about/background.png
-share/apps/konqueror/about/background_rtl.png
-share/apps/konqueror/about/bgtable.png
-share/apps/konqueror/about/bgtable_rtl.png
+share/apps/konqueror/about/box-centre-konqueror.png
 share/apps/konqueror/about/intro.html
-share/apps/konqueror/about/intro_rtl.html
-share/apps/konqueror/about/kdelogo2.png
 share/apps/konqueror/about/konq.css
-share/apps/konqueror/about/konq_rtl.css
-share/apps/konqueror/about/konqueror.png
-share/apps/konqueror/about/konqueror_rtl.png
+share/apps/konqueror/about/launch.html
 share/apps/konqueror/about/lightning.png
-share/apps/konqueror/about/lines.png
-share/apps/konqueror/about/lines2.png
-share/apps/konqueror/about/more.png
 share/apps/konqueror/about/plugins.html
 share/apps/konqueror/about/plugins_rtl.html
-share/apps/konqueror/about/pointers.gif
-share/apps/konqueror/about/shadow1.png
 share/apps/konqueror/about/specs.html
-share/apps/konqueror/about/specs_rtl.html
 share/apps/konqueror/about/tips.html
-share/apps/konqueror/about/tips_rtl.html
+share/apps/konqueror/about/top-right-konqueror.png
 share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
@@ -1478,7 +1564,6 @@ share/apps/konqueror/pics/arrow_bottomleft.png
 share/apps/konqueror/pics/arrow_bottomright.png
 share/apps/konqueror/pics/arrow_topleft.png
 share/apps/konqueror/pics/arrow_topright.png
-share/apps/konqueror/pics/indicator_anchor.png
 share/apps/konqueror/pics/indicator_connect.png
 share/apps/konqueror/pics/indicator_empty.png
 share/apps/konqueror/pics/indicator_noconnect.png
@@ -1490,23 +1575,13 @@ share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/simplebrowser
 share/apps/konqueror/profiles/tabbedbrowsing
 share/apps/konqueror/profiles/webbrowsing
-share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
 share/apps/konqueror/servicemenus/installfont.desktop
 share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 share/apps/konqueror/servicemenus/konsolehere.desktop
-share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
+share/apps/konqueror/servicemenus/media_eject.desktop
+share/apps/konqueror/servicemenus/media_mount.desktop
+share/apps/konqueror/servicemenus/media_safelyremove.desktop
+share/apps/konqueror/servicemenus/media_unmount.desktop
 share/apps/konqueror/servicemenus/text-ada-print.desktop
 share/apps/konqueror/servicemenus/text-c++-print.desktop
 share/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1525,8 +1600,6 @@ share/apps/konqueror/servicemenus/text-tcl-print.desktop
 share/apps/konqueror/servicemenus/text-tex-print.desktop
 share/apps/konqueror/servicemenus/text-xml-print.desktop
 share/apps/konqueror/servicemenus/text-xslt-print.desktop
-share/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
 share/apps/konqueror/tiles/bluemorning.png
 share/apps/konqueror/tiles/canvas.png
 share/apps/konqueror/tiles/checker.png
@@ -1573,6 +1646,7 @@ share/apps/konsole/profiles/4shells
 share/apps/konsole/profiles/5shells
 share/apps/konsole/screen.desktop
 share/apps/konsole/shell.desktop
+share/apps/konsole/solaris.keytab
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
 share/apps/konsole/syscolor.schema
@@ -1598,9 +1672,12 @@ share/apps/ksplash/Themes/Default/splash_active_bar.png
 share/apps/ksplash/Themes/Default/splash_bottom.png
 share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 share/apps/ksplash/Themes/Default/splash_top.png
+share/apps/ksplash/Themes/None/Theme.rc
 share/apps/ksplash/Themes/Redmond/Background.png
 share/apps/ksplash/Themes/Redmond/Preview.png
 share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Simple/Preview.png
+share/apps/ksplash/Themes/Simple/Theme.rc
 share/apps/ksplash/Themes/Standard/Preview.png
 share/apps/ksplash/Themes/Standard/Theme.rc
 share/apps/ksplash/Themes/blue-bend/Preview.png
@@ -1626,6 +1703,30 @@ share/apps/ksysguard/pics/shell.png
 share/apps/ksysguard/pics/tools.png
 share/apps/ksysguard/pics/unknownapp.png
 share/apps/ksysguard/pics/waiting.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml
+share/apps/kthememanager/themes/Keramik/Keramik.preview.png
+share/apps/kthememanager/themes/Keramik/Keramik.xml
+share/apps/kthememanager/themes/Plastik/Plastik.preview.png
+share/apps/kthememanager/themes/Plastik/Plastik.xml
+share/apps/kthememanager/themes/Platinum/Platinum.preview.png
+share/apps/kthememanager/themes/Platinum/Platinum.xml
+share/apps/kthememanager/themes/Redmond/Redmond.preview.png
+share/apps/kthememanager/themes/Redmond/Redmond.xml
+share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png
+share/apps/kthememanager/themes/Sunshine/Sunshine.xml
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
 share/apps/kwin/keramik.desktop
@@ -1644,12 +1745,20 @@ share/apps/kwin/pics/menu.png
 share/apps/kwin/pics/pindown.png
 share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
+share/apps/kwin/plastik.desktop
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
+share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/smb-network.desktop
+share/apps/systemview/home.desktop
+share/apps/systemview/media.desktop
+share/apps/systemview/remote.desktop
+share/apps/systemview/settings.desktop
+share/apps/systemview/trash.desktop
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
@@ -1658,15 +1767,20 @@ share/autostart/ktip.desktop
 share/autostart/panel.desktop
 share/config.kcfg/kcm_useraccount.kcfg
 share/config.kcfg/kcm_useraccount_pass.kcfg
+share/config.kcfg/kdesktop.kcfg
+share/config.kcfg/khelpcenter.kcfg
+share/config.kcfg/klaunch.kcfg
 share/config.kcfg/konqueror.kcfg
+share/config.kcfg/kwebdesktop.kcfg
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/taskbar.kcfg
+share/config/katerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
 share/config/kxkb_groups
-share/config/mountwatcher.desktop
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -1689,6 +1803,7 @@ share/desktop-directories/kde-science.directory
 share/desktop-directories/kde-settings-accessibility.directory
 share/desktop-directories/kde-settings-components.directory
 share/desktop-directories/kde-settings-desktop.directory
+share/desktop-directories/kde-settings-hardware.directory
 share/desktop-directories/kde-settings-looknfeel.directory
 share/desktop-directories/kde-settings-network.directory
 share/desktop-directories/kde-settings-peripherals.directory
@@ -1706,6 +1821,7 @@ share/desktop-directories/kde-toys.directory
 share/desktop-directories/kde-unknown.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
+share/doc/HTML/en/kappfinder/man-kappfinder.1.docbook
 share/doc/HTML/en/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1866,6 +1982,9 @@ share/doc/HTML/en/kcontrol/useragent/index.docbook
 share/doc/HTML/en/kcontrol/windowmanagement/common
 share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/en/kdcop/common
+share/doc/HTML/en/kdcop/index.cache.bz2
+share/doc/HTML/en/kdcop/index.docbook
 share/doc/HTML/en/kdebase-apidocs/common
 share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.cache.bz2
@@ -1961,7 +2080,10 @@ share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/HTML/en/khelpcenter/faq/questions.docbook
+share/doc/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
 share/doc/HTML/en/khelpcenter/faq/winmng.docbook
 share/doc/HTML/en/khelpcenter/glossary/checkxrefs
 share/doc/HTML/en/khelpcenter/glossary/common
@@ -1982,20 +2104,84 @@ share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/shadow1.png
 share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/a-window.png
+share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
+share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
+share/doc/HTML/en/khelpcenter/userguide/amarok.png
+share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
 share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook
-share/doc/HTML/en/khelpcenter/userguide/history.docbook
+share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
+share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/en/khelpcenter/userguide/desktop.png
+share/doc/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
+share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
+share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
+share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
+share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/more-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/notices-trademarks.docbook
-share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/staff.docbook
-share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook
+share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
+share/doc/HTML/en/khelpcenter/userguide/juk.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
+share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
+share/doc/HTML/en/khelpcenter/userguide/kmag.png
+share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
+share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
+share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-start.png
+share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
+share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
+share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/kopete.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
+share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
+share/doc/HTML/en/khelpcenter/userguide/noatun.png
+share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
+share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
+share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
+share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
+share/doc/HTML/en/khelpcenter/userguide/rip.png
+share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
+share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
+share/doc/HTML/en/khelpcenter/userguide/services.png
+share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
+share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
+share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
@@ -2056,6 +2242,9 @@ share/doc/HTML/en/kinfocenter/memory/index.docbook
 share/doc/HTML/en/kinfocenter/nics/common
 share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
 share/doc/HTML/en/kinfocenter/nics/index.docbook
+share/doc/HTML/en/kinfocenter/opengl/common
+share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
+share/doc/HTML/en/kinfocenter/opengl/index.docbook
 share/doc/HTML/en/kinfocenter/partitions/common
 share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
 share/doc/HTML/en/kinfocenter/partitions/index.docbook
@@ -2086,7 +2275,6 @@ share/doc/HTML/en/kinfocenter/usb/index.docbook
 share/doc/HTML/en/kinfocenter/xserver/common
 share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
 share/doc/HTML/en/kinfocenter/xserver/index.docbook
-share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
@@ -2144,6 +2332,10 @@ share/doc/HTML/en/kmenuedit/i_paste.png
 share/doc/HTML/en/kmenuedit/icon_sets.png
 share/doc/HTML/en/kmenuedit/index.cache.bz2
 share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/knetattach/common
+share/doc/HTML/en/knetattach/index.cache.bz2
+share/doc/HTML/en/knetattach/index.docbook
+share/doc/HTML/en/knetattach/screenshot.png
 share/doc/HTML/en/konqueror/basics.docbook
 share/doc/HTML/en/konqueror/bookmarks.docbook
 share/doc/HTML/en/konqueror/browser.docbook
@@ -2160,6 +2352,7 @@ share/doc/HTML/en/konqueror/index.cache.bz2
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/introduction.docbook
 share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
 share/doc/HTML/en/konqueror/parts.png
 share/doc/HTML/en/konqueror/path-complete.docbook
 share/doc/HTML/en/konqueror/plugins.docbook
@@ -2171,6 +2364,7 @@ share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/konsole.png
+share/doc/HTML/en/konsole/tabbar.png
 share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
@@ -2203,8 +2397,10 @@ share/icons/crystalsvg/128x128/apps/bell.png
 share/icons/crystalsvg/128x128/apps/cache.png
 share/icons/crystalsvg/128x128/apps/clanbomber.png
 share/icons/crystalsvg/128x128/apps/clock.png
+share/icons/crystalsvg/128x128/apps/colors.png
 share/icons/crystalsvg/128x128/apps/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy.png
 share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
 share/icons/crystalsvg/128x128/apps/fonts.png
@@ -2215,19 +2411,20 @@ share/icons/crystalsvg/128x128/apps/kappfinder.png
 share/icons/crystalsvg/128x128/apps/kate.png
 share/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/icons/crystalsvg/128x128/apps/kcmdf.png
+share/icons/crystalsvg/128x128/apps/kcmkwm.png
 share/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/icons/crystalsvg/128x128/apps/kcmpci.png
 share/icons/crystalsvg/128x128/apps/kcontrol.png
 share/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/icons/crystalsvg/128x128/apps/kdmconfig.png
-share/icons/crystalsvg/128x128/apps/keditbookmarks.png
 share/icons/crystalsvg/128x128/apps/key_bindings.png
 share/icons/crystalsvg/128x128/apps/kfm_home.png
 share/icons/crystalsvg/128x128/apps/khelpcenter.png
 share/icons/crystalsvg/128x128/apps/kjobviewer.png
 share/icons/crystalsvg/128x128/apps/klipper.png
 share/icons/crystalsvg/128x128/apps/kmenu.png
+share/icons/crystalsvg/128x128/apps/knetattach.png
 share/icons/crystalsvg/128x128/apps/konqueror.png
 share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
@@ -2245,6 +2442,7 @@ share/icons/crystalsvg/128x128/apps/multimedia.png
 share/icons/crystalsvg/128x128/apps/netscape.png
 share/icons/crystalsvg/128x128/apps/package.png
 share/icons/crystalsvg/128x128/apps/package_applications.png
+share/icons/crystalsvg/128x128/apps/package_development.png
 share/icons/crystalsvg/128x128/apps/package_favourite.png
 share/icons/crystalsvg/128x128/apps/package_games.png
 share/icons/crystalsvg/128x128/apps/package_multimedia.png
@@ -2291,6 +2489,10 @@ share/icons/crystalsvg/16x16/apps/designer.png
 share/icons/crystalsvg/16x16/apps/dia.png
 share/icons/crystalsvg/16x16/apps/dlgedit.png
 share/icons/crystalsvg/16x16/apps/eclipse.png
+share/icons/crystalsvg/16x16/apps/edu_languages.png
+share/icons/crystalsvg/16x16/apps/edu_mathematics.png
+share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
+share/icons/crystalsvg/16x16/apps/edu_science.png
 share/icons/crystalsvg/16x16/apps/emacs.png
 share/icons/crystalsvg/16x16/apps/email.png
 share/icons/crystalsvg/16x16/apps/energy.png
@@ -2307,7 +2509,6 @@ share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/gnomemeeting.png
 share/icons/crystalsvg/16x16/apps/gnucash.png
 share/icons/crystalsvg/16x16/apps/gnumeric.png
-share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
 share/icons/crystalsvg/16x16/apps/help_index.png
@@ -2346,6 +2547,7 @@ share/icons/crystalsvg/16x16/apps/kjobviewer.png
 share/icons/crystalsvg/16x16/apps/klipper.png
 share/icons/crystalsvg/16x16/apps/kmenu.png
 share/icons/crystalsvg/16x16/apps/kmenuedit.png
+share/icons/crystalsvg/16x16/apps/knetattach.png
 share/icons/crystalsvg/16x16/apps/knotify.png
 share/icons/crystalsvg/16x16/apps/konqueror.png
 share/icons/crystalsvg/16x16/apps/konsole.png
@@ -2412,7 +2614,6 @@ share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
 share/icons/crystalsvg/16x16/apps/scribus.png
 share/icons/crystalsvg/16x16/apps/sodipodi.png
-share/icons/crystalsvg/16x16/apps/soffice.png
 share/icons/crystalsvg/16x16/apps/style.png
 share/icons/crystalsvg/16x16/apps/stylesheet.png
 share/icons/crystalsvg/16x16/apps/terminal.png
@@ -2423,7 +2624,6 @@ share/icons/crystalsvg/16x16/apps/vnc.png
 share/icons/crystalsvg/16x16/apps/wabi.png
 share/icons/crystalsvg/16x16/apps/window_list.png
 share/icons/crystalsvg/16x16/apps/wine.png
-share/icons/crystalsvg/16x16/apps/winprops.png
 share/icons/crystalsvg/16x16/apps/wp.png
 share/icons/crystalsvg/16x16/apps/xcalc.png
 share/icons/crystalsvg/16x16/apps/xchat.png
@@ -2441,18 +2641,54 @@ share/icons/crystalsvg/16x16/apps/xmms.png
 share/icons/crystalsvg/16x16/apps/xosview.png
 share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
-share/icons/crystalsvg/16x16/devices/print_printer.png
-share/icons/crystalsvg/16x16/filesystems/folder_print2.png
 share/icons/crystalsvg/22x22/actions/newfont.png
-share/icons/crystalsvg/22x22/actions/textwaterfall.png
+share/icons/crystalsvg/22x22/apps/access.png
+share/icons/crystalsvg/22x22/apps/agent.png
+share/icons/crystalsvg/22x22/apps/arts.png
+share/icons/crystalsvg/22x22/apps/background.png
+share/icons/crystalsvg/22x22/apps/bell.png
+share/icons/crystalsvg/22x22/apps/cache.png
+share/icons/crystalsvg/22x22/apps/colors.png
+share/icons/crystalsvg/22x22/apps/cookie.png
+share/icons/crystalsvg/22x22/apps/date.png
+share/icons/crystalsvg/22x22/apps/email.png
+share/icons/crystalsvg/22x22/apps/energy.png
+share/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/icons/crystalsvg/22x22/apps/filetypes.png
+share/icons/crystalsvg/22x22/apps/fonts.png
+share/icons/crystalsvg/22x22/apps/hwinfo.png
+share/icons/crystalsvg/22x22/apps/icons.png
+share/icons/crystalsvg/22x22/apps/iconthemes.png
+share/icons/crystalsvg/22x22/apps/kcmdevices.png
+share/icons/crystalsvg/22x22/apps/kcmkicker.png
+share/icons/crystalsvg/22x22/apps/kcmkwm.png
+share/icons/crystalsvg/22x22/apps/kcmx.png
+share/icons/crystalsvg/22x22/apps/kdmconfig.png
+share/icons/crystalsvg/22x22/apps/key_bindings.png
+share/icons/crystalsvg/22x22/apps/keyboard.png
+share/icons/crystalsvg/22x22/apps/kfm.png
+share/icons/crystalsvg/22x22/apps/khelpcenter.png
+share/icons/crystalsvg/22x22/apps/kjobviewer.png
 share/icons/crystalsvg/22x22/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/kmenu.png
+share/icons/crystalsvg/22x22/apps/knetattach.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/konsole.png
+share/icons/crystalsvg/22x22/apps/kscreensaver.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
+share/icons/crystalsvg/22x22/apps/kthememgr.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
+share/icons/crystalsvg/22x22/apps/locale.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/package_development.png
+share/icons/crystalsvg/22x22/apps/personal.png
+share/icons/crystalsvg/22x22/apps/printmgr.png
+share/icons/crystalsvg/22x22/apps/proxy.png
 share/icons/crystalsvg/22x22/apps/randr.png
+share/icons/crystalsvg/22x22/apps/samba.png
+share/icons/crystalsvg/22x22/apps/style.png
+share/icons/crystalsvg/22x22/apps/stylesheet.png
 share/icons/crystalsvg/32x32/actions/newfont.png
-share/icons/crystalsvg/32x32/actions/textwaterfall.png
 share/icons/crystalsvg/32x32/apps/abiword.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
@@ -2475,6 +2711,10 @@ share/icons/crystalsvg/32x32/apps/designer.png
 share/icons/crystalsvg/32x32/apps/dia.png
 share/icons/crystalsvg/32x32/apps/dlgedit.png
 share/icons/crystalsvg/32x32/apps/eclipse.png
+share/icons/crystalsvg/32x32/apps/edu_languages.png
+share/icons/crystalsvg/32x32/apps/edu_mathematics.png
+share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
+share/icons/crystalsvg/32x32/apps/edu_science.png
 share/icons/crystalsvg/32x32/apps/emacs.png
 share/icons/crystalsvg/32x32/apps/email.png
 share/icons/crystalsvg/32x32/apps/energy.png
@@ -2493,7 +2733,6 @@ share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/gnomemeeting.png
 share/icons/crystalsvg/32x32/apps/gnucash.png
 share/icons/crystalsvg/32x32/apps/gnumeric.png
-share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
 share/icons/crystalsvg/32x32/apps/help_index.png
@@ -2505,7 +2744,6 @@ share/icons/crystalsvg/32x32/apps/kappfinder.png
 share/icons/crystalsvg/32x32/apps/kate.png
 share/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
-share/icons/crystalsvg/32x32/apps/kcmfontinst.png
 share/icons/crystalsvg/32x32/apps/kcmkicker.png
 share/icons/crystalsvg/32x32/apps/kcmkwm.png
 share/icons/crystalsvg/32x32/apps/kcmmemory.png
@@ -2528,12 +2766,12 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 share/icons/crystalsvg/32x32/apps/kfind.png
 share/icons/crystalsvg/32x32/apps/kfm.png
 share/icons/crystalsvg/32x32/apps/kfm_home.png
-share/icons/crystalsvg/32x32/apps/kfontview.png
 share/icons/crystalsvg/32x32/apps/khelpcenter.png
 share/icons/crystalsvg/32x32/apps/kjobviewer.png
 share/icons/crystalsvg/32x32/apps/klipper.png
 share/icons/crystalsvg/32x32/apps/kmenu.png
 share/icons/crystalsvg/32x32/apps/kmenuedit.png
+share/icons/crystalsvg/32x32/apps/knetattach.png
 share/icons/crystalsvg/32x32/apps/knotify.png
 share/icons/crystalsvg/32x32/apps/konqueror.png
 share/icons/crystalsvg/32x32/apps/konsole.png
@@ -2565,6 +2803,7 @@ share/icons/crystalsvg/32x32/apps/netscape.png
 share/icons/crystalsvg/32x32/apps/opera.png
 share/icons/crystalsvg/32x32/apps/package.png
 share/icons/crystalsvg/32x32/apps/package_applications.png
+share/icons/crystalsvg/32x32/apps/package_development.png
 share/icons/crystalsvg/32x32/apps/package_editors.png
 share/icons/crystalsvg/32x32/apps/package_edutainment.png
 share/icons/crystalsvg/32x32/apps/package_favourite.png
@@ -2596,7 +2835,6 @@ share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/scribus.png
 share/icons/crystalsvg/32x32/apps/sodipodi.png
-share/icons/crystalsvg/32x32/apps/soffice.png
 share/icons/crystalsvg/32x32/apps/style.png
 share/icons/crystalsvg/32x32/apps/stylesheet.png
 share/icons/crystalsvg/32x32/apps/terminal.png
@@ -2607,7 +2845,6 @@ share/icons/crystalsvg/32x32/apps/vnc.png
 share/icons/crystalsvg/32x32/apps/wabi.png
 share/icons/crystalsvg/32x32/apps/window_list.png
 share/icons/crystalsvg/32x32/apps/wine.png
-share/icons/crystalsvg/32x32/apps/winprops.png
 share/icons/crystalsvg/32x32/apps/wp.png
 share/icons/crystalsvg/32x32/apps/x.png
 share/icons/crystalsvg/32x32/apps/xapp.png
@@ -2628,8 +2865,6 @@ share/icons/crystalsvg/32x32/apps/xmms.png
 share/icons/crystalsvg/32x32/apps/xosview.png
 share/icons/crystalsvg/32x32/apps/xpaint.png
 share/icons/crystalsvg/32x32/apps/xv.png
-share/icons/crystalsvg/32x32/devices/print_printer.png
-share/icons/crystalsvg/32x32/filesystems/folder_print2.png
 share/icons/crystalsvg/48x48/apps/abiword.png
 share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
@@ -2649,6 +2884,10 @@ share/icons/crystalsvg/48x48/apps/date.png
 share/icons/crystalsvg/48x48/apps/designer.png
 share/icons/crystalsvg/48x48/apps/dia.png
 share/icons/crystalsvg/48x48/apps/eclipse.png
+share/icons/crystalsvg/48x48/apps/edu_languages.png
+share/icons/crystalsvg/48x48/apps/edu_mathematics.png
+share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
+share/icons/crystalsvg/48x48/apps/edu_science.png
 share/icons/crystalsvg/48x48/apps/emacs.png
 share/icons/crystalsvg/48x48/apps/email.png
 share/icons/crystalsvg/48x48/apps/energy.png
@@ -2666,7 +2905,6 @@ share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/gnomemeeting.png
 share/icons/crystalsvg/48x48/apps/gnucash.png
 share/icons/crystalsvg/48x48/apps/gnumeric.png
-share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
 share/icons/crystalsvg/48x48/apps/hwinfo.png
@@ -2678,10 +2916,10 @@ share/icons/crystalsvg/48x48/apps/kate.png
 share/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/icons/crystalsvg/48x48/apps/kcmdf.png
 share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
-share/icons/crystalsvg/48x48/apps/kcmfontinst.png
 share/icons/crystalsvg/48x48/apps/kcmkwm.png
 share/icons/crystalsvg/48x48/apps/kcmmemory.png
 share/icons/crystalsvg/48x48/apps/kcmmidi.png
+share/icons/crystalsvg/48x48/apps/kcmopengl.png
 share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
@@ -2699,12 +2937,12 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 share/icons/crystalsvg/48x48/apps/kfind.png
 share/icons/crystalsvg/48x48/apps/kfm.png
 share/icons/crystalsvg/48x48/apps/kfm_home.png
-share/icons/crystalsvg/48x48/apps/kfontview.png
 share/icons/crystalsvg/48x48/apps/khelpcenter.png
 share/icons/crystalsvg/48x48/apps/kjobviewer.png
 share/icons/crystalsvg/48x48/apps/klipper.png
 share/icons/crystalsvg/48x48/apps/kmenu.png
 share/icons/crystalsvg/48x48/apps/kmenuedit.png
+share/icons/crystalsvg/48x48/apps/knetattach.png
 share/icons/crystalsvg/48x48/apps/knotify.png
 share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
@@ -2731,6 +2969,7 @@ share/icons/crystalsvg/48x48/apps/netscape.png
 share/icons/crystalsvg/48x48/apps/opera.png
 share/icons/crystalsvg/48x48/apps/package.png
 share/icons/crystalsvg/48x48/apps/package_applications.png
+share/icons/crystalsvg/48x48/apps/package_development.png
 share/icons/crystalsvg/48x48/apps/package_editors.png
 share/icons/crystalsvg/48x48/apps/package_edutainment.png
 share/icons/crystalsvg/48x48/apps/package_favourite.png
@@ -2760,7 +2999,6 @@ share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/scribus.png
 share/icons/crystalsvg/48x48/apps/sodipodi.png
-share/icons/crystalsvg/48x48/apps/soffice.png
 share/icons/crystalsvg/48x48/apps/staroffice.png
 share/icons/crystalsvg/48x48/apps/style.png
 share/icons/crystalsvg/48x48/apps/stylesheet.png
@@ -2770,7 +3008,6 @@ share/icons/crystalsvg/48x48/apps/usb.png
 share/icons/crystalsvg/48x48/apps/vnc.png
 share/icons/crystalsvg/48x48/apps/window_list.png
 share/icons/crystalsvg/48x48/apps/wine.png
-share/icons/crystalsvg/48x48/apps/winprops.png
 share/icons/crystalsvg/48x48/apps/wmaker_apps.png
 share/icons/crystalsvg/48x48/apps/wp.png
 share/icons/crystalsvg/48x48/apps/xchat.png
@@ -2780,8 +3017,7 @@ share/icons/crystalsvg/48x48/apps/xemacs.png
 share/icons/crystalsvg/48x48/apps/xfmail.png
 share/icons/crystalsvg/48x48/apps/xmag.png
 share/icons/crystalsvg/48x48/apps/xv.png
-share/icons/crystalsvg/48x48/devices/print_printer.png
-share/icons/crystalsvg/48x48/filesystems/folder_print2.png
+share/icons/crystalsvg/64x64/apps/access.png
 share/icons/crystalsvg/64x64/apps/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
 share/icons/crystalsvg/64x64/apps/arts.png
@@ -2790,9 +3026,13 @@ share/icons/crystalsvg/64x64/apps/bell.png
 share/icons/crystalsvg/64x64/apps/cache.png
 share/icons/crystalsvg/64x64/apps/clanbomber.png
 share/icons/crystalsvg/64x64/apps/clock.png
+share/icons/crystalsvg/64x64/apps/colors.png
+share/icons/crystalsvg/64x64/apps/cookie.png
 share/icons/crystalsvg/64x64/apps/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy.png
 share/icons/crystalsvg/64x64/apps/energy_star.png
+share/icons/crystalsvg/64x64/apps/enhanced_browsing.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
 share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
@@ -2804,6 +3044,7 @@ share/icons/crystalsvg/64x64/apps/kappfinder.png
 share/icons/crystalsvg/64x64/apps/kate.png
 share/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/icons/crystalsvg/64x64/apps/kcmdf.png
+share/icons/crystalsvg/64x64/apps/kcmkwm.png
 share/icons/crystalsvg/64x64/apps/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
@@ -2820,6 +3061,7 @@ share/icons/crystalsvg/64x64/apps/khelpcenter.png
 share/icons/crystalsvg/64x64/apps/kjobviewer.png
 share/icons/crystalsvg/64x64/apps/klipper.png
 share/icons/crystalsvg/64x64/apps/kmenu.png
+share/icons/crystalsvg/64x64/apps/knetattach.png
 share/icons/crystalsvg/64x64/apps/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
@@ -2840,6 +3082,7 @@ share/icons/crystalsvg/64x64/apps/nedit.png
 share/icons/crystalsvg/64x64/apps/netscape.png
 share/icons/crystalsvg/64x64/apps/package.png
 share/icons/crystalsvg/64x64/apps/package_applications.png
+share/icons/crystalsvg/64x64/apps/package_development.png
 share/icons/crystalsvg/64x64/apps/package_favourite.png
 share/icons/crystalsvg/64x64/apps/package_games.png
 share/icons/crystalsvg/64x64/apps/package_multimedia.png
@@ -2865,17 +3108,13 @@ share/icons/crystalsvg/64x64/apps/wp.png
 share/icons/crystalsvg/64x64/apps/xclock.png
 share/icons/crystalsvg/64x64/apps/xfmail.png
 share/icons/crystalsvg/64x64/apps/xmag.png
-share/icons/crystalsvg/64x64/devices/print_printer.png
 share/icons/crystalsvg/scalable/apps/access.svgz
 share/icons/crystalsvg/scalable/apps/acroread.svgz
 share/icons/crystalsvg/scalable/apps/aim.svgz
 share/icons/crystalsvg/scalable/apps/aktion.svgz
 share/icons/crystalsvg/scalable/apps/antivirus.svgz
 share/icons/crystalsvg/scalable/apps/applixware.svgz
-share/icons/crystalsvg/scalable/apps/ark.svgz
 share/icons/crystalsvg/scalable/apps/arts.svgz
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svgz
 share/icons/crystalsvg/scalable/apps/background.svgz
 share/icons/crystalsvg/scalable/apps/bell.svgz
 share/icons/crystalsvg/scalable/apps/browser.svgz
@@ -2894,48 +3133,41 @@ share/icons/crystalsvg/scalable/apps/error.svgz
 share/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/icons/crystalsvg/scalable/apps/fonts.svgz
 share/icons/crystalsvg/scalable/apps/galeon.svgz
-share/icons/crystalsvg/scalable/apps/gnome/apps.svgz
-share/icons/crystalsvg/scalable/apps/go.svgz
-share/icons/crystalsvg/scalable/apps/harddrive.svgz
+share/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/icons/crystalsvg/scalable/apps/hardware.svgz
 share/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/icons/crystalsvg/scalable/apps/karbon14.svgz
-share/icons/crystalsvg/scalable/apps/kate.svgz
-share/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/icons/crystalsvg/scalable/apps/kate2.svgz
 share/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+share/icons/crystalsvg/scalable/apps/kcmx.svgz
 share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/icons/crystalsvg/scalable/apps/kdict.svgz
-share/icons/crystalsvg/scalable/apps/kdvi.svgz
 share/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz
+share/icons/crystalsvg/scalable/apps/kjobviewer.svgz
 share/icons/crystalsvg/scalable/apps/klipper.svgz
-share/icons/crystalsvg/scalable/apps/kmail.svgz
+share/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/icons/crystalsvg/scalable/apps/knetattach.svgz
 share/icons/crystalsvg/scalable/apps/konqueror.svgz
 share/icons/crystalsvg/scalable/apps/konsole.svgz
-share/icons/crystalsvg/scalable/apps/kopete.svgz
-share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
-share/icons/crystalsvg/scalable/apps/kwrite.svgz
+share/icons/crystalsvg/scalable/apps/ktip.svgz
+share/icons/crystalsvg/scalable/apps/kwrite2.svgz
 share/icons/crystalsvg/scalable/apps/locale.svgz
-share/icons/crystalsvg/scalable/apps/mail.svgz
 share/icons/crystalsvg/scalable/apps/my_mac.svgz
-share/icons/crystalsvg/scalable/apps/mycomputer.svgz
 share/icons/crystalsvg/scalable/apps/netscape.svgz
 share/icons/crystalsvg/scalable/apps/openoffice.svgz
+share/icons/crystalsvg/scalable/apps/package_development.svgz
 share/icons/crystalsvg/scalable/apps/package_toys.svgz
-share/icons/crystalsvg/scalable/apps/package_utilities.svgz
 share/icons/crystalsvg/scalable/apps/penguin.svgz
+share/icons/crystalsvg/scalable/apps/personal.svgz
+share/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/icons/crystalsvg/scalable/apps/samba.svgz
 share/icons/crystalsvg/scalable/apps/shell.svgz
-share/icons/crystalsvg/scalable/apps/soffice.svgz
 share/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/icons/crystalsvg/scalable/apps/stylesheet.svgz
 share/icons/crystalsvg/scalable/apps/terminal.svgz
 share/icons/crystalsvg/scalable/apps/tux.svgz
 share/icons/crystalsvg/scalable/apps/wine.svgz
-share/icons/crystalsvg/scalable/apps/winprops.svgz
 share/icons/crystalsvg/scalable/apps/x.svgz
 share/icons/crystalsvg/scalable/apps/xapp.svgz
 share/icons/crystalsvg/scalable/apps/xcalc.svgz
@@ -2945,8 +3177,6 @@ share/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/icons/crystalsvg/scalable/apps/xpaint.svgz
 share/icons/hicolor/16x16/apps/khotkeys.png
 share/icons/hicolor/32x32/apps/khotkeys.png
-share/icons/locolor/16x16/apps/kcmfontinst.png
-share/icons/locolor/32x32/apps/kcmfontinst.png
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
@@ -3427,24 +3657,34 @@ share/mimelnk/application/x-smb-server.desktop
 share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
-share/mimelnk/kdedevice/cdrom_mounted.desktop
-share/mimelnk/kdedevice/cdrom_unmounted.desktop
-share/mimelnk/kdedevice/cdwriter_mounted.desktop
-share/mimelnk/kdedevice/cdwriter_unmounted.desktop
-share/mimelnk/kdedevice/dvd_mounted.desktop
-share/mimelnk/kdedevice/dvd_unmounted.desktop
-share/mimelnk/kdedevice/floppy5_mounted.desktop
-share/mimelnk/kdedevice/floppy5_unmounted.desktop
-share/mimelnk/kdedevice/floppy_mounted.desktop
-share/mimelnk/kdedevice/floppy_unmounted.desktop
-share/mimelnk/kdedevice/hdd_mounted.desktop
-share/mimelnk/kdedevice/hdd_unmounted.desktop
-share/mimelnk/kdedevice/nfs_mounted.desktop
-share/mimelnk/kdedevice/nfs_unmounted.desktop
-share/mimelnk/kdedevice/smb_mounted.desktop
-share/mimelnk/kdedevice/smb_unmounted.desktop
-share/mimelnk/kdedevice/zip_mounted.desktop
-share/mimelnk/kdedevice/zip_unmounted.desktop
+share/mimelnk/inode/system_directory.desktop
+share/mimelnk/media/audiocd.desktop
+share/mimelnk/media/blankcd.desktop
+share/mimelnk/media/blankdvd.desktop
+share/mimelnk/media/cdrom_mounted.desktop
+share/mimelnk/media/cdrom_unmounted.desktop
+share/mimelnk/media/cdwriter_mounted.desktop
+share/mimelnk/media/cdwriter_unmounted.desktop
+share/mimelnk/media/dvd_mounted.desktop
+share/mimelnk/media/dvd_unmounted.desktop
+share/mimelnk/media/dvdvideo.desktop
+share/mimelnk/media/floppy5_mounted.desktop
+share/mimelnk/media/floppy5_unmounted.desktop
+share/mimelnk/media/floppy_mounted.desktop
+share/mimelnk/media/floppy_unmounted.desktop
+share/mimelnk/media/gphoto2camera.desktop
+share/mimelnk/media/hdd_mounted.desktop
+share/mimelnk/media/hdd_unmounted.desktop
+share/mimelnk/media/nfs_mounted.desktop
+share/mimelnk/media/nfs_unmounted.desktop
+share/mimelnk/media/removable_mounted.desktop
+share/mimelnk/media/removable_unmounted.desktop
+share/mimelnk/media/smb_mounted.desktop
+share/mimelnk/media/smb_unmounted.desktop
+share/mimelnk/media/svcd.desktop
+share/mimelnk/media/vcd.desktop
+share/mimelnk/media/zip_mounted.desktop
+share/mimelnk/media/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
 share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
@@ -3453,13 +3693,14 @@ share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
 share/mimelnk/print/printermodel.desktop
 share/services/about.protocol
+share/services/applications.protocol
 share/services/ar.protocol
 share/services/bzip.protocol
 share/services/bzip2.protocol
 share/services/cgi.protocol
 share/services/cursorthumbnail.desktop
-share/services/devices.protocol
 share/services/djvuthumbnail.desktop
+share/services/exrthumbnail.desktop
 share/services/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
@@ -3468,17 +3709,21 @@ share/services/fontthumbnail.desktop
 share/services/gzip.protocol
 share/services/htmlthumbnail.desktop
 share/services/imagethumbnail.desktop
-share/services/imap4.protocol
-share/services/imaps.protocol
 share/services/info.protocol
 share/services/kaccess.desktop
 share/services/katedefaultproject.desktop
+share/services/katekttsd.desktop
 share/services/kded/favicons.desktop
+share/services/kded/khotkeys.desktop
 share/services/kded/konqy_preloader.desktop
 share/services/kded/kwrited.desktop
-share/services/kded/mountwatcher.desktop
+share/services/kded/mediamanager.desktop
+share/services/kded/remotedirnotify.desktop
+share/services/kded/systemdirnotify.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
+share/services/kfile_media.desktop
+share/services/kfile_trash.desktop
 share/services/kfindpart.desktop
 share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
@@ -3491,7 +3736,6 @@ share/services/konq_multicolumnview.desktop
 share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
-share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
@@ -3508,6 +3752,7 @@ share/services/ldaps.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
+share/services/media.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
 share/services/picturethumbnail.desktop
@@ -3516,23 +3761,27 @@ share/services/pop3s.protocol
 share/services/print.protocol
 share/services/printdb.protocol
 share/services/programs.protocol
+share/services/remote.protocol
 share/services/searchproviders/acronym.desktop
 share/services/searchproviders/alexa.desktop
 share/services/searchproviders/alexa_url.desktop
 share/services/searchproviders/alltheweb.desktop
 share/services/searchproviders/altavista.desktop
+share/services/searchproviders/amg.desktop
 share/services/searchproviders/appsy.desktop
 share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/backports.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.desktop
+share/services/searchproviders/cia.desktop
 share/services/searchproviders/citeseer.desktop
 share/services/searchproviders/cpan.desktop
 share/services/searchproviders/ctan.desktop
 share/services/searchproviders/ctan_cat.desktop
 share/services/searchproviders/dbug.desktop
 share/services/searchproviders/de2en.desktop
+share/services/searchproviders/de2fr.desktop
 share/services/searchproviders/deb.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
@@ -3545,10 +3794,12 @@ share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
 share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2de.desktop
 share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freedb.desktop
 share/services/searchproviders/freshmeat.desktop
 share/services/searchproviders/froogle.desktop
+share/services/searchproviders/fsd.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
@@ -3556,6 +3807,7 @@ share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
 share/services/searchproviders/google_news.desktop
 share/services/searchproviders/gracenote.desktop
+share/services/searchproviders/grec.desktop
 share/services/searchproviders/hotbot.desktop
 share/services/searchproviders/hyperdictionary.desktop
 share/services/searchproviders/hyperdictionary_thesaurus.desktop
@@ -3584,6 +3836,8 @@ share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
 share/services/searchproviders/thesaurus.desktop
+share/services/searchproviders/tvtome.desktop
+share/services/searchproviders/uspto.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
@@ -3599,24 +3853,30 @@ share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
+share/services/trash.protocol
+share/services/useragentstrings/firefoxoncurrent.desktop
+share/services/useragentstrings/googlebot.desktop
 share/services/useragentstrings/ie401onwinnt4.desktop
-share/services/useragentstrings/ie45onwinnt5.desktop
 share/services/useragentstrings/ie501onwinnt5.desktop
 share/services/useragentstrings/ie50onppc.desktop
-share/services/useragentstrings/ie50onwin95.desktop
 share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
+share/services/useragentstrings/ie60oncurrent.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
 share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozoncurrent12.desktop
 share/services/useragentstrings/mozoncurrent16.desktop
 share/services/useragentstrings/mozonwin2000.desktop
-share/services/useragentstrings/mozonwinnt4.desktop
+share/services/useragentstrings/mozonwinxp.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
+share/services/useragentstrings/ns71oncurrent.desktop
+share/services/useragentstrings/ns71onwinnt51.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/op75oncurrent.desktop
 share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
@@ -3645,6 +3905,8 @@ share/sounds/KDE_Beep_Connect.wav
 share/sounds/KDE_Beep_Digital_1.ogg
 share/sounds/KDE_Beep_Digital_2.ogg
 share/sounds/KDE_Beep_Door.wav
+share/sounds/KDE_Beep_Double.ogg
+share/sounds/KDE_Beep_Harsh.ogg
 share/sounds/KDE_Beep_Honk.wav
 share/sounds/KDE_Beep_Lightning.wav
 share/sounds/KDE_Beep_Phone_1.ogg
@@ -3689,6 +3951,7 @@ share/sounds/KDE_Drum_Break.ogg
 share/sounds/KDE_Error.wav
 share/sounds/KDE_Error_1.ogg
 share/sounds/KDE_Error_2.ogg
+share/sounds/KDE_Error_3.ogg
 share/sounds/KDE_Event_1.ogg
 share/sounds/KDE_Event_2.ogg
 share/sounds/KDE_Event_3.ogg
@@ -3766,27 +4029,69 @@ share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
 share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/All-Good-People-1.jpg.desktop
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Blkmarble.jpg.desktop
 share/wallpapers/Chicken-Songs-2.jpg
+share/wallpapers/Chicken-Songs-2.jpg.desktop
 share/wallpapers/Circuit.jpg
+share/wallpapers/Circuit.jpg.desktop
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Foggy1.jpg.desktop
 share/wallpapers/Island-of-Elba.jpg
+share/wallpapers/Island-of-Elba.jpg.desktop
+share/wallpapers/KDE34.png
+share/wallpapers/KDE34.png.desktop
 share/wallpapers/Marble01.jpg
+share/wallpapers/Marble01.jpg.desktop
 share/wallpapers/No-Ones-Laughing-3.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 share/wallpapers/Paper01.jpg
+share/wallpapers/Paper01.jpg.desktop
 share/wallpapers/Planning-And-Probing-1.jpg
+share/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/wallpapers/Totally-New-Product-1.jpg
+share/wallpapers/Totally-New-Product-1.jpg.desktop
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/wallpapers/andes-venezolanos.svgz
+share/wallpapers/andes-venezolanos.svgz.desktop
+share/wallpapers/aurora.svgz
+share/wallpapers/aurora.svgz.desktop
 share/wallpapers/blue-bend.jpg
+share/wallpapers/blue-bend.jpg.desktop
+share/wallpapers/celtic.svgz
+share/wallpapers/celtic.svgz.desktop
 share/wallpapers/default_blue.jpg
+share/wallpapers/default_blue.jpg.desktop
 share/wallpapers/default_gears.jpg
+share/wallpapers/default_gears.jpg.desktop
 share/wallpapers/fulmine.jpg
+share/wallpapers/fulmine.jpg.desktop
+share/wallpapers/gear-flowers.svgz
+share/wallpapers/gear-flowers.svgz.desktop
+share/wallpapers/globe.svgz
+share/wallpapers/globe.svgz.desktop
+share/wallpapers/here-gear.svgz
+share/wallpapers/here-gear.svgz.desktop
 share/wallpapers/kde_box.png
+share/wallpapers/kde_box.png.desktop
 share/wallpapers/kde_passion.jpg
+share/wallpapers/kde_passion.jpg.desktop
+share/wallpapers/konqui.svgz
+share/wallpapers/konqui.svgz.desktop
+share/wallpapers/lineart.svgz
+share/wallpapers/lineart.svgz.desktop
+share/wallpapers/moon.svgz
+share/wallpapers/moon.svgz.desktop
 share/wallpapers/only_k.jpg
+share/wallpapers/only_k.jpg.desktop
 share/wallpapers/seaofconero.jpg
+share/wallpapers/seaofconero.jpg.desktop
 share/wallpapers/triplegears.jpg
+share/wallpapers/triplegears.jpg.desktop
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@@ -3795,19 +4100,15 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/templates/.source/emptydir
 @dirrm share/mimelnk/print
-@dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/media
 @dirrm share/mimelnk/fonts
 @dirrm share/locale/l10n/zw
 @dirrm share/locale/l10n/zm
@@ -4036,7 +4337,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/crystalsvg/scalable/apps/gnome
+@dirrm share/fonts/override
+@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4045,6 +4347,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
+@dirrm share/doc/HTML/en/knetattach
 @dirrm share/doc/HTML/en/kmenuedit
 @dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kioslave
@@ -4058,6 +4361,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kinfocenter/pcmcia
 @dirrm share/doc/HTML/en/kinfocenter/pci
 @dirrm share/doc/HTML/en/kinfocenter/partitions
+@dirrm share/doc/HTML/en/kinfocenter/opengl
 @dirrm share/doc/HTML/en/kinfocenter/nics
 @dirrm share/doc/HTML/en/kinfocenter/memory
 @dirrm share/doc/HTML/en/kinfocenter/ioports
@@ -4083,12 +4387,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate
 @dirrm share/doc/HTML/en/kdebase-apidocs
+@dirrm share/doc/HTML/en/kdcop
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
 @dirrm share/doc/HTML/en/kcontrol/spellchecking
@@ -4134,16 +4436,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
 @dirrm share/doc/HTML/en/kate
+@dirrm share/doc/HTML/en/kappfinder
 @dirrm share/desktop-directories
+@dirrm share/apps/systemview
+@dirrm share/apps/remoteview
+@dirrm share/apps/plugin
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
+@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
+@dirrm share/apps/kthememanager/themes/YellowOnBlue
+@dirrm share/apps/kthememanager/themes/Sunshine
+@dirrm share/apps/kthememanager/themes/Redmond
+@dirrm share/apps/kthememanager/themes/Platinum
+@dirrm share/apps/kthememanager/themes/Plastik
+@dirrm share/apps/kthememanager/themes/Keramik
+@dirrm share/apps/kthememanager/themes/KDE_Classic
+@dirrm share/apps/kthememanager/themes/HighContrastLight-big
+@dirrm share/apps/kthememanager/themes/HighContrastLight
+@dirrm share/apps/kthememanager/themes/HighContrastDark-big
+@dirrm share/apps/kthememanager/themes/HighContrastDark
+@dirrm share/apps/kthememanager/themes
+@dirrm share/apps/kthememanager
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash/Themes/blue-bend
 @dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Simple
 @dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/None
 @dirrm share/apps/ksplash/Themes/Default/locolor
 @dirrm share/apps/ksplash/Themes/Default
 @dirrm share/apps/ksplash/Themes
@@ -4197,7 +4519,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
+@dirrm share/apps/khtml/kpartplugins
 @dirrm share/apps/khotkeys
+@dirrm share/apps/khelpcenter/searchhandlers/htdig
+@dirrm share/apps/khelpcenter/searchhandlers
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
@@ -4209,6 +4534,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/themes/circles
+@dirrm share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
@@ -4237,7 +4564,9 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcontroledit/icons
 @dirrm share/apps/kcontroledit
 @dirrm share/apps/kcontrol/pics
+@dirrm share/apps/kcontrol/about
 @dirrm share/apps/kcontrol
+@dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
 @dirrm share/apps/kcmkeys
@@ -4245,6 +4574,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
+@dirrm share/apps/katepart/kpartplugins
+@dirrm share/apps/kate/plugins/katekttsd
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index fdbd9bfc5636..4679a2d4d220 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,13 +18,16 @@ COMMENT=	Basic applications for the KDE system
 
 BUILD_DEPENDS=	mkfontdir:${X_CLIENTS_PORT} \
 		xmkmf:${X_IMAKE_PORT}
-LIB_DEPENDS=	smbclient:${PORTSDIR}/net/samba-libsmbclient
+LIB_DEPENDS=	sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		smbclient:${PORTSDIR}/net/samba-libsmbclient \
+		usb:${PORTSDIR}/devel/libusb
 
-CONFLICTS=	kdeutils-3.[0-2] kdeutils-3.0.* kdeutils-3.1.* kdeutils-3.2.*
+CONFLICTS=	kdelibs-3.[0-3]* kdeutils-3.[0-2]*
 
 USE_KDELIBS_VER=3
 PREFIX=		${KDE_PREFIX}
 
+USE_GETOPT_LONG=yes
 USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -38,8 +40,7 @@ GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 
-DO_NOT_COMPILE=	nsplugins
-CONFIGURE_ENV+=	RUN_KAPPFINDER=no
+CONFIGURE_ENV+=	RUN_KAPPFINDER=no kde_cv_utmp_file=/var/run/utmp
 CONFIGURE_ARGS+=--without-java			\
 		--with-qt-dir=${X11BASE}	\
 		--with-xdmdir=${X11BASE}/lib/X11/xdm
@@ -49,10 +50,6 @@ OPTIONS=	ARTSWRAPPER "Suid wrapper for aRts, req'd for realtime prio" on
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
-.if defined(DO_NOT_COMPILE)
-CONFIGURE_ENV+=DO_NOT_COMPILE="${DO_NOT_COMPILE}"
-.endif # defined(DO_NOT_COMPILE)
-
 .if !defined(WITHOUT_ARTSWRAPPER)
 RUN_DEPENDS+=	artswrapper:${PORTSDIR}/audio/artswrapper
 .endif
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index a1ad17ecaaad..7a5b5d02fcce 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdebase-3.3.2.tar.bz2) = edbd721a2a4970977dfe5f45d9e38923
-SIZE (KDE/kdebase-3.3.2.tar.bz2) = 19995043
+MD5 (KDE/kdebase-3.4.0.tar.bz2) = c88659e558ca98dc45377bf8ddfc26c9
+SIZE (KDE/kdebase-3.4.0.tar.bz2) = 22670772
diff --git a/x11/kdebase4/files/patch-kcontrol-nics-nic.cpp b/x11/kdebase4/files/patch-kcontrol-nics-nic.cpp
deleted file mode 100644
index e11c3de5032a..000000000000
--- a/x11/kdebase4/files/patch-kcontrol-nics-nic.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
---- kcontrol/nics/nic.cpp	15 Nov 2003 22:01:05 -0000	1.24
-+++ kcontrol/nics/nic.cpp	21 Jan 2004 13:38:46 -0000
-@@ -229,9 +229,14 @@ NICList* findNICs()
-       tmp->addr = buf;
- 
-       if (ifa->ifa_netmask != NULL) {
-+#ifdef Q_OS_FREEBSD
-+	struct sockaddr_in *sinptr = (struct sockaddr_in *)ifa->ifa_netmask;
-+	tmp->netmask=inet_ntoa(sinptr->sin_addr);
-+#else
- 	bzero(buf, 128);
- 	getnameinfo(ifa->ifa_netmask, ifa->ifa_netmask->sa_len, buf, 127, 0, 0, NI_NUMERICHOST);
- 	tmp->netmask = buf;
-+#endif
-       }
- 
-       if (ifa->ifa_flags & IFF_UP)
diff --git a/x11/kdebase4/files/patch-kcontrol_konq_previews.cpp b/x11/kdebase4/files/patch-kcontrol_konq_previews.cpp
deleted file mode 100644
index 7fe3246c2149..000000000000
--- a/x11/kdebase4/files/patch-kcontrol_konq_previews.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- kcontrol/konq/previews.cpp.orig	Sun Oct 26 11:46:25 2003
-+++ kcontrol/konq/previews.cpp	Thu Jan 27 10:16:32 2005
-@@ -153,6 +153,11 @@
- 
-     for ( ; it.current() ; ++it ) {
-         QString protocol( it.current()->text() );
-+        if ( ( protocol == "file" ) && ( !group.hasKey ( protocol ) ) ) 
-+          // file should be enabled in case is not defined because if not so 
-+          // than preview's lost when size is changed from default one 
-+          it.current()->setOn( true ); 
-+        else 
-         it.current()->setOn( group.readBoolEntry( protocol, false ) );
-     }
-     // config key is in bytes (default value 1MB), numinput is in MB
diff --git a/x11/kdebase4/files/patch-kdm-backend-xdmcp.c b/x11/kdebase4/files/patch-kdm-backend-xdmcp.c
deleted file mode 100644
index be29ec4d3416..000000000000
--- a/x11/kdebase4/files/patch-kdm-backend-xdmcp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/backend/xdmcp.c.orig	Wed May  8 14:21:31 2002
-+++ kdm/backend/xdmcp.c	Wed Jun 26 20:14:02 2002
-@@ -1012,7 +1012,7 @@
- 
-     sprintf (buf, "Session %ld failed for display %.260s: %s",
- 	     (long) sessionID, name, reason);
--    Debug ("send_failed(%\"s)\n", buf);
-+    Debug ("send_failed(\"%s\")\n", buf);
-     status.length = strlen (buf);
-     status.data = (CARD8Ptr) buf;
-     header.version = XDM_PROTOCOL_VERSION;
diff --git a/x11/kdebase4/files/patch-kdm-kfrontend-config.def b/x11/kdebase4/files/patch-kdm-kfrontend-config.def
deleted file mode 100644
index 3776abd3beae..000000000000
--- a/x11/kdebase4/files/patch-kdm-kfrontend-config.def
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdm/kfrontend/config.def.orig	Thu Nov 11 20:47:50 2004
-+++ kdm/kfrontend/config.def	Thu Nov 11 20:51:18 2004
-@@ -10,7 +10,7 @@
- # define HALT_CMD	"/usr/sbin/shutdown -h now"
- # define REBOOT_CMD	"/usr/sbin/shutdown -r now"
- #elif defined(BSD)
--# define HALT_CMD	"/sbin/shutdown -h now"
-+# define HALT_CMD	"/sbin/shutdown -p now"
- # define REBOOT_CMD	"/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD	"/usr/sbin/halt"
diff --git a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
index 4a3ac236fe1d..a6126b314d8e 100644
--- a/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
+++ b/x11/kdebase4/files/patch-kdm-kfrontend-genkdmconf.c
@@ -1,6 +1,6 @@
---- kdm/kfrontend/genkdmconf.c.orig	Sun Nov 28 18:26:14 2004
-+++ kdm/kfrontend/genkdmconf.c	Thu Dec  2 00:41:46 2004
-@@ -578,7 +578,7 @@
+--- kdm/kfrontend/genkdmconf.c.orig	Wed Feb 23 12:26:01 2005
++++ kdm/kfrontend/genkdmconf.c	Sat Mar 19 16:43:49 2005
+@@ -562,7 +562,7 @@
  "# by Xsetup usually.\n"
  "# This is not required if you use PAM with the pam_console module.\n"
  "#\n"
@@ -9,7 +9,7 @@
  "\n"
  #ifdef _AIX
  "# We create a pseudodevice for finger.  (host:0 becomes xdm/host_0)\n"
-@@ -619,8 +619,8 @@
+@@ -591,8 +591,8 @@
  "# Reassign ownership of the console to root, this should disallow\n"
  "# assignment of console output to any random users's xterm. See Xstartup.\n"
  "#\n"
@@ -19,8 +19,17 @@
 +/* "#chmod 622 /dev/console\n" */
  "\n"
  #ifdef _AIX
- "if [ -f /usr/lib/X11/xdm/sessreg ]; then\n"
-@@ -667,7 +667,9 @@
+ "#devname=`echo $DISPLAY | cut -c1-8`\n"
+@@ -609,6 +609,8 @@
+ "#! /bin/sh\n"
+ "# Xsession - run as user\n"
+ "\n"
++"session=$1\n"
++"\n"
+ "# Note that the respective logout scripts are not sourced.\n"
+ "case $SHELL in\n"
+ "  */bash)\n"
+@@ -637,7 +639,9 @@
  "  */csh|*/tcsh)\n"
  "    # [t]cshrc is always sourced automatically.\n"
  "    # Note that sourcing csh.login after .cshrc is non-standard.\n"
@@ -31,3 +40,232 @@
  "    ;;\n"
  "  *) # Plain sh, ksh, and anything we don't know.\n"
  "    [ -f /etc/profile ] && . /etc/profile\n"
+@@ -648,7 +652,7 @@
+ "[ -f /etc/xprofile ] && . /etc/xprofile\n"
+ "[ -f $HOME/.xprofile ] && . $HOME/.xprofile\n"
+ "\n"
+-"case $1 in\n"
++"case $session in\n"
+ "  \"\")\n"
+ "    exec xmessage -center -buttons OK:0 -default OK \"Sorry, $DESKTOP_SESSION is no valid session.\"\n"
+ "    ;;\n"
+@@ -662,10 +666,10 @@
+ "    exec " KDE_BINDIR "/startkde\n"
+ "    ;;\n"
+ "  *)\n"
+-"    eval exec \"$1\"\n"
++"    eval exec \"$session\"\n"
+ "    ;;\n"
+ "esac\n"
+-"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $1. Check $DESKTOP_SESSION.desktop.\"\n";
++"exec xmessage -center -buttons OK:0 -default OK \"Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop.\"\n";
+ 
+ static const char def_background[] =
+ "[Desktop0]\n"
+@@ -817,7 +821,7 @@
+  * XXX this stuff is highly borked. it does not handle collisions at all.
+  */
+ static int
+-copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File *, char **, int * ) )
++copyfile( Entry *ce, const char *tname, int mode, int (*proc)( File * ) )
+ {
+ 	const char *tptr;
+ 	char *nname;
+@@ -840,12 +844,7 @@
+ 		fprintf( stderr, "Warning: cannot copy file %s\n", ce->value );
+ 		rt = 0;
+ 	} else {
+-		char *nbuf;
+-		int nlen;
+-
+-		if (!proc || !proc( &file, &nbuf, &nlen ) ||
+-		    (nlen == file.eof - file.buf && !memcmp( nbuf, file.buf, nlen )))
+-		{
++		if (!proc || !proc( &file )) {
+ 			if (!use_destdir && !strcmp( ce->value, nname ))
+ 				linkedFile( nname );
+ 			else {
+@@ -855,7 +854,7 @@
+ 				copiedFile( ce->value );
+ 			}
+ 		} else {
+-			WriteOut( nname, mode, 0, nbuf, nlen );
++			WriteOut( nname, mode, 0, file.buf, file.eof - file.buf );
+ 			editedFile( ce->value );
+ 		}
+ 		if (strcmp( ce->value, nname ) && inNewDir( ce->value ) && !use_destdir)
+@@ -1378,7 +1377,7 @@
+ 
+ /*
+ static int
+-edit_resources(File *file, char **nbuf, int *nlen)
++edit_resources( File *file )
+ {
+ 	// XXX remove any login*, chooser*, ... resources
+ 	return 0;
+@@ -1415,15 +1414,14 @@
+ 				paap = pap += 2;
+ 				while (!isspace( *pap ))
+ 					pap++;
+-				for (;;) {
+-					if (*pp++ != '/')
+-						goto no;
+-					for (bpp = pp; *pp != '/'; pp++)
+-						if (isspace( *pp ))
++				if (*pp != '/')
++					break;
++				for (;;)
++					for (bpp = ++pp; *pp != '/'; pp++)
++						if (!*pp || isspace( *pp ))
+ 							goto wbrk;
+-				}
+ 			  wbrk:
+-				if (memcmp( bpp, paap, pap - paap ))
++				if ((pp - bpp != pap - paap) || memcmp( bpp, paap, pap - paap ))
+ 					break;
+ 			} else if (*pap == '\t') {
+ 				pap++;
+@@ -1472,24 +1470,25 @@
+ static int mod_usebg;
+ 
+ static int
+-edit_setup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_setup( File *file )
+ {
+-	putval( "UseBackground",
+-	        (delstr( file, "\n"
+-	                 "(\n"
+-	                 "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-	                 "  */kdmdesktop\t&\n"
+-	                 "  echo $! >$PIDFILE\n"
+-	                 "  wait $!\n"
+-	                 "  rm $PIDFILE\n"
+-	                 ")\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "*/kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\t&\n" ) ||
+-	         delstr( file, "\n"
+-	                 "kdmdesktop\n" )) ? "true" : "false" );
+-	return 0;
++	int chg =
++		delstr( file, "\n"
++		        "(\n"
++		        "  PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++		        "  */kdmdesktop\t&\n"
++		        "  echo $! >$PIDFILE\n"
++		        "  wait $!\n"
++		        "  rm $PIDFILE\n"
++		        ")\t&\n" ) |
++		delstr( file, "\n"
++		        "*/kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\t&\n" ) |
++		delstr( file, "\n"
++		        "kdmdesktop\n" );
++	putval( "UseBackground", chg ? "true" : "false" );
++	return chg;
+ }
+ 
+ static void
+@@ -1515,19 +1514,22 @@
+ }
+ 
+ static int
+-edit_startup( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_startup( File *file )
+ {
++	int chg1 = 0, chg2 = 0;
++
+ 	if (mod_usebg &&
+-	    !delstr( file, "\n"
++	    (delstr( file, "\n"
+ 	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+ 	             "if [[] -f $PIDFILE ] ; then\n"
+ 	             "	   kill `cat $PIDFILE`\n"
+-	             "fi\n" ))
+-		delstr( file, "\n"
+-		        "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
+-		        "test -f $PIDFILE && kill `cat $PIDFILE`\n" );
+-	if (oldver < 0x0203)
+-		putval( "UseSessReg", (
++	             "fi\n" ) ||
++	     delstr( file, "\n"
++	             "PIDFILE=/var/run/kdmdesktop-$DISPLAY.pid\n"
++	             "test -f $PIDFILE && kill `cat $PIDFILE`\n" )))
++		chg1 = 1;
++	if (oldver < 0x0203) {
++		chg2 = 
+ #ifdef _AIX
+ 			delstr( file, "\n"
+ "# We create a pseudodevice for finger.  (host:0 becomes [kx]dm/host_0)\n" );
+@@ -1552,11 +1554,11 @@
+ "  else\n"
+ "    exec /usr/lib/X11/xdm/sessreg -a -l [kx]dm/$devname -h $hostname $USER\n"
+ "  fi\n"
+-"fi\n") ||
++"fi\n") |
+ #else
+ # ifdef BSD
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) ||
++"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+ 			delstr( file, "\n"
+@@ -1564,11 +1566,12 @@
+ #ifdef BSD
+ " -x */Xservers"
+ #endif
+-" $USER\n" ) ||
++" $USER\n" ) |
+ 			delstr( file, "\n"
+-"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" )
+-		 ) ? "true" : "false");
+-	return 0;
++"exec sessreg -a -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
++		putval( "UseSessReg", chg2 ? "true" : "false");
++	}
++	return chg1 | chg2;
+ }
+ 
+ static void
+@@ -1592,29 +1595,29 @@
+ }
+ 
+ static int
+-edit_reset( File *file, char **nbuf ATTR_UNUSED, int *nlen ATTR_UNUSED )
++edit_reset( File *file )
+ {
++	return
+ #ifdef _AIX
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "if [[] -f /usr/lib/X11/xdm/sessreg ]; then\n"
+ "  devname=`echo $DISPLAY | /usr/bin/sed -e 's/[[]:\\.]/_/g' | /usr/bin/cut -c1-8`\n"
+ "  exec /usr/lib/X11/xdm/sessreg -d -l [kx]dm/$devname $USER\n"
+-"fi\n" );
++"fi\n" ) |
+ #else
+ # ifdef BSD
+-	delstr( file, "\n"
+-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" );
++		delstr( file, "\n"
++"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) |
+ # endif
+ #endif /* _AIX */
+-	delstr( file, "\n"
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY"
+ # ifdef BSD
+ " -x */Xservers"
+ # endif
+-" $USER\n" );
+-	delstr( file, "\n"
++" $USER\n" ) |
++		delstr( file, "\n"
+ "exec sessreg -d -l $DISPLAY -u /var/run/utmp -x */Xservers $USER\n" );
+-	return 0;
+ }
+ 
+ static void
diff --git a/x11/kdebase4/files/patch-konsole-konsole-konsole.cpp b/x11/kdebase4/files/patch-konsole-konsole-konsole.cpp
deleted file mode 100644
index 553c411983a7..000000000000
--- a/x11/kdebase4/files/patch-konsole-konsole-konsole.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- konsole/konsole/konsole.cpp	16 Nov 2004 16:46:00 -0000	1.472.2.6
-+++ konsole/konsole/konsole.cpp	1 Dec 2004 17:05:30 -0000	1.472.2.7
-@@ -2381,11 +2381,11 @@ void Konsole::addSession(TESession* s)
-     createSessionTab(te, SmallIconSet(s->IconName()), newTitle);
-     setSchema(s->schemaNo());
-     tabwidget->setCurrentPage(tabwidget->count()-1);
--      disableMasterModeConnections(); // no duplicate connections, remove old
--      enableMasterModeConnections();
--    }
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    disableMasterModeConnections(); // no duplicate connections, remove old
-+    enableMasterModeConnections();
-+    if(m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+  }
- }
- 
- QString Konsole::currentSession()
-@@ -2827,8 +2827,8 @@ void Konsole::doneSession(TESession* s)
-       rootxpms.remove(s->widget());
-     }
-     delete s->widget();
--    if( tabwidget )
--    m_removeSessionButton->setEnabled(tabwidget->count()>1);
-+    if (m_removeSessionButton)
-+      m_removeSessionButton->setEnabled(tabwidget->count()>1);
-   }
-   session2action.remove(s);
-   action2session.remove(ra);
diff --git a/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp b/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp
new file mode 100644
index 000000000000..55eed7247922
--- /dev/null
+++ b/x11/kdebase4/files/patch-nsplugins-pluginscan.cpp
@@ -0,0 +1,10 @@
+--- nsplugins/pluginscan.cpp.orig	Sat Mar 13 21:07:58 2004
++++ nsplugins/pluginscan.cpp	Sat Mar 13 21:08:50 2004
+@@ -457,6 +457,7 @@
+ 	paths.append("/usr/lib64/netscape/plugins");
+ 	paths.append("/usr/lib64/mozilla/plugins");
+         paths.append("$MOZILLA_HOME/plugins");
++	paths.append("/usr/local/lib/linux-flashplugin6");
+         config->writeEntry( "scanPaths", paths );
+     }
+ 
diff --git a/x11/kdebase4/files/patch-post-3.3.2-kdebase-htmlframes2 b/x11/kdebase4/files/patch-post-3.3.2-kdebase-htmlframes2
deleted file mode 100644
index f31b6341cf9c..000000000000
--- a/x11/kdebase4/files/patch-post-3.3.2-kdebase-htmlframes2
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: konq_mainwindow.cc
-===================================================================
-RCS file: /home/kde/kdebase/konqueror/konq_mainwindow.cc,v
-retrieving revision 1.1342.2.14
-diff -u -p -r1.1342.2.14 konq_mainwindow.cc
---- konqueror/konq_mainwindow.cc	24 Nov 2004 18:29:51 -0000	1.1342.2.14
-+++ konqueror/konq_mainwindow.cc	12 Dec 2004 15:54:46 -0000
-@@ -2252,6 +2252,17 @@ KonqView * KonqMainWindow::childView( KP
-     QString viewName = view->viewName();
-     kdDebug() << "       - viewName=" << viewName << "   "
-               << "frame names:" << view->frameNames().join( "," ) << endl;
-+
-+    // First look for a hostextension containing this frame name
-+    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
-+    if ( ext )
-+    {
-+      ext = ext->findFrameParent(callingPart, name);
-+      kdDebug() << "BrowserHostExtension found part " << ext << endl;
-+      if (!ext)
-+         continue; // Don't use this window
-+    }
-+
-     if ( !viewName.isEmpty() && viewName == name )
-     {
-       kdDebug() << "found existing view by name: " << view << endl;
-@@ -2262,13 +2273,6 @@ KonqView * KonqMainWindow::childView( KP
-       return view;
-     }
- 
--    // First look for a hostextension containing this frame name
--    KParts::BrowserHostExtension *ext = KParts::BrowserHostExtension::childObject( view->part() );
--    if ( ext )
--    {
--      ext = ext->findFrameParent(callingPart, name);
--    }
--
- //    KParts::BrowserHostExtension* ext = KonqView::hostExtension( view->part(), name );
- 
-     if ( ext )
diff --git a/x11/kdebase4/pkg-plist b/x11/kdebase4/pkg-plist
index 61e591e3cd68..1dabe06f9d62 100644
--- a/x11/kdebase4/pkg-plist
+++ b/x11/kdebase4/pkg-plist
@@ -4,11 +4,13 @@ bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kasbar
 bin/kate
 bin/kblankscrn.kss
+bin/kbookmarkmerger
 bin/kcheckpass
+bin/kcheckrunning
 bin/kcminit
-bin/kcmshell
 bin/kcontrol
 bin/kcontroledit
 bin/kdcop
@@ -32,16 +34,21 @@ bin/kfind
 bin/kfmclient
 bin/kfontinst
 bin/kfontview
+bin/khc_docbookdig.pl
+bin/khc_htdig.pl
+bin/khc_htsearch.pl
 bin/khc_indexbuilder
+bin/khc_mansearch.pl
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
 bin/kinfocenter
-bin/kio_devices_mounthelper
+bin/kio_media_mounthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
 bin/kmenuedit
+bin/knetattach
 bin/konqueror
 bin/konsole
 bin/kpager
@@ -56,11 +63,13 @@ bin/kreadconfig
 bin/krootimage
 bin/ksmserver
 bin/ksplash
+bin/ksplashsimple
 bin/kstart
 bin/ksysguard
 bin/ksysguardd
 bin/ksystraycmd
 bin/ktip
+bin/ktrash
 bin/kwebdesktop
 bin/kwin
 bin/kwin_killer_helper
@@ -68,6 +77,8 @@ bin/kwin_rules_dialog
 bin/kwrite
 bin/kwriteconfig
 bin/kxkb
+bin/nspluginscan
+bin/nspluginviewer
 bin/startkde
 etc/ksysguarddrc
 etc/rc.d/genkdmconf.sh
@@ -107,6 +118,7 @@ include/konq_dirpart.h
 include/konq_drag.h
 include/konq_events.h
 include/konq_faviconmgr.h
+include/konq_filetip.h
 include/konq_historycomm.h
 include/konq_historymgr.h
 include/konq_iconviewwidget.h
@@ -119,7 +131,6 @@ include/konq_undo.h
 include/konq_xmlguiclient.h
 include/konqbookmarkmanager.h
 include/konqsidebarplugin.h
-include/ksgrd/ColorPicker.h
 include/ksgrd/HostConnector.h
 include/ksgrd/SensorAgent.h
 include/ksgrd/SensorClient.h
@@ -135,22 +146,22 @@ include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
+include/libkonq_export.h
 lib/kconf_update_bin/khotkeys_update
+lib/kconf_update_bin/kicker-3.4-reverseLayout
 lib/kconf_update_bin/kwin_update_window_settings
 lib/kde3/appletproxy.la
 lib/kde3/appletproxy.so
-lib/kde3/childpanel_panelextension.la
-lib/kde3/childpanel_panelextension.so
 lib/kde3/clock_panelapplet.la
 lib/kde3/clock_panelapplet.so
 lib/kde3/cursorthumbnail.la
 lib/kde3/cursorthumbnail.so
-lib/kde3/devices_panelapplet.la
-lib/kde3/devices_panelapplet.so
 lib/kde3/djvuthumbnail.la
 lib/kde3/djvuthumbnail.so
 lib/kde3/dockbar_panelextension.la
 lib/kde3/dockbar_panelextension.so
+lib/kde3/exrthumbnail.la
+lib/kde3/exrthumbnail.so
 lib/kde3/extensionproxy.la
 lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
@@ -211,6 +222,8 @@ lib/kde3/kcm_kded.la
 lib/kde3/kcm_kded.so
 lib/kde3/kcm_kdm.la
 lib/kde3/kcm_kdm.so
+lib/kde3/kcm_kdnssd.la
+lib/kde3/kcm_kdnssd.so
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keyboard.so
 lib/kde3/kcm_keys.la
@@ -247,6 +260,8 @@ lib/kde3/kcm_locale.la
 lib/kde3/kcm_locale.so
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
 lib/kde3/kcm_performance.la
 lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
@@ -267,36 +282,48 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
+lib/kde3/kcm_usb.la
+lib/kde3/kcm_usb.so
 lib/kde3/kcm_useraccount.la
 lib/kde3/kcm_useraccount.so
 lib/kde3/kcm_xinerama.la
 lib/kde3/kcm_xinerama.so
 lib/kde3/kcminit.la
 lib/kde3/kcminit.so
-lib/kde3/kcmshell.la
-lib/kde3/kcmshell.so
 lib/kde3/kcontrol.la
 lib/kde3/kcontrol.so
 lib/kde3/kcontroledit.la
 lib/kde3/kcontroledit.so
 lib/kde3/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_khotkeys.la
+lib/kde3/kded_khotkeys.so
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_kwrited.so
-lib/kde3/kded_mountwatcher.la
-lib/kde3/kded_mountwatcher.so
+lib/kde3/kded_mediamanager.la
+lib/kde3/kded_mediamanager.so
+lib/kde3/kded_remotedirnotify.la
+lib/kde3/kded_remotedirnotify.so
+lib/kde3/kded_systemdirnotify.la
+lib/kde3/kded_systemdirnotify.so
 lib/kde3/kdesktop.la
 lib/kde3/kdesktop.so
 lib/kde3/keditbookmarks.la
 lib/kde3/keditbookmarks.so
 lib/kde3/kfile_font.la
 lib/kde3/kfile_font.so
+lib/kde3/kfile_media.la
+lib/kde3/kfile_media.so
+lib/kde3/kfile_trash.la
+lib/kde3/kfile_trash.so
 lib/kde3/kfmclient.la
 lib/kde3/kfmclient.so
 lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_classic.so
+lib/kde3/kgreet_winbind.la
+lib/kde3/kgreet_winbind.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
 lib/kde3/khotkeys.la
@@ -315,12 +342,14 @@ lib/kde3/kickermenu_prefmenu.la
 lib/kde3/kickermenu_prefmenu.so
 lib/kde3/kickermenu_recentdocs.la
 lib/kde3/kickermenu_recentdocs.so
+lib/kde3/kickermenu_remotemenu.la
+lib/kde3/kickermenu_remotemenu.so
+lib/kde3/kickermenu_systemmenu.la
+lib/kde3/kickermenu_systemmenu.so
 lib/kde3/kio_about.la
 lib/kde3/kio_about.so
 lib/kde3/kio_cgi.la
 lib/kde3/kio_cgi.so
-lib/kde3/kio_devices.la
-lib/kde3/kio_devices.so
 lib/kde3/kio_filter.la
 lib/kde3/kio_filter.so
 lib/kde3/kio_finger.la
@@ -331,8 +360,6 @@ lib/kde3/kio_floppy.la
 lib/kde3/kio_floppy.so
 lib/kde3/kio_fonts.la
 lib/kde3/kio_fonts.so
-lib/kde3/kio_imap4.la
-lib/kde3/kio_imap4.so
 lib/kde3/kio_info.la
 lib/kde3/kio_info.so
 lib/kde3/kio_ldap.la
@@ -341,6 +368,8 @@ lib/kde3/kio_mac.la
 lib/kde3/kio_mac.so
 lib/kde3/kio_man.la
 lib/kde3/kio_man.so
+lib/kde3/kio_media.la
+lib/kde3/kio_media.so
 lib/kde3/kio_nfs.la
 lib/kde3/kio_nfs.so
 lib/kde3/kio_nntp.la
@@ -349,6 +378,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_remote.la
+lib/kde3/kio_remote.so
 lib/kde3/kio_settings.la
 lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
@@ -357,10 +388,14 @@ lib/kde3/kio_smb.la
 lib/kde3/kio_smb.so
 lib/kde3/kio_smtp.la
 lib/kde3/kio_smtp.so
+lib/kde3/kio_system.la
+lib/kde3/kio_system.so
 lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
+lib/kde3/kio_trash.la
+lib/kde3/kio_trash.so
 lib/kde3/kjobviewer.la
 lib/kde3/kjobviewer.so
 lib/kde3/klipper.la
@@ -423,6 +458,8 @@ lib/kde3/kwin3_laptop.la
 lib/kde3/kwin3_laptop.so
 lib/kde3/kwin3_modernsys.la
 lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_plastik.la
+lib/kde3/kwin3_plastik.so
 lib/kde3/kwin3_quartz.la
 lib/kde3/kwin3_quartz.so
 lib/kde3/kwin3_redmond.la
@@ -437,6 +474,8 @@ lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
+lib/kde3/kwin_plastik_config.la
+lib/kde3/kwin_plastik_config.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
 lib/kde3/kwin_rules_dialog.la
@@ -453,6 +492,8 @@ lib/kde3/libkfindpart.la
 lib/kde3/libkfindpart.so
 lib/kde3/libkfontviewpart.la
 lib/kde3/libkfontviewpart.so
+lib/kde3/libkhtmlkttsdplugin.la
+lib/kde3/libkhtmlkttsdplugin.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -465,8 +506,12 @@ lib/kde3/libkurisearchfilter.la
 lib/kde3/libkurisearchfilter.so
 lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/media_panelapplet.la
+lib/kde3/media_panelapplet.so
 lib/kde3/menu_panelapplet.la
 lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
@@ -489,6 +534,11 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
+lib/kde3/trash_panelapplet.la
+lib/kde3/trash_panelapplet.so
+lib/libkasbar.la
+lib/libkasbar.so
+lib/libkasbar.so.1
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
 lib/libkateinterfaces.so.0
@@ -508,8 +558,6 @@ lib/libkdeinit_kate.la
 lib/libkdeinit_kate.so
 lib/libkdeinit_kcminit.la
 lib/libkdeinit_kcminit.so
-lib/libkdeinit_kcmshell.la
-lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kcontrol.la
 lib/libkdeinit_kcontrol.so
 lib/libkdeinit_kcontroledit.la
@@ -604,6 +652,7 @@ share/applications/kde/ioports.desktop
 share/applications/kde/ioslaveinfo.desktop
 share/applications/kde/kappfinder.desktop
 share/applications/kde/kate.desktop
+share/applications/kde/kcm_kdnssd.desktop
 share/applications/kde/kcm_useraccount.desktop
 share/applications/kde/kcmaccess.desktop
 share/applications/kde/kcmcgi.desktop
@@ -617,6 +666,7 @@ share/applications/kde/kcmnotify.desktop
 share/applications/kde/kcmperformance.desktop
 share/applications/kde/kcmsmserver.desktop
 share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kcmusb.desktop
 share/applications/kde/kdepasswd.desktop
 share/applications/kde/kdeprintfax.desktop
 share/applications/kde/kdm.desktop
@@ -632,9 +682,12 @@ share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
+share/applications/kde/khtml_plugins.desktop
+share/applications/kde/kinfocenter.desktop
 share/applications/kde/kjobviewer.desktop
 share/applications/kde/klipper.desktop
 share/applications/kde/kmenuedit.desktop
+share/applications/kde/knetattach.desktop
 share/applications/kde/konqbrowser.desktop
 share/applications/kde/konquerorsu.desktop
 share/applications/kde/konsole.desktop
@@ -656,6 +709,7 @@ share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
 share/applications/kde/nic.desktop
+share/applications/kde/opengl.desktop
 share/applications/kde/panel.desktop
 share/applications/kde/panel_appearance.desktop
 share/applications/kde/partitions.desktop
@@ -672,6 +726,7 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/applnk/.hidden/.directory
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -692,6 +747,7 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
+share/applnk/.hidden/kwintranslucency.desktop
 share/applnk/.hidden/passwords.desktop
 share/applnk/.hidden/power.desktop
 share/applnk/.hidden/randr.desktop
@@ -701,7 +757,6 @@ share/applnk/.hidden/userinfo.desktop
 share/applnk/.hidden/virtualdesktops.desktop
 share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/KControl.desktop
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
@@ -713,7 +768,6 @@ share/applnk/Settingsmenu/printmgr.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
 share/applnk/System/kpersonalizer.desktop
 share/applnk/Toys/ktip.desktop
@@ -800,6 +854,7 @@ share/apps/kappfinder/apps/Graphics/blender.desktop
 share/apps/kappfinder/apps/Graphics/ghostview.desktop
 share/apps/kappfinder/apps/Graphics/gimp.desktop
 share/apps/kappfinder/apps/Graphics/gv.desktop
+share/apps/kappfinder/apps/Graphics/inkscape.desktop
 share/apps/kappfinder/apps/Graphics/sodipodi.desktop
 share/apps/kappfinder/apps/Graphics/tgif.desktop
 share/apps/kappfinder/apps/Graphics/xdvi.desktop
@@ -952,9 +1007,11 @@ share/apps/kate/icons/locolor/22x22/actions/indent.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
 share/apps/kate/plugins/katedefaultproject/ui.rc
+share/apps/kate/plugins/katekttsd/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
 share/apps/kate/tips
+share/apps/katepart/kpartplugins/katepartkttsd.rc
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_browser.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -973,9 +1030,11 @@ share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
 share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
+share/apps/kcmusb/usb.ids
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
+share/apps/kconf_update/kate-2.4.upd
 share/apps/kconf_update/kcmdisplayrc.upd
 share/apps/kconf_update/kfmclient_3_2.upd
 share/apps/kconf_update/kfmclient_3_2_update.sh
@@ -986,6 +1045,7 @@ share/apps/kconf_update/klipper-1-2.pl
 share/apps/kconf_update/klipper-kde31.sh
 share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
+share/apps/kconf_update/konqsidebartng.upd
 share/apps/kconf_update/konqueror_gestures_kde321_update.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
@@ -995,14 +1055,20 @@ share/apps/kconf_update/kwin3_plugin.pl
 share/apps/kconf_update/kwin3_plugin.upd
 share/apps/kconf_update/kwin_focus1.sh
 share/apps/kconf_update/kwin_focus1.upd
+share/apps/kconf_update/kwin_focus2.sh
+share/apps/kconf_update/kwin_focus2.upd
 share/apps/kconf_update/kwiniconify.upd
 share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/kwinupdatewindowsettings.upd
 share/apps/kconf_update/move_favicons.sh
+share/apps/kconf_update/move_konqsidebartng_entries.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
 share/apps/kconf_update/schemaStrip.pl
 share/apps/kconf_update/socks.upd
+share/apps/kcontrol/about/kcontrol.css
+share/apps/kcontrol/about/main.html
+share/apps/kcontrol/about/top-right-kcontrol.png
 share/apps/kcontrol/kcontrolui.rc
 share/apps/kcontrol/pics/energybig.png
 share/apps/kcontrol/pics/lo-energy.png
@@ -1011,9 +1077,6 @@ share/apps/kcontrol/pics/mini-world.png
 share/apps/kcontrol/pics/monitor.png
 share/apps/kcontrol/pics/onlyone.png
 share/apps/kcontrol/pics/overlapping.png
-share/apps/kcontrol/pics/part1.png
-share/apps/kcontrol/pics/part2.png
-share/apps/kcontrol/pics/part3.png
 share/apps/kcontrol/pics/play.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new.png
 share/apps/kcontroledit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1022,25 +1085,42 @@ share/apps/kcontroledit/icons/crystalsvg/32x32/actions/menu_new_sep.png
 share/apps/kcontroledit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kcontroledit/kcontroleditui.rc
 share/apps/kdcop/kdcopui.rc
-share/apps/kdeprint/template/background.png
+share/apps/kdeprint/template/bar-bottom-left.png
+share/apps/kdeprint/template/bar-bottom-middle.png
+share/apps/kdeprint/template/bar-bottom-right.png
+share/apps/kdeprint/template/bar-middle-left.png
+share/apps/kdeprint/template/bar-middle-right.png
+share/apps/kdeprint/template/bar-top-left.png
+share/apps/kdeprint/template/bar-top-middle.png
+share/apps/kdeprint/template/bar-top-right.png
+share/apps/kdeprint/template/bottom-left.png
+share/apps/kdeprint/template/bottom-middle.png
+share/apps/kdeprint/template/bottom-right.png
+share/apps/kdeprint/template/box-bottom-left.png
+share/apps/kdeprint/template/box-bottom-middle.png
+share/apps/kdeprint/template/box-bottom-right.png
+share/apps/kdeprint/template/box-centre-kdeprint.png
+share/apps/kdeprint/template/box-middle-left.png
+share/apps/kdeprint/template/box-middle-right.png
+share/apps/kdeprint/template/box-top-left.png
+share/apps/kdeprint/template/box-top-middle.png
+share/apps/kdeprint/template/box-top-right.png
 share/apps/kdeprint/template/class.template
 share/apps/kdeprint/template/driver.template
 share/apps/kdeprint/template/htmlstyles.css
 share/apps/kdeprint/template/jobs.template
-share/apps/kdeprint/template/kdelogo2.png
-share/apps/kdeprint/template/kdeprint.png
-share/apps/kdeprint/template/lines.png
-share/apps/kdeprint/template/lines2.png
-share/apps/kdeprint/template/pointers.png
 share/apps/kdeprint/template/printer.template
 share/apps/kdeprint/template/pseudo.template
-share/apps/kdeprint/template/shadow1.png
+share/apps/kdeprint/template/top-left.png
+share/apps/kdeprint/template/top-middle.png
+share/apps/kdeprint/template/top-right-kdeprint.png
 share/apps/kdeprint_part/kdeprint_part.rc
 share/apps/kdeprintfax/anytops
 share/apps/kdeprintfax/faxfilters
 share/apps/kdeprintfax/icons/crystalsvg/16x16/actions/abentry.png
 share/apps/kdeprintfax/kdeprintfaxui.rc
 share/apps/kdesktop/DesktopLinks/Home.desktop
+share/apps/kdesktop/DesktopLinks/System.desktop
 share/apps/kdesktop/directory.autostart
 share/apps/kdesktop/directory.desktop
 share/apps/kdesktop/directory.templates
@@ -1117,8 +1197,9 @@ share/apps/kdisplay/color-schemes/Windows2000.kcsrc
 share/apps/kdisplay/color-schemes/Windows95.kcsrc
 share/apps/kdisplay/color-schemes/WindowsXP.kcsrc
 share/apps/kdisplay/color-schemes/YellowOnBlue.kcsrc
-share/apps/kdm/pics/kdeflower.png
+share/apps/kdm/pics/kdelogo-crystal.png
 share/apps/kdm/pics/kdelogo.png
+share/apps/kdm/pics/shutdown.jpg
 share/apps/kdm/pics/users/Apple.png
 share/apps/kdm/pics/users/BeachBall.png
 share/apps/kdm/pics/users/Blowfish.png
@@ -1197,6 +1278,13 @@ share/apps/kdm/sessions/wm2.desktop
 share/apps/kdm/sessions/wmaker.desktop
 share/apps/kdm/sessions/xfce.desktop
 share/apps/kdm/sessions/xfce4.desktop
+share/apps/kdm/themes/circles/GdmGreeterTheme.desktop
+share/apps/kdm/themes/circles/background.svg
+share/apps/kdm/themes/circles/circles.xml
+share/apps/kdm/themes/circles/flower.png
+share/apps/kdm/themes/circles/help.png
+share/apps/kdm/themes/circles/options.png
+share/apps/kdm/themes/circles/screenshot.png
 share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
@@ -1207,6 +1295,7 @@ share/apps/kfindpart/icons/locolor/22x22/actions/openfile.png
 share/apps/kfindpart/icons/locolor/22x22/actions/save.png
 share/apps/kfindpart/icons/locolor/22x22/actions/search.png
 share/apps/kfontview/kfontviewpart.rc
+share/apps/kfontview/kfontviewui.rc
 share/apps/khelpcenter/glossary.html.in
 share/apps/khelpcenter/glossary.xslt
 share/apps/khelpcenter/intro.html.in
@@ -1240,14 +1329,20 @@ share/apps/khelpcenter/plugins/links.desktop
 share/apps/khelpcenter/plugins/support.desktop
 share/apps/khelpcenter/plugins/userguide.desktop
 share/apps/khelpcenter/plugins/welcome.desktop
+share/apps/khelpcenter/searchhandlers/docbook.desktop
+share/apps/khelpcenter/searchhandlers/htdig.desktop
+share/apps/khelpcenter/searchhandlers/htdig/htdig_long.html
+share/apps/khelpcenter/searchhandlers/man.desktop
 share/apps/khelpcenter/table-of-contents.xslt
 share/apps/khotkeys/kde32b1.khotkeys
 share/apps/khotkeys/konqueror_gestures_kde321.khotkeys
+share/apps/khtml/kpartplugins/khtmlkttsd.desktop
+share/apps/khtml/kpartplugins/khtmlkttsd.rc
 share/apps/kicker/applets/clockapplet.desktop
-share/apps/kicker/applets/devicesapplet.desktop
 share/apps/kicker/applets/klipper.desktop
 share/apps/kicker/applets/ksysguardapplet.desktop
 share/apps/kicker/applets/lockout.desktop
+share/apps/kicker/applets/mediaapplet.desktop
 share/apps/kicker/applets/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
@@ -1255,6 +1350,7 @@ share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/applets/runapplet.desktop
 share/apps/kicker/applets/systemtrayapplet.desktop
 share/apps/kicker/applets/taskbarapplet.desktop
+share/apps/kicker/applets/trashapplet.desktop
 share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
@@ -1271,6 +1367,8 @@ share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
 share/apps/kicker/menuext/recentdocs.desktop
+share/apps/kicker/menuext/remotemenu.desktop
+share/apps/kicker/menuext/systemmenu.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk10.png
 share/apps/kicker/pics/disk2.png
@@ -1416,14 +1514,12 @@ share/apps/konqsidebartng/dirtree/dirtree_module.desktop
 share/apps/konqsidebartng/dirtree/history_module.desktop
 share/apps/konqsidebartng/entries/.version
 share/apps/konqsidebartng/entries/bookmarks.desktop
-share/apps/konqsidebartng/entries/devices.desktop
 share/apps/konqsidebartng/entries/history.desktop
 share/apps/konqsidebartng/entries/home.desktop
 share/apps/konqsidebartng/entries/remote.desktop
 share/apps/konqsidebartng/entries/root.desktop
 share/apps/konqsidebartng/entries/services.desktop
 share/apps/konqsidebartng/kicker_entries/bookmarks.desktop
-share/apps/konqsidebartng/kicker_entries/devices.desktop
 share/apps/konqsidebartng/kicker_entries/history.desktop
 share/apps/konqsidebartng/kicker_entries/home.desktop
 share/apps/konqsidebartng/kicker_entries/remote.desktop
@@ -1436,35 +1532,25 @@ share/apps/konqsidebartng/virtual_folders/remote/web/.directory
 share/apps/konqsidebartng/virtual_folders/remote/web/apps_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/dot_web.desktop
 share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
+share/apps/konqsidebartng/virtual_folders/remote/web/look_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
+share/apps/konqsidebartng/virtual_folders/services/applications.desktop
 share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
-share/apps/konqsidebartng/virtual_folders/services/devices.desktop
 share/apps/konqsidebartng/virtual_folders/services/fonts.desktop
+share/apps/konqsidebartng/virtual_folders/services/media.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.desktop
+share/apps/konqsidebartng/virtual_folders/services/settings.desktop
 share/apps/konqsidebartng/websidebar/websidebar.html
-share/apps/konqueror/about/background.png
-share/apps/konqueror/about/background_rtl.png
-share/apps/konqueror/about/bgtable.png
-share/apps/konqueror/about/bgtable_rtl.png
+share/apps/konqueror/about/box-centre-konqueror.png
 share/apps/konqueror/about/intro.html
-share/apps/konqueror/about/intro_rtl.html
-share/apps/konqueror/about/kdelogo2.png
 share/apps/konqueror/about/konq.css
-share/apps/konqueror/about/konq_rtl.css
-share/apps/konqueror/about/konqueror.png
-share/apps/konqueror/about/konqueror_rtl.png
+share/apps/konqueror/about/launch.html
 share/apps/konqueror/about/lightning.png
-share/apps/konqueror/about/lines.png
-share/apps/konqueror/about/lines2.png
-share/apps/konqueror/about/more.png
 share/apps/konqueror/about/plugins.html
 share/apps/konqueror/about/plugins_rtl.html
-share/apps/konqueror/about/pointers.gif
-share/apps/konqueror/about/shadow1.png
 share/apps/konqueror/about/specs.html
-share/apps/konqueror/about/specs_rtl.html
 share/apps/konqueror/about/tips.html
-share/apps/konqueror/about/tips_rtl.html
+share/apps/konqueror/about/top-right-konqueror.png
 share/apps/konqueror/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
@@ -1478,7 +1564,6 @@ share/apps/konqueror/pics/arrow_bottomleft.png
 share/apps/konqueror/pics/arrow_bottomright.png
 share/apps/konqueror/pics/arrow_topleft.png
 share/apps/konqueror/pics/arrow_topright.png
-share/apps/konqueror/pics/indicator_anchor.png
 share/apps/konqueror/pics/indicator_connect.png
 share/apps/konqueror/pics/indicator_empty.png
 share/apps/konqueror/pics/indicator_noconnect.png
@@ -1490,23 +1575,13 @@ share/apps/konqueror/profiles/midnightcommander
 share/apps/konqueror/profiles/simplebrowser
 share/apps/konqueror/profiles/tabbedbrowsing
 share/apps/konqueror/profiles/webbrowsing
-share/apps/konqueror/servicemenus/cdrom_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdrom_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/cdwriter_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/dvd_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy5_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/floppy_unmounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/hdd_unmounted_konqy.desktop
 share/apps/konqueror/servicemenus/installfont.desktop
 share/apps/konqueror/servicemenus/kdesktopSetAsBackground.desktop
 share/apps/konqueror/servicemenus/konsolehere.desktop
-share/apps/konqueror/servicemenus/nfs_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/smb_mounted_konqy.desktop
+share/apps/konqueror/servicemenus/media_eject.desktop
+share/apps/konqueror/servicemenus/media_mount.desktop
+share/apps/konqueror/servicemenus/media_safelyremove.desktop
+share/apps/konqueror/servicemenus/media_unmount.desktop
 share/apps/konqueror/servicemenus/text-ada-print.desktop
 share/apps/konqueror/servicemenus/text-c++-print.desktop
 share/apps/konqueror/servicemenus/text-c++h-print.desktop
@@ -1525,8 +1600,6 @@ share/apps/konqueror/servicemenus/text-tcl-print.desktop
 share/apps/konqueror/servicemenus/text-tex-print.desktop
 share/apps/konqueror/servicemenus/text-xml-print.desktop
 share/apps/konqueror/servicemenus/text-xslt-print.desktop
-share/apps/konqueror/servicemenus/zip_mounted_konqy.desktop
-share/apps/konqueror/servicemenus/zip_unmounted_konqy.desktop
 share/apps/konqueror/tiles/bluemorning.png
 share/apps/konqueror/tiles/canvas.png
 share/apps/konqueror/tiles/checker.png
@@ -1573,6 +1646,7 @@ share/apps/konsole/profiles/4shells
 share/apps/konsole/profiles/5shells
 share/apps/konsole/screen.desktop
 share/apps/konsole/shell.desktop
+share/apps/konsole/solaris.keytab
 share/apps/konsole/su.desktop
 share/apps/konsole/sumc.desktop
 share/apps/konsole/syscolor.schema
@@ -1598,9 +1672,12 @@ share/apps/ksplash/Themes/Default/splash_active_bar.png
 share/apps/ksplash/Themes/Default/splash_bottom.png
 share/apps/ksplash/Themes/Default/splash_inactive_bar.png
 share/apps/ksplash/Themes/Default/splash_top.png
+share/apps/ksplash/Themes/None/Theme.rc
 share/apps/ksplash/Themes/Redmond/Background.png
 share/apps/ksplash/Themes/Redmond/Preview.png
 share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Simple/Preview.png
+share/apps/ksplash/Themes/Simple/Theme.rc
 share/apps/ksplash/Themes/Standard/Preview.png
 share/apps/ksplash/Themes/Standard/Theme.rc
 share/apps/ksplash/Themes/blue-bend/Preview.png
@@ -1626,6 +1703,30 @@ share/apps/ksysguard/pics/shell.png
 share/apps/ksysguard/pics/tools.png
 share/apps/ksysguard/pics/unknownapp.png
 share/apps/ksysguard/pics/waiting.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.preview.png
+share/apps/kthememanager/themes/HighContrastDark-big/HighContrastDark-big.xml
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.preview.png
+share/apps/kthememanager/themes/HighContrastDark/HighContrastDark.xml
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.preview.png
+share/apps/kthememanager/themes/HighContrastLight-big/HighContrastLight-big.xml
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.preview.png
+share/apps/kthememanager/themes/HighContrastLight/HighContrastLight.xml
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.preview.png
+share/apps/kthememanager/themes/KDE_Classic/KDE_Classic.xml
+share/apps/kthememanager/themes/Keramik/Keramik.preview.png
+share/apps/kthememanager/themes/Keramik/Keramik.xml
+share/apps/kthememanager/themes/Plastik/Plastik.preview.png
+share/apps/kthememanager/themes/Plastik/Plastik.xml
+share/apps/kthememanager/themes/Platinum/Platinum.preview.png
+share/apps/kthememanager/themes/Platinum/Platinum.xml
+share/apps/kthememanager/themes/Redmond/Redmond.preview.png
+share/apps/kthememanager/themes/Redmond/Redmond.xml
+share/apps/kthememanager/themes/Sunshine/Sunshine.preview.png
+share/apps/kthememanager/themes/Sunshine/Sunshine.xml
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.preview.png
+share/apps/kthememanager/themes/YellowOnBlue-big/YellowOnBlue-big.xml
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.preview.png
+share/apps/kthememanager/themes/YellowOnBlue/YellowOnBlue.xml
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
 share/apps/kwin/keramik.desktop
@@ -1644,12 +1745,20 @@ share/apps/kwin/pics/menu.png
 share/apps/kwin/pics/pindown.png
 share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
+share/apps/kwin/plastik.desktop
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
 share/apps/naughtyapplet/pics/naughty-sad.png
+share/apps/plugin/nspluginpart.rc
+share/apps/remoteview/smb-network.desktop
+share/apps/systemview/home.desktop
+share/apps/systemview/media.desktop
+share/apps/systemview/remote.desktop
+share/apps/systemview/settings.desktop
+share/apps/systemview/trash.desktop
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
@@ -1658,15 +1767,20 @@ share/autostart/ktip.desktop
 share/autostart/panel.desktop
 share/config.kcfg/kcm_useraccount.kcfg
 share/config.kcfg/kcm_useraccount_pass.kcfg
+share/config.kcfg/kdesktop.kcfg
+share/config.kcfg/khelpcenter.kcfg
+share/config.kcfg/klaunch.kcfg
 share/config.kcfg/konqueror.kcfg
+share/config.kcfg/kwebdesktop.kcfg
 share/config.kcfg/kwin.kcfg
+share/config.kcfg/taskbar.kcfg
+share/config/katerc
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
 share/config/klipperrc
 share/config/konqsidebartng.rc
 share/config/kshorturifilterrc
 share/config/kxkb_groups
-share/config/mountwatcher.desktop
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -1689,6 +1803,7 @@ share/desktop-directories/kde-science.directory
 share/desktop-directories/kde-settings-accessibility.directory
 share/desktop-directories/kde-settings-components.directory
 share/desktop-directories/kde-settings-desktop.directory
+share/desktop-directories/kde-settings-hardware.directory
 share/desktop-directories/kde-settings-looknfeel.directory
 share/desktop-directories/kde-settings-network.directory
 share/desktop-directories/kde-settings-peripherals.directory
@@ -1706,6 +1821,7 @@ share/desktop-directories/kde-toys.directory
 share/desktop-directories/kde-unknown.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
+share/doc/HTML/en/kappfinder/man-kappfinder.1.docbook
 share/doc/HTML/en/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1866,6 +1982,9 @@ share/doc/HTML/en/kcontrol/useragent/index.docbook
 share/doc/HTML/en/kcontrol/windowmanagement/common
 share/doc/HTML/en/kcontrol/windowmanagement/index.cache.bz2
 share/doc/HTML/en/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/en/kdcop/common
+share/doc/HTML/en/kdcop/index.cache.bz2
+share/doc/HTML/en/kdcop/index.docbook
 share/doc/HTML/en/kdebase-apidocs/common
 share/doc/HTML/en/kdebugdialog/common
 share/doc/HTML/en/kdebugdialog/index.cache.bz2
@@ -1961,7 +2080,10 @@ share/doc/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/HTML/en/khelpcenter/faq/questions.docbook
+share/doc/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/HTML/en/khelpcenter/faq/tips.docbook
+share/doc/HTML/en/khelpcenter/faq/webbrowse.docbook
 share/doc/HTML/en/khelpcenter/faq/winmng.docbook
 share/doc/HTML/en/khelpcenter/glossary/checkxrefs
 share/doc/HTML/en/khelpcenter/glossary/common
@@ -1982,20 +2104,84 @@ share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/shadow1.png
 share/doc/HTML/en/khelpcenter/support.docbook
-share/doc/HTML/en/khelpcenter/userguide/about-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/a-window.png
+share/doc/HTML/en/khelpcenter/userguide/accessibility.docbook
+share/doc/HTML/en/khelpcenter/userguide/amarok-icon.png
+share/doc/HTML/en/khelpcenter/userguide/amarok.png
+share/doc/HTML/en/khelpcenter/userguide/base-kde-applications.docbook
+share/doc/HTML/en/khelpcenter/userguide/browser-fine-tuning.docbook
+share/doc/HTML/en/khelpcenter/userguide/burning-cds.docbook
 share/doc/HTML/en/khelpcenter/userguide/common
-share/doc/HTML/en/khelpcenter/userguide/first-impressions.docbook
-share/doc/HTML/en/khelpcenter/userguide/getting-started.docbook
-share/doc/HTML/en/khelpcenter/userguide/history.docbook
+share/doc/HTML/en/khelpcenter/userguide/control-center.docbook
+share/doc/HTML/en/khelpcenter/userguide/creating-graphics.docbook
+share/doc/HTML/en/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/en/khelpcenter/userguide/desktop.png
+share/doc/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/HTML/en/khelpcenter/userguide/file-sharing.docbook
+share/doc/HTML/en/khelpcenter/userguide/font-installation.docbook
+share/doc/HTML/en/khelpcenter/userguide/getting-help.docbook
+share/doc/HTML/en/khelpcenter/userguide/glossary.docbook
+share/doc/HTML/en/khelpcenter/userguide/groupware-kontact.docbook
 share/doc/HTML/en/khelpcenter/userguide/index.cache.bz2
 share/doc/HTML/en/khelpcenter/userguide/index.docbook
-share/doc/HTML/en/khelpcenter/userguide/installation.docbook
-share/doc/HTML/en/khelpcenter/userguide/intro.docbook
-share/doc/HTML/en/khelpcenter/userguide/more-help.docbook
-share/doc/HTML/en/khelpcenter/userguide/notices-trademarks.docbook
-share/doc/HTML/en/khelpcenter/userguide/shortcuts.docbook
-share/doc/HTML/en/khelpcenter/userguide/staff.docbook
-share/doc/HTML/en/khelpcenter/userguide/ug-faq.docbook
+share/doc/HTML/en/khelpcenter/userguide/internet-shortcuts.docbook
+share/doc/HTML/en/khelpcenter/userguide/juk-icon.png
+share/doc/HTML/en/khelpcenter/userguide/juk.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle-icon.png
+share/doc/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/HTML/en/khelpcenter/userguide/kcontrol.png
+share/doc/HTML/en/khelpcenter/userguide/kde-as-root.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-for-admins.docbook
+share/doc/HTML/en/khelpcenter/userguide/kde-office.docbook
+share/doc/HTML/en/khelpcenter/userguide/kmag.png
+share/doc/HTML/en/khelpcenter/userguide/kmousetool.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth2.png
+share/doc/HTML/en/khelpcenter/userguide/kmouth3.png
+share/doc/HTML/en/khelpcenter/userguide/knode-identity.png
+share/doc/HTML/en/khelpcenter/userguide/knode-mail-account.png
+share/doc/HTML/en/khelpcenter/userguide/knode-start.png
+share/doc/HTML/en/khelpcenter/userguide/konq-sidebar.png
+share/doc/HTML/en/khelpcenter/userguide/konq-simple.png
+share/doc/HTML/en/khelpcenter/userguide/konsole-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/kopete.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
+share/doc/HTML/en/khelpcenter/userguide/kppp-wizard.png
+share/doc/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
+share/doc/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
+share/doc/HTML/en/khelpcenter/userguide/noatun-icon.png
+share/doc/HTML/en/khelpcenter/userguide/noatun.png
+share/doc/HTML/en/khelpcenter/userguide/oggfolder.png
+share/doc/HTML/en/khelpcenter/userguide/open-file-dialog.png
+share/doc/HTML/en/khelpcenter/userguide/panel-and-desktop.docbook
+share/doc/HTML/en/khelpcenter/userguide/pdf-files.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-audiocds.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-movies.docbook
+share/doc/HTML/en/khelpcenter/userguide/playing-music.docbook
+share/doc/HTML/en/khelpcenter/userguide/printer-setup.docbook
+share/doc/HTML/en/khelpcenter/userguide/printing-from-apps.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-and-documents.docbook
+share/doc/HTML/en/khelpcenter/userguide/programs-controlling.docbook
+share/doc/HTML/en/khelpcenter/userguide/removable-disks.docbook
+share/doc/HTML/en/khelpcenter/userguide/rip.png
+share/doc/HTML/en/khelpcenter/userguide/ripsettings.png
+share/doc/HTML/en/khelpcenter/userguide/screen-captures.docbook
+share/doc/HTML/en/khelpcenter/userguide/services.png
+share/doc/HTML/en/khelpcenter/userguide/shared-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/standard-menu-entries.docbook
+share/doc/HTML/en/khelpcenter/userguide/switching-sessions.docbook
+share/doc/HTML/en/khelpcenter/userguide/the-filemanager.docbook
+share/doc/HTML/en/khelpcenter/userguide/titlebar-menu.png
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-network-x.docbook
+share/doc/HTML/en/khelpcenter/userguide/troubleshooting-no-open.docbook
+share/doc/HTML/en/khelpcenter/userguide/under-the-hood.docbook
+share/doc/HTML/en/khelpcenter/userguide/usenet.docbook
+share/doc/HTML/en/khelpcenter/userguide/where-next.docbook
+share/doc/HTML/en/khelpcenter/userguide/windows-how-to.docbook
+share/doc/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/HTML/en/khelpcenter/visualdict/common
 share/doc/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/HTML/en/khelpcenter/visualdict/index.docbook
@@ -2056,6 +2242,9 @@ share/doc/HTML/en/kinfocenter/memory/index.docbook
 share/doc/HTML/en/kinfocenter/nics/common
 share/doc/HTML/en/kinfocenter/nics/index.cache.bz2
 share/doc/HTML/en/kinfocenter/nics/index.docbook
+share/doc/HTML/en/kinfocenter/opengl/common
+share/doc/HTML/en/kinfocenter/opengl/index.cache.bz2
+share/doc/HTML/en/kinfocenter/opengl/index.docbook
 share/doc/HTML/en/kinfocenter/partitions/common
 share/doc/HTML/en/kinfocenter/partitions/index.cache.bz2
 share/doc/HTML/en/kinfocenter/partitions/index.docbook
@@ -2086,7 +2275,6 @@ share/doc/HTML/en/kinfocenter/usb/index.docbook
 share/doc/HTML/en/kinfocenter/xserver/common
 share/doc/HTML/en/kinfocenter/xserver/index.cache.bz2
 share/doc/HTML/en/kinfocenter/xserver/index.docbook
-share/doc/HTML/en/kioslave/audiocd.docbook
 share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
@@ -2144,6 +2332,10 @@ share/doc/HTML/en/kmenuedit/i_paste.png
 share/doc/HTML/en/kmenuedit/icon_sets.png
 share/doc/HTML/en/kmenuedit/index.cache.bz2
 share/doc/HTML/en/kmenuedit/index.docbook
+share/doc/HTML/en/knetattach/common
+share/doc/HTML/en/knetattach/index.cache.bz2
+share/doc/HTML/en/knetattach/index.docbook
+share/doc/HTML/en/knetattach/screenshot.png
 share/doc/HTML/en/konqueror/basics.docbook
 share/doc/HTML/en/konqueror/bookmarks.docbook
 share/doc/HTML/en/konqueror/browser.docbook
@@ -2160,6 +2352,7 @@ share/doc/HTML/en/konqueror/index.cache.bz2
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/introduction.docbook
 share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/man-kbookmarkmerger.1.docbook
 share/doc/HTML/en/konqueror/parts.png
 share/doc/HTML/en/konqueror/path-complete.docbook
 share/doc/HTML/en/konqueror/plugins.docbook
@@ -2171,6 +2364,7 @@ share/doc/HTML/en/konsole/common
 share/doc/HTML/en/konsole/index.cache.bz2
 share/doc/HTML/en/konsole/index.docbook
 share/doc/HTML/en/konsole/konsole.png
+share/doc/HTML/en/konsole/tabbar.png
 share/doc/HTML/en/kpager/common
 share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
@@ -2203,8 +2397,10 @@ share/icons/crystalsvg/128x128/apps/bell.png
 share/icons/crystalsvg/128x128/apps/cache.png
 share/icons/crystalsvg/128x128/apps/clanbomber.png
 share/icons/crystalsvg/128x128/apps/clock.png
+share/icons/crystalsvg/128x128/apps/colors.png
 share/icons/crystalsvg/128x128/apps/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy.png
 share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
 share/icons/crystalsvg/128x128/apps/fonts.png
@@ -2215,19 +2411,20 @@ share/icons/crystalsvg/128x128/apps/kappfinder.png
 share/icons/crystalsvg/128x128/apps/kate.png
 share/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/icons/crystalsvg/128x128/apps/kcmdf.png
+share/icons/crystalsvg/128x128/apps/kcmkwm.png
 share/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/icons/crystalsvg/128x128/apps/kcmpci.png
 share/icons/crystalsvg/128x128/apps/kcontrol.png
 share/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/icons/crystalsvg/128x128/apps/kdmconfig.png
-share/icons/crystalsvg/128x128/apps/keditbookmarks.png
 share/icons/crystalsvg/128x128/apps/key_bindings.png
 share/icons/crystalsvg/128x128/apps/kfm_home.png
 share/icons/crystalsvg/128x128/apps/khelpcenter.png
 share/icons/crystalsvg/128x128/apps/kjobviewer.png
 share/icons/crystalsvg/128x128/apps/klipper.png
 share/icons/crystalsvg/128x128/apps/kmenu.png
+share/icons/crystalsvg/128x128/apps/knetattach.png
 share/icons/crystalsvg/128x128/apps/konqueror.png
 share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
@@ -2245,6 +2442,7 @@ share/icons/crystalsvg/128x128/apps/multimedia.png
 share/icons/crystalsvg/128x128/apps/netscape.png
 share/icons/crystalsvg/128x128/apps/package.png
 share/icons/crystalsvg/128x128/apps/package_applications.png
+share/icons/crystalsvg/128x128/apps/package_development.png
 share/icons/crystalsvg/128x128/apps/package_favourite.png
 share/icons/crystalsvg/128x128/apps/package_games.png
 share/icons/crystalsvg/128x128/apps/package_multimedia.png
@@ -2291,6 +2489,10 @@ share/icons/crystalsvg/16x16/apps/designer.png
 share/icons/crystalsvg/16x16/apps/dia.png
 share/icons/crystalsvg/16x16/apps/dlgedit.png
 share/icons/crystalsvg/16x16/apps/eclipse.png
+share/icons/crystalsvg/16x16/apps/edu_languages.png
+share/icons/crystalsvg/16x16/apps/edu_mathematics.png
+share/icons/crystalsvg/16x16/apps/edu_miscellaneous.png
+share/icons/crystalsvg/16x16/apps/edu_science.png
 share/icons/crystalsvg/16x16/apps/emacs.png
 share/icons/crystalsvg/16x16/apps/email.png
 share/icons/crystalsvg/16x16/apps/energy.png
@@ -2307,7 +2509,6 @@ share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/gnomemeeting.png
 share/icons/crystalsvg/16x16/apps/gnucash.png
 share/icons/crystalsvg/16x16/apps/gnumeric.png
-share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
 share/icons/crystalsvg/16x16/apps/help_index.png
@@ -2346,6 +2547,7 @@ share/icons/crystalsvg/16x16/apps/kjobviewer.png
 share/icons/crystalsvg/16x16/apps/klipper.png
 share/icons/crystalsvg/16x16/apps/kmenu.png
 share/icons/crystalsvg/16x16/apps/kmenuedit.png
+share/icons/crystalsvg/16x16/apps/knetattach.png
 share/icons/crystalsvg/16x16/apps/knotify.png
 share/icons/crystalsvg/16x16/apps/konqueror.png
 share/icons/crystalsvg/16x16/apps/konsole.png
@@ -2412,7 +2614,6 @@ share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
 share/icons/crystalsvg/16x16/apps/scribus.png
 share/icons/crystalsvg/16x16/apps/sodipodi.png
-share/icons/crystalsvg/16x16/apps/soffice.png
 share/icons/crystalsvg/16x16/apps/style.png
 share/icons/crystalsvg/16x16/apps/stylesheet.png
 share/icons/crystalsvg/16x16/apps/terminal.png
@@ -2423,7 +2624,6 @@ share/icons/crystalsvg/16x16/apps/vnc.png
 share/icons/crystalsvg/16x16/apps/wabi.png
 share/icons/crystalsvg/16x16/apps/window_list.png
 share/icons/crystalsvg/16x16/apps/wine.png
-share/icons/crystalsvg/16x16/apps/winprops.png
 share/icons/crystalsvg/16x16/apps/wp.png
 share/icons/crystalsvg/16x16/apps/xcalc.png
 share/icons/crystalsvg/16x16/apps/xchat.png
@@ -2441,18 +2641,54 @@ share/icons/crystalsvg/16x16/apps/xmms.png
 share/icons/crystalsvg/16x16/apps/xosview.png
 share/icons/crystalsvg/16x16/apps/xpaint.png
 share/icons/crystalsvg/16x16/apps/xv.png
-share/icons/crystalsvg/16x16/devices/print_printer.png
-share/icons/crystalsvg/16x16/filesystems/folder_print2.png
 share/icons/crystalsvg/22x22/actions/newfont.png
-share/icons/crystalsvg/22x22/actions/textwaterfall.png
+share/icons/crystalsvg/22x22/apps/access.png
+share/icons/crystalsvg/22x22/apps/agent.png
+share/icons/crystalsvg/22x22/apps/arts.png
+share/icons/crystalsvg/22x22/apps/background.png
+share/icons/crystalsvg/22x22/apps/bell.png
+share/icons/crystalsvg/22x22/apps/cache.png
+share/icons/crystalsvg/22x22/apps/colors.png
+share/icons/crystalsvg/22x22/apps/cookie.png
+share/icons/crystalsvg/22x22/apps/date.png
+share/icons/crystalsvg/22x22/apps/email.png
+share/icons/crystalsvg/22x22/apps/energy.png
+share/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/icons/crystalsvg/22x22/apps/filetypes.png
+share/icons/crystalsvg/22x22/apps/fonts.png
+share/icons/crystalsvg/22x22/apps/hwinfo.png
+share/icons/crystalsvg/22x22/apps/icons.png
+share/icons/crystalsvg/22x22/apps/iconthemes.png
+share/icons/crystalsvg/22x22/apps/kcmdevices.png
+share/icons/crystalsvg/22x22/apps/kcmkicker.png
+share/icons/crystalsvg/22x22/apps/kcmkwm.png
+share/icons/crystalsvg/22x22/apps/kcmx.png
+share/icons/crystalsvg/22x22/apps/kdmconfig.png
+share/icons/crystalsvg/22x22/apps/key_bindings.png
+share/icons/crystalsvg/22x22/apps/keyboard.png
+share/icons/crystalsvg/22x22/apps/kfm.png
+share/icons/crystalsvg/22x22/apps/khelpcenter.png
+share/icons/crystalsvg/22x22/apps/kjobviewer.png
 share/icons/crystalsvg/22x22/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/kmenu.png
+share/icons/crystalsvg/22x22/apps/knetattach.png
 share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/konsole.png
+share/icons/crystalsvg/22x22/apps/kscreensaver.png
 share/icons/crystalsvg/22x22/apps/ksplash.png
+share/icons/crystalsvg/22x22/apps/kthememgr.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
+share/icons/crystalsvg/22x22/apps/locale.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/package_development.png
+share/icons/crystalsvg/22x22/apps/personal.png
+share/icons/crystalsvg/22x22/apps/printmgr.png
+share/icons/crystalsvg/22x22/apps/proxy.png
 share/icons/crystalsvg/22x22/apps/randr.png
+share/icons/crystalsvg/22x22/apps/samba.png
+share/icons/crystalsvg/22x22/apps/style.png
+share/icons/crystalsvg/22x22/apps/stylesheet.png
 share/icons/crystalsvg/32x32/actions/newfont.png
-share/icons/crystalsvg/32x32/actions/textwaterfall.png
 share/icons/crystalsvg/32x32/apps/abiword.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
@@ -2475,6 +2711,10 @@ share/icons/crystalsvg/32x32/apps/designer.png
 share/icons/crystalsvg/32x32/apps/dia.png
 share/icons/crystalsvg/32x32/apps/dlgedit.png
 share/icons/crystalsvg/32x32/apps/eclipse.png
+share/icons/crystalsvg/32x32/apps/edu_languages.png
+share/icons/crystalsvg/32x32/apps/edu_mathematics.png
+share/icons/crystalsvg/32x32/apps/edu_miscellaneous.png
+share/icons/crystalsvg/32x32/apps/edu_science.png
 share/icons/crystalsvg/32x32/apps/emacs.png
 share/icons/crystalsvg/32x32/apps/email.png
 share/icons/crystalsvg/32x32/apps/energy.png
@@ -2493,7 +2733,6 @@ share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/gnomemeeting.png
 share/icons/crystalsvg/32x32/apps/gnucash.png
 share/icons/crystalsvg/32x32/apps/gnumeric.png
-share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
 share/icons/crystalsvg/32x32/apps/help_index.png
@@ -2505,7 +2744,6 @@ share/icons/crystalsvg/32x32/apps/kappfinder.png
 share/icons/crystalsvg/32x32/apps/kate.png
 share/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
-share/icons/crystalsvg/32x32/apps/kcmfontinst.png
 share/icons/crystalsvg/32x32/apps/kcmkicker.png
 share/icons/crystalsvg/32x32/apps/kcmkwm.png
 share/icons/crystalsvg/32x32/apps/kcmmemory.png
@@ -2528,12 +2766,12 @@ share/icons/crystalsvg/32x32/apps/keyboard_layout.png
 share/icons/crystalsvg/32x32/apps/kfind.png
 share/icons/crystalsvg/32x32/apps/kfm.png
 share/icons/crystalsvg/32x32/apps/kfm_home.png
-share/icons/crystalsvg/32x32/apps/kfontview.png
 share/icons/crystalsvg/32x32/apps/khelpcenter.png
 share/icons/crystalsvg/32x32/apps/kjobviewer.png
 share/icons/crystalsvg/32x32/apps/klipper.png
 share/icons/crystalsvg/32x32/apps/kmenu.png
 share/icons/crystalsvg/32x32/apps/kmenuedit.png
+share/icons/crystalsvg/32x32/apps/knetattach.png
 share/icons/crystalsvg/32x32/apps/knotify.png
 share/icons/crystalsvg/32x32/apps/konqueror.png
 share/icons/crystalsvg/32x32/apps/konsole.png
@@ -2565,6 +2803,7 @@ share/icons/crystalsvg/32x32/apps/netscape.png
 share/icons/crystalsvg/32x32/apps/opera.png
 share/icons/crystalsvg/32x32/apps/package.png
 share/icons/crystalsvg/32x32/apps/package_applications.png
+share/icons/crystalsvg/32x32/apps/package_development.png
 share/icons/crystalsvg/32x32/apps/package_editors.png
 share/icons/crystalsvg/32x32/apps/package_edutainment.png
 share/icons/crystalsvg/32x32/apps/package_favourite.png
@@ -2596,7 +2835,6 @@ share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/scribus.png
 share/icons/crystalsvg/32x32/apps/sodipodi.png
-share/icons/crystalsvg/32x32/apps/soffice.png
 share/icons/crystalsvg/32x32/apps/style.png
 share/icons/crystalsvg/32x32/apps/stylesheet.png
 share/icons/crystalsvg/32x32/apps/terminal.png
@@ -2607,7 +2845,6 @@ share/icons/crystalsvg/32x32/apps/vnc.png
 share/icons/crystalsvg/32x32/apps/wabi.png
 share/icons/crystalsvg/32x32/apps/window_list.png
 share/icons/crystalsvg/32x32/apps/wine.png
-share/icons/crystalsvg/32x32/apps/winprops.png
 share/icons/crystalsvg/32x32/apps/wp.png
 share/icons/crystalsvg/32x32/apps/x.png
 share/icons/crystalsvg/32x32/apps/xapp.png
@@ -2628,8 +2865,6 @@ share/icons/crystalsvg/32x32/apps/xmms.png
 share/icons/crystalsvg/32x32/apps/xosview.png
 share/icons/crystalsvg/32x32/apps/xpaint.png
 share/icons/crystalsvg/32x32/apps/xv.png
-share/icons/crystalsvg/32x32/devices/print_printer.png
-share/icons/crystalsvg/32x32/filesystems/folder_print2.png
 share/icons/crystalsvg/48x48/apps/abiword.png
 share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
@@ -2649,6 +2884,10 @@ share/icons/crystalsvg/48x48/apps/date.png
 share/icons/crystalsvg/48x48/apps/designer.png
 share/icons/crystalsvg/48x48/apps/dia.png
 share/icons/crystalsvg/48x48/apps/eclipse.png
+share/icons/crystalsvg/48x48/apps/edu_languages.png
+share/icons/crystalsvg/48x48/apps/edu_mathematics.png
+share/icons/crystalsvg/48x48/apps/edu_miscellaneous.png
+share/icons/crystalsvg/48x48/apps/edu_science.png
 share/icons/crystalsvg/48x48/apps/emacs.png
 share/icons/crystalsvg/48x48/apps/email.png
 share/icons/crystalsvg/48x48/apps/energy.png
@@ -2666,7 +2905,6 @@ share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/gnomemeeting.png
 share/icons/crystalsvg/48x48/apps/gnucash.png
 share/icons/crystalsvg/48x48/apps/gnumeric.png
-share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
 share/icons/crystalsvg/48x48/apps/hwinfo.png
@@ -2678,10 +2916,10 @@ share/icons/crystalsvg/48x48/apps/kate.png
 share/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/icons/crystalsvg/48x48/apps/kcmdf.png
 share/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
-share/icons/crystalsvg/48x48/apps/kcmfontinst.png
 share/icons/crystalsvg/48x48/apps/kcmkwm.png
 share/icons/crystalsvg/48x48/apps/kcmmemory.png
 share/icons/crystalsvg/48x48/apps/kcmmidi.png
+share/icons/crystalsvg/48x48/apps/kcmopengl.png
 share/icons/crystalsvg/48x48/apps/kcmpartitions.png
 share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
@@ -2699,12 +2937,12 @@ share/icons/crystalsvg/48x48/apps/keyboard_layout.png
 share/icons/crystalsvg/48x48/apps/kfind.png
 share/icons/crystalsvg/48x48/apps/kfm.png
 share/icons/crystalsvg/48x48/apps/kfm_home.png
-share/icons/crystalsvg/48x48/apps/kfontview.png
 share/icons/crystalsvg/48x48/apps/khelpcenter.png
 share/icons/crystalsvg/48x48/apps/kjobviewer.png
 share/icons/crystalsvg/48x48/apps/klipper.png
 share/icons/crystalsvg/48x48/apps/kmenu.png
 share/icons/crystalsvg/48x48/apps/kmenuedit.png
+share/icons/crystalsvg/48x48/apps/knetattach.png
 share/icons/crystalsvg/48x48/apps/knotify.png
 share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
@@ -2731,6 +2969,7 @@ share/icons/crystalsvg/48x48/apps/netscape.png
 share/icons/crystalsvg/48x48/apps/opera.png
 share/icons/crystalsvg/48x48/apps/package.png
 share/icons/crystalsvg/48x48/apps/package_applications.png
+share/icons/crystalsvg/48x48/apps/package_development.png
 share/icons/crystalsvg/48x48/apps/package_editors.png
 share/icons/crystalsvg/48x48/apps/package_edutainment.png
 share/icons/crystalsvg/48x48/apps/package_favourite.png
@@ -2760,7 +2999,6 @@ share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/scribus.png
 share/icons/crystalsvg/48x48/apps/sodipodi.png
-share/icons/crystalsvg/48x48/apps/soffice.png
 share/icons/crystalsvg/48x48/apps/staroffice.png
 share/icons/crystalsvg/48x48/apps/style.png
 share/icons/crystalsvg/48x48/apps/stylesheet.png
@@ -2770,7 +3008,6 @@ share/icons/crystalsvg/48x48/apps/usb.png
 share/icons/crystalsvg/48x48/apps/vnc.png
 share/icons/crystalsvg/48x48/apps/window_list.png
 share/icons/crystalsvg/48x48/apps/wine.png
-share/icons/crystalsvg/48x48/apps/winprops.png
 share/icons/crystalsvg/48x48/apps/wmaker_apps.png
 share/icons/crystalsvg/48x48/apps/wp.png
 share/icons/crystalsvg/48x48/apps/xchat.png
@@ -2780,8 +3017,7 @@ share/icons/crystalsvg/48x48/apps/xemacs.png
 share/icons/crystalsvg/48x48/apps/xfmail.png
 share/icons/crystalsvg/48x48/apps/xmag.png
 share/icons/crystalsvg/48x48/apps/xv.png
-share/icons/crystalsvg/48x48/devices/print_printer.png
-share/icons/crystalsvg/48x48/filesystems/folder_print2.png
+share/icons/crystalsvg/64x64/apps/access.png
 share/icons/crystalsvg/64x64/apps/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
 share/icons/crystalsvg/64x64/apps/arts.png
@@ -2790,9 +3026,13 @@ share/icons/crystalsvg/64x64/apps/bell.png
 share/icons/crystalsvg/64x64/apps/cache.png
 share/icons/crystalsvg/64x64/apps/clanbomber.png
 share/icons/crystalsvg/64x64/apps/clock.png
+share/icons/crystalsvg/64x64/apps/colors.png
+share/icons/crystalsvg/64x64/apps/cookie.png
 share/icons/crystalsvg/64x64/apps/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy.png
 share/icons/crystalsvg/64x64/apps/energy_star.png
+share/icons/crystalsvg/64x64/apps/enhanced_browsing.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
 share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
@@ -2804,6 +3044,7 @@ share/icons/crystalsvg/64x64/apps/kappfinder.png
 share/icons/crystalsvg/64x64/apps/kate.png
 share/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/icons/crystalsvg/64x64/apps/kcmdf.png
+share/icons/crystalsvg/64x64/apps/kcmkwm.png
 share/icons/crystalsvg/64x64/apps/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
@@ -2820,6 +3061,7 @@ share/icons/crystalsvg/64x64/apps/khelpcenter.png
 share/icons/crystalsvg/64x64/apps/kjobviewer.png
 share/icons/crystalsvg/64x64/apps/klipper.png
 share/icons/crystalsvg/64x64/apps/kmenu.png
+share/icons/crystalsvg/64x64/apps/knetattach.png
 share/icons/crystalsvg/64x64/apps/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
@@ -2840,6 +3082,7 @@ share/icons/crystalsvg/64x64/apps/nedit.png
 share/icons/crystalsvg/64x64/apps/netscape.png
 share/icons/crystalsvg/64x64/apps/package.png
 share/icons/crystalsvg/64x64/apps/package_applications.png
+share/icons/crystalsvg/64x64/apps/package_development.png
 share/icons/crystalsvg/64x64/apps/package_favourite.png
 share/icons/crystalsvg/64x64/apps/package_games.png
 share/icons/crystalsvg/64x64/apps/package_multimedia.png
@@ -2865,17 +3108,13 @@ share/icons/crystalsvg/64x64/apps/wp.png
 share/icons/crystalsvg/64x64/apps/xclock.png
 share/icons/crystalsvg/64x64/apps/xfmail.png
 share/icons/crystalsvg/64x64/apps/xmag.png
-share/icons/crystalsvg/64x64/devices/print_printer.png
 share/icons/crystalsvg/scalable/apps/access.svgz
 share/icons/crystalsvg/scalable/apps/acroread.svgz
 share/icons/crystalsvg/scalable/apps/aim.svgz
 share/icons/crystalsvg/scalable/apps/aktion.svgz
 share/icons/crystalsvg/scalable/apps/antivirus.svgz
 share/icons/crystalsvg/scalable/apps/applixware.svgz
-share/icons/crystalsvg/scalable/apps/ark.svgz
 share/icons/crystalsvg/scalable/apps/arts.svgz
-share/icons/crystalsvg/scalable/apps/artsbuilder.svgz
-share/icons/crystalsvg/scalable/apps/artscontrol.svgz
 share/icons/crystalsvg/scalable/apps/background.svgz
 share/icons/crystalsvg/scalable/apps/bell.svgz
 share/icons/crystalsvg/scalable/apps/browser.svgz
@@ -2894,48 +3133,41 @@ share/icons/crystalsvg/scalable/apps/error.svgz
 share/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/icons/crystalsvg/scalable/apps/fonts.svgz
 share/icons/crystalsvg/scalable/apps/galeon.svgz
-share/icons/crystalsvg/scalable/apps/gnome/apps.svgz
-share/icons/crystalsvg/scalable/apps/go.svgz
-share/icons/crystalsvg/scalable/apps/harddrive.svgz
+share/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/icons/crystalsvg/scalable/apps/hardware.svgz
 share/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/icons/crystalsvg/scalable/apps/karbon14.svgz
-share/icons/crystalsvg/scalable/apps/kate.svgz
-share/icons/crystalsvg/scalable/apps/kcalc.svgz
+share/icons/crystalsvg/scalable/apps/kate2.svgz
 share/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/icons/crystalsvg/scalable/apps/kcmkwm.svgz
+share/icons/crystalsvg/scalable/apps/kcmx.svgz
 share/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/icons/crystalsvg/scalable/apps/kdict.svgz
-share/icons/crystalsvg/scalable/apps/kdvi.svgz
 share/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/icons/crystalsvg/scalable/apps/klaptopdaemon.svgz
+share/icons/crystalsvg/scalable/apps/kjobviewer.svgz
 share/icons/crystalsvg/scalable/apps/klipper.svgz
-share/icons/crystalsvg/scalable/apps/kmail.svgz
+share/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/icons/crystalsvg/scalable/apps/knetattach.svgz
 share/icons/crystalsvg/scalable/apps/konqueror.svgz
 share/icons/crystalsvg/scalable/apps/konsole.svgz
-share/icons/crystalsvg/scalable/apps/kopete.svgz
-share/icons/crystalsvg/scalable/apps/ksnapshot.svgz
-share/icons/crystalsvg/scalable/apps/kwrite.svgz
+share/icons/crystalsvg/scalable/apps/ktip.svgz
+share/icons/crystalsvg/scalable/apps/kwrite2.svgz
 share/icons/crystalsvg/scalable/apps/locale.svgz
-share/icons/crystalsvg/scalable/apps/mail.svgz
 share/icons/crystalsvg/scalable/apps/my_mac.svgz
-share/icons/crystalsvg/scalable/apps/mycomputer.svgz
 share/icons/crystalsvg/scalable/apps/netscape.svgz
 share/icons/crystalsvg/scalable/apps/openoffice.svgz
+share/icons/crystalsvg/scalable/apps/package_development.svgz
 share/icons/crystalsvg/scalable/apps/package_toys.svgz
-share/icons/crystalsvg/scalable/apps/package_utilities.svgz
 share/icons/crystalsvg/scalable/apps/penguin.svgz
+share/icons/crystalsvg/scalable/apps/personal.svgz
+share/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/icons/crystalsvg/scalable/apps/samba.svgz
 share/icons/crystalsvg/scalable/apps/shell.svgz
-share/icons/crystalsvg/scalable/apps/soffice.svgz
 share/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/icons/crystalsvg/scalable/apps/stylesheet.svgz
 share/icons/crystalsvg/scalable/apps/terminal.svgz
 share/icons/crystalsvg/scalable/apps/tux.svgz
 share/icons/crystalsvg/scalable/apps/wine.svgz
-share/icons/crystalsvg/scalable/apps/winprops.svgz
 share/icons/crystalsvg/scalable/apps/x.svgz
 share/icons/crystalsvg/scalable/apps/xapp.svgz
 share/icons/crystalsvg/scalable/apps/xcalc.svgz
@@ -2945,8 +3177,6 @@ share/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/icons/crystalsvg/scalable/apps/xpaint.svgz
 share/icons/hicolor/16x16/apps/khotkeys.png
 share/icons/hicolor/32x32/apps/khotkeys.png
-share/icons/locolor/16x16/apps/kcmfontinst.png
-share/icons/locolor/32x32/apps/kcmfontinst.png
 share/locale/en_US/entry.desktop
 share/locale/l10n/C/entry.desktop
 share/locale/l10n/C/flag.png
@@ -3427,24 +3657,34 @@ share/mimelnk/application/x-smb-server.desktop
 share/mimelnk/application/x-smb-workgroup.desktop
 share/mimelnk/fonts/folder.desktop
 share/mimelnk/fonts/system-folder.desktop
-share/mimelnk/kdedevice/cdrom_mounted.desktop
-share/mimelnk/kdedevice/cdrom_unmounted.desktop
-share/mimelnk/kdedevice/cdwriter_mounted.desktop
-share/mimelnk/kdedevice/cdwriter_unmounted.desktop
-share/mimelnk/kdedevice/dvd_mounted.desktop
-share/mimelnk/kdedevice/dvd_unmounted.desktop
-share/mimelnk/kdedevice/floppy5_mounted.desktop
-share/mimelnk/kdedevice/floppy5_unmounted.desktop
-share/mimelnk/kdedevice/floppy_mounted.desktop
-share/mimelnk/kdedevice/floppy_unmounted.desktop
-share/mimelnk/kdedevice/hdd_mounted.desktop
-share/mimelnk/kdedevice/hdd_unmounted.desktop
-share/mimelnk/kdedevice/nfs_mounted.desktop
-share/mimelnk/kdedevice/nfs_unmounted.desktop
-share/mimelnk/kdedevice/smb_mounted.desktop
-share/mimelnk/kdedevice/smb_unmounted.desktop
-share/mimelnk/kdedevice/zip_mounted.desktop
-share/mimelnk/kdedevice/zip_unmounted.desktop
+share/mimelnk/inode/system_directory.desktop
+share/mimelnk/media/audiocd.desktop
+share/mimelnk/media/blankcd.desktop
+share/mimelnk/media/blankdvd.desktop
+share/mimelnk/media/cdrom_mounted.desktop
+share/mimelnk/media/cdrom_unmounted.desktop
+share/mimelnk/media/cdwriter_mounted.desktop
+share/mimelnk/media/cdwriter_unmounted.desktop
+share/mimelnk/media/dvd_mounted.desktop
+share/mimelnk/media/dvd_unmounted.desktop
+share/mimelnk/media/dvdvideo.desktop
+share/mimelnk/media/floppy5_mounted.desktop
+share/mimelnk/media/floppy5_unmounted.desktop
+share/mimelnk/media/floppy_mounted.desktop
+share/mimelnk/media/floppy_unmounted.desktop
+share/mimelnk/media/gphoto2camera.desktop
+share/mimelnk/media/hdd_mounted.desktop
+share/mimelnk/media/hdd_unmounted.desktop
+share/mimelnk/media/nfs_mounted.desktop
+share/mimelnk/media/nfs_unmounted.desktop
+share/mimelnk/media/removable_mounted.desktop
+share/mimelnk/media/removable_unmounted.desktop
+share/mimelnk/media/smb_mounted.desktop
+share/mimelnk/media/smb_unmounted.desktop
+share/mimelnk/media/svcd.desktop
+share/mimelnk/media/vcd.desktop
+share/mimelnk/media/zip_mounted.desktop
+share/mimelnk/media/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
 share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
@@ -3453,13 +3693,14 @@ share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
 share/mimelnk/print/printermodel.desktop
 share/services/about.protocol
+share/services/applications.protocol
 share/services/ar.protocol
 share/services/bzip.protocol
 share/services/bzip2.protocol
 share/services/cgi.protocol
 share/services/cursorthumbnail.desktop
-share/services/devices.protocol
 share/services/djvuthumbnail.desktop
+share/services/exrthumbnail.desktop
 share/services/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
@@ -3468,17 +3709,21 @@ share/services/fontthumbnail.desktop
 share/services/gzip.protocol
 share/services/htmlthumbnail.desktop
 share/services/imagethumbnail.desktop
-share/services/imap4.protocol
-share/services/imaps.protocol
 share/services/info.protocol
 share/services/kaccess.desktop
 share/services/katedefaultproject.desktop
+share/services/katekttsd.desktop
 share/services/kded/favicons.desktop
+share/services/kded/khotkeys.desktop
 share/services/kded/konqy_preloader.desktop
 share/services/kded/kwrited.desktop
-share/services/kded/mountwatcher.desktop
+share/services/kded/mediamanager.desktop
+share/services/kded/remotedirnotify.desktop
+share/services/kded/systemdirnotify.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
+share/services/kfile_media.desktop
+share/services/kfile_trash.desktop
 share/services/kfindpart.desktop
 share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
@@ -3491,7 +3736,6 @@ share/services/konq_multicolumnview.desktop
 share/services/konq_sidebartng.desktop
 share/services/konq_textview.desktop
 share/services/konq_treeview.desktop
-share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
@@ -3508,6 +3752,7 @@ share/services/ldaps.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
+share/services/media.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
 share/services/picturethumbnail.desktop
@@ -3516,23 +3761,27 @@ share/services/pop3s.protocol
 share/services/print.protocol
 share/services/printdb.protocol
 share/services/programs.protocol
+share/services/remote.protocol
 share/services/searchproviders/acronym.desktop
 share/services/searchproviders/alexa.desktop
 share/services/searchproviders/alexa_url.desktop
 share/services/searchproviders/alltheweb.desktop
 share/services/searchproviders/altavista.desktop
+share/services/searchproviders/amg.desktop
 share/services/searchproviders/appsy.desktop
 share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/backports.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.desktop
+share/services/searchproviders/cia.desktop
 share/services/searchproviders/citeseer.desktop
 share/services/searchproviders/cpan.desktop
 share/services/searchproviders/ctan.desktop
 share/services/searchproviders/ctan_cat.desktop
 share/services/searchproviders/dbug.desktop
 share/services/searchproviders/de2en.desktop
+share/services/searchproviders/de2fr.desktop
 share/services/searchproviders/deb.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
@@ -3545,10 +3794,12 @@ share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
 share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2de.desktop
 share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freedb.desktop
 share/services/searchproviders/freshmeat.desktop
 share/services/searchproviders/froogle.desktop
+share/services/searchproviders/fsd.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
@@ -3556,6 +3807,7 @@ share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
 share/services/searchproviders/google_news.desktop
 share/services/searchproviders/gracenote.desktop
+share/services/searchproviders/grec.desktop
 share/services/searchproviders/hotbot.desktop
 share/services/searchproviders/hyperdictionary.desktop
 share/services/searchproviders/hyperdictionary_thesaurus.desktop
@@ -3584,6 +3836,8 @@ share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
 share/services/searchproviders/thesaurus.desktop
+share/services/searchproviders/tvtome.desktop
+share/services/searchproviders/uspto.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
@@ -3599,24 +3853,30 @@ share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
+share/services/trash.protocol
+share/services/useragentstrings/firefoxoncurrent.desktop
+share/services/useragentstrings/googlebot.desktop
 share/services/useragentstrings/ie401onwinnt4.desktop
-share/services/useragentstrings/ie45onwinnt5.desktop
 share/services/useragentstrings/ie501onwinnt5.desktop
 share/services/useragentstrings/ie50onppc.desktop
-share/services/useragentstrings/ie50onwin95.desktop
 share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
+share/services/useragentstrings/ie60oncurrent.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
 share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozoncurrent12.desktop
 share/services/useragentstrings/mozoncurrent16.desktop
 share/services/useragentstrings/mozonwin2000.desktop
-share/services/useragentstrings/mozonwinnt4.desktop
+share/services/useragentstrings/mozonwinxp.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
+share/services/useragentstrings/ns71oncurrent.desktop
+share/services/useragentstrings/ns71onwinnt51.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/op75oncurrent.desktop
 share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
@@ -3645,6 +3905,8 @@ share/sounds/KDE_Beep_Connect.wav
 share/sounds/KDE_Beep_Digital_1.ogg
 share/sounds/KDE_Beep_Digital_2.ogg
 share/sounds/KDE_Beep_Door.wav
+share/sounds/KDE_Beep_Double.ogg
+share/sounds/KDE_Beep_Harsh.ogg
 share/sounds/KDE_Beep_Honk.wav
 share/sounds/KDE_Beep_Lightning.wav
 share/sounds/KDE_Beep_Phone_1.ogg
@@ -3689,6 +3951,7 @@ share/sounds/KDE_Drum_Break.ogg
 share/sounds/KDE_Error.wav
 share/sounds/KDE_Error_1.ogg
 share/sounds/KDE_Error_2.ogg
+share/sounds/KDE_Error_3.ogg
 share/sounds/KDE_Event_1.ogg
 share/sounds/KDE_Event_2.ogg
 share/sounds/KDE_Event_3.ogg
@@ -3766,27 +4029,69 @@ share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
 share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/All-Good-People-1.jpg.desktop
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Blkmarble.jpg.desktop
 share/wallpapers/Chicken-Songs-2.jpg
+share/wallpapers/Chicken-Songs-2.jpg.desktop
 share/wallpapers/Circuit.jpg
+share/wallpapers/Circuit.jpg.desktop
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Foggy1.jpg.desktop
 share/wallpapers/Island-of-Elba.jpg
+share/wallpapers/Island-of-Elba.jpg.desktop
+share/wallpapers/KDE34.png
+share/wallpapers/KDE34.png.desktop
 share/wallpapers/Marble01.jpg
+share/wallpapers/Marble01.jpg.desktop
 share/wallpapers/No-Ones-Laughing-3.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg.desktop
 share/wallpapers/Paper01.jpg
+share/wallpapers/Paper01.jpg.desktop
 share/wallpapers/Planning-And-Probing-1.jpg
+share/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/wallpapers/Totally-New-Product-1.jpg
+share/wallpapers/Totally-New-Product-1.jpg.desktop
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/wallpapers/andes-venezolanos.svgz
+share/wallpapers/andes-venezolanos.svgz.desktop
+share/wallpapers/aurora.svgz
+share/wallpapers/aurora.svgz.desktop
 share/wallpapers/blue-bend.jpg
+share/wallpapers/blue-bend.jpg.desktop
+share/wallpapers/celtic.svgz
+share/wallpapers/celtic.svgz.desktop
 share/wallpapers/default_blue.jpg
+share/wallpapers/default_blue.jpg.desktop
 share/wallpapers/default_gears.jpg
+share/wallpapers/default_gears.jpg.desktop
 share/wallpapers/fulmine.jpg
+share/wallpapers/fulmine.jpg.desktop
+share/wallpapers/gear-flowers.svgz
+share/wallpapers/gear-flowers.svgz.desktop
+share/wallpapers/globe.svgz
+share/wallpapers/globe.svgz.desktop
+share/wallpapers/here-gear.svgz
+share/wallpapers/here-gear.svgz.desktop
 share/wallpapers/kde_box.png
+share/wallpapers/kde_box.png.desktop
 share/wallpapers/kde_passion.jpg
+share/wallpapers/kde_passion.jpg.desktop
+share/wallpapers/konqui.svgz
+share/wallpapers/konqui.svgz.desktop
+share/wallpapers/lineart.svgz
+share/wallpapers/lineart.svgz.desktop
+share/wallpapers/moon.svgz
+share/wallpapers/moon.svgz.desktop
 share/wallpapers/only_k.jpg
+share/wallpapers/only_k.jpg.desktop
 share/wallpapers/seaofconero.jpg
+share/wallpapers/seaofconero.jpg.desktop
 share/wallpapers/triplegears.jpg
+share/wallpapers/triplegears.jpg.desktop
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
@@ -3795,19 +4100,15 @@ share/wallpapers/triplegears.jpg
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kate/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/templates/.source/emptydir
 @dirrm share/mimelnk/print
-@dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/media
 @dirrm share/mimelnk/fonts
 @dirrm share/locale/l10n/zw
 @dirrm share/locale/l10n/zm
@@ -4036,7 +4337,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
-@dirrm share/icons/crystalsvg/scalable/apps/gnome
+@dirrm share/fonts/override
+@dirrm share/fonts
 @dirrm share/doc/kdm
 @dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
@@ -4045,6 +4347,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
+@dirrm share/doc/HTML/en/knetattach
 @dirrm share/doc/HTML/en/kmenuedit
 @dirrm share/doc/HTML/en/klipper
 @dirrm share/doc/HTML/en/kioslave
@@ -4058,6 +4361,7 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kinfocenter/pcmcia
 @dirrm share/doc/HTML/en/kinfocenter/pci
 @dirrm share/doc/HTML/en/kinfocenter/partitions
+@dirrm share/doc/HTML/en/kinfocenter/opengl
 @dirrm share/doc/HTML/en/kinfocenter/nics
 @dirrm share/doc/HTML/en/kinfocenter/memory
 @dirrm share/doc/HTML/en/kinfocenter/ioports
@@ -4083,12 +4387,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kwin
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave/imap4
-@dirrm share/doc/HTML/en/kdebase-apidocs/kioslave
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate/html
 @dirrm share/doc/HTML/en/kdebase-apidocs/kate
 @dirrm share/doc/HTML/en/kdebase-apidocs
+@dirrm share/doc/HTML/en/kdcop
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
 @dirrm share/doc/HTML/en/kcontrol/spellchecking
@@ -4134,16 +4436,36 @@ share/wallpapers/triplegears.jpg
 @dirrm share/doc/HTML/en/kcontrol/background
 @dirrm share/doc/HTML/en/kcontrol/arts
 @dirrm share/doc/HTML/en/kate
+@dirrm share/doc/HTML/en/kappfinder
 @dirrm share/desktop-directories
+@dirrm share/apps/systemview
+@dirrm share/apps/remoteview
+@dirrm share/apps/plugin
 @dirrm share/apps/naughtyapplet/pics
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
+@dirrm share/apps/kthememanager/themes/YellowOnBlue-big
+@dirrm share/apps/kthememanager/themes/YellowOnBlue
+@dirrm share/apps/kthememanager/themes/Sunshine
+@dirrm share/apps/kthememanager/themes/Redmond
+@dirrm share/apps/kthememanager/themes/Platinum
+@dirrm share/apps/kthememanager/themes/Plastik
+@dirrm share/apps/kthememanager/themes/Keramik
+@dirrm share/apps/kthememanager/themes/KDE_Classic
+@dirrm share/apps/kthememanager/themes/HighContrastLight-big
+@dirrm share/apps/kthememanager/themes/HighContrastLight
+@dirrm share/apps/kthememanager/themes/HighContrastDark-big
+@dirrm share/apps/kthememanager/themes/HighContrastDark
+@dirrm share/apps/kthememanager/themes
+@dirrm share/apps/kthememanager
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
 @dirrm share/apps/ksplash/pics
 @dirrm share/apps/ksplash/Themes/blue-bend
 @dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Simple
 @dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/None
 @dirrm share/apps/ksplash/Themes/Default/locolor
 @dirrm share/apps/ksplash/Themes/Default
 @dirrm share/apps/ksplash/Themes
@@ -4197,7 +4519,10 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kicker/icons/crystalsvg/16x16
 @dirrm share/apps/kicker/icons/crystalsvg
 @dirrm share/apps/kicker/icons
+@dirrm share/apps/khtml/kpartplugins
 @dirrm share/apps/khotkeys
+@dirrm share/apps/khelpcenter/searchhandlers/htdig
+@dirrm share/apps/khelpcenter/searchhandlers
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
@@ -4209,6 +4534,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/themes/circles
+@dirrm share/apps/kdm/themes
 @dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
@@ -4237,7 +4564,9 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcontroledit/icons
 @dirrm share/apps/kcontroledit
 @dirrm share/apps/kcontrol/pics
+@dirrm share/apps/kcontrol/about
 @dirrm share/apps/kcontrol
+@dirrm share/apps/kcmusb
 @dirrm share/apps/kcmlocale/pics
 @dirrm share/apps/kcmlocale
 @dirrm share/apps/kcmkeys
@@ -4245,6 +4574,8 @@ share/wallpapers/triplegears.jpg
 @dirrm share/apps/kcminput
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kbookmark
+@dirrm share/apps/katepart/kpartplugins
+@dirrm share/apps/kate/plugins/katekttsd
 @dirrm share/apps/kate/plugins/katedefaultproject
 @dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
diff --git a/x11/kdelibs3-nocups/pkg-plist b/x11/kdelibs3-nocups/pkg-plist
index 241bb658214c..a0dcadc732b0 100644
--- a/x11/kdelibs3-nocups/pkg-plist
+++ b/x11/kdelibs3-nocups/pkg-plist
@@ -14,11 +14,11 @@ bin/dcopserver_shutdown
 bin/dcopstart
 bin/filesharelist
 bin/fileshareset
-bin/ghns
 bin/imagetops
 bin/kab2kabc
 bin/kaddprinterwizard
 bin/kbuildsycoca
+bin/kcmshell
 bin/kconf_update
 bin/kconfig_compiler
 bin/kcookiejar
@@ -71,6 +71,13 @@ include/dcopobject.h
 include/dcopref.h
 include/dcopstub.h
 include/dcoptypes.h
+include/dnssd/domainbrowser.h
+include/dnssd/publicservice.h
+include/dnssd/query.h
+include/dnssd/remoteservice.h
+include/dnssd/servicebase.h
+include/dnssd/servicebrowser.h
+include/dnssd/settings.h
 include/dom/css_rule.h
 include/dom/css_stylesheet.h
 include/dom/css_value.h
@@ -135,6 +142,7 @@ include/kabc/resourceldapkio.h
 include/kabc/resourcenet.h
 include/kabc/resourceselectdialog.h
 include/kabc/secrecy.h
+include/kabc/sortmode.h
 include/kabc/sound.h
 include/kabc/stdaddressbook.h
 include/kabc/timezone.h
@@ -198,6 +206,7 @@ include/kclipboard.h
 include/kcmdlineargs.h
 include/kcmenumngr.h
 include/kcmodule.h
+include/kcmodulecontainer.h
 include/kcmoduleinfo.h
 include/kcmoduleloader.h
 include/kcmoduleproxy.h
@@ -236,10 +245,12 @@ include/kdcopactionproxy.h
 include/kdcoppropertyproxy.h
 include/kdcopservicestarter.h
 include/kde.pot
+include/kde_file.h
 include/kde_terminal_interface.h
 include/kdebug.h
 include/kdebugclasses.h
 include/kdedmodule.h
+include/kdelibs_export.h
 include/kdemacros.h
 include/kdeprint/driver.h
 include/kdeprint/kiconselectaction.h
@@ -336,6 +347,7 @@ include/kiconeffect.h
 include/kiconloader.h
 include/kicontheme.h
 include/kiconview.h
+include/kiconviewsearchline.h
 include/kidna.h
 include/kimageeffect.h
 include/kimagefilepreview.h
@@ -351,6 +363,7 @@ include/kio/connection.h
 include/kio/davjob.h
 include/kio/defaultprogress.h
 include/kio/file.h
+include/kio/forwardingslavebase.h
 include/kio/global.h
 include/kio/http.h
 include/kio/http_slave_defaults.h
@@ -360,6 +373,7 @@ include/kio/jobclasses.h
 include/kio/kdesasl.h
 include/kio/kmdbase.h
 include/kio/kmdcodec.h
+include/kio/kntlm.h
 include/kio/metainfojob.h
 include/kio/netaccess.h
 include/kio/observer.h
@@ -419,6 +433,10 @@ include/kmainwindow.h
 include/kmainwindowiface.h
 include/kmanagerselection.h
 include/kmdcodec.h
+include/kmdi/global.h
+include/kmdi/mainwindow.h
+include/kmdi/tabwidget.h
+include/kmdi/toolviewaccessor.h
 include/kmdichildarea.h
 include/kmdichildfrm.h
 include/kmdichildfrmcaption.h
@@ -450,7 +468,9 @@ include/knewstuff/downloaddialog.h
 include/knewstuff/engine.h
 include/knewstuff/entry.h
 include/knewstuff/knewstuff.h
+include/knewstuff/knewstuffbutton.h
 include/knewstuff/knewstuffgeneric.h
+include/knewstuff/knewstuffsecure.h
 include/knewstuff/provider.h
 include/knewstuff/providerdialog.h
 include/knewstuff/uploaddialog.h
@@ -487,6 +507,8 @@ include/kpixmap.h
 include/kpixmapeffect.h
 include/kpixmapio.h
 include/kpixmapprovider.h
+include/kpixmapregionselectordialog.h
+include/kpixmapregionselectorwidget.h
 include/kpixmapsplitter.h
 include/kplugininfo.h
 include/kpluginselector.h
@@ -549,6 +571,7 @@ include/ksharedptr.h
 include/kshell.h
 include/kshellcompletion.h
 include/kshortcut.h
+include/kshortcutdialog.h
 include/kshortcutlist.h
 include/kshred.h
 include/ksimpleconfig.h
@@ -561,6 +584,8 @@ include/ksocketdevice.h
 include/ksocks.h
 include/ksockssocketdevice.h
 include/ksortablevaluelist.h
+include/kspeech.h
+include/kspeechsink.h
 include/kspell.h
 include/kspell2/backgroundchecker.h
 include/kspell2/broker.h
@@ -610,6 +635,7 @@ include/kstringhandler.h
 include/kstringvalidator.h
 include/kstyle.h
 include/ksvgiconengine.h
+include/kswap.h
 include/ksycoca.h
 include/ksycocaentry.h
 include/ksycocatype.h
@@ -648,6 +674,7 @@ include/ktexteditor/selectionextdcopinterface.h
 include/ktexteditor/selectioninterface.h
 include/ktexteditor/selectioninterfaceext.h
 include/ktexteditor/sessionconfiginterface.h
+include/ktexteditor/templateinterface.h
 include/ktexteditor/texthintinterface.h
 include/ktexteditor/undointerface.h
 include/ktexteditor/variableinterface.h
@@ -659,6 +686,7 @@ include/ktimewidget.h
 include/ktip.h
 include/ktoolbar.h
 include/ktoolbarbutton.h
+include/ktoolbarlabelaction.h
 include/ktoolbarradiogroup.h
 include/ktrader.h
 include/ktypelist.h
@@ -737,6 +765,8 @@ lib/kde3/kbzip2filter.la
 lib/kde3/kbzip2filter.so
 lib/kde3/kcm_kresources.la
 lib/kde3/kcm_kresources.so
+lib/kde3/kcmshell.la
+lib/kde3/kcmshell.so
 lib/kde3/kconf_update.la
 lib/kde3/kconf_update.so
 lib/kde3/kcookiejar.la
@@ -785,12 +815,16 @@ lib/kde3/kimg_jp2.la
 lib/kde3/kimg_jp2.so
 lib/kde3/kimg_pcx.la
 lib/kde3/kimg_pcx.so
+lib/kde3/kimg_psd.la
+lib/kde3/kimg_psd.so
 lib/kde3/kimg_rgb.la
 lib/kde3/kimg_rgb.so
 lib/kde3/kimg_tga.la
 lib/kde3/kimg_tga.so
 lib/kde3/kimg_tiff.la
 lib/kde3/kimg_tiff.so
+lib/kde3/kimg_xcf.la
+lib/kde3/kimg_xcf.so
 lib/kde3/kimg_xview.la
 lib/kde3/kimg_xview.so
 lib/kde3/kio_file.la
@@ -819,8 +853,8 @@ lib/kde3/kspell_aspell.la
 lib/kde3/kspell_aspell.so
 lib/kde3/kspell_ispell.la
 lib/kde3/kspell_ispell.so
-lib/kde3/ktexteditor_autobookmarker.la
-lib/kde3/ktexteditor_autobookmarker.so
+lib/kde3/kstyle_plastik_config.la
+lib/kde3/kstyle_plastik_config.so
 lib/kde3/ktexteditor_docwordcompletion.la
 lib/kde3/ktexteditor_docwordcompletion.so
 lib/kde3/ktexteditor_insertfile.la
@@ -845,12 +879,16 @@ lib/kde3/plugins/designer/kdewidgets.la
 lib/kde3/plugins/designer/kdewidgets.so
 lib/kde3/plugins/styles/highcolor.la
 lib/kde3/plugins/styles/highcolor.so
+lib/kde3/plugins/styles/highcontrast.la
+lib/kde3/plugins/styles/highcontrast.so
 lib/kde3/plugins/styles/keramik.la
 lib/kde3/plugins/styles/keramik.so
 lib/kde3/plugins/styles/kthemestyle.la
 lib/kde3/plugins/styles/kthemestyle.so
 lib/kde3/plugins/styles/light.la
 lib/kde3/plugins/styles/light.so
+lib/kde3/plugins/styles/plastik.la
+lib/kde3/plugins/styles/plastik.so
 lib/libDCOP.la
 lib/libDCOP.so
 lib/libDCOP.so.6
@@ -891,6 +929,8 @@ lib/libkdeinit_kaddprinterwizard.la
 lib/libkdeinit_kaddprinterwizard.so
 lib/libkdeinit_kbuildsycoca.la
 lib/libkdeinit_kbuildsycoca.so
+lib/libkdeinit_kcmshell.la
+lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kconf_update.la
 lib/libkdeinit_kconf_update.so
 lib/libkdeinit_kcookiejar.la
@@ -918,6 +958,9 @@ lib/libkdesu.so.6
 lib/libkdeui.la
 lib/libkdeui.so
 lib/libkdeui.so.6
+lib/libkdnssd.la
+lib/libkdnssd.so
+lib/libkdnssd.so.1
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.6
@@ -936,6 +979,9 @@ lib/libkjs.so.3
 lib/libkmdi.la
 lib/libkmdi.so
 lib/libkmdi.so.1
+lib/libkmdi2.la
+lib/libkmdi2.so
+lib/libkmdi2.so.1
 lib/libkmediaplayer.la
 lib/libkmediaplayer.so
 lib/libkmediaplayer.so.0
@@ -945,6 +991,9 @@ lib/libkmid.so.0
 lib/libknewstuff.la
 lib/libknewstuff.so
 lib/libknewstuff.so.1
+lib/libkntlm.la
+lib/libkntlm.so
+lib/libkntlm.so.0
 lib/libkparts.la
 lib/libkparts.so
 lib/libkparts.so.3
@@ -988,28 +1037,31 @@ share/apps/dcopidlng/Ast.pm
 share/apps/dcopidlng/Iter.pm
 share/apps/dcopidlng/kalyptus
 share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
-share/apps/dcopidlng/kalyptusDataDict.pm
 share/apps/dcopidlng/kdocAstUtil.pm
-share/apps/dcopidlng/kdocLib.pm
 share/apps/dcopidlng/kdocParseDoc.pm
 share/apps/dcopidlng/kdocUtil.pm
 share/apps/kabc/countrytransl.map
 share/apps/kabc/formats/binary.desktop
 share/apps/katepart/katepartreadonlyui.rc
 share/apps/katepart/katepartui.rc
+share/apps/katepart/syntax/abc.xml
 share/apps/katepart/syntax/ada.xml
 share/apps/katepart/syntax/ahdl.xml
 share/apps/katepart/syntax/alert.xml
 share/apps/katepart/syntax/ansic89.xml
+share/apps/katepart/syntax/asm-avr.xml
 share/apps/katepart/syntax/asm6502.xml
+share/apps/katepart/syntax/asp.xml
 share/apps/katepart/syntax/awk.xml
 share/apps/katepart/syntax/bash.xml
 share/apps/katepart/syntax/bibtex.xml
 share/apps/katepart/syntax/c.xml
 share/apps/katepart/syntax/cg.xml
+share/apps/katepart/syntax/cgis.xml
 share/apps/katepart/syntax/changelog.xml
 share/apps/katepart/syntax/cisco.xml
 share/apps/katepart/syntax/clipper.xml
+share/apps/katepart/syntax/cmake.xml
 share/apps/katepart/syntax/coldfusion.xml
 share/apps/katepart/syntax/commonlisp.xml
 share/apps/katepart/syntax/component-pascal.xml
@@ -1033,6 +1085,7 @@ share/apps/katepart/syntax/fgl-per.xml
 share/apps/katepart/syntax/fortran.xml
 share/apps/katepart/syntax/gdl.xml
 share/apps/katepart/syntax/gettext.xml
+share/apps/katepart/syntax/glsl.xml
 share/apps/katepart/syntax/gnuassembler.xml
 share/apps/katepart/syntax/haskell.xml
 share/apps/katepart/syntax/html-php.xml
@@ -1042,6 +1095,7 @@ share/apps/katepart/syntax/idl.xml
 share/apps/katepart/syntax/ilerpg.xml
 share/apps/katepart/syntax/inform.xml
 share/apps/katepart/syntax/java.xml
+share/apps/katepart/syntax/javadoc.xml
 share/apps/katepart/syntax/javascript-php.xml
 share/apps/katepart/syntax/javascript.xml
 share/apps/katepart/syntax/jsp.xml
@@ -1050,6 +1104,7 @@ share/apps/katepart/syntax/language.dtd
 share/apps/katepart/syntax/latex.xml
 share/apps/katepart/syntax/ldif.xml
 share/apps/katepart/syntax/lex.xml
+share/apps/katepart/syntax/lilypond.xml
 share/apps/katepart/syntax/literate-haskell.xml
 share/apps/katepart/syntax/logtalk.xml
 share/apps/katepart/syntax/lpc.xml
@@ -1061,8 +1116,10 @@ share/apps/katepart/syntax/matlab.xml
 share/apps/katepart/syntax/mips.xml
 share/apps/katepart/syntax/modula-2.xml
 share/apps/katepart/syntax/mup.xml
+share/apps/katepart/syntax/nasm.xml
 share/apps/katepart/syntax/objectivec.xml
 share/apps/katepart/syntax/ocaml.xml
+share/apps/katepart/syntax/octave.xml
 share/apps/katepart/syntax/pascal.xml
 share/apps/katepart/syntax/perl.xml
 share/apps/katepart/syntax/php.xml
@@ -1076,6 +1133,7 @@ share/apps/katepart/syntax/purebasic.xml
 share/apps/katepart/syntax/python.xml
 share/apps/katepart/syntax/r.xml
 share/apps/katepart/syntax/rexx.xml
+share/apps/katepart/syntax/rib.xml
 share/apps/katepart/syntax/rpmspec.xml
 share/apps/katepart/syntax/rsiidl.xml
 share/apps/katepart/syntax/ruby.xml
@@ -1085,9 +1143,11 @@ share/apps/katepart/syntax/sci.xml
 share/apps/katepart/syntax/sgml.xml
 share/apps/katepart/syntax/sieve.xml
 share/apps/katepart/syntax/sml.xml
+share/apps/katepart/syntax/spice.xml
 share/apps/katepart/syntax/sql-mysql.xml
 share/apps/katepart/syntax/sql-postgresql.xml
 share/apps/katepart/syntax/sql.xml
+share/apps/katepart/syntax/stata.xml
 share/apps/katepart/syntax/syntax.template
 share/apps/katepart/syntax/tcl.xml
 share/apps/katepart/syntax/tibasic.xml
@@ -1101,6 +1161,7 @@ share/apps/katepart/syntax/winehq.xml
 share/apps/katepart/syntax/xharbour.xml
 share/apps/katepart/syntax/xml.xml
 share/apps/katepart/syntax/xmldebug.xml
+share/apps/katepart/syntax/xslt.xml
 share/apps/katepart/syntax/yacas.xml
 share/apps/katepart/syntax/yacc.xml
 share/apps/kcertpart/kcertpart.rc
@@ -1220,6 +1281,29 @@ share/apps/kdeprint/testprint.ps
 share/apps/kdeprint/tiledown.png
 share/apps/kdeprint/tileup.png
 share/apps/kdeprint/tools/escputil.desktop
+share/apps/kdeui/about/bar-bottom-left.png
+share/apps/kdeui/about/bar-bottom-middle.png
+share/apps/kdeui/about/bar-bottom-right.png
+share/apps/kdeui/about/bar-middle-left.png
+share/apps/kdeui/about/bar-middle-right.png
+share/apps/kdeui/about/bar-top-left.png
+share/apps/kdeui/about/bar-top-middle.png
+share/apps/kdeui/about/bar-top-right.png
+share/apps/kdeui/about/bottom-left.png
+share/apps/kdeui/about/bottom-middle.png
+share/apps/kdeui/about/bottom-right.png
+share/apps/kdeui/about/box-bottom-left.png
+share/apps/kdeui/about/box-bottom-middle.png
+share/apps/kdeui/about/box-bottom-right.png
+share/apps/kdeui/about/box-middle-left.png
+share/apps/kdeui/about/box-middle-right.png
+share/apps/kdeui/about/box-top-left.png
+share/apps/kdeui/about/box-top-middle.png
+share/apps/kdeui/about/box-top-right.png
+share/apps/kdeui/about/kde_infopage.css
+share/apps/kdeui/about/kde_infopage_rtl.css
+share/apps/kdeui/about/top-left.png
+share/apps/kdeui/about/top-middle.png
 share/apps/kdeui/pics/aboutkde.png
 share/apps/kdeui/pics/ktip-background.png
 share/apps/kdeui/pics/ktip-bulb.png
@@ -1359,7 +1443,6 @@ share/apps/ksgmltools2/customization/cs/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/cs/lang.entities
@@ -1632,6 +1715,7 @@ share/apps/ksgmltools2/customization/ja/strings.entities
 share/apps/ksgmltools2/customization/ja/user.entities
 share/apps/ksgmltools2/customization/kde-chunk-online.xsl
 share/apps/ksgmltools2/customization/kde-chunk.xsl
+share/apps/ksgmltools2/customization/kde-man.xsl
 share/apps/ksgmltools2/customization/kde-navig-online.xsl
 share/apps/ksgmltools2/customization/kde-navig.xsl
 share/apps/ksgmltools2/customization/kde-nochunk.xsl
@@ -1759,6 +1843,7 @@ share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/pt-BR/lang.entities
@@ -2001,6 +2086,24 @@ share/apps/ksgmltools2/customization/xx/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/xx/lang.entities
 share/apps/ksgmltools2/customization/xx/strings.entities
 share/apps/ksgmltools2/customization/xx/user.entities
+share/apps/ksgmltools2/customization/zh-CN/catalog
+share/apps/ksgmltools2/customization/zh-CN/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/help-menu.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/install-compile.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/install-intro.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underLGPL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/zh-CN/lang.entities
+share/apps/ksgmltools2/customization/zh-CN/strings.entities
+share/apps/ksgmltools2/customization/zh-CN/user.entities
 share/apps/ksgmltools2/customization/zh-TW/catalog
 share/apps/ksgmltools2/customization/zh-TW/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/zh-TW/entities/gpl-notice.docbook
@@ -2090,6 +2193,11 @@ share/apps/ksgmltools2/docbook/xsl/VERSION
 share/apps/ksgmltools2/docbook/xsl/WhatsNew
 share/apps/ksgmltools2/docbook/xsl/common/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/common/af.xml
+share/apps/ksgmltools2/docbook/xsl/common/ar.xml
+share/apps/ksgmltools2/docbook/xsl/common/autoidx-ng.xsl
+share/apps/ksgmltools2/docbook/xsl/common/bg.xml
+share/apps/ksgmltools2/docbook/xsl/common/bn.xml
+share/apps/ksgmltools2/docbook/xsl/common/bs.xml
 share/apps/ksgmltools2/docbook/xsl/common/ca.xml
 share/apps/ksgmltools2/docbook/xsl/common/common.xsl
 share/apps/ksgmltools2/docbook/xsl/common/cs.xml
@@ -2103,6 +2211,8 @@ share/apps/ksgmltools2/docbook/xsl/common/eu.xml
 share/apps/ksgmltools2/docbook/xsl/common/fi.xml
 share/apps/ksgmltools2/docbook/xsl/common/fr.xml
 share/apps/ksgmltools2/docbook/xsl/common/gentext.xsl
+share/apps/ksgmltools2/docbook/xsl/common/he.xml
+share/apps/ksgmltools2/docbook/xsl/common/hr.xml
 share/apps/ksgmltools2/docbook/xsl/common/hu.xml
 share/apps/ksgmltools2/docbook/xsl/common/id.xml
 share/apps/ksgmltools2/docbook/xsl/common/it.xml
@@ -2111,10 +2221,14 @@ share/apps/ksgmltools2/docbook/xsl/common/ko.xml
 share/apps/ksgmltools2/docbook/xsl/common/l10n.dtd
 share/apps/ksgmltools2/docbook/xsl/common/l10n.xml
 share/apps/ksgmltools2/docbook/xsl/common/l10n.xsl
+share/apps/ksgmltools2/docbook/xsl/common/la.xml
 share/apps/ksgmltools2/docbook/xsl/common/labels.xsl
+share/apps/ksgmltools2/docbook/xsl/common/lt.xml
 share/apps/ksgmltools2/docbook/xsl/common/nl.xml
 share/apps/ksgmltools2/docbook/xsl/common/nn.xml
 share/apps/ksgmltools2/docbook/xsl/common/no.xml
+share/apps/ksgmltools2/docbook/xsl/common/olink.xsl
+share/apps/ksgmltools2/docbook/xsl/common/pi.xsl
 share/apps/ksgmltools2/docbook/xsl/common/pl.xml
 share/apps/ksgmltools2/docbook/xsl/common/pt.xml
 share/apps/ksgmltools2/docbook/xsl/common/pt_br.xml
@@ -2123,57 +2237,72 @@ share/apps/ksgmltools2/docbook/xsl/common/ru.xml
 share/apps/ksgmltools2/docbook/xsl/common/sk.xml
 share/apps/ksgmltools2/docbook/xsl/common/sl.xml
 share/apps/ksgmltools2/docbook/xsl/common/sr.xml
+share/apps/ksgmltools2/docbook/xsl/common/sr_Latn.xml
 share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/sv.xml
 share/apps/ksgmltools2/docbook/xsl/common/table.xsl
+share/apps/ksgmltools2/docbook/xsl/common/targetdatabase.dtd
+share/apps/ksgmltools2/docbook/xsl/common/targets.xsl
 share/apps/ksgmltools2/docbook/xsl/common/th.xml
 share/apps/ksgmltools2/docbook/xsl/common/titles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/tr.xml
 share/apps/ksgmltools2/docbook/xsl/common/uk.xml
+share/apps/ksgmltools2/docbook/xsl/common/vi.xml
 share/apps/ksgmltools2/docbook/xsl/common/xh.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml
 share/apps/ksgmltools2/docbook/xsl/html/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/html/admon.xsl
+share/apps/ksgmltools2/docbook/xsl/html/autoidx-ng.xsl
 share/apps/ksgmltools2/docbook/xsl/html/autoidx.xsl
 share/apps/ksgmltools2/docbook/xsl/html/autotoc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/biblio.xsl
 share/apps/ksgmltools2/docbook/xsl/html/block.xsl
-share/apps/ksgmltools2/docbook/xsl/html/calc-chunks.xsl
 share/apps/ksgmltools2/docbook/xsl/html/callout.xsl
 share/apps/ksgmltools2/docbook/xsl/html/changebars.xsl
-share/apps/ksgmltools2/docbook/xsl/html/chunk-experimental.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunk-code.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunk-common.xsl
 share/apps/ksgmltools2/docbook/xsl/html/chunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/chunker.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunkfast.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunktoc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/component.xsl
 share/apps/ksgmltools2/docbook/xsl/html/division.xsl
 share/apps/ksgmltools2/docbook/xsl/html/docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/html/docbookng.xsl
 share/apps/ksgmltools2/docbook/xsl/html/ebnf.xsl
-share/apps/ksgmltools2/docbook/xsl/html/expchunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/footnote.xsl
 share/apps/ksgmltools2/docbook/xsl/html/formal.xsl
 share/apps/ksgmltools2/docbook/xsl/html/glossary.xsl
 share/apps/ksgmltools2/docbook/xsl/html/graphics.xsl
+share/apps/ksgmltools2/docbook/xsl/html/html-rtf.xsl
 share/apps/ksgmltools2/docbook/xsl/html/html.xsl
+share/apps/ksgmltools2/docbook/xsl/html/htmltbl.xsl
 share/apps/ksgmltools2/docbook/xsl/html/index.xsl
 share/apps/ksgmltools2/docbook/xsl/html/info.xsl
 share/apps/ksgmltools2/docbook/xsl/html/inline.xsl
 share/apps/ksgmltools2/docbook/xsl/html/keywords.xsl
 share/apps/ksgmltools2/docbook/xsl/html/lists.xsl
+share/apps/ksgmltools2/docbook/xsl/html/maketoc.xsl
+share/apps/ksgmltools2/docbook/xsl/html/manifest.xsl
 share/apps/ksgmltools2/docbook/xsl/html/math.xsl
 share/apps/ksgmltools2/docbook/xsl/html/oldchunker.xsl
 share/apps/ksgmltools2/docbook/xsl/html/onechunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/param.ent
-share/apps/ksgmltools2/docbook/xsl/html/param.html
 share/apps/ksgmltools2/docbook/xsl/html/param.xml
 share/apps/ksgmltools2/docbook/xsl/html/param.xsl
 share/apps/ksgmltools2/docbook/xsl/html/param.xweb
 share/apps/ksgmltools2/docbook/xsl/html/pi.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-chunk-code.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-chunk.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-onechunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/qandaset.xsl
 share/apps/ksgmltools2/docbook/xsl/html/refentry.xsl
 share/apps/ksgmltools2/docbook/xsl/html/sections.xsl
 share/apps/ksgmltools2/docbook/xsl/html/synop.xsl
 share/apps/ksgmltools2/docbook/xsl/html/table.xsl
+share/apps/ksgmltools2/docbook/xsl/html/task.xsl
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xml
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xsl
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.xsl
@@ -2181,52 +2310,96 @@ share/apps/ksgmltools2/docbook/xsl/html/toc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/verbatim.xsl
 share/apps/ksgmltools2/docbook/xsl/html/xref.xsl
 share/apps/ksgmltools2/docbook/xsl/images/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/images/blank.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/1.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/1.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/10.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/10.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/11.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/11.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/12.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/12.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/13.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/13.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/14.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/14.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/15.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/15.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/2.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/2.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/3.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/3.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/4.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/4.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/5.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/5.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/6.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/6.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/7.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/7.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/8.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/8.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/9.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/9.png
 share/apps/ksgmltools2/docbook/xsl/images/callouts/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/images/caution.gif
 share/apps/ksgmltools2/docbook/xsl/images/caution.png
 share/apps/ksgmltools2/docbook/xsl/images/caution.tif
+share/apps/ksgmltools2/docbook/xsl/images/draft.png
+share/apps/ksgmltools2/docbook/xsl/images/home.gif
 share/apps/ksgmltools2/docbook/xsl/images/home.png
+share/apps/ksgmltools2/docbook/xsl/images/important.gif
 share/apps/ksgmltools2/docbook/xsl/images/important.png
 share/apps/ksgmltools2/docbook/xsl/images/important.tif
+share/apps/ksgmltools2/docbook/xsl/images/next.gif
 share/apps/ksgmltools2/docbook/xsl/images/next.png
+share/apps/ksgmltools2/docbook/xsl/images/note.gif
 share/apps/ksgmltools2/docbook/xsl/images/note.png
 share/apps/ksgmltools2/docbook/xsl/images/note.tif
+share/apps/ksgmltools2/docbook/xsl/images/prev.gif
 share/apps/ksgmltools2/docbook/xsl/images/prev.png
+share/apps/ksgmltools2/docbook/xsl/images/tip.gif
 share/apps/ksgmltools2/docbook/xsl/images/tip.png
 share/apps/ksgmltools2/docbook/xsl/images/tip.tif
 share/apps/ksgmltools2/docbook/xsl/images/toc-blank.png
 share/apps/ksgmltools2/docbook/xsl/images/toc-minus.png
 share/apps/ksgmltools2/docbook/xsl/images/toc-plus.png
+share/apps/ksgmltools2/docbook/xsl/images/up.gif
 share/apps/ksgmltools2/docbook/xsl/images/up.png
+share/apps/ksgmltools2/docbook/xsl/images/warning.gif
 share/apps/ksgmltools2/docbook/xsl/images/warning.png
 share/apps/ksgmltools2/docbook/xsl/images/warning.tif
 share/apps/ksgmltools2/docbook/xsl/lib/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/lib/lib.xml
 share/apps/ksgmltools2/docbook/xsl/lib/lib.xsl
+share/apps/ksgmltools2/docbook/xsl/lib/lib.xweb
+share/apps/ksgmltools2/docbook/xsl/manpages/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/manpages/README
+share/apps/ksgmltools2/docbook/xsl/manpages/docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/lists.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/sect23.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/synop.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/xref.xsl
 share/apps/ksgmltools2/docbook/xsl/params/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.path.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/admon.textlabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/admonition.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/admonition.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/alignment.xml
 share/apps/ksgmltools2/docbook/xsl/params/annotate.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/appendix.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/arbortext.extensions.xml
+share/apps/ksgmltools2/docbook/xsl/params/article.appendix.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/author.othername.in.middle.xml
 share/apps/ksgmltools2/docbook/xsl/params/autotoc.label.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/axf.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/base.dir.xml
 share/apps/ksgmltools2/docbook/xsl/params/biblioentry.item.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/bibliography.collection.xml
+share/apps/ksgmltools2/docbook/xsl/params/bibliography.numbered.xml
 share/apps/ksgmltools2/docbook/xsl/params/blockquote.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/body.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/body.font.master.xml
@@ -2246,78 +2419,179 @@ share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.start.character.xml
 share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.xml
 share/apps/ksgmltools2/docbook/xsl/params/callouts.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/chapter.autolabel.xml
-share/apps/ksgmltools2/docbook/xsl/params/chunk.datafile.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.first.sections.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.quietly.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.section.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.sections.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.separate.lots.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.tocs.and.lots.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.cdata-section-elements.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-public.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-system.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.indent.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.media-type.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.method.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.omit-xml-declaration.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.standalone.xml
 share/apps/ksgmltools2/docbook/xsl/params/citerefentry.link.xml
-share/apps/ksgmltools2/docbook/xsl/params/column.count.xml
+share/apps/ksgmltools2/docbook/xsl/params/collect.xref.targets.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.body.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.front.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.index.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.lot.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.titlepage.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.body.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.front.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.index.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.lot.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.titlepage.xml
+share/apps/ksgmltools2/docbook/xsl/params/compact.list.item.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/component.label.includes.part.label.xml
 share/apps/ksgmltools2/docbook/xsl/params/component.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/css.decoration.xml
-share/apps/ksgmltools2/docbook/xsl/params/default.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/current.docid.xml
+share/apps/ksgmltools2/docbook/xsl/params/default.float.class.xml
+share/apps/ksgmltools2/docbook/xsl/params/default.image.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/default.table.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/default.units.xml
 share/apps/ksgmltools2/docbook/xsl/params/dingbat.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/double.sided.xml
+share/apps/ksgmltools2/docbook/xsl/params/draft.mode.xml
+share/apps/ksgmltools2/docbook/xsl/params/draft.watermark.image.xml
+share/apps/ksgmltools2/docbook/xsl/params/ebnf.assignment.xml
+share/apps/ksgmltools2/docbook/xsl/params/ebnf.statement.terminator.xml
 share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.bgcolor.xml
 share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.border.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.id.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.name.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.provider.xml
 share/apps/ksgmltools2/docbook/xsl/params/emphasis.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/entry.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/equation.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/example.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/figure.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/firstterm.only.link.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.column.widths.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.content.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.rule.xml
+share/apps/ksgmltools2/docbook/xsl/params/footers.on.blank.pages.xml
 share/apps/ksgmltools2/docbook/xsl/params/footnote.font.size.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.number.symbols.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.sep.leader.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/fop.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.object.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.procedures.xml
+share/apps/ksgmltools2/docbook/xsl/params/formal.title.placement.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.decoration.xml
 share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.tabular.threshold.xml
 share/apps/ksgmltools2/docbook/xsl/params/function.parens.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.appendix.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.article.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.equation.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.example.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.figure.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.table.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.chapter.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.component.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.equation.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.example.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.figure.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.table.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.id.attributes.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.index.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.legalnotice.link.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.part.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.preface.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.qandadiv.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.qandaset.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.reference.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.manifest.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.meta.abstract.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.section.toc.level.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.section.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.set.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossary.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/glossary.collection.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossentry.show.acronym.xml
+share/apps/ksgmltools2/docbook/xsl/params/glosslist.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/glossterm.auto.link.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossterm.separation.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossterm.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/graphic.default.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/graphicsize.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.column.widths.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.content.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.rule.xml
+share/apps/ksgmltools2/docbook/xsl/params/headers.on.blank.pages.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.base.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cellpadding.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cellspacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cleanup.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.ext.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.extra.head.links.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.link.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.type.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.alias.file.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.forward.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.hideshow.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.locate.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.next.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.options.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.prev.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.print.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.refresh.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.stop.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.zoom.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.chm.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.default.topic.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.display.progress.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enhanced.decompilation.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enumerate.images.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.force.map.and.alias.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.binary.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.folders.instead.books.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.section.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.show.root.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhk.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.tail.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.window.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.windows.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.map.file.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.only.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.remember.window.position.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.advanced.search.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.favorities.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.menu.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.toolbar.text.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.use.hhk.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.window.geometry.xml
+share/apps/ksgmltools2/docbook/xsl/params/hyphenate.verbatim.xml
 share/apps/ksgmltools2/docbook/xsl/params/hyphenate.xml
+share/apps/ksgmltools2/docbook/xsl/params/ignore.image.scaling.xml
+share/apps/ksgmltools2/docbook/xsl/params/img.src.path.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.on.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.on.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.prefer.titleabbrev.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.preferred.page.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informal.object.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalequation.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalexample.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalfigure.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informaltable.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/inherit.keywords.xml
+share/apps/ksgmltools2/docbook/xsl/params/insert.olink.page.number.xml
+share/apps/ksgmltools2/docbook/xsl/params/insert.olink.pdf.frag.xml
 share/apps/ksgmltools2/docbook/xsl/params/insert.xref.page.number.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.default.language.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.language.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.use.xref.language.xml
 share/apps/ksgmltools2/docbook/xsl/params/label.from.part.xml
 share/apps/ksgmltools2/docbook/xsl/params/line-height.xml
 share/apps/ksgmltools2/docbook/xsl/params/linenumbering.everyNth.xml
@@ -2327,23 +2601,38 @@ share/apps/ksgmltools2/docbook/xsl/params/linenumbering.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/link.mailto.url.xml
 share/apps/ksgmltools2/docbook/xsl/params/list.block.spacing.xml
 share/apps/ksgmltools2/docbook/xsl/params/list.item.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/make.graphic.viewport.xml
+share/apps/ksgmltools2/docbook/xsl/params/make.index.markup.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.single.year.ranges.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.valid.html.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.year.ranges.xml
+share/apps/ksgmltools2/docbook/xsl/params/manifest.in.base.dir.xml
+share/apps/ksgmltools2/docbook/xsl/params/manifest.xml
+share/apps/ksgmltools2/docbook/xsl/params/manual.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/marker.section.level.xml
+share/apps/ksgmltools2/docbook/xsl/params/menuchoice.menu.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/menuchoice.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/monospace.font.family.xml
+share/apps/ksgmltools2/docbook/xsl/params/monospace.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/monospace.verbatim.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.path.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.showtitles.xml
+share/apps/ksgmltools2/docbook/xsl/params/nominal.image.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/nominal.image.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/nominal.table.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/normal.para.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.base.uri.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.debug.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.doctitle.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.fragid.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.lang.fallback.sequence.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.outline.ext.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.pubid.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.resolver.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.sysid.xml
-share/apps/ksgmltools2/docbook/xsl/params/output.method.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.height.portrait.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.height.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.margin.bottom.xml
@@ -2354,23 +2643,53 @@ share/apps/ksgmltools2/docbook/xsl/params/page.orientation.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.width.portrait.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/paper.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/para.propagates.style.xml
 share/apps/ksgmltools2/docbook/xsl/params/part.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/passivetex.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/phrase.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/pixels.per.inch.xml
+share/apps/ksgmltools2/docbook/xsl/params/points.per.em.xml
 share/apps/ksgmltools2/docbook/xsl/params/preface.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/prefer.internal.olink.xml
+share/apps/ksgmltools2/docbook/xsl/params/preferred.mediaobject.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/procedure.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/process.empty.source.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/process.source.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.arch.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.attribute.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.condition.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.conformance.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.lang.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.os.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.revision.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.revisionflag.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.security.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.userlevel.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.value.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.vendor.xml
 share/apps/ksgmltools2/docbook/xsl/params/punct.honorific.xml
 share/apps/ksgmltools2/docbook/xsl/params/qanda.defaultlabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/qanda.inherit.numeration.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/qandadiv.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.name.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/refentry.pagebreak.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/refentry.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.xref.manvolnum.xml
 share/apps/ksgmltools2/docbook/xsl/params/region.after.extent.xml
 share/apps/ksgmltools2/docbook/xsl/params/region.before.extent.xml
 share/apps/ksgmltools2/docbook/xsl/params/root.filename.xml
+share/apps/ksgmltools2/docbook/xsl/params/root.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/rootid.xml
 share/apps/ksgmltools2/docbook/xsl/params/runinhead.default.title.end.punct.xml
 share/apps/ksgmltools2/docbook/xsl/params/runinhead.title.end.punct.xml
@@ -2379,83 +2698,92 @@ share/apps/ksgmltools2/docbook/xsl/params/saxon.callouts.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.character.representation.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.linenumbering.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.tablecolumns.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.max.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/section.label.includes.component.label.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/segmentedlist.as.table.xml
 share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.style.xml
 share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.xml
 share/apps/ksgmltools2/docbook/xsl/params/show.comments.xml
 share/apps/ksgmltools2/docbook/xsl/params/show.revisionflag.xml
+share/apps/ksgmltools2/docbook/xsl/params/sidebar.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/simplesect.in.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/spacing.paras.xml
-share/apps/ksgmltools2/docbook/xsl/params/stylesheet.result.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/subscript.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/superscript.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/suppress.footer.navigation.xml
+share/apps/ksgmltools2/docbook/xsl/params/suppress.header.navigation.xml
 share/apps/ksgmltools2/docbook/xsl/params/suppress.navigation.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.color.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.padding.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.style.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/symbol.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/table.borders.with.css.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.color.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.padding.xml
 share/apps/ksgmltools2/docbook/xsl/params/table.entry.padding.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.symbols.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.color.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.table.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/tablecolumns.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/target.database.document.xml
+share/apps/ksgmltools2/docbook/xsl/params/targets.filename.xml
 share/apps/ksgmltools2/docbook/xsl/params/template.xml
+share/apps/ksgmltools2/docbook/xsl/params/tex.math.delims.xml
 share/apps/ksgmltools2/docbook/xsl/params/tex.math.file.xml
 share/apps/ksgmltools2/docbook/xsl/params/tex.math.in.alt.xml
+share/apps/ksgmltools2/docbook/xsl/params/textdata.default.encoding.xml
 share/apps/ksgmltools2/docbook/xsl/params/textinsert.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/title.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/title.margin.left.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.indent.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.list.type.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.margin.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/toc.max.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.section.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.footnotes.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.hyphenate.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.show.xml
 share/apps/ksgmltools2/docbook/xsl/params/ulink.target.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.embed.for.svg.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.id.as.filename.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.id.function.xml
-share/apps/ksgmltools2/docbook/xsl/params/using.chunker.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.local.olink.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.role.as.xrefstyle.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.role.for.mediaobject.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.svg.xml
 share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.table.xml
+share/apps/ksgmltools2/docbook/xsl/params/variablelist.max.termlength.xml
 share/apps/ksgmltools2/docbook/xsl/params/verbatim.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/wordml.template.xml
 share/apps/ksgmltools2/docbook/xsl/params/xep.extensions.xml
+share/apps/ksgmltools2/docbook/xsl/params/xep.index.item.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.label-page.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.label-title.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/xref.properties.xml
-share/apps/ksgmltools2/docbook/xsl/tools/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/olink/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olink-common.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olink.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olinkchunk.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olinksum.dtd
-share/apps/ksgmltools2/docbook/xsl/tools/profile/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/profile/profile.xsl
+share/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
 share/apps/kssl/ca-bundle.crt
-share/apps/kstyle/pixmaps/aquaice.png
-share/apps/kstyle/pixmaps/black_combo.png
-share/apps/kstyle/pixmaps/blkmarble.png
-share/apps/kstyle/pixmaps/darkgraytexture.png
-share/apps/kstyle/pixmaps/darkslider.png
-share/apps/kstyle/pixmaps/elec_combo.png
-share/apps/kstyle/pixmaps/elec_combodown.png
-share/apps/kstyle/pixmaps/elec_groove.png
-share/apps/kstyle/pixmaps/elec_hdl.png
-share/apps/kstyle/pixmaps/elec_horizhdl.png
-share/apps/kstyle/pixmaps/elec_off.png
-share/apps/kstyle/pixmaps/elec_on.png
-share/apps/kstyle/pixmaps/elec_slider.png
-share/apps/kstyle/pixmaps/gold_checked.png
-share/apps/kstyle/pixmaps/gold_unchecked.png
-share/apps/kstyle/pixmaps/graybutton.png
-share/apps/kstyle/pixmaps/grayice.png
-share/apps/kstyle/pixmaps/graymarble.png
-share/apps/kstyle/pixmaps/graymarble_dark.png
-share/apps/kstyle/pixmaps/graytexture.png
-share/apps/kstyle/pixmaps/ice.png
-share/apps/kstyle/pixmaps/marble2.png
-share/apps/kstyle/pixmaps/marble3.png
-share/apps/kstyle/pixmaps/marble_checked.png
-share/apps/kstyle/pixmaps/marble_combo.png
-share/apps/kstyle/pixmaps/marble_off.png
-share/apps/kstyle/pixmaps/marble_on.png
-share/apps/kstyle/pixmaps/marble_unchecked.png
-share/apps/kstyle/pixmaps/minigray.png
-share/apps/kstyle/pixmaps/pinkmarble.png
-share/apps/kstyle/pixmaps/red_checkmark.png
 share/apps/kstyle/pixmaps/riscos/arrowdown.png
 share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
 share/apps/kstyle/pixmaps/riscos/arrowleft.png
@@ -2488,40 +2816,14 @@ share/apps/kstyle/pixmaps/riscos/vscrollbar.png
 share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
 share/apps/kstyle/pixmaps/riscos/vscrollborder.png
 share/apps/kstyle/pixmaps/riscos/vtab.png
-share/apps/kstyle/pixmaps/sbdeco_brown.png
-share/apps/kstyle/pixmaps/sbdeco_elec.png
-share/apps/kstyle/pixmaps/sbdeco_elec_small.png
-share/apps/kstyle/pixmaps/sbdeco_elec_smalldown.png
-share/apps/kstyle/pixmaps/sbdeco_elecdown.png
-share/apps/kstyle/pixmaps/sbdeco_gray.png
-share/apps/kstyle/pixmaps/slate.png
-share/apps/kstyle/pixmaps/switch_off.png
-share/apps/kstyle/pixmaps/switch_on.png
-share/apps/kstyle/pixmaps/sysarrow_down.png
-share/apps/kstyle/pixmaps/sysarrow_idown.png
-share/apps/kstyle/pixmaps/sysarrow_ileft.png
-share/apps/kstyle/pixmaps/sysarrow_iright.png
-share/apps/kstyle/pixmaps/sysarrow_iup.png
-share/apps/kstyle/pixmaps/sysarrow_left.png
-share/apps/kstyle/pixmaps/sysarrow_right.png
-share/apps/kstyle/pixmaps/sysarrow_sdown.png
-share/apps/kstyle/pixmaps/sysarrow_sleft.png
-share/apps/kstyle/pixmaps/sysarrow_sright.png
-share/apps/kstyle/pixmaps/sysarrow_sup.png
-share/apps/kstyle/pixmaps/sysarrow_up.png
-share/apps/kstyle/pixmaps/sysborder.png
-share/apps/kstyle/pixmaps/sysborderdown.png
-share/apps/kstyle/pixmaps/whitemarble.png
-share/apps/kstyle/pixmaps/woodmenu.png
-share/apps/kstyle/pixmaps/yellow_off.png
-share/apps/kstyle/pixmaps/yellow_on.png
 share/apps/kstyle/themes/b3.themerc
 share/apps/kstyle/themes/default.themerc
 share/apps/kstyle/themes/highcolor.themerc
+share/apps/kstyle/themes/highcontrast.themerc
 share/apps/kstyle/themes/keramik.themerc
 share/apps/kstyle/themes/light-v2.themerc
 share/apps/kstyle/themes/light-v3.themerc
-share/apps/kstyle/themes/marble.themerc
+share/apps/kstyle/themes/plastik.themerc
 share/apps/kstyle/themes/qtcde.themerc
 share/apps/kstyle/themes/qtmotif.themerc
 share/apps/kstyle/themes/qtmotifplus.themerc
@@ -2529,8 +2831,6 @@ share/apps/kstyle/themes/qtplatinum.themerc
 share/apps/kstyle/themes/qtsgi.themerc
 share/apps/kstyle/themes/qtwindows.themerc
 share/apps/kstyle/themes/riscos.themerc
-share/apps/kstyle/themes/system.themerc
-share/apps/kstyle/themes/systemalt.themerc
 share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
 share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
 share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc
@@ -2540,13 +2840,13 @@ share/autostart/kab2kabc.desktop
 share/config/colors/40 Colors
 share/config/colors/Royal
 share/config/colors/Web
+share/config/katefiletyperc
 share/config/katesyntaxhighlightingrc
 share/config/kdebug.areas
 share/config/kdebugrc
 share/config/kdeprintrc
 share/config/khotnewstuffrc
 share/config/ksslcalist
-share/config/ktexteditor_autobookmarkerrc
 share/config/kthemestylerc
 share/config/language.codes
 share/config/ui/kprintpreviewui.rc
@@ -2563,6 +2863,9 @@ share/doc/HTML/en/common/8.png
 share/doc/HTML/en/common/9.png
 share/doc/HTML/en/common/appheader.html
 share/doc/HTML/en/common/artistic-license.html
+share/doc/HTML/en/common/bottom-left.png
+share/doc/HTML/en/common/bottom-middle.png
+share/doc/HTML/en/common/bottom-right.png
 share/doc/HTML/en/common/bottom1.png
 share/doc/HTML/en/common/bottom2.png
 share/doc/HTML/en/common/bsd-license.html
@@ -2593,6 +2896,9 @@ share/doc/HTML/en/common/mainfooter.html
 share/doc/HTML/en/common/mainheader.html
 share/doc/HTML/en/common/qpl-license.html
 share/doc/HTML/en/common/shadow.png
+share/doc/HTML/en/common/top-left.png
+share/doc/HTML/en/common/top-middle.png
+share/doc/HTML/en/common/top-right-konqueror.png
 share/doc/HTML/en/common/web-docbottom.png
 share/doc/HTML/en/common/web-doctop.png
 share/doc/HTML/en/common/x11-license.html
@@ -2601,11 +2907,73 @@ share/doc/HTML/en/kdelibs-apidocs/common
 share/doc/HTML/en/kspell/common
 share/doc/HTML/en/kspell/index.cache.bz2
 share/doc/HTML/en/kspell/index.docbook
+share/emoticons/Default/angry.png
+share/emoticons/Default/bat.png
+share/emoticons/Default/beer.png
+share/emoticons/Default/biggrin.png
+share/emoticons/Default/cake.png
+share/emoticons/Default/camera.png
+share/emoticons/Default/cat.png
+share/emoticons/Default/clock.png
+share/emoticons/Default/cocktail.png
+share/emoticons/Default/confused.png
+share/emoticons/Default/cry.png
+share/emoticons/Default/cup.png
+share/emoticons/Default/dog.png
+share/emoticons/Default/email.png
+share/emoticons/Default/embarassed.png
+share/emoticons/Default/emoticons.xml
+share/emoticons/Default/film.png
+share/emoticons/Default/foot_in_mouth.png
+share/emoticons/Default/innocent.png
+share/emoticons/Default/kiss.png
+share/emoticons/Default/lightbulb.png
+share/emoticons/Default/love.png
+share/emoticons/Default/note.png
+share/emoticons/Default/oh.png
+share/emoticons/Default/omg.png
+share/emoticons/Default/phone.png
+share/emoticons/Default/present.png
+share/emoticons/Default/rose.png
+share/emoticons/Default/sad.png
+share/emoticons/Default/shade.png
+share/emoticons/Default/sleep.png
+share/emoticons/Default/smile.png
+share/emoticons/Default/star.png
+share/emoticons/Default/teeth.png
+share/emoticons/Default/thumbs_down.png
+share/emoticons/Default/thumbs_up.png
+share/emoticons/Default/tongue.png
+share/emoticons/Default/undecided.png
+share/emoticons/Default/unhappy.png
+share/emoticons/Default/unlove.png
+share/emoticons/Default/wilted_rose.png
+share/emoticons/Default/wink.png
+share/icons/crystalsvg/128x128/actions/contents2.png
+share/icons/crystalsvg/128x128/actions/fileprint.png
+share/icons/crystalsvg/128x128/actions/filequickprint.png
+share/icons/crystalsvg/128x128/actions/frameprint.png
 share/icons/crystalsvg/128x128/actions/player_playlist.png
+share/icons/crystalsvg/128x128/actions/share.png
 share/icons/crystalsvg/128x128/apps/password.png
 share/icons/crystalsvg/128x128/devices/blockdevice.png
+share/icons/crystalsvg/128x128/devices/camera_mount.png
+share/icons/crystalsvg/128x128/devices/camera_unmount.png
 share/icons/crystalsvg/128x128/devices/chardevice.png
+share/icons/crystalsvg/128x128/devices/compact_flash_mount.png
+share/icons/crystalsvg/128x128/devices/compact_flash_unmount.png
+share/icons/crystalsvg/128x128/devices/hdd_mount.png
+share/icons/crystalsvg/128x128/devices/hdd_unmount.png
+share/icons/crystalsvg/128x128/devices/memory_stick_mount.png
+share/icons/crystalsvg/128x128/devices/memory_stick_unmount.png
 share/icons/crystalsvg/128x128/devices/mouse.png
+share/icons/crystalsvg/128x128/devices/print_class.png
+share/icons/crystalsvg/128x128/devices/printer1.png
+share/icons/crystalsvg/128x128/devices/sd_mmc_mount.png
+share/icons/crystalsvg/128x128/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/128x128/devices/smart_media_mount.png
+share/icons/crystalsvg/128x128/devices/smart_media_unmount.png
+share/icons/crystalsvg/128x128/devices/system.png
 share/icons/crystalsvg/128x128/devices/usbpendrive_mount.png
 share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png
 share/icons/crystalsvg/128x128/filesystems/desktop.png
@@ -2689,7 +3057,6 @@ share/icons/crystalsvg/128x128/mimetypes/pk.png
 share/icons/crystalsvg/128x128/mimetypes/postscript.png
 share/icons/crystalsvg/128x128/mimetypes/quicktime.png
 share/icons/crystalsvg/128x128/mimetypes/readme.png
-share/icons/crystalsvg/128x128/mimetypes/real_doc.png
 share/icons/crystalsvg/128x128/mimetypes/recycled.png
 share/icons/crystalsvg/128x128/mimetypes/resource.png
 share/icons/crystalsvg/128x128/mimetypes/rpm.png
@@ -2763,6 +3130,7 @@ share/icons/crystalsvg/16x16/actions/connect_creating.png
 share/icons/crystalsvg/16x16/actions/connect_established.png
 share/icons/crystalsvg/16x16/actions/connect_no.png
 share/icons/crystalsvg/16x16/actions/contents.png
+share/icons/crystalsvg/16x16/actions/contents2.png
 share/icons/crystalsvg/16x16/actions/contexthelp.png
 share/icons/crystalsvg/16x16/actions/crop.png
 share/icons/crystalsvg/16x16/actions/decrypted.png
@@ -2887,6 +3255,10 @@ share/icons/crystalsvg/16x16/actions/player_start.png
 share/icons/crystalsvg/16x16/actions/player_stop.png
 share/icons/crystalsvg/16x16/actions/player_time.png
 share/icons/crystalsvg/16x16/actions/player_volume.png
+share/icons/crystalsvg/16x16/actions/presence_away.png
+share/icons/crystalsvg/16x16/actions/presence_offline.png
+share/icons/crystalsvg/16x16/actions/presence_online.png
+share/icons/crystalsvg/16x16/actions/presence_unknown.png
 share/icons/crystalsvg/16x16/actions/previous.png
 share/icons/crystalsvg/16x16/actions/project_open.png
 share/icons/crystalsvg/16x16/actions/queue.png
@@ -2953,6 +3325,7 @@ share/icons/crystalsvg/16x16/actions/viewmagfit.png
 share/icons/crystalsvg/16x16/actions/window_fullscreen.png
 share/icons/crystalsvg/16x16/actions/window_new.png
 share/icons/crystalsvg/16x16/actions/window_nofullscreen.png
+share/icons/crystalsvg/16x16/actions/window_suppressed.png
 share/icons/crystalsvg/16x16/actions/wizard.png
 share/icons/crystalsvg/16x16/apps/password.png
 share/icons/crystalsvg/16x16/devices/3floppy_mount.png
@@ -2969,12 +3342,16 @@ share/icons/crystalsvg/16x16/devices/cdrom_unmount.png
 share/icons/crystalsvg/16x16/devices/cdwriter_mount.png
 share/icons/crystalsvg/16x16/devices/cdwriter_unmount.png
 share/icons/crystalsvg/16x16/devices/chardevice.png
+share/icons/crystalsvg/16x16/devices/compact_flash_mount.png
+share/icons/crystalsvg/16x16/devices/compact_flash_unmount.png
 share/icons/crystalsvg/16x16/devices/dvd_mount.png
 share/icons/crystalsvg/16x16/devices/dvd_unmount.png
 share/icons/crystalsvg/16x16/devices/hdd_mount.png
 share/icons/crystalsvg/16x16/devices/hdd_unmount.png
 share/icons/crystalsvg/16x16/devices/joystick.png
 share/icons/crystalsvg/16x16/devices/memory.png
+share/icons/crystalsvg/16x16/devices/memory_stick_mount.png
+share/icons/crystalsvg/16x16/devices/memory_stick_unmount.png
 share/icons/crystalsvg/16x16/devices/mo_mount.png
 share/icons/crystalsvg/16x16/devices/mo_unmount.png
 share/icons/crystalsvg/16x16/devices/mouse.png
@@ -2985,6 +3362,11 @@ share/icons/crystalsvg/16x16/devices/pda_blue.png
 share/icons/crystalsvg/16x16/devices/print_class.png
 share/icons/crystalsvg/16x16/devices/printer1.png
 share/icons/crystalsvg/16x16/devices/scanner.png
+share/icons/crystalsvg/16x16/devices/sd_mmc_mount.png
+share/icons/crystalsvg/16x16/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/16x16/devices/smart_media_mount.png
+share/icons/crystalsvg/16x16/devices/smart_media_unmount.png
+share/icons/crystalsvg/16x16/devices/system.png
 share/icons/crystalsvg/16x16/devices/tablet.png
 share/icons/crystalsvg/16x16/devices/tv.png
 share/icons/crystalsvg/16x16/devices/usbpendrive_mount.png
@@ -3025,6 +3407,7 @@ share/icons/crystalsvg/16x16/filesystems/folder_violet.png
 share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png
 share/icons/crystalsvg/16x16/filesystems/folder_yellow.png
 share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/16x16/filesystems/ftp.png
 share/icons/crystalsvg/16x16/filesystems/link.png
 share/icons/crystalsvg/16x16/filesystems/lockoverlay.png
 share/icons/crystalsvg/16x16/filesystems/network.png
@@ -3084,7 +3467,6 @@ share/icons/crystalsvg/16x16/mimetypes/pk.png
 share/icons/crystalsvg/16x16/mimetypes/postscript.png
 share/icons/crystalsvg/16x16/mimetypes/quicktime.png
 share/icons/crystalsvg/16x16/mimetypes/readme.png
-share/icons/crystalsvg/16x16/mimetypes/real_doc.png
 share/icons/crystalsvg/16x16/mimetypes/recycled.png
 share/icons/crystalsvg/16x16/mimetypes/resource.png
 share/icons/crystalsvg/16x16/mimetypes/rpm.png
@@ -3154,6 +3536,7 @@ share/icons/crystalsvg/22x22/actions/connect_creating.png
 share/icons/crystalsvg/22x22/actions/connect_established.png
 share/icons/crystalsvg/22x22/actions/connect_no.png
 share/icons/crystalsvg/22x22/actions/contents.png
+share/icons/crystalsvg/22x22/actions/contents2.png
 share/icons/crystalsvg/22x22/actions/contexthelp.png
 share/icons/crystalsvg/22x22/actions/crop.png
 share/icons/crystalsvg/22x22/actions/decrypted.png
@@ -3204,6 +3587,8 @@ share/icons/crystalsvg/22x22/actions/goto.png
 share/icons/crystalsvg/22x22/actions/halfencrypted.png
 share/icons/crystalsvg/22x22/actions/help.png
 share/icons/crystalsvg/22x22/actions/history.png
+share/icons/crystalsvg/22x22/actions/idea.png
+share/icons/crystalsvg/22x22/actions/identity.png
 share/icons/crystalsvg/22x22/actions/inline_image.png
 share/icons/crystalsvg/22x22/actions/inline_table.png
 share/icons/crystalsvg/22x22/actions/kde.png
@@ -3243,6 +3628,7 @@ share/icons/crystalsvg/22x22/actions/math_sqrt.png
 share/icons/crystalsvg/22x22/actions/math_sum.png
 share/icons/crystalsvg/22x22/actions/message_reply.png
 share/icons/crystalsvg/22x22/actions/misc.png
+share/icons/crystalsvg/22x22/actions/mouse.png
 share/icons/crystalsvg/22x22/actions/move.png
 share/icons/crystalsvg/22x22/actions/music_32ndnote.png
 share/icons/crystalsvg/22x22/actions/music_cleficon.png
@@ -3287,13 +3673,12 @@ share/icons/crystalsvg/22x22/actions/rotate_ccw.png
 share/icons/crystalsvg/22x22/actions/rotate_cw.png
 share/icons/crystalsvg/22x22/actions/run.png
 share/icons/crystalsvg/22x22/actions/save_all.png
+share/icons/crystalsvg/22x22/actions/share.png
 share/icons/crystalsvg/22x22/actions/showmenu.png
 share/icons/crystalsvg/22x22/actions/signature.png
 share/icons/crystalsvg/22x22/actions/spellcheck.png
 share/icons/crystalsvg/22x22/actions/start.png
 share/icons/crystalsvg/22x22/actions/stop.png
-share/icons/crystalsvg/22x22/actions/sub.png
-share/icons/crystalsvg/22x22/actions/super.png
 share/icons/crystalsvg/22x22/actions/text.png
 share/icons/crystalsvg/22x22/actions/text_block.png
 share/icons/crystalsvg/22x22/actions/text_bold.png
@@ -3302,6 +3687,8 @@ share/icons/crystalsvg/22x22/actions/text_italic.png
 share/icons/crystalsvg/22x22/actions/text_left.png
 share/icons/crystalsvg/22x22/actions/text_right.png
 share/icons/crystalsvg/22x22/actions/text_strike.png
+share/icons/crystalsvg/22x22/actions/text_sub.png
+share/icons/crystalsvg/22x22/actions/text_super.png
 share/icons/crystalsvg/22x22/actions/text_under.png
 share/icons/crystalsvg/22x22/actions/thumbnail.png
 share/icons/crystalsvg/22x22/actions/today.png
@@ -3332,8 +3719,48 @@ share/icons/crystalsvg/22x22/actions/window_fullscreen.png
 share/icons/crystalsvg/22x22/actions/window_new.png
 share/icons/crystalsvg/22x22/actions/window_nofullscreen.png
 share/icons/crystalsvg/22x22/actions/wizard.png
+share/icons/crystalsvg/22x22/apps/password.png
+share/icons/crystalsvg/22x22/devices/3floppy_mount.png
+share/icons/crystalsvg/22x22/devices/3floppy_unmount.png
+share/icons/crystalsvg/22x22/devices/camera_mount.png
+share/icons/crystalsvg/22x22/devices/camera_unmount.png
+share/icons/crystalsvg/22x22/devices/cdaudio_unmount.png
+share/icons/crystalsvg/22x22/devices/compact_flash_mount.png
+share/icons/crystalsvg/22x22/devices/compact_flash_unmount.png
+share/icons/crystalsvg/22x22/devices/hdd_mount.png
+share/icons/crystalsvg/22x22/devices/hdd_unmount.png
+share/icons/crystalsvg/22x22/devices/joystick.png
+share/icons/crystalsvg/22x22/devices/memory_stick_mount.png
+share/icons/crystalsvg/22x22/devices/memory_stick_unmount.png
+share/icons/crystalsvg/22x22/devices/print_class.png
+share/icons/crystalsvg/22x22/devices/printer1.png
+share/icons/crystalsvg/22x22/devices/sd_mmc_mount.png
+share/icons/crystalsvg/22x22/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/22x22/devices/smart_media_mount.png
+share/icons/crystalsvg/22x22/devices/smart_media_unmount.png
+share/icons/crystalsvg/22x22/devices/system.png
 share/icons/crystalsvg/22x22/devices/usbpendrive_mount.png
 share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png
+share/icons/crystalsvg/22x22/filesystems/desktop.png
+share/icons/crystalsvg/22x22/filesystems/folder.png
+share/icons/crystalsvg/22x22/filesystems/folder_green.png
+share/icons/crystalsvg/22x22/filesystems/folder_green_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_grey.png
+share/icons/crystalsvg/22x22/filesystems/folder_grey_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_home.png
+share/icons/crystalsvg/22x22/filesystems/folder_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_orange.png
+share/icons/crystalsvg/22x22/filesystems/folder_orange_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_print.png
+share/icons/crystalsvg/22x22/filesystems/folder_red.png
+share/icons/crystalsvg/22x22/filesystems/folder_red_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_violet.png
+share/icons/crystalsvg/22x22/filesystems/folder_violet_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_yellow.png
+share/icons/crystalsvg/22x22/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/22x22/filesystems/network.png
+share/icons/crystalsvg/22x22/filesystems/trashcan_empty.png
+share/icons/crystalsvg/22x22/filesystems/trashcan_full.png
 share/icons/crystalsvg/22x22/filesystems/www.png
 share/icons/crystalsvg/22x22/mimetypes/applix.png
 share/icons/crystalsvg/22x22/mimetypes/ascii.png
@@ -3385,7 +3812,6 @@ share/icons/crystalsvg/22x22/mimetypes/pk.png
 share/icons/crystalsvg/22x22/mimetypes/postscript.png
 share/icons/crystalsvg/22x22/mimetypes/quicktime.png
 share/icons/crystalsvg/22x22/mimetypes/readme.png
-share/icons/crystalsvg/22x22/mimetypes/real_doc.png
 share/icons/crystalsvg/22x22/mimetypes/recycled.png
 share/icons/crystalsvg/22x22/mimetypes/rpm.png
 share/icons/crystalsvg/22x22/mimetypes/shellscript.png
@@ -3443,6 +3869,7 @@ share/icons/crystalsvg/32x32/actions/connect_creating.png
 share/icons/crystalsvg/32x32/actions/connect_established.png
 share/icons/crystalsvg/32x32/actions/connect_no.png
 share/icons/crystalsvg/32x32/actions/contents.png
+share/icons/crystalsvg/32x32/actions/contents2.png
 share/icons/crystalsvg/32x32/actions/contexthelp.png
 share/icons/crystalsvg/32x32/actions/decrypted.png
 share/icons/crystalsvg/32x32/actions/down.png
@@ -3541,6 +3968,10 @@ share/icons/crystalsvg/32x32/actions/player_playlist.png
 share/icons/crystalsvg/32x32/actions/player_rew.png
 share/icons/crystalsvg/32x32/actions/player_start.png
 share/icons/crystalsvg/32x32/actions/player_stop.png
+share/icons/crystalsvg/32x32/actions/presence_away.png
+share/icons/crystalsvg/32x32/actions/presence_offline.png
+share/icons/crystalsvg/32x32/actions/presence_online.png
+share/icons/crystalsvg/32x32/actions/presence_unknown.png
 share/icons/crystalsvg/32x32/actions/previous.png
 share/icons/crystalsvg/32x32/actions/project_open.png
 share/icons/crystalsvg/32x32/actions/queue.png
@@ -3567,6 +3998,9 @@ share/icons/crystalsvg/32x32/actions/text_center.png
 share/icons/crystalsvg/32x32/actions/text_italic.png
 share/icons/crystalsvg/32x32/actions/text_left.png
 share/icons/crystalsvg/32x32/actions/text_right.png
+share/icons/crystalsvg/32x32/actions/text_strike.png
+share/icons/crystalsvg/32x32/actions/text_sub.png
+share/icons/crystalsvg/32x32/actions/text_super.png
 share/icons/crystalsvg/32x32/actions/text_under.png
 share/icons/crystalsvg/32x32/actions/today.png
 share/icons/crystalsvg/32x32/actions/toggle_log.png
@@ -3611,12 +4045,16 @@ share/icons/crystalsvg/32x32/devices/cdrom_unmount.png
 share/icons/crystalsvg/32x32/devices/cdwriter_mount.png
 share/icons/crystalsvg/32x32/devices/cdwriter_unmount.png
 share/icons/crystalsvg/32x32/devices/chardevice.png
+share/icons/crystalsvg/32x32/devices/compact_flash_mount.png
+share/icons/crystalsvg/32x32/devices/compact_flash_unmount.png
 share/icons/crystalsvg/32x32/devices/dvd_mount.png
 share/icons/crystalsvg/32x32/devices/dvd_unmount.png
 share/icons/crystalsvg/32x32/devices/hdd_mount.png
 share/icons/crystalsvg/32x32/devices/hdd_unmount.png
 share/icons/crystalsvg/32x32/devices/joystick.png
 share/icons/crystalsvg/32x32/devices/memory.png
+share/icons/crystalsvg/32x32/devices/memory_stick_mount.png
+share/icons/crystalsvg/32x32/devices/memory_stick_unmount.png
 share/icons/crystalsvg/32x32/devices/mo_mount.png
 share/icons/crystalsvg/32x32/devices/mo_unmount.png
 share/icons/crystalsvg/32x32/devices/mouse.png
@@ -3627,6 +4065,11 @@ share/icons/crystalsvg/32x32/devices/pda_blue.png
 share/icons/crystalsvg/32x32/devices/print_class.png
 share/icons/crystalsvg/32x32/devices/printer1.png
 share/icons/crystalsvg/32x32/devices/scanner.png
+share/icons/crystalsvg/32x32/devices/sd_mmc_mount.png
+share/icons/crystalsvg/32x32/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/32x32/devices/smart_media_mount.png
+share/icons/crystalsvg/32x32/devices/smart_media_unmount.png
+share/icons/crystalsvg/32x32/devices/system.png
 share/icons/crystalsvg/32x32/devices/tablet.png
 share/icons/crystalsvg/32x32/devices/tv.png
 share/icons/crystalsvg/32x32/devices/usbpendrive_mount.png
@@ -3664,6 +4107,7 @@ share/icons/crystalsvg/32x32/filesystems/folder_violet.png
 share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png
 share/icons/crystalsvg/32x32/filesystems/folder_yellow.png
 share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/32x32/filesystems/ftp.png
 share/icons/crystalsvg/32x32/filesystems/link.png
 share/icons/crystalsvg/32x32/filesystems/lockoverlay.png
 share/icons/crystalsvg/32x32/filesystems/network.png
@@ -3722,7 +4166,6 @@ share/icons/crystalsvg/32x32/mimetypes/pk.png
 share/icons/crystalsvg/32x32/mimetypes/postscript.png
 share/icons/crystalsvg/32x32/mimetypes/quicktime.png
 share/icons/crystalsvg/32x32/mimetypes/readme.png
-share/icons/crystalsvg/32x32/mimetypes/real_doc.png
 share/icons/crystalsvg/32x32/mimetypes/recycled.png
 share/icons/crystalsvg/32x32/mimetypes/resource.png
 share/icons/crystalsvg/32x32/mimetypes/rpm.png
@@ -3761,18 +4204,30 @@ share/icons/crystalsvg/32x32/mimetypes/widget_doc.png
 share/icons/crystalsvg/32x32/mimetypes/wordprocessing.png
 share/icons/crystalsvg/48x48/actions/back.png
 share/icons/crystalsvg/48x48/actions/bookmark.png
+share/icons/crystalsvg/48x48/actions/contents2.png
 share/icons/crystalsvg/48x48/actions/down.png
 share/icons/crystalsvg/48x48/actions/exit.png
 share/icons/crystalsvg/48x48/actions/fileclose.png
+share/icons/crystalsvg/48x48/actions/filenew.png
+share/icons/crystalsvg/48x48/actions/fileprint.png
+share/icons/crystalsvg/48x48/actions/filequickprint.png
 share/icons/crystalsvg/48x48/actions/forward.png
+share/icons/crystalsvg/48x48/actions/frameprint.png
 share/icons/crystalsvg/48x48/actions/gear.png
+share/icons/crystalsvg/48x48/actions/identity.png
 share/icons/crystalsvg/48x48/actions/indent.png
 share/icons/crystalsvg/48x48/actions/lock.png
+share/icons/crystalsvg/48x48/actions/mail_new.png
+share/icons/crystalsvg/48x48/actions/mail_post_to.png
 share/icons/crystalsvg/48x48/actions/misc.png
 share/icons/crystalsvg/48x48/actions/player_playlist.png
+share/icons/crystalsvg/48x48/actions/presence_away.png
+share/icons/crystalsvg/48x48/actions/presence_offline.png
+share/icons/crystalsvg/48x48/actions/presence_online.png
 share/icons/crystalsvg/48x48/actions/share.png
 share/icons/crystalsvg/48x48/actions/unindent.png
 share/icons/crystalsvg/48x48/actions/up.png
+share/icons/crystalsvg/48x48/actions/wizard.png
 share/icons/crystalsvg/48x48/apps/password.png
 share/icons/crystalsvg/48x48/devices/3floppy_mount.png
 share/icons/crystalsvg/48x48/devices/3floppy_unmount.png
@@ -3788,12 +4243,16 @@ share/icons/crystalsvg/48x48/devices/cdrom_unmount.png
 share/icons/crystalsvg/48x48/devices/cdwriter_mount.png
 share/icons/crystalsvg/48x48/devices/cdwriter_unmount.png
 share/icons/crystalsvg/48x48/devices/chardevice.png
+share/icons/crystalsvg/48x48/devices/compact_flash_mount.png
+share/icons/crystalsvg/48x48/devices/compact_flash_unmount.png
 share/icons/crystalsvg/48x48/devices/dvd_mount.png
 share/icons/crystalsvg/48x48/devices/dvd_unmount.png
 share/icons/crystalsvg/48x48/devices/hdd_mount.png
 share/icons/crystalsvg/48x48/devices/hdd_unmount.png
 share/icons/crystalsvg/48x48/devices/joystick.png
 share/icons/crystalsvg/48x48/devices/memory.png
+share/icons/crystalsvg/48x48/devices/memory_stick_mount.png
+share/icons/crystalsvg/48x48/devices/memory_stick_unmount.png
 share/icons/crystalsvg/48x48/devices/mo_mount.png
 share/icons/crystalsvg/48x48/devices/mo_unmount.png
 share/icons/crystalsvg/48x48/devices/mouse.png
@@ -3804,6 +4263,11 @@ share/icons/crystalsvg/48x48/devices/pda_blue.png
 share/icons/crystalsvg/48x48/devices/print_class.png
 share/icons/crystalsvg/48x48/devices/printer1.png
 share/icons/crystalsvg/48x48/devices/scanner.png
+share/icons/crystalsvg/48x48/devices/sd_mmc_mount.png
+share/icons/crystalsvg/48x48/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/48x48/devices/smart_media_mount.png
+share/icons/crystalsvg/48x48/devices/smart_media_unmount.png
+share/icons/crystalsvg/48x48/devices/system.png
 share/icons/crystalsvg/48x48/devices/tablet.png
 share/icons/crystalsvg/48x48/devices/tv.png
 share/icons/crystalsvg/48x48/devices/usbpendrive_mount.png
@@ -3843,6 +4307,7 @@ share/icons/crystalsvg/48x48/filesystems/folder_violet.png
 share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png
 share/icons/crystalsvg/48x48/filesystems/folder_yellow.png
 share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/48x48/filesystems/ftp.png
 share/icons/crystalsvg/48x48/filesystems/link.png
 share/icons/crystalsvg/48x48/filesystems/lockoverlay.png
 share/icons/crystalsvg/48x48/filesystems/network.png
@@ -3903,7 +4368,6 @@ share/icons/crystalsvg/48x48/mimetypes/pk.png
 share/icons/crystalsvg/48x48/mimetypes/postscript.png
 share/icons/crystalsvg/48x48/mimetypes/quicktime.png
 share/icons/crystalsvg/48x48/mimetypes/readme.png
-share/icons/crystalsvg/48x48/mimetypes/real_doc.png
 share/icons/crystalsvg/48x48/mimetypes/recycled.png
 share/icons/crystalsvg/48x48/mimetypes/resource.png
 share/icons/crystalsvg/48x48/mimetypes/rpm.png
@@ -3941,9 +4405,14 @@ share/icons/crystalsvg/48x48/mimetypes/video.png
 share/icons/crystalsvg/48x48/mimetypes/widget_doc.png
 share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png
 share/icons/crystalsvg/48x48/mimetypes/zip.png
+share/icons/crystalsvg/64x64/actions/contents2.png
 share/icons/crystalsvg/64x64/actions/favorites.png
+share/icons/crystalsvg/64x64/actions/fileprint.png
+share/icons/crystalsvg/64x64/actions/filequickprint.png
+share/icons/crystalsvg/64x64/actions/frameprint.png
 share/icons/crystalsvg/64x64/actions/knewstuff.png
 share/icons/crystalsvg/64x64/actions/player_playlist.png
+share/icons/crystalsvg/64x64/actions/share.png
 share/icons/crystalsvg/64x64/apps/password.png
 share/icons/crystalsvg/64x64/devices/3floppy_mount.png
 share/icons/crystalsvg/64x64/devices/3floppy_unmount.png
@@ -3959,12 +4428,16 @@ share/icons/crystalsvg/64x64/devices/cdrom_unmount.png
 share/icons/crystalsvg/64x64/devices/cdwriter_mount.png
 share/icons/crystalsvg/64x64/devices/cdwriter_unmount.png
 share/icons/crystalsvg/64x64/devices/chardevice.png
+share/icons/crystalsvg/64x64/devices/compact_flash_mount.png
+share/icons/crystalsvg/64x64/devices/compact_flash_unmount.png
 share/icons/crystalsvg/64x64/devices/dvd_mount.png
 share/icons/crystalsvg/64x64/devices/dvd_unmount.png
 share/icons/crystalsvg/64x64/devices/hdd_mount.png
 share/icons/crystalsvg/64x64/devices/hdd_unmount.png
 share/icons/crystalsvg/64x64/devices/joystick.png
 share/icons/crystalsvg/64x64/devices/memory.png
+share/icons/crystalsvg/64x64/devices/memory_stick_mount.png
+share/icons/crystalsvg/64x64/devices/memory_stick_unmount.png
 share/icons/crystalsvg/64x64/devices/mo_mount.png
 share/icons/crystalsvg/64x64/devices/mo_unmount.png
 share/icons/crystalsvg/64x64/devices/mouse.png
@@ -3975,6 +4448,11 @@ share/icons/crystalsvg/64x64/devices/pda_blue.png
 share/icons/crystalsvg/64x64/devices/print_class.png
 share/icons/crystalsvg/64x64/devices/printer1.png
 share/icons/crystalsvg/64x64/devices/scanner.png
+share/icons/crystalsvg/64x64/devices/sd_mmc_mount.png
+share/icons/crystalsvg/64x64/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/64x64/devices/smart_media_mount.png
+share/icons/crystalsvg/64x64/devices/smart_media_unmount.png
+share/icons/crystalsvg/64x64/devices/system.png
 share/icons/crystalsvg/64x64/devices/tablet.png
 share/icons/crystalsvg/64x64/devices/tv.png
 share/icons/crystalsvg/64x64/devices/usbpendrive_mount.png
@@ -4068,7 +4546,6 @@ share/icons/crystalsvg/64x64/mimetypes/pk.png
 share/icons/crystalsvg/64x64/mimetypes/postscript.png
 share/icons/crystalsvg/64x64/mimetypes/quicktime.png
 share/icons/crystalsvg/64x64/mimetypes/readme.png
-share/icons/crystalsvg/64x64/mimetypes/real_doc.png
 share/icons/crystalsvg/64x64/mimetypes/recycled.png
 share/icons/crystalsvg/64x64/mimetypes/resource.png
 share/icons/crystalsvg/64x64/mimetypes/rpm.png
@@ -4108,52 +4585,71 @@ share/icons/crystalsvg/64x64/mimetypes/wordprocessing.png
 share/icons/crystalsvg/64x64/mimetypes/zip.png
 share/icons/crystalsvg/index.theme
 share/icons/crystalsvg/scalable/actions/about_kde.svgz
+share/icons/crystalsvg/scalable/actions/configure.svgz
+share/icons/crystalsvg/scalable/actions/contents2.svgz
+share/icons/crystalsvg/scalable/actions/exit.svgz
+share/icons/crystalsvg/scalable/actions/filenew.svgz
+share/icons/crystalsvg/scalable/actions/fileprint.svgz
+share/icons/crystalsvg/scalable/actions/filequickprint.svgz
+share/icons/crystalsvg/scalable/actions/frameprint.svgz
+share/icons/crystalsvg/scalable/actions/info.svgz
+share/icons/crystalsvg/scalable/actions/lock.svgz
+share/icons/crystalsvg/scalable/actions/mail_generic.svgz
+share/icons/crystalsvg/scalable/actions/mail_new.svgz
+share/icons/crystalsvg/scalable/actions/mail_post_to.svgz
+share/icons/crystalsvg/scalable/actions/share.svgz
+share/icons/crystalsvg/scalable/actions/text_bild.svgz
+share/icons/crystalsvg/scalable/actions/text_bold.svg
+share/icons/crystalsvg/scalable/actions/text_strike.svgz
+share/icons/crystalsvg/scalable/actions/text_sub.svgz
+share/icons/crystalsvg/scalable/actions/text_super.svgz
+share/icons/crystalsvg/scalable/actions/text_under.svgz
+share/icons/crystalsvg/scalable/actions/wizard.svgz
 share/icons/crystalsvg/scalable/devices/3floppy_mount.svgz
-share/icons/crystalsvg/scalable/devices/3floppy_umount.svgz
 share/icons/crystalsvg/scalable/devices/3floppy_unmount.svgz
 share/icons/crystalsvg/scalable/devices/5floppy_mount.svgz
-share/icons/crystalsvg/scalable/devices/5floppy_umount.svgz
 share/icons/crystalsvg/scalable/devices/5floppy_unmount.svgz
 share/icons/crystalsvg/scalable/devices/blockdevice.svgz
 share/icons/crystalsvg/scalable/devices/camera_mount.svgz
-share/icons/crystalsvg/scalable/devices/camera_umount.svgz
 share/icons/crystalsvg/scalable/devices/camera_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdaudio_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdaudio_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdaudio_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdrom_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdrom_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdrom_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdwriter_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdwriter_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdwriter_unmount.svgz
 share/icons/crystalsvg/scalable/devices/chardevice.svgz
+share/icons/crystalsvg/scalable/devices/compact_flash_mount.svgz
+share/icons/crystalsvg/scalable/devices/compact_flash_unmount.svgz
 share/icons/crystalsvg/scalable/devices/dvd_mount.svgz
-share/icons/crystalsvg/scalable/devices/dvd_umount.svgz
 share/icons/crystalsvg/scalable/devices/dvd_unmount.svgz
 share/icons/crystalsvg/scalable/devices/hdd_mount.svgz
-share/icons/crystalsvg/scalable/devices/hdd_umount.svgz
 share/icons/crystalsvg/scalable/devices/hdd_unmount.svgz
 share/icons/crystalsvg/scalable/devices/joystick.svgz
 share/icons/crystalsvg/scalable/devices/memory.svgz
+share/icons/crystalsvg/scalable/devices/memory_stick_mount.svgz
+share/icons/crystalsvg/scalable/devices/memory_stick_unmount.svgz
 share/icons/crystalsvg/scalable/devices/mo_mount.svgz
 share/icons/crystalsvg/scalable/devices/mo_umount.svgz
+share/icons/crystalsvg/scalable/devices/mo_unmount.svgz
 share/icons/crystalsvg/scalable/devices/mouse.svgz
 share/icons/crystalsvg/scalable/devices/nfs_mount.svgz
-share/icons/crystalsvg/scalable/devices/nfs_umount.svgz
 share/icons/crystalsvg/scalable/devices/nfs_unmount.svgz
 share/icons/crystalsvg/scalable/devices/pda_black.svgz
 share/icons/crystalsvg/scalable/devices/pda_blue.svgz
 share/icons/crystalsvg/scalable/devices/print_class.svgz
 share/icons/crystalsvg/scalable/devices/printer1.svgz
-share/icons/crystalsvg/scalable/devices/printer2.svgz
 share/icons/crystalsvg/scalable/devices/scanner.svgz
+share/icons/crystalsvg/scalable/devices/sd_mmc_mount.svgz
+share/icons/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
+share/icons/crystalsvg/scalable/devices/smartmedia_mount.svgz
+share/icons/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+share/icons/crystalsvg/scalable/devices/system.svgz
 share/icons/crystalsvg/scalable/devices/tablet.svgz
 share/icons/crystalsvg/scalable/devices/tv.svgz
 share/icons/crystalsvg/scalable/devices/usbpendrive_mount.svgz
 share/icons/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
 share/icons/crystalsvg/scalable/devices/zip_mount.svgz
-share/icons/crystalsvg/scalable/devices/zip_umount.svgz
 share/icons/crystalsvg/scalable/devices/zip_unmount.svgz
 share/icons/crystalsvg/scalable/filesystems/desktop.svgz
 share/icons/crystalsvg/scalable/filesystems/exec.svgz
@@ -4166,6 +4662,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_blue.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_blue_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_cyan.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
+share/icons/crystalsvg/scalable/filesystems/folder_favorite.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_green.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_green_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_grey.svgz
@@ -4179,6 +4676,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_man2.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_orange.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_orange_open.svgz
+share/icons/crystalsvg/scalable/filesystems/folder_print.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_red.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_red_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_sound.svgz
@@ -4193,11 +4691,13 @@ share/icons/crystalsvg/scalable/filesystems/home_white.svgz
 share/icons/crystalsvg/scalable/filesystems/link.svgz
 share/icons/crystalsvg/scalable/filesystems/lockoverlay.svgz
 share/icons/crystalsvg/scalable/filesystems/network.svgz
+share/icons/crystalsvg/scalable/filesystems/network_local.svgz
 share/icons/crystalsvg/scalable/filesystems/pipe.svgz
 share/icons/crystalsvg/scalable/filesystems/services.svgz
 share/icons/crystalsvg/scalable/filesystems/temporary.svgz
 share/icons/crystalsvg/scalable/filesystems/trashcan_empty.svgz
 share/icons/crystalsvg/scalable/filesystems/trashcan_full.svgz
+share/icons/crystalsvg/scalable/filesystems/www.svgz
 share/icons/crystalsvg/scalable/filesystems/zip.svgz
 share/icons/crystalsvg/scalable/mimetypes/applix.svgz
 share/icons/crystalsvg/scalable/mimetypes/ascii.svgz
@@ -4241,7 +4741,6 @@ share/icons/crystalsvg/scalable/mimetypes/pk.svgz
 share/icons/crystalsvg/scalable/mimetypes/postscript.svgz
 share/icons/crystalsvg/scalable/mimetypes/quicktime.svgz
 share/icons/crystalsvg/scalable/mimetypes/readme.svgz
-share/icons/crystalsvg/scalable/mimetypes/real_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/recycled.svgz
 share/icons/crystalsvg/scalable/mimetypes/resource.svgz
 share/icons/crystalsvg/scalable/mimetypes/rpm.svgz
@@ -4279,6 +4778,15 @@ share/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
 share/icons/crystalsvg/scalable/mimetypes/zip.svgz
 share/icons/default.kde
+share/icons/hicolor/16x16/actions/show_side_panel.png
+share/icons/hicolor/16x16/actions/view_fit_width.png
+share/icons/hicolor/16x16/actions/view_fit_window.png
+share/icons/hicolor/22x22/actions/show_side_panel.png
+share/icons/hicolor/22x22/actions/view_fit_width.png
+share/icons/hicolor/22x22/actions/view_fit_window.png
+share/icons/hicolor/32x32/actions/show_side_panel.png
+share/icons/hicolor/32x32/actions/view_fit_width.png
+share/icons/hicolor/32x32/actions/view_fit_window.png
 share/icons/hicolor/index.theme
 share/locale/all_languages
 share/mimelnk/all/all.desktop
@@ -4300,12 +4808,24 @@ share/mimelnk/application/pkcs10.desktop
 share/mimelnk/application/pkcs7-mime.desktop
 share/mimelnk/application/pkcs7-signature.desktop
 share/mimelnk/application/postscript.desktop
+share/mimelnk/application/relaxng.desktop
 share/mimelnk/application/sieve.desktop
 share/mimelnk/application/smil.desktop
 share/mimelnk/application/vnd.mozilla.xul+xml.desktop
 share/mimelnk/application/vnd.ms-asf.desktop
 share/mimelnk/application/vnd.ms-excel.desktop
 share/mimelnk/application/vnd.ms-word.desktop
+share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
+share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
+share/mimelnk/application/vnd.oasis.opendocument.graphics-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.graphics.desktop
+share/mimelnk/application/vnd.oasis.opendocument.image.desktop
+share/mimelnk/application/vnd.oasis.opendocument.presentation-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.presentation.desktop
+share/mimelnk/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.spreadsheet.desktop
+share/mimelnk/application/vnd.oasis.opendocument.text-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.text.desktop
 share/mimelnk/application/vnd.palm.desktop
 share/mimelnk/application/vnd.rn-realmedia.desktop
 share/mimelnk/application/vnd.stardivision.calc.desktop
@@ -4325,6 +4845,7 @@ share/mimelnk/application/vnd.sun.xml.writer.desktop
 share/mimelnk/application/vnd.sun.xml.writer.master.desktop
 share/mimelnk/application/vnd.sun.xml.writer.template.desktop
 share/mimelnk/application/wordperfect.desktop
+share/mimelnk/application/x-7z.desktop
 share/mimelnk/application/x-abiword.desktop
 share/mimelnk/application/x-ace.desktop
 share/mimelnk/application/x-afm.desktop
@@ -4394,6 +4915,7 @@ share/mimelnk/application/x-linguist.desktop
 share/mimelnk/application/x-lyx.desktop
 share/mimelnk/application/x-lzop.desktop
 share/mimelnk/application/x-magicpoint.desktop
+share/mimelnk/application/x-mimearchive.desktop
 share/mimelnk/application/x-msaccess.desktop
 share/mimelnk/application/x-msdos-program.desktop
 share/mimelnk/application/x-msmetafile.desktop
@@ -4430,12 +4952,15 @@ share/mimelnk/application/x-tzo.desktop
 share/mimelnk/application/x-vnd.kde.kexi.desktop
 share/mimelnk/application/x-vnd.kde.kplato.desktop
 share/mimelnk/application/x-vnd.kde.kugar.mixed.desktop
+share/mimelnk/application/x-webarchive.desktop
 share/mimelnk/application/x-x509-ca-cert.desktop
+share/mimelnk/application/x-xliff.desktop
 share/mimelnk/application/x-zerosize.desktop
 share/mimelnk/application/x-zip.desktop
 share/mimelnk/application/x-zoo.desktop
 share/mimelnk/application/xhtml+xml.desktop
 share/mimelnk/application/xml.desktop
+share/mimelnk/application/xsd.desktop
 share/mimelnk/audio/aac.desktop
 share/mimelnk/audio/ac3.desktop
 share/mimelnk/audio/basic.desktop
@@ -4470,6 +4995,7 @@ share/mimelnk/image/jpeg.desktop
 share/mimelnk/image/pjpeg.desktop
 share/mimelnk/image/png.desktop
 share/mimelnk/image/svg+xml.desktop
+share/mimelnk/image/svg-xml.desktop
 share/mimelnk/image/tiff.desktop
 share/mimelnk/image/wmf.desktop
 share/mimelnk/image/x-bmp.desktop
@@ -4511,11 +5037,13 @@ share/mimelnk/text/css.desktop
 share/mimelnk/text/docbook.desktop
 share/mimelnk/text/enriched.desktop
 share/mimelnk/text/html.desktop
+share/mimelnk/text/javascript.desktop
 share/mimelnk/text/plain.desktop
 share/mimelnk/text/rdf.desktop
 share/mimelnk/text/rss.desktop
 share/mimelnk/text/rtf.desktop
 share/mimelnk/text/sgml.desktop
+share/mimelnk/text/vnd.abc.desktop
 share/mimelnk/text/vnd.wap.wml.desktop
 share/mimelnk/text/x-adasrc.desktop
 share/mimelnk/text/x-bibtex.desktop
@@ -4535,6 +5063,7 @@ share/mimelnk/text/x-lyx.desktop
 share/mimelnk/text/x-makefile.desktop
 share/mimelnk/text/x-moc.desktop
 share/mimelnk/text/x-mswinurl.desktop
+share/mimelnk/text/x-objchdr.desktop
 share/mimelnk/text/x-objcsrc.desktop
 share/mimelnk/text/x-pascal.desktop
 share/mimelnk/text/x-perl.desktop
@@ -4546,6 +5075,12 @@ share/mimelnk/text/x-vcard.desktop
 share/mimelnk/text/x-xslfo.desktop
 share/mimelnk/text/x-xslt.desktop
 share/mimelnk/text/xml.desktop
+share/mimelnk/uri/mms.desktop
+share/mimelnk/uri/mmst.desktop
+share/mimelnk/uri/mmsu.desktop
+share/mimelnk/uri/pnm.desktop
+share/mimelnk/uri/rtspt.desktop
+share/mimelnk/uri/rtspu.desktop
 share/mimelnk/video/avi.desktop
 share/mimelnk/video/mp4.desktop
 share/mimelnk/video/mpeg.desktop
@@ -4597,23 +5132,30 @@ share/services/kresources/kabc/dir.desktop
 share/services/kresources/kabc/file.desktop
 share/services/kresources/kabc/ldapkio.desktop
 share/services/kresources/kabc/net.desktop
+share/services/kresources/kabc_manager.desktop
 share/services/kspell_aspell.desktop
 share/services/kspell_ispell.desktop
-share/services/ktexteditor_autobookmarker.desktop
 share/services/ktexteditor_docwordcompletion.desktop
 share/services/ktexteditor_insertfile.desktop
 share/services/ktexteditor_isearch.desktop
 share/services/ktexteditor_kdatatool.desktop
 share/services/metainfo.protocol
 share/services/mms.protocol
+share/services/mmst.protocol
+share/services/mmsu.protocol
+share/services/mng.kimgio
 share/services/pbm.kimgio
 share/services/pcx.kimgio
 share/services/pgm.kimgio
 share/services/png.kimgio
+share/services/pnm.protocol
 share/services/ppm.kimgio
+share/services/psd.kimgio
 share/services/rgb.kimgio
 share/services/rlogin.protocol
 share/services/rtsp.protocol
+share/services/rtspt.protocol
+share/services/rtspu.protocol
 share/services/shellscript.desktop
 share/services/ssh.protocol
 share/services/telnet.protocol
@@ -4622,11 +5164,13 @@ share/services/tiff.kimgio
 share/services/webdav.protocol
 share/services/webdavs.protocol
 share/services/xbm.kimgio
+share/services/xcf.kimgio
 share/services/xpm.kimgio
 share/services/xv.kimgio
 share/servicetypes/application.desktop
 share/servicetypes/browserview.desktop
 share/servicetypes/dcopinstantmessenger.desktop
+share/servicetypes/dcoptexttospeech.desktop
 share/servicetypes/kbytesedit.desktop
 share/servicetypes/kcmodule.desktop
 share/servicetypes/kcomprfilter.desktop
@@ -4639,6 +5183,7 @@ share/servicetypes/kpart.desktop
 share/servicetypes/kplugininfo.desktop
 share/servicetypes/kpropsdlgplugin.desktop
 share/servicetypes/kregexpeditor.desktop
+share/servicetypes/kresources_manager.desktop
 share/servicetypes/kresources_plugin.desktop
 share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
@@ -4664,7 +5209,10 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
@@ -4684,8 +5232,13 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@@ -4698,23 +5251,29 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
 @dirrm share/services/kresources/kabc
 @dirrm share/services/kresources
 @dirrm share/services/kded
+@dirrm share/mimelnk/uri
 @dirrm share/icons/crystalsvg/scalable/mimetypes
 @dirrm share/icons/crystalsvg/32x32/actions/kde
 @dirrm share/icons/crystalsvg/22x22/actions/kde
+@dirrm share/emoticons/Default
+@dirrm share/emoticons
 @dirrm share/doc/HTML/en/kspell
 @dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
@@ -4728,6 +5287,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
 @dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kjs/html
@@ -4748,8 +5309,12 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kate
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kabc/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech
 @dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dnssd/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dnssd
 @dirrm share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/arts/html
@@ -4770,10 +5335,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
 @dirrm share/apps/kssl
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools
 @dirrm share/apps/ksgmltools2/docbook/xsl/params
+@dirrm share/apps/ksgmltools2/docbook/xsl/manpages
 @dirrm share/apps/ksgmltools2/docbook/xsl/lib
 @dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
 @dirrm share/apps/ksgmltools2/docbook/xsl/images
@@ -4787,6 +5350,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/ksgmltools2/docbook
 @dirrm share/apps/ksgmltools2/customization/zh-TW/entities
 @dirrm share/apps/ksgmltools2/customization/zh-TW
+@dirrm share/apps/ksgmltools2/customization/zh-CN/entities
+@dirrm share/apps/ksgmltools2/customization/zh-CN
 @dirrm share/apps/ksgmltools2/customization/xx/entities
 @dirrm share/apps/ksgmltools2/customization/xx
 @dirrm share/apps/ksgmltools2/customization/xsl
@@ -4896,6 +5461,7 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/kdewidgets/pics
 @dirrm share/apps/kdewidgets
 @dirrm share/apps/kdeui/pics
+@dirrm share/apps/kdeui/about
 @dirrm share/apps/kdeui
 @dirrm share/apps/kdeprint/tools
 @dirrm share/apps/kdeprint/plugins
@@ -4936,6 +5502,7 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kparts
 @dirrm include/knewstuff
 @dirrm include/kmediaplayer
+@dirrm include/kmdi
 @dirrm include/kjs
 @dirrm include/kio
 @dirrm include/khexedit
@@ -4945,5 +5512,6 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kate
 @dirrm include/kabc
 @dirrm include/dom
+@dirrm include/dnssd
 @dirrm etc/xdg/menus
 @dirrm etc/xdg
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 3676dc22bfce..861698aab3b9 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	6
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -25,19 +24,20 @@ LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		artsc.0:${PORTSDIR}/audio/arts \
 		aspell:${PORTSDIR}/textproc/aspell \
 		fam.0:${PORTSDIR}/devel/fam \
+		dns_sd:${PORTSDIR}/net/mDNSResponder \
 		idn:${PORTSDIR}/devel/libidn \
 		jasper:${PORTSDIR}/graphics/jasper \
+		pcre:${PORTSDIR}/devel/pcre \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		xslt.2:${PORTSDIR}/textproc/libxslt \
-		pcre.0:${PORTSDIR}/devel/pcre
+		xslt.2:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
 		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
 
 .if ${PKGNAMESUFFIX} == -nocups
-CONFLICTS+=	kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.*
+CONFLICTS+=	kdeartwork-3.2* kdebase-3.[0-3]* kdepim-3.2*
 .else
-CONFLICTS+=	kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdelibs-nocups-[0-9]* kdepim-3.2.*
+CONFLICTS+=	kdeartwork-3.2* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2*
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .endif
 
@@ -50,7 +50,6 @@ USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-_NO_KDE_CLOSURE=yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
@@ -79,6 +78,7 @@ pre-configure:
 
 post-configure:
 	${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in
+	${TOUCH} ${WRKSRC}/kdecore/kdemacros.h.in
 	${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in
 
 post-install:
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index d33e461816d8..16bcf58e2a9a 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdelibs-3.3.2.tar.bz2) = 0473fb4c6c2cd2bc0f267cfa201f3fd8
-SIZE (KDE/kdelibs-3.3.2.tar.bz2) = 15623180
+MD5 (KDE/kdelibs-3.4.0.tar.bz2) = e5961a78b44a3005a7af6ada249e5888
+SIZE (KDE/kdelibs-3.4.0.tar.bz2) = 16861967
diff --git a/x11/kdelibs3/files/patch-dcop_dcopidlng_dcopidlng b/x11/kdelibs3/files/patch-dcop_dcopidlng_dcopidlng
deleted file mode 100644
index 41fb3987a440..000000000000
--- a/x11/kdelibs3/files/patch-dcop_dcopidlng_dcopidlng
+++ /dev/null
@@ -1,16 +0,0 @@
---- dcop/dcopidlng/dcopidlng	Sat May 22 22:55:01 2004
-+++ dcop/dcopidlng/dcopidlng	Sun Feb 20 21:49:47 2005
-@@ -1,9 +1,12 @@
- #!/bin/sh
-+
-+trap "rm -f dcopidlng.stderr.$$" 
-+
- if test -z "$KDECONFIG"; then
-     KDECONFIG=kde-config
- fi
- LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
--perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2>/tmp/dcopidlng.stderr.$$
-+perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> dcopidlng.stderr.$$
- RET=$?
- if [ $RET -ne 0 ]
- then
diff --git a/x11/kdelibs3/files/patch-dnssd_publicservice.cpp b/x11/kdelibs3/files/patch-dnssd_publicservice.cpp
new file mode 100644
index 000000000000..e65eb524913b
--- /dev/null
+++ b/x11/kdelibs3/files/patch-dnssd_publicservice.cpp
@@ -0,0 +1,15 @@
+--- dnssd/publicservice.cpp.orig	Sat Mar 19 09:36:15 2005
++++ dnssd/publicservice.cpp	Sat Mar 19 09:41:46 2005
+@@ -18,7 +18,12 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include "publicservice.h"
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #include <netinet/in.h>
+ #include <qapplication.h>
+ #include "sdevent.h"
diff --git a/x11/kdelibs3/files/patch-khtml_html_htmltokenizer.cpp b/x11/kdelibs3/files/patch-khtml_html_htmltokenizer.cpp
deleted file mode 100644
index df651b7dba30..000000000000
--- a/x11/kdelibs3/files/patch-khtml_html_htmltokenizer.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- khtml/html/htmltokenizer.cpp.orig	2005-01-14 18:34:45.783473376 -0800
-+++ khtml/html/htmltokenizer.cpp	2005-01-14 18:13:22.200607632 -0800
-@@ -1693,3 +1693,7 @@
-     onHold = _onHold;
- }
- 
-+bool HTMLTokenizer::isRunningScriptFromTokenizer() const
-+{
-+    return isExecutingScript();
-+}
---- khtml/html/htmltokenizer.h.orig	2005-01-14 18:36:55.359774784 -0800
-+++ khtml/html/htmltokenizer.h	2005-01-14 18:12:54.872762096 -0800
-@@ -171,6 +171,7 @@
- 
-     virtual bool isWaitingForScripts() const;
-     virtual bool isExecutingScript() const;
-+    virtual bool isRunningScriptFromTokenizer() const;
- protected:
-     // Internal buffers
-     ///////////////////
---- khtml/xml/dom_docimpl.cpp.orig	2005-01-14 18:37:53.073001040 -0800
-+++ khtml/xml/dom_docimpl.cpp	2005-01-14 18:18:34.716098056 -0800
-@@ -1181,7 +1181,7 @@
-     // on an explicit document.close(), the tokenizer might still be waiting on scripts,
-     // and in that case we don't want to destroy it because that will prevent the
-     // scripts from getting processed.
--    if (m_tokenizer && !m_tokenizer->isWaitingForScripts()) {
-+    if (m_tokenizer && !m_tokenizer->isWaitingForScripts() && !m_tokenizer->isRunningScriptFromTokenizer()) {
-         delete m_tokenizer;
-         m_tokenizer = 0;
-     }
---- khtml/xml/xml_tokenizer.h.orig	2005-01-14 18:38:27.401782272 -0800
-+++ khtml/xml/xml_tokenizer.h	2005-01-14 18:10:57.609588808 -0800
-@@ -122,6 +122,7 @@
-     virtual void finish() = 0;
-     virtual void setOnHold(bool /*_onHold*/) {}
-     virtual bool isWaitingForScripts() const = 0;
-+    virtual bool isRunningScriptFromTokenizer() const { return false; }
- 
- signals:
-     void finishedParsing();
diff --git a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-htmlframes2 b/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-htmlframes2
deleted file mode 100644
index 0ff5af8fe26b..000000000000
--- a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-htmlframes2
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: khtml_part.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
-retrieving revision 1.1015.2.12
-diff -u -p -r1.1015.2.12 khtml_part.cpp
---- khtml/khtml_part.cpp	17 Nov 2004 13:46:56 -0000	1.1015.2.12
-+++ khtml/khtml_part.cpp	12 Dec 2004 15:55:30 -0000
-@@ -4758,7 +4758,7 @@ KHTMLPart *
- KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
- {
- #ifdef DEBUG_FINDFRAME
--  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
-+  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
- #endif
-   // Check access
-   KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
-@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read
-   if (!checkFrameAccess(callingHtmlPart))
-      return 0;
- 
-+  if (!childFrame && !parentPart() && (name() == f))
-+     return this;
-+
-   FrameIt it = d->m_frames.find( f );
-   const FrameIt end = d->m_frames.end();
-   if ( it != end )
diff --git a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kio.diff b/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kio.diff
deleted file mode 100644
index 674ba009495b..000000000000
--- a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kio.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- kio/kio/job.cpp	9 Nov 2004 00:50:35 -0000	1.397.2.5
-+++ kio/kio/job.cpp	8 Dec 2004 01:08:15 -0000	1.397.2.8
-@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile()
-                        if ( f.open( IO_ReadWrite ) )
-                        {
-                            f.close();
-                            KSimpleConfig config( path );
-                            config.setDesktopGroup();
--                           config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
--                           KURL urlName = (*it).uSource;
--                           urlName.setPass( "" );
--                           config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
-+                           KURL url = (*it).uSource;
-+                           url.setPass( "" );
-+                           config.writePathEntry( QString::fromLatin1("URL"), url.url() );
-+                           config.writeEntry( QString::fromLatin1("Name"), url.url() );
-                            config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
-                            QString protocol = (*it).uSource.protocol();
-                            if ( protocol == QString::fromLatin1("ftp") )
-                                config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") );
-                            else if ( protocol == QString::fromLatin1("http") )
diff --git a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kioslave b/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kioslave
deleted file mode 100644
index 18dc66b03367..000000000000
--- a/x11/kdelibs3/files/patch-post-3.3.2-kdelibs-kioslave
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -b -p -u -r1.213.2.1 -r1.213.2.2
---- kioslave/ftp/ftp.cc	21 Sep 2004 16:17:56 -0000	1.213.2.1
-+++ kioslave/ftp/ftp.cc	26 Dec 2004 00:29:54 -0000	1.213.2.2
-@@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
- {
-   assert(m_control != NULL);    // must have control connection socket
- 
-+  if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
-+  {
-+    kdWarning(7102) << "Invalid command received (contains CR or LF): "
-+                    << cmd.data() << endl;
-+    error( ERR_UNSUPPORTED_ACTION, m_host );
-+    return false;
-+  }
-+
-   // Don't print out the password...
-   bool isPassCmd = (cmd.left(4).lower() == "pass");
-   if ( !isPassCmd )
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 097184ec2447..275ab08d7f62 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -16,11 +16,11 @@ bin/dcopserver_shutdown
 bin/dcopstart
 bin/filesharelist
 bin/fileshareset
-bin/ghns
 bin/imagetops
 bin/kab2kabc
 bin/kaddprinterwizard
 bin/kbuildsycoca
+bin/kcmshell
 bin/kconf_update
 bin/kconfig_compiler
 bin/kcookiejar
@@ -74,6 +74,13 @@ include/dcopobject.h
 include/dcopref.h
 include/dcopstub.h
 include/dcoptypes.h
+include/dnssd/domainbrowser.h
+include/dnssd/publicservice.h
+include/dnssd/query.h
+include/dnssd/remoteservice.h
+include/dnssd/servicebase.h
+include/dnssd/servicebrowser.h
+include/dnssd/settings.h
 include/dom/css_rule.h
 include/dom/css_stylesheet.h
 include/dom/css_value.h
@@ -138,6 +145,7 @@ include/kabc/resourceldapkio.h
 include/kabc/resourcenet.h
 include/kabc/resourceselectdialog.h
 include/kabc/secrecy.h
+include/kabc/sortmode.h
 include/kabc/sound.h
 include/kabc/stdaddressbook.h
 include/kabc/timezone.h
@@ -201,6 +209,7 @@ include/kclipboard.h
 include/kcmdlineargs.h
 include/kcmenumngr.h
 include/kcmodule.h
+include/kcmodulecontainer.h
 include/kcmoduleinfo.h
 include/kcmoduleloader.h
 include/kcmoduleproxy.h
@@ -239,10 +248,12 @@ include/kdcopactionproxy.h
 include/kdcoppropertyproxy.h
 include/kdcopservicestarter.h
 include/kde.pot
+include/kde_file.h
 include/kde_terminal_interface.h
 include/kdebug.h
 include/kdebugclasses.h
 include/kdedmodule.h
+include/kdelibs_export.h
 include/kdemacros.h
 include/kdeprint/driver.h
 include/kdeprint/kiconselectaction.h
@@ -339,6 +350,7 @@ include/kiconeffect.h
 include/kiconloader.h
 include/kicontheme.h
 include/kiconview.h
+include/kiconviewsearchline.h
 include/kidna.h
 include/kimageeffect.h
 include/kimagefilepreview.h
@@ -354,6 +366,7 @@ include/kio/connection.h
 include/kio/davjob.h
 include/kio/defaultprogress.h
 include/kio/file.h
+include/kio/forwardingslavebase.h
 include/kio/global.h
 include/kio/http.h
 include/kio/http_slave_defaults.h
@@ -363,6 +376,7 @@ include/kio/jobclasses.h
 include/kio/kdesasl.h
 include/kio/kmdbase.h
 include/kio/kmdcodec.h
+include/kio/kntlm.h
 include/kio/metainfojob.h
 include/kio/netaccess.h
 include/kio/observer.h
@@ -422,6 +436,10 @@ include/kmainwindow.h
 include/kmainwindowiface.h
 include/kmanagerselection.h
 include/kmdcodec.h
+include/kmdi/global.h
+include/kmdi/mainwindow.h
+include/kmdi/tabwidget.h
+include/kmdi/toolviewaccessor.h
 include/kmdichildarea.h
 include/kmdichildfrm.h
 include/kmdichildfrmcaption.h
@@ -453,7 +471,9 @@ include/knewstuff/downloaddialog.h
 include/knewstuff/engine.h
 include/knewstuff/entry.h
 include/knewstuff/knewstuff.h
+include/knewstuff/knewstuffbutton.h
 include/knewstuff/knewstuffgeneric.h
+include/knewstuff/knewstuffsecure.h
 include/knewstuff/provider.h
 include/knewstuff/providerdialog.h
 include/knewstuff/uploaddialog.h
@@ -490,6 +510,8 @@ include/kpixmap.h
 include/kpixmapeffect.h
 include/kpixmapio.h
 include/kpixmapprovider.h
+include/kpixmapregionselectordialog.h
+include/kpixmapregionselectorwidget.h
 include/kpixmapsplitter.h
 include/kplugininfo.h
 include/kpluginselector.h
@@ -552,6 +574,7 @@ include/ksharedptr.h
 include/kshell.h
 include/kshellcompletion.h
 include/kshortcut.h
+include/kshortcutdialog.h
 include/kshortcutlist.h
 include/kshred.h
 include/ksimpleconfig.h
@@ -564,6 +587,8 @@ include/ksocketdevice.h
 include/ksocks.h
 include/ksockssocketdevice.h
 include/ksortablevaluelist.h
+include/kspeech.h
+include/kspeechsink.h
 include/kspell.h
 include/kspell2/backgroundchecker.h
 include/kspell2/broker.h
@@ -613,6 +638,7 @@ include/kstringhandler.h
 include/kstringvalidator.h
 include/kstyle.h
 include/ksvgiconengine.h
+include/kswap.h
 include/ksycoca.h
 include/ksycocaentry.h
 include/ksycocatype.h
@@ -651,6 +677,7 @@ include/ktexteditor/selectionextdcopinterface.h
 include/ktexteditor/selectioninterface.h
 include/ktexteditor/selectioninterfaceext.h
 include/ktexteditor/sessionconfiginterface.h
+include/ktexteditor/templateinterface.h
 include/ktexteditor/texthintinterface.h
 include/ktexteditor/undointerface.h
 include/ktexteditor/variableinterface.h
@@ -662,6 +689,7 @@ include/ktimewidget.h
 include/ktip.h
 include/ktoolbar.h
 include/ktoolbarbutton.h
+include/ktoolbarlabelaction.h
 include/ktoolbarradiogroup.h
 include/ktrader.h
 include/ktypelist.h
@@ -742,6 +770,8 @@ lib/kde3/kbzip2filter.la
 lib/kde3/kbzip2filter.so
 lib/kde3/kcm_kresources.la
 lib/kde3/kcm_kresources.so
+lib/kde3/kcmshell.la
+lib/kde3/kcmshell.so
 lib/kde3/kconf_update.la
 lib/kde3/kconf_update.so
 lib/kde3/kcookiejar.la
@@ -792,12 +822,16 @@ lib/kde3/kimg_jp2.la
 lib/kde3/kimg_jp2.so
 lib/kde3/kimg_pcx.la
 lib/kde3/kimg_pcx.so
+lib/kde3/kimg_psd.la
+lib/kde3/kimg_psd.so
 lib/kde3/kimg_rgb.la
 lib/kde3/kimg_rgb.so
 lib/kde3/kimg_tga.la
 lib/kde3/kimg_tga.so
 lib/kde3/kimg_tiff.la
 lib/kde3/kimg_tiff.so
+lib/kde3/kimg_xcf.la
+lib/kde3/kimg_xcf.so
 lib/kde3/kimg_xview.la
 lib/kde3/kimg_xview.so
 lib/kde3/kio_file.la
@@ -826,8 +860,8 @@ lib/kde3/kspell_aspell.la
 lib/kde3/kspell_aspell.so
 lib/kde3/kspell_ispell.la
 lib/kde3/kspell_ispell.so
-lib/kde3/ktexteditor_autobookmarker.la
-lib/kde3/ktexteditor_autobookmarker.so
+lib/kde3/kstyle_plastik_config.la
+lib/kde3/kstyle_plastik_config.so
 lib/kde3/ktexteditor_docwordcompletion.la
 lib/kde3/ktexteditor_docwordcompletion.so
 lib/kde3/ktexteditor_insertfile.la
@@ -852,12 +886,16 @@ lib/kde3/plugins/designer/kdewidgets.la
 lib/kde3/plugins/designer/kdewidgets.so
 lib/kde3/plugins/styles/highcolor.la
 lib/kde3/plugins/styles/highcolor.so
+lib/kde3/plugins/styles/highcontrast.la
+lib/kde3/plugins/styles/highcontrast.so
 lib/kde3/plugins/styles/keramik.la
 lib/kde3/plugins/styles/keramik.so
 lib/kde3/plugins/styles/kthemestyle.la
 lib/kde3/plugins/styles/kthemestyle.so
 lib/kde3/plugins/styles/light.la
 lib/kde3/plugins/styles/light.so
+lib/kde3/plugins/styles/plastik.la
+lib/kde3/plugins/styles/plastik.so
 lib/libDCOP.la
 lib/libDCOP.so
 lib/libDCOP.so.6
@@ -900,6 +938,8 @@ lib/libkdeinit_kaddprinterwizard.la
 lib/libkdeinit_kaddprinterwizard.so
 lib/libkdeinit_kbuildsycoca.la
 lib/libkdeinit_kbuildsycoca.so
+lib/libkdeinit_kcmshell.la
+lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kconf_update.la
 lib/libkdeinit_kconf_update.so
 lib/libkdeinit_kcookiejar.la
@@ -927,6 +967,9 @@ lib/libkdesu.so.6
 lib/libkdeui.la
 lib/libkdeui.so
 lib/libkdeui.so.6
+lib/libkdnssd.la
+lib/libkdnssd.so
+lib/libkdnssd.so.1
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.6
@@ -945,6 +988,9 @@ lib/libkjs.so.3
 lib/libkmdi.la
 lib/libkmdi.so
 lib/libkmdi.so.1
+lib/libkmdi2.la
+lib/libkmdi2.so
+lib/libkmdi2.so.1
 lib/libkmediaplayer.la
 lib/libkmediaplayer.so
 lib/libkmediaplayer.so.0
@@ -954,6 +1000,9 @@ lib/libkmid.so.0
 lib/libknewstuff.la
 lib/libknewstuff.so
 lib/libknewstuff.so.1
+lib/libkntlm.la
+lib/libkntlm.so
+lib/libkntlm.so.0
 lib/libkparts.la
 lib/libkparts.so
 lib/libkparts.so.3
@@ -997,28 +1046,31 @@ share/apps/dcopidlng/Ast.pm
 share/apps/dcopidlng/Iter.pm
 share/apps/dcopidlng/kalyptus
 share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
-share/apps/dcopidlng/kalyptusDataDict.pm
 share/apps/dcopidlng/kdocAstUtil.pm
-share/apps/dcopidlng/kdocLib.pm
 share/apps/dcopidlng/kdocParseDoc.pm
 share/apps/dcopidlng/kdocUtil.pm
 share/apps/kabc/countrytransl.map
 share/apps/kabc/formats/binary.desktop
 share/apps/katepart/katepartreadonlyui.rc
 share/apps/katepart/katepartui.rc
+share/apps/katepart/syntax/abc.xml
 share/apps/katepart/syntax/ada.xml
 share/apps/katepart/syntax/ahdl.xml
 share/apps/katepart/syntax/alert.xml
 share/apps/katepart/syntax/ansic89.xml
+share/apps/katepart/syntax/asm-avr.xml
 share/apps/katepart/syntax/asm6502.xml
+share/apps/katepart/syntax/asp.xml
 share/apps/katepart/syntax/awk.xml
 share/apps/katepart/syntax/bash.xml
 share/apps/katepart/syntax/bibtex.xml
 share/apps/katepart/syntax/c.xml
 share/apps/katepart/syntax/cg.xml
+share/apps/katepart/syntax/cgis.xml
 share/apps/katepart/syntax/changelog.xml
 share/apps/katepart/syntax/cisco.xml
 share/apps/katepart/syntax/clipper.xml
+share/apps/katepart/syntax/cmake.xml
 share/apps/katepart/syntax/coldfusion.xml
 share/apps/katepart/syntax/commonlisp.xml
 share/apps/katepart/syntax/component-pascal.xml
@@ -1042,6 +1094,7 @@ share/apps/katepart/syntax/fgl-per.xml
 share/apps/katepart/syntax/fortran.xml
 share/apps/katepart/syntax/gdl.xml
 share/apps/katepart/syntax/gettext.xml
+share/apps/katepart/syntax/glsl.xml
 share/apps/katepart/syntax/gnuassembler.xml
 share/apps/katepart/syntax/haskell.xml
 share/apps/katepart/syntax/html-php.xml
@@ -1051,6 +1104,7 @@ share/apps/katepart/syntax/idl.xml
 share/apps/katepart/syntax/ilerpg.xml
 share/apps/katepart/syntax/inform.xml
 share/apps/katepart/syntax/java.xml
+share/apps/katepart/syntax/javadoc.xml
 share/apps/katepart/syntax/javascript-php.xml
 share/apps/katepart/syntax/javascript.xml
 share/apps/katepart/syntax/jsp.xml
@@ -1059,6 +1113,7 @@ share/apps/katepart/syntax/language.dtd
 share/apps/katepart/syntax/latex.xml
 share/apps/katepart/syntax/ldif.xml
 share/apps/katepart/syntax/lex.xml
+share/apps/katepart/syntax/lilypond.xml
 share/apps/katepart/syntax/literate-haskell.xml
 share/apps/katepart/syntax/logtalk.xml
 share/apps/katepart/syntax/lpc.xml
@@ -1070,8 +1125,10 @@ share/apps/katepart/syntax/matlab.xml
 share/apps/katepart/syntax/mips.xml
 share/apps/katepart/syntax/modula-2.xml
 share/apps/katepart/syntax/mup.xml
+share/apps/katepart/syntax/nasm.xml
 share/apps/katepart/syntax/objectivec.xml
 share/apps/katepart/syntax/ocaml.xml
+share/apps/katepart/syntax/octave.xml
 share/apps/katepart/syntax/pascal.xml
 share/apps/katepart/syntax/perl.xml
 share/apps/katepart/syntax/php.xml
@@ -1085,6 +1142,7 @@ share/apps/katepart/syntax/purebasic.xml
 share/apps/katepart/syntax/python.xml
 share/apps/katepart/syntax/r.xml
 share/apps/katepart/syntax/rexx.xml
+share/apps/katepart/syntax/rib.xml
 share/apps/katepart/syntax/rpmspec.xml
 share/apps/katepart/syntax/rsiidl.xml
 share/apps/katepart/syntax/ruby.xml
@@ -1094,9 +1152,11 @@ share/apps/katepart/syntax/sci.xml
 share/apps/katepart/syntax/sgml.xml
 share/apps/katepart/syntax/sieve.xml
 share/apps/katepart/syntax/sml.xml
+share/apps/katepart/syntax/spice.xml
 share/apps/katepart/syntax/sql-mysql.xml
 share/apps/katepart/syntax/sql-postgresql.xml
 share/apps/katepart/syntax/sql.xml
+share/apps/katepart/syntax/stata.xml
 share/apps/katepart/syntax/syntax.template
 share/apps/katepart/syntax/tcl.xml
 share/apps/katepart/syntax/tibasic.xml
@@ -1110,6 +1170,7 @@ share/apps/katepart/syntax/winehq.xml
 share/apps/katepart/syntax/xharbour.xml
 share/apps/katepart/syntax/xml.xml
 share/apps/katepart/syntax/xmldebug.xml
+share/apps/katepart/syntax/xslt.xml
 share/apps/katepart/syntax/yacas.xml
 share/apps/katepart/syntax/yacc.xml
 share/apps/kcertpart/kcertpart.rc
@@ -1235,6 +1296,29 @@ share/apps/kdeprint/testprint.ps
 share/apps/kdeprint/tiledown.png
 share/apps/kdeprint/tileup.png
 share/apps/kdeprint/tools/escputil.desktop
+share/apps/kdeui/about/bar-bottom-left.png
+share/apps/kdeui/about/bar-bottom-middle.png
+share/apps/kdeui/about/bar-bottom-right.png
+share/apps/kdeui/about/bar-middle-left.png
+share/apps/kdeui/about/bar-middle-right.png
+share/apps/kdeui/about/bar-top-left.png
+share/apps/kdeui/about/bar-top-middle.png
+share/apps/kdeui/about/bar-top-right.png
+share/apps/kdeui/about/bottom-left.png
+share/apps/kdeui/about/bottom-middle.png
+share/apps/kdeui/about/bottom-right.png
+share/apps/kdeui/about/box-bottom-left.png
+share/apps/kdeui/about/box-bottom-middle.png
+share/apps/kdeui/about/box-bottom-right.png
+share/apps/kdeui/about/box-middle-left.png
+share/apps/kdeui/about/box-middle-right.png
+share/apps/kdeui/about/box-top-left.png
+share/apps/kdeui/about/box-top-middle.png
+share/apps/kdeui/about/box-top-right.png
+share/apps/kdeui/about/kde_infopage.css
+share/apps/kdeui/about/kde_infopage_rtl.css
+share/apps/kdeui/about/top-left.png
+share/apps/kdeui/about/top-middle.png
 share/apps/kdeui/pics/aboutkde.png
 share/apps/kdeui/pics/ktip-background.png
 share/apps/kdeui/pics/ktip-bulb.png
@@ -1374,7 +1458,6 @@ share/apps/ksgmltools2/customization/cs/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/cs/lang.entities
@@ -1647,6 +1730,7 @@ share/apps/ksgmltools2/customization/ja/strings.entities
 share/apps/ksgmltools2/customization/ja/user.entities
 share/apps/ksgmltools2/customization/kde-chunk-online.xsl
 share/apps/ksgmltools2/customization/kde-chunk.xsl
+share/apps/ksgmltools2/customization/kde-man.xsl
 share/apps/ksgmltools2/customization/kde-navig-online.xsl
 share/apps/ksgmltools2/customization/kde-navig.xsl
 share/apps/ksgmltools2/customization/kde-nochunk.xsl
@@ -1774,6 +1858,7 @@ share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/pt-BR/lang.entities
@@ -2016,6 +2101,24 @@ share/apps/ksgmltools2/customization/xx/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/xx/lang.entities
 share/apps/ksgmltools2/customization/xx/strings.entities
 share/apps/ksgmltools2/customization/xx/user.entities
+share/apps/ksgmltools2/customization/zh-CN/catalog
+share/apps/ksgmltools2/customization/zh-CN/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/help-menu.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/install-compile.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/install-intro.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underLGPL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/zh-CN/lang.entities
+share/apps/ksgmltools2/customization/zh-CN/strings.entities
+share/apps/ksgmltools2/customization/zh-CN/user.entities
 share/apps/ksgmltools2/customization/zh-TW/catalog
 share/apps/ksgmltools2/customization/zh-TW/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/zh-TW/entities/gpl-notice.docbook
@@ -2105,6 +2208,11 @@ share/apps/ksgmltools2/docbook/xsl/VERSION
 share/apps/ksgmltools2/docbook/xsl/WhatsNew
 share/apps/ksgmltools2/docbook/xsl/common/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/common/af.xml
+share/apps/ksgmltools2/docbook/xsl/common/ar.xml
+share/apps/ksgmltools2/docbook/xsl/common/autoidx-ng.xsl
+share/apps/ksgmltools2/docbook/xsl/common/bg.xml
+share/apps/ksgmltools2/docbook/xsl/common/bn.xml
+share/apps/ksgmltools2/docbook/xsl/common/bs.xml
 share/apps/ksgmltools2/docbook/xsl/common/ca.xml
 share/apps/ksgmltools2/docbook/xsl/common/common.xsl
 share/apps/ksgmltools2/docbook/xsl/common/cs.xml
@@ -2118,6 +2226,8 @@ share/apps/ksgmltools2/docbook/xsl/common/eu.xml
 share/apps/ksgmltools2/docbook/xsl/common/fi.xml
 share/apps/ksgmltools2/docbook/xsl/common/fr.xml
 share/apps/ksgmltools2/docbook/xsl/common/gentext.xsl
+share/apps/ksgmltools2/docbook/xsl/common/he.xml
+share/apps/ksgmltools2/docbook/xsl/common/hr.xml
 share/apps/ksgmltools2/docbook/xsl/common/hu.xml
 share/apps/ksgmltools2/docbook/xsl/common/id.xml
 share/apps/ksgmltools2/docbook/xsl/common/it.xml
@@ -2126,10 +2236,14 @@ share/apps/ksgmltools2/docbook/xsl/common/ko.xml
 share/apps/ksgmltools2/docbook/xsl/common/l10n.dtd
 share/apps/ksgmltools2/docbook/xsl/common/l10n.xml
 share/apps/ksgmltools2/docbook/xsl/common/l10n.xsl
+share/apps/ksgmltools2/docbook/xsl/common/la.xml
 share/apps/ksgmltools2/docbook/xsl/common/labels.xsl
+share/apps/ksgmltools2/docbook/xsl/common/lt.xml
 share/apps/ksgmltools2/docbook/xsl/common/nl.xml
 share/apps/ksgmltools2/docbook/xsl/common/nn.xml
 share/apps/ksgmltools2/docbook/xsl/common/no.xml
+share/apps/ksgmltools2/docbook/xsl/common/olink.xsl
+share/apps/ksgmltools2/docbook/xsl/common/pi.xsl
 share/apps/ksgmltools2/docbook/xsl/common/pl.xml
 share/apps/ksgmltools2/docbook/xsl/common/pt.xml
 share/apps/ksgmltools2/docbook/xsl/common/pt_br.xml
@@ -2138,57 +2252,72 @@ share/apps/ksgmltools2/docbook/xsl/common/ru.xml
 share/apps/ksgmltools2/docbook/xsl/common/sk.xml
 share/apps/ksgmltools2/docbook/xsl/common/sl.xml
 share/apps/ksgmltools2/docbook/xsl/common/sr.xml
+share/apps/ksgmltools2/docbook/xsl/common/sr_Latn.xml
 share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/sv.xml
 share/apps/ksgmltools2/docbook/xsl/common/table.xsl
+share/apps/ksgmltools2/docbook/xsl/common/targetdatabase.dtd
+share/apps/ksgmltools2/docbook/xsl/common/targets.xsl
 share/apps/ksgmltools2/docbook/xsl/common/th.xml
 share/apps/ksgmltools2/docbook/xsl/common/titles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/tr.xml
 share/apps/ksgmltools2/docbook/xsl/common/uk.xml
+share/apps/ksgmltools2/docbook/xsl/common/vi.xml
 share/apps/ksgmltools2/docbook/xsl/common/xh.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml
 share/apps/ksgmltools2/docbook/xsl/html/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/html/admon.xsl
+share/apps/ksgmltools2/docbook/xsl/html/autoidx-ng.xsl
 share/apps/ksgmltools2/docbook/xsl/html/autoidx.xsl
 share/apps/ksgmltools2/docbook/xsl/html/autotoc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/biblio.xsl
 share/apps/ksgmltools2/docbook/xsl/html/block.xsl
-share/apps/ksgmltools2/docbook/xsl/html/calc-chunks.xsl
 share/apps/ksgmltools2/docbook/xsl/html/callout.xsl
 share/apps/ksgmltools2/docbook/xsl/html/changebars.xsl
-share/apps/ksgmltools2/docbook/xsl/html/chunk-experimental.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunk-code.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunk-common.xsl
 share/apps/ksgmltools2/docbook/xsl/html/chunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/chunker.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunkfast.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunktoc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/component.xsl
 share/apps/ksgmltools2/docbook/xsl/html/division.xsl
 share/apps/ksgmltools2/docbook/xsl/html/docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/html/docbookng.xsl
 share/apps/ksgmltools2/docbook/xsl/html/ebnf.xsl
-share/apps/ksgmltools2/docbook/xsl/html/expchunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/footnote.xsl
 share/apps/ksgmltools2/docbook/xsl/html/formal.xsl
 share/apps/ksgmltools2/docbook/xsl/html/glossary.xsl
 share/apps/ksgmltools2/docbook/xsl/html/graphics.xsl
+share/apps/ksgmltools2/docbook/xsl/html/html-rtf.xsl
 share/apps/ksgmltools2/docbook/xsl/html/html.xsl
+share/apps/ksgmltools2/docbook/xsl/html/htmltbl.xsl
 share/apps/ksgmltools2/docbook/xsl/html/index.xsl
 share/apps/ksgmltools2/docbook/xsl/html/info.xsl
 share/apps/ksgmltools2/docbook/xsl/html/inline.xsl
 share/apps/ksgmltools2/docbook/xsl/html/keywords.xsl
 share/apps/ksgmltools2/docbook/xsl/html/lists.xsl
+share/apps/ksgmltools2/docbook/xsl/html/maketoc.xsl
+share/apps/ksgmltools2/docbook/xsl/html/manifest.xsl
 share/apps/ksgmltools2/docbook/xsl/html/math.xsl
 share/apps/ksgmltools2/docbook/xsl/html/oldchunker.xsl
 share/apps/ksgmltools2/docbook/xsl/html/onechunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/param.ent
-share/apps/ksgmltools2/docbook/xsl/html/param.html
 share/apps/ksgmltools2/docbook/xsl/html/param.xml
 share/apps/ksgmltools2/docbook/xsl/html/param.xsl
 share/apps/ksgmltools2/docbook/xsl/html/param.xweb
 share/apps/ksgmltools2/docbook/xsl/html/pi.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-chunk-code.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-chunk.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-onechunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/qandaset.xsl
 share/apps/ksgmltools2/docbook/xsl/html/refentry.xsl
 share/apps/ksgmltools2/docbook/xsl/html/sections.xsl
 share/apps/ksgmltools2/docbook/xsl/html/synop.xsl
 share/apps/ksgmltools2/docbook/xsl/html/table.xsl
+share/apps/ksgmltools2/docbook/xsl/html/task.xsl
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xml
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xsl
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.xsl
@@ -2196,52 +2325,96 @@ share/apps/ksgmltools2/docbook/xsl/html/toc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/verbatim.xsl
 share/apps/ksgmltools2/docbook/xsl/html/xref.xsl
 share/apps/ksgmltools2/docbook/xsl/images/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/images/blank.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/1.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/1.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/10.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/10.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/11.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/11.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/12.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/12.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/13.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/13.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/14.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/14.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/15.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/15.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/2.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/2.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/3.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/3.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/4.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/4.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/5.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/5.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/6.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/6.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/7.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/7.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/8.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/8.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/9.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/9.png
 share/apps/ksgmltools2/docbook/xsl/images/callouts/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/images/caution.gif
 share/apps/ksgmltools2/docbook/xsl/images/caution.png
 share/apps/ksgmltools2/docbook/xsl/images/caution.tif
+share/apps/ksgmltools2/docbook/xsl/images/draft.png
+share/apps/ksgmltools2/docbook/xsl/images/home.gif
 share/apps/ksgmltools2/docbook/xsl/images/home.png
+share/apps/ksgmltools2/docbook/xsl/images/important.gif
 share/apps/ksgmltools2/docbook/xsl/images/important.png
 share/apps/ksgmltools2/docbook/xsl/images/important.tif
+share/apps/ksgmltools2/docbook/xsl/images/next.gif
 share/apps/ksgmltools2/docbook/xsl/images/next.png
+share/apps/ksgmltools2/docbook/xsl/images/note.gif
 share/apps/ksgmltools2/docbook/xsl/images/note.png
 share/apps/ksgmltools2/docbook/xsl/images/note.tif
+share/apps/ksgmltools2/docbook/xsl/images/prev.gif
 share/apps/ksgmltools2/docbook/xsl/images/prev.png
+share/apps/ksgmltools2/docbook/xsl/images/tip.gif
 share/apps/ksgmltools2/docbook/xsl/images/tip.png
 share/apps/ksgmltools2/docbook/xsl/images/tip.tif
 share/apps/ksgmltools2/docbook/xsl/images/toc-blank.png
 share/apps/ksgmltools2/docbook/xsl/images/toc-minus.png
 share/apps/ksgmltools2/docbook/xsl/images/toc-plus.png
+share/apps/ksgmltools2/docbook/xsl/images/up.gif
 share/apps/ksgmltools2/docbook/xsl/images/up.png
+share/apps/ksgmltools2/docbook/xsl/images/warning.gif
 share/apps/ksgmltools2/docbook/xsl/images/warning.png
 share/apps/ksgmltools2/docbook/xsl/images/warning.tif
 share/apps/ksgmltools2/docbook/xsl/lib/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/lib/lib.xml
 share/apps/ksgmltools2/docbook/xsl/lib/lib.xsl
+share/apps/ksgmltools2/docbook/xsl/lib/lib.xweb
+share/apps/ksgmltools2/docbook/xsl/manpages/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/manpages/README
+share/apps/ksgmltools2/docbook/xsl/manpages/docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/lists.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/sect23.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/synop.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/xref.xsl
 share/apps/ksgmltools2/docbook/xsl/params/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.path.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/admon.textlabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/admonition.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/admonition.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/alignment.xml
 share/apps/ksgmltools2/docbook/xsl/params/annotate.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/appendix.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/arbortext.extensions.xml
+share/apps/ksgmltools2/docbook/xsl/params/article.appendix.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/author.othername.in.middle.xml
 share/apps/ksgmltools2/docbook/xsl/params/autotoc.label.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/axf.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/base.dir.xml
 share/apps/ksgmltools2/docbook/xsl/params/biblioentry.item.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/bibliography.collection.xml
+share/apps/ksgmltools2/docbook/xsl/params/bibliography.numbered.xml
 share/apps/ksgmltools2/docbook/xsl/params/blockquote.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/body.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/body.font.master.xml
@@ -2261,78 +2434,179 @@ share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.start.character.xml
 share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.xml
 share/apps/ksgmltools2/docbook/xsl/params/callouts.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/chapter.autolabel.xml
-share/apps/ksgmltools2/docbook/xsl/params/chunk.datafile.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.first.sections.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.quietly.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.section.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.sections.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.separate.lots.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.tocs.and.lots.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.cdata-section-elements.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-public.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-system.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.indent.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.media-type.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.method.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.omit-xml-declaration.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.standalone.xml
 share/apps/ksgmltools2/docbook/xsl/params/citerefentry.link.xml
-share/apps/ksgmltools2/docbook/xsl/params/column.count.xml
+share/apps/ksgmltools2/docbook/xsl/params/collect.xref.targets.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.body.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.front.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.index.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.lot.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.titlepage.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.body.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.front.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.index.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.lot.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.titlepage.xml
+share/apps/ksgmltools2/docbook/xsl/params/compact.list.item.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/component.label.includes.part.label.xml
 share/apps/ksgmltools2/docbook/xsl/params/component.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/css.decoration.xml
-share/apps/ksgmltools2/docbook/xsl/params/default.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/current.docid.xml
+share/apps/ksgmltools2/docbook/xsl/params/default.float.class.xml
+share/apps/ksgmltools2/docbook/xsl/params/default.image.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/default.table.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/default.units.xml
 share/apps/ksgmltools2/docbook/xsl/params/dingbat.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/double.sided.xml
+share/apps/ksgmltools2/docbook/xsl/params/draft.mode.xml
+share/apps/ksgmltools2/docbook/xsl/params/draft.watermark.image.xml
+share/apps/ksgmltools2/docbook/xsl/params/ebnf.assignment.xml
+share/apps/ksgmltools2/docbook/xsl/params/ebnf.statement.terminator.xml
 share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.bgcolor.xml
 share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.border.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.id.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.name.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.provider.xml
 share/apps/ksgmltools2/docbook/xsl/params/emphasis.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/entry.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/equation.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/example.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/figure.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/firstterm.only.link.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.column.widths.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.content.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.rule.xml
+share/apps/ksgmltools2/docbook/xsl/params/footers.on.blank.pages.xml
 share/apps/ksgmltools2/docbook/xsl/params/footnote.font.size.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.number.symbols.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.sep.leader.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/fop.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.object.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.procedures.xml
+share/apps/ksgmltools2/docbook/xsl/params/formal.title.placement.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.decoration.xml
 share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.tabular.threshold.xml
 share/apps/ksgmltools2/docbook/xsl/params/function.parens.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.appendix.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.article.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.equation.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.example.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.figure.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.table.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.chapter.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.component.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.equation.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.example.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.figure.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.table.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.id.attributes.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.index.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.legalnotice.link.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.part.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.preface.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.qandadiv.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.qandaset.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.reference.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.manifest.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.meta.abstract.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.section.toc.level.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.section.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.set.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossary.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/glossary.collection.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossentry.show.acronym.xml
+share/apps/ksgmltools2/docbook/xsl/params/glosslist.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/glossterm.auto.link.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossterm.separation.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossterm.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/graphic.default.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/graphicsize.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.column.widths.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.content.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.rule.xml
+share/apps/ksgmltools2/docbook/xsl/params/headers.on.blank.pages.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.base.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cellpadding.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cellspacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cleanup.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.ext.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.extra.head.links.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.link.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.type.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.alias.file.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.forward.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.hideshow.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.locate.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.next.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.options.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.prev.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.print.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.refresh.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.stop.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.zoom.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.chm.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.default.topic.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.display.progress.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enhanced.decompilation.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enumerate.images.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.force.map.and.alias.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.binary.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.folders.instead.books.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.section.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.show.root.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhk.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.tail.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.window.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.windows.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.map.file.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.only.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.remember.window.position.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.advanced.search.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.favorities.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.menu.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.toolbar.text.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.use.hhk.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.window.geometry.xml
+share/apps/ksgmltools2/docbook/xsl/params/hyphenate.verbatim.xml
 share/apps/ksgmltools2/docbook/xsl/params/hyphenate.xml
+share/apps/ksgmltools2/docbook/xsl/params/ignore.image.scaling.xml
+share/apps/ksgmltools2/docbook/xsl/params/img.src.path.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.on.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.on.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.prefer.titleabbrev.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.preferred.page.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informal.object.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalequation.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalexample.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalfigure.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informaltable.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/inherit.keywords.xml
+share/apps/ksgmltools2/docbook/xsl/params/insert.olink.page.number.xml
+share/apps/ksgmltools2/docbook/xsl/params/insert.olink.pdf.frag.xml
 share/apps/ksgmltools2/docbook/xsl/params/insert.xref.page.number.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.default.language.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.language.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.use.xref.language.xml
 share/apps/ksgmltools2/docbook/xsl/params/label.from.part.xml
 share/apps/ksgmltools2/docbook/xsl/params/line-height.xml
 share/apps/ksgmltools2/docbook/xsl/params/linenumbering.everyNth.xml
@@ -2342,23 +2616,38 @@ share/apps/ksgmltools2/docbook/xsl/params/linenumbering.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/link.mailto.url.xml
 share/apps/ksgmltools2/docbook/xsl/params/list.block.spacing.xml
 share/apps/ksgmltools2/docbook/xsl/params/list.item.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/make.graphic.viewport.xml
+share/apps/ksgmltools2/docbook/xsl/params/make.index.markup.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.single.year.ranges.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.valid.html.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.year.ranges.xml
+share/apps/ksgmltools2/docbook/xsl/params/manifest.in.base.dir.xml
+share/apps/ksgmltools2/docbook/xsl/params/manifest.xml
+share/apps/ksgmltools2/docbook/xsl/params/manual.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/marker.section.level.xml
+share/apps/ksgmltools2/docbook/xsl/params/menuchoice.menu.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/menuchoice.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/monospace.font.family.xml
+share/apps/ksgmltools2/docbook/xsl/params/monospace.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/monospace.verbatim.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.path.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.showtitles.xml
+share/apps/ksgmltools2/docbook/xsl/params/nominal.image.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/nominal.image.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/nominal.table.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/normal.para.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.base.uri.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.debug.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.doctitle.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.fragid.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.lang.fallback.sequence.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.outline.ext.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.pubid.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.resolver.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.sysid.xml
-share/apps/ksgmltools2/docbook/xsl/params/output.method.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.height.portrait.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.height.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.margin.bottom.xml
@@ -2369,23 +2658,53 @@ share/apps/ksgmltools2/docbook/xsl/params/page.orientation.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.width.portrait.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/paper.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/para.propagates.style.xml
 share/apps/ksgmltools2/docbook/xsl/params/part.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/passivetex.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/phrase.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/pixels.per.inch.xml
+share/apps/ksgmltools2/docbook/xsl/params/points.per.em.xml
 share/apps/ksgmltools2/docbook/xsl/params/preface.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/prefer.internal.olink.xml
+share/apps/ksgmltools2/docbook/xsl/params/preferred.mediaobject.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/procedure.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/process.empty.source.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/process.source.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.arch.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.attribute.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.condition.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.conformance.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.lang.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.os.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.revision.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.revisionflag.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.security.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.userlevel.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.value.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.vendor.xml
 share/apps/ksgmltools2/docbook/xsl/params/punct.honorific.xml
 share/apps/ksgmltools2/docbook/xsl/params/qanda.defaultlabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/qanda.inherit.numeration.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/qandadiv.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.name.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/refentry.pagebreak.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/refentry.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.xref.manvolnum.xml
 share/apps/ksgmltools2/docbook/xsl/params/region.after.extent.xml
 share/apps/ksgmltools2/docbook/xsl/params/region.before.extent.xml
 share/apps/ksgmltools2/docbook/xsl/params/root.filename.xml
+share/apps/ksgmltools2/docbook/xsl/params/root.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/rootid.xml
 share/apps/ksgmltools2/docbook/xsl/params/runinhead.default.title.end.punct.xml
 share/apps/ksgmltools2/docbook/xsl/params/runinhead.title.end.punct.xml
@@ -2394,83 +2713,92 @@ share/apps/ksgmltools2/docbook/xsl/params/saxon.callouts.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.character.representation.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.linenumbering.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.tablecolumns.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.max.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/section.label.includes.component.label.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/segmentedlist.as.table.xml
 share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.style.xml
 share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.xml
 share/apps/ksgmltools2/docbook/xsl/params/show.comments.xml
 share/apps/ksgmltools2/docbook/xsl/params/show.revisionflag.xml
+share/apps/ksgmltools2/docbook/xsl/params/sidebar.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/simplesect.in.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/spacing.paras.xml
-share/apps/ksgmltools2/docbook/xsl/params/stylesheet.result.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/subscript.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/superscript.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/suppress.footer.navigation.xml
+share/apps/ksgmltools2/docbook/xsl/params/suppress.header.navigation.xml
 share/apps/ksgmltools2/docbook/xsl/params/suppress.navigation.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.color.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.padding.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.style.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/symbol.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/table.borders.with.css.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.color.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.padding.xml
 share/apps/ksgmltools2/docbook/xsl/params/table.entry.padding.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.symbols.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.color.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.table.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/tablecolumns.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/target.database.document.xml
+share/apps/ksgmltools2/docbook/xsl/params/targets.filename.xml
 share/apps/ksgmltools2/docbook/xsl/params/template.xml
+share/apps/ksgmltools2/docbook/xsl/params/tex.math.delims.xml
 share/apps/ksgmltools2/docbook/xsl/params/tex.math.file.xml
 share/apps/ksgmltools2/docbook/xsl/params/tex.math.in.alt.xml
+share/apps/ksgmltools2/docbook/xsl/params/textdata.default.encoding.xml
 share/apps/ksgmltools2/docbook/xsl/params/textinsert.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/title.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/title.margin.left.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.indent.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.list.type.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.margin.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/toc.max.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.section.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.footnotes.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.hyphenate.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.show.xml
 share/apps/ksgmltools2/docbook/xsl/params/ulink.target.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.embed.for.svg.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.id.as.filename.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.id.function.xml
-share/apps/ksgmltools2/docbook/xsl/params/using.chunker.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.local.olink.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.role.as.xrefstyle.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.role.for.mediaobject.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.svg.xml
 share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.table.xml
+share/apps/ksgmltools2/docbook/xsl/params/variablelist.max.termlength.xml
 share/apps/ksgmltools2/docbook/xsl/params/verbatim.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/wordml.template.xml
 share/apps/ksgmltools2/docbook/xsl/params/xep.extensions.xml
+share/apps/ksgmltools2/docbook/xsl/params/xep.index.item.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.label-page.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.label-title.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/xref.properties.xml
-share/apps/ksgmltools2/docbook/xsl/tools/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/olink/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olink-common.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olink.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olinkchunk.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olinksum.dtd
-share/apps/ksgmltools2/docbook/xsl/tools/profile/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/profile/profile.xsl
+share/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
 share/apps/kssl/ca-bundle.crt
-share/apps/kstyle/pixmaps/aquaice.png
-share/apps/kstyle/pixmaps/black_combo.png
-share/apps/kstyle/pixmaps/blkmarble.png
-share/apps/kstyle/pixmaps/darkgraytexture.png
-share/apps/kstyle/pixmaps/darkslider.png
-share/apps/kstyle/pixmaps/elec_combo.png
-share/apps/kstyle/pixmaps/elec_combodown.png
-share/apps/kstyle/pixmaps/elec_groove.png
-share/apps/kstyle/pixmaps/elec_hdl.png
-share/apps/kstyle/pixmaps/elec_horizhdl.png
-share/apps/kstyle/pixmaps/elec_off.png
-share/apps/kstyle/pixmaps/elec_on.png
-share/apps/kstyle/pixmaps/elec_slider.png
-share/apps/kstyle/pixmaps/gold_checked.png
-share/apps/kstyle/pixmaps/gold_unchecked.png
-share/apps/kstyle/pixmaps/graybutton.png
-share/apps/kstyle/pixmaps/grayice.png
-share/apps/kstyle/pixmaps/graymarble.png
-share/apps/kstyle/pixmaps/graymarble_dark.png
-share/apps/kstyle/pixmaps/graytexture.png
-share/apps/kstyle/pixmaps/ice.png
-share/apps/kstyle/pixmaps/marble2.png
-share/apps/kstyle/pixmaps/marble3.png
-share/apps/kstyle/pixmaps/marble_checked.png
-share/apps/kstyle/pixmaps/marble_combo.png
-share/apps/kstyle/pixmaps/marble_off.png
-share/apps/kstyle/pixmaps/marble_on.png
-share/apps/kstyle/pixmaps/marble_unchecked.png
-share/apps/kstyle/pixmaps/minigray.png
-share/apps/kstyle/pixmaps/pinkmarble.png
-share/apps/kstyle/pixmaps/red_checkmark.png
 share/apps/kstyle/pixmaps/riscos/arrowdown.png
 share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
 share/apps/kstyle/pixmaps/riscos/arrowleft.png
@@ -2503,40 +2831,14 @@ share/apps/kstyle/pixmaps/riscos/vscrollbar.png
 share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
 share/apps/kstyle/pixmaps/riscos/vscrollborder.png
 share/apps/kstyle/pixmaps/riscos/vtab.png
-share/apps/kstyle/pixmaps/sbdeco_brown.png
-share/apps/kstyle/pixmaps/sbdeco_elec.png
-share/apps/kstyle/pixmaps/sbdeco_elec_small.png
-share/apps/kstyle/pixmaps/sbdeco_elec_smalldown.png
-share/apps/kstyle/pixmaps/sbdeco_elecdown.png
-share/apps/kstyle/pixmaps/sbdeco_gray.png
-share/apps/kstyle/pixmaps/slate.png
-share/apps/kstyle/pixmaps/switch_off.png
-share/apps/kstyle/pixmaps/switch_on.png
-share/apps/kstyle/pixmaps/sysarrow_down.png
-share/apps/kstyle/pixmaps/sysarrow_idown.png
-share/apps/kstyle/pixmaps/sysarrow_ileft.png
-share/apps/kstyle/pixmaps/sysarrow_iright.png
-share/apps/kstyle/pixmaps/sysarrow_iup.png
-share/apps/kstyle/pixmaps/sysarrow_left.png
-share/apps/kstyle/pixmaps/sysarrow_right.png
-share/apps/kstyle/pixmaps/sysarrow_sdown.png
-share/apps/kstyle/pixmaps/sysarrow_sleft.png
-share/apps/kstyle/pixmaps/sysarrow_sright.png
-share/apps/kstyle/pixmaps/sysarrow_sup.png
-share/apps/kstyle/pixmaps/sysarrow_up.png
-share/apps/kstyle/pixmaps/sysborder.png
-share/apps/kstyle/pixmaps/sysborderdown.png
-share/apps/kstyle/pixmaps/whitemarble.png
-share/apps/kstyle/pixmaps/woodmenu.png
-share/apps/kstyle/pixmaps/yellow_off.png
-share/apps/kstyle/pixmaps/yellow_on.png
 share/apps/kstyle/themes/b3.themerc
 share/apps/kstyle/themes/default.themerc
 share/apps/kstyle/themes/highcolor.themerc
+share/apps/kstyle/themes/highcontrast.themerc
 share/apps/kstyle/themes/keramik.themerc
 share/apps/kstyle/themes/light-v2.themerc
 share/apps/kstyle/themes/light-v3.themerc
-share/apps/kstyle/themes/marble.themerc
+share/apps/kstyle/themes/plastik.themerc
 share/apps/kstyle/themes/qtcde.themerc
 share/apps/kstyle/themes/qtmotif.themerc
 share/apps/kstyle/themes/qtmotifplus.themerc
@@ -2544,8 +2846,6 @@ share/apps/kstyle/themes/qtplatinum.themerc
 share/apps/kstyle/themes/qtsgi.themerc
 share/apps/kstyle/themes/qtwindows.themerc
 share/apps/kstyle/themes/riscos.themerc
-share/apps/kstyle/themes/system.themerc
-share/apps/kstyle/themes/systemalt.themerc
 share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
 share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
 share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc
@@ -2555,13 +2855,13 @@ share/autostart/kab2kabc.desktop
 share/config/colors/40 Colors
 share/config/colors/Royal
 share/config/colors/Web
+share/config/katefiletyperc
 share/config/katesyntaxhighlightingrc
 share/config/kdebug.areas
 share/config/kdebugrc
 share/config/kdeprintrc
 share/config/khotnewstuffrc
 share/config/ksslcalist
-share/config/ktexteditor_autobookmarkerrc
 share/config/kthemestylerc
 share/config/language.codes
 share/config/ui/kprintpreviewui.rc
@@ -2579,6 +2879,9 @@ share/doc/HTML/en/common/8.png
 share/doc/HTML/en/common/9.png
 share/doc/HTML/en/common/appheader.html
 share/doc/HTML/en/common/artistic-license.html
+share/doc/HTML/en/common/bottom-left.png
+share/doc/HTML/en/common/bottom-middle.png
+share/doc/HTML/en/common/bottom-right.png
 share/doc/HTML/en/common/bottom1.png
 share/doc/HTML/en/common/bottom2.png
 share/doc/HTML/en/common/bsd-license.html
@@ -2609,6 +2912,9 @@ share/doc/HTML/en/common/mainfooter.html
 share/doc/HTML/en/common/mainheader.html
 share/doc/HTML/en/common/qpl-license.html
 share/doc/HTML/en/common/shadow.png
+share/doc/HTML/en/common/top-left.png
+share/doc/HTML/en/common/top-middle.png
+share/doc/HTML/en/common/top-right-konqueror.png
 share/doc/HTML/en/common/web-docbottom.png
 share/doc/HTML/en/common/web-doctop.png
 share/doc/HTML/en/common/x11-license.html
@@ -2617,11 +2923,73 @@ share/doc/HTML/en/kdelibs-apidocs/common
 share/doc/HTML/en/kspell/common
 share/doc/HTML/en/kspell/index.cache.bz2
 share/doc/HTML/en/kspell/index.docbook
+share/emoticons/Default/angry.png
+share/emoticons/Default/bat.png
+share/emoticons/Default/beer.png
+share/emoticons/Default/biggrin.png
+share/emoticons/Default/cake.png
+share/emoticons/Default/camera.png
+share/emoticons/Default/cat.png
+share/emoticons/Default/clock.png
+share/emoticons/Default/cocktail.png
+share/emoticons/Default/confused.png
+share/emoticons/Default/cry.png
+share/emoticons/Default/cup.png
+share/emoticons/Default/dog.png
+share/emoticons/Default/email.png
+share/emoticons/Default/embarassed.png
+share/emoticons/Default/emoticons.xml
+share/emoticons/Default/film.png
+share/emoticons/Default/foot_in_mouth.png
+share/emoticons/Default/innocent.png
+share/emoticons/Default/kiss.png
+share/emoticons/Default/lightbulb.png
+share/emoticons/Default/love.png
+share/emoticons/Default/note.png
+share/emoticons/Default/oh.png
+share/emoticons/Default/omg.png
+share/emoticons/Default/phone.png
+share/emoticons/Default/present.png
+share/emoticons/Default/rose.png
+share/emoticons/Default/sad.png
+share/emoticons/Default/shade.png
+share/emoticons/Default/sleep.png
+share/emoticons/Default/smile.png
+share/emoticons/Default/star.png
+share/emoticons/Default/teeth.png
+share/emoticons/Default/thumbs_down.png
+share/emoticons/Default/thumbs_up.png
+share/emoticons/Default/tongue.png
+share/emoticons/Default/undecided.png
+share/emoticons/Default/unhappy.png
+share/emoticons/Default/unlove.png
+share/emoticons/Default/wilted_rose.png
+share/emoticons/Default/wink.png
+share/icons/crystalsvg/128x128/actions/contents2.png
+share/icons/crystalsvg/128x128/actions/fileprint.png
+share/icons/crystalsvg/128x128/actions/filequickprint.png
+share/icons/crystalsvg/128x128/actions/frameprint.png
 share/icons/crystalsvg/128x128/actions/player_playlist.png
+share/icons/crystalsvg/128x128/actions/share.png
 share/icons/crystalsvg/128x128/apps/password.png
 share/icons/crystalsvg/128x128/devices/blockdevice.png
+share/icons/crystalsvg/128x128/devices/camera_mount.png
+share/icons/crystalsvg/128x128/devices/camera_unmount.png
 share/icons/crystalsvg/128x128/devices/chardevice.png
+share/icons/crystalsvg/128x128/devices/compact_flash_mount.png
+share/icons/crystalsvg/128x128/devices/compact_flash_unmount.png
+share/icons/crystalsvg/128x128/devices/hdd_mount.png
+share/icons/crystalsvg/128x128/devices/hdd_unmount.png
+share/icons/crystalsvg/128x128/devices/memory_stick_mount.png
+share/icons/crystalsvg/128x128/devices/memory_stick_unmount.png
 share/icons/crystalsvg/128x128/devices/mouse.png
+share/icons/crystalsvg/128x128/devices/print_class.png
+share/icons/crystalsvg/128x128/devices/printer1.png
+share/icons/crystalsvg/128x128/devices/sd_mmc_mount.png
+share/icons/crystalsvg/128x128/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/128x128/devices/smart_media_mount.png
+share/icons/crystalsvg/128x128/devices/smart_media_unmount.png
+share/icons/crystalsvg/128x128/devices/system.png
 share/icons/crystalsvg/128x128/devices/usbpendrive_mount.png
 share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png
 share/icons/crystalsvg/128x128/filesystems/desktop.png
@@ -2705,7 +3073,6 @@ share/icons/crystalsvg/128x128/mimetypes/pk.png
 share/icons/crystalsvg/128x128/mimetypes/postscript.png
 share/icons/crystalsvg/128x128/mimetypes/quicktime.png
 share/icons/crystalsvg/128x128/mimetypes/readme.png
-share/icons/crystalsvg/128x128/mimetypes/real_doc.png
 share/icons/crystalsvg/128x128/mimetypes/recycled.png
 share/icons/crystalsvg/128x128/mimetypes/resource.png
 share/icons/crystalsvg/128x128/mimetypes/rpm.png
@@ -2779,6 +3146,7 @@ share/icons/crystalsvg/16x16/actions/connect_creating.png
 share/icons/crystalsvg/16x16/actions/connect_established.png
 share/icons/crystalsvg/16x16/actions/connect_no.png
 share/icons/crystalsvg/16x16/actions/contents.png
+share/icons/crystalsvg/16x16/actions/contents2.png
 share/icons/crystalsvg/16x16/actions/contexthelp.png
 share/icons/crystalsvg/16x16/actions/crop.png
 share/icons/crystalsvg/16x16/actions/decrypted.png
@@ -2903,6 +3271,10 @@ share/icons/crystalsvg/16x16/actions/player_start.png
 share/icons/crystalsvg/16x16/actions/player_stop.png
 share/icons/crystalsvg/16x16/actions/player_time.png
 share/icons/crystalsvg/16x16/actions/player_volume.png
+share/icons/crystalsvg/16x16/actions/presence_away.png
+share/icons/crystalsvg/16x16/actions/presence_offline.png
+share/icons/crystalsvg/16x16/actions/presence_online.png
+share/icons/crystalsvg/16x16/actions/presence_unknown.png
 share/icons/crystalsvg/16x16/actions/previous.png
 share/icons/crystalsvg/16x16/actions/project_open.png
 share/icons/crystalsvg/16x16/actions/queue.png
@@ -2969,6 +3341,7 @@ share/icons/crystalsvg/16x16/actions/viewmagfit.png
 share/icons/crystalsvg/16x16/actions/window_fullscreen.png
 share/icons/crystalsvg/16x16/actions/window_new.png
 share/icons/crystalsvg/16x16/actions/window_nofullscreen.png
+share/icons/crystalsvg/16x16/actions/window_suppressed.png
 share/icons/crystalsvg/16x16/actions/wizard.png
 share/icons/crystalsvg/16x16/apps/password.png
 share/icons/crystalsvg/16x16/devices/3floppy_mount.png
@@ -2985,12 +3358,16 @@ share/icons/crystalsvg/16x16/devices/cdrom_unmount.png
 share/icons/crystalsvg/16x16/devices/cdwriter_mount.png
 share/icons/crystalsvg/16x16/devices/cdwriter_unmount.png
 share/icons/crystalsvg/16x16/devices/chardevice.png
+share/icons/crystalsvg/16x16/devices/compact_flash_mount.png
+share/icons/crystalsvg/16x16/devices/compact_flash_unmount.png
 share/icons/crystalsvg/16x16/devices/dvd_mount.png
 share/icons/crystalsvg/16x16/devices/dvd_unmount.png
 share/icons/crystalsvg/16x16/devices/hdd_mount.png
 share/icons/crystalsvg/16x16/devices/hdd_unmount.png
 share/icons/crystalsvg/16x16/devices/joystick.png
 share/icons/crystalsvg/16x16/devices/memory.png
+share/icons/crystalsvg/16x16/devices/memory_stick_mount.png
+share/icons/crystalsvg/16x16/devices/memory_stick_unmount.png
 share/icons/crystalsvg/16x16/devices/mo_mount.png
 share/icons/crystalsvg/16x16/devices/mo_unmount.png
 share/icons/crystalsvg/16x16/devices/mouse.png
@@ -3001,6 +3378,11 @@ share/icons/crystalsvg/16x16/devices/pda_blue.png
 share/icons/crystalsvg/16x16/devices/print_class.png
 share/icons/crystalsvg/16x16/devices/printer1.png
 share/icons/crystalsvg/16x16/devices/scanner.png
+share/icons/crystalsvg/16x16/devices/sd_mmc_mount.png
+share/icons/crystalsvg/16x16/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/16x16/devices/smart_media_mount.png
+share/icons/crystalsvg/16x16/devices/smart_media_unmount.png
+share/icons/crystalsvg/16x16/devices/system.png
 share/icons/crystalsvg/16x16/devices/tablet.png
 share/icons/crystalsvg/16x16/devices/tv.png
 share/icons/crystalsvg/16x16/devices/usbpendrive_mount.png
@@ -3041,6 +3423,7 @@ share/icons/crystalsvg/16x16/filesystems/folder_violet.png
 share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png
 share/icons/crystalsvg/16x16/filesystems/folder_yellow.png
 share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/16x16/filesystems/ftp.png
 share/icons/crystalsvg/16x16/filesystems/link.png
 share/icons/crystalsvg/16x16/filesystems/lockoverlay.png
 share/icons/crystalsvg/16x16/filesystems/network.png
@@ -3100,7 +3483,6 @@ share/icons/crystalsvg/16x16/mimetypes/pk.png
 share/icons/crystalsvg/16x16/mimetypes/postscript.png
 share/icons/crystalsvg/16x16/mimetypes/quicktime.png
 share/icons/crystalsvg/16x16/mimetypes/readme.png
-share/icons/crystalsvg/16x16/mimetypes/real_doc.png
 share/icons/crystalsvg/16x16/mimetypes/recycled.png
 share/icons/crystalsvg/16x16/mimetypes/resource.png
 share/icons/crystalsvg/16x16/mimetypes/rpm.png
@@ -3170,6 +3552,7 @@ share/icons/crystalsvg/22x22/actions/connect_creating.png
 share/icons/crystalsvg/22x22/actions/connect_established.png
 share/icons/crystalsvg/22x22/actions/connect_no.png
 share/icons/crystalsvg/22x22/actions/contents.png
+share/icons/crystalsvg/22x22/actions/contents2.png
 share/icons/crystalsvg/22x22/actions/contexthelp.png
 share/icons/crystalsvg/22x22/actions/crop.png
 share/icons/crystalsvg/22x22/actions/decrypted.png
@@ -3220,6 +3603,8 @@ share/icons/crystalsvg/22x22/actions/goto.png
 share/icons/crystalsvg/22x22/actions/halfencrypted.png
 share/icons/crystalsvg/22x22/actions/help.png
 share/icons/crystalsvg/22x22/actions/history.png
+share/icons/crystalsvg/22x22/actions/idea.png
+share/icons/crystalsvg/22x22/actions/identity.png
 share/icons/crystalsvg/22x22/actions/inline_image.png
 share/icons/crystalsvg/22x22/actions/inline_table.png
 share/icons/crystalsvg/22x22/actions/kde.png
@@ -3259,6 +3644,7 @@ share/icons/crystalsvg/22x22/actions/math_sqrt.png
 share/icons/crystalsvg/22x22/actions/math_sum.png
 share/icons/crystalsvg/22x22/actions/message_reply.png
 share/icons/crystalsvg/22x22/actions/misc.png
+share/icons/crystalsvg/22x22/actions/mouse.png
 share/icons/crystalsvg/22x22/actions/move.png
 share/icons/crystalsvg/22x22/actions/music_32ndnote.png
 share/icons/crystalsvg/22x22/actions/music_cleficon.png
@@ -3303,13 +3689,12 @@ share/icons/crystalsvg/22x22/actions/rotate_ccw.png
 share/icons/crystalsvg/22x22/actions/rotate_cw.png
 share/icons/crystalsvg/22x22/actions/run.png
 share/icons/crystalsvg/22x22/actions/save_all.png
+share/icons/crystalsvg/22x22/actions/share.png
 share/icons/crystalsvg/22x22/actions/showmenu.png
 share/icons/crystalsvg/22x22/actions/signature.png
 share/icons/crystalsvg/22x22/actions/spellcheck.png
 share/icons/crystalsvg/22x22/actions/start.png
 share/icons/crystalsvg/22x22/actions/stop.png
-share/icons/crystalsvg/22x22/actions/sub.png
-share/icons/crystalsvg/22x22/actions/super.png
 share/icons/crystalsvg/22x22/actions/text.png
 share/icons/crystalsvg/22x22/actions/text_block.png
 share/icons/crystalsvg/22x22/actions/text_bold.png
@@ -3318,6 +3703,8 @@ share/icons/crystalsvg/22x22/actions/text_italic.png
 share/icons/crystalsvg/22x22/actions/text_left.png
 share/icons/crystalsvg/22x22/actions/text_right.png
 share/icons/crystalsvg/22x22/actions/text_strike.png
+share/icons/crystalsvg/22x22/actions/text_sub.png
+share/icons/crystalsvg/22x22/actions/text_super.png
 share/icons/crystalsvg/22x22/actions/text_under.png
 share/icons/crystalsvg/22x22/actions/thumbnail.png
 share/icons/crystalsvg/22x22/actions/today.png
@@ -3348,8 +3735,48 @@ share/icons/crystalsvg/22x22/actions/window_fullscreen.png
 share/icons/crystalsvg/22x22/actions/window_new.png
 share/icons/crystalsvg/22x22/actions/window_nofullscreen.png
 share/icons/crystalsvg/22x22/actions/wizard.png
+share/icons/crystalsvg/22x22/apps/password.png
+share/icons/crystalsvg/22x22/devices/3floppy_mount.png
+share/icons/crystalsvg/22x22/devices/3floppy_unmount.png
+share/icons/crystalsvg/22x22/devices/camera_mount.png
+share/icons/crystalsvg/22x22/devices/camera_unmount.png
+share/icons/crystalsvg/22x22/devices/cdaudio_unmount.png
+share/icons/crystalsvg/22x22/devices/compact_flash_mount.png
+share/icons/crystalsvg/22x22/devices/compact_flash_unmount.png
+share/icons/crystalsvg/22x22/devices/hdd_mount.png
+share/icons/crystalsvg/22x22/devices/hdd_unmount.png
+share/icons/crystalsvg/22x22/devices/joystick.png
+share/icons/crystalsvg/22x22/devices/memory_stick_mount.png
+share/icons/crystalsvg/22x22/devices/memory_stick_unmount.png
+share/icons/crystalsvg/22x22/devices/print_class.png
+share/icons/crystalsvg/22x22/devices/printer1.png
+share/icons/crystalsvg/22x22/devices/sd_mmc_mount.png
+share/icons/crystalsvg/22x22/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/22x22/devices/smart_media_mount.png
+share/icons/crystalsvg/22x22/devices/smart_media_unmount.png
+share/icons/crystalsvg/22x22/devices/system.png
 share/icons/crystalsvg/22x22/devices/usbpendrive_mount.png
 share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png
+share/icons/crystalsvg/22x22/filesystems/desktop.png
+share/icons/crystalsvg/22x22/filesystems/folder.png
+share/icons/crystalsvg/22x22/filesystems/folder_green.png
+share/icons/crystalsvg/22x22/filesystems/folder_green_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_grey.png
+share/icons/crystalsvg/22x22/filesystems/folder_grey_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_home.png
+share/icons/crystalsvg/22x22/filesystems/folder_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_orange.png
+share/icons/crystalsvg/22x22/filesystems/folder_orange_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_print.png
+share/icons/crystalsvg/22x22/filesystems/folder_red.png
+share/icons/crystalsvg/22x22/filesystems/folder_red_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_violet.png
+share/icons/crystalsvg/22x22/filesystems/folder_violet_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_yellow.png
+share/icons/crystalsvg/22x22/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/22x22/filesystems/network.png
+share/icons/crystalsvg/22x22/filesystems/trashcan_empty.png
+share/icons/crystalsvg/22x22/filesystems/trashcan_full.png
 share/icons/crystalsvg/22x22/filesystems/www.png
 share/icons/crystalsvg/22x22/mimetypes/applix.png
 share/icons/crystalsvg/22x22/mimetypes/ascii.png
@@ -3401,7 +3828,6 @@ share/icons/crystalsvg/22x22/mimetypes/pk.png
 share/icons/crystalsvg/22x22/mimetypes/postscript.png
 share/icons/crystalsvg/22x22/mimetypes/quicktime.png
 share/icons/crystalsvg/22x22/mimetypes/readme.png
-share/icons/crystalsvg/22x22/mimetypes/real_doc.png
 share/icons/crystalsvg/22x22/mimetypes/recycled.png
 share/icons/crystalsvg/22x22/mimetypes/rpm.png
 share/icons/crystalsvg/22x22/mimetypes/shellscript.png
@@ -3459,6 +3885,7 @@ share/icons/crystalsvg/32x32/actions/connect_creating.png
 share/icons/crystalsvg/32x32/actions/connect_established.png
 share/icons/crystalsvg/32x32/actions/connect_no.png
 share/icons/crystalsvg/32x32/actions/contents.png
+share/icons/crystalsvg/32x32/actions/contents2.png
 share/icons/crystalsvg/32x32/actions/contexthelp.png
 share/icons/crystalsvg/32x32/actions/decrypted.png
 share/icons/crystalsvg/32x32/actions/down.png
@@ -3557,6 +3984,10 @@ share/icons/crystalsvg/32x32/actions/player_playlist.png
 share/icons/crystalsvg/32x32/actions/player_rew.png
 share/icons/crystalsvg/32x32/actions/player_start.png
 share/icons/crystalsvg/32x32/actions/player_stop.png
+share/icons/crystalsvg/32x32/actions/presence_away.png
+share/icons/crystalsvg/32x32/actions/presence_offline.png
+share/icons/crystalsvg/32x32/actions/presence_online.png
+share/icons/crystalsvg/32x32/actions/presence_unknown.png
 share/icons/crystalsvg/32x32/actions/previous.png
 share/icons/crystalsvg/32x32/actions/project_open.png
 share/icons/crystalsvg/32x32/actions/queue.png
@@ -3583,6 +4014,9 @@ share/icons/crystalsvg/32x32/actions/text_center.png
 share/icons/crystalsvg/32x32/actions/text_italic.png
 share/icons/crystalsvg/32x32/actions/text_left.png
 share/icons/crystalsvg/32x32/actions/text_right.png
+share/icons/crystalsvg/32x32/actions/text_strike.png
+share/icons/crystalsvg/32x32/actions/text_sub.png
+share/icons/crystalsvg/32x32/actions/text_super.png
 share/icons/crystalsvg/32x32/actions/text_under.png
 share/icons/crystalsvg/32x32/actions/today.png
 share/icons/crystalsvg/32x32/actions/toggle_log.png
@@ -3627,12 +4061,16 @@ share/icons/crystalsvg/32x32/devices/cdrom_unmount.png
 share/icons/crystalsvg/32x32/devices/cdwriter_mount.png
 share/icons/crystalsvg/32x32/devices/cdwriter_unmount.png
 share/icons/crystalsvg/32x32/devices/chardevice.png
+share/icons/crystalsvg/32x32/devices/compact_flash_mount.png
+share/icons/crystalsvg/32x32/devices/compact_flash_unmount.png
 share/icons/crystalsvg/32x32/devices/dvd_mount.png
 share/icons/crystalsvg/32x32/devices/dvd_unmount.png
 share/icons/crystalsvg/32x32/devices/hdd_mount.png
 share/icons/crystalsvg/32x32/devices/hdd_unmount.png
 share/icons/crystalsvg/32x32/devices/joystick.png
 share/icons/crystalsvg/32x32/devices/memory.png
+share/icons/crystalsvg/32x32/devices/memory_stick_mount.png
+share/icons/crystalsvg/32x32/devices/memory_stick_unmount.png
 share/icons/crystalsvg/32x32/devices/mo_mount.png
 share/icons/crystalsvg/32x32/devices/mo_unmount.png
 share/icons/crystalsvg/32x32/devices/mouse.png
@@ -3643,6 +4081,11 @@ share/icons/crystalsvg/32x32/devices/pda_blue.png
 share/icons/crystalsvg/32x32/devices/print_class.png
 share/icons/crystalsvg/32x32/devices/printer1.png
 share/icons/crystalsvg/32x32/devices/scanner.png
+share/icons/crystalsvg/32x32/devices/sd_mmc_mount.png
+share/icons/crystalsvg/32x32/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/32x32/devices/smart_media_mount.png
+share/icons/crystalsvg/32x32/devices/smart_media_unmount.png
+share/icons/crystalsvg/32x32/devices/system.png
 share/icons/crystalsvg/32x32/devices/tablet.png
 share/icons/crystalsvg/32x32/devices/tv.png
 share/icons/crystalsvg/32x32/devices/usbpendrive_mount.png
@@ -3680,6 +4123,7 @@ share/icons/crystalsvg/32x32/filesystems/folder_violet.png
 share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png
 share/icons/crystalsvg/32x32/filesystems/folder_yellow.png
 share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/32x32/filesystems/ftp.png
 share/icons/crystalsvg/32x32/filesystems/link.png
 share/icons/crystalsvg/32x32/filesystems/lockoverlay.png
 share/icons/crystalsvg/32x32/filesystems/network.png
@@ -3738,7 +4182,6 @@ share/icons/crystalsvg/32x32/mimetypes/pk.png
 share/icons/crystalsvg/32x32/mimetypes/postscript.png
 share/icons/crystalsvg/32x32/mimetypes/quicktime.png
 share/icons/crystalsvg/32x32/mimetypes/readme.png
-share/icons/crystalsvg/32x32/mimetypes/real_doc.png
 share/icons/crystalsvg/32x32/mimetypes/recycled.png
 share/icons/crystalsvg/32x32/mimetypes/resource.png
 share/icons/crystalsvg/32x32/mimetypes/rpm.png
@@ -3777,18 +4220,30 @@ share/icons/crystalsvg/32x32/mimetypes/widget_doc.png
 share/icons/crystalsvg/32x32/mimetypes/wordprocessing.png
 share/icons/crystalsvg/48x48/actions/back.png
 share/icons/crystalsvg/48x48/actions/bookmark.png
+share/icons/crystalsvg/48x48/actions/contents2.png
 share/icons/crystalsvg/48x48/actions/down.png
 share/icons/crystalsvg/48x48/actions/exit.png
 share/icons/crystalsvg/48x48/actions/fileclose.png
+share/icons/crystalsvg/48x48/actions/filenew.png
+share/icons/crystalsvg/48x48/actions/fileprint.png
+share/icons/crystalsvg/48x48/actions/filequickprint.png
 share/icons/crystalsvg/48x48/actions/forward.png
+share/icons/crystalsvg/48x48/actions/frameprint.png
 share/icons/crystalsvg/48x48/actions/gear.png
+share/icons/crystalsvg/48x48/actions/identity.png
 share/icons/crystalsvg/48x48/actions/indent.png
 share/icons/crystalsvg/48x48/actions/lock.png
+share/icons/crystalsvg/48x48/actions/mail_new.png
+share/icons/crystalsvg/48x48/actions/mail_post_to.png
 share/icons/crystalsvg/48x48/actions/misc.png
 share/icons/crystalsvg/48x48/actions/player_playlist.png
+share/icons/crystalsvg/48x48/actions/presence_away.png
+share/icons/crystalsvg/48x48/actions/presence_offline.png
+share/icons/crystalsvg/48x48/actions/presence_online.png
 share/icons/crystalsvg/48x48/actions/share.png
 share/icons/crystalsvg/48x48/actions/unindent.png
 share/icons/crystalsvg/48x48/actions/up.png
+share/icons/crystalsvg/48x48/actions/wizard.png
 share/icons/crystalsvg/48x48/apps/password.png
 share/icons/crystalsvg/48x48/devices/3floppy_mount.png
 share/icons/crystalsvg/48x48/devices/3floppy_unmount.png
@@ -3804,12 +4259,16 @@ share/icons/crystalsvg/48x48/devices/cdrom_unmount.png
 share/icons/crystalsvg/48x48/devices/cdwriter_mount.png
 share/icons/crystalsvg/48x48/devices/cdwriter_unmount.png
 share/icons/crystalsvg/48x48/devices/chardevice.png
+share/icons/crystalsvg/48x48/devices/compact_flash_mount.png
+share/icons/crystalsvg/48x48/devices/compact_flash_unmount.png
 share/icons/crystalsvg/48x48/devices/dvd_mount.png
 share/icons/crystalsvg/48x48/devices/dvd_unmount.png
 share/icons/crystalsvg/48x48/devices/hdd_mount.png
 share/icons/crystalsvg/48x48/devices/hdd_unmount.png
 share/icons/crystalsvg/48x48/devices/joystick.png
 share/icons/crystalsvg/48x48/devices/memory.png
+share/icons/crystalsvg/48x48/devices/memory_stick_mount.png
+share/icons/crystalsvg/48x48/devices/memory_stick_unmount.png
 share/icons/crystalsvg/48x48/devices/mo_mount.png
 share/icons/crystalsvg/48x48/devices/mo_unmount.png
 share/icons/crystalsvg/48x48/devices/mouse.png
@@ -3820,6 +4279,11 @@ share/icons/crystalsvg/48x48/devices/pda_blue.png
 share/icons/crystalsvg/48x48/devices/print_class.png
 share/icons/crystalsvg/48x48/devices/printer1.png
 share/icons/crystalsvg/48x48/devices/scanner.png
+share/icons/crystalsvg/48x48/devices/sd_mmc_mount.png
+share/icons/crystalsvg/48x48/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/48x48/devices/smart_media_mount.png
+share/icons/crystalsvg/48x48/devices/smart_media_unmount.png
+share/icons/crystalsvg/48x48/devices/system.png
 share/icons/crystalsvg/48x48/devices/tablet.png
 share/icons/crystalsvg/48x48/devices/tv.png
 share/icons/crystalsvg/48x48/devices/usbpendrive_mount.png
@@ -3859,6 +4323,7 @@ share/icons/crystalsvg/48x48/filesystems/folder_violet.png
 share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png
 share/icons/crystalsvg/48x48/filesystems/folder_yellow.png
 share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/48x48/filesystems/ftp.png
 share/icons/crystalsvg/48x48/filesystems/link.png
 share/icons/crystalsvg/48x48/filesystems/lockoverlay.png
 share/icons/crystalsvg/48x48/filesystems/network.png
@@ -3919,7 +4384,6 @@ share/icons/crystalsvg/48x48/mimetypes/pk.png
 share/icons/crystalsvg/48x48/mimetypes/postscript.png
 share/icons/crystalsvg/48x48/mimetypes/quicktime.png
 share/icons/crystalsvg/48x48/mimetypes/readme.png
-share/icons/crystalsvg/48x48/mimetypes/real_doc.png
 share/icons/crystalsvg/48x48/mimetypes/recycled.png
 share/icons/crystalsvg/48x48/mimetypes/resource.png
 share/icons/crystalsvg/48x48/mimetypes/rpm.png
@@ -3957,9 +4421,14 @@ share/icons/crystalsvg/48x48/mimetypes/video.png
 share/icons/crystalsvg/48x48/mimetypes/widget_doc.png
 share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png
 share/icons/crystalsvg/48x48/mimetypes/zip.png
+share/icons/crystalsvg/64x64/actions/contents2.png
 share/icons/crystalsvg/64x64/actions/favorites.png
+share/icons/crystalsvg/64x64/actions/fileprint.png
+share/icons/crystalsvg/64x64/actions/filequickprint.png
+share/icons/crystalsvg/64x64/actions/frameprint.png
 share/icons/crystalsvg/64x64/actions/knewstuff.png
 share/icons/crystalsvg/64x64/actions/player_playlist.png
+share/icons/crystalsvg/64x64/actions/share.png
 share/icons/crystalsvg/64x64/apps/password.png
 share/icons/crystalsvg/64x64/devices/3floppy_mount.png
 share/icons/crystalsvg/64x64/devices/3floppy_unmount.png
@@ -3975,12 +4444,16 @@ share/icons/crystalsvg/64x64/devices/cdrom_unmount.png
 share/icons/crystalsvg/64x64/devices/cdwriter_mount.png
 share/icons/crystalsvg/64x64/devices/cdwriter_unmount.png
 share/icons/crystalsvg/64x64/devices/chardevice.png
+share/icons/crystalsvg/64x64/devices/compact_flash_mount.png
+share/icons/crystalsvg/64x64/devices/compact_flash_unmount.png
 share/icons/crystalsvg/64x64/devices/dvd_mount.png
 share/icons/crystalsvg/64x64/devices/dvd_unmount.png
 share/icons/crystalsvg/64x64/devices/hdd_mount.png
 share/icons/crystalsvg/64x64/devices/hdd_unmount.png
 share/icons/crystalsvg/64x64/devices/joystick.png
 share/icons/crystalsvg/64x64/devices/memory.png
+share/icons/crystalsvg/64x64/devices/memory_stick_mount.png
+share/icons/crystalsvg/64x64/devices/memory_stick_unmount.png
 share/icons/crystalsvg/64x64/devices/mo_mount.png
 share/icons/crystalsvg/64x64/devices/mo_unmount.png
 share/icons/crystalsvg/64x64/devices/mouse.png
@@ -3991,6 +4464,11 @@ share/icons/crystalsvg/64x64/devices/pda_blue.png
 share/icons/crystalsvg/64x64/devices/print_class.png
 share/icons/crystalsvg/64x64/devices/printer1.png
 share/icons/crystalsvg/64x64/devices/scanner.png
+share/icons/crystalsvg/64x64/devices/sd_mmc_mount.png
+share/icons/crystalsvg/64x64/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/64x64/devices/smart_media_mount.png
+share/icons/crystalsvg/64x64/devices/smart_media_unmount.png
+share/icons/crystalsvg/64x64/devices/system.png
 share/icons/crystalsvg/64x64/devices/tablet.png
 share/icons/crystalsvg/64x64/devices/tv.png
 share/icons/crystalsvg/64x64/devices/usbpendrive_mount.png
@@ -4084,7 +4562,6 @@ share/icons/crystalsvg/64x64/mimetypes/pk.png
 share/icons/crystalsvg/64x64/mimetypes/postscript.png
 share/icons/crystalsvg/64x64/mimetypes/quicktime.png
 share/icons/crystalsvg/64x64/mimetypes/readme.png
-share/icons/crystalsvg/64x64/mimetypes/real_doc.png
 share/icons/crystalsvg/64x64/mimetypes/recycled.png
 share/icons/crystalsvg/64x64/mimetypes/resource.png
 share/icons/crystalsvg/64x64/mimetypes/rpm.png
@@ -4124,52 +4601,71 @@ share/icons/crystalsvg/64x64/mimetypes/wordprocessing.png
 share/icons/crystalsvg/64x64/mimetypes/zip.png
 share/icons/crystalsvg/index.theme
 share/icons/crystalsvg/scalable/actions/about_kde.svgz
+share/icons/crystalsvg/scalable/actions/configure.svgz
+share/icons/crystalsvg/scalable/actions/contents2.svgz
+share/icons/crystalsvg/scalable/actions/exit.svgz
+share/icons/crystalsvg/scalable/actions/filenew.svgz
+share/icons/crystalsvg/scalable/actions/fileprint.svgz
+share/icons/crystalsvg/scalable/actions/filequickprint.svgz
+share/icons/crystalsvg/scalable/actions/frameprint.svgz
+share/icons/crystalsvg/scalable/actions/info.svgz
+share/icons/crystalsvg/scalable/actions/lock.svgz
+share/icons/crystalsvg/scalable/actions/mail_generic.svgz
+share/icons/crystalsvg/scalable/actions/mail_new.svgz
+share/icons/crystalsvg/scalable/actions/mail_post_to.svgz
+share/icons/crystalsvg/scalable/actions/share.svgz
+share/icons/crystalsvg/scalable/actions/text_bild.svgz
+share/icons/crystalsvg/scalable/actions/text_bold.svg
+share/icons/crystalsvg/scalable/actions/text_strike.svgz
+share/icons/crystalsvg/scalable/actions/text_sub.svgz
+share/icons/crystalsvg/scalable/actions/text_super.svgz
+share/icons/crystalsvg/scalable/actions/text_under.svgz
+share/icons/crystalsvg/scalable/actions/wizard.svgz
 share/icons/crystalsvg/scalable/devices/3floppy_mount.svgz
-share/icons/crystalsvg/scalable/devices/3floppy_umount.svgz
 share/icons/crystalsvg/scalable/devices/3floppy_unmount.svgz
 share/icons/crystalsvg/scalable/devices/5floppy_mount.svgz
-share/icons/crystalsvg/scalable/devices/5floppy_umount.svgz
 share/icons/crystalsvg/scalable/devices/5floppy_unmount.svgz
 share/icons/crystalsvg/scalable/devices/blockdevice.svgz
 share/icons/crystalsvg/scalable/devices/camera_mount.svgz
-share/icons/crystalsvg/scalable/devices/camera_umount.svgz
 share/icons/crystalsvg/scalable/devices/camera_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdaudio_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdaudio_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdaudio_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdrom_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdrom_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdrom_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdwriter_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdwriter_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdwriter_unmount.svgz
 share/icons/crystalsvg/scalable/devices/chardevice.svgz
+share/icons/crystalsvg/scalable/devices/compact_flash_mount.svgz
+share/icons/crystalsvg/scalable/devices/compact_flash_unmount.svgz
 share/icons/crystalsvg/scalable/devices/dvd_mount.svgz
-share/icons/crystalsvg/scalable/devices/dvd_umount.svgz
 share/icons/crystalsvg/scalable/devices/dvd_unmount.svgz
 share/icons/crystalsvg/scalable/devices/hdd_mount.svgz
-share/icons/crystalsvg/scalable/devices/hdd_umount.svgz
 share/icons/crystalsvg/scalable/devices/hdd_unmount.svgz
 share/icons/crystalsvg/scalable/devices/joystick.svgz
 share/icons/crystalsvg/scalable/devices/memory.svgz
+share/icons/crystalsvg/scalable/devices/memory_stick_mount.svgz
+share/icons/crystalsvg/scalable/devices/memory_stick_unmount.svgz
 share/icons/crystalsvg/scalable/devices/mo_mount.svgz
 share/icons/crystalsvg/scalable/devices/mo_umount.svgz
+share/icons/crystalsvg/scalable/devices/mo_unmount.svgz
 share/icons/crystalsvg/scalable/devices/mouse.svgz
 share/icons/crystalsvg/scalable/devices/nfs_mount.svgz
-share/icons/crystalsvg/scalable/devices/nfs_umount.svgz
 share/icons/crystalsvg/scalable/devices/nfs_unmount.svgz
 share/icons/crystalsvg/scalable/devices/pda_black.svgz
 share/icons/crystalsvg/scalable/devices/pda_blue.svgz
 share/icons/crystalsvg/scalable/devices/print_class.svgz
 share/icons/crystalsvg/scalable/devices/printer1.svgz
-share/icons/crystalsvg/scalable/devices/printer2.svgz
 share/icons/crystalsvg/scalable/devices/scanner.svgz
+share/icons/crystalsvg/scalable/devices/sd_mmc_mount.svgz
+share/icons/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
+share/icons/crystalsvg/scalable/devices/smartmedia_mount.svgz
+share/icons/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+share/icons/crystalsvg/scalable/devices/system.svgz
 share/icons/crystalsvg/scalable/devices/tablet.svgz
 share/icons/crystalsvg/scalable/devices/tv.svgz
 share/icons/crystalsvg/scalable/devices/usbpendrive_mount.svgz
 share/icons/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
 share/icons/crystalsvg/scalable/devices/zip_mount.svgz
-share/icons/crystalsvg/scalable/devices/zip_umount.svgz
 share/icons/crystalsvg/scalable/devices/zip_unmount.svgz
 share/icons/crystalsvg/scalable/filesystems/desktop.svgz
 share/icons/crystalsvg/scalable/filesystems/exec.svgz
@@ -4182,6 +4678,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_blue.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_blue_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_cyan.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
+share/icons/crystalsvg/scalable/filesystems/folder_favorite.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_green.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_green_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_grey.svgz
@@ -4195,6 +4692,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_man2.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_orange.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_orange_open.svgz
+share/icons/crystalsvg/scalable/filesystems/folder_print.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_red.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_red_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_sound.svgz
@@ -4209,11 +4707,13 @@ share/icons/crystalsvg/scalable/filesystems/home_white.svgz
 share/icons/crystalsvg/scalable/filesystems/link.svgz
 share/icons/crystalsvg/scalable/filesystems/lockoverlay.svgz
 share/icons/crystalsvg/scalable/filesystems/network.svgz
+share/icons/crystalsvg/scalable/filesystems/network_local.svgz
 share/icons/crystalsvg/scalable/filesystems/pipe.svgz
 share/icons/crystalsvg/scalable/filesystems/services.svgz
 share/icons/crystalsvg/scalable/filesystems/temporary.svgz
 share/icons/crystalsvg/scalable/filesystems/trashcan_empty.svgz
 share/icons/crystalsvg/scalable/filesystems/trashcan_full.svgz
+share/icons/crystalsvg/scalable/filesystems/www.svgz
 share/icons/crystalsvg/scalable/filesystems/zip.svgz
 share/icons/crystalsvg/scalable/mimetypes/applix.svgz
 share/icons/crystalsvg/scalable/mimetypes/ascii.svgz
@@ -4257,7 +4757,6 @@ share/icons/crystalsvg/scalable/mimetypes/pk.svgz
 share/icons/crystalsvg/scalable/mimetypes/postscript.svgz
 share/icons/crystalsvg/scalable/mimetypes/quicktime.svgz
 share/icons/crystalsvg/scalable/mimetypes/readme.svgz
-share/icons/crystalsvg/scalable/mimetypes/real_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/recycled.svgz
 share/icons/crystalsvg/scalable/mimetypes/resource.svgz
 share/icons/crystalsvg/scalable/mimetypes/rpm.svgz
@@ -4295,6 +4794,15 @@ share/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
 share/icons/crystalsvg/scalable/mimetypes/zip.svgz
 share/icons/default.kde
+share/icons/hicolor/16x16/actions/show_side_panel.png
+share/icons/hicolor/16x16/actions/view_fit_width.png
+share/icons/hicolor/16x16/actions/view_fit_window.png
+share/icons/hicolor/22x22/actions/show_side_panel.png
+share/icons/hicolor/22x22/actions/view_fit_width.png
+share/icons/hicolor/22x22/actions/view_fit_window.png
+share/icons/hicolor/32x32/actions/show_side_panel.png
+share/icons/hicolor/32x32/actions/view_fit_width.png
+share/icons/hicolor/32x32/actions/view_fit_window.png
 share/icons/hicolor/index.theme
 share/locale/all_languages
 share/mimelnk/all/all.desktop
@@ -4316,12 +4824,24 @@ share/mimelnk/application/pkcs10.desktop
 share/mimelnk/application/pkcs7-mime.desktop
 share/mimelnk/application/pkcs7-signature.desktop
 share/mimelnk/application/postscript.desktop
+share/mimelnk/application/relaxng.desktop
 share/mimelnk/application/sieve.desktop
 share/mimelnk/application/smil.desktop
 share/mimelnk/application/vnd.mozilla.xul+xml.desktop
 share/mimelnk/application/vnd.ms-asf.desktop
 share/mimelnk/application/vnd.ms-excel.desktop
 share/mimelnk/application/vnd.ms-word.desktop
+share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
+share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
+share/mimelnk/application/vnd.oasis.opendocument.graphics-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.graphics.desktop
+share/mimelnk/application/vnd.oasis.opendocument.image.desktop
+share/mimelnk/application/vnd.oasis.opendocument.presentation-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.presentation.desktop
+share/mimelnk/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.spreadsheet.desktop
+share/mimelnk/application/vnd.oasis.opendocument.text-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.text.desktop
 share/mimelnk/application/vnd.palm.desktop
 share/mimelnk/application/vnd.rn-realmedia.desktop
 share/mimelnk/application/vnd.stardivision.calc.desktop
@@ -4341,6 +4861,7 @@ share/mimelnk/application/vnd.sun.xml.writer.desktop
 share/mimelnk/application/vnd.sun.xml.writer.master.desktop
 share/mimelnk/application/vnd.sun.xml.writer.template.desktop
 share/mimelnk/application/wordperfect.desktop
+share/mimelnk/application/x-7z.desktop
 share/mimelnk/application/x-abiword.desktop
 share/mimelnk/application/x-ace.desktop
 share/mimelnk/application/x-afm.desktop
@@ -4410,6 +4931,7 @@ share/mimelnk/application/x-linguist.desktop
 share/mimelnk/application/x-lyx.desktop
 share/mimelnk/application/x-lzop.desktop
 share/mimelnk/application/x-magicpoint.desktop
+share/mimelnk/application/x-mimearchive.desktop
 share/mimelnk/application/x-msaccess.desktop
 share/mimelnk/application/x-msdos-program.desktop
 share/mimelnk/application/x-msmetafile.desktop
@@ -4446,12 +4968,15 @@ share/mimelnk/application/x-tzo.desktop
 share/mimelnk/application/x-vnd.kde.kexi.desktop
 share/mimelnk/application/x-vnd.kde.kplato.desktop
 share/mimelnk/application/x-vnd.kde.kugar.mixed.desktop
+share/mimelnk/application/x-webarchive.desktop
 share/mimelnk/application/x-x509-ca-cert.desktop
+share/mimelnk/application/x-xliff.desktop
 share/mimelnk/application/x-zerosize.desktop
 share/mimelnk/application/x-zip.desktop
 share/mimelnk/application/x-zoo.desktop
 share/mimelnk/application/xhtml+xml.desktop
 share/mimelnk/application/xml.desktop
+share/mimelnk/application/xsd.desktop
 share/mimelnk/audio/aac.desktop
 share/mimelnk/audio/ac3.desktop
 share/mimelnk/audio/basic.desktop
@@ -4486,6 +5011,7 @@ share/mimelnk/image/jpeg.desktop
 share/mimelnk/image/pjpeg.desktop
 share/mimelnk/image/png.desktop
 share/mimelnk/image/svg+xml.desktop
+share/mimelnk/image/svg-xml.desktop
 share/mimelnk/image/tiff.desktop
 share/mimelnk/image/wmf.desktop
 share/mimelnk/image/x-bmp.desktop
@@ -4527,11 +5053,13 @@ share/mimelnk/text/css.desktop
 share/mimelnk/text/docbook.desktop
 share/mimelnk/text/enriched.desktop
 share/mimelnk/text/html.desktop
+share/mimelnk/text/javascript.desktop
 share/mimelnk/text/plain.desktop
 share/mimelnk/text/rdf.desktop
 share/mimelnk/text/rss.desktop
 share/mimelnk/text/rtf.desktop
 share/mimelnk/text/sgml.desktop
+share/mimelnk/text/vnd.abc.desktop
 share/mimelnk/text/vnd.wap.wml.desktop
 share/mimelnk/text/x-adasrc.desktop
 share/mimelnk/text/x-bibtex.desktop
@@ -4551,6 +5079,7 @@ share/mimelnk/text/x-lyx.desktop
 share/mimelnk/text/x-makefile.desktop
 share/mimelnk/text/x-moc.desktop
 share/mimelnk/text/x-mswinurl.desktop
+share/mimelnk/text/x-objchdr.desktop
 share/mimelnk/text/x-objcsrc.desktop
 share/mimelnk/text/x-pascal.desktop
 share/mimelnk/text/x-perl.desktop
@@ -4562,6 +5091,12 @@ share/mimelnk/text/x-vcard.desktop
 share/mimelnk/text/x-xslfo.desktop
 share/mimelnk/text/x-xslt.desktop
 share/mimelnk/text/xml.desktop
+share/mimelnk/uri/mms.desktop
+share/mimelnk/uri/mmst.desktop
+share/mimelnk/uri/mmsu.desktop
+share/mimelnk/uri/pnm.desktop
+share/mimelnk/uri/rtspt.desktop
+share/mimelnk/uri/rtspu.desktop
 share/mimelnk/video/avi.desktop
 share/mimelnk/video/mp4.desktop
 share/mimelnk/video/mpeg.desktop
@@ -4613,23 +5148,30 @@ share/services/kresources/kabc/dir.desktop
 share/services/kresources/kabc/file.desktop
 share/services/kresources/kabc/ldapkio.desktop
 share/services/kresources/kabc/net.desktop
+share/services/kresources/kabc_manager.desktop
 share/services/kspell_aspell.desktop
 share/services/kspell_ispell.desktop
-share/services/ktexteditor_autobookmarker.desktop
 share/services/ktexteditor_docwordcompletion.desktop
 share/services/ktexteditor_insertfile.desktop
 share/services/ktexteditor_isearch.desktop
 share/services/ktexteditor_kdatatool.desktop
 share/services/metainfo.protocol
 share/services/mms.protocol
+share/services/mmst.protocol
+share/services/mmsu.protocol
+share/services/mng.kimgio
 share/services/pbm.kimgio
 share/services/pcx.kimgio
 share/services/pgm.kimgio
 share/services/png.kimgio
+share/services/pnm.protocol
 share/services/ppm.kimgio
+share/services/psd.kimgio
 share/services/rgb.kimgio
 share/services/rlogin.protocol
 share/services/rtsp.protocol
+share/services/rtspt.protocol
+share/services/rtspu.protocol
 share/services/shellscript.desktop
 share/services/ssh.protocol
 share/services/telnet.protocol
@@ -4638,11 +5180,13 @@ share/services/tiff.kimgio
 share/services/webdav.protocol
 share/services/webdavs.protocol
 share/services/xbm.kimgio
+share/services/xcf.kimgio
 share/services/xpm.kimgio
 share/services/xv.kimgio
 share/servicetypes/application.desktop
 share/servicetypes/browserview.desktop
 share/servicetypes/dcopinstantmessenger.desktop
+share/servicetypes/dcoptexttospeech.desktop
 share/servicetypes/kbytesedit.desktop
 share/servicetypes/kcmodule.desktop
 share/servicetypes/kcomprfilter.desktop
@@ -4655,6 +5199,7 @@ share/servicetypes/kpart.desktop
 share/servicetypes/kplugininfo.desktop
 share/servicetypes/kpropsdlgplugin.desktop
 share/servicetypes/kregexpeditor.desktop
+share/servicetypes/kresources_manager.desktop
 share/servicetypes/kresources_plugin.desktop
 share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
@@ -4680,7 +5225,10 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
@@ -4700,8 +5248,13 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@@ -4714,23 +5267,29 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
 @dirrm share/services/kresources/kabc
 @dirrm share/services/kresources
 @dirrm share/services/kded
+@dirrm share/mimelnk/uri
 @dirrm share/icons/crystalsvg/scalable/mimetypes
 @dirrm share/icons/crystalsvg/32x32/actions/kde
 @dirrm share/icons/crystalsvg/22x22/actions/kde
+@dirrm share/emoticons/Default
+@dirrm share/emoticons
 @dirrm share/doc/HTML/en/kspell
 @dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
@@ -4744,6 +5303,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
 @dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kjs/html
@@ -4764,8 +5325,12 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kate
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kabc/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech
 @dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dnssd/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dnssd
 @dirrm share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/arts/html
@@ -4786,10 +5351,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
 @dirrm share/apps/kssl
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools
 @dirrm share/apps/ksgmltools2/docbook/xsl/params
+@dirrm share/apps/ksgmltools2/docbook/xsl/manpages
 @dirrm share/apps/ksgmltools2/docbook/xsl/lib
 @dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
 @dirrm share/apps/ksgmltools2/docbook/xsl/images
@@ -4803,6 +5366,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/ksgmltools2/docbook
 @dirrm share/apps/ksgmltools2/customization/zh-TW/entities
 @dirrm share/apps/ksgmltools2/customization/zh-TW
+@dirrm share/apps/ksgmltools2/customization/zh-CN/entities
+@dirrm share/apps/ksgmltools2/customization/zh-CN
 @dirrm share/apps/ksgmltools2/customization/xx/entities
 @dirrm share/apps/ksgmltools2/customization/xx
 @dirrm share/apps/ksgmltools2/customization/xsl
@@ -4912,6 +5477,7 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/kdewidgets/pics
 @dirrm share/apps/kdewidgets
 @dirrm share/apps/kdeui/pics
+@dirrm share/apps/kdeui/about
 @dirrm share/apps/kdeui
 @dirrm share/apps/kdeprint/tools
 @dirrm share/apps/kdeprint/plugins
@@ -4952,6 +5518,7 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kparts
 @dirrm include/knewstuff
 @dirrm include/kmediaplayer
+@dirrm include/kmdi
 @dirrm include/kjs
 @dirrm include/kio
 @dirrm include/khexedit
@@ -4961,5 +5528,6 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kate
 @dirrm include/kabc
 @dirrm include/dom
+@dirrm include/dnssd
 @dirrm etc/xdg/menus
 @dirrm etc/xdg
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 3676dc22bfce..861698aab3b9 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,6 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	6
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -25,19 +24,20 @@ LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		artsc.0:${PORTSDIR}/audio/arts \
 		aspell:${PORTSDIR}/textproc/aspell \
 		fam.0:${PORTSDIR}/devel/fam \
+		dns_sd:${PORTSDIR}/net/mDNSResponder \
 		idn:${PORTSDIR}/devel/libidn \
 		jasper:${PORTSDIR}/graphics/jasper \
+		pcre:${PORTSDIR}/devel/pcre \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		xml2.5:${PORTSDIR}/textproc/libxml2 \
-		xslt.2:${PORTSDIR}/textproc/libxslt \
-		pcre.0:${PORTSDIR}/devel/pcre
+		xslt.2:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	${FONTSCALE}:${X_FONTS_TTF_PORT} \
 		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
 
 .if ${PKGNAMESUFFIX} == -nocups
-CONFLICTS+=	kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdepim-3.2.*
+CONFLICTS+=	kdeartwork-3.2* kdebase-3.[0-3]* kdepim-3.2*
 .else
-CONFLICTS+=	kdebase-3.[0-1] kdebase-3.0.* kdebase-3.1.* kdelibs-nocups-[0-9]* kdepim-3.2.*
+CONFLICTS+=	kdeartwork-3.2* kdebase-3.[0-3]* kdelibs-nocups-[0-9]* kdepim-3.2*
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-base
 .endif
 
@@ -50,7 +50,6 @@ USE_OPENLDAP=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-_NO_KDE_CLOSURE=yes
 
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
@@ -79,6 +78,7 @@ pre-configure:
 
 post-configure:
 	${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in
+	${TOUCH} ${WRKSRC}/kdecore/kdemacros.h.in
 	${TOUCH} ${WRKSRC}/kio/kssl/ksslconfig.h.in
 
 post-install:
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index d33e461816d8..16bcf58e2a9a 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdelibs-3.3.2.tar.bz2) = 0473fb4c6c2cd2bc0f267cfa201f3fd8
-SIZE (KDE/kdelibs-3.3.2.tar.bz2) = 15623180
+MD5 (KDE/kdelibs-3.4.0.tar.bz2) = e5961a78b44a3005a7af6ada249e5888
+SIZE (KDE/kdelibs-3.4.0.tar.bz2) = 16861967
diff --git a/x11/kdelibs4/files/patch-dcop_dcopidlng_dcopidlng b/x11/kdelibs4/files/patch-dcop_dcopidlng_dcopidlng
deleted file mode 100644
index 41fb3987a440..000000000000
--- a/x11/kdelibs4/files/patch-dcop_dcopidlng_dcopidlng
+++ /dev/null
@@ -1,16 +0,0 @@
---- dcop/dcopidlng/dcopidlng	Sat May 22 22:55:01 2004
-+++ dcop/dcopidlng/dcopidlng	Sun Feb 20 21:49:47 2005
-@@ -1,9 +1,12 @@
- #!/bin/sh
-+
-+trap "rm -f dcopidlng.stderr.$$" 
-+
- if test -z "$KDECONFIG"; then
-     KDECONFIG=kde-config
- fi
- LIBDIR="`$KDECONFIG --install data --expandvars`/dcopidlng"
--perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2>/tmp/dcopidlng.stderr.$$
-+perl -I"$LIBDIR" "$LIBDIR/kalyptus" --allow_k_dcop_accessors -f dcopidl $1 2> dcopidlng.stderr.$$
- RET=$?
- if [ $RET -ne 0 ]
- then
diff --git a/x11/kdelibs4/files/patch-dnssd_publicservice.cpp b/x11/kdelibs4/files/patch-dnssd_publicservice.cpp
new file mode 100644
index 000000000000..e65eb524913b
--- /dev/null
+++ b/x11/kdelibs4/files/patch-dnssd_publicservice.cpp
@@ -0,0 +1,15 @@
+--- dnssd/publicservice.cpp.orig	Sat Mar 19 09:36:15 2005
++++ dnssd/publicservice.cpp	Sat Mar 19 09:41:46 2005
+@@ -18,7 +18,12 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
+ #include "publicservice.h"
++#ifdef HAVE_SYS_TYPES_H
++#include <sys/types.h>
++#endif
+ #include <netinet/in.h>
+ #include <qapplication.h>
+ #include "sdevent.h"
diff --git a/x11/kdelibs4/files/patch-khtml_html_htmltokenizer.cpp b/x11/kdelibs4/files/patch-khtml_html_htmltokenizer.cpp
deleted file mode 100644
index df651b7dba30..000000000000
--- a/x11/kdelibs4/files/patch-khtml_html_htmltokenizer.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
---- khtml/html/htmltokenizer.cpp.orig	2005-01-14 18:34:45.783473376 -0800
-+++ khtml/html/htmltokenizer.cpp	2005-01-14 18:13:22.200607632 -0800
-@@ -1693,3 +1693,7 @@
-     onHold = _onHold;
- }
- 
-+bool HTMLTokenizer::isRunningScriptFromTokenizer() const
-+{
-+    return isExecutingScript();
-+}
---- khtml/html/htmltokenizer.h.orig	2005-01-14 18:36:55.359774784 -0800
-+++ khtml/html/htmltokenizer.h	2005-01-14 18:12:54.872762096 -0800
-@@ -171,6 +171,7 @@
- 
-     virtual bool isWaitingForScripts() const;
-     virtual bool isExecutingScript() const;
-+    virtual bool isRunningScriptFromTokenizer() const;
- protected:
-     // Internal buffers
-     ///////////////////
---- khtml/xml/dom_docimpl.cpp.orig	2005-01-14 18:37:53.073001040 -0800
-+++ khtml/xml/dom_docimpl.cpp	2005-01-14 18:18:34.716098056 -0800
-@@ -1181,7 +1181,7 @@
-     // on an explicit document.close(), the tokenizer might still be waiting on scripts,
-     // and in that case we don't want to destroy it because that will prevent the
-     // scripts from getting processed.
--    if (m_tokenizer && !m_tokenizer->isWaitingForScripts()) {
-+    if (m_tokenizer && !m_tokenizer->isWaitingForScripts() && !m_tokenizer->isRunningScriptFromTokenizer()) {
-         delete m_tokenizer;
-         m_tokenizer = 0;
-     }
---- khtml/xml/xml_tokenizer.h.orig	2005-01-14 18:38:27.401782272 -0800
-+++ khtml/xml/xml_tokenizer.h	2005-01-14 18:10:57.609588808 -0800
-@@ -122,6 +122,7 @@
-     virtual void finish() = 0;
-     virtual void setOnHold(bool /*_onHold*/) {}
-     virtual bool isWaitingForScripts() const = 0;
-+    virtual bool isRunningScriptFromTokenizer() const { return false; }
- 
- signals:
-     void finishedParsing();
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2 b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2
deleted file mode 100644
index 0ff5af8fe26b..000000000000
--- a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-htmlframes2
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: khtml_part.cpp
-===================================================================
-RCS file: /home/kde/kdelibs/khtml/khtml_part.cpp,v
-retrieving revision 1.1015.2.12
-diff -u -p -r1.1015.2.12 khtml_part.cpp
---- khtml/khtml_part.cpp	17 Nov 2004 13:46:56 -0000	1.1015.2.12
-+++ khtml/khtml_part.cpp	12 Dec 2004 15:55:30 -0000
-@@ -4758,7 +4758,7 @@ KHTMLPart *
- KHTMLPart::findFrameParent( KParts::ReadOnlyPart *callingPart, const QString &f, khtml::ChildFrame **childFrame )
- {
- #ifdef DEBUG_FINDFRAME
--  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " findFrameParent( " << f << " )" << endl;
-+  kdDebug(6050) << "KHTMLPart::findFrameParent: this = " << this << " URL = " << m_url << " name = " << name() << " findFrameParent( " << f << " )" << endl;
- #endif
-   // Check access
-   KHTMLPart* const callingHtmlPart = dynamic_cast<KHTMLPart *>(callingPart);
-@@ -4766,6 +4766,9 @@ KHTMLPart::findFrameParent( KParts::Read
-   if (!checkFrameAccess(callingHtmlPart))
-      return 0;
- 
-+  if (!childFrame && !parentPart() && (name() == f))
-+     return this;
-+
-   FrameIt it = d->m_frames.find( f );
-   const FrameIt end = d->m_frames.end();
-   if ( it != end )
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff
deleted file mode 100644
index 674ba009495b..000000000000
--- a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kio.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- kio/kio/job.cpp	9 Nov 2004 00:50:35 -0000	1.397.2.5
-+++ kio/kio/job.cpp	8 Dec 2004 01:08:15 -0000	1.397.2.8
-@@ -3119,14 +3119,14 @@ void CopyJob::copyNextFile()
-                        if ( f.open( IO_ReadWrite ) )
-                        {
-                            f.close();
-                            KSimpleConfig config( path );
-                            config.setDesktopGroup();
--                           config.writePathEntry( QString::fromLatin1("URL"), (*it).uSource.url() );
--                           KURL urlName = (*it).uSource;
--                           urlName.setPass( "" );
--                           config.writeEntry( QString::fromLatin1("Name"), urlName.url() );
-+                           KURL url = (*it).uSource;
-+                           url.setPass( "" );
-+                           config.writePathEntry( QString::fromLatin1("URL"), url.url() );
-+                           config.writeEntry( QString::fromLatin1("Name"), url.url() );
-                            config.writeEntry( QString::fromLatin1("Type"), QString::fromLatin1("Link") );
-                            QString protocol = (*it).uSource.protocol();
-                            if ( protocol == QString::fromLatin1("ftp") )
-                                config.writeEntry( QString::fromLatin1("Icon"), QString::fromLatin1("ftp") );
-                            else if ( protocol == QString::fromLatin1("http") )
diff --git a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kioslave b/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kioslave
deleted file mode 100644
index 18dc66b03367..000000000000
--- a/x11/kdelibs4/files/patch-post-3.3.2-kdelibs-kioslave
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -b -p -u -r1.213.2.1 -r1.213.2.2
---- kioslave/ftp/ftp.cc	21 Sep 2004 16:17:56 -0000	1.213.2.1
-+++ kioslave/ftp/ftp.cc	26 Dec 2004 00:29:54 -0000	1.213.2.2
-@@ -751,6 +751,14 @@ bool Ftp::ftpSendCmd( const QCString& cm
- {
-   assert(m_control != NULL);    // must have control connection socket
- 
-+  if ( cmd.find( '\r' ) != -1 || cmd.find( '\n' ) != -1)
-+  {
-+    kdWarning(7102) << "Invalid command received (contains CR or LF): "
-+                    << cmd.data() << endl;
-+    error( ERR_UNSUPPORTED_ACTION, m_host );
-+    return false;
-+  }
-+
-   // Don't print out the password...
-   bool isPassCmd = (cmd.left(4).lower() == "pass");
-   if ( !isPassCmd )
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 097184ec2447..275ab08d7f62 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -16,11 +16,11 @@ bin/dcopserver_shutdown
 bin/dcopstart
 bin/filesharelist
 bin/fileshareset
-bin/ghns
 bin/imagetops
 bin/kab2kabc
 bin/kaddprinterwizard
 bin/kbuildsycoca
+bin/kcmshell
 bin/kconf_update
 bin/kconfig_compiler
 bin/kcookiejar
@@ -74,6 +74,13 @@ include/dcopobject.h
 include/dcopref.h
 include/dcopstub.h
 include/dcoptypes.h
+include/dnssd/domainbrowser.h
+include/dnssd/publicservice.h
+include/dnssd/query.h
+include/dnssd/remoteservice.h
+include/dnssd/servicebase.h
+include/dnssd/servicebrowser.h
+include/dnssd/settings.h
 include/dom/css_rule.h
 include/dom/css_stylesheet.h
 include/dom/css_value.h
@@ -138,6 +145,7 @@ include/kabc/resourceldapkio.h
 include/kabc/resourcenet.h
 include/kabc/resourceselectdialog.h
 include/kabc/secrecy.h
+include/kabc/sortmode.h
 include/kabc/sound.h
 include/kabc/stdaddressbook.h
 include/kabc/timezone.h
@@ -201,6 +209,7 @@ include/kclipboard.h
 include/kcmdlineargs.h
 include/kcmenumngr.h
 include/kcmodule.h
+include/kcmodulecontainer.h
 include/kcmoduleinfo.h
 include/kcmoduleloader.h
 include/kcmoduleproxy.h
@@ -239,10 +248,12 @@ include/kdcopactionproxy.h
 include/kdcoppropertyproxy.h
 include/kdcopservicestarter.h
 include/kde.pot
+include/kde_file.h
 include/kde_terminal_interface.h
 include/kdebug.h
 include/kdebugclasses.h
 include/kdedmodule.h
+include/kdelibs_export.h
 include/kdemacros.h
 include/kdeprint/driver.h
 include/kdeprint/kiconselectaction.h
@@ -339,6 +350,7 @@ include/kiconeffect.h
 include/kiconloader.h
 include/kicontheme.h
 include/kiconview.h
+include/kiconviewsearchline.h
 include/kidna.h
 include/kimageeffect.h
 include/kimagefilepreview.h
@@ -354,6 +366,7 @@ include/kio/connection.h
 include/kio/davjob.h
 include/kio/defaultprogress.h
 include/kio/file.h
+include/kio/forwardingslavebase.h
 include/kio/global.h
 include/kio/http.h
 include/kio/http_slave_defaults.h
@@ -363,6 +376,7 @@ include/kio/jobclasses.h
 include/kio/kdesasl.h
 include/kio/kmdbase.h
 include/kio/kmdcodec.h
+include/kio/kntlm.h
 include/kio/metainfojob.h
 include/kio/netaccess.h
 include/kio/observer.h
@@ -422,6 +436,10 @@ include/kmainwindow.h
 include/kmainwindowiface.h
 include/kmanagerselection.h
 include/kmdcodec.h
+include/kmdi/global.h
+include/kmdi/mainwindow.h
+include/kmdi/tabwidget.h
+include/kmdi/toolviewaccessor.h
 include/kmdichildarea.h
 include/kmdichildfrm.h
 include/kmdichildfrmcaption.h
@@ -453,7 +471,9 @@ include/knewstuff/downloaddialog.h
 include/knewstuff/engine.h
 include/knewstuff/entry.h
 include/knewstuff/knewstuff.h
+include/knewstuff/knewstuffbutton.h
 include/knewstuff/knewstuffgeneric.h
+include/knewstuff/knewstuffsecure.h
 include/knewstuff/provider.h
 include/knewstuff/providerdialog.h
 include/knewstuff/uploaddialog.h
@@ -490,6 +510,8 @@ include/kpixmap.h
 include/kpixmapeffect.h
 include/kpixmapio.h
 include/kpixmapprovider.h
+include/kpixmapregionselectordialog.h
+include/kpixmapregionselectorwidget.h
 include/kpixmapsplitter.h
 include/kplugininfo.h
 include/kpluginselector.h
@@ -552,6 +574,7 @@ include/ksharedptr.h
 include/kshell.h
 include/kshellcompletion.h
 include/kshortcut.h
+include/kshortcutdialog.h
 include/kshortcutlist.h
 include/kshred.h
 include/ksimpleconfig.h
@@ -564,6 +587,8 @@ include/ksocketdevice.h
 include/ksocks.h
 include/ksockssocketdevice.h
 include/ksortablevaluelist.h
+include/kspeech.h
+include/kspeechsink.h
 include/kspell.h
 include/kspell2/backgroundchecker.h
 include/kspell2/broker.h
@@ -613,6 +638,7 @@ include/kstringhandler.h
 include/kstringvalidator.h
 include/kstyle.h
 include/ksvgiconengine.h
+include/kswap.h
 include/ksycoca.h
 include/ksycocaentry.h
 include/ksycocatype.h
@@ -651,6 +677,7 @@ include/ktexteditor/selectionextdcopinterface.h
 include/ktexteditor/selectioninterface.h
 include/ktexteditor/selectioninterfaceext.h
 include/ktexteditor/sessionconfiginterface.h
+include/ktexteditor/templateinterface.h
 include/ktexteditor/texthintinterface.h
 include/ktexteditor/undointerface.h
 include/ktexteditor/variableinterface.h
@@ -662,6 +689,7 @@ include/ktimewidget.h
 include/ktip.h
 include/ktoolbar.h
 include/ktoolbarbutton.h
+include/ktoolbarlabelaction.h
 include/ktoolbarradiogroup.h
 include/ktrader.h
 include/ktypelist.h
@@ -742,6 +770,8 @@ lib/kde3/kbzip2filter.la
 lib/kde3/kbzip2filter.so
 lib/kde3/kcm_kresources.la
 lib/kde3/kcm_kresources.so
+lib/kde3/kcmshell.la
+lib/kde3/kcmshell.so
 lib/kde3/kconf_update.la
 lib/kde3/kconf_update.so
 lib/kde3/kcookiejar.la
@@ -792,12 +822,16 @@ lib/kde3/kimg_jp2.la
 lib/kde3/kimg_jp2.so
 lib/kde3/kimg_pcx.la
 lib/kde3/kimg_pcx.so
+lib/kde3/kimg_psd.la
+lib/kde3/kimg_psd.so
 lib/kde3/kimg_rgb.la
 lib/kde3/kimg_rgb.so
 lib/kde3/kimg_tga.la
 lib/kde3/kimg_tga.so
 lib/kde3/kimg_tiff.la
 lib/kde3/kimg_tiff.so
+lib/kde3/kimg_xcf.la
+lib/kde3/kimg_xcf.so
 lib/kde3/kimg_xview.la
 lib/kde3/kimg_xview.so
 lib/kde3/kio_file.la
@@ -826,8 +860,8 @@ lib/kde3/kspell_aspell.la
 lib/kde3/kspell_aspell.so
 lib/kde3/kspell_ispell.la
 lib/kde3/kspell_ispell.so
-lib/kde3/ktexteditor_autobookmarker.la
-lib/kde3/ktexteditor_autobookmarker.so
+lib/kde3/kstyle_plastik_config.la
+lib/kde3/kstyle_plastik_config.so
 lib/kde3/ktexteditor_docwordcompletion.la
 lib/kde3/ktexteditor_docwordcompletion.so
 lib/kde3/ktexteditor_insertfile.la
@@ -852,12 +886,16 @@ lib/kde3/plugins/designer/kdewidgets.la
 lib/kde3/plugins/designer/kdewidgets.so
 lib/kde3/plugins/styles/highcolor.la
 lib/kde3/plugins/styles/highcolor.so
+lib/kde3/plugins/styles/highcontrast.la
+lib/kde3/plugins/styles/highcontrast.so
 lib/kde3/plugins/styles/keramik.la
 lib/kde3/plugins/styles/keramik.so
 lib/kde3/plugins/styles/kthemestyle.la
 lib/kde3/plugins/styles/kthemestyle.so
 lib/kde3/plugins/styles/light.la
 lib/kde3/plugins/styles/light.so
+lib/kde3/plugins/styles/plastik.la
+lib/kde3/plugins/styles/plastik.so
 lib/libDCOP.la
 lib/libDCOP.so
 lib/libDCOP.so.6
@@ -900,6 +938,8 @@ lib/libkdeinit_kaddprinterwizard.la
 lib/libkdeinit_kaddprinterwizard.so
 lib/libkdeinit_kbuildsycoca.la
 lib/libkdeinit_kbuildsycoca.so
+lib/libkdeinit_kcmshell.la
+lib/libkdeinit_kcmshell.so
 lib/libkdeinit_kconf_update.la
 lib/libkdeinit_kconf_update.so
 lib/libkdeinit_kcookiejar.la
@@ -927,6 +967,9 @@ lib/libkdesu.so.6
 lib/libkdeui.la
 lib/libkdeui.so
 lib/libkdeui.so.6
+lib/libkdnssd.la
+lib/libkdnssd.so
+lib/libkdnssd.so.1
 lib/libkhtml.la
 lib/libkhtml.so
 lib/libkhtml.so.6
@@ -945,6 +988,9 @@ lib/libkjs.so.3
 lib/libkmdi.la
 lib/libkmdi.so
 lib/libkmdi.so.1
+lib/libkmdi2.la
+lib/libkmdi2.so
+lib/libkmdi2.so.1
 lib/libkmediaplayer.la
 lib/libkmediaplayer.so
 lib/libkmediaplayer.so.0
@@ -954,6 +1000,9 @@ lib/libkmid.so.0
 lib/libknewstuff.la
 lib/libknewstuff.so
 lib/libknewstuff.so.1
+lib/libkntlm.la
+lib/libkntlm.so
+lib/libkntlm.so.0
 lib/libkparts.la
 lib/libkparts.so
 lib/libkparts.so.3
@@ -997,28 +1046,31 @@ share/apps/dcopidlng/Ast.pm
 share/apps/dcopidlng/Iter.pm
 share/apps/dcopidlng/kalyptus
 share/apps/dcopidlng/kalyptusCxxToDcopIDL.pm
-share/apps/dcopidlng/kalyptusDataDict.pm
 share/apps/dcopidlng/kdocAstUtil.pm
-share/apps/dcopidlng/kdocLib.pm
 share/apps/dcopidlng/kdocParseDoc.pm
 share/apps/dcopidlng/kdocUtil.pm
 share/apps/kabc/countrytransl.map
 share/apps/kabc/formats/binary.desktop
 share/apps/katepart/katepartreadonlyui.rc
 share/apps/katepart/katepartui.rc
+share/apps/katepart/syntax/abc.xml
 share/apps/katepart/syntax/ada.xml
 share/apps/katepart/syntax/ahdl.xml
 share/apps/katepart/syntax/alert.xml
 share/apps/katepart/syntax/ansic89.xml
+share/apps/katepart/syntax/asm-avr.xml
 share/apps/katepart/syntax/asm6502.xml
+share/apps/katepart/syntax/asp.xml
 share/apps/katepart/syntax/awk.xml
 share/apps/katepart/syntax/bash.xml
 share/apps/katepart/syntax/bibtex.xml
 share/apps/katepart/syntax/c.xml
 share/apps/katepart/syntax/cg.xml
+share/apps/katepart/syntax/cgis.xml
 share/apps/katepart/syntax/changelog.xml
 share/apps/katepart/syntax/cisco.xml
 share/apps/katepart/syntax/clipper.xml
+share/apps/katepart/syntax/cmake.xml
 share/apps/katepart/syntax/coldfusion.xml
 share/apps/katepart/syntax/commonlisp.xml
 share/apps/katepart/syntax/component-pascal.xml
@@ -1042,6 +1094,7 @@ share/apps/katepart/syntax/fgl-per.xml
 share/apps/katepart/syntax/fortran.xml
 share/apps/katepart/syntax/gdl.xml
 share/apps/katepart/syntax/gettext.xml
+share/apps/katepart/syntax/glsl.xml
 share/apps/katepart/syntax/gnuassembler.xml
 share/apps/katepart/syntax/haskell.xml
 share/apps/katepart/syntax/html-php.xml
@@ -1051,6 +1104,7 @@ share/apps/katepart/syntax/idl.xml
 share/apps/katepart/syntax/ilerpg.xml
 share/apps/katepart/syntax/inform.xml
 share/apps/katepart/syntax/java.xml
+share/apps/katepart/syntax/javadoc.xml
 share/apps/katepart/syntax/javascript-php.xml
 share/apps/katepart/syntax/javascript.xml
 share/apps/katepart/syntax/jsp.xml
@@ -1059,6 +1113,7 @@ share/apps/katepart/syntax/language.dtd
 share/apps/katepart/syntax/latex.xml
 share/apps/katepart/syntax/ldif.xml
 share/apps/katepart/syntax/lex.xml
+share/apps/katepart/syntax/lilypond.xml
 share/apps/katepart/syntax/literate-haskell.xml
 share/apps/katepart/syntax/logtalk.xml
 share/apps/katepart/syntax/lpc.xml
@@ -1070,8 +1125,10 @@ share/apps/katepart/syntax/matlab.xml
 share/apps/katepart/syntax/mips.xml
 share/apps/katepart/syntax/modula-2.xml
 share/apps/katepart/syntax/mup.xml
+share/apps/katepart/syntax/nasm.xml
 share/apps/katepart/syntax/objectivec.xml
 share/apps/katepart/syntax/ocaml.xml
+share/apps/katepart/syntax/octave.xml
 share/apps/katepart/syntax/pascal.xml
 share/apps/katepart/syntax/perl.xml
 share/apps/katepart/syntax/php.xml
@@ -1085,6 +1142,7 @@ share/apps/katepart/syntax/purebasic.xml
 share/apps/katepart/syntax/python.xml
 share/apps/katepart/syntax/r.xml
 share/apps/katepart/syntax/rexx.xml
+share/apps/katepart/syntax/rib.xml
 share/apps/katepart/syntax/rpmspec.xml
 share/apps/katepart/syntax/rsiidl.xml
 share/apps/katepart/syntax/ruby.xml
@@ -1094,9 +1152,11 @@ share/apps/katepart/syntax/sci.xml
 share/apps/katepart/syntax/sgml.xml
 share/apps/katepart/syntax/sieve.xml
 share/apps/katepart/syntax/sml.xml
+share/apps/katepart/syntax/spice.xml
 share/apps/katepart/syntax/sql-mysql.xml
 share/apps/katepart/syntax/sql-postgresql.xml
 share/apps/katepart/syntax/sql.xml
+share/apps/katepart/syntax/stata.xml
 share/apps/katepart/syntax/syntax.template
 share/apps/katepart/syntax/tcl.xml
 share/apps/katepart/syntax/tibasic.xml
@@ -1110,6 +1170,7 @@ share/apps/katepart/syntax/winehq.xml
 share/apps/katepart/syntax/xharbour.xml
 share/apps/katepart/syntax/xml.xml
 share/apps/katepart/syntax/xmldebug.xml
+share/apps/katepart/syntax/xslt.xml
 share/apps/katepart/syntax/yacas.xml
 share/apps/katepart/syntax/yacc.xml
 share/apps/kcertpart/kcertpart.rc
@@ -1235,6 +1296,29 @@ share/apps/kdeprint/testprint.ps
 share/apps/kdeprint/tiledown.png
 share/apps/kdeprint/tileup.png
 share/apps/kdeprint/tools/escputil.desktop
+share/apps/kdeui/about/bar-bottom-left.png
+share/apps/kdeui/about/bar-bottom-middle.png
+share/apps/kdeui/about/bar-bottom-right.png
+share/apps/kdeui/about/bar-middle-left.png
+share/apps/kdeui/about/bar-middle-right.png
+share/apps/kdeui/about/bar-top-left.png
+share/apps/kdeui/about/bar-top-middle.png
+share/apps/kdeui/about/bar-top-right.png
+share/apps/kdeui/about/bottom-left.png
+share/apps/kdeui/about/bottom-middle.png
+share/apps/kdeui/about/bottom-right.png
+share/apps/kdeui/about/box-bottom-left.png
+share/apps/kdeui/about/box-bottom-middle.png
+share/apps/kdeui/about/box-bottom-right.png
+share/apps/kdeui/about/box-middle-left.png
+share/apps/kdeui/about/box-middle-right.png
+share/apps/kdeui/about/box-top-left.png
+share/apps/kdeui/about/box-top-middle.png
+share/apps/kdeui/about/box-top-right.png
+share/apps/kdeui/about/kde_infopage.css
+share/apps/kdeui/about/kde_infopage_rtl.css
+share/apps/kdeui/about/top-left.png
+share/apps/kdeui/about/top-middle.png
 share/apps/kdeui/pics/aboutkde.png
 share/apps/kdeui/pics/ktip-background.png
 share/apps/kdeui/pics/ktip-bulb.png
@@ -1374,7 +1458,6 @@ share/apps/ksgmltools2/customization/cs/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/cs/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/cs/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/cs/entities/underGPL.docbook
-share/apps/ksgmltools2/customization/cs/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/cs/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/cs/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/cs/lang.entities
@@ -1647,6 +1730,7 @@ share/apps/ksgmltools2/customization/ja/strings.entities
 share/apps/ksgmltools2/customization/ja/user.entities
 share/apps/ksgmltools2/customization/kde-chunk-online.xsl
 share/apps/ksgmltools2/customization/kde-chunk.xsl
+share/apps/ksgmltools2/customization/kde-man.xsl
 share/apps/ksgmltools2/customization/kde-navig-online.xsl
 share/apps/ksgmltools2/customization/kde-navig.xsl
 share/apps/ksgmltools2/customization/kde-nochunk.xsl
@@ -1774,6 +1858,7 @@ share/apps/ksgmltools2/customization/pt-BR/entities/underArtisticLicense.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underBSDLicense.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underFDL.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/pt-BR/entities/underLGPL.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/underX11License.docbook
 share/apps/ksgmltools2/customization/pt-BR/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/pt-BR/lang.entities
@@ -2016,6 +2101,24 @@ share/apps/ksgmltools2/customization/xx/entities/update-doc.docbook
 share/apps/ksgmltools2/customization/xx/lang.entities
 share/apps/ksgmltools2/customization/xx/strings.entities
 share/apps/ksgmltools2/customization/xx/user.entities
+share/apps/ksgmltools2/customization/zh-CN/catalog
+share/apps/ksgmltools2/customization/zh-CN/entities/fdl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/gpl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/help-menu.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/install-compile.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/install-intro.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/lgpl-notice.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/report-bugs.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underArtisticLicense.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underBSDLicense.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underFDL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underLGPL.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/underX11License.docbook
+share/apps/ksgmltools2/customization/zh-CN/entities/update-doc.docbook
+share/apps/ksgmltools2/customization/zh-CN/lang.entities
+share/apps/ksgmltools2/customization/zh-CN/strings.entities
+share/apps/ksgmltools2/customization/zh-CN/user.entities
 share/apps/ksgmltools2/customization/zh-TW/catalog
 share/apps/ksgmltools2/customization/zh-TW/entities/fdl-notice.docbook
 share/apps/ksgmltools2/customization/zh-TW/entities/gpl-notice.docbook
@@ -2105,6 +2208,11 @@ share/apps/ksgmltools2/docbook/xsl/VERSION
 share/apps/ksgmltools2/docbook/xsl/WhatsNew
 share/apps/ksgmltools2/docbook/xsl/common/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/common/af.xml
+share/apps/ksgmltools2/docbook/xsl/common/ar.xml
+share/apps/ksgmltools2/docbook/xsl/common/autoidx-ng.xsl
+share/apps/ksgmltools2/docbook/xsl/common/bg.xml
+share/apps/ksgmltools2/docbook/xsl/common/bn.xml
+share/apps/ksgmltools2/docbook/xsl/common/bs.xml
 share/apps/ksgmltools2/docbook/xsl/common/ca.xml
 share/apps/ksgmltools2/docbook/xsl/common/common.xsl
 share/apps/ksgmltools2/docbook/xsl/common/cs.xml
@@ -2118,6 +2226,8 @@ share/apps/ksgmltools2/docbook/xsl/common/eu.xml
 share/apps/ksgmltools2/docbook/xsl/common/fi.xml
 share/apps/ksgmltools2/docbook/xsl/common/fr.xml
 share/apps/ksgmltools2/docbook/xsl/common/gentext.xsl
+share/apps/ksgmltools2/docbook/xsl/common/he.xml
+share/apps/ksgmltools2/docbook/xsl/common/hr.xml
 share/apps/ksgmltools2/docbook/xsl/common/hu.xml
 share/apps/ksgmltools2/docbook/xsl/common/id.xml
 share/apps/ksgmltools2/docbook/xsl/common/it.xml
@@ -2126,10 +2236,14 @@ share/apps/ksgmltools2/docbook/xsl/common/ko.xml
 share/apps/ksgmltools2/docbook/xsl/common/l10n.dtd
 share/apps/ksgmltools2/docbook/xsl/common/l10n.xml
 share/apps/ksgmltools2/docbook/xsl/common/l10n.xsl
+share/apps/ksgmltools2/docbook/xsl/common/la.xml
 share/apps/ksgmltools2/docbook/xsl/common/labels.xsl
+share/apps/ksgmltools2/docbook/xsl/common/lt.xml
 share/apps/ksgmltools2/docbook/xsl/common/nl.xml
 share/apps/ksgmltools2/docbook/xsl/common/nn.xml
 share/apps/ksgmltools2/docbook/xsl/common/no.xml
+share/apps/ksgmltools2/docbook/xsl/common/olink.xsl
+share/apps/ksgmltools2/docbook/xsl/common/pi.xsl
 share/apps/ksgmltools2/docbook/xsl/common/pl.xml
 share/apps/ksgmltools2/docbook/xsl/common/pt.xml
 share/apps/ksgmltools2/docbook/xsl/common/pt_br.xml
@@ -2138,57 +2252,72 @@ share/apps/ksgmltools2/docbook/xsl/common/ru.xml
 share/apps/ksgmltools2/docbook/xsl/common/sk.xml
 share/apps/ksgmltools2/docbook/xsl/common/sl.xml
 share/apps/ksgmltools2/docbook/xsl/common/sr.xml
+share/apps/ksgmltools2/docbook/xsl/common/sr_Latn.xml
 share/apps/ksgmltools2/docbook/xsl/common/subtitles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/sv.xml
 share/apps/ksgmltools2/docbook/xsl/common/table.xsl
+share/apps/ksgmltools2/docbook/xsl/common/targetdatabase.dtd
+share/apps/ksgmltools2/docbook/xsl/common/targets.xsl
 share/apps/ksgmltools2/docbook/xsl/common/th.xml
 share/apps/ksgmltools2/docbook/xsl/common/titles.xsl
 share/apps/ksgmltools2/docbook/xsl/common/tr.xml
 share/apps/ksgmltools2/docbook/xsl/common/uk.xml
+share/apps/ksgmltools2/docbook/xsl/common/vi.xml
 share/apps/ksgmltools2/docbook/xsl/common/xh.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_cn.xml
 share/apps/ksgmltools2/docbook/xsl/common/zh_tw.xml
 share/apps/ksgmltools2/docbook/xsl/html/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/html/admon.xsl
+share/apps/ksgmltools2/docbook/xsl/html/autoidx-ng.xsl
 share/apps/ksgmltools2/docbook/xsl/html/autoidx.xsl
 share/apps/ksgmltools2/docbook/xsl/html/autotoc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/biblio.xsl
 share/apps/ksgmltools2/docbook/xsl/html/block.xsl
-share/apps/ksgmltools2/docbook/xsl/html/calc-chunks.xsl
 share/apps/ksgmltools2/docbook/xsl/html/callout.xsl
 share/apps/ksgmltools2/docbook/xsl/html/changebars.xsl
-share/apps/ksgmltools2/docbook/xsl/html/chunk-experimental.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunk-code.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunk-common.xsl
 share/apps/ksgmltools2/docbook/xsl/html/chunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/chunker.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunkfast.xsl
+share/apps/ksgmltools2/docbook/xsl/html/chunktoc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/component.xsl
 share/apps/ksgmltools2/docbook/xsl/html/division.xsl
 share/apps/ksgmltools2/docbook/xsl/html/docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/html/docbookng.xsl
 share/apps/ksgmltools2/docbook/xsl/html/ebnf.xsl
-share/apps/ksgmltools2/docbook/xsl/html/expchunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/footnote.xsl
 share/apps/ksgmltools2/docbook/xsl/html/formal.xsl
 share/apps/ksgmltools2/docbook/xsl/html/glossary.xsl
 share/apps/ksgmltools2/docbook/xsl/html/graphics.xsl
+share/apps/ksgmltools2/docbook/xsl/html/html-rtf.xsl
 share/apps/ksgmltools2/docbook/xsl/html/html.xsl
+share/apps/ksgmltools2/docbook/xsl/html/htmltbl.xsl
 share/apps/ksgmltools2/docbook/xsl/html/index.xsl
 share/apps/ksgmltools2/docbook/xsl/html/info.xsl
 share/apps/ksgmltools2/docbook/xsl/html/inline.xsl
 share/apps/ksgmltools2/docbook/xsl/html/keywords.xsl
 share/apps/ksgmltools2/docbook/xsl/html/lists.xsl
+share/apps/ksgmltools2/docbook/xsl/html/maketoc.xsl
+share/apps/ksgmltools2/docbook/xsl/html/manifest.xsl
 share/apps/ksgmltools2/docbook/xsl/html/math.xsl
 share/apps/ksgmltools2/docbook/xsl/html/oldchunker.xsl
 share/apps/ksgmltools2/docbook/xsl/html/onechunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/param.ent
-share/apps/ksgmltools2/docbook/xsl/html/param.html
 share/apps/ksgmltools2/docbook/xsl/html/param.xml
 share/apps/ksgmltools2/docbook/xsl/html/param.xsl
 share/apps/ksgmltools2/docbook/xsl/html/param.xweb
 share/apps/ksgmltools2/docbook/xsl/html/pi.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-chunk-code.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-chunk.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/html/profile-onechunk.xsl
 share/apps/ksgmltools2/docbook/xsl/html/qandaset.xsl
 share/apps/ksgmltools2/docbook/xsl/html/refentry.xsl
 share/apps/ksgmltools2/docbook/xsl/html/sections.xsl
 share/apps/ksgmltools2/docbook/xsl/html/synop.xsl
 share/apps/ksgmltools2/docbook/xsl/html/table.xsl
+share/apps/ksgmltools2/docbook/xsl/html/task.xsl
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xml
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.templates.xsl
 share/apps/ksgmltools2/docbook/xsl/html/titlepage.xsl
@@ -2196,52 +2325,96 @@ share/apps/ksgmltools2/docbook/xsl/html/toc.xsl
 share/apps/ksgmltools2/docbook/xsl/html/verbatim.xsl
 share/apps/ksgmltools2/docbook/xsl/html/xref.xsl
 share/apps/ksgmltools2/docbook/xsl/images/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/images/blank.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/1.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/1.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/10.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/10.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/11.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/11.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/12.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/12.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/13.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/13.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/14.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/14.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/15.gif
+share/apps/ksgmltools2/docbook/xsl/images/callouts/15.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/2.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/2.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/3.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/3.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/4.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/4.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/5.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/5.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/6.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/6.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/7.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/7.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/8.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/8.png
+share/apps/ksgmltools2/docbook/xsl/images/callouts/9.gif
 share/apps/ksgmltools2/docbook/xsl/images/callouts/9.png
 share/apps/ksgmltools2/docbook/xsl/images/callouts/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/images/caution.gif
 share/apps/ksgmltools2/docbook/xsl/images/caution.png
 share/apps/ksgmltools2/docbook/xsl/images/caution.tif
+share/apps/ksgmltools2/docbook/xsl/images/draft.png
+share/apps/ksgmltools2/docbook/xsl/images/home.gif
 share/apps/ksgmltools2/docbook/xsl/images/home.png
+share/apps/ksgmltools2/docbook/xsl/images/important.gif
 share/apps/ksgmltools2/docbook/xsl/images/important.png
 share/apps/ksgmltools2/docbook/xsl/images/important.tif
+share/apps/ksgmltools2/docbook/xsl/images/next.gif
 share/apps/ksgmltools2/docbook/xsl/images/next.png
+share/apps/ksgmltools2/docbook/xsl/images/note.gif
 share/apps/ksgmltools2/docbook/xsl/images/note.png
 share/apps/ksgmltools2/docbook/xsl/images/note.tif
+share/apps/ksgmltools2/docbook/xsl/images/prev.gif
 share/apps/ksgmltools2/docbook/xsl/images/prev.png
+share/apps/ksgmltools2/docbook/xsl/images/tip.gif
 share/apps/ksgmltools2/docbook/xsl/images/tip.png
 share/apps/ksgmltools2/docbook/xsl/images/tip.tif
 share/apps/ksgmltools2/docbook/xsl/images/toc-blank.png
 share/apps/ksgmltools2/docbook/xsl/images/toc-minus.png
 share/apps/ksgmltools2/docbook/xsl/images/toc-plus.png
+share/apps/ksgmltools2/docbook/xsl/images/up.gif
 share/apps/ksgmltools2/docbook/xsl/images/up.png
+share/apps/ksgmltools2/docbook/xsl/images/warning.gif
 share/apps/ksgmltools2/docbook/xsl/images/warning.png
 share/apps/ksgmltools2/docbook/xsl/images/warning.tif
 share/apps/ksgmltools2/docbook/xsl/lib/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/lib/lib.xml
 share/apps/ksgmltools2/docbook/xsl/lib/lib.xsl
+share/apps/ksgmltools2/docbook/xsl/lib/lib.xweb
+share/apps/ksgmltools2/docbook/xsl/manpages/ChangeLog
+share/apps/ksgmltools2/docbook/xsl/manpages/README
+share/apps/ksgmltools2/docbook/xsl/manpages/docbook.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/lists.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/sect23.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/synop.xsl
+share/apps/ksgmltools2/docbook/xsl/manpages/xref.xsl
 share/apps/ksgmltools2/docbook/xsl/params/ChangeLog
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.path.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.graphics.xml
 share/apps/ksgmltools2/docbook/xsl/params/admon.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/admon.textlabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/admonition.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/admonition.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/alignment.xml
 share/apps/ksgmltools2/docbook/xsl/params/annotate.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/appendix.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/arbortext.extensions.xml
+share/apps/ksgmltools2/docbook/xsl/params/article.appendix.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/author.othername.in.middle.xml
 share/apps/ksgmltools2/docbook/xsl/params/autotoc.label.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/axf.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/base.dir.xml
 share/apps/ksgmltools2/docbook/xsl/params/biblioentry.item.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/bibliography.collection.xml
+share/apps/ksgmltools2/docbook/xsl/params/bibliography.numbered.xml
 share/apps/ksgmltools2/docbook/xsl/params/blockquote.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/body.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/body.font.master.xml
@@ -2261,78 +2434,179 @@ share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.start.character.xml
 share/apps/ksgmltools2/docbook/xsl/params/callout.unicode.xml
 share/apps/ksgmltools2/docbook/xsl/params/callouts.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/chapter.autolabel.xml
-share/apps/ksgmltools2/docbook/xsl/params/chunk.datafile.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.first.sections.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.quietly.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.section.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/chunk.sections.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.separate.lots.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunk.tocs.and.lots.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.cdata-section-elements.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-public.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.doctype-system.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.indent.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.media-type.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.method.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.omit-xml-declaration.xml
+share/apps/ksgmltools2/docbook/xsl/params/chunker.output.standalone.xml
 share/apps/ksgmltools2/docbook/xsl/params/citerefentry.link.xml
-share/apps/ksgmltools2/docbook/xsl/params/column.count.xml
+share/apps/ksgmltools2/docbook/xsl/params/collect.xref.targets.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.body.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.front.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.index.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.lot.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.count.titlepage.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.body.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.front.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.index.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.lot.xml
+share/apps/ksgmltools2/docbook/xsl/params/column.gap.titlepage.xml
+share/apps/ksgmltools2/docbook/xsl/params/compact.list.item.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/component.label.includes.part.label.xml
 share/apps/ksgmltools2/docbook/xsl/params/component.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/css.decoration.xml
-share/apps/ksgmltools2/docbook/xsl/params/default.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/current.docid.xml
+share/apps/ksgmltools2/docbook/xsl/params/default.float.class.xml
+share/apps/ksgmltools2/docbook/xsl/params/default.image.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/default.table.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/default.units.xml
 share/apps/ksgmltools2/docbook/xsl/params/dingbat.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/double.sided.xml
+share/apps/ksgmltools2/docbook/xsl/params/draft.mode.xml
+share/apps/ksgmltools2/docbook/xsl/params/draft.watermark.image.xml
+share/apps/ksgmltools2/docbook/xsl/params/ebnf.assignment.xml
+share/apps/ksgmltools2/docbook/xsl/params/ebnf.statement.terminator.xml
 share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.bgcolor.xml
 share/apps/ksgmltools2/docbook/xsl/params/ebnf.table.border.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.id.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.name.xml
+share/apps/ksgmltools2/docbook/xsl/params/eclipse.plugin.provider.xml
 share/apps/ksgmltools2/docbook/xsl/params/emphasis.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/entry.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/equation.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/example.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/figure.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/firstterm.only.link.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.column.widths.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.content.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/footer.rule.xml
+share/apps/ksgmltools2/docbook/xsl/params/footers.on.blank.pages.xml
 share/apps/ksgmltools2/docbook/xsl/params/footnote.font.size.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.number.symbols.xml
+share/apps/ksgmltools2/docbook/xsl/params/footnote.sep.leader.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/fop.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.object.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.procedures.xml
+share/apps/ksgmltools2/docbook/xsl/params/formal.title.placement.xml
 share/apps/ksgmltools2/docbook/xsl/params/formal.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.decoration.xml
 share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/funcsynopsis.tabular.threshold.xml
 share/apps/ksgmltools2/docbook/xsl/params/function.parens.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.appendix.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.article.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.equation.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.example.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.figure.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.table.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.book.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.chapter.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.component.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.equation.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.example.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.figure.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.table.lot.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.division.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.id.attributes.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.index.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.legalnotice.link.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.part.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.preface.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.qandadiv.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.qandaset.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.reference.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.manifest.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.meta.abstract.xml
 share/apps/ksgmltools2/docbook/xsl/params/generate.section.toc.level.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.section.toc.xml
-share/apps/ksgmltools2/docbook/xsl/params/generate.set.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/generate.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossary.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/glossary.collection.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossentry.show.acronym.xml
+share/apps/ksgmltools2/docbook/xsl/params/glosslist.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/glossterm.auto.link.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossterm.separation.xml
+share/apps/ksgmltools2/docbook/xsl/params/glossterm.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/graphic.default.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/graphicsize.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.column.widths.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.content.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/header.rule.xml
+share/apps/ksgmltools2/docbook/xsl/params/headers.on.blank.pages.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.base.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cellpadding.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cellspacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.cleanup.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.ext.xml
+share/apps/ksgmltools2/docbook/xsl/params/html.extra.head.links.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.link.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.longdesc.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.type.xml
 share/apps/ksgmltools2/docbook/xsl/params/html.stylesheet.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.alias.file.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.back.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.forward.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.hideshow.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.home.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump1.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.url.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.jump2.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.locate.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.next.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.options.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.prev.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.print.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.refresh.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.stop.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.button.zoom.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.chm.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.default.topic.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.display.progress.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.encoding.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enhanced.decompilation.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.enumerate.images.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.force.map.and.alias.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.binary.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.folders.instead.books.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.section.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.show.root.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhc.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhk.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.tail.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.window.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.windows.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.hhp.xml
 share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.map.file.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.only.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.remember.window.position.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.advanced.search.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.favorities.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.menu.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.show.toolbar.text.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.use.hhk.xml
+share/apps/ksgmltools2/docbook/xsl/params/htmlhelp.window.geometry.xml
+share/apps/ksgmltools2/docbook/xsl/params/hyphenate.verbatim.xml
 share/apps/ksgmltools2/docbook/xsl/params/hyphenate.xml
+share/apps/ksgmltools2/docbook/xsl/params/ignore.image.scaling.xml
+share/apps/ksgmltools2/docbook/xsl/params/img.src.path.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.on.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.on.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.prefer.titleabbrev.xml
+share/apps/ksgmltools2/docbook/xsl/params/index.preferred.page.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informal.object.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalequation.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalexample.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informalfigure.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/informaltable.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/inherit.keywords.xml
+share/apps/ksgmltools2/docbook/xsl/params/insert.olink.page.number.xml
+share/apps/ksgmltools2/docbook/xsl/params/insert.olink.pdf.frag.xml
 share/apps/ksgmltools2/docbook/xsl/params/insert.xref.page.number.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.default.language.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.language.xml
+share/apps/ksgmltools2/docbook/xsl/params/l10n.gentext.use.xref.language.xml
 share/apps/ksgmltools2/docbook/xsl/params/label.from.part.xml
 share/apps/ksgmltools2/docbook/xsl/params/line-height.xml
 share/apps/ksgmltools2/docbook/xsl/params/linenumbering.everyNth.xml
@@ -2342,23 +2616,38 @@ share/apps/ksgmltools2/docbook/xsl/params/linenumbering.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/link.mailto.url.xml
 share/apps/ksgmltools2/docbook/xsl/params/list.block.spacing.xml
 share/apps/ksgmltools2/docbook/xsl/params/list.item.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/make.graphic.viewport.xml
+share/apps/ksgmltools2/docbook/xsl/params/make.index.markup.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.single.year.ranges.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.valid.html.xml
 share/apps/ksgmltools2/docbook/xsl/params/make.year.ranges.xml
+share/apps/ksgmltools2/docbook/xsl/params/manifest.in.base.dir.xml
+share/apps/ksgmltools2/docbook/xsl/params/manifest.xml
+share/apps/ksgmltools2/docbook/xsl/params/manual.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/marker.section.level.xml
+share/apps/ksgmltools2/docbook/xsl/params/menuchoice.menu.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/menuchoice.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/monospace.font.family.xml
+share/apps/ksgmltools2/docbook/xsl/params/monospace.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/monospace.verbatim.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.path.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.graphics.xml
 share/apps/ksgmltools2/docbook/xsl/params/navig.showtitles.xml
+share/apps/ksgmltools2/docbook/xsl/params/nominal.image.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/nominal.image.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/nominal.table.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/normal.para.spacing.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.base.uri.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.debug.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.doctitle.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.fragid.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.lang.fallback.sequence.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.outline.ext.xml
+share/apps/ksgmltools2/docbook/xsl/params/olink.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.pubid.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.resolver.xml
 share/apps/ksgmltools2/docbook/xsl/params/olink.sysid.xml
-share/apps/ksgmltools2/docbook/xsl/params/output.method.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.height.portrait.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.height.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.margin.bottom.xml
@@ -2369,23 +2658,53 @@ share/apps/ksgmltools2/docbook/xsl/params/page.orientation.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.width.portrait.xml
 share/apps/ksgmltools2/docbook/xsl/params/page.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/paper.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/para.propagates.style.xml
 share/apps/ksgmltools2/docbook/xsl/params/part.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/passivetex.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/phrase.propagates.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/pixels.per.inch.xml
+share/apps/ksgmltools2/docbook/xsl/params/points.per.em.xml
 share/apps/ksgmltools2/docbook/xsl/params/preface.autolabel.xml
+share/apps/ksgmltools2/docbook/xsl/params/prefer.internal.olink.xml
+share/apps/ksgmltools2/docbook/xsl/params/preferred.mediaobject.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/procedure.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/process.empty.source.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/process.source.toc.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.arch.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.attribute.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.condition.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.conformance.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.lang.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.os.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.revision.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.revisionflag.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.role.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.security.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.userlevel.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.value.xml
+share/apps/ksgmltools2/docbook/xsl/params/profile.vendor.xml
 share/apps/ksgmltools2/docbook/xsl/params/punct.honorific.xml
 share/apps/ksgmltools2/docbook/xsl/params/qanda.defaultlabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/qanda.inherit.numeration.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/qanda.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/qandadiv.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.name.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.generate.title.xml
+share/apps/ksgmltools2/docbook/xsl/params/refentry.pagebreak.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/refentry.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/refentry.xref.manvolnum.xml
 share/apps/ksgmltools2/docbook/xsl/params/region.after.extent.xml
 share/apps/ksgmltools2/docbook/xsl/params/region.before.extent.xml
 share/apps/ksgmltools2/docbook/xsl/params/root.filename.xml
+share/apps/ksgmltools2/docbook/xsl/params/root.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/rootid.xml
 share/apps/ksgmltools2/docbook/xsl/params/runinhead.default.title.end.punct.xml
 share/apps/ksgmltools2/docbook/xsl/params/runinhead.title.end.punct.xml
@@ -2394,83 +2713,92 @@ share/apps/ksgmltools2/docbook/xsl/params/saxon.callouts.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.character.representation.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.linenumbering.xml
 share/apps/ksgmltools2/docbook/xsl/params/saxon.tablecolumns.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.max.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/section.autolabel.xml
 share/apps/ksgmltools2/docbook/xsl/params/section.label.includes.component.label.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level1.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level2.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level3.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level4.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level5.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.level6.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/section.title.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/segmentedlist.as.table.xml
 share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.style.xml
 share/apps/ksgmltools2/docbook/xsl/params/shade.verbatim.xml
 share/apps/ksgmltools2/docbook/xsl/params/show.comments.xml
 share/apps/ksgmltools2/docbook/xsl/params/show.revisionflag.xml
+share/apps/ksgmltools2/docbook/xsl/params/sidebar.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/simplesect.in.toc.xml
 share/apps/ksgmltools2/docbook/xsl/params/spacing.paras.xml
-share/apps/ksgmltools2/docbook/xsl/params/stylesheet.result.type.xml
+share/apps/ksgmltools2/docbook/xsl/params/subscript.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/superscript.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/suppress.footer.navigation.xml
+share/apps/ksgmltools2/docbook/xsl/params/suppress.header.navigation.xml
 share/apps/ksgmltools2/docbook/xsl/params/suppress.navigation.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.color.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.padding.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.style.xml
-share/apps/ksgmltools2/docbook/xsl/params/table.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/symbol.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/table.borders.with.css.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.color.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.cell.padding.xml
 share/apps/ksgmltools2/docbook/xsl/params/table.entry.padding.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.footnote.number.symbols.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.color.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.frame.border.thickness.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/table.table.properties.xml
 share/apps/ksgmltools2/docbook/xsl/params/tablecolumns.extension.xml
+share/apps/ksgmltools2/docbook/xsl/params/target.database.document.xml
+share/apps/ksgmltools2/docbook/xsl/params/targets.filename.xml
 share/apps/ksgmltools2/docbook/xsl/params/template.xml
+share/apps/ksgmltools2/docbook/xsl/params/tex.math.delims.xml
 share/apps/ksgmltools2/docbook/xsl/params/tex.math.file.xml
 share/apps/ksgmltools2/docbook/xsl/params/tex.math.in.alt.xml
+share/apps/ksgmltools2/docbook/xsl/params/textdata.default.encoding.xml
 share/apps/ksgmltools2/docbook/xsl/params/textinsert.extension.xml
 share/apps/ksgmltools2/docbook/xsl/params/title.font.family.xml
 share/apps/ksgmltools2/docbook/xsl/params/title.margin.left.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.indent.width.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.list.type.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.margin.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/toc.max.depth.xml
 share/apps/ksgmltools2/docbook/xsl/params/toc.section.depth.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.footnote.number.format.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.footnotes.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.hyphenate.xml
+share/apps/ksgmltools2/docbook/xsl/params/ulink.show.xml
 share/apps/ksgmltools2/docbook/xsl/params/ulink.target.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.embed.for.svg.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.extensions.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.id.as.filename.xml
 share/apps/ksgmltools2/docbook/xsl/params/use.id.function.xml
-share/apps/ksgmltools2/docbook/xsl/params/using.chunker.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.local.olink.style.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.role.as.xrefstyle.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.role.for.mediaobject.xml
+share/apps/ksgmltools2/docbook/xsl/params/use.svg.xml
 share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.blocks.xml
 share/apps/ksgmltools2/docbook/xsl/params/variablelist.as.table.xml
+share/apps/ksgmltools2/docbook/xsl/params/variablelist.max.termlength.xml
 share/apps/ksgmltools2/docbook/xsl/params/verbatim.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/wordml.template.xml
 share/apps/ksgmltools2/docbook/xsl/params/xep.extensions.xml
+share/apps/ksgmltools2/docbook/xsl/params/xep.index.item.properties.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.label-page.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.label-title.separator.xml
 share/apps/ksgmltools2/docbook/xsl/params/xref.properties.xml
-share/apps/ksgmltools2/docbook/xsl/tools/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/olink/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olink-common.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olink.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olinkchunk.xsl
-share/apps/ksgmltools2/docbook/xsl/tools/olink/olinksum.dtd
-share/apps/ksgmltools2/docbook/xsl/tools/profile/ChangeLog
-share/apps/ksgmltools2/docbook/xsl/tools/profile/profile.xsl
+share/apps/ksgmltools2/docbook/xsl/params/xref.title-page.separator.xml
+share/apps/ksgmltools2/docbook/xsl/params/xref.with.number.and.title.xml
 share/apps/kssl/ca-bundle.crt
-share/apps/kstyle/pixmaps/aquaice.png
-share/apps/kstyle/pixmaps/black_combo.png
-share/apps/kstyle/pixmaps/blkmarble.png
-share/apps/kstyle/pixmaps/darkgraytexture.png
-share/apps/kstyle/pixmaps/darkslider.png
-share/apps/kstyle/pixmaps/elec_combo.png
-share/apps/kstyle/pixmaps/elec_combodown.png
-share/apps/kstyle/pixmaps/elec_groove.png
-share/apps/kstyle/pixmaps/elec_hdl.png
-share/apps/kstyle/pixmaps/elec_horizhdl.png
-share/apps/kstyle/pixmaps/elec_off.png
-share/apps/kstyle/pixmaps/elec_on.png
-share/apps/kstyle/pixmaps/elec_slider.png
-share/apps/kstyle/pixmaps/gold_checked.png
-share/apps/kstyle/pixmaps/gold_unchecked.png
-share/apps/kstyle/pixmaps/graybutton.png
-share/apps/kstyle/pixmaps/grayice.png
-share/apps/kstyle/pixmaps/graymarble.png
-share/apps/kstyle/pixmaps/graymarble_dark.png
-share/apps/kstyle/pixmaps/graytexture.png
-share/apps/kstyle/pixmaps/ice.png
-share/apps/kstyle/pixmaps/marble2.png
-share/apps/kstyle/pixmaps/marble3.png
-share/apps/kstyle/pixmaps/marble_checked.png
-share/apps/kstyle/pixmaps/marble_combo.png
-share/apps/kstyle/pixmaps/marble_off.png
-share/apps/kstyle/pixmaps/marble_on.png
-share/apps/kstyle/pixmaps/marble_unchecked.png
-share/apps/kstyle/pixmaps/minigray.png
-share/apps/kstyle/pixmaps/pinkmarble.png
-share/apps/kstyle/pixmaps/red_checkmark.png
 share/apps/kstyle/pixmaps/riscos/arrowdown.png
 share/apps/kstyle/pixmaps/riscos/arrowdown_down.png
 share/apps/kstyle/pixmaps/riscos/arrowleft.png
@@ -2503,40 +2831,14 @@ share/apps/kstyle/pixmaps/riscos/vscrollbar.png
 share/apps/kstyle/pixmaps/riscos/vscrollbar_down.png
 share/apps/kstyle/pixmaps/riscos/vscrollborder.png
 share/apps/kstyle/pixmaps/riscos/vtab.png
-share/apps/kstyle/pixmaps/sbdeco_brown.png
-share/apps/kstyle/pixmaps/sbdeco_elec.png
-share/apps/kstyle/pixmaps/sbdeco_elec_small.png
-share/apps/kstyle/pixmaps/sbdeco_elec_smalldown.png
-share/apps/kstyle/pixmaps/sbdeco_elecdown.png
-share/apps/kstyle/pixmaps/sbdeco_gray.png
-share/apps/kstyle/pixmaps/slate.png
-share/apps/kstyle/pixmaps/switch_off.png
-share/apps/kstyle/pixmaps/switch_on.png
-share/apps/kstyle/pixmaps/sysarrow_down.png
-share/apps/kstyle/pixmaps/sysarrow_idown.png
-share/apps/kstyle/pixmaps/sysarrow_ileft.png
-share/apps/kstyle/pixmaps/sysarrow_iright.png
-share/apps/kstyle/pixmaps/sysarrow_iup.png
-share/apps/kstyle/pixmaps/sysarrow_left.png
-share/apps/kstyle/pixmaps/sysarrow_right.png
-share/apps/kstyle/pixmaps/sysarrow_sdown.png
-share/apps/kstyle/pixmaps/sysarrow_sleft.png
-share/apps/kstyle/pixmaps/sysarrow_sright.png
-share/apps/kstyle/pixmaps/sysarrow_sup.png
-share/apps/kstyle/pixmaps/sysarrow_up.png
-share/apps/kstyle/pixmaps/sysborder.png
-share/apps/kstyle/pixmaps/sysborderdown.png
-share/apps/kstyle/pixmaps/whitemarble.png
-share/apps/kstyle/pixmaps/woodmenu.png
-share/apps/kstyle/pixmaps/yellow_off.png
-share/apps/kstyle/pixmaps/yellow_on.png
 share/apps/kstyle/themes/b3.themerc
 share/apps/kstyle/themes/default.themerc
 share/apps/kstyle/themes/highcolor.themerc
+share/apps/kstyle/themes/highcontrast.themerc
 share/apps/kstyle/themes/keramik.themerc
 share/apps/kstyle/themes/light-v2.themerc
 share/apps/kstyle/themes/light-v3.themerc
-share/apps/kstyle/themes/marble.themerc
+share/apps/kstyle/themes/plastik.themerc
 share/apps/kstyle/themes/qtcde.themerc
 share/apps/kstyle/themes/qtmotif.themerc
 share/apps/kstyle/themes/qtmotifplus.themerc
@@ -2544,8 +2846,6 @@ share/apps/kstyle/themes/qtplatinum.themerc
 share/apps/kstyle/themes/qtsgi.themerc
 share/apps/kstyle/themes/qtwindows.themerc
 share/apps/kstyle/themes/riscos.themerc
-share/apps/kstyle/themes/system.themerc
-share/apps/kstyle/themes/systemalt.themerc
 share/apps/ktexteditor_docwordcompletion/docwordcompletionui.rc
 share/apps/ktexteditor_insertfile/ktexteditor_insertfileui.rc
 share/apps/ktexteditor_isearch/ktexteditor_isearchui.rc
@@ -2555,13 +2855,13 @@ share/autostart/kab2kabc.desktop
 share/config/colors/40 Colors
 share/config/colors/Royal
 share/config/colors/Web
+share/config/katefiletyperc
 share/config/katesyntaxhighlightingrc
 share/config/kdebug.areas
 share/config/kdebugrc
 share/config/kdeprintrc
 share/config/khotnewstuffrc
 share/config/ksslcalist
-share/config/ktexteditor_autobookmarkerrc
 share/config/kthemestylerc
 share/config/language.codes
 share/config/ui/kprintpreviewui.rc
@@ -2579,6 +2879,9 @@ share/doc/HTML/en/common/8.png
 share/doc/HTML/en/common/9.png
 share/doc/HTML/en/common/appheader.html
 share/doc/HTML/en/common/artistic-license.html
+share/doc/HTML/en/common/bottom-left.png
+share/doc/HTML/en/common/bottom-middle.png
+share/doc/HTML/en/common/bottom-right.png
 share/doc/HTML/en/common/bottom1.png
 share/doc/HTML/en/common/bottom2.png
 share/doc/HTML/en/common/bsd-license.html
@@ -2609,6 +2912,9 @@ share/doc/HTML/en/common/mainfooter.html
 share/doc/HTML/en/common/mainheader.html
 share/doc/HTML/en/common/qpl-license.html
 share/doc/HTML/en/common/shadow.png
+share/doc/HTML/en/common/top-left.png
+share/doc/HTML/en/common/top-middle.png
+share/doc/HTML/en/common/top-right-konqueror.png
 share/doc/HTML/en/common/web-docbottom.png
 share/doc/HTML/en/common/web-doctop.png
 share/doc/HTML/en/common/x11-license.html
@@ -2617,11 +2923,73 @@ share/doc/HTML/en/kdelibs-apidocs/common
 share/doc/HTML/en/kspell/common
 share/doc/HTML/en/kspell/index.cache.bz2
 share/doc/HTML/en/kspell/index.docbook
+share/emoticons/Default/angry.png
+share/emoticons/Default/bat.png
+share/emoticons/Default/beer.png
+share/emoticons/Default/biggrin.png
+share/emoticons/Default/cake.png
+share/emoticons/Default/camera.png
+share/emoticons/Default/cat.png
+share/emoticons/Default/clock.png
+share/emoticons/Default/cocktail.png
+share/emoticons/Default/confused.png
+share/emoticons/Default/cry.png
+share/emoticons/Default/cup.png
+share/emoticons/Default/dog.png
+share/emoticons/Default/email.png
+share/emoticons/Default/embarassed.png
+share/emoticons/Default/emoticons.xml
+share/emoticons/Default/film.png
+share/emoticons/Default/foot_in_mouth.png
+share/emoticons/Default/innocent.png
+share/emoticons/Default/kiss.png
+share/emoticons/Default/lightbulb.png
+share/emoticons/Default/love.png
+share/emoticons/Default/note.png
+share/emoticons/Default/oh.png
+share/emoticons/Default/omg.png
+share/emoticons/Default/phone.png
+share/emoticons/Default/present.png
+share/emoticons/Default/rose.png
+share/emoticons/Default/sad.png
+share/emoticons/Default/shade.png
+share/emoticons/Default/sleep.png
+share/emoticons/Default/smile.png
+share/emoticons/Default/star.png
+share/emoticons/Default/teeth.png
+share/emoticons/Default/thumbs_down.png
+share/emoticons/Default/thumbs_up.png
+share/emoticons/Default/tongue.png
+share/emoticons/Default/undecided.png
+share/emoticons/Default/unhappy.png
+share/emoticons/Default/unlove.png
+share/emoticons/Default/wilted_rose.png
+share/emoticons/Default/wink.png
+share/icons/crystalsvg/128x128/actions/contents2.png
+share/icons/crystalsvg/128x128/actions/fileprint.png
+share/icons/crystalsvg/128x128/actions/filequickprint.png
+share/icons/crystalsvg/128x128/actions/frameprint.png
 share/icons/crystalsvg/128x128/actions/player_playlist.png
+share/icons/crystalsvg/128x128/actions/share.png
 share/icons/crystalsvg/128x128/apps/password.png
 share/icons/crystalsvg/128x128/devices/blockdevice.png
+share/icons/crystalsvg/128x128/devices/camera_mount.png
+share/icons/crystalsvg/128x128/devices/camera_unmount.png
 share/icons/crystalsvg/128x128/devices/chardevice.png
+share/icons/crystalsvg/128x128/devices/compact_flash_mount.png
+share/icons/crystalsvg/128x128/devices/compact_flash_unmount.png
+share/icons/crystalsvg/128x128/devices/hdd_mount.png
+share/icons/crystalsvg/128x128/devices/hdd_unmount.png
+share/icons/crystalsvg/128x128/devices/memory_stick_mount.png
+share/icons/crystalsvg/128x128/devices/memory_stick_unmount.png
 share/icons/crystalsvg/128x128/devices/mouse.png
+share/icons/crystalsvg/128x128/devices/print_class.png
+share/icons/crystalsvg/128x128/devices/printer1.png
+share/icons/crystalsvg/128x128/devices/sd_mmc_mount.png
+share/icons/crystalsvg/128x128/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/128x128/devices/smart_media_mount.png
+share/icons/crystalsvg/128x128/devices/smart_media_unmount.png
+share/icons/crystalsvg/128x128/devices/system.png
 share/icons/crystalsvg/128x128/devices/usbpendrive_mount.png
 share/icons/crystalsvg/128x128/devices/usbpendrive_unmount.png
 share/icons/crystalsvg/128x128/filesystems/desktop.png
@@ -2705,7 +3073,6 @@ share/icons/crystalsvg/128x128/mimetypes/pk.png
 share/icons/crystalsvg/128x128/mimetypes/postscript.png
 share/icons/crystalsvg/128x128/mimetypes/quicktime.png
 share/icons/crystalsvg/128x128/mimetypes/readme.png
-share/icons/crystalsvg/128x128/mimetypes/real_doc.png
 share/icons/crystalsvg/128x128/mimetypes/recycled.png
 share/icons/crystalsvg/128x128/mimetypes/resource.png
 share/icons/crystalsvg/128x128/mimetypes/rpm.png
@@ -2779,6 +3146,7 @@ share/icons/crystalsvg/16x16/actions/connect_creating.png
 share/icons/crystalsvg/16x16/actions/connect_established.png
 share/icons/crystalsvg/16x16/actions/connect_no.png
 share/icons/crystalsvg/16x16/actions/contents.png
+share/icons/crystalsvg/16x16/actions/contents2.png
 share/icons/crystalsvg/16x16/actions/contexthelp.png
 share/icons/crystalsvg/16x16/actions/crop.png
 share/icons/crystalsvg/16x16/actions/decrypted.png
@@ -2903,6 +3271,10 @@ share/icons/crystalsvg/16x16/actions/player_start.png
 share/icons/crystalsvg/16x16/actions/player_stop.png
 share/icons/crystalsvg/16x16/actions/player_time.png
 share/icons/crystalsvg/16x16/actions/player_volume.png
+share/icons/crystalsvg/16x16/actions/presence_away.png
+share/icons/crystalsvg/16x16/actions/presence_offline.png
+share/icons/crystalsvg/16x16/actions/presence_online.png
+share/icons/crystalsvg/16x16/actions/presence_unknown.png
 share/icons/crystalsvg/16x16/actions/previous.png
 share/icons/crystalsvg/16x16/actions/project_open.png
 share/icons/crystalsvg/16x16/actions/queue.png
@@ -2969,6 +3341,7 @@ share/icons/crystalsvg/16x16/actions/viewmagfit.png
 share/icons/crystalsvg/16x16/actions/window_fullscreen.png
 share/icons/crystalsvg/16x16/actions/window_new.png
 share/icons/crystalsvg/16x16/actions/window_nofullscreen.png
+share/icons/crystalsvg/16x16/actions/window_suppressed.png
 share/icons/crystalsvg/16x16/actions/wizard.png
 share/icons/crystalsvg/16x16/apps/password.png
 share/icons/crystalsvg/16x16/devices/3floppy_mount.png
@@ -2985,12 +3358,16 @@ share/icons/crystalsvg/16x16/devices/cdrom_unmount.png
 share/icons/crystalsvg/16x16/devices/cdwriter_mount.png
 share/icons/crystalsvg/16x16/devices/cdwriter_unmount.png
 share/icons/crystalsvg/16x16/devices/chardevice.png
+share/icons/crystalsvg/16x16/devices/compact_flash_mount.png
+share/icons/crystalsvg/16x16/devices/compact_flash_unmount.png
 share/icons/crystalsvg/16x16/devices/dvd_mount.png
 share/icons/crystalsvg/16x16/devices/dvd_unmount.png
 share/icons/crystalsvg/16x16/devices/hdd_mount.png
 share/icons/crystalsvg/16x16/devices/hdd_unmount.png
 share/icons/crystalsvg/16x16/devices/joystick.png
 share/icons/crystalsvg/16x16/devices/memory.png
+share/icons/crystalsvg/16x16/devices/memory_stick_mount.png
+share/icons/crystalsvg/16x16/devices/memory_stick_unmount.png
 share/icons/crystalsvg/16x16/devices/mo_mount.png
 share/icons/crystalsvg/16x16/devices/mo_unmount.png
 share/icons/crystalsvg/16x16/devices/mouse.png
@@ -3001,6 +3378,11 @@ share/icons/crystalsvg/16x16/devices/pda_blue.png
 share/icons/crystalsvg/16x16/devices/print_class.png
 share/icons/crystalsvg/16x16/devices/printer1.png
 share/icons/crystalsvg/16x16/devices/scanner.png
+share/icons/crystalsvg/16x16/devices/sd_mmc_mount.png
+share/icons/crystalsvg/16x16/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/16x16/devices/smart_media_mount.png
+share/icons/crystalsvg/16x16/devices/smart_media_unmount.png
+share/icons/crystalsvg/16x16/devices/system.png
 share/icons/crystalsvg/16x16/devices/tablet.png
 share/icons/crystalsvg/16x16/devices/tv.png
 share/icons/crystalsvg/16x16/devices/usbpendrive_mount.png
@@ -3041,6 +3423,7 @@ share/icons/crystalsvg/16x16/filesystems/folder_violet.png
 share/icons/crystalsvg/16x16/filesystems/folder_violet_open.png
 share/icons/crystalsvg/16x16/filesystems/folder_yellow.png
 share/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/16x16/filesystems/ftp.png
 share/icons/crystalsvg/16x16/filesystems/link.png
 share/icons/crystalsvg/16x16/filesystems/lockoverlay.png
 share/icons/crystalsvg/16x16/filesystems/network.png
@@ -3100,7 +3483,6 @@ share/icons/crystalsvg/16x16/mimetypes/pk.png
 share/icons/crystalsvg/16x16/mimetypes/postscript.png
 share/icons/crystalsvg/16x16/mimetypes/quicktime.png
 share/icons/crystalsvg/16x16/mimetypes/readme.png
-share/icons/crystalsvg/16x16/mimetypes/real_doc.png
 share/icons/crystalsvg/16x16/mimetypes/recycled.png
 share/icons/crystalsvg/16x16/mimetypes/resource.png
 share/icons/crystalsvg/16x16/mimetypes/rpm.png
@@ -3170,6 +3552,7 @@ share/icons/crystalsvg/22x22/actions/connect_creating.png
 share/icons/crystalsvg/22x22/actions/connect_established.png
 share/icons/crystalsvg/22x22/actions/connect_no.png
 share/icons/crystalsvg/22x22/actions/contents.png
+share/icons/crystalsvg/22x22/actions/contents2.png
 share/icons/crystalsvg/22x22/actions/contexthelp.png
 share/icons/crystalsvg/22x22/actions/crop.png
 share/icons/crystalsvg/22x22/actions/decrypted.png
@@ -3220,6 +3603,8 @@ share/icons/crystalsvg/22x22/actions/goto.png
 share/icons/crystalsvg/22x22/actions/halfencrypted.png
 share/icons/crystalsvg/22x22/actions/help.png
 share/icons/crystalsvg/22x22/actions/history.png
+share/icons/crystalsvg/22x22/actions/idea.png
+share/icons/crystalsvg/22x22/actions/identity.png
 share/icons/crystalsvg/22x22/actions/inline_image.png
 share/icons/crystalsvg/22x22/actions/inline_table.png
 share/icons/crystalsvg/22x22/actions/kde.png
@@ -3259,6 +3644,7 @@ share/icons/crystalsvg/22x22/actions/math_sqrt.png
 share/icons/crystalsvg/22x22/actions/math_sum.png
 share/icons/crystalsvg/22x22/actions/message_reply.png
 share/icons/crystalsvg/22x22/actions/misc.png
+share/icons/crystalsvg/22x22/actions/mouse.png
 share/icons/crystalsvg/22x22/actions/move.png
 share/icons/crystalsvg/22x22/actions/music_32ndnote.png
 share/icons/crystalsvg/22x22/actions/music_cleficon.png
@@ -3303,13 +3689,12 @@ share/icons/crystalsvg/22x22/actions/rotate_ccw.png
 share/icons/crystalsvg/22x22/actions/rotate_cw.png
 share/icons/crystalsvg/22x22/actions/run.png
 share/icons/crystalsvg/22x22/actions/save_all.png
+share/icons/crystalsvg/22x22/actions/share.png
 share/icons/crystalsvg/22x22/actions/showmenu.png
 share/icons/crystalsvg/22x22/actions/signature.png
 share/icons/crystalsvg/22x22/actions/spellcheck.png
 share/icons/crystalsvg/22x22/actions/start.png
 share/icons/crystalsvg/22x22/actions/stop.png
-share/icons/crystalsvg/22x22/actions/sub.png
-share/icons/crystalsvg/22x22/actions/super.png
 share/icons/crystalsvg/22x22/actions/text.png
 share/icons/crystalsvg/22x22/actions/text_block.png
 share/icons/crystalsvg/22x22/actions/text_bold.png
@@ -3318,6 +3703,8 @@ share/icons/crystalsvg/22x22/actions/text_italic.png
 share/icons/crystalsvg/22x22/actions/text_left.png
 share/icons/crystalsvg/22x22/actions/text_right.png
 share/icons/crystalsvg/22x22/actions/text_strike.png
+share/icons/crystalsvg/22x22/actions/text_sub.png
+share/icons/crystalsvg/22x22/actions/text_super.png
 share/icons/crystalsvg/22x22/actions/text_under.png
 share/icons/crystalsvg/22x22/actions/thumbnail.png
 share/icons/crystalsvg/22x22/actions/today.png
@@ -3348,8 +3735,48 @@ share/icons/crystalsvg/22x22/actions/window_fullscreen.png
 share/icons/crystalsvg/22x22/actions/window_new.png
 share/icons/crystalsvg/22x22/actions/window_nofullscreen.png
 share/icons/crystalsvg/22x22/actions/wizard.png
+share/icons/crystalsvg/22x22/apps/password.png
+share/icons/crystalsvg/22x22/devices/3floppy_mount.png
+share/icons/crystalsvg/22x22/devices/3floppy_unmount.png
+share/icons/crystalsvg/22x22/devices/camera_mount.png
+share/icons/crystalsvg/22x22/devices/camera_unmount.png
+share/icons/crystalsvg/22x22/devices/cdaudio_unmount.png
+share/icons/crystalsvg/22x22/devices/compact_flash_mount.png
+share/icons/crystalsvg/22x22/devices/compact_flash_unmount.png
+share/icons/crystalsvg/22x22/devices/hdd_mount.png
+share/icons/crystalsvg/22x22/devices/hdd_unmount.png
+share/icons/crystalsvg/22x22/devices/joystick.png
+share/icons/crystalsvg/22x22/devices/memory_stick_mount.png
+share/icons/crystalsvg/22x22/devices/memory_stick_unmount.png
+share/icons/crystalsvg/22x22/devices/print_class.png
+share/icons/crystalsvg/22x22/devices/printer1.png
+share/icons/crystalsvg/22x22/devices/sd_mmc_mount.png
+share/icons/crystalsvg/22x22/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/22x22/devices/smart_media_mount.png
+share/icons/crystalsvg/22x22/devices/smart_media_unmount.png
+share/icons/crystalsvg/22x22/devices/system.png
 share/icons/crystalsvg/22x22/devices/usbpendrive_mount.png
 share/icons/crystalsvg/22x22/devices/usbpendrive_unmount.png
+share/icons/crystalsvg/22x22/filesystems/desktop.png
+share/icons/crystalsvg/22x22/filesystems/folder.png
+share/icons/crystalsvg/22x22/filesystems/folder_green.png
+share/icons/crystalsvg/22x22/filesystems/folder_green_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_grey.png
+share/icons/crystalsvg/22x22/filesystems/folder_grey_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_home.png
+share/icons/crystalsvg/22x22/filesystems/folder_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_orange.png
+share/icons/crystalsvg/22x22/filesystems/folder_orange_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_print.png
+share/icons/crystalsvg/22x22/filesystems/folder_red.png
+share/icons/crystalsvg/22x22/filesystems/folder_red_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_violet.png
+share/icons/crystalsvg/22x22/filesystems/folder_violet_open.png
+share/icons/crystalsvg/22x22/filesystems/folder_yellow.png
+share/icons/crystalsvg/22x22/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/22x22/filesystems/network.png
+share/icons/crystalsvg/22x22/filesystems/trashcan_empty.png
+share/icons/crystalsvg/22x22/filesystems/trashcan_full.png
 share/icons/crystalsvg/22x22/filesystems/www.png
 share/icons/crystalsvg/22x22/mimetypes/applix.png
 share/icons/crystalsvg/22x22/mimetypes/ascii.png
@@ -3401,7 +3828,6 @@ share/icons/crystalsvg/22x22/mimetypes/pk.png
 share/icons/crystalsvg/22x22/mimetypes/postscript.png
 share/icons/crystalsvg/22x22/mimetypes/quicktime.png
 share/icons/crystalsvg/22x22/mimetypes/readme.png
-share/icons/crystalsvg/22x22/mimetypes/real_doc.png
 share/icons/crystalsvg/22x22/mimetypes/recycled.png
 share/icons/crystalsvg/22x22/mimetypes/rpm.png
 share/icons/crystalsvg/22x22/mimetypes/shellscript.png
@@ -3459,6 +3885,7 @@ share/icons/crystalsvg/32x32/actions/connect_creating.png
 share/icons/crystalsvg/32x32/actions/connect_established.png
 share/icons/crystalsvg/32x32/actions/connect_no.png
 share/icons/crystalsvg/32x32/actions/contents.png
+share/icons/crystalsvg/32x32/actions/contents2.png
 share/icons/crystalsvg/32x32/actions/contexthelp.png
 share/icons/crystalsvg/32x32/actions/decrypted.png
 share/icons/crystalsvg/32x32/actions/down.png
@@ -3557,6 +3984,10 @@ share/icons/crystalsvg/32x32/actions/player_playlist.png
 share/icons/crystalsvg/32x32/actions/player_rew.png
 share/icons/crystalsvg/32x32/actions/player_start.png
 share/icons/crystalsvg/32x32/actions/player_stop.png
+share/icons/crystalsvg/32x32/actions/presence_away.png
+share/icons/crystalsvg/32x32/actions/presence_offline.png
+share/icons/crystalsvg/32x32/actions/presence_online.png
+share/icons/crystalsvg/32x32/actions/presence_unknown.png
 share/icons/crystalsvg/32x32/actions/previous.png
 share/icons/crystalsvg/32x32/actions/project_open.png
 share/icons/crystalsvg/32x32/actions/queue.png
@@ -3583,6 +4014,9 @@ share/icons/crystalsvg/32x32/actions/text_center.png
 share/icons/crystalsvg/32x32/actions/text_italic.png
 share/icons/crystalsvg/32x32/actions/text_left.png
 share/icons/crystalsvg/32x32/actions/text_right.png
+share/icons/crystalsvg/32x32/actions/text_strike.png
+share/icons/crystalsvg/32x32/actions/text_sub.png
+share/icons/crystalsvg/32x32/actions/text_super.png
 share/icons/crystalsvg/32x32/actions/text_under.png
 share/icons/crystalsvg/32x32/actions/today.png
 share/icons/crystalsvg/32x32/actions/toggle_log.png
@@ -3627,12 +4061,16 @@ share/icons/crystalsvg/32x32/devices/cdrom_unmount.png
 share/icons/crystalsvg/32x32/devices/cdwriter_mount.png
 share/icons/crystalsvg/32x32/devices/cdwriter_unmount.png
 share/icons/crystalsvg/32x32/devices/chardevice.png
+share/icons/crystalsvg/32x32/devices/compact_flash_mount.png
+share/icons/crystalsvg/32x32/devices/compact_flash_unmount.png
 share/icons/crystalsvg/32x32/devices/dvd_mount.png
 share/icons/crystalsvg/32x32/devices/dvd_unmount.png
 share/icons/crystalsvg/32x32/devices/hdd_mount.png
 share/icons/crystalsvg/32x32/devices/hdd_unmount.png
 share/icons/crystalsvg/32x32/devices/joystick.png
 share/icons/crystalsvg/32x32/devices/memory.png
+share/icons/crystalsvg/32x32/devices/memory_stick_mount.png
+share/icons/crystalsvg/32x32/devices/memory_stick_unmount.png
 share/icons/crystalsvg/32x32/devices/mo_mount.png
 share/icons/crystalsvg/32x32/devices/mo_unmount.png
 share/icons/crystalsvg/32x32/devices/mouse.png
@@ -3643,6 +4081,11 @@ share/icons/crystalsvg/32x32/devices/pda_blue.png
 share/icons/crystalsvg/32x32/devices/print_class.png
 share/icons/crystalsvg/32x32/devices/printer1.png
 share/icons/crystalsvg/32x32/devices/scanner.png
+share/icons/crystalsvg/32x32/devices/sd_mmc_mount.png
+share/icons/crystalsvg/32x32/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/32x32/devices/smart_media_mount.png
+share/icons/crystalsvg/32x32/devices/smart_media_unmount.png
+share/icons/crystalsvg/32x32/devices/system.png
 share/icons/crystalsvg/32x32/devices/tablet.png
 share/icons/crystalsvg/32x32/devices/tv.png
 share/icons/crystalsvg/32x32/devices/usbpendrive_mount.png
@@ -3680,6 +4123,7 @@ share/icons/crystalsvg/32x32/filesystems/folder_violet.png
 share/icons/crystalsvg/32x32/filesystems/folder_violet_open.png
 share/icons/crystalsvg/32x32/filesystems/folder_yellow.png
 share/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/32x32/filesystems/ftp.png
 share/icons/crystalsvg/32x32/filesystems/link.png
 share/icons/crystalsvg/32x32/filesystems/lockoverlay.png
 share/icons/crystalsvg/32x32/filesystems/network.png
@@ -3738,7 +4182,6 @@ share/icons/crystalsvg/32x32/mimetypes/pk.png
 share/icons/crystalsvg/32x32/mimetypes/postscript.png
 share/icons/crystalsvg/32x32/mimetypes/quicktime.png
 share/icons/crystalsvg/32x32/mimetypes/readme.png
-share/icons/crystalsvg/32x32/mimetypes/real_doc.png
 share/icons/crystalsvg/32x32/mimetypes/recycled.png
 share/icons/crystalsvg/32x32/mimetypes/resource.png
 share/icons/crystalsvg/32x32/mimetypes/rpm.png
@@ -3777,18 +4220,30 @@ share/icons/crystalsvg/32x32/mimetypes/widget_doc.png
 share/icons/crystalsvg/32x32/mimetypes/wordprocessing.png
 share/icons/crystalsvg/48x48/actions/back.png
 share/icons/crystalsvg/48x48/actions/bookmark.png
+share/icons/crystalsvg/48x48/actions/contents2.png
 share/icons/crystalsvg/48x48/actions/down.png
 share/icons/crystalsvg/48x48/actions/exit.png
 share/icons/crystalsvg/48x48/actions/fileclose.png
+share/icons/crystalsvg/48x48/actions/filenew.png
+share/icons/crystalsvg/48x48/actions/fileprint.png
+share/icons/crystalsvg/48x48/actions/filequickprint.png
 share/icons/crystalsvg/48x48/actions/forward.png
+share/icons/crystalsvg/48x48/actions/frameprint.png
 share/icons/crystalsvg/48x48/actions/gear.png
+share/icons/crystalsvg/48x48/actions/identity.png
 share/icons/crystalsvg/48x48/actions/indent.png
 share/icons/crystalsvg/48x48/actions/lock.png
+share/icons/crystalsvg/48x48/actions/mail_new.png
+share/icons/crystalsvg/48x48/actions/mail_post_to.png
 share/icons/crystalsvg/48x48/actions/misc.png
 share/icons/crystalsvg/48x48/actions/player_playlist.png
+share/icons/crystalsvg/48x48/actions/presence_away.png
+share/icons/crystalsvg/48x48/actions/presence_offline.png
+share/icons/crystalsvg/48x48/actions/presence_online.png
 share/icons/crystalsvg/48x48/actions/share.png
 share/icons/crystalsvg/48x48/actions/unindent.png
 share/icons/crystalsvg/48x48/actions/up.png
+share/icons/crystalsvg/48x48/actions/wizard.png
 share/icons/crystalsvg/48x48/apps/password.png
 share/icons/crystalsvg/48x48/devices/3floppy_mount.png
 share/icons/crystalsvg/48x48/devices/3floppy_unmount.png
@@ -3804,12 +4259,16 @@ share/icons/crystalsvg/48x48/devices/cdrom_unmount.png
 share/icons/crystalsvg/48x48/devices/cdwriter_mount.png
 share/icons/crystalsvg/48x48/devices/cdwriter_unmount.png
 share/icons/crystalsvg/48x48/devices/chardevice.png
+share/icons/crystalsvg/48x48/devices/compact_flash_mount.png
+share/icons/crystalsvg/48x48/devices/compact_flash_unmount.png
 share/icons/crystalsvg/48x48/devices/dvd_mount.png
 share/icons/crystalsvg/48x48/devices/dvd_unmount.png
 share/icons/crystalsvg/48x48/devices/hdd_mount.png
 share/icons/crystalsvg/48x48/devices/hdd_unmount.png
 share/icons/crystalsvg/48x48/devices/joystick.png
 share/icons/crystalsvg/48x48/devices/memory.png
+share/icons/crystalsvg/48x48/devices/memory_stick_mount.png
+share/icons/crystalsvg/48x48/devices/memory_stick_unmount.png
 share/icons/crystalsvg/48x48/devices/mo_mount.png
 share/icons/crystalsvg/48x48/devices/mo_unmount.png
 share/icons/crystalsvg/48x48/devices/mouse.png
@@ -3820,6 +4279,11 @@ share/icons/crystalsvg/48x48/devices/pda_blue.png
 share/icons/crystalsvg/48x48/devices/print_class.png
 share/icons/crystalsvg/48x48/devices/printer1.png
 share/icons/crystalsvg/48x48/devices/scanner.png
+share/icons/crystalsvg/48x48/devices/sd_mmc_mount.png
+share/icons/crystalsvg/48x48/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/48x48/devices/smart_media_mount.png
+share/icons/crystalsvg/48x48/devices/smart_media_unmount.png
+share/icons/crystalsvg/48x48/devices/system.png
 share/icons/crystalsvg/48x48/devices/tablet.png
 share/icons/crystalsvg/48x48/devices/tv.png
 share/icons/crystalsvg/48x48/devices/usbpendrive_mount.png
@@ -3859,6 +4323,7 @@ share/icons/crystalsvg/48x48/filesystems/folder_violet.png
 share/icons/crystalsvg/48x48/filesystems/folder_violet_open.png
 share/icons/crystalsvg/48x48/filesystems/folder_yellow.png
 share/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png
+share/icons/crystalsvg/48x48/filesystems/ftp.png
 share/icons/crystalsvg/48x48/filesystems/link.png
 share/icons/crystalsvg/48x48/filesystems/lockoverlay.png
 share/icons/crystalsvg/48x48/filesystems/network.png
@@ -3919,7 +4384,6 @@ share/icons/crystalsvg/48x48/mimetypes/pk.png
 share/icons/crystalsvg/48x48/mimetypes/postscript.png
 share/icons/crystalsvg/48x48/mimetypes/quicktime.png
 share/icons/crystalsvg/48x48/mimetypes/readme.png
-share/icons/crystalsvg/48x48/mimetypes/real_doc.png
 share/icons/crystalsvg/48x48/mimetypes/recycled.png
 share/icons/crystalsvg/48x48/mimetypes/resource.png
 share/icons/crystalsvg/48x48/mimetypes/rpm.png
@@ -3957,9 +4421,14 @@ share/icons/crystalsvg/48x48/mimetypes/video.png
 share/icons/crystalsvg/48x48/mimetypes/widget_doc.png
 share/icons/crystalsvg/48x48/mimetypes/wordprocessing.png
 share/icons/crystalsvg/48x48/mimetypes/zip.png
+share/icons/crystalsvg/64x64/actions/contents2.png
 share/icons/crystalsvg/64x64/actions/favorites.png
+share/icons/crystalsvg/64x64/actions/fileprint.png
+share/icons/crystalsvg/64x64/actions/filequickprint.png
+share/icons/crystalsvg/64x64/actions/frameprint.png
 share/icons/crystalsvg/64x64/actions/knewstuff.png
 share/icons/crystalsvg/64x64/actions/player_playlist.png
+share/icons/crystalsvg/64x64/actions/share.png
 share/icons/crystalsvg/64x64/apps/password.png
 share/icons/crystalsvg/64x64/devices/3floppy_mount.png
 share/icons/crystalsvg/64x64/devices/3floppy_unmount.png
@@ -3975,12 +4444,16 @@ share/icons/crystalsvg/64x64/devices/cdrom_unmount.png
 share/icons/crystalsvg/64x64/devices/cdwriter_mount.png
 share/icons/crystalsvg/64x64/devices/cdwriter_unmount.png
 share/icons/crystalsvg/64x64/devices/chardevice.png
+share/icons/crystalsvg/64x64/devices/compact_flash_mount.png
+share/icons/crystalsvg/64x64/devices/compact_flash_unmount.png
 share/icons/crystalsvg/64x64/devices/dvd_mount.png
 share/icons/crystalsvg/64x64/devices/dvd_unmount.png
 share/icons/crystalsvg/64x64/devices/hdd_mount.png
 share/icons/crystalsvg/64x64/devices/hdd_unmount.png
 share/icons/crystalsvg/64x64/devices/joystick.png
 share/icons/crystalsvg/64x64/devices/memory.png
+share/icons/crystalsvg/64x64/devices/memory_stick_mount.png
+share/icons/crystalsvg/64x64/devices/memory_stick_unmount.png
 share/icons/crystalsvg/64x64/devices/mo_mount.png
 share/icons/crystalsvg/64x64/devices/mo_unmount.png
 share/icons/crystalsvg/64x64/devices/mouse.png
@@ -3991,6 +4464,11 @@ share/icons/crystalsvg/64x64/devices/pda_blue.png
 share/icons/crystalsvg/64x64/devices/print_class.png
 share/icons/crystalsvg/64x64/devices/printer1.png
 share/icons/crystalsvg/64x64/devices/scanner.png
+share/icons/crystalsvg/64x64/devices/sd_mmc_mount.png
+share/icons/crystalsvg/64x64/devices/sd_mmc_unmount.png
+share/icons/crystalsvg/64x64/devices/smart_media_mount.png
+share/icons/crystalsvg/64x64/devices/smart_media_unmount.png
+share/icons/crystalsvg/64x64/devices/system.png
 share/icons/crystalsvg/64x64/devices/tablet.png
 share/icons/crystalsvg/64x64/devices/tv.png
 share/icons/crystalsvg/64x64/devices/usbpendrive_mount.png
@@ -4084,7 +4562,6 @@ share/icons/crystalsvg/64x64/mimetypes/pk.png
 share/icons/crystalsvg/64x64/mimetypes/postscript.png
 share/icons/crystalsvg/64x64/mimetypes/quicktime.png
 share/icons/crystalsvg/64x64/mimetypes/readme.png
-share/icons/crystalsvg/64x64/mimetypes/real_doc.png
 share/icons/crystalsvg/64x64/mimetypes/recycled.png
 share/icons/crystalsvg/64x64/mimetypes/resource.png
 share/icons/crystalsvg/64x64/mimetypes/rpm.png
@@ -4124,52 +4601,71 @@ share/icons/crystalsvg/64x64/mimetypes/wordprocessing.png
 share/icons/crystalsvg/64x64/mimetypes/zip.png
 share/icons/crystalsvg/index.theme
 share/icons/crystalsvg/scalable/actions/about_kde.svgz
+share/icons/crystalsvg/scalable/actions/configure.svgz
+share/icons/crystalsvg/scalable/actions/contents2.svgz
+share/icons/crystalsvg/scalable/actions/exit.svgz
+share/icons/crystalsvg/scalable/actions/filenew.svgz
+share/icons/crystalsvg/scalable/actions/fileprint.svgz
+share/icons/crystalsvg/scalable/actions/filequickprint.svgz
+share/icons/crystalsvg/scalable/actions/frameprint.svgz
+share/icons/crystalsvg/scalable/actions/info.svgz
+share/icons/crystalsvg/scalable/actions/lock.svgz
+share/icons/crystalsvg/scalable/actions/mail_generic.svgz
+share/icons/crystalsvg/scalable/actions/mail_new.svgz
+share/icons/crystalsvg/scalable/actions/mail_post_to.svgz
+share/icons/crystalsvg/scalable/actions/share.svgz
+share/icons/crystalsvg/scalable/actions/text_bild.svgz
+share/icons/crystalsvg/scalable/actions/text_bold.svg
+share/icons/crystalsvg/scalable/actions/text_strike.svgz
+share/icons/crystalsvg/scalable/actions/text_sub.svgz
+share/icons/crystalsvg/scalable/actions/text_super.svgz
+share/icons/crystalsvg/scalable/actions/text_under.svgz
+share/icons/crystalsvg/scalable/actions/wizard.svgz
 share/icons/crystalsvg/scalable/devices/3floppy_mount.svgz
-share/icons/crystalsvg/scalable/devices/3floppy_umount.svgz
 share/icons/crystalsvg/scalable/devices/3floppy_unmount.svgz
 share/icons/crystalsvg/scalable/devices/5floppy_mount.svgz
-share/icons/crystalsvg/scalable/devices/5floppy_umount.svgz
 share/icons/crystalsvg/scalable/devices/5floppy_unmount.svgz
 share/icons/crystalsvg/scalable/devices/blockdevice.svgz
 share/icons/crystalsvg/scalable/devices/camera_mount.svgz
-share/icons/crystalsvg/scalable/devices/camera_umount.svgz
 share/icons/crystalsvg/scalable/devices/camera_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdaudio_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdaudio_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdaudio_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdrom_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdrom_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdrom_unmount.svgz
 share/icons/crystalsvg/scalable/devices/cdwriter_mount.svgz
-share/icons/crystalsvg/scalable/devices/cdwriter_umount.svgz
 share/icons/crystalsvg/scalable/devices/cdwriter_unmount.svgz
 share/icons/crystalsvg/scalable/devices/chardevice.svgz
+share/icons/crystalsvg/scalable/devices/compact_flash_mount.svgz
+share/icons/crystalsvg/scalable/devices/compact_flash_unmount.svgz
 share/icons/crystalsvg/scalable/devices/dvd_mount.svgz
-share/icons/crystalsvg/scalable/devices/dvd_umount.svgz
 share/icons/crystalsvg/scalable/devices/dvd_unmount.svgz
 share/icons/crystalsvg/scalable/devices/hdd_mount.svgz
-share/icons/crystalsvg/scalable/devices/hdd_umount.svgz
 share/icons/crystalsvg/scalable/devices/hdd_unmount.svgz
 share/icons/crystalsvg/scalable/devices/joystick.svgz
 share/icons/crystalsvg/scalable/devices/memory.svgz
+share/icons/crystalsvg/scalable/devices/memory_stick_mount.svgz
+share/icons/crystalsvg/scalable/devices/memory_stick_unmount.svgz
 share/icons/crystalsvg/scalable/devices/mo_mount.svgz
 share/icons/crystalsvg/scalable/devices/mo_umount.svgz
+share/icons/crystalsvg/scalable/devices/mo_unmount.svgz
 share/icons/crystalsvg/scalable/devices/mouse.svgz
 share/icons/crystalsvg/scalable/devices/nfs_mount.svgz
-share/icons/crystalsvg/scalable/devices/nfs_umount.svgz
 share/icons/crystalsvg/scalable/devices/nfs_unmount.svgz
 share/icons/crystalsvg/scalable/devices/pda_black.svgz
 share/icons/crystalsvg/scalable/devices/pda_blue.svgz
 share/icons/crystalsvg/scalable/devices/print_class.svgz
 share/icons/crystalsvg/scalable/devices/printer1.svgz
-share/icons/crystalsvg/scalable/devices/printer2.svgz
 share/icons/crystalsvg/scalable/devices/scanner.svgz
+share/icons/crystalsvg/scalable/devices/sd_mmc_mount.svgz
+share/icons/crystalsvg/scalable/devices/sd_mmc_unmount.svgz
+share/icons/crystalsvg/scalable/devices/smartmedia_mount.svgz
+share/icons/crystalsvg/scalable/devices/smartmedia_unmount.svgz
+share/icons/crystalsvg/scalable/devices/system.svgz
 share/icons/crystalsvg/scalable/devices/tablet.svgz
 share/icons/crystalsvg/scalable/devices/tv.svgz
 share/icons/crystalsvg/scalable/devices/usbpendrive_mount.svgz
 share/icons/crystalsvg/scalable/devices/usbpendrive_unmount.svgz
 share/icons/crystalsvg/scalable/devices/zip_mount.svgz
-share/icons/crystalsvg/scalable/devices/zip_umount.svgz
 share/icons/crystalsvg/scalable/devices/zip_unmount.svgz
 share/icons/crystalsvg/scalable/filesystems/desktop.svgz
 share/icons/crystalsvg/scalable/filesystems/exec.svgz
@@ -4182,6 +4678,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_blue.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_blue_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_cyan.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_cyan_open.svgz
+share/icons/crystalsvg/scalable/filesystems/folder_favorite.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_green.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_green_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_grey.svgz
@@ -4195,6 +4692,7 @@ share/icons/crystalsvg/scalable/filesystems/folder_man2.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_orange.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_orange_open.svgz
+share/icons/crystalsvg/scalable/filesystems/folder_print.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_red.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_red_open.svgz
 share/icons/crystalsvg/scalable/filesystems/folder_sound.svgz
@@ -4209,11 +4707,13 @@ share/icons/crystalsvg/scalable/filesystems/home_white.svgz
 share/icons/crystalsvg/scalable/filesystems/link.svgz
 share/icons/crystalsvg/scalable/filesystems/lockoverlay.svgz
 share/icons/crystalsvg/scalable/filesystems/network.svgz
+share/icons/crystalsvg/scalable/filesystems/network_local.svgz
 share/icons/crystalsvg/scalable/filesystems/pipe.svgz
 share/icons/crystalsvg/scalable/filesystems/services.svgz
 share/icons/crystalsvg/scalable/filesystems/temporary.svgz
 share/icons/crystalsvg/scalable/filesystems/trashcan_empty.svgz
 share/icons/crystalsvg/scalable/filesystems/trashcan_full.svgz
+share/icons/crystalsvg/scalable/filesystems/www.svgz
 share/icons/crystalsvg/scalable/filesystems/zip.svgz
 share/icons/crystalsvg/scalable/mimetypes/applix.svgz
 share/icons/crystalsvg/scalable/mimetypes/ascii.svgz
@@ -4257,7 +4757,6 @@ share/icons/crystalsvg/scalable/mimetypes/pk.svgz
 share/icons/crystalsvg/scalable/mimetypes/postscript.svgz
 share/icons/crystalsvg/scalable/mimetypes/quicktime.svgz
 share/icons/crystalsvg/scalable/mimetypes/readme.svgz
-share/icons/crystalsvg/scalable/mimetypes/real_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/recycled.svgz
 share/icons/crystalsvg/scalable/mimetypes/resource.svgz
 share/icons/crystalsvg/scalable/mimetypes/rpm.svgz
@@ -4295,6 +4794,15 @@ share/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
 share/icons/crystalsvg/scalable/mimetypes/zip.svgz
 share/icons/default.kde
+share/icons/hicolor/16x16/actions/show_side_panel.png
+share/icons/hicolor/16x16/actions/view_fit_width.png
+share/icons/hicolor/16x16/actions/view_fit_window.png
+share/icons/hicolor/22x22/actions/show_side_panel.png
+share/icons/hicolor/22x22/actions/view_fit_width.png
+share/icons/hicolor/22x22/actions/view_fit_window.png
+share/icons/hicolor/32x32/actions/show_side_panel.png
+share/icons/hicolor/32x32/actions/view_fit_width.png
+share/icons/hicolor/32x32/actions/view_fit_window.png
 share/icons/hicolor/index.theme
 share/locale/all_languages
 share/mimelnk/all/all.desktop
@@ -4316,12 +4824,24 @@ share/mimelnk/application/pkcs10.desktop
 share/mimelnk/application/pkcs7-mime.desktop
 share/mimelnk/application/pkcs7-signature.desktop
 share/mimelnk/application/postscript.desktop
+share/mimelnk/application/relaxng.desktop
 share/mimelnk/application/sieve.desktop
 share/mimelnk/application/smil.desktop
 share/mimelnk/application/vnd.mozilla.xul+xml.desktop
 share/mimelnk/application/vnd.ms-asf.desktop
 share/mimelnk/application/vnd.ms-excel.desktop
 share/mimelnk/application/vnd.ms-word.desktop
+share/mimelnk/application/vnd.oasis.opendocument.chart.desktop
+share/mimelnk/application/vnd.oasis.opendocument.formula.desktop
+share/mimelnk/application/vnd.oasis.opendocument.graphics-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.graphics.desktop
+share/mimelnk/application/vnd.oasis.opendocument.image.desktop
+share/mimelnk/application/vnd.oasis.opendocument.presentation-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.presentation.desktop
+share/mimelnk/application/vnd.oasis.opendocument.spreadsheet-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.spreadsheet.desktop
+share/mimelnk/application/vnd.oasis.opendocument.text-template.desktop
+share/mimelnk/application/vnd.oasis.opendocument.text.desktop
 share/mimelnk/application/vnd.palm.desktop
 share/mimelnk/application/vnd.rn-realmedia.desktop
 share/mimelnk/application/vnd.stardivision.calc.desktop
@@ -4341,6 +4861,7 @@ share/mimelnk/application/vnd.sun.xml.writer.desktop
 share/mimelnk/application/vnd.sun.xml.writer.master.desktop
 share/mimelnk/application/vnd.sun.xml.writer.template.desktop
 share/mimelnk/application/wordperfect.desktop
+share/mimelnk/application/x-7z.desktop
 share/mimelnk/application/x-abiword.desktop
 share/mimelnk/application/x-ace.desktop
 share/mimelnk/application/x-afm.desktop
@@ -4410,6 +4931,7 @@ share/mimelnk/application/x-linguist.desktop
 share/mimelnk/application/x-lyx.desktop
 share/mimelnk/application/x-lzop.desktop
 share/mimelnk/application/x-magicpoint.desktop
+share/mimelnk/application/x-mimearchive.desktop
 share/mimelnk/application/x-msaccess.desktop
 share/mimelnk/application/x-msdos-program.desktop
 share/mimelnk/application/x-msmetafile.desktop
@@ -4446,12 +4968,15 @@ share/mimelnk/application/x-tzo.desktop
 share/mimelnk/application/x-vnd.kde.kexi.desktop
 share/mimelnk/application/x-vnd.kde.kplato.desktop
 share/mimelnk/application/x-vnd.kde.kugar.mixed.desktop
+share/mimelnk/application/x-webarchive.desktop
 share/mimelnk/application/x-x509-ca-cert.desktop
+share/mimelnk/application/x-xliff.desktop
 share/mimelnk/application/x-zerosize.desktop
 share/mimelnk/application/x-zip.desktop
 share/mimelnk/application/x-zoo.desktop
 share/mimelnk/application/xhtml+xml.desktop
 share/mimelnk/application/xml.desktop
+share/mimelnk/application/xsd.desktop
 share/mimelnk/audio/aac.desktop
 share/mimelnk/audio/ac3.desktop
 share/mimelnk/audio/basic.desktop
@@ -4486,6 +5011,7 @@ share/mimelnk/image/jpeg.desktop
 share/mimelnk/image/pjpeg.desktop
 share/mimelnk/image/png.desktop
 share/mimelnk/image/svg+xml.desktop
+share/mimelnk/image/svg-xml.desktop
 share/mimelnk/image/tiff.desktop
 share/mimelnk/image/wmf.desktop
 share/mimelnk/image/x-bmp.desktop
@@ -4527,11 +5053,13 @@ share/mimelnk/text/css.desktop
 share/mimelnk/text/docbook.desktop
 share/mimelnk/text/enriched.desktop
 share/mimelnk/text/html.desktop
+share/mimelnk/text/javascript.desktop
 share/mimelnk/text/plain.desktop
 share/mimelnk/text/rdf.desktop
 share/mimelnk/text/rss.desktop
 share/mimelnk/text/rtf.desktop
 share/mimelnk/text/sgml.desktop
+share/mimelnk/text/vnd.abc.desktop
 share/mimelnk/text/vnd.wap.wml.desktop
 share/mimelnk/text/x-adasrc.desktop
 share/mimelnk/text/x-bibtex.desktop
@@ -4551,6 +5079,7 @@ share/mimelnk/text/x-lyx.desktop
 share/mimelnk/text/x-makefile.desktop
 share/mimelnk/text/x-moc.desktop
 share/mimelnk/text/x-mswinurl.desktop
+share/mimelnk/text/x-objchdr.desktop
 share/mimelnk/text/x-objcsrc.desktop
 share/mimelnk/text/x-pascal.desktop
 share/mimelnk/text/x-perl.desktop
@@ -4562,6 +5091,12 @@ share/mimelnk/text/x-vcard.desktop
 share/mimelnk/text/x-xslfo.desktop
 share/mimelnk/text/x-xslt.desktop
 share/mimelnk/text/xml.desktop
+share/mimelnk/uri/mms.desktop
+share/mimelnk/uri/mmst.desktop
+share/mimelnk/uri/mmsu.desktop
+share/mimelnk/uri/pnm.desktop
+share/mimelnk/uri/rtspt.desktop
+share/mimelnk/uri/rtspu.desktop
 share/mimelnk/video/avi.desktop
 share/mimelnk/video/mp4.desktop
 share/mimelnk/video/mpeg.desktop
@@ -4613,23 +5148,30 @@ share/services/kresources/kabc/dir.desktop
 share/services/kresources/kabc/file.desktop
 share/services/kresources/kabc/ldapkio.desktop
 share/services/kresources/kabc/net.desktop
+share/services/kresources/kabc_manager.desktop
 share/services/kspell_aspell.desktop
 share/services/kspell_ispell.desktop
-share/services/ktexteditor_autobookmarker.desktop
 share/services/ktexteditor_docwordcompletion.desktop
 share/services/ktexteditor_insertfile.desktop
 share/services/ktexteditor_isearch.desktop
 share/services/ktexteditor_kdatatool.desktop
 share/services/metainfo.protocol
 share/services/mms.protocol
+share/services/mmst.protocol
+share/services/mmsu.protocol
+share/services/mng.kimgio
 share/services/pbm.kimgio
 share/services/pcx.kimgio
 share/services/pgm.kimgio
 share/services/png.kimgio
+share/services/pnm.protocol
 share/services/ppm.kimgio
+share/services/psd.kimgio
 share/services/rgb.kimgio
 share/services/rlogin.protocol
 share/services/rtsp.protocol
+share/services/rtspt.protocol
+share/services/rtspu.protocol
 share/services/shellscript.desktop
 share/services/ssh.protocol
 share/services/telnet.protocol
@@ -4638,11 +5180,13 @@ share/services/tiff.kimgio
 share/services/webdav.protocol
 share/services/webdavs.protocol
 share/services/xbm.kimgio
+share/services/xcf.kimgio
 share/services/xpm.kimgio
 share/services/xv.kimgio
 share/servicetypes/application.desktop
 share/servicetypes/browserview.desktop
 share/servicetypes/dcopinstantmessenger.desktop
+share/servicetypes/dcoptexttospeech.desktop
 share/servicetypes/kbytesedit.desktop
 share/servicetypes/kcmodule.desktop
 share/servicetypes/kcomprfilter.desktop
@@ -4655,6 +5199,7 @@ share/servicetypes/kpart.desktop
 share/servicetypes/kplugininfo.desktop
 share/servicetypes/kpropsdlgplugin.desktop
 share/servicetypes/kregexpeditor.desktop
+share/servicetypes/kresources_manager.desktop
 share/servicetypes/kresources_plugin.desktop
 share/servicetypes/krop.desktop
 share/servicetypes/krwp.desktop
@@ -4680,7 +5225,10 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kjs/html
@@ -4700,8 +5248,13 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
@@ -4714,23 +5267,29 @@ share/servicetypes/scriptinterface.desktop
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kwallet/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kio/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/arts/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/dnssd/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kparts/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kresources/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kutils/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/libkmid/html
-@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kdeprint/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kabc/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/khtml/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @exec /bin/mkdir -p %D/share/doc/HTML/en/kdelibs-apidocs/kate/html
 @dirrm share/services/kresources/kabc
 @dirrm share/services/kresources
 @dirrm share/services/kded
+@dirrm share/mimelnk/uri
 @dirrm share/icons/crystalsvg/scalable/mimetypes
 @dirrm share/icons/crystalsvg/32x32/actions/kde
 @dirrm share/icons/crystalsvg/22x22/actions/kde
+@dirrm share/emoticons/Default
+@dirrm share/emoticons
 @dirrm share/doc/HTML/en/kspell
 @dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/libkmid
@@ -4744,6 +5303,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kparts
 @dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/knewstuff
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/kmdi
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kmdi
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kjs/html
@@ -4764,8 +5325,12 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kate
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kabc/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/kabc
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/kspeech
 @dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/interfaces
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dnssd/html
+@dirrm share/doc/HTML/en/kdelibs-apidocs/dnssd
 @dirrm share/doc/HTML/en/kdelibs-apidocs/dcop/html
 @dirrm share/doc/HTML/en/kdelibs-apidocs/dcop
 @dirrm share/doc/HTML/en/kdelibs-apidocs/arts/html
@@ -4786,10 +5351,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/kstyle/pixmaps
 @dirrm share/apps/kstyle
 @dirrm share/apps/kssl
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/profile
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools/olink
-@dirrm share/apps/ksgmltools2/docbook/xsl/tools
 @dirrm share/apps/ksgmltools2/docbook/xsl/params
+@dirrm share/apps/ksgmltools2/docbook/xsl/manpages
 @dirrm share/apps/ksgmltools2/docbook/xsl/lib
 @dirrm share/apps/ksgmltools2/docbook/xsl/images/callouts
 @dirrm share/apps/ksgmltools2/docbook/xsl/images
@@ -4803,6 +5366,8 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/ksgmltools2/docbook
 @dirrm share/apps/ksgmltools2/customization/zh-TW/entities
 @dirrm share/apps/ksgmltools2/customization/zh-TW
+@dirrm share/apps/ksgmltools2/customization/zh-CN/entities
+@dirrm share/apps/ksgmltools2/customization/zh-CN
 @dirrm share/apps/ksgmltools2/customization/xx/entities
 @dirrm share/apps/ksgmltools2/customization/xx
 @dirrm share/apps/ksgmltools2/customization/xsl
@@ -4912,6 +5477,7 @@ share/servicetypes/scriptinterface.desktop
 @dirrm share/apps/kdewidgets/pics
 @dirrm share/apps/kdewidgets
 @dirrm share/apps/kdeui/pics
+@dirrm share/apps/kdeui/about
 @dirrm share/apps/kdeui
 @dirrm share/apps/kdeprint/tools
 @dirrm share/apps/kdeprint/plugins
@@ -4952,6 +5518,7 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kparts
 @dirrm include/knewstuff
 @dirrm include/kmediaplayer
+@dirrm include/kmdi
 @dirrm include/kjs
 @dirrm include/kio
 @dirrm include/khexedit
@@ -4961,5 +5528,6 @@ share/servicetypes/scriptinterface.desktop
 @dirrm include/kate
 @dirrm include/kabc
 @dirrm include/dom
+@dirrm include/dnssd
 @dirrm etc/xdg/menus
 @dirrm etc/xdg
diff --git a/x11/xscreensaver-kde/distinfo b/x11/xscreensaver-kde/distinfo
index 1ebe2fe83305..4360c88e5a40 100644
--- a/x11/xscreensaver-kde/distinfo
+++ b/x11/xscreensaver-kde/distinfo
@@ -1,2 +1,2 @@
-MD5 (KDE/kdeartwork-3.3.2.tar.bz2) = 9a712da253bacb87e0d4fd28cec183a1
-SIZE (KDE/kdeartwork-3.3.2.tar.bz2) = 17980598
+MD5 (KDE/kdeartwork-3.4.0.tar.bz2) = 89df94d9e6c63887e5a66312b6514d0d
+SIZE (KDE/kdeartwork-3.4.0.tar.bz2) = 18077818
diff --git a/x11/xscreensaver-kde/pkg-plist b/x11/xscreensaver-kde/pkg-plist
index 47fa9ed250da..1940269223a4 100644
--- a/x11/xscreensaver-kde/pkg-plist
+++ b/x11/xscreensaver-kde/pkg-plist
@@ -1,6 +1,7 @@
 bin/kxsconfig
 bin/kxsrun
 share/applnk/System/ScreenSavers/anemone.desktop
+share/applnk/System/ScreenSavers/anemotaxis.desktop
 share/applnk/System/ScreenSavers/ant.desktop
 share/applnk/System/ScreenSavers/antinspect.desktop
 share/applnk/System/ScreenSavers/antspotlight.desktop
@@ -100,6 +101,7 @@ share/applnk/System/ScreenSavers/lissie.desktop
 share/applnk/System/ScreenSavers/lmorph.desktop
 share/applnk/System/ScreenSavers/loop.desktop
 share/applnk/System/ScreenSavers/maze.desktop
+share/applnk/System/ScreenSavers/memscroller.desktop
 share/applnk/System/ScreenSavers/menger.desktop
 share/applnk/System/ScreenSavers/metaballs.desktop
 share/applnk/System/ScreenSavers/mirrorblob.desktop
author	Michael Nottebrock <lofi@FreeBSD.org>	2005-03-20 18:17:55 +0000
committer	Michael Nottebrock <lofi@FreeBSD.org>	2005-03-20 18:17:55 +0000
commit	d57e6a82578ae8c5008de9b8a118e7286b5ac8bd (patch)
tree	3242aa4d74a61f6856c81b2ca2de2e77f3bdfe80 /x11
parent	6d03af1e2cf23cd31fdb26de95a70d7cfaa23986 (diff)
download	ports-d57e6a82578ae8c5008de9b8a118e7286b5ac8bd.tar.gz ports-d57e6a82578ae8c5008de9b8a118e7286b5ac8bd.zip