12 files changed, 1148 insertions, 523 deletions

diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 47d2d4b60935..ed45162a6049 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -8,10 +8,9 @@
 
 PORTNAME=	kdebase
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${KDE_VERSION}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -67,7 +66,6 @@ pre-extract::
 post-extract:
 	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
 	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
-	${REINPLACE_CMD} -e 's|-pedantic ||g' ${WRKSRC}/configure
 
 post-configure:
 	${REINPLACE_CMD} -e "s@genkdmconf --in@genkdmconf --no-old --in@" \
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 0b7b33f0942b..5d536db80794 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,3 +1 @@
-MD5 (KDE/kdebase-3.1.4.tar.bz2) = e6859ad85b176e11ce997490786c124d
-MD5 (KDE/kdebase-2003092201-configure.tar.bz2) = 7b732232e887c62f5338e7117b0a30bf
-MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1
+MD5 (KDE/kdebase-3.2.0.tar.bz2) = 9d05be3ccd6cc0294d6153e5d4dfa63a
diff --git a/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp
new file mode 100644
index 000000000000..e0e5a92ce25d
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kcontrol-arts.cpp
@@ -0,0 +1,39 @@
+Index: kcontrol/arts/arts.cpp
+===================================================================
+RCS file: /home/kde/kdebase/kcontrol/arts/arts.cpp,v
+retrieving revision 1.100
+diff -u -3 -p -r1.100 arts.cpp
+--- kcontrol/arts/arts.cpp	8 Nov 2003 23:43:47 -0000	1.100
++++ kcontrol/arts/arts.cpp	29 Jan 2004 11:59:29 -0000
+@@ -51,6 +51,7 @@
+ //#include <kparts/componentfactory.h>
+ //#include "midi.h"
+ #include "arts.h"
++#include <arts/artsversion.h>
+ 
+ extern "C" {
+ 	void init_arts();
+@@ -601,7 +602,11 @@ void init_arts()
+ 	config->setGroup("Arts");
+ 	bool startServer = config->readBoolEntry("StartServer",true);
+ 	bool startRealtime = config->readBoolEntry("StartRealtime",true);
++#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2
+ 	QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -c drkonqi -l 3 -f");
++#else
++	QString args = config->readEntry("Arguments","-F 10 -S 4096 -s 60 -m artsmessage -l 3 -f");
++#endif
+ 
+ 	delete config;
+ 
+@@ -652,7 +657,11 @@ QString KArtsModule::createArgs(bool net
+ 		args += QChar(' ') + addOptions;
+ 
+ 	args += QString::fromLatin1(" -m artsmessage");
++
++#if ARTS_MAJOR_VERSION >= 1 && ARTS_MINOR_VERSION >= 2
+ 	args += QString::fromLatin1(" -c drkonqi");
++#endif
++
+ 	args += QString::fromLatin1(" -l 3");
+ 	args += QString::fromLatin1(" -f");
+ 
diff --git a/x11/kdebase4-workspace/files/patch-kcontrol-nics-nic.cpp b/x11/kdebase4-workspace/files/patch-kcontrol-nics-nic.cpp
new file mode 100644
index 000000000000..e11c3de5032a
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-kcontrol-nics-nic.cpp
@@ -0,0 +1,17 @@
+--- 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-kdesktop-init.cc b/x11/kdebase4-workspace/files/patch-kdesktop-init.cc
deleted file mode 100644
index f7fe48544866..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdesktop-init.cc
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdesktop/init.cc.orig	Fri Oct 12 15:11:13 2001
-+++ kdesktop/init.cc	Thu Jul 18 06:48:59 2002
-@@ -80,6 +80,9 @@
-      QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(),
-      QFile::encodeName(dir).data() );
-     system( cmd );
-+    cmd.sprintf( "chmod 644 %s/.directory", 
-+		 QFile::encodeName(dir).data() );
-+    system( cmd );
-   }
- }
- 
-@@ -106,6 +109,9 @@
- 	cmd += "' '";
- 	cmd += QFile::encodeName(desktopPath + desk.readName());
- 	cmd += "'";
-+	system( cmd );
-+	cmd.sprintf("chmod 644 '%s'",
-+		    QFile::encodeName(desktopPath + desk.readName()).data());
- 	system( cmd );
-     }
- }
diff --git a/x11/kdebase4-workspace/files/patch-kdesktop-lockeng.cc b/x11/kdebase4-workspace/files/patch-kdesktop-lockeng.cc
deleted file mode 100644
index 9841e698ec06..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdesktop-lockeng.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- kdesktop/lockeng.cc.orig	Fri Sep 26 11:28:03 2003
-+++ kdesktop/lockeng.cc	Fri Sep 26 11:31:15 2003
-@@ -277,6 +277,9 @@
- 	    {
- 	    if (!event->xkey.send_event && mXAutoLock && mState == Waiting)
-     		mXAutoLock->keyPressed();
-+		// don't further process key events that were received only because XAutoLock wants them
-+		if (!event->xkey.send_event && mXAutoLock && !QWidget::find( event->xkey.window ))
-+		    return true;
- 	    break;
- 	    }
- 
diff --git a/x11/kdebase4-workspace/files/patch-konsole-konsole-TEPty.cpp b/x11/kdebase4-workspace/files/patch-konsole-konsole-TEPty.cpp
deleted file mode 100644
index 949bc5bc36ce..000000000000
--- a/x11/kdebase4-workspace/files/patch-konsole-konsole-TEPty.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- konsole/konsole/TEPty.cpp.orig	Mon Sep 29 11:22:07 2003
-+++ konsole/konsole/TEPty.cpp	Mon Sep 29 11:22:12 2003
-@@ -624,7 +624,14 @@
-   if (strncmp(str_ptr, "/dev/", 5) == 0)
-        str_ptr += 5;
-   strncpy(l_struct.ut_line, str_ptr, UT_LINESIZE);
--  time(&l_struct.ut_time);
-+
-+  // Handle 64-bit time_t properly, where it may be larger
-+  // than the integral type of ut_time.
-+  {
-+      time_t ut_time_temp;
-+      time(&ut_time_temp);
-+      l_struct.ut_time=ut_time_temp;
-+  }
- 
-   login(&l_struct);
- #endif
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
deleted file mode 100644
index 13b5efd1d38d..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-CPU.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/CPU.c.orig	Sat Nov  8 15:40:15 2003
-+++ ksysguard/ksysguardd/FreeBSD/CPU.c	Sat Nov  8 15:16:40 2003
-@@ -49,6 +49,8 @@
- long cp_diff[CPUSTATES];
- int cpu_states[CPUSTATES];
-
-+size_t cp_time_len = sizeof(cp_time);
-+
- void
- initCpuInfo(struct SensorModul* sm)
- {
-@@ -73,7 +75,7 @@
- int
- updateCpuInfo(void)
- {
--        sysctlbyname("kern.cp_time", &cp_time, sizeof(cp_time), NULL, 0);
-+        sysctlbyname("kern.cp_time", &cp_time, &cp_time_len, NULL, 0);
-         percentages(CPUSTATES, cpu_states, cp_time, cp_old, cp_diff);
- 	return (0);
- }
-
diff --git a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-ProcessList.c b/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-ProcessList.c
deleted file mode 100644
index 4f57a705f1f2..000000000000
--- a/x11/kdebase4-workspace/files/patch-ksysguard-ksysguardd-FreeBSD-ProcessList.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- ksysguard/ksysguardd/FreeBSD/ProcessList.c	Wed May  7 07:44:17 2003
-+++ ksysguard/ksysguardd/FreeBSD/ProcessList.c	Wed Aug 27 18:51:18 2003
-@@ -168,6 +168,8 @@
- 	int mib[4];
- 	struct kinfo_proc p;
- 	size_t len;
-+	size_t buflen = 256;
-+	char buf[256];
- 
- 	if ((ps = findProcessInList(pid)) == 0)
- 	{
-@@ -239,10 +241,17 @@
- #endif
- 
-         /* process command line */
--	/* the following line causes segfaults on some FreeBSD systems... why?
--		strncpy(ps->cmdline, p.kp_proc.p_args->ar_args, sizeof(ps->cmdline) - 1);
--	*/
--	strcpy(ps->cmdline, "????");
-+	/* do a sysctl to get the command line args. */
-+
-+	mib[0] = CTL_KERN;
-+	mib[1] = KERN_PROC;
-+	mib[2] = KERN_PROC_ARGS;
-+	mib[3] = pid;
-+	
-+	if ((sysctl(mib, 4, buf, &buflen, 0, 0) == -1) || !buflen)
-+ 		strcpy(ps->cmdline, "????"); 
-+        else
-+	        strncpy(ps->cmdline, buf, buflen - 1);
- 
- 	return (0);
- }
diff --git a/x11/kdebase4-workspace/files/plist.base b/x11/kdebase4-workspace/files/plist.base
index ae0ca83e8cd9..a4a50bea8ee8 100644
--- a/x11/kdebase4-workspace/files/plist.base
+++ b/x11/kdebase4-workspace/files/plist.base
@@ -1,9 +1,9 @@
 bin/appletproxy
-bin/chooser
 bin/drkonqi
 bin/extensionproxy
 bin/filesharelist
 bin/fileshareset
+bin/genkdmconf
 bin/kaccess
 bin/kappfinder
 bin/kate
@@ -28,7 +28,8 @@ bin/keditbookmarks
 bin/keditfiletype
 bin/kfind
 bin/kfmclient
-bin/kfmexec
+bin/kfontinst
+bin/khc_indexbuilder
 bin/khelpcenter
 bin/khotkeys
 bin/kicker
@@ -40,12 +41,12 @@ bin/klocaldomainurifilterhelper
 bin/kmenuedit
 bin/konqueror
 bin/konsole
-bin/konsole_grantpty
 bin/kpager
 bin/kpersonalizer
 bin/kpm
 bin/kprinter
 bin/krandom.kss
+bin/krandrtray
 bin/krdb
 bin/kreadconfig
 bin/krootimage
@@ -58,18 +59,22 @@ bin/ksystraycmd
 bin/ktip
 bin/kwebdesktop
 bin/kwin
-bin/kwmtheme
+bin/kwin_killer_helper
 bin/kwrite
+bin/kwriteconfig
 bin/kwrited
 bin/kxkb
 bin/startkde
 etc/ksysguarddrc
+etc/xdg/menus/applications-merged/kde-essential.menu
+etc/xdg/menus/kde-information.menu
+etc/xdg/menus/kde-screensavers.menu
+etc/xdg/menus/kde-settings.menu
 include/KBackgroundIface.h
 include/KDesktopIface.h
 include/KScreensaverIface.h
 include/KWinInterface.h
 include/KonquerorIface.h
-include/ccont.h
 include/kate/application.h
 include/kate/documentmanager.h
 include/kate/mainwindow.h
@@ -77,12 +82,19 @@ include/kate/plugin.h
 include/kate/pluginconfiginterface.h
 include/kate/pluginconfiginterfaceextension.h
 include/kate/pluginmanager.h
+include/kate/project.h
+include/kate/projectmanager.h
 include/kate/toolviewmanager.h
+include/kate/utils/dockviewbase.h
+include/kate/utils/listboxview.h
+include/kate/utils/messageview.h
 include/kate/viewmanager.h
-include/kbookmarkimporter_crash.h
-include/kbookmarkimporter_ie.h
-include/kbookmarkimporter_opera.h
+include/kdecoration.h
+include/kdecoration_p.h
+include/kdecoration_plugins_p.h
+include/kdecorationfactory.h
 include/kfileivi.h
+include/kgreeterplugin.h
 include/kivdirectoryoverlay.h
 include/knewmenu.h
 include/konq_bgnddlg.h
@@ -113,30 +125,30 @@ include/ksgrd/SensorSocketAgent.h
 include/ksgrd/StyleEngine.h
 include/ksgrd/StyleSettings.h
 include/ksgrd/TimerSettings.h
+include/ksplash/objkstheme.h
+include/ksplash/themeengine.h
 include/kwin/client.h
 include/kwin/kwinbutton.h
 include/kwin/options.h
 include/kwin/workspace.h
-lib/appletproxy.la
-lib/appletproxy.so
-lib/extensionproxy.la
-lib/extensionproxy.so
-lib/kaccess.la
-lib/kaccess.so
-lib/kate.la
-lib/kate.so
-lib/kcminit.la
-lib/kcminit.so
-lib/kcmshell.la
-lib/kcmshell.so
-lib/kcontrol.la
-lib/kcontrol.so
+lib/kconf_update_bin/khotkeys_update
+lib/kde3/appletproxy.la
+lib/kde3/appletproxy.so
 lib/kde3/childpanel_panelextension.la
 lib/kde3/childpanel_panelextension.so
+lib/kde3/childpanel_panelextension.so.0
 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/extensionproxy.la
+lib/kde3/extensionproxy.so
 lib/kde3/fontthumbnail.la
 lib/kde3/fontthumbnail.so
 lib/kde3/gsthumbnail.la
@@ -145,8 +157,14 @@ lib/kde3/htmlthumbnail.la
 lib/kde3/htmlthumbnail.so
 lib/kde3/imagethumbnail.la
 lib/kde3/imagethumbnail.so
+lib/kde3/kaccess.la
+lib/kde3/kaccess.so
 lib/kde3/kasbar_panelextension.la
 lib/kde3/kasbar_panelextension.so
+lib/kde3/kate.la
+lib/kde3/kate.so
+lib/kde3/katedefaultprojectplugin.la
+lib/kde3/katedefaultprojectplugin.so
 lib/kde3/kcm_access.la
 lib/kde3/kcm_access.so
 lib/kde3/kcm_arts.la
@@ -167,6 +185,8 @@ lib/kde3/kcm_crypto.la
 lib/kde3/kcm_crypto.so
 lib/kde3/kcm_css.la
 lib/kde3/kcm_css.so
+lib/kde3/kcm_display.la
+lib/kde3/kcm_display.so
 lib/kde3/kcm_email.la
 lib/kde3/kcm_email.so
 lib/kde3/kcm_energy.la
@@ -179,8 +199,6 @@ lib/kde3/kcm_fontinst.la
 lib/kde3/kcm_fontinst.so
 lib/kde3/kcm_fonts.la
 lib/kde3/kcm_fonts.so
-lib/kde3/kcm_helpcenter.la
-lib/kde3/kcm_helpcenter.so
 lib/kde3/kcm_history.la
 lib/kde3/kcm_history.so
 lib/kde3/kcm_icons.la
@@ -213,6 +231,8 @@ lib/kde3/kcm_konqhtml.la
 lib/kde3/kcm_konqhtml.so
 lib/kde3/kcm_konsole.la
 lib/kde3/kcm_konsole.so
+lib/kde3/kcm_ksplashthemes.la
+lib/kde3/kcm_ksplashthemes.so
 lib/kde3/kcm_kurifilt.la
 lib/kde3/kcm_kurifilt.so
 lib/kde3/kcm_kwindecoration.la
@@ -227,8 +247,14 @@ lib/kde3/kcm_nic.la
 lib/kde3/kcm_nic.so
 lib/kde3/kcm_passwords.la
 lib/kde3/kcm_passwords.so
+lib/kde3/kcm_performance.la
+lib/kde3/kcm_performance.so
 lib/kde3/kcm_printmgr.la
 lib/kde3/kcm_printmgr.so
+lib/kde3/kcm_privacy.la
+lib/kde3/kcm_privacy.so
+lib/kde3/kcm_randr.la
+lib/kde3/kcm_randr.so
 lib/kde3/kcm_samba.la
 lib/kde3/kcm_samba.so
 lib/kde3/kcm_screensaver.la
@@ -241,16 +267,38 @@ lib/kde3/kcm_style.la
 lib/kde3/kcm_style.so
 lib/kde3/kcm_taskbar.la
 lib/kde3/kcm_taskbar.so
-lib/kde3/kcm_themes.la
-lib/kde3/kcm_themes.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/kded_favicons.la
 lib/kde3/kded_favicons.so
+lib/kde3/kded_konqy_preloader.la
+lib/kde3/kded_konqy_preloader.so
 lib/kde3/kded_mountwatcher.la
 lib/kde3/kded_mountwatcher.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/kfmclient.la
+lib/kde3/kfmclient.so
+lib/kde3/kgreet_classic.la
+lib/kde3/kgreet_classic.so
 lib/kde3/khelpcenter.la
 lib/kde3/khelpcenter.so
+lib/kde3/khotkeys.la
+lib/kde3/khotkeys.so
+lib/kde3/kicker.la
+lib/kde3/kicker.so
+lib/kde3/kickermenu_find.la
+lib/kde3/kickermenu_find.so
 lib/kde3/kickermenu_kdeprint.la
 lib/kde3/kickermenu_kdeprint.so
 lib/kde3/kickermenu_konsole.la
@@ -273,6 +321,8 @@ lib/kde3/kio_fish.la
 lib/kde3/kio_fish.so
 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
@@ -291,6 +341,8 @@ lib/kde3/kio_pop3.la
 lib/kde3/kio_pop3.so
 lib/kde3/kio_print.la
 lib/kde3/kio_print.so
+lib/kde3/kio_settings.la
+lib/kde3/kio_settings.so
 lib/kde3/kio_sftp.la
 lib/kde3/kio_sftp.so
 lib/kde3/kio_smb.la
@@ -301,10 +353,14 @@ lib/kde3/kio_tar.la
 lib/kde3/kio_tar.so
 lib/kde3/kio_thumbnail.la
 lib/kde3/kio_thumbnail.so
-lib/kde3/kio_zip.la
-lib/kde3/kio_zip.so
+lib/kde3/kjobviewer.la
+lib/kde3/kjobviewer.so
+lib/kde3/klipper.la
+lib/kde3/klipper.so
 lib/kde3/klipper_panelapplet.la
 lib/kde3/klipper_panelapplet.so
+lib/kde3/kmenuedit.la
+lib/kde3/kmenuedit.so
 lib/kde3/konq_aboutpage.la
 lib/kde3/konq_aboutpage.so
 lib/kde3/konq_iconview.la
@@ -325,50 +381,67 @@ lib/kde3/konq_sound.la
 lib/kde3/konq_sound.so
 lib/kde3/konqsidebar_tree.la
 lib/kde3/konqsidebar_tree.so
-lib/kde3/kwin_b2.la
-lib/kde3/kwin_b2.so
+lib/kde3/konqsidebar_web.la
+lib/kde3/konqsidebar_web.so
+lib/kde3/konqueror.la
+lib/kde3/konqueror.so
+lib/kde3/konsole.la
+lib/kde3/konsole.so
+lib/kde3/kprinter.la
+lib/kde3/kprinter.so
+lib/kde3/ksmserver.la
+lib/kde3/ksmserver.so
+lib/kde3/ksplashdefault.la
+lib/kde3/ksplashdefault.so
+lib/kde3/ksplashredmond.la
+lib/kde3/ksplashredmond.so
+lib/kde3/ksplashstandard.la
+lib/kde3/ksplashstandard.so
+lib/kde3/kstyle_keramik_config.la
+lib/kde3/kstyle_keramik_config.so
+lib/kde3/kwin.la
+lib/kde3/kwin.so
+lib/kde3/kwin3_b2.la
+lib/kde3/kwin3_b2.so
+lib/kde3/kwin3_default.la
+lib/kde3/kwin3_default.so
+lib/kde3/kwin3_keramik.la
+lib/kde3/kwin3_keramik.so
+lib/kde3/kwin3_laptop.la
+lib/kde3/kwin3_laptop.so
+lib/kde3/kwin3_modernsys.la
+lib/kde3/kwin3_modernsys.so
+lib/kde3/kwin3_quartz.la
+lib/kde3/kwin3_quartz.so
+lib/kde3/kwin3_redmond.la
+lib/kde3/kwin3_redmond.so
+lib/kde3/kwin3_web.la
+lib/kde3/kwin3_web.so
 lib/kde3/kwin_b2_config.la
 lib/kde3/kwin_b2_config.so
-lib/kde3/kwin_default.la
-lib/kde3/kwin_default.so
 lib/kde3/kwin_default_config.la
 lib/kde3/kwin_default_config.so
-lib/kde3/kwin_icewm.la
-lib/kde3/kwin_icewm.so
-lib/kde3/kwin_icewm_config.la
-lib/kde3/kwin_icewm_config.so
-lib/kde3/kwin_kde1.la
-lib/kde3/kwin_kde1.so
-lib/kde3/kwin_keramik.la
-lib/kde3/kwin_keramik.so
 lib/kde3/kwin_keramik_config.la
 lib/kde3/kwin_keramik_config.so
-lib/kde3/kwin_kstep.la
-lib/kde3/kwin_kstep.so
-lib/kde3/kwin_kwmtheme.la
-lib/kde3/kwin_kwmtheme.so
-lib/kde3/kwin_laptop.la
-lib/kde3/kwin_laptop.so
-lib/kde3/kwin_modernsys.la
-lib/kde3/kwin_modernsys.so
 lib/kde3/kwin_modernsys_config.la
 lib/kde3/kwin_modernsys_config.so
-lib/kde3/kwin_quartz.la
-lib/kde3/kwin_quartz.so
 lib/kde3/kwin_quartz_config.la
 lib/kde3/kwin_quartz_config.so
-lib/kde3/kwin_redmond.la
-lib/kde3/kwin_redmond.so
-lib/kde3/kwin_riscos.la
-lib/kde3/kwin_riscos.so
-lib/kde3/kwin_system.la
-lib/kde3/kwin_system.so
-lib/kde3/kwin_web.la
-lib/kde3/kwin_web.so
+lib/kde3/kwrite.la
+lib/kde3/kwrite.so
+lib/kde3/kwrited.la
+lib/kde3/kwrited.so
+lib/kde3/kxkb.la
+lib/kde3/kxkb.so
 lib/kde3/launcher_panelapplet.la
 lib/kde3/launcher_panelapplet.so
+lib/kde3/launcher_panelapplet.so.0
 lib/kde3/libkdeprint_part.la
 lib/kde3/libkdeprint_part.so
+lib/kde3/libkfindpart.la
+lib/kde3/libkfindpart.so
+lib/kde3/libkfontviewpart.la
+lib/kde3/libkfontviewpart.so
 lib/kde3/libkmanpart.la
 lib/kde3/libkmanpart.so
 lib/kde3/libkonsolepart.la
@@ -383,6 +456,8 @@ lib/kde3/liblocaldomainurifilter.la
 lib/kde3/liblocaldomainurifilter.so
 lib/kde3/lockout_panelapplet.la
 lib/kde3/lockout_panelapplet.so
+lib/kde3/menu_panelapplet.la
+lib/kde3/menu_panelapplet.so
 lib/kde3/minipager_panelapplet.la
 lib/kde3/minipager_panelapplet.so
 lib/kde3/naughty_panelapplet.la
@@ -391,6 +466,8 @@ lib/kde3/picturethumbnail.la
 lib/kde3/picturethumbnail.so
 lib/kde3/run_panelapplet.la
 lib/kde3/run_panelapplet.so
+lib/kde3/sidebar_panelextension.la
+lib/kde3/sidebar_panelextension.so
 lib/kde3/sysguard_panelapplet.la
 lib/kde3/sysguard_panelapplet.so
 lib/kde3/systemtray_panelapplet.la
@@ -401,70 +478,184 @@ lib/kde3/taskbar_panelextension.la
 lib/kde3/taskbar_panelextension.so
 lib/kde3/textthumbnail.la
 lib/kde3/textthumbnail.so
-lib/kdesktop.la
-lib/kdesktop.so
-lib/keditbookmarks.la
-lib/keditbookmarks.so
-lib/kfmclient.la
-lib/kfmclient.so
-lib/khotkeys.la
-lib/khotkeys.so
-lib/kicker.la
-lib/kicker.so
-lib/kjobviewer.la
-lib/kjobviewer.so
-lib/klipper.la
-lib/klipper.so
-lib/kmenuedit.la
-lib/kmenuedit.so
-lib/konqueror.la
-lib/konqueror.so
-lib/konsole.la
-lib/konsole.so
-lib/kprinter.la
-lib/kprinter.so
-lib/ksmserver.la
-lib/ksmserver.so
-lib/kwin.la
-lib/kwin.so
-lib/kwrite.la
-lib/kwrite.so
-lib/kwrited.la
-lib/kwrited.so
-lib/kxkb.la
-lib/kxkb.so
-lib/libccont.a
+lib/krandrinithack.la
+lib/krandrinithack.so
 lib/libkateinterfaces.la
 lib/libkateinterfaces.so
-lib/libkfindpart.la
-lib/libkfindpart.so
+lib/libkateinterfaces.so.0
+lib/libkateutils.la
+lib/libkateutils.so
+lib/libkateutils.so.0
+lib/libkdecorations.la
+lib/libkdecorations.so
+lib/libkdecorations.so.1
+lib/libkdeinit_appletproxy.la
+lib/libkdeinit_appletproxy.so
+lib/libkdeinit_extensionproxy.la
+lib/libkdeinit_extensionproxy.so
+lib/libkdeinit_kaccess.la
+lib/libkdeinit_kaccess.so
+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_kdesktop.la
+lib/libkdeinit_kdesktop.so
+lib/libkdeinit_keditbookmarks.la
+lib/libkdeinit_keditbookmarks.so
+lib/libkdeinit_kfmclient.la
+lib/libkdeinit_kfmclient.so
+lib/libkdeinit_khelpcenter.la
+lib/libkdeinit_khelpcenter.so
+lib/libkdeinit_khotkeys.la
+lib/libkdeinit_khotkeys.so
+lib/libkdeinit_kicker.la
+lib/libkdeinit_kicker.so
+lib/libkdeinit_kjobviewer.la
+lib/libkdeinit_kjobviewer.so
+lib/libkdeinit_klipper.la
+lib/libkdeinit_klipper.so
+lib/libkdeinit_kmenuedit.la
+lib/libkdeinit_kmenuedit.so
+lib/libkdeinit_konqueror.la
+lib/libkdeinit_konqueror.so
+lib/libkdeinit_konsole.la
+lib/libkdeinit_konsole.so
+lib/libkdeinit_kprinter.la
+lib/libkdeinit_kprinter.so
+lib/libkdeinit_ksmserver.la
+lib/libkdeinit_ksmserver.so
+lib/libkdeinit_kwin.la
+lib/libkdeinit_kwin.so
+lib/libkdeinit_kwrite.la
+lib/libkdeinit_kwrite.so
+lib/libkdeinit_kwrited.la
+lib/libkdeinit_kwrited.so
+lib/libkdeinit_kxkb.la
+lib/libkdeinit_kxkb.so
 lib/libkickermain.la
 lib/libkickermain.so
 lib/libkickermain.so.1
-lib/libkmultitabbar.la
-lib/libkmultitabbar.so
-lib/libkmultitabbar.so.0
 lib/libkonq.la
 lib/libkonq.so
-lib/libkonq.so.5
+lib/libkonq.so.6
 lib/libkonq_sidebar_tree.la
 lib/libkonq_sidebar_tree.so
 lib/libkonqsidebarplugin.la
 lib/libkonqsidebarplugin.so
-lib/libkonqsidebarplugin.so.0
+lib/libkonqsidebarplugin.so.3
 lib/libksgrd.la
 lib/libksgrd.so
-lib/libksgrd.so.0
-lib/libsensordisplays.la
-lib/libsensordisplays.so
-lib/libsensordisplays.so.0
+lib/libksgrd.so.3
+lib/libksplashthemes.la
+lib/libksplashthemes.so
+lib/libksplashthemes.so.0
 lib/libtaskbar.la
 lib/libtaskbar.so
-lib/libtaskbar.so.2
+lib/libtaskbar.so.3
 lib/libtaskmanager.la
 lib/libtaskmanager.so
 lib/libtaskmanager.so.1
-share/applnk/.directory
+share/applications/kde/Help.desktop
+share/applications/kde/Home.desktop
+share/applications/kde/KControl.desktop
+share/applications/kde/Kfind.desktop
+share/applications/kde/arts.desktop
+share/applications/kde/background.desktop
+share/applications/kde/bell.desktop
+share/applications/kde/cache.desktop
+share/applications/kde/clock.desktop
+share/applications/kde/colors.desktop
+share/applications/kde/componentchooser.desktop
+share/applications/kde/cookies.desktop
+share/applications/kde/crypto.desktop
+share/applications/kde/desktop.desktop
+share/applications/kde/desktopbehavior.desktop
+share/applications/kde/desktoppath.desktop
+share/applications/kde/devices.desktop
+share/applications/kde/display.desktop
+share/applications/kde/dma.desktop
+share/applications/kde/ebrowsing.desktop
+share/applications/kde/email.desktop
+share/applications/kde/energy.desktop
+share/applications/kde/filebrowser.desktop
+share/applications/kde/fileshare.desktop
+share/applications/kde/filetypes.desktop
+share/applications/kde/fonts.desktop
+share/applications/kde/icons.desktop
+share/applications/kde/interrupts.desktop
+share/applications/kde/ioports.desktop
+share/applications/kde/ioslaveinfo.desktop
+share/applications/kde/kappfinder.desktop
+share/applications/kde/kate.desktop
+share/applications/kde/kcmaccess.desktop
+share/applications/kde/kcmcgi.desktop
+share/applications/kde/kcmcss.desktop
+share/applications/kde/kcmfontinst.desktop
+share/applications/kde/kcmhistory.desktop
+share/applications/kde/kcmkded.desktop
+share/applications/kde/kcmkicker.desktop
+share/applications/kde/kcmlaunch.desktop
+share/applications/kde/kcmnotify.desktop
+share/applications/kde/kcmperformance.desktop
+share/applications/kde/kcmsmserver.desktop
+share/applications/kde/kcmtaskbar.desktop
+share/applications/kde/kdeprintfax.desktop
+share/applications/kde/kdm.desktop
+share/applications/kde/keyboard.desktop
+share/applications/kde/keyboard_layout.desktop
+share/applications/kde/keys.desktop
+share/applications/kde/kfmclient.desktop
+share/applications/kde/kfmclient_dir.desktop
+share/applications/kde/kfmclient_html.desktop
+share/applications/kde/kfmclient_war.desktop
+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/kjobviewer.desktop
+share/applications/kde/klipper.desktop
+share/applications/kde/kmenuedit.desktop
+share/applications/kde/konqbrowser.desktop
+share/applications/kde/konquerorsu.desktop
+share/applications/kde/konsole.desktop
+share/applications/kde/konsolesu.desktop
+share/applications/kde/kpager.desktop
+share/applications/kde/kpersonalizer.desktop
+share/applications/kde/krandrtray.desktop
+share/applications/kde/ksplashthememgr.desktop
+share/applications/kde/ksysguard.desktop
+share/applications/kde/ktip.desktop
+share/applications/kde/kwindecoration.desktop
+share/applications/kde/kwinoptions.desktop
+share/applications/kde/kwrite.desktop
+share/applications/kde/lanbrowser.desktop
+share/applications/kde/language.desktop
+share/applications/kde/memory.desktop
+share/applications/kde/mouse.desktop
+share/applications/kde/netpref.desktop
+share/applications/kde/nic.desktop
+share/applications/kde/panel.desktop
+share/applications/kde/panel_appearance.desktop
+share/applications/kde/partitions.desktop
+share/applications/kde/passwords.desktop
+share/applications/kde/pci.desktop
+share/applications/kde/printers.desktop
+share/applications/kde/privacy.desktop
+share/applications/kde/processor.desktop
+share/applications/kde/proxy.desktop
+share/applications/kde/screensaver.desktop
+share/applications/kde/scsi.desktop
+share/applications/kde/smbstatus.desktop
+share/applications/kde/sound.desktop
+share/applications/kde/spellchecking.desktop
+share/applications/kde/style.desktop
+share/applications/kde/useragent.desktop
+share/applications/kde/xserver.desktop
 share/applnk/.hidden/battery.desktop
 share/applnk/.hidden/bwarning.desktop
 share/applnk/.hidden/cwarning.desktop
@@ -472,6 +663,7 @@ share/applnk/.hidden/fileappearance.desktop
 share/applnk/.hidden/filebehavior.desktop
 share/applnk/.hidden/filepreviews.desktop
 share/applnk/.hidden/kcmkonq.desktop
+share/applnk/.hidden/kcmkonqyperformance.desktop
 share/applnk/.hidden/kcmkonsole.desktop
 share/applnk/.hidden/kcmkxmlrpcd.desktop
 share/applnk/.hidden/kicker_config.desktop
@@ -482,174 +674,31 @@ share/applnk/.hidden/kwinactions.desktop
 share/applnk/.hidden/kwinadvanced.desktop
 share/applnk/.hidden/kwinfocus.desktop
 share/applnk/.hidden/kwinmoving.desktop
-share/applnk/.hidden/midi.desktop
 share/applnk/.hidden/power.desktop
+share/applnk/.hidden/randr.desktop
 share/applnk/.hidden/smb.desktop
 share/applnk/.hidden/socks.desktop
 share/applnk/.hidden/virtualdesktops.desktop
-share/applnk/Applications/.directory
-share/applnk/Development/.directory
-share/applnk/Editors/.directory
-share/applnk/Editors/kate.desktop
-share/applnk/Editors/kwrite.desktop
-share/applnk/Edutainment/.directory
-share/applnk/Games/.directory
-share/applnk/Games/Arcade/.directory
-share/applnk/Games/Board/.directory
-share/applnk/Games/Card/.directory
-share/applnk/Games/Kidsgames/.directory
-share/applnk/Games/Roguelikes/.directory
-share/applnk/Games/TacticStrategy/.directory
-share/applnk/Graphics/.directory
-share/applnk/Graphics/More/.directory
-share/applnk/Help.desktop
-share/applnk/Home.desktop
-share/applnk/Internet/.directory
-share/applnk/Internet/More/.directory
-share/applnk/Internet/Terminal/.directory
+share/applnk/.hidden/xinerama.desktop
 share/applnk/Internet/keditbookmarks.desktop
-share/applnk/Internet/konqbrowser.desktop
 share/applnk/KControl.desktop
-share/applnk/Kfind.desktop
-share/applnk/Multimedia/.directory
-share/applnk/Multimedia/More/.directory
-share/applnk/Office/.directory
-share/applnk/Settings/.directory
-share/applnk/Settings/Accessibility/.directory
-share/applnk/Settings/Accessibility/kcmaccess.desktop
-share/applnk/Settings/Accessibility/keyboard_layout.desktop
-share/applnk/Settings/Accessibility/keys.desktop
-share/applnk/Settings/Accessibility/language.desktop
-share/applnk/Settings/Components/.directory
-share/applnk/Settings/Components/componentchooser.desktop
-share/applnk/Settings/Components/filebrowser.desktop
-share/applnk/Settings/Components/filetypes.desktop
-share/applnk/Settings/Components/kcmkded.desktop
-share/applnk/Settings/Components/kcmsmserver.desktop
-share/applnk/Settings/Components/spellchecking.desktop
-share/applnk/Settings/Desktop/.directory
-share/applnk/Settings/Desktop/desktop.desktop
-share/applnk/Settings/Desktop/desktopappearance.desktop
-share/applnk/Settings/Desktop/desktopbehavior.desktop
-share/applnk/Settings/Desktop/filetrash.desktop
-share/applnk/Settings/Desktop/kcmtaskbar.desktop
-share/applnk/Settings/Desktop/kwinoptions.desktop
-share/applnk/Settings/Desktop/panel.desktop
-share/applnk/Settings/Information/.directory
-share/applnk/Settings/Information/devices.desktop
-share/applnk/Settings/Information/dma.desktop
-share/applnk/Settings/Information/interrupts.desktop
-share/applnk/Settings/Information/ioports.desktop
-share/applnk/Settings/Information/ioslaveinfo.desktop
-share/applnk/Settings/Information/memory.desktop
-share/applnk/Settings/Information/nic.desktop
-share/applnk/Settings/Information/partitions.desktop
-share/applnk/Settings/Information/pci.desktop
-share/applnk/Settings/Information/processor.desktop
-share/applnk/Settings/Information/scsi.desktop
-share/applnk/Settings/Information/smbstatus.desktop
-share/applnk/Settings/Information/sound.desktop
-share/applnk/Settings/Information/xserver.desktop
-share/applnk/Settings/LookNFeel/.directory
 share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
-share/applnk/Settings/LookNFeel/Windows/actions.desktop
-share/applnk/Settings/LookNFeel/Windows/kwinmouse.desktop
-share/applnk/Settings/LookNFeel/Windows/mouse.desktop
-share/applnk/Settings/LookNFeel/background.desktop
-share/applnk/Settings/LookNFeel/borders.desktop
-share/applnk/Settings/LookNFeel/colors.desktop
-share/applnk/Settings/LookNFeel/desktop.desktop
-share/applnk/Settings/LookNFeel/fonts.desktop
-share/applnk/Settings/LookNFeel/icons.desktop
-share/applnk/Settings/LookNFeel/kcmlaunch.desktop
 share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
-share/applnk/Settings/LookNFeel/kthememgr.desktop
-share/applnk/Settings/LookNFeel/kwindecoration.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
 share/applnk/Settings/LookNFeel/panel_appearance.desktop
-share/applnk/Settings/LookNFeel/screensaver.desktop
-share/applnk/Settings/LookNFeel/style.desktop
-share/applnk/Settings/LookNFeel/virtualdesktops.desktop
-share/applnk/Settings/Network/.directory
-share/applnk/Settings/Network/WebBrowsing/.directory
-share/applnk/Settings/Network/WebBrowsing/cache.desktop
-share/applnk/Settings/Network/WebBrowsing/cookies.desktop
-share/applnk/Settings/Network/WebBrowsing/ebrowsing.desktop
-share/applnk/Settings/Network/WebBrowsing/kcmcgi.desktop
-share/applnk/Settings/Network/WebBrowsing/kcmcss.desktop
-share/applnk/Settings/Network/WebBrowsing/kcmhistory.desktop
-share/applnk/Settings/Network/WebBrowsing/khtml_behavior.desktop
-share/applnk/Settings/Network/WebBrowsing/khtml_fonts.desktop
-share/applnk/Settings/Network/WebBrowsing/khtml_java_js.desktop
-share/applnk/Settings/Network/WebBrowsing/khtml_plugins.desktop
-share/applnk/Settings/Network/WebBrowsing/useragent.desktop
-share/applnk/Settings/Network/email.desktop
-share/applnk/Settings/Network/fileshare.desktop
-share/applnk/Settings/Network/lanbrowser.desktop
-share/applnk/Settings/Network/netpref.desktop
-share/applnk/Settings/Network/proxy.desktop
-share/applnk/Settings/Peripherals/.directory
-share/applnk/Settings/Peripherals/keyboard.desktop
-share/applnk/Settings/Peripherals/mouse.desktop
-share/applnk/Settings/Peripherals/printers.desktop
-share/applnk/Settings/Personalization/kcmlayout.desktop
-share/applnk/Settings/PowerControl/.directory
-share/applnk/Settings/PowerControl/energy.desktop
-share/applnk/Settings/Security/.directory
-share/applnk/Settings/Security/crypto.desktop
-share/applnk/Settings/Security/passwords.desktop
-share/applnk/Settings/Sound/.directory
-share/applnk/Settings/Sound/arts.desktop
-share/applnk/Settings/Sound/bell.desktop
-share/applnk/Settings/Sound/kcmnotify.desktop
-share/applnk/Settings/System/.directory
-share/applnk/Settings/System/clock.desktop
-share/applnk/Settings/System/desktoppath.desktop
-share/applnk/Settings/System/kcmfontinst.desktop
-share/applnk/Settings/System/kcmhelpcenter.desktop
-share/applnk/Settings/System/kdm.desktop
 share/applnk/Settings/WebBrowsing/khtml_appearance.desktop
 share/applnk/Settings/WebBrowsing/nsplugin.desktop
 share/applnk/Settings/WebBrowsing/smb.desktop
 share/applnk/Settings/email.desktop
-share/applnk/Settingsmenu/.directory
-share/applnk/Settingsmenu/KControl.desktop
-share/applnk/Settingsmenu/kappfinder.desktop
-share/applnk/Settingsmenu/kcmkicker.desktop
-share/applnk/Settingsmenu/kmenuedit.desktop
-share/applnk/Settingsmenu/kpersonalizer.desktop
 share/applnk/Settingsmenu/printmgr.desktop
-share/applnk/System/.directory
-share/applnk/System/More/.directory
-share/applnk/System/More/konquerorsu.desktop
-share/applnk/System/More/konsolesu.desktop
-share/applnk/System/ScreenSavers/.directory
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KRandom.desktop
-share/applnk/System/Terminal/.directory
 share/applnk/System/kappfinder.desktop
-share/applnk/System/kfmclient.desktop
-share/applnk/System/kfmclient_dir.desktop
-share/applnk/System/kfmclient_html.desktop
-share/applnk/System/kfmclient_war.desktop
 share/applnk/System/kinfocenter.desktop
 share/applnk/System/kmenuedit.desktop
-share/applnk/System/konquerorsu.desktop
-share/applnk/System/konsole.desktop
-share/applnk/System/konsolesu.desktop
 share/applnk/System/kpersonalizer.desktop
-share/applnk/System/ksysguard.desktop
-share/applnk/Toys/.directory
 share/applnk/Toys/ktip.desktop
-share/applnk/Utilities/.directory
-share/applnk/Utilities/More/.directory
-share/applnk/Utilities/More/kpager.desktop
-share/applnk/Utilities/XUtilities/.directory
-share/applnk/Utilities/kdeprintfax.desktop
-share/applnk/Utilities/kjobviewer.desktop
-share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
-share/applnk/Utilities/ktip.desktop
 share/applnk/konqueror.desktop
 share/apps/clockapplet/pics/lcd.png
 share/apps/drkonqi/debuggers/gdbrc
@@ -661,6 +710,7 @@ share/apps/kappfinder/apps/Development/assistant.desktop
 share/apps/kappfinder/apps/Development/ddd.desktop
 share/apps/kappfinder/apps/Development/designer.desktop
 share/apps/kappfinder/apps/Development/dlgedit.desktop
+share/apps/kappfinder/apps/Development/eclipse.desktop
 share/apps/kappfinder/apps/Development/j2mewtk.desktop
 share/apps/kappfinder/apps/Development/linguist.desktop
 share/apps/kappfinder/apps/Development/pose.desktop
@@ -674,6 +724,7 @@ share/apps/kappfinder/apps/Editors/pico.desktop
 share/apps/kappfinder/apps/Editors/xedit.desktop
 share/apps/kappfinder/apps/Editors/xemacs.desktop
 share/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop
+share/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop
 share/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop
 share/apps/kappfinder/apps/Games/Arcade/GnobotsII.desktop
 share/apps/kappfinder/apps/Games/Arcade/Mures.desktop
@@ -708,8 +759,8 @@ share/apps/kappfinder/apps/Games/GTali.desktop
 share/apps/kappfinder/apps/Games/Roguelikes/angband.desktop
 share/apps/kappfinder/apps/Games/Roguelikes/moria.desktop
 share/apps/kappfinder/apps/Games/Roguelikes/nethack.desktop
-share/apps/kappfinder/apps/Games/Roguelikes/pernband.desktop
 share/apps/kappfinder/apps/Games/Roguelikes/rogue.desktop
+share/apps/kappfinder/apps/Games/Roguelikes/tome.desktop
 share/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop
 share/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
 share/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop
@@ -726,6 +777,7 @@ share/apps/kappfinder/apps/Graphics/Sketch.desktop
 share/apps/kappfinder/apps/Graphics/Xpcd.desktop
 share/apps/kappfinder/apps/Graphics/Xwpick.desktop
 share/apps/kappfinder/apps/Graphics/bitmap.desktop
+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
@@ -750,6 +802,7 @@ share/apps/kappfinder/apps/Internet/Pan.desktop
 share/apps/kappfinder/apps/Internet/Sylpheed.desktop
 share/apps/kappfinder/apps/Internet/Terminal/Links.desktop
 share/apps/kappfinder/apps/Internet/Terminal/Lynx.desktop
+share/apps/kappfinder/apps/Internet/Terminal/btdownloadcurses.desktop
 share/apps/kappfinder/apps/Internet/Terminal/lftp.desktop
 share/apps/kappfinder/apps/Internet/Terminal/mutt.desktop
 share/apps/kappfinder/apps/Internet/Terminal/ncftp.desktop
@@ -759,17 +812,23 @@ share/apps/kappfinder/apps/Internet/Terminal/slrn.desktop
 share/apps/kappfinder/apps/Internet/Terminal/w3m.desktop
 share/apps/kappfinder/apps/Internet/arena.desktop
 share/apps/kappfinder/apps/Internet/balsa.desktop
+share/apps/kappfinder/apps/Internet/btdownloadgui.desktop
 share/apps/kappfinder/apps/Internet/coolmail.desktop
 share/apps/kappfinder/apps/Internet/dc_gui.desktop
 share/apps/kappfinder/apps/Internet/ed2k_gui.desktop
+share/apps/kappfinder/apps/Internet/epiphany.desktop
 share/apps/kappfinder/apps/Internet/ethereal.desktop
 share/apps/kappfinder/apps/Internet/gFTP.desktop
+share/apps/kappfinder/apps/Internet/gaim.desktop
 share/apps/kappfinder/apps/Internet/gnomemeeting.desktop
 share/apps/kappfinder/apps/Internet/gnometalk.desktop
 share/apps/kappfinder/apps/Internet/gtelnet.desktop
 share/apps/kappfinder/apps/Internet/ickle.desktop
 share/apps/kappfinder/apps/Internet/knews.desktop
 share/apps/kappfinder/apps/Internet/licq.desktop
+share/apps/kappfinder/apps/Internet/mldonkey_gui.desktop
+share/apps/kappfinder/apps/Internet/mozilla-firebird.desktop
+share/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop
 share/apps/kappfinder/apps/Internet/mozilla.desktop
 share/apps/kappfinder/apps/Internet/netscape.desktop
 share/apps/kappfinder/apps/Internet/netscape6.desktop
@@ -782,7 +841,6 @@ share/apps/kappfinder/apps/Multimedia/Aumix.desktop
 share/apps/kappfinder/apps/Multimedia/Grip.desktop
 share/apps/kappfinder/apps/Multimedia/MP3info.desktop
 share/apps/kappfinder/apps/Multimedia/XMovie.desktop
-share/apps/kappfinder/apps/Multimedia/Xpcd.desktop
 share/apps/kappfinder/apps/Multimedia/alevt.desktop
 share/apps/kappfinder/apps/Multimedia/aviplay.desktop
 share/apps/kappfinder/apps/Multimedia/bcast2000.desktop
@@ -833,6 +891,7 @@ share/apps/kappfinder/apps/System/wine.desktop
 share/apps/kappfinder/apps/System/xosview.desktop
 share/apps/kappfinder/apps/Toys/xeyes.desktop
 share/apps/kappfinder/apps/Toys/xpinguin.desktop
+share/apps/kappfinder/apps/Utilities/GKrellM.desktop
 share/apps/kappfinder/apps/Utilities/GnomeWho.desktop
 share/apps/kappfinder/apps/Utilities/SystemInfo.desktop
 share/apps/kappfinder/apps/Utilities/SystemLogViewer.desktop
@@ -849,39 +908,32 @@ share/apps/kappfinder/apps/Utilities/XUtilities/xterm.desktop
 share/apps/kappfinder/apps/Utilities/calctool.desktop
 share/apps/kappfinder/apps/Utilities/e-notes.desktop
 share/apps/kappfinder/apps/Utilities/oclock.desktop
+share/apps/kappfinder/apps/Utilities/xgnokii.desktop
 share/apps/kate/icons/crystalsvg/16x16/actions/curfiledir.png
 share/apps/kate/icons/crystalsvg/16x16/actions/highlighting.png
 share/apps/kate/icons/crystalsvg/16x16/actions/modified.png
+share/apps/kate/icons/crystalsvg/16x16/actions/modmod.png
+share/apps/kate/icons/crystalsvg/16x16/actions/modonhd.png
 share/apps/kate/icons/crystalsvg/16x16/actions/null.png
-share/apps/kate/icons/crystalsvg/16x16/actions/save_all.png
-share/apps/kate/icons/crystalsvg/22x22/actions/save_all.png
 share/apps/kate/icons/crystalsvg/32x32/actions/highlighting.png
 share/apps/kate/icons/locolor/16x16/actions/curfiledir.png
 share/apps/kate/icons/locolor/16x16/actions/indent.png
 share/apps/kate/icons/locolor/16x16/actions/modified.png
+share/apps/kate/icons/locolor/16x16/actions/modmod.png
+share/apps/kate/icons/locolor/16x16/actions/modonhd.png
 share/apps/kate/icons/locolor/16x16/actions/null.png
-share/apps/kate/icons/locolor/16x16/actions/save_all.png
 share/apps/kate/icons/locolor/16x16/actions/unindent.png
 share/apps/kate/icons/locolor/22x22/actions/indent.png
-share/apps/kate/icons/locolor/22x22/actions/save_all.png
 share/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/apps/kate/kateui.rc
-share/apps/kate/pics/fileselector.png
-share/apps/kate/pics/indicator_empty.png
-share/apps/kate/pics/indicator_viewactive.png
-share/apps/kate/pics/openfiles.png
+share/apps/kate/plugins/katedefaultproject/ui.rc
 share/apps/kate/scripts/sample.desktop
 share/apps/kate/scripts/sample.sh
-share/apps/kate/scripts/tolower.desktop
-share/apps/kate/scripts/tolower.sh
 share/apps/kate/tips
 share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcm_componentchooser/kcm_kemail.desktop
 share/apps/kcm_componentchooser/kcm_terminal.desktop
 share/apps/kcmcss/template.css
-share/apps/kcmfontinst/StarOffice/microsoft-cp1252.xpp
-share/apps/kcmfontinst/pics/kcmfontinst_star_office.png
-share/apps/kcmfontinst/psnames
 share/apps/kcminput/cursor_large_black.pcf.gz
 share/apps/kcminput/cursor_large_white.pcf.gz
 share/apps/kcminput/cursor_small_white.pcf.gz
@@ -893,11 +945,15 @@ share/apps/kcmkeys/mac4.kksrc
 share/apps/kcmkeys/unix3.kksrc
 share/apps/kcmkeys/win3.kksrc
 share/apps/kcmkeys/win4.kksrc
+share/apps/kcmkeys/wm3.kksrc
 share/apps/kcmlocale/pics/background.png
 share/apps/kconf_update/convertShortcuts.pl
 share/apps/kconf_update/favicons.upd
 share/apps/kconf_update/kaccel.upd
 share/apps/kconf_update/kcmdisplayrc.upd
+share/apps/kconf_update/kfmclient_3_2.upd
+share/apps/kconf_update/kfmclient_3_2_update.sh
+share/apps/kconf_update/khotkeys_32b1_update.upd
 share/apps/kconf_update/kicker-3.1-properSizeSetting.pl
 share/apps/kconf_update/kickerrc.upd
 share/apps/kconf_update/klipper-1-2.pl
@@ -906,7 +962,14 @@ share/apps/kconf_update/klipperrc.upd
 share/apps/kconf_update/klippershortcuts.upd
 share/apps/kconf_update/konsole.upd
 share/apps/kconf_update/ksmserver.upd
+share/apps/kconf_update/kuriikwsfilter.upd
 share/apps/kconf_update/kwin.upd
+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/kwiniconify.upd
+share/apps/kconf_update/kwinsticky.upd
 share/apps/kconf_update/move_favicons.sh
 share/apps/kconf_update/move_session_config.sh
 share/apps/kconf_update/pluginlibFix.pl
@@ -994,6 +1057,7 @@ share/apps/kdisplay/app-defaults/Xdvi.ad
 share/apps/kdisplay/app-defaults/Xpdf.ad
 share/apps/kdisplay/color-schemes/AtlasGreen.kcsrc
 share/apps/kdisplay/color-schemes/BeOS.kcsrc
+share/apps/kdisplay/color-schemes/BlackOnWhite.kcsrc
 share/apps/kdisplay/color-schemes/BlueSlate.kcsrc
 share/apps/kdisplay/color-schemes/CDE.kcsrc
 share/apps/kdisplay/color-schemes/DarkBlue.kcsrc
@@ -1008,20 +1072,68 @@ share/apps/kdisplay/color-schemes/KeramikWhite.kcsrc
 share/apps/kdisplay/color-schemes/MediaPeach.kcsrc
 share/apps/kdisplay/color-schemes/Next.kcsrc
 share/apps/kdisplay/color-schemes/PaleGray.kcsrc
+share/apps/kdisplay/color-schemes/Plastik.kcsrc
 share/apps/kdisplay/color-schemes/PointReyesGreen.kcsrc
 share/apps/kdisplay/color-schemes/Pumpkin.kcsrc
 share/apps/kdisplay/color-schemes/SolarisCDE.kcsrc
 share/apps/kdisplay/color-schemes/Storm.kcsrc
 share/apps/kdisplay/color-schemes/System.kcsrc
+share/apps/kdisplay/color-schemes/WhiteOnBlack.kcsrc
 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.png
-share/apps/kdm/pics/users/default.png
+share/apps/kdm/pics/users/default1.png
 share/apps/kdm/pics/users/default2.png
-share/apps/kdm/pics/users/root.png
-share/apps/kdm/pics/users/root2.png
+share/apps/kdm/pics/users/root1.png
+share/apps/kdm/sessions/9wm.desktop
+share/apps/kdm/sessions/aewm++.desktop
+share/apps/kdm/sessions/aewm.desktop
+share/apps/kdm/sessions/afterstep.desktop
+share/apps/kdm/sessions/amaterus.desktop
+share/apps/kdm/sessions/amiwm.desktop
+share/apps/kdm/sessions/asclassic.desktop
+share/apps/kdm/sessions/blackbox.desktop
+share/apps/kdm/sessions/cde.desktop
+share/apps/kdm/sessions/ctwm.desktop
+share/apps/kdm/sessions/cwwm.desktop
+share/apps/kdm/sessions/enlightenment.desktop
+share/apps/kdm/sessions/evilwm.desktop
+share/apps/kdm/sessions/fluxbox.desktop
+share/apps/kdm/sessions/flwm.desktop
+share/apps/kdm/sessions/fvwm.desktop
+share/apps/kdm/sessions/fvwm95.desktop
+share/apps/kdm/sessions/gnome.desktop
+share/apps/kdm/sessions/golem.desktop
+share/apps/kdm/sessions/icewm.desktop
+share/apps/kdm/sessions/ion.desktop
+share/apps/kdm/sessions/kde.desktop
+share/apps/kdm/sessions/larswm.desktop
+share/apps/kdm/sessions/lwm.desktop
+share/apps/kdm/sessions/matchbox.desktop
+share/apps/kdm/sessions/metacity.desktop
+share/apps/kdm/sessions/mwm.desktop
+share/apps/kdm/sessions/olvwm.desktop
+share/apps/kdm/sessions/olwm.desktop
+share/apps/kdm/sessions/openbox.desktop
+share/apps/kdm/sessions/oroborus.desktop
+share/apps/kdm/sessions/phluid.desktop
+share/apps/kdm/sessions/pwm.desktop
+share/apps/kdm/sessions/qvwm.desktop
+share/apps/kdm/sessions/ratpoison.desktop
+share/apps/kdm/sessions/sapphire.desktop
+share/apps/kdm/sessions/sawfish.desktop
+share/apps/kdm/sessions/twm.desktop
+share/apps/kdm/sessions/ude.desktop
+share/apps/kdm/sessions/vtwm.desktop
+share/apps/kdm/sessions/w9wm.desktop
+share/apps/kdm/sessions/waimea.desktop
+share/apps/kdm/sessions/wm2.desktop
+share/apps/kdm/sessions/wmaker.desktop
+share/apps/kdm/sessions/xfce.desktop
+share/apps/keditbookmarks/keditbookmarks-genui.rc
 share/apps/keditbookmarks/keditbookmarksui.rc
 share/apps/kfindpart/icons/locolor/22x22/actions/archive.png
 share/apps/kfindpart/icons/locolor/22x22/actions/delete.png
@@ -1046,6 +1158,8 @@ share/apps/khelpcenter/plugins/Manpages/man7.desktop
 share/apps/khelpcenter/plugins/Manpages/man8.desktop
 share/apps/khelpcenter/plugins/Manpages/man9.desktop
 share/apps/khelpcenter/plugins/Manpages/mann.desktop
+share/apps/khelpcenter/plugins/Scrollkeeper/.directory
+share/apps/khelpcenter/plugins/Scrollkeeper/scrollkeeper.desktop
 share/apps/khelpcenter/plugins/Tutorials/.directory
 share/apps/khelpcenter/plugins/Tutorials/quickstart.desktop
 share/apps/khelpcenter/plugins/Tutorials/visualdict.desktop
@@ -1055,16 +1169,20 @@ share/apps/khelpcenter/plugins/faq.desktop
 share/apps/khelpcenter/plugins/info.desktop
 share/apps/khelpcenter/plugins/kcontrolmodules.desktop
 share/apps/khelpcenter/plugins/kicmodules.desktop
+share/apps/khelpcenter/plugins/kioslaves.desktop
 share/apps/khelpcenter/plugins/konqplugins.desktop
 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/table-of-contents.xslt
+share/apps/khotkeys/kde32b1.khotkeys
 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/menuapplet.desktop
 share/apps/kicker/applets/minipagerapplet.desktop
 share/apps/kicker/applets/naughtyapplet.desktop
 share/apps/kicker/applets/quicklauncher.desktop
@@ -1075,9 +1193,13 @@ share/apps/kicker/default-apps
 share/apps/kicker/extensions/childpanelextension.desktop
 share/apps/kicker/extensions/dockbarextension.desktop
 share/apps/kicker/extensions/kasbarextension.desktop
+share/apps/kicker/extensions/sidebarextension.desktop
 share/apps/kicker/extensions/taskbarextension.desktop
 share/apps/kicker/icons/crystalsvg/16x16/actions/modified.png
 share/apps/kicker/icons/locolor/16x16/actions/modified.png
+share/apps/kicker/menuext/find.desktop
+share/apps/kicker/menuext/find/kfind.desktop
+share/apps/kicker/menuext/find/websearch.desktop
 share/apps/kicker/menuext/konsolemenu.desktop
 share/apps/kicker/menuext/prefmenu.desktop
 share/apps/kicker/menuext/printmenu.desktop
@@ -1195,6 +1317,7 @@ share/apps/kicker/tiles/solid_tigereye_normal_up.png
 share/apps/kicker/tiles/solid_tigereye_tiny_down.png
 share/apps/kicker/tiles/solid_tigereye_tiny_up.png
 share/apps/kicker/wallpapers/deck_plate.png
+share/apps/kicker/wallpapers/default.png
 share/apps/kicker/wallpapers/green_line.png
 share/apps/kicker/wallpapers/rail.png
 share/apps/kinfocenter/kinfocenterui.rc
@@ -1216,16 +1339,24 @@ share/apps/konqlistview/konq_textview.rc
 share/apps/konqlistview/konq_treeview.rc
 share/apps/konqlistview/kpartplugins/kshellcmdplugin.rc
 share/apps/konqsidebartng/add/virtualfolderadd.desktop
+share/apps/konqsidebartng/add/webmodule_add.desktop
 share/apps/konqsidebartng/dirtree/bookmarks_module.desktop
 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/history.desktop
+share/apps/konqsidebartng/kicker_entries/home.desktop
+share/apps/konqsidebartng/kicker_entries/remote.desktop
+share/apps/konqsidebartng/kicker_entries/root.desktop
+share/apps/konqsidebartng/kicker_entries/services.desktop
 share/apps/konqsidebartng/virtual_folders/remote/.directory
 share/apps/konqsidebartng/virtual_folders/remote/ftp/.directory
 share/apps/konqsidebartng/virtual_folders/remote/ftp/kde_ftp.desktop
@@ -1236,8 +1367,10 @@ share/apps/konqsidebartng/virtual_folders/remote/web/kde_web.desktop
 share/apps/konqsidebartng/virtual_folders/services/.directory
 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/lisa.desktop
 share/apps/konqsidebartng/virtual_folders/services/printsystem.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
@@ -1253,12 +1386,15 @@ 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/dirtree/remote/smb-network.desktop
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde1.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde2.png
 share/apps/konqueror/icons/crystalsvg/16x16/actions/kde3.png
@@ -1284,6 +1420,8 @@ 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
@@ -1293,6 +1431,24 @@ share/apps/konqueror/servicemenus/hdd_unmounted_konqy.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/text-ada-print.desktop
+share/apps/konqueror/servicemenus/text-c++-print.desktop
+share/apps/konqueror/servicemenus/text-c++h-print.desktop
+share/apps/konqueror/servicemenus/text-ch-print.desktop
+share/apps/konqueror/servicemenus/text-css-print.desktop
+share/apps/konqueror/servicemenus/text-diff-print.desktop
+share/apps/konqueror/servicemenus/text-html-print.desktop
+share/apps/konqueror/servicemenus/text-java-print.desktop
+share/apps/konqueror/servicemenus/text-log-print.desktop
+share/apps/konqueror/servicemenus/text-makefile-print.desktop
+share/apps/konqueror/servicemenus/text-pas-print.desktop
+share/apps/konqueror/servicemenus/text-perl-print.desktop
+share/apps/konqueror/servicemenus/text-print.desktop
+share/apps/konqueror/servicemenus/text-python-print.desktop
+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
@@ -1325,6 +1481,13 @@ share/apps/konsole/WhiteOnBlack.schema
 share/apps/konsole/XTerm.schema
 share/apps/konsole/default.Keytab
 share/apps/konsole/default.Schema
+share/apps/konsole/eventsrc
+share/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png
+share/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png
+share/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png
+share/apps/konsole/icons/crystalsvg/22x22/actions/opentermred.png
+share/apps/konsole/icons/crystalsvg/32x32/actions/opentermblue.png
+share/apps/konsole/icons/crystalsvg/32x32/actions/opentermred.png
 share/apps/konsole/linux.keytab
 share/apps/konsole/mc.desktop
 share/apps/konsole/profiles/2shells
@@ -1347,14 +1510,29 @@ share/apps/kpersonalizer/pics/step3.png
 share/apps/kpersonalizer/pics/step4.png
 share/apps/kpersonalizer/pics/step5.png
 share/apps/ksmserver/pics/shutdownkonq.png
-share/apps/ksplash/pics/locolor/splash_active_bar.png
-share/apps/ksplash/pics/locolor/splash_bottom.png
-share/apps/ksplash/pics/locolor/splash_inactive_bar.png
-share/apps/ksplash/pics/locolor/splash_top.png
-share/apps/ksplash/pics/splash_active_bar.png
-share/apps/ksplash/pics/splash_bottom.png
-share/apps/ksplash/pics/splash_inactive_bar.png
-share/apps/ksplash/pics/splash_top.png
+share/apps/ksplash/Themes/Default/Preview.png
+share/apps/ksplash/Themes/Default/Theme.rc
+share/apps/ksplash/Themes/Default/locolor/Theme.rc
+share/apps/ksplash/Themes/Default/locolor/splash_active_bar.png
+share/apps/ksplash/Themes/Default/locolor/splash_bottom.png
+share/apps/ksplash/Themes/Default/locolor/splash_inactive_bar.png
+share/apps/ksplash/Themes/Default/locolor/splash_top.png
+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/Redmond/Background.png
+share/apps/ksplash/Themes/Redmond/Preview.png
+share/apps/ksplash/Themes/Redmond/Theme.rc
+share/apps/ksplash/Themes/Standard/Preview.png
+share/apps/ksplash/Themes/Standard/Theme.rc
+share/apps/ksplash/Themes/blue-bend/Preview.png
+share/apps/ksplash/Themes/blue-bend/Theme.rc
+share/apps/ksplash/Themes/blue-bend/splash_active_bar.png
+share/apps/ksplash/Themes/blue-bend/splash_bottom.png
+share/apps/ksplash/Themes/blue-bend/splash_inactive_bar.png
+share/apps/ksplash/Themes/blue-bend/splash_top.png
+share/apps/ksplash/pics/splash.png
 share/apps/ksysguard/KSysGuardApplet.xml
 share/apps/ksysguard/ProcessTable.sgrd
 share/apps/ksysguard/SystemLoad.sgrd
@@ -1371,51 +1549,9 @@ 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/kthememgr/Themes/Default.ktheme
-share/apps/kthememgr/Themes/MGBreizh.ktheme
-share/apps/kthememgr/Themes/Nostalgy.ktheme
-share/apps/kthememgr/Themes/Template.themerc
-share/apps/kthememgr/Themes/Wood.ktheme
-share/apps/kthememgr/theme.mappings
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
-share/apps/kwin/icewm-themes/closeA.xpm
-share/apps/kwin/icewm-themes/closeI.xpm
-share/apps/kwin/icewm-themes/default.theme
-share/apps/kwin/icewm-themes/depthA.xpm
-share/apps/kwin/icewm-themes/depthI.xpm
-share/apps/kwin/icewm-themes/maximizeA.xpm
-share/apps/kwin/icewm-themes/maximizeI.xpm
-share/apps/kwin/icewm-themes/menuButtonA.xpm
-share/apps/kwin/icewm-themes/menuButtonI.xpm
-share/apps/kwin/icewm-themes/minimizeA.xpm
-share/apps/kwin/icewm-themes/minimizeI.xpm
-share/apps/kwin/icewm-themes/restoreA.xpm
-share/apps/kwin/icewm-themes/restoreI.xpm
-share/apps/kwin/icewm-themes/rolldownA.xpm
-share/apps/kwin/icewm-themes/rolldownI.xpm
-share/apps/kwin/icewm-themes/rollupA.xpm
-share/apps/kwin/icewm-themes/rollupI.xpm
-share/apps/kwin/icewm-themes/titleAB.xpm
-share/apps/kwin/icewm-themes/titleAJ.xpm
-share/apps/kwin/icewm-themes/titleAM.xpm
-share/apps/kwin/icewm-themes/titleAP.xpm
-share/apps/kwin/icewm-themes/titleAQ.xpm
-share/apps/kwin/icewm-themes/titleAR.xpm
-share/apps/kwin/icewm-themes/titleAS.xpm
-share/apps/kwin/icewm-themes/titleAT.xpm
-share/apps/kwin/icewm-themes/titleIB.xpm
-share/apps/kwin/icewm-themes/titleIJ.xpm
-share/apps/kwin/icewm-themes/titleIM.xpm
-share/apps/kwin/icewm-themes/titleIP.xpm
-share/apps/kwin/icewm-themes/titleIQ.xpm
-share/apps/kwin/icewm-themes/titleIR.xpm
-share/apps/kwin/icewm-themes/titleIS.xpm
-share/apps/kwin/icewm-themes/titleIT.xpm
-share/apps/kwin/icewm.desktop
-share/apps/kwin/kde1.desktop
 share/apps/kwin/keramik.desktop
-share/apps/kwin/kstep.desktop
 share/apps/kwin/laptop.desktop
 share/apps/kwin/modernsystem.desktop
 share/apps/kwin/pics/bluesun.png
@@ -1433,8 +1569,6 @@ share/apps/kwin/pics/pinup.png
 share/apps/kwin/pics/unknown.png
 share/apps/kwin/quartz.desktop
 share/apps/kwin/redmond.desktop
-share/apps/kwin/riscos.desktop
-share/apps/kwin/system.desktop
 share/apps/kwin/web.desktop
 share/apps/kwrite/kwriteui.rc
 share/apps/naughtyapplet/pics/naughty-happy.png
@@ -1442,11 +1576,13 @@ share/apps/naughtyapplet/pics/naughty-sad.png
 share/autostart/kdesktop.desktop
 share/autostart/khotkeys.desktop
 share/autostart/klipper.desktop
+share/autostart/konqy_preload.desktop
 share/autostart/ktip.desktop
 share/autostart/kwrited.desktop
 share/autostart/panel.desktop
 share/config/kdesktop_custom_menu1
 share/config/kdesktop_custom_menu2
+share/config/kdm/README
 share/config/kdm/Xaccess
 share/config/kdm/Xreset
 share/config/kdm/Xservers
@@ -1458,10 +1594,48 @@ share/config/kdm/backgroundrc
 share/config/kdm/kdmrc
 share/config/klipperrc
 share/config/konqsidebartng.rc
-share/config/konsolerc
 share/config/kshorturifilterrc
-share/config/kuriikwsfilterrc
 share/config/kwritedrc
+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
+share/desktop-directories/kde-games-arcade.directory
+share/desktop-directories/kde-games-board.directory
+share/desktop-directories/kde-games-card.directory
+share/desktop-directories/kde-games-kidsgames.directory
+share/desktop-directories/kde-games-roguelikes.directory
+share/desktop-directories/kde-games-strategy.directory
+share/desktop-directories/kde-games.directory
+share/desktop-directories/kde-graphics.directory
+share/desktop-directories/kde-information.directory
+share/desktop-directories/kde-internet-terminal.directory
+share/desktop-directories/kde-internet.directory
+share/desktop-directories/kde-main.directory
+share/desktop-directories/kde-more.directory
+share/desktop-directories/kde-multimedia.directory
+share/desktop-directories/kde-office.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-looknfeel.directory
+share/desktop-directories/kde-settings-network.directory
+share/desktop-directories/kde-settings-peripherals.directory
+share/desktop-directories/kde-settings-power.directory
+share/desktop-directories/kde-settings-security.directory
+share/desktop-directories/kde-settings-sound.directory
+share/desktop-directories/kde-settings-system.directory
+share/desktop-directories/kde-settings-webbrowsing.directory
+share/desktop-directories/kde-settings.directory
+share/desktop-directories/kde-settingsmenu.directory
+share/desktop-directories/kde-system-screensavers.directory
+share/desktop-directories/kde-system-terminal.directory
+share/desktop-directories/kde-system.directory
+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/kate/TODO
 share/doc/HTML/en/kate/advanced.docbook
 share/doc/HTML/en/kate/common
@@ -1510,6 +1684,9 @@ share/doc/HTML/en/kcontrol/crypto/index.docbook
 share/doc/HTML/en/kcontrol/desktop/common
 share/doc/HTML/en/kcontrol/desktop/index.cache.bz2
 share/doc/HTML/en/kcontrol/desktop/index.docbook
+share/doc/HTML/en/kcontrol/desktopbehavior/common
+share/doc/HTML/en/kcontrol/desktopbehavior/index.cache.bz2
+share/doc/HTML/en/kcontrol/desktopbehavior/index.docbook
 share/doc/HTML/en/kcontrol/ebrowsing/common
 share/doc/HTML/en/kcontrol/ebrowsing/index.cache.bz2
 share/doc/HTML/en/kcontrol/ebrowsing/index.docbook
@@ -1578,9 +1755,6 @@ share/doc/HTML/en/kcontrol/khtml/common
 share/doc/HTML/en/kcontrol/khtml/index.cache.bz2
 share/doc/HTML/en/kcontrol/khtml/index.docbook
 share/doc/HTML/en/kcontrol/khtml/nsplugin.docbook
-share/doc/HTML/en/kcontrol/kthememgr/common
-share/doc/HTML/en/kcontrol/kthememgr/index.cache.bz2
-share/doc/HTML/en/kcontrol/kthememgr/index.docbook
 share/doc/HTML/en/kcontrol/kwindecoration/common
 share/doc/HTML/en/kcontrol/kwindecoration/index.cache.bz2
 share/doc/HTML/en/kcontrol/kwindecoration/index.docbook
@@ -1596,6 +1770,9 @@ share/doc/HTML/en/kcontrol/netpref/index.docbook
 share/doc/HTML/en/kcontrol/panel/common
 share/doc/HTML/en/kcontrol/panel/index.cache.bz2
 share/doc/HTML/en/kcontrol/panel/index.docbook
+share/doc/HTML/en/kcontrol/panelappearance/common
+share/doc/HTML/en/kcontrol/panelappearance/index.cache.bz2
+share/doc/HTML/en/kcontrol/panelappearance/index.docbook
 share/doc/HTML/en/kcontrol/passwords/common
 share/doc/HTML/en/kcontrol/passwords/index.cache.bz2
 share/doc/HTML/en/kcontrol/passwords/index.docbook
@@ -1688,6 +1865,7 @@ share/doc/HTML/en/kdesu/index.docbook
 share/doc/HTML/en/kdm/common
 share/doc/HTML/en/kdm/index.cache.bz2
 share/doc/HTML/en/kdm/index.docbook
+share/doc/HTML/en/kdm/kdmrc-ref.docbook
 share/doc/HTML/en/kfind/common
 share/doc/HTML/en/kfind/index.cache.bz2
 share/doc/HTML/en/kfind/index.docbook
@@ -1728,7 +1906,6 @@ share/doc/HTML/en/khelpcenter/khelpcenter.png
 share/doc/HTML/en/khelpcenter/konq.css
 share/doc/HTML/en/khelpcenter/lines.png
 share/doc/HTML/en/khelpcenter/lines2.png
-share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/pointers.png
 share/doc/HTML/en/khelpcenter/quickstart/common
 share/doc/HTML/en/khelpcenter/quickstart/index.cache.bz2
@@ -1744,18 +1921,8 @@ 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/kdeadmin-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdebase-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdeedu-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdegames-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdegraphics-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdemultimedia-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdenetwork-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdepim-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdetoys-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/kdeutils-apps.docbook
-share/doc/HTML/en/khelpcenter/userguide/koffice-apps.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
@@ -1854,6 +2021,7 @@ share/doc/HTML/en/kioslave/bzip.docbook
 share/doc/HTML/en/kioslave/bzip2.docbook
 share/doc/HTML/en/kioslave/cgi.docbook
 share/doc/HTML/en/kioslave/common
+share/doc/HTML/en/kioslave/data.docbook
 share/doc/HTML/en/kioslave/file.docbook
 share/doc/HTML/en/kioslave/finger.docbook
 share/doc/HTML/en/kioslave/fish.docbook
@@ -1874,13 +2042,13 @@ share/doc/HTML/en/kioslave/ldap.docbook
 share/doc/HTML/en/kioslave/mac.docbook
 share/doc/HTML/en/kioslave/mailto.docbook
 share/doc/HTML/en/kioslave/man.docbook
+share/doc/HTML/en/kioslave/mrml.docbook
 share/doc/HTML/en/kioslave/news.docbook
 share/doc/HTML/en/kioslave/nfs.docbook
 share/doc/HTML/en/kioslave/nntp.docbook
 share/doc/HTML/en/kioslave/pop3.docbook
 share/doc/HTML/en/kioslave/pop3s.docbook
 share/doc/HTML/en/kioslave/print.docbook
-share/doc/HTML/en/kioslave/rdate.docbook
 share/doc/HTML/en/kioslave/rlan.docbook
 share/doc/HTML/en/kioslave/rlogin.docbook
 share/doc/HTML/en/kioslave/sftp.docbook
@@ -1938,47 +2106,68 @@ share/doc/HTML/en/kpager/index.cache.bz2
 share/doc/HTML/en/kpager/index.docbook
 share/doc/HTML/en/kpager/screenshot.png
 share/doc/HTML/en/kpager/settings.png
+share/doc/HTML/en/ksplashml/common
+share/doc/HTML/en/ksplashml/index.cache.bz2
+share/doc/HTML/en/ksplashml/index.docbook
 share/doc/HTML/en/ksysguard/common
 share/doc/HTML/en/ksysguard/index.cache.bz2
 share/doc/HTML/en/ksysguard/index.docbook
 share/doc/HTML/en/kwrite/common
 share/doc/HTML/en/kwrite/index.cache.bz2
 share/doc/HTML/en/kwrite/index.docbook
+share/doc/HTML/en/kxkb/common
+share/doc/HTML/en/kxkb/index.cache.bz2
+share/doc/HTML/en/kxkb/index.docbook
+share/doc/kdm/README
 share/fonts/9x15.pcf.gz
 share/fonts/console8x16.pcf.gz
 share/fonts/console8x8.pcf.gz
+share/fonts/fonts.dir
+share/fonts/override/fonts.dir
 share/icons/crystalsvg/128x128/apps/access.png
 share/icons/crystalsvg/128x128/apps/acroread.png
 share/icons/crystalsvg/128x128/apps/applixware.png
+share/icons/crystalsvg/128x128/apps/arts.png
 share/icons/crystalsvg/128x128/apps/background.png
+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/date.png
 share/icons/crystalsvg/128x128/apps/email.png
+share/icons/crystalsvg/128x128/apps/energy_star.png
 share/icons/crystalsvg/128x128/apps/filetypes.png
+share/icons/crystalsvg/128x128/apps/fonts.png
 share/icons/crystalsvg/128x128/apps/gimp.png
 share/icons/crystalsvg/128x128/apps/help_index.png
 share/icons/crystalsvg/128x128/apps/hwinfo.png
 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/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/konqueror.png
+share/icons/crystalsvg/128x128/apps/konsole.png
 share/icons/crystalsvg/128x128/apps/kscreensaver.png
+share/icons/crystalsvg/128x128/apps/ksplash.png
 share/icons/crystalsvg/128x128/apps/ksysguard.png
 share/icons/crystalsvg/128x128/apps/kthememgr.png
 share/icons/crystalsvg/128x128/apps/ktip.png
 share/icons/crystalsvg/128x128/apps/kwrite.png
 share/icons/crystalsvg/128x128/apps/licq.png
 share/icons/crystalsvg/128x128/apps/linuxconf.png
+share/icons/crystalsvg/128x128/apps/locale.png
 share/icons/crystalsvg/128x128/apps/looknfeel.png
 share/icons/crystalsvg/128x128/apps/mozilla.png
 share/icons/crystalsvg/128x128/apps/multimedia.png
@@ -1996,8 +2185,13 @@ share/icons/crystalsvg/128x128/apps/password.png
 share/icons/crystalsvg/128x128/apps/penguin.png
 share/icons/crystalsvg/128x128/apps/personal.png
 share/icons/crystalsvg/128x128/apps/phppg.png
+share/icons/crystalsvg/128x128/apps/printmgr.png
+share/icons/crystalsvg/128x128/apps/proxy.png
 share/icons/crystalsvg/128x128/apps/pysol.png
+share/icons/crystalsvg/128x128/apps/randr.png
+share/icons/crystalsvg/128x128/apps/samba.png
 share/icons/crystalsvg/128x128/apps/staroffice.png
+share/icons/crystalsvg/128x128/apps/stylesheet.png
 share/icons/crystalsvg/128x128/apps/terminal.png
 share/icons/crystalsvg/128x128/apps/tux.png
 share/icons/crystalsvg/128x128/apps/wp.png
@@ -2029,7 +2223,7 @@ share/icons/crystalsvg/16x16/apps/enhanced_browsing.png
 share/icons/crystalsvg/16x16/apps/filetypes.png
 share/icons/crystalsvg/16x16/apps/fonts.png
 share/icons/crystalsvg/16x16/apps/gimp.png
-share/icons/crystalsvg/16x16/apps/gnome/apps.png
+share/icons/crystalsvg/16x16/apps/gnome_apps.png
 share/icons/crystalsvg/16x16/apps/go.png
 share/icons/crystalsvg/16x16/apps/gv.png
 share/icons/crystalsvg/16x16/apps/gvim.png
@@ -2075,6 +2269,7 @@ share/icons/crystalsvg/16x16/apps/konsole.png
 share/icons/crystalsvg/16x16/apps/kpager.png
 share/icons/crystalsvg/16x16/apps/kpersonalizer.png
 share/icons/crystalsvg/16x16/apps/kscreensaver.png
+share/icons/crystalsvg/16x16/apps/ksplash.png
 share/icons/crystalsvg/16x16/apps/ksysguard.png
 share/icons/crystalsvg/16x16/apps/kthememgr.png
 share/icons/crystalsvg/16x16/apps/ktip.png
@@ -2090,8 +2285,8 @@ share/icons/crystalsvg/16x16/apps/lyx.png
 share/icons/crystalsvg/16x16/apps/mac.png
 share/icons/crystalsvg/16x16/apps/mathematica.png
 share/icons/crystalsvg/16x16/apps/mozilla.png
-share/icons/crystalsvg/16x16/apps/mozilla/m.png
-share/icons/crystalsvg/16x16/apps/mozilla/mail.png
+share/icons/crystalsvg/16x16/apps/mozilla_m.png
+share/icons/crystalsvg/16x16/apps/mozilla_mail.png
 share/icons/crystalsvg/16x16/apps/multimedia.png
 share/icons/crystalsvg/16x16/apps/nedit.png
 share/icons/crystalsvg/16x16/apps/netscape.png
@@ -2126,6 +2321,7 @@ share/icons/crystalsvg/16x16/apps/plan.png
 share/icons/crystalsvg/16x16/apps/printmgr.png
 share/icons/crystalsvg/16x16/apps/proxy.png
 share/icons/crystalsvg/16x16/apps/pybliographic.png
+share/icons/crystalsvg/16x16/apps/randr.png
 share/icons/crystalsvg/16x16/apps/realplayer.png
 share/icons/crystalsvg/16x16/apps/remote.png
 share/icons/crystalsvg/16x16/apps/samba.png
@@ -2159,13 +2355,17 @@ 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/apps/klipper.png
+share/icons/crystalsvg/22x22/apps/konqueror.png
+share/icons/crystalsvg/22x22/apps/ksplash.png
 share/icons/crystalsvg/22x22/apps/kvirc.png
 share/icons/crystalsvg/22x22/apps/nedit.png
+share/icons/crystalsvg/22x22/apps/randr.png
 share/icons/crystalsvg/32x32/apps/access.png
 share/icons/crystalsvg/32x32/apps/acroread.png
 share/icons/crystalsvg/32x32/apps/agent.png
 share/icons/crystalsvg/32x32/apps/alevt.png
 share/icons/crystalsvg/32x32/apps/applixware.png
+share/icons/crystalsvg/32x32/apps/arts.png
 share/icons/crystalsvg/32x32/apps/background.png
 share/icons/crystalsvg/32x32/apps/bell.png
 share/icons/crystalsvg/32x32/apps/blender.png
@@ -2187,7 +2387,7 @@ share/icons/crystalsvg/32x32/apps/filetypes.png
 share/icons/crystalsvg/32x32/apps/fonts.png
 share/icons/crystalsvg/32x32/apps/galeon.png
 share/icons/crystalsvg/32x32/apps/gimp.png
-share/icons/crystalsvg/32x32/apps/gnome/app.png
+share/icons/crystalsvg/32x32/apps/gnome_apps.png
 share/icons/crystalsvg/32x32/apps/go.png
 share/icons/crystalsvg/32x32/apps/gv.png
 share/icons/crystalsvg/32x32/apps/gvim.png
@@ -2234,6 +2434,7 @@ share/icons/crystalsvg/32x32/apps/konsole.png
 share/icons/crystalsvg/32x32/apps/kpager.png
 share/icons/crystalsvg/32x32/apps/kpersonalizer.png
 share/icons/crystalsvg/32x32/apps/kscreensaver.png
+share/icons/crystalsvg/32x32/apps/ksplash.png
 share/icons/crystalsvg/32x32/apps/ksysguard.png
 share/icons/crystalsvg/32x32/apps/kthememgr.png
 share/icons/crystalsvg/32x32/apps/ktip.png
@@ -2249,8 +2450,8 @@ share/icons/crystalsvg/32x32/apps/lyx.png
 share/icons/crystalsvg/32x32/apps/mac.png
 share/icons/crystalsvg/32x32/apps/mathematica.png
 share/icons/crystalsvg/32x32/apps/mozilla.png
-share/icons/crystalsvg/32x32/apps/mozilla/m.png
-share/icons/crystalsvg/32x32/apps/mozilla/mail.png
+share/icons/crystalsvg/32x32/apps/mozilla_m.png
+share/icons/crystalsvg/32x32/apps/mozilla_mail.png
 share/icons/crystalsvg/32x32/apps/multimedia.png
 share/icons/crystalsvg/32x32/apps/nedit.png
 share/icons/crystalsvg/32x32/apps/netscape.png
@@ -2282,6 +2483,7 @@ share/icons/crystalsvg/32x32/apps/printmgr.png
 share/icons/crystalsvg/32x32/apps/proxy.png
 share/icons/crystalsvg/32x32/apps/pybliographic.png
 share/icons/crystalsvg/32x32/apps/pysol.png
+share/icons/crystalsvg/32x32/apps/randr.png
 share/icons/crystalsvg/32x32/apps/realplayer.png
 share/icons/crystalsvg/32x32/apps/samba.png
 share/icons/crystalsvg/32x32/apps/soffice.png
@@ -2319,6 +2521,7 @@ share/icons/crystalsvg/48x48/apps/access.png
 share/icons/crystalsvg/48x48/apps/acroread.png
 share/icons/crystalsvg/48x48/apps/agent.png
 share/icons/crystalsvg/48x48/apps/applixware.png
+share/icons/crystalsvg/48x48/apps/arts.png
 share/icons/crystalsvg/48x48/apps/background.png
 share/icons/crystalsvg/48x48/apps/bell.png
 share/icons/crystalsvg/48x48/apps/blender.png
@@ -2338,7 +2541,7 @@ share/icons/crystalsvg/48x48/apps/filetypes.png
 share/icons/crystalsvg/48x48/apps/fonts.png
 share/icons/crystalsvg/48x48/apps/galeon.png
 share/icons/crystalsvg/48x48/apps/gimp.png
-share/icons/crystalsvg/48x48/apps/gnome/apps.png
+share/icons/crystalsvg/48x48/apps/gnome_apps.png
 share/icons/crystalsvg/48x48/apps/go.png
 share/icons/crystalsvg/48x48/apps/gvim.png
 share/icons/crystalsvg/48x48/apps/help_index.png
@@ -2349,6 +2552,7 @@ share/icons/crystalsvg/48x48/apps/input_devices_settings.png
 share/icons/crystalsvg/48x48/apps/kappfinder.png
 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
@@ -2359,7 +2563,9 @@ share/icons/crystalsvg/48x48/apps/kcmpci.png
 share/icons/crystalsvg/48x48/apps/kcmprocessor.png
 share/icons/crystalsvg/48x48/apps/kcmscsi.png
 share/icons/crystalsvg/48x48/apps/kcmsystem.png
+share/icons/crystalsvg/48x48/apps/kcmx.png
 share/icons/crystalsvg/48x48/apps/kcontrol.png
+share/icons/crystalsvg/48x48/apps/kdeprintfax.png
 share/icons/crystalsvg/48x48/apps/kdisknav.png
 share/icons/crystalsvg/48x48/apps/kdmconfig.png
 share/icons/crystalsvg/48x48/apps/keditbookmarks.png
@@ -2370,6 +2576,7 @@ 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/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
@@ -2378,6 +2585,7 @@ share/icons/crystalsvg/48x48/apps/konqueror.png
 share/icons/crystalsvg/48x48/apps/konsole.png
 share/icons/crystalsvg/48x48/apps/kpager.png
 share/icons/crystalsvg/48x48/apps/kscreensaver.png
+share/icons/crystalsvg/48x48/apps/ksplash.png
 share/icons/crystalsvg/48x48/apps/ksysguard.png
 share/icons/crystalsvg/48x48/apps/kthememgr.png
 share/icons/crystalsvg/48x48/apps/ktip.png
@@ -2390,8 +2598,8 @@ share/icons/crystalsvg/48x48/apps/linuxconf.png
 share/icons/crystalsvg/48x48/apps/locale.png
 share/icons/crystalsvg/48x48/apps/looknfeel.png
 share/icons/crystalsvg/48x48/apps/mozilla.png
-share/icons/crystalsvg/48x48/apps/mozilla/m.png
-share/icons/crystalsvg/48x48/apps/mozilla/mail.png
+share/icons/crystalsvg/48x48/apps/mozilla_m.png
+share/icons/crystalsvg/48x48/apps/mozilla_mail.png
 share/icons/crystalsvg/48x48/apps/multimedia.png
 share/icons/crystalsvg/48x48/apps/nedit.png
 share/icons/crystalsvg/48x48/apps/netscape.png
@@ -2418,8 +2626,10 @@ share/icons/crystalsvg/48x48/apps/password.png
 share/icons/crystalsvg/48x48/apps/penguin.png
 share/icons/crystalsvg/48x48/apps/personal.png
 share/icons/crystalsvg/48x48/apps/phppg.png
+share/icons/crystalsvg/48x48/apps/printmgr.png
 share/icons/crystalsvg/48x48/apps/proxy.png
 share/icons/crystalsvg/48x48/apps/pysol.png
+share/icons/crystalsvg/48x48/apps/randr.png
 share/icons/crystalsvg/48x48/apps/remote.png
 share/icons/crystalsvg/48x48/apps/samba.png
 share/icons/crystalsvg/48x48/apps/soffice.png
@@ -2440,35 +2650,51 @@ 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/acroread.png
 share/icons/crystalsvg/64x64/apps/applixware.png
+share/icons/crystalsvg/64x64/apps/arts.png
 share/icons/crystalsvg/64x64/apps/background.png
+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/date.png
 share/icons/crystalsvg/64x64/apps/email.png
+share/icons/crystalsvg/64x64/apps/energy_star.png
 share/icons/crystalsvg/64x64/apps/filetypes.png
+share/icons/crystalsvg/64x64/apps/fonts.png
 share/icons/crystalsvg/64x64/apps/gimp.png
 share/icons/crystalsvg/64x64/apps/gvim.png
 share/icons/crystalsvg/64x64/apps/help_index.png
 share/icons/crystalsvg/64x64/apps/hwinfo.png
+share/icons/crystalsvg/64x64/apps/icons.png
 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/kcmmemory.png
 share/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/icons/crystalsvg/64x64/apps/kcmpci.png
+share/icons/crystalsvg/64x64/apps/kcmx.png
 share/icons/crystalsvg/64x64/apps/kcontrol.png
+share/icons/crystalsvg/64x64/apps/kdeprintfax.png
 share/icons/crystalsvg/64x64/apps/kdmconfig.png
 share/icons/crystalsvg/64x64/apps/keditbookmarks.png
+share/icons/crystalsvg/64x64/apps/key_bindings.png
 share/icons/crystalsvg/64x64/apps/kfind.png
+share/icons/crystalsvg/64x64/apps/kfm.png
 share/icons/crystalsvg/64x64/apps/kfm_home.png
 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/knotify.png
 share/icons/crystalsvg/64x64/apps/konqueror.png
 share/icons/crystalsvg/64x64/apps/konsole.png
 share/icons/crystalsvg/64x64/apps/kscreensaver.png
+share/icons/crystalsvg/64x64/apps/ksplash.png
 share/icons/crystalsvg/64x64/apps/ksysguard.png
 share/icons/crystalsvg/64x64/apps/kthememgr.png
 share/icons/crystalsvg/64x64/apps/ktip.png
@@ -2476,6 +2702,7 @@ share/icons/crystalsvg/64x64/apps/kvirc.png
 share/icons/crystalsvg/64x64/apps/kwrite.png
 share/icons/crystalsvg/64x64/apps/licq.png
 share/icons/crystalsvg/64x64/apps/linuxconf.png
+share/icons/crystalsvg/64x64/apps/locale.png
 share/icons/crystalsvg/64x64/apps/looknfeel.png
 share/icons/crystalsvg/64x64/apps/mozilla.png
 share/icons/crystalsvg/64x64/apps/multimedia.png
@@ -2494,34 +2721,59 @@ share/icons/crystalsvg/64x64/apps/password.png
 share/icons/crystalsvg/64x64/apps/penguin.png
 share/icons/crystalsvg/64x64/apps/personal.png
 share/icons/crystalsvg/64x64/apps/phppg.png
+share/icons/crystalsvg/64x64/apps/printmgr.png
+share/icons/crystalsvg/64x64/apps/proxy.png
 share/icons/crystalsvg/64x64/apps/pysol.png
 share/icons/crystalsvg/64x64/apps/qtella.png
+share/icons/crystalsvg/64x64/apps/randr.png
+share/icons/crystalsvg/64x64/apps/samba.png
 share/icons/crystalsvg/64x64/apps/staroffice.png
+share/icons/crystalsvg/64x64/apps/style.png
+share/icons/crystalsvg/64x64/apps/stylesheet.png
 share/icons/crystalsvg/64x64/apps/terminal.png
 share/icons/crystalsvg/64x64/apps/tux.png
 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/locolor/16x16/apps/bell.png
+share/icons/crystalsvg/64x64/devices/print_printer.png
+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/bell.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
+share/locale/l10n/ad/entry.desktop
+share/locale/l10n/ad/flag.png
 share/locale/l10n/ae/entry.desktop
 share/locale/l10n/ae/flag.png
+share/locale/l10n/af/entry.desktop
+share/locale/l10n/af/flag.png
 share/locale/l10n/africa.desktop
 share/locale/l10n/ag/entry.desktop
 share/locale/l10n/ag/flag.png
+share/locale/l10n/ai/entry.desktop
+share/locale/l10n/ai/flag.png
+share/locale/l10n/al/entry.desktop
+share/locale/l10n/al/flag.png
+share/locale/l10n/am/entry.desktop
+share/locale/l10n/am/flag.png
+share/locale/l10n/an/entry.desktop
+share/locale/l10n/an/flag.png
+share/locale/l10n/ao/entry.desktop
+share/locale/l10n/ao/flag.png
 share/locale/l10n/ar/entry.desktop
 share/locale/l10n/ar/flag.png
+share/locale/l10n/as/entry.desktop
+share/locale/l10n/as/flag.png
 share/locale/l10n/asia.desktop
 share/locale/l10n/at/entry.desktop
 share/locale/l10n/at/flag.png
 share/locale/l10n/au/entry.desktop
 share/locale/l10n/au/flag.png
+share/locale/l10n/aw/entry.desktop
+share/locale/l10n/aw/flag.png
 share/locale/l10n/az/entry.desktop
 share/locale/l10n/az/flag.png
 share/locale/l10n/ba/entry.desktop
@@ -2532,24 +2784,57 @@ share/locale/l10n/bd/entry.desktop
 share/locale/l10n/bd/flag.png
 share/locale/l10n/be/entry.desktop
 share/locale/l10n/be/flag.png
+share/locale/l10n/bf/entry.desktop
+share/locale/l10n/bf/flag.png
 share/locale/l10n/bg/entry.desktop
 share/locale/l10n/bg/flag.png
 share/locale/l10n/bh/entry.desktop
 share/locale/l10n/bh/flag.png
+share/locale/l10n/bi/entry.desktop
+share/locale/l10n/bi/flag.png
+share/locale/l10n/bj/entry.desktop
+share/locale/l10n/bj/flag.png
+share/locale/l10n/bm/entry.desktop
+share/locale/l10n/bm/flag.png
+share/locale/l10n/bn/entry.desktop
+share/locale/l10n/bn/flag.png
 share/locale/l10n/bo/entry.desktop
 share/locale/l10n/bo/flag.png
 share/locale/l10n/br/entry.desktop
 share/locale/l10n/br/flag.png
+share/locale/l10n/bs/entry.desktop
+share/locale/l10n/bs/flag.png
+share/locale/l10n/bt/entry.desktop
+share/locale/l10n/bt/flag.png
+share/locale/l10n/bw/entry.desktop
+share/locale/l10n/bw/flag.png
 share/locale/l10n/by/entry.desktop
 share/locale/l10n/by/flag.png
+share/locale/l10n/bz/entry.desktop
+share/locale/l10n/bz/flag.png
 share/locale/l10n/ca/entry.desktop
 share/locale/l10n/ca/flag.png
+share/locale/l10n/caribbean.desktop
+share/locale/l10n/cc/entry.desktop
+share/locale/l10n/cc/flag.png
+share/locale/l10n/cd/entry.desktop
+share/locale/l10n/cd/flag.png
 share/locale/l10n/centralamerica.desktop
 share/locale/l10n/centraleurope.desktop
+share/locale/l10n/cf/entry.desktop
+share/locale/l10n/cf/flag.png
+share/locale/l10n/cg/entry.desktop
+share/locale/l10n/cg/flag.png
 share/locale/l10n/ch/entry.desktop
 share/locale/l10n/ch/flag.png
+share/locale/l10n/ci/entry.desktop
+share/locale/l10n/ci/flag.png
+share/locale/l10n/ck/entry.desktop
+share/locale/l10n/ck/flag.png
 share/locale/l10n/cl/entry.desktop
 share/locale/l10n/cl/flag.png
+share/locale/l10n/cm/entry.desktop
+share/locale/l10n/cm/flag.png
 share/locale/l10n/cn/entry.desktop
 share/locale/l10n/cn/flag.png
 share/locale/l10n/co/entry.desktop
@@ -2558,6 +2843,12 @@ share/locale/l10n/cr/entry.desktop
 share/locale/l10n/cr/flag.png
 share/locale/l10n/cu/entry.desktop
 share/locale/l10n/cu/flag.png
+share/locale/l10n/cv/entry.desktop
+share/locale/l10n/cv/flag.png
+share/locale/l10n/cx/entry.desktop
+share/locale/l10n/cx/flag.png
+share/locale/l10n/cy/entry.desktop
+share/locale/l10n/cy/flag.png
 share/locale/l10n/cz/entry.desktop
 share/locale/l10n/cz/flag.png
 share/locale/l10n/de/entry.desktop
@@ -2566,6 +2857,8 @@ share/locale/l10n/dj/entry.desktop
 share/locale/l10n/dj/flag.png
 share/locale/l10n/dk/entry.desktop
 share/locale/l10n/dk/flag.png
+share/locale/l10n/dm/entry.desktop
+share/locale/l10n/dm/flag.png
 share/locale/l10n/do/entry.desktop
 share/locale/l10n/do/flag.png
 share/locale/l10n/dz/entry.desktop
@@ -2577,26 +2870,64 @@ share/locale/l10n/ee/entry.desktop
 share/locale/l10n/ee/flag.png
 share/locale/l10n/eg/entry.desktop
 share/locale/l10n/eg/flag.png
+share/locale/l10n/eh/entry.desktop
+share/locale/l10n/eh/flag.png
+share/locale/l10n/er/entry.desktop
+share/locale/l10n/er/flag.png
 share/locale/l10n/es/entry.desktop
 share/locale/l10n/es/flag.png
+share/locale/l10n/et/entry.desktop
+share/locale/l10n/et/flag.png
 share/locale/l10n/fi/entry.desktop
 share/locale/l10n/fi/flag.png
+share/locale/l10n/fj/entry.desktop
+share/locale/l10n/fj/flag.png
+share/locale/l10n/fk/entry.desktop
+share/locale/l10n/fk/flag.png
+share/locale/l10n/fm/entry.desktop
+share/locale/l10n/fm/flag.png
+share/locale/l10n/fo/entry.desktop
+share/locale/l10n/fo/flag.png
 share/locale/l10n/fr/entry.desktop
 share/locale/l10n/fr/flag.png
+share/locale/l10n/ga/entry.desktop
+share/locale/l10n/ga/flag.png
 share/locale/l10n/gb/entry.desktop
 share/locale/l10n/gb/flag.png
 share/locale/l10n/gd/entry.desktop
 share/locale/l10n/gd/flag.png
+share/locale/l10n/ge/entry.desktop
+share/locale/l10n/ge/flag.png
 share/locale/l10n/gh/entry.desktop
 share/locale/l10n/gh/flag.png
+share/locale/l10n/gi/entry.desktop
+share/locale/l10n/gi/flag.png
+share/locale/l10n/gm/entry.desktop
+share/locale/l10n/gm/flag.png
+share/locale/l10n/gn/entry.desktop
+share/locale/l10n/gn/flag.png
+share/locale/l10n/gp/entry.desktop
+share/locale/l10n/gp/flag.png
+share/locale/l10n/gq/entry.desktop
+share/locale/l10n/gq/flag.png
 share/locale/l10n/gr/entry.desktop
 share/locale/l10n/gr/flag.png
 share/locale/l10n/gt/entry.desktop
 share/locale/l10n/gt/flag.png
+share/locale/l10n/gu/entry.desktop
+share/locale/l10n/gu/flag.png
+share/locale/l10n/gw/entry.desktop
+share/locale/l10n/gw/flag.png
+share/locale/l10n/gy/entry.desktop
+share/locale/l10n/gy/flag.png
+share/locale/l10n/hk/entry.desktop
+share/locale/l10n/hk/flag.png
 share/locale/l10n/hn/entry.desktop
 share/locale/l10n/hn/flag.png
 share/locale/l10n/hr/entry.desktop
 share/locale/l10n/hr/flag.png
+share/locale/l10n/ht/entry.desktop
+share/locale/l10n/ht/flag.png
 share/locale/l10n/hu/entry.desktop
 share/locale/l10n/hu/flag.png
 share/locale/l10n/id/entry.desktop
@@ -2621,6 +2952,16 @@ share/locale/l10n/jo/entry.desktop
 share/locale/l10n/jo/flag.png
 share/locale/l10n/jp/entry.desktop
 share/locale/l10n/jp/flag.png
+share/locale/l10n/ke/entry.desktop
+share/locale/l10n/ke/flag.png
+share/locale/l10n/kg/entry.desktop
+share/locale/l10n/kg/flag.png
+share/locale/l10n/kh/entry.desktop
+share/locale/l10n/kh/flag.png
+share/locale/l10n/ki/entry.desktop
+share/locale/l10n/ki/flag.png
+share/locale/l10n/km/entry.desktop
+share/locale/l10n/km/flag.png
 share/locale/l10n/kn/entry.desktop
 share/locale/l10n/kn/flag.png
 share/locale/l10n/kp/entry.desktop
@@ -2629,10 +2970,24 @@ share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
 share/locale/l10n/kw/entry.desktop
 share/locale/l10n/kw/flag.png
+share/locale/l10n/ky/entry.desktop
+share/locale/l10n/ky/flag.png
+share/locale/l10n/kz/entry.desktop
+share/locale/l10n/kz/flag.png
+share/locale/l10n/la/entry.desktop
+share/locale/l10n/la/flag.png
 share/locale/l10n/lb/entry.desktop
 share/locale/l10n/lb/flag.png
 share/locale/l10n/lc/entry.desktop
 share/locale/l10n/lc/flag.png
+share/locale/l10n/li/entry.desktop
+share/locale/l10n/li/flag.png
+share/locale/l10n/lk/entry.desktop
+share/locale/l10n/lk/flag.png
+share/locale/l10n/lr/entry.desktop
+share/locale/l10n/lr/flag.png
+share/locale/l10n/ls/entry.desktop
+share/locale/l10n/ls/flag.png
 share/locale/l10n/lt/entry.desktop
 share/locale/l10n/lt/flag.png
 share/locale/l10n/lu/entry.desktop
@@ -2643,12 +2998,54 @@ share/locale/l10n/ly/entry.desktop
 share/locale/l10n/ly/flag.png
 share/locale/l10n/ma/entry.desktop
 share/locale/l10n/ma/flag.png
+share/locale/l10n/mc/entry.desktop
+share/locale/l10n/mc/flag.png
+share/locale/l10n/md/entry.desktop
+share/locale/l10n/md/flag.png
+share/locale/l10n/mg/entry.desktop
+share/locale/l10n/mg/flag.png
+share/locale/l10n/mh/entry.desktop
+share/locale/l10n/mh/flag.png
 share/locale/l10n/mk/entry.desktop
 share/locale/l10n/mk/flag.png
+share/locale/l10n/ml/entry.desktop
+share/locale/l10n/ml/flag.png
+share/locale/l10n/mm/entry.desktop
+share/locale/l10n/mm/flag.png
+share/locale/l10n/mn/entry.desktop
+share/locale/l10n/mn/flag.png
+share/locale/l10n/mo/entry.desktop
+share/locale/l10n/mo/flag.png
+share/locale/l10n/mq/entry.desktop
+share/locale/l10n/mq/flag.png
+share/locale/l10n/mr/entry.desktop
+share/locale/l10n/mr/flag.png
+share/locale/l10n/ms/entry.desktop
+share/locale/l10n/ms/flag.png
 share/locale/l10n/mt/entry.desktop
 share/locale/l10n/mt/flag.png
+share/locale/l10n/mu/entry.desktop
+share/locale/l10n/mu/flag.png
+share/locale/l10n/mv/entry.desktop
+share/locale/l10n/mv/flag.png
+share/locale/l10n/mw/entry.desktop
+share/locale/l10n/mw/flag.png
 share/locale/l10n/mx/entry.desktop
 share/locale/l10n/mx/flag.png
+share/locale/l10n/my/entry.desktop
+share/locale/l10n/my/flag.png
+share/locale/l10n/mz/entry.desktop
+share/locale/l10n/mz/flag.png
+share/locale/l10n/na/entry.desktop
+share/locale/l10n/na/flag.png
+share/locale/l10n/nc/entry.desktop
+share/locale/l10n/nc/flag.png
+share/locale/l10n/ne/entry.desktop
+share/locale/l10n/ne/flag.png
+share/locale/l10n/nf/entry.desktop
+share/locale/l10n/nf/flag.png
+share/locale/l10n/ng/entry.desktop
+share/locale/l10n/ng/flag.png
 share/locale/l10n/ni/entry.desktop
 share/locale/l10n/ni/flag.png
 share/locale/l10n/nl/entry.desktop
@@ -2657,20 +3054,43 @@ share/locale/l10n/no/entry.desktop
 share/locale/l10n/no/flag.png
 share/locale/l10n/northamerica.desktop
 share/locale/l10n/northeurope.desktop
+share/locale/l10n/np/entry.desktop
+share/locale/l10n/np/flag.png
+share/locale/l10n/nr/entry.desktop
+share/locale/l10n/nr/flag.png
+share/locale/l10n/nu/entry.desktop
+share/locale/l10n/nu/flag.png
 share/locale/l10n/nz/entry.desktop
 share/locale/l10n/nz/flag.png
+share/locale/l10n/oceania.desktop
 share/locale/l10n/om/entry.desktop
 share/locale/l10n/om/flag.png
 share/locale/l10n/pa/entry.desktop
 share/locale/l10n/pa/flag.png
 share/locale/l10n/pe/entry.desktop
 share/locale/l10n/pe/flag.png
+share/locale/l10n/pf/entry.desktop
+share/locale/l10n/pf/flag.png
+share/locale/l10n/pg/entry.desktop
+share/locale/l10n/pg/flag.png
+share/locale/l10n/ph/entry.desktop
+share/locale/l10n/ph/flag.png
+share/locale/l10n/pk/entry.desktop
+share/locale/l10n/pk/flag.png
 share/locale/l10n/pl/entry.desktop
 share/locale/l10n/pl/flag.png
+share/locale/l10n/pm/entry.desktop
+share/locale/l10n/pm/flag.png
+share/locale/l10n/pn/entry.desktop
+share/locale/l10n/pn/flag.png
+share/locale/l10n/pr/entry.desktop
+share/locale/l10n/pr/flag.png
 share/locale/l10n/ps/entry.desktop
 share/locale/l10n/ps/flag.png
 share/locale/l10n/pt/entry.desktop
 share/locale/l10n/pt/flag.png
+share/locale/l10n/pw/entry.desktop
+share/locale/l10n/pw/flag.png
 share/locale/l10n/py/entry.desktop
 share/locale/l10n/py/flag.png
 share/locale/l10n/qa/entry.desktop
@@ -2679,60 +3099,124 @@ share/locale/l10n/ro/entry.desktop
 share/locale/l10n/ro/flag.png
 share/locale/l10n/ru/entry.desktop
 share/locale/l10n/ru/flag.png
+share/locale/l10n/rw/entry.desktop
+share/locale/l10n/rw/flag.png
 share/locale/l10n/sa/entry.desktop
 share/locale/l10n/sa/flag.png
+share/locale/l10n/sb/entry.desktop
+share/locale/l10n/sb/flag.png
+share/locale/l10n/sc/entry.desktop
+share/locale/l10n/sc/flag.png
 share/locale/l10n/sd/entry.desktop
 share/locale/l10n/sd/flag.png
 share/locale/l10n/se/entry.desktop
 share/locale/l10n/se/flag.png
+share/locale/l10n/sg/entry.desktop
+share/locale/l10n/sg/flag.png
+share/locale/l10n/sh/entry.desktop
+share/locale/l10n/sh/flag.png
 share/locale/l10n/si/entry.desktop
 share/locale/l10n/si/flag.png
 share/locale/l10n/sk/entry.desktop
 share/locale/l10n/sk/flag.png
+share/locale/l10n/sm/entry.desktop
+share/locale/l10n/sm/flag.png
+share/locale/l10n/sn/entry.desktop
+share/locale/l10n/sn/flag.png
 share/locale/l10n/so/entry.desktop
 share/locale/l10n/so/flag.png
 share/locale/l10n/southamerica.desktop
 share/locale/l10n/southeurope.desktop
 share/locale/l10n/sr/entry.desktop
 share/locale/l10n/sr/flag.png
+share/locale/l10n/st/entry.desktop
+share/locale/l10n/st/flag.png
 share/locale/l10n/sv/entry.desktop
 share/locale/l10n/sv/flag.png
 share/locale/l10n/sy/entry.desktop
 share/locale/l10n/sy/flag.png
+share/locale/l10n/sz/entry.desktop
+share/locale/l10n/sz/flag.png
+share/locale/l10n/tc/entry.desktop
+share/locale/l10n/tc/flag.png
+share/locale/l10n/td/entry.desktop
+share/locale/l10n/td/flag.png
+share/locale/l10n/tg/entry.desktop
+share/locale/l10n/tg/flag.png
 share/locale/l10n/th/entry.desktop
 share/locale/l10n/th/flag.png
+share/locale/l10n/tj/entry.desktop
+share/locale/l10n/tj/flag.png
+share/locale/l10n/tk/entry.desktop
+share/locale/l10n/tk/flag.png
+share/locale/l10n/tm/entry.desktop
+share/locale/l10n/tm/flag.png
 share/locale/l10n/tn/entry.desktop
 share/locale/l10n/tn/flag.png
+share/locale/l10n/to/entry.desktop
+share/locale/l10n/to/flag.png
+share/locale/l10n/tp/entry.desktop
+share/locale/l10n/tp/flag.png
 share/locale/l10n/tr/entry.desktop
 share/locale/l10n/tr/flag.png
 share/locale/l10n/tt/entry.desktop
 share/locale/l10n/tt/flag.png
+share/locale/l10n/tv/entry.desktop
+share/locale/l10n/tv/flag.png
 share/locale/l10n/tw/entry.desktop
 share/locale/l10n/tw/flag.png
+share/locale/l10n/tz/entry.desktop
+share/locale/l10n/tz/flag.png
 share/locale/l10n/ua/entry.desktop
 share/locale/l10n/ua/flag.png
+share/locale/l10n/ug/entry.desktop
+share/locale/l10n/ug/flag.png
 share/locale/l10n/us/entry.desktop
 share/locale/l10n/us/flag.png
 share/locale/l10n/uy/entry.desktop
 share/locale/l10n/uy/flag.png
+share/locale/l10n/uz/entry.desktop
+share/locale/l10n/uz/flag.png
+share/locale/l10n/va/entry.desktop
+share/locale/l10n/va/flag.png
 share/locale/l10n/vc/entry.desktop
 share/locale/l10n/vc/flag.png
 share/locale/l10n/ve/entry.desktop
 share/locale/l10n/ve/flag.png
+share/locale/l10n/vg/entry.desktop
+share/locale/l10n/vg/flag.png
+share/locale/l10n/vi/entry.desktop
+share/locale/l10n/vi/flag.png
 share/locale/l10n/vn/entry.desktop
 share/locale/l10n/vn/flag.png
+share/locale/l10n/vu/entry.desktop
+share/locale/l10n/vu/flag.png
 share/locale/l10n/westeurope.desktop
+share/locale/l10n/wf/entry.desktop
+share/locale/l10n/wf/flag.png
+share/locale/l10n/ws/entry.desktop
+share/locale/l10n/ws/flag.png
 share/locale/l10n/ye/entry.desktop
 share/locale/l10n/ye/flag.png
+share/locale/l10n/yu/entry.desktop
+share/locale/l10n/yu/flag.png
 share/locale/l10n/za/entry.desktop
 share/locale/l10n/za/flag.png
+share/locale/l10n/zm/entry.desktop
+share/locale/l10n/zm/flag.png
+share/locale/l10n/zw/entry.desktop
+share/locale/l10n/zw/flag.png
 share/mimelnk/application/x-konsole.desktop
 share/mimelnk/application/x-ksysguard.desktop
-share/mimelnk/application/x-ktheme.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
@@ -2746,18 +3230,24 @@ share/mimelnk/kdedevice/smb_unmounted.desktop
 share/mimelnk/kdedevice/zip_mounted.desktop
 share/mimelnk/kdedevice/zip_unmounted.desktop
 share/mimelnk/print/class.desktop
+share/mimelnk/print/driver.desktop
 share/mimelnk/print/folder.desktop
 share/mimelnk/print/jobs.desktop
 share/mimelnk/print/manager.desktop
 share/mimelnk/print/printer.desktop
+share/mimelnk/print/printermodel.desktop
 share/services/about.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/finger.protocol
 share/services/fish.protocol
 share/services/floppy.protocol
+share/services/fonts.protocol
 share/services/fontthumbnail.desktop
 share/services/gsthumbnail.desktop
 share/services/gzip.protocol
@@ -2766,13 +3256,15 @@ share/services/imagethumbnail.desktop
 share/services/imap4.protocol
 share/services/imaps.protocol
 share/services/info.protocol
-share/services/ldap.protocol
 share/services/kaccess.desktop
+share/services/katedefaultproject.desktop
 share/services/kded/favicons.desktop
+share/services/kded/konqy_preloader.desktop
 share/services/kded/mountwatcher.desktop
 share/services/kdeprint_part.desktop
 share/services/kfile_font.desktop
 share/services/kfindpart.desktop
+share/services/kfontviewpart.desktop
 share/services/khelpcenter.desktop
 share/services/kmanpart.desktop
 share/services/konq_aboutpage.desktop
@@ -2787,10 +3279,15 @@ share/services/konqueror_config.desktop
 share/services/konsole-script.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
+share/services/ksplash.desktop
+share/services/ksplashdefault.desktop
+share/services/ksplashredmond.desktop
+share/services/ksplashstandard.desktop
 share/services/kuriikwsfilter.desktop
 share/services/kurisearchfilter.desktop
 share/services/kwrited.desktop
 share/services/kxkb.desktop
+share/services/ldap.protocol
 share/services/localdomainurifilter.desktop
 share/services/mac.protocol
 share/services/man.protocol
@@ -2800,7 +3297,11 @@ share/services/picturethumbnail.desktop
 share/services/pop3.protocol
 share/services/pop3s.protocol
 share/services/print.protocol
+share/services/printdb.protocol
+share/services/programs.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/appsy.desktop
@@ -2808,45 +3309,70 @@ share/services/searchproviders/austronaut.desktop
 share/services/searchproviders/bugft.desktop
 share/services/searchproviders/bugno.desktop
 share/services/searchproviders/call.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/de2en.desktop
 share/services/searchproviders/dmoz.desktop
 share/services/searchproviders/docbook.desktop
+share/services/searchproviders/doi.desktop
+share/services/searchproviders/en2de.desktop
+share/services/searchproviders/en2es.desktop
+share/services/searchproviders/en2fr.desktop
+share/services/searchproviders/en2it.desktop
+share/services/searchproviders/es2en.desktop
 share/services/searchproviders/excite.desktop
+share/services/searchproviders/feedster.desktop
 share/services/searchproviders/foldoc.desktop
+share/services/searchproviders/fr2en.desktop
 share/services/searchproviders/freshmeat.desktop
+share/services/searchproviders/froogle.desktop
 share/services/searchproviders/google.desktop
 share/services/searchproviders/google_advanced.desktop
 share/services/searchproviders/google_groups.desktop
 share/services/searchproviders/google_images.desktop
 share/services/searchproviders/google_lucky.desktop
+share/services/searchproviders/google_news.desktop
 share/services/searchproviders/hotbot.desktop
+share/services/searchproviders/hyperdictionary.desktop
+share/services/searchproviders/hyperdictionary_thesaurus.desktop
+share/services/searchproviders/imdb.desktop
+share/services/searchproviders/it2en.desktop
 share/services/searchproviders/jeeves.desktop
+share/services/searchproviders/kde.desktop
+share/services/searchproviders/kde_webcvs.desktop
 share/services/searchproviders/leo.desktop
 share/services/searchproviders/lycos.desktop
 share/services/searchproviders/mamma.desktop
 share/services/searchproviders/metacrawler.desktop
 share/services/searchproviders/msdn.desktop
+share/services/searchproviders/netcraft.desktop
+share/services/searchproviders/nl-telephone.desktop
 share/services/searchproviders/nl-teletekst.desktop
 share/services/searchproviders/pgpkeys.desktop
 share/services/searchproviders/php.desktop
 share/services/searchproviders/python.desktop
+share/services/searchproviders/qt.desktop
+share/services/searchproviders/rae.desktop
 share/services/searchproviders/rfc.desktop
 share/services/searchproviders/rpmfind.desktop
 share/services/searchproviders/ruby_application_archive.desktop
 share/services/searchproviders/seek.desktop
 share/services/searchproviders/sourceforge.desktop
-share/services/searchproviders/tel_at.desktop
 share/services/searchproviders/thesaurus.desktop
 share/services/searchproviders/vivisimo.desktop
 share/services/searchproviders/voila.desktop
 share/services/searchproviders/webster.desktop
 share/services/searchproviders/whatis.desktop
+share/services/searchproviders/wikipedia.desktop
+share/services/searchproviders/wordref.desktop
+share/services/settings.protocol
 share/services/sftp.protocol
 share/services/smb.protocol
 share/services/smtp.protocol
 share/services/smtps.protocol
+share/services/system.protocol
 share/services/tar.protocol
 share/services/textthumbnail.desktop
 share/services/thumbnail.protocol
@@ -2859,20 +3385,25 @@ share/services/useragentstrings/ie55onwin98.desktop
 share/services/useragentstrings/ie55onwinnt5.desktop
 share/services/useragentstrings/ie60onwinnt51.desktop
 share/services/useragentstrings/lynxoncurrent.desktop
-share/services/useragentstrings/mozm18oncurrent.desktop
-share/services/useragentstrings/mozm18onwinnt4.desktop
+share/services/useragentstrings/mozoncurrent.desktop
+share/services/useragentstrings/mozonwin2000.desktop
+share/services/useragentstrings/mozonwinnt4.desktop
 share/services/useragentstrings/nn301oncurrent.desktop
 share/services/useragentstrings/nn475oncurrent.desktop
 share/services/useragentstrings/nn475onwin95.desktop
 share/services/useragentstrings/nn476onppc.desktop
 share/services/useragentstrings/op403onwinnt4.desktop
+share/services/useragentstrings/safari.desktop
 share/services/useragentstrings/w3moncurrent.desktop
 share/services/useragentstrings/wgetoncurrent.desktop
 share/services/zip.protocol
 share/servicetypes/findpart.desktop
+share/servicetypes/kateinitplugin.desktop
 share/servicetypes/kateplugin.desktop
+share/servicetypes/kateprojectplugin.desktop
 share/servicetypes/konqaboutpage.desktop
 share/servicetypes/konqpopupmenuplugin.desktop
+share/servicetypes/ksplashplugins.desktop
 share/servicetypes/searchprovider.desktop
 share/servicetypes/terminalemulator.desktop
 share/servicetypes/thumbcreator.desktop
@@ -2919,26 +3450,39 @@ share/sounds/KDE_Window_Sticky.wav
 share/sounds/KDE_Window_UnMaximize.wav
 share/sounds/KDE_Window_UnSticky.wav
 share/sounds/pop.wav
+share/templates/.source/CAMERA-Device.desktop
 share/templates/.source/CDROM-Device.desktop
+share/templates/.source/CDWRITER-Device.desktop
+share/templates/.source/DVDROM-Device.desktop
 share/templates/.source/Floppy.desktop
 share/templates/.source/HD.desktop
 share/templates/.source/HTMLFile.html
+share/templates/.source/MO-Device.desktop
+share/templates/.source/NFS.desktop
 share/templates/.source/Program.desktop
 share/templates/.source/TextFile.txt
 share/templates/.source/URL.desktop
+share/templates/.source/ZIP-Device.desktop
 share/templates/Directory.desktop
 share/templates/HTMLFile.desktop
 share/templates/TextFile.desktop
+share/templates/linkCAMERA.desktop
 share/templates/linkCDROM.desktop
+share/templates/linkCDWRITER.desktop
+share/templates/linkDVDROM.desktop
 share/templates/linkFloppy.desktop
 share/templates/linkHD.desktop
+share/templates/linkMO.desktop
+share/templates/linkNFS.desktop
 share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
+share/templates/linkZIP.desktop
 share/wallpapers/All-Good-People-1.jpg
 share/wallpapers/Blkmarble.jpg
 share/wallpapers/Chicken-Songs-2.jpg
 share/wallpapers/Circuit.jpg
 share/wallpapers/Foggy1.jpg
+share/wallpapers/Island-of-Elba.jpg
 share/wallpapers/Marble01.jpg
 share/wallpapers/No-Ones-Laughing-3.jpg
 share/wallpapers/Paper01.jpg
@@ -2946,13 +3490,19 @@ share/wallpapers/Planning-And-Probing-1.jpg
 share/wallpapers/Time-For-Lunch-2.jpg
 share/wallpapers/Totally-New-Product-1.jpg
 share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/blue-bend.jpg
 share/wallpapers/default_blue.jpg
 share/wallpapers/default_gears.jpg
+share/wallpapers/fulmine.jpg
 share/wallpapers/kde_box.png
 share/wallpapers/kde_passion.jpg
-share/wallpapers/kdm_bg.jpg
 share/wallpapers/only_k.jpg
+share/wallpapers/seaofconero.jpg
 share/wallpapers/triplegears.jpg
+@exec /bin/mkdir -p %D/share/applnk/Settings/Information
+@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/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/libkonq/html
-@exec /bin/mkdir -p %D/share/fonts/override
 @exec /bin/mkdir -p %D/share/templates/.source/emptydir
diff --git a/x11/kdebase4-workspace/files/plist.base.rm b/x11/kdebase4-workspace/files/plist.base.rm
index 83d6890a62f7..9dce67c3924d 100644
--- a/x11/kdebase4-workspace/files/plist.base.rm
+++ b/x11/kdebase4-workspace/files/plist.base.rm
@@ -1,6 +1,10 @@
 @unexec /bin/rmdir %D/share/templates/.source/emptydir || true
-@unexec /bin/rmdir %D/share/fonts/override || true
 @unexec /bin/rmdir %D/share/doc/HTML/en/kdebase-apidocs/libkonq/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdebase-apidocs/kwin/lib/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdebase-apidocs/kwin/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdebase-apidocs/kioslave/imap4/html || true
+@unexec /bin/rmdir %D/share/doc/HTML/en/kdebase-apidocs/kate/html || true
+@unexec /bin/rmdir %D/share/applnk/Settings/Information || true
 @dirrm share/wallpapers
 @dirrm share/templates/.source
 @dirrm share/templates
@@ -12,58 +16,133 @@
 @dirrm share/services
 @dirrm share/mimelnk/print
 @dirrm share/mimelnk/kdedevice
+@dirrm share/mimelnk/fonts
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
+@dirrm share/locale/l10n/zw
+@dirrm share/locale/l10n/zm
 @dirrm share/locale/l10n/za
+@dirrm share/locale/l10n/yu
 @dirrm share/locale/l10n/ye
+@dirrm share/locale/l10n/ws
+@dirrm share/locale/l10n/wf
+@dirrm share/locale/l10n/vu
 @dirrm share/locale/l10n/vn
+@dirrm share/locale/l10n/vi
+@dirrm share/locale/l10n/vg
 @dirrm share/locale/l10n/ve
 @dirrm share/locale/l10n/vc
+@dirrm share/locale/l10n/va
+@dirrm share/locale/l10n/uz
 @dirrm share/locale/l10n/uy
 @dirrm share/locale/l10n/us
+@dirrm share/locale/l10n/ug
 @dirrm share/locale/l10n/ua
+@dirrm share/locale/l10n/tz
 @dirrm share/locale/l10n/tw
+@dirrm share/locale/l10n/tv
 @dirrm share/locale/l10n/tt
 @dirrm share/locale/l10n/tr
+@dirrm share/locale/l10n/tp
+@dirrm share/locale/l10n/to
 @dirrm share/locale/l10n/tn
+@dirrm share/locale/l10n/tm
+@dirrm share/locale/l10n/tk
+@dirrm share/locale/l10n/tj
 @dirrm share/locale/l10n/th
+@dirrm share/locale/l10n/tg
+@dirrm share/locale/l10n/td
+@dirrm share/locale/l10n/tc
+@dirrm share/locale/l10n/sz
 @dirrm share/locale/l10n/sy
 @dirrm share/locale/l10n/sv
+@dirrm share/locale/l10n/st
 @dirrm share/locale/l10n/sr
 @dirrm share/locale/l10n/so
+@dirrm share/locale/l10n/sn
+@dirrm share/locale/l10n/sm
 @dirrm share/locale/l10n/sk
 @dirrm share/locale/l10n/si
+@dirrm share/locale/l10n/sh
+@dirrm share/locale/l10n/sg
 @dirrm share/locale/l10n/se
 @dirrm share/locale/l10n/sd
+@dirrm share/locale/l10n/sc
+@dirrm share/locale/l10n/sb
 @dirrm share/locale/l10n/sa
+@dirrm share/locale/l10n/rw
 @dirrm share/locale/l10n/ru
 @dirrm share/locale/l10n/ro
 @dirrm share/locale/l10n/qa
 @dirrm share/locale/l10n/py
+@dirrm share/locale/l10n/pw
 @dirrm share/locale/l10n/pt
 @dirrm share/locale/l10n/ps
+@dirrm share/locale/l10n/pr
+@dirrm share/locale/l10n/pn
+@dirrm share/locale/l10n/pm
 @dirrm share/locale/l10n/pl
+@dirrm share/locale/l10n/pk
+@dirrm share/locale/l10n/ph
+@dirrm share/locale/l10n/pg
+@dirrm share/locale/l10n/pf
 @dirrm share/locale/l10n/pe
 @dirrm share/locale/l10n/pa
 @dirrm share/locale/l10n/om
 @dirrm share/locale/l10n/nz
+@dirrm share/locale/l10n/nu
+@dirrm share/locale/l10n/nr
+@dirrm share/locale/l10n/np
 @dirrm share/locale/l10n/no
 @dirrm share/locale/l10n/nl
 @dirrm share/locale/l10n/ni
+@dirrm share/locale/l10n/ng
+@dirrm share/locale/l10n/nf
+@dirrm share/locale/l10n/ne
+@dirrm share/locale/l10n/nc
+@dirrm share/locale/l10n/na
+@dirrm share/locale/l10n/mz
+@dirrm share/locale/l10n/my
 @dirrm share/locale/l10n/mx
+@dirrm share/locale/l10n/mw
+@dirrm share/locale/l10n/mv
+@dirrm share/locale/l10n/mu
 @dirrm share/locale/l10n/mt
+@dirrm share/locale/l10n/ms
+@dirrm share/locale/l10n/mr
+@dirrm share/locale/l10n/mq
+@dirrm share/locale/l10n/mo
+@dirrm share/locale/l10n/mn
+@dirrm share/locale/l10n/mm
+@dirrm share/locale/l10n/ml
 @dirrm share/locale/l10n/mk
+@dirrm share/locale/l10n/mh
+@dirrm share/locale/l10n/mg
+@dirrm share/locale/l10n/md
+@dirrm share/locale/l10n/mc
 @dirrm share/locale/l10n/ma
 @dirrm share/locale/l10n/ly
 @dirrm share/locale/l10n/lv
 @dirrm share/locale/l10n/lu
 @dirrm share/locale/l10n/lt
+@dirrm share/locale/l10n/ls
+@dirrm share/locale/l10n/lr
+@dirrm share/locale/l10n/lk
+@dirrm share/locale/l10n/li
 @dirrm share/locale/l10n/lc
 @dirrm share/locale/l10n/lb
+@dirrm share/locale/l10n/la
+@dirrm share/locale/l10n/kz
+@dirrm share/locale/l10n/ky
 @dirrm share/locale/l10n/kw
 @dirrm share/locale/l10n/kr
 @dirrm share/locale/l10n/kp
 @dirrm share/locale/l10n/kn
+@dirrm share/locale/l10n/km
+@dirrm share/locale/l10n/ki
+@dirrm share/locale/l10n/kh
+@dirrm share/locale/l10n/kg
+@dirrm share/locale/l10n/ke
 @dirrm share/locale/l10n/jp
 @dirrm share/locale/l10n/jo
 @dirrm share/locale/l10n/jm
@@ -76,47 +155,95 @@
 @dirrm share/locale/l10n/ie
 @dirrm share/locale/l10n/id
 @dirrm share/locale/l10n/hu
+@dirrm share/locale/l10n/ht
 @dirrm share/locale/l10n/hr
 @dirrm share/locale/l10n/hn
+@dirrm share/locale/l10n/hk
+@dirrm share/locale/l10n/gy
+@dirrm share/locale/l10n/gw
+@dirrm share/locale/l10n/gu
 @dirrm share/locale/l10n/gt
 @dirrm share/locale/l10n/gr
+@dirrm share/locale/l10n/gq
+@dirrm share/locale/l10n/gp
+@dirrm share/locale/l10n/gn
+@dirrm share/locale/l10n/gm
+@dirrm share/locale/l10n/gi
 @dirrm share/locale/l10n/gh
+@dirrm share/locale/l10n/ge
 @dirrm share/locale/l10n/gd
 @dirrm share/locale/l10n/gb
+@dirrm share/locale/l10n/ga
 @dirrm share/locale/l10n/fr
+@dirrm share/locale/l10n/fo
+@dirrm share/locale/l10n/fm
+@dirrm share/locale/l10n/fk
+@dirrm share/locale/l10n/fj
 @dirrm share/locale/l10n/fi
+@dirrm share/locale/l10n/et
 @dirrm share/locale/l10n/es
+@dirrm share/locale/l10n/er
+@dirrm share/locale/l10n/eh
 @dirrm share/locale/l10n/eg
 @dirrm share/locale/l10n/ee
 @dirrm share/locale/l10n/ec
 @dirrm share/locale/l10n/dz
 @dirrm share/locale/l10n/do
+@dirrm share/locale/l10n/dm
 @dirrm share/locale/l10n/dk
 @dirrm share/locale/l10n/dj
 @dirrm share/locale/l10n/de
 @dirrm share/locale/l10n/cz
+@dirrm share/locale/l10n/cy
+@dirrm share/locale/l10n/cx
+@dirrm share/locale/l10n/cv
 @dirrm share/locale/l10n/cu
 @dirrm share/locale/l10n/cr
 @dirrm share/locale/l10n/co
 @dirrm share/locale/l10n/cn
+@dirrm share/locale/l10n/cm
 @dirrm share/locale/l10n/cl
+@dirrm share/locale/l10n/ck
+@dirrm share/locale/l10n/ci
 @dirrm share/locale/l10n/ch
+@dirrm share/locale/l10n/cg
+@dirrm share/locale/l10n/cf
+@dirrm share/locale/l10n/cd
+@dirrm share/locale/l10n/cc
 @dirrm share/locale/l10n/ca
+@dirrm share/locale/l10n/bz
 @dirrm share/locale/l10n/by
+@dirrm share/locale/l10n/bw
+@dirrm share/locale/l10n/bt
+@dirrm share/locale/l10n/bs
 @dirrm share/locale/l10n/br
 @dirrm share/locale/l10n/bo
+@dirrm share/locale/l10n/bn
+@dirrm share/locale/l10n/bm
+@dirrm share/locale/l10n/bj
+@dirrm share/locale/l10n/bi
 @dirrm share/locale/l10n/bh
 @dirrm share/locale/l10n/bg
+@dirrm share/locale/l10n/bf
 @dirrm share/locale/l10n/be
 @dirrm share/locale/l10n/bd
 @dirrm share/locale/l10n/bb
 @dirrm share/locale/l10n/ba
 @dirrm share/locale/l10n/az
+@dirrm share/locale/l10n/aw
 @dirrm share/locale/l10n/au
 @dirrm share/locale/l10n/at
+@dirrm share/locale/l10n/as
 @dirrm share/locale/l10n/ar
+@dirrm share/locale/l10n/ao
+@dirrm share/locale/l10n/an
+@dirrm share/locale/l10n/am
+@dirrm share/locale/l10n/al
+@dirrm share/locale/l10n/ai
 @dirrm share/locale/l10n/ag
+@dirrm share/locale/l10n/af
 @dirrm share/locale/l10n/ae
+@dirrm share/locale/l10n/ad
 @dirrm share/locale/l10n/C
 @dirrm share/locale/l10n
 @dirrm share/locale/en_US
@@ -126,33 +253,39 @@
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons/crystalsvg/64x64/devices
 @dirrm share/icons/crystalsvg/64x64/apps
 @dirrm share/icons/crystalsvg/64x64
-@dirrm share/icons/crystalsvg/48x48/apps/mozilla
-@dirrm share/icons/crystalsvg/48x48/apps/gnome
+@dirrm share/icons/crystalsvg/48x48/filesystems
+@dirrm share/icons/crystalsvg/48x48/devices
 @dirrm share/icons/crystalsvg/48x48/apps
 @dirrm share/icons/crystalsvg/48x48
 @dirrm share/icons/crystalsvg/32x32/filesystems
 @dirrm share/icons/crystalsvg/32x32/devices
-@dirrm share/icons/crystalsvg/32x32/apps/mozilla
-@dirrm share/icons/crystalsvg/32x32/apps/gnome
 @dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/32x32
 @dirrm share/icons/crystalsvg/22x22/apps
 @dirrm share/icons/crystalsvg/22x22
 @dirrm share/icons/crystalsvg/16x16/filesystems
 @dirrm share/icons/crystalsvg/16x16/devices
-@dirrm share/icons/crystalsvg/16x16/apps/mozilla
-@dirrm share/icons/crystalsvg/16x16/apps/gnome
 @dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/icons/crystalsvg/16x16
 @dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/icons/crystalsvg/128x128
 @dirrm share/icons/crystalsvg
 @dirrm share/icons
+@dirrm share/fonts/override
 @dirrm share/fonts
+@dirrm share/doc/kdm
+@dirrm share/doc/HTML/en/kxkb
 @dirrm share/doc/HTML/en/kwrite
 @dirrm share/doc/HTML/en/ksysguard
+@dirrm share/doc/HTML/en/ksplashml
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
 @dirrm share/doc/HTML/en/konqueror
@@ -189,6 +322,11 @@
 @dirrm share/doc/HTML/en/kdeprint
 @dirrm share/doc/HTML/en/kdebugdialog
 @dirrm share/doc/HTML/en/kdebase-apidocs/libkonq
+@dirrm share/doc/HTML/en/kdebase-apidocs/kwin/lib
+@dirrm share/doc/HTML/en/kdebase-apidocs/kwin
+@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
 @dirrm share/doc/HTML/en/kdebase-apidocs
 @dirrm share/doc/HTML/en/kcontrol/windowmanagement
 @dirrm share/doc/HTML/en/kcontrol/useragent
@@ -197,12 +335,12 @@
 @dirrm share/doc/HTML/en/kcontrol/screensaver
 @dirrm share/doc/HTML/en/kcontrol/proxy
 @dirrm share/doc/HTML/en/kcontrol/passwords
+@dirrm share/doc/HTML/en/kcontrol/panelappearance
 @dirrm share/doc/HTML/en/kcontrol/panel
 @dirrm share/doc/HTML/en/kcontrol/netpref
 @dirrm share/doc/HTML/en/kcontrol/mouse
 @dirrm share/doc/HTML/en/kcontrol/language
 @dirrm share/doc/HTML/en/kcontrol/kwindecoration
-@dirrm share/doc/HTML/en/kcontrol/kthememgr
 @dirrm share/doc/HTML/en/kcontrol/khtml
 @dirrm share/doc/HTML/en/kcontrol/keys
 @dirrm share/doc/HTML/en/kcontrol/keyboard
@@ -224,6 +362,7 @@
 @dirrm share/doc/HTML/en/kcontrol/energy
 @dirrm share/doc/HTML/en/kcontrol/email
 @dirrm share/doc/HTML/en/kcontrol/ebrowsing
+@dirrm share/doc/HTML/en/kcontrol/desktopbehavior
 @dirrm share/doc/HTML/en/kcontrol/desktop
 @dirrm share/doc/HTML/en/kcontrol/crypto
 @dirrm share/doc/HTML/en/kcontrol/cookies
@@ -237,6 +376,7 @@
 @dirrm share/doc/HTML/en/kate
 @dirrm share/doc/HTML/en
 @dirrm share/doc/HTML
+@dirrm share/desktop-directories
 @dirrm share/config/kdm
 @dirrm share/config
 @dirrm share/autostart
@@ -244,20 +384,30 @@
 @dirrm share/apps/naughtyapplet
 @dirrm share/apps/kwrite
 @dirrm share/apps/kwin/pics
-@dirrm share/apps/kwin/icewm-themes
 @dirrm share/apps/kwin
-@dirrm share/apps/kthememgr/Themes
-@dirrm share/apps/kthememgr
 @dirrm share/apps/ksysguard/pics
 @dirrm share/apps/ksysguard
-@dirrm share/apps/ksplash/pics/locolor
 @dirrm share/apps/ksplash/pics
+@dirrm share/apps/ksplash/Themes/blue-bend
+@dirrm share/apps/ksplash/Themes/Standard
+@dirrm share/apps/ksplash/Themes/Redmond
+@dirrm share/apps/ksplash/Themes/Default/locolor
+@dirrm share/apps/ksplash/Themes/Default
+@dirrm share/apps/ksplash/Themes
 @dirrm share/apps/ksplash
 @dirrm share/apps/ksmserver/pics
 @dirrm share/apps/ksmserver
 @dirrm share/apps/kpersonalizer/pics
 @dirrm share/apps/kpersonalizer
 @dirrm share/apps/konsole/profiles
+@dirrm share/apps/konsole/icons/crystalsvg/32x32/actions
+@dirrm share/apps/konsole/icons/crystalsvg/32x32
+@dirrm share/apps/konsole/icons/crystalsvg/22x22/actions
+@dirrm share/apps/konsole/icons/crystalsvg/22x22
+@dirrm share/apps/konsole/icons/crystalsvg/16x16/actions
+@dirrm share/apps/konsole/icons/crystalsvg/16x16
+@dirrm share/apps/konsole/icons/crystalsvg
+@dirrm share/apps/konsole/icons
 @dirrm share/apps/konsole
 @dirrm share/apps/konqueror/tiles
 @dirrm share/apps/konqueror/servicemenus
@@ -267,13 +417,17 @@
 @dirrm share/apps/konqueror/icons/crystalsvg/16x16
 @dirrm share/apps/konqueror/icons/crystalsvg
 @dirrm share/apps/konqueror/icons
+@dirrm share/apps/konqueror/dirtree/remote
+@dirrm share/apps/konqueror/dirtree
 @dirrm share/apps/konqueror/about
 @dirrm share/apps/konqueror
+@dirrm share/apps/konqsidebartng/websidebar
 @dirrm share/apps/konqsidebartng/virtual_folders/services
 @dirrm share/apps/konqsidebartng/virtual_folders/remote/web
 @dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
 @dirrm share/apps/konqsidebartng/virtual_folders/remote
 @dirrm share/apps/konqsidebartng/virtual_folders
+@dirrm share/apps/konqsidebartng/kicker_entries
 @dirrm share/apps/konqsidebartng/entries
 @dirrm share/apps/konqsidebartng/dirtree
 @dirrm share/apps/konqsidebartng/add
@@ -299,6 +453,7 @@
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
+@dirrm share/apps/kicker/menuext/find
 @dirrm share/apps/kicker/menuext
 @dirrm share/apps/kicker/icons/locolor/16x16/actions
 @dirrm share/apps/kicker/icons/locolor/16x16
@@ -310,7 +465,9 @@
 @dirrm share/apps/kicker/extensions
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
+@dirrm share/apps/khotkeys
 @dirrm share/apps/khelpcenter/plugins/Tutorials
+@dirrm share/apps/khelpcenter/plugins/Scrollkeeper
 @dirrm share/apps/khelpcenter/plugins/Manpages
 @dirrm share/apps/khelpcenter/plugins/Applications
 @dirrm share/apps/khelpcenter/plugins
@@ -321,6 +478,7 @@
 @dirrm share/apps/kfindpart/icons
 @dirrm share/apps/kfindpart
 @dirrm share/apps/keditbookmarks
+@dirrm share/apps/kdm/sessions
 @dirrm share/apps/kdm/pics/users
 @dirrm share/apps/kdm/pics
 @dirrm share/apps/kdm
@@ -351,14 +509,12 @@
 @dirrm share/apps/kcmkeys
 @dirrm share/apps/kcminput/pics
 @dirrm share/apps/kcminput
-@dirrm share/apps/kcmfontinst/pics
-@dirrm share/apps/kcmfontinst/StarOffice
-@dirrm share/apps/kcmfontinst
 @dirrm share/apps/kcmcss
 @dirrm share/apps/kcm_componentchooser
 @dirrm share/apps/kbookmark
 @dirrm share/apps/kate/scripts
-@dirrm share/apps/kate/pics
+@dirrm share/apps/kate/plugins/katedefaultproject
+@dirrm share/apps/kate/plugins
 @dirrm share/apps/kate/icons/locolor/22x22/actions
 @dirrm share/apps/kate/icons/locolor/22x22
 @dirrm share/apps/kate/icons/locolor/16x16/actions
@@ -366,8 +522,6 @@
 @dirrm share/apps/kate/icons/locolor
 @dirrm share/apps/kate/icons/crystalsvg/32x32/actions
 @dirrm share/apps/kate/icons/crystalsvg/32x32
-@dirrm share/apps/kate/icons/crystalsvg/22x22/actions
-@dirrm share/apps/kate/icons/crystalsvg/22x22
 @dirrm share/apps/kate/icons/crystalsvg/16x16/actions
 @dirrm share/apps/kate/icons/crystalsvg/16x16
 @dirrm share/apps/kate/icons/crystalsvg
@@ -401,54 +555,27 @@
 @dirrm share/apps/clockapplet/pics
 @dirrm share/apps/clockapplet
 @dirrm share/apps
-@dirrm share/applnk/Utilities/XUtilities
-@dirrm share/applnk/Utilities/More
 @dirrm share/applnk/Utilities
 @dirrm share/applnk/Toys
-@dirrm share/applnk/System/Terminal
 @dirrm share/applnk/System/ScreenSavers
-@dirrm share/applnk/System/More
 @dirrm share/applnk/System
 @dirrm share/applnk/Settingsmenu
 @dirrm share/applnk/Settings/WebBrowsing
-@dirrm share/applnk/Settings/System
-@dirrm share/applnk/Settings/Sound
-@dirrm share/applnk/Settings/Security
-@dirrm share/applnk/Settings/PowerControl
-@dirrm share/applnk/Settings/Personalization
-@dirrm share/applnk/Settings/Peripherals
-@dirrm share/applnk/Settings/Network/WebBrowsing
-@dirrm share/applnk/Settings/Network
-@dirrm share/applnk/Settings/LookNFeel/Windows
 @dirrm share/applnk/Settings/LookNFeel/Themes
 @dirrm share/applnk/Settings/LookNFeel
-@dirrm share/applnk/Settings/Information
-@dirrm share/applnk/Settings/Desktop
-@dirrm share/applnk/Settings/Components
-@dirrm share/applnk/Settings/Accessibility
 @dirrm share/applnk/Settings
-@dirrm share/applnk/Office
-@dirrm share/applnk/Multimedia/More
-@dirrm share/applnk/Multimedia
-@dirrm share/applnk/Internet/Terminal
-@dirrm share/applnk/Internet/More
 @dirrm share/applnk/Internet
-@dirrm share/applnk/Graphics/More
-@dirrm share/applnk/Graphics
-@dirrm share/applnk/Games/TacticStrategy
-@dirrm share/applnk/Games/Roguelikes
-@dirrm share/applnk/Games/Kidsgames
-@dirrm share/applnk/Games/Card
-@dirrm share/applnk/Games/Board
-@dirrm share/applnk/Games/Arcade
-@dirrm share/applnk/Games
-@dirrm share/applnk/Edutainment
-@dirrm share/applnk/Editors
-@dirrm share/applnk/Development
-@dirrm share/applnk/Applications
 @dirrm share/applnk/.hidden
 @dirrm share/applnk
+@dirrm share/applications/kde
+@dirrm share/applications
 @dirrm lib/kde3
+@dirrm lib/kconf_update_bin
 @dirrm include/kwin
+@dirrm include/ksplash
 @dirrm include/ksgrd
+@dirrm include/kate/utils
 @dirrm include/kate
+@dirrm etc/xdg/menus/applications-merged
+@dirrm etc/xdg/menus
+@dirrm etc/xdg
diff --git a/x11/kdebase4-workspace/files/plist.motif b/x11/kdebase4-workspace/files/plist.motif
index ede17101761e..df4e14f294a2 100644
--- a/x11/kdebase4-workspace/files/plist.motif
+++ b/x11/kdebase4-workspace/files/plist.motif
@@ -1,5 +1,7 @@
 bin/nspluginscan
 bin/nspluginviewer
-lib/libnsplugin.la
-lib/libnsplugin.so
-lib/libnsplugin.so.1
+lib/kde3/kcm_nsplugins.la
+lib/kde3/kcm_nsplugins.so
+lib/kde3/libnsplugin.la
+lib/kde3/libnsplugin.so
+share/applications/kde/khtml_plugins.desktop