Update to 20000829A snapshot. Disable kdenetwork2 for the time being so

I can address some of its issues (should see it marked un-broken in about
3 hours, if they're trivial enough).  It took too long to get this update
out the door... :-(

This is a rather stable version of KDE2.  Release is hoped for sometime
next month, so I'm going to try to reroll snapshots this weekend.

Also decide policy by removing the interactive requirement in qt22's
configure script.  I don't know why they bothered adding it there..

Bugged by:	*many* bug-reports, requests, etc.

3 files changed, 304 insertions, 319 deletions

diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 9658bb835c33..3fbd30c494dc 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	kdebase
-PORTVERSION= 	20000724A
+PORTVERSION= 	20000829A
 CATEGORIES=	x11 kde
-MASTER_SITES=	$(MASTER_SITE_LOCAL)
-MASTER_SITE_SUBDIR=	will
+MASTER_SITES=	http://www.physics.purdue.edu/~will/
 
 MAINTAINER=	will@FreeBSD.org
 
@@ -17,7 +16,6 @@ LIB_DEPENDS=	qt2.4:${PORTSDIR}/x11-toolkits/qt22 \
 		kdeui.4:${PORTSDIR}/x11/kdelibs2 \
 		intl.1:${PORTSDIR}/devel/gettext
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
 SOMAJOR=	4
 SOMINOR=	0
 MOC?=		${X11BASE}/bin/moc2
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 740d30dd169f..094815fd3937 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1 +1 @@
-MD5 (kdebase-20000724A.tar.bz2) = 957b13b43eb31b5262db0c338112a58d
+MD5 (kdebase-20000829A.tar.bz2) = 694c8bd21212a8ef0af1caeb13f3fd16
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 335914a61506..c63b81caa6cb 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -5,7 +5,6 @@ bin/drkonqi
 bin/kaccess
 bin/kappfinder
 bin/kbanner.kss
-bin/kbat.kss
 bin/kblankscrn.kss
 bin/kblob.kss
 bin/kbouboule.kss
@@ -19,7 +18,6 @@ bin/kdebugdialog
 bin/kdesktop
 bin/kdesu
 bin/kdesud
-bin/kdewizard
 bin/kdm
 bin/kdmdesktop
 bin/keditfiletype
@@ -80,19 +78,19 @@ include/kbookmarkmenu.h
 include/kfileivi.h
 include/knewmenu.h
 include/konq_bgnddlg.h
+include/konq_defaults.h
+include/konq_dirlister.h
 include/konq_dirpart.h
+include/konq_drag.h
 include/konq_events.h
+include/konq_fileitem.h
+include/konq_iconviewwidget.h
+include/konq_imagepreviewjob.h
+include/konq_operations.h
+include/konq_popupmenu.h
 include/konq_propsview.h
+include/konq_settings.h
 include/konq_undo.h
-include/konqdefaults.h
-include/konqdirlister.h
-include/konqdrag.h
-include/konqfileitem.h
-include/konqiconviewwidget.h
-include/konqimagepreviewjob.h
-include/konqoperations.h
-include/konqpopupmenu.h
-include/konqsettings.h
 lib/appletproxy.la
 lib/appletproxy.so
 lib/kcminit.la
@@ -170,8 +168,6 @@ lib/libkcm_clock.la
 lib/libkcm_clock.so
 lib/libkcm_colors.la
 lib/libkcm_colors.so
-lib/libkcm_drkonqi.la
-lib/libkcm_drkonqi.so
 lib/libkcm_email.la
 lib/libkcm_email.so
 lib/libkcm_energy.la
@@ -184,6 +180,8 @@ lib/libkcm_htmlsearch.la
 lib/libkcm_htmlsearch.so
 lib/libkcm_icons.la
 lib/libkcm_icons.so
+lib/libkcm_iconthemes.la
+lib/libkcm_iconthemes.so
 lib/libkcm_info.la
 lib/libkcm_info.so
 lib/libkcm_input.la
@@ -216,8 +214,6 @@ lib/libkcm_layout.la
 lib/libkcm_layout.so
 lib/libkcm_locale.la
 lib/libkcm_locale.so
-lib/libkcm_numberandnames.la
-lib/libkcm_numberandnames.so
 lib/libkcm_passwords.la
 lib/libkcm_passwords.so
 lib/libkcm_samba.la
@@ -226,6 +222,10 @@ lib/libkcm_screensaver.la
 lib/libkcm_screensaver.so
 lib/libkcm_style.la
 lib/libkcm_style.so
+lib/libkcm_taskbar.la
+lib/libkcm_taskbar.so
+lib/libkcm_virtualdesktops.la
+lib/libkcm_virtualdesktops.so
 lib/libkhelpcenter.la
 lib/libkhelpcenter.so.4
 lib/libkminipagerapplet.la
@@ -250,6 +250,8 @@ lib/libktaskbarapplet.la
 lib/libktaskbarapplet.so.1
 lib/libkuriikwsfilter.la
 lib/libkuriikwsfilter.so.1
+lib/libkurisearchfilter.la
+lib/libkurisearchfilter.so.1
 lib/libkwinb2.la
 lib/libkwinb2.so
 lib/libkwindefault.la
@@ -268,11 +270,14 @@ lib/libkwinsystem.la
 lib/libkwinsystem.so
 lib/libkwritepart.la
 lib/libkwritepart.so
+lib/libquicklauncher.la
+lib/libquicklauncher.so.1
 lib/libsmb++.la
 lib/libsmb++.so.0
 share/applnk/.directory
 share/applnk/.hidden/konqfilemgr.desktop
 share/applnk/Applications/.directory
+share/applnk/Development/designer.desktop
 share/applnk/Editors/gvim.desktop
 share/applnk/Editors/kwrite.desktop
 share/applnk/Games/.directory
@@ -285,24 +290,13 @@ share/applnk/Internet/konqbrowser.desktop
 share/applnk/Internet/netscape.desktop
 share/applnk/KControl.desktop
 share/applnk/Multimedia/.directory
+share/applnk/Office/.directory
 share/applnk/Settings/.directory
-share/applnk/Settings/Applications/.directory
-share/applnk/Settings/Applications/drkonqi.desktop
-share/applnk/Settings/Applications/kdm.desktop
-share/applnk/Settings/Browsing/.directory
-share/applnk/Settings/Browsing/Files/.directory
-share/applnk/Settings/Browsing/Files/filetypes.desktop
-share/applnk/Settings/Browsing/Files/kcmkonq.desktop
-share/applnk/Settings/Browsing/Help/.directory
-share/applnk/Settings/Browsing/Help/htmlsearch.desktop
-share/applnk/Settings/Browsing/Neighborhood/.directory
-share/applnk/Settings/Browsing/Neighborhood/smb.desktop
-share/applnk/Settings/Browsing/Web/.directory
-share/applnk/Settings/Browsing/Web/cookies.desktop
-share/applnk/Settings/Browsing/Web/ebrowsing.desktop
-share/applnk/Settings/Browsing/Web/konqhtml.desktop
-share/applnk/Settings/Browsing/Web/proxy.desktop
-share/applnk/Settings/Browsing/Web/useragent.desktop
+share/applnk/Settings/FileBrowsing/.directory
+share/applnk/Settings/FileBrowsing/filetypes.desktop
+share/applnk/Settings/FileBrowsing/kcmkonq.desktop
+share/applnk/Settings/Help/.directory
+share/applnk/Settings/Help/htmlsearch.desktop
 share/applnk/Settings/Information/.directory
 share/applnk/Settings/Information/devices.desktop
 share/applnk/Settings/Information/dma.desktop
@@ -321,9 +315,10 @@ share/applnk/Settings/LookNFeel/Desktop/.directory
 share/applnk/Settings/LookNFeel/Desktop/background.desktop
 share/applnk/Settings/LookNFeel/Desktop/borders.desktop
 share/applnk/Settings/LookNFeel/Desktop/desktop.desktop
-share/applnk/Settings/LookNFeel/Desktop/numberandnames.desktop
+share/applnk/Settings/LookNFeel/Desktop/virtualdesktops.desktop
 share/applnk/Settings/LookNFeel/Panel/.directory
 share/applnk/Settings/LookNFeel/Themes/.directory
+share/applnk/Settings/LookNFeel/Themes/iconthemes.desktop
 share/applnk/Settings/LookNFeel/Themes/style.desktop
 share/applnk/Settings/LookNFeel/Windows/.directory
 share/applnk/Settings/LookNFeel/Windows/actions.desktop
@@ -332,16 +327,19 @@ share/applnk/Settings/LookNFeel/colors.desktop
 share/applnk/Settings/LookNFeel/fonts.desktop
 share/applnk/Settings/LookNFeel/icons.desktop
 share/applnk/Settings/LookNFeel/kcmnotify.desktop
+share/applnk/Settings/LookNFeel/kcmtaskbar.desktop
 share/applnk/Settings/LookNFeel/keys.desktop
 share/applnk/Settings/LookNFeel/panel.desktop
 share/applnk/Settings/LookNFeel/screensaver.desktop
+share/applnk/Settings/Network/.directory
+share/applnk/Settings/Network/smb.desktop
 share/applnk/Settings/Peripherals/.directory
-share/applnk/Settings/Peripherals/kcmlayout.desktop
 share/applnk/Settings/Peripherals/keyboard.desktop
 share/applnk/Settings/Peripherals/mouse.desktop
 share/applnk/Settings/Personalization/.directory
 share/applnk/Settings/Personalization/email.desktop
 share/applnk/Settings/Personalization/kcmaccess.desktop
+share/applnk/Settings/Personalization/kcmlayout.desktop
 share/applnk/Settings/Personalization/language.desktop
 share/applnk/Settings/Personalization/passwords.desktop
 share/applnk/Settings/PowerControl/.directory
@@ -349,19 +347,50 @@ share/applnk/Settings/PowerControl/energy.desktop
 share/applnk/Settings/Sound/.directory
 share/applnk/Settings/Sound/arts.desktop
 share/applnk/Settings/Sound/bell.desktop
+share/applnk/Settings/System/.directory
 share/applnk/Settings/System/clock.desktop
+share/applnk/Settings/System/kdm.desktop
+share/applnk/Settings/WebBrowsing/.directory
+share/applnk/Settings/WebBrowsing/cookies.desktop
+share/applnk/Settings/WebBrowsing/ebrowsing.desktop
+share/applnk/Settings/WebBrowsing/konqhtml.desktop
+share/applnk/Settings/WebBrowsing/proxy.desktop
+share/applnk/Settings/WebBrowsing/useragent.desktop
 share/applnk/System/.directory
 share/applnk/System/Arrange.desktop
 share/applnk/System/ScreenSavers/.directory
 share/applnk/System/ScreenSavers/Ant.desktop
+share/applnk/System/ScreenSavers/Atlantis.desktop
+share/applnk/System/ScreenSavers/Attraction.desktop
 share/applnk/System/ScreenSavers/Bouboule.desktop
+share/applnk/System/ScreenSavers/Braid.desktop
+share/applnk/System/ScreenSavers/Bubble3d.desktop
 share/applnk/System/ScreenSavers/Bubbles.desktop
+share/applnk/System/ScreenSavers/Cage.desktop
+share/applnk/System/ScreenSavers/Compass.desktop
+share/applnk/System/ScreenSavers/Coral.desktop
+share/applnk/System/ScreenSavers/Crystal.desktop
+share/applnk/System/ScreenSavers/Cynosure.desktop
 share/applnk/System/ScreenSavers/Demon.desktop
 share/applnk/System/ScreenSavers/Drift.desktop
+share/applnk/System/ScreenSavers/Fadeplot.desktop
+share/applnk/System/ScreenSavers/Flag.desktop
+share/applnk/System/ScreenSavers/Flame.desktop
+share/applnk/System/ScreenSavers/Flow.desktop
+share/applnk/System/ScreenSavers/Forest.desktop
+share/applnk/System/ScreenSavers/GLPlanet.desktop
+share/applnk/System/ScreenSavers/Galaxy.desktop
+share/applnk/System/ScreenSavers/Gears.desktop
+share/applnk/System/ScreenSavers/Goop.desktop
+share/applnk/System/ScreenSavers/Grav.desktop
+share/applnk/System/ScreenSavers/Hopalong.desktop
+share/applnk/System/ScreenSavers/Hypercube.desktop
+share/applnk/System/ScreenSavers/Ifs.desktop
 share/applnk/System/ScreenSavers/Imsmap.desktop
+share/applnk/System/ScreenSavers/Interference.desktop
+share/applnk/System/ScreenSavers/Julia.desktop
 share/applnk/System/ScreenSavers/KAttration.desktop
 share/applnk/System/ScreenSavers/KBanner.desktop
-share/applnk/System/ScreenSavers/KBat.desktop
 share/applnk/System/ScreenSavers/KBlankscreen.desktop
 share/applnk/System/ScreenSavers/KBlob.desktop
 share/applnk/System/ScreenSavers/KBouboule.desktop
@@ -387,9 +416,34 @@ share/applnk/System/ScreenSavers/KSlip.desktop
 share/applnk/System/ScreenSavers/KSpace.desktop
 share/applnk/System/ScreenSavers/KSwarm.desktop
 share/applnk/System/ScreenSavers/KVm.desktop
+share/applnk/System/ScreenSavers/Kaleidescope.desktop
 share/applnk/System/ScreenSavers/Kumppa.desktop
+share/applnk/System/ScreenSavers/LMorph.desktop
+share/applnk/System/ScreenSavers/Lament.desktop
+share/applnk/System/ScreenSavers/Laser.desktop
+share/applnk/System/ScreenSavers/Lightning.desktop
+share/applnk/System/ScreenSavers/Lissie.desktop
+share/applnk/System/ScreenSavers/Moenius.desktop
+share/applnk/System/ScreenSavers/Penrose.desktop
+share/applnk/System/ScreenSavers/Phosphor.desktop
+share/applnk/System/ScreenSavers/Pulsar.desktop
+share/applnk/System/ScreenSavers/Rubik.desktop
 share/applnk/System/ScreenSavers/Slip.desktop
+share/applnk/System/ScreenSavers/Sonar.desktop
+share/applnk/System/ScreenSavers/Sproingies.desktop
+share/applnk/System/ScreenSavers/Stairs.desktop
+share/applnk/System/ScreenSavers/Starfish.desktop
+share/applnk/System/ScreenSavers/Strange.desktop
+share/applnk/System/ScreenSavers/Superquadrics.desktop
+share/applnk/System/ScreenSavers/Swirl.desktop
+share/applnk/System/ScreenSavers/T3d.desktop
+share/applnk/System/ScreenSavers/Triangle.desktop
+share/applnk/System/ScreenSavers/Vines.desktop
 share/applnk/System/ScreenSavers/Worm.desktop
+share/applnk/System/ScreenSavers/XFlame.desktop
+share/applnk/System/ScreenSavers/XJack.desktop
+share/applnk/System/ScreenSavers/XMatrix.desktop
+share/applnk/System/ScreenSavers/XPipes.desktop
 share/applnk/System/kappfinder.desktop
 share/applnk/System/kfmclient.desktop
 share/applnk/System/klegacyimport.desktop
@@ -399,7 +453,6 @@ share/applnk/System/konsole.desktop
 share/applnk/System/konsolesu.desktop
 share/applnk/System/ksysguard.desktop
 share/applnk/Utilities/.directory
-share/applnk/Utilities/kdewizard.desktop
 share/applnk/Utilities/klipper.desktop
 share/applnk/Utilities/kpager.desktop
 share/applnk/Utilities/ktip.desktop
@@ -417,6 +470,7 @@ share/apps/drkonqi/presets/enduserrc
 share/apps/kappfinder/apps/.directory
 share/apps/kappfinder/apps/Development/.directory
 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/Editors/.directory
 share/apps/kappfinder/apps/Editors/emacs.desktop
@@ -436,6 +490,7 @@ share/apps/kappfinder/apps/Internet/coolmail.desktop
 share/apps/kappfinder/apps/Internet/netscape.desktop
 share/apps/kappfinder/apps/Internet/pine.desktop
 share/apps/kappfinder/apps/Internet/xbiff.desktop
+share/apps/kappfinder/apps/Internet/xchat.desktop
 share/apps/kappfinder/apps/Internet/xfmail.desktop
 share/apps/kappfinder/apps/Internet/xftp.desktop
 share/apps/kappfinder/apps/Multimedia/.directory
@@ -530,7 +585,7 @@ share/apps/kappfinder/apps/WordProcessing/gv.desktop
 share/apps/kappfinder/apps/WordProcessing/lyx.desktop
 share/apps/kappfinder/apps/WordProcessing/xdvi.desktop
 share/apps/kappfinder/apps/WordProcessing/xpdf.desktop
-share/apps/kbookmark/directory.bookmarkbar
+share/apps/kbookmark/directory_bookmarkbar.desktop
 share/apps/kcminput/cursor_large.pcf.gz
 share/apps/kcmlocale/pics/background.png
 share/apps/kcontrol/kcontrolui.rc
@@ -569,9 +624,8 @@ share/apps/kdesktop/pics/splash.png
 share/apps/kdesktop/pics/splash2.png
 share/apps/kdesktop/programs/xearth.desktop
 share/apps/kdesktop/programs/xglobe.desktop
-share/apps/kdewizard/pics/kdelogo.png
-share/apps/kdewizard/pics/wizard.png
 share/apps/kdewizard/pics/wizard_small.png
+share/apps/kdewizard/tips
 share/apps/kdisplay/app-defaults/AAAAAAGeneral.ad
 share/apps/kdisplay/app-defaults/AAAMotif.ad
 share/apps/kdisplay/app-defaults/AAATk.ad
@@ -627,7 +681,7 @@ share/apps/kicker/applets/kminipagerapplet.desktop
 share/apps/kicker/applets/krunapplet.desktop
 share/apps/kicker/applets/ksystemtrayapplet.desktop
 share/apps/kicker/applets/ktaskbarapplet.desktop
-share/apps/kicker/default/personal_directory
+share/apps/kicker/applets/quicklauncher.desktop
 share/apps/kicker/pics/disk1.png
 share/apps/kicker/pics/disk2.png
 share/apps/kicker/pics/disk3.png
@@ -668,6 +722,9 @@ share/apps/kicker/tiles/solid_red_tiny_down.png
 share/apps/kicker/tiles/solid_red_tiny_up.png
 share/apps/kio_info/kde-info2html
 share/apps/kio_info/kde-info2html.conf
+share/apps/kmenuedit/icons/hicolor/22x22/actions/menu_new.png
+share/apps/kmenuedit/icons/hicolor/32x32/actions/menu_new.png
+share/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png
 share/apps/kmenuedit/kmenueditui.rc
 share/apps/konqiconview/konq_iconview.rc
 share/apps/konqiconview/konq_multicolumnview.rc
@@ -721,45 +778,63 @@ share/apps/konsole/vt100.keytab
 share/apps/konsole/vt420pc.keytab
 share/apps/kscreensaver/kscience-small.gif
 share/apps/kscreensaver/kscience.gif
+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/ksysguard/ProcessTable.sgrd
 share/apps/ksysguard/SystemLoad.sgrd
+share/apps/ksysguard/icons/locolor/16x16/apps/X.png
+share/apps/ksysguard/icons/locolor/16x16/apps/artsd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/automount.png
+share/apps/ksysguard/icons/locolor/16x16/apps/bash.png
+share/apps/ksysguard/icons/locolor/16x16/apps/c++.png
+share/apps/ksysguard/icons/locolor/16x16/apps/cc.png
+share/apps/ksysguard/icons/locolor/16x16/apps/computer.png
+share/apps/ksysguard/icons/locolor/16x16/apps/console.png
+share/apps/ksysguard/icons/locolor/16x16/apps/csh.png
+share/apps/ksysguard/icons/locolor/16x16/apps/emacs.png
+share/apps/ksysguard/icons/locolor/16x16/apps/g++.png
+share/apps/ksysguard/icons/locolor/16x16/apps/gcc.png
+share/apps/ksysguard/icons/locolor/16x16/apps/gdb.png
+share/apps/ksysguard/icons/locolor/16x16/apps/httpd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/in.identd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/inetd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/init.png
+share/apps/ksysguard/icons/locolor/16x16/apps/kcookiejar.png
+share/apps/ksysguard/icons/locolor/16x16/apps/kdesktop.png
+share/apps/ksysguard/icons/locolor/16x16/apps/kflushd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/kicker.png
+share/apps/ksysguard/icons/locolor/16x16/apps/kio_file.png
+share/apps/ksysguard/icons/locolor/16x16/apps/klauncher.png
+share/apps/ksysguard/icons/locolor/16x16/apps/ksh.png
+share/apps/ksysguard/icons/locolor/16x16/apps/kswapd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/ksysguardd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/kupdate.png
+share/apps/ksysguard/icons/locolor/16x16/apps/login.png
+share/apps/ksysguard/icons/locolor/16x16/apps/lpd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/mingetty.png
+share/apps/ksysguard/icons/locolor/16x16/apps/mutt.png
+share/apps/ksysguard/icons/locolor/16x16/apps/nscd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/pine.png
+share/apps/ksysguard/icons/locolor/16x16/apps/portmap.png
+share/apps/ksysguard/icons/locolor/16x16/apps/sendmail.png
+share/apps/ksysguard/icons/locolor/16x16/apps/sh.png
+share/apps/ksysguard/icons/locolor/16x16/apps/ssh.png
+share/apps/ksysguard/icons/locolor/16x16/apps/startkde.png
+share/apps/ksysguard/icons/locolor/16x16/apps/startx.png
+share/apps/ksysguard/icons/locolor/16x16/apps/syslogd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/tcsh.png
+share/apps/ksysguard/icons/locolor/16x16/apps/unknown.png
+share/apps/ksysguard/icons/locolor/16x16/apps/xemacs.png
+share/apps/ksysguard/icons/locolor/16x16/apps/xinit.png
+share/apps/ksysguard/icons/locolor/16x16/apps/xntpd.png
+share/apps/ksysguard/icons/locolor/16x16/apps/xterm.png
+share/apps/ksysguard/icons/locolor/16x16/apps/ypbind.png
 share/apps/ksysguard/ksysguard.rc
-share/apps/ktop/pics/X.png
-share/apps/ktop/pics/bash.png
-share/apps/ktop/pics/bsh.png
-share/apps/ktop/pics/c++.png
-share/apps/ktop/pics/cc.png
-share/apps/ktop/pics/console.png
-share/apps/ktop/pics/csh.png
-share/apps/ktop/pics/emacs.png
-share/apps/ktop/pics/g++.png
-share/apps/ktop/pics/gbd.png
-share/apps/ktop/pics/gcc.png
-share/apps/ktop/pics/gdb.png
-share/apps/ktop/pics/init.png
-share/apps/ktop/pics/kaudioserver.png
-share/apps/ktop/pics/kbgndwm.png
-share/apps/ktop/pics/kioslave.png
-share/apps/ktop/pics/kpanel.png
-share/apps/ktop/pics/krootwm.png
-share/apps/ktop/pics/ksh.png
-share/apps/ktop/pics/login.png
-share/apps/ktop/pics/lpd.png
-share/apps/ktop/pics/maudio.png
-share/apps/ktop/pics/nxterm.png
-share/apps/ktop/pics/sh.png
-share/apps/ktop/pics/startkde.png
-share/apps/ktop/pics/startx.png
-share/apps/ktop/pics/tcsh.png
-share/apps/ktop/pics/xconsole.png
-share/apps/ktop/pics/xemacs.png
-share/apps/ktop/pics/xinit.png
-share/apps/ktop/pics/xload.png
-share/apps/ktop/pics/xterm.png
-share/apps/ktop/pics/xxgbd.png
-share/apps/ktop/pics/xxgdb.png
 share/apps/kwin/b2.desktop
 share/apps/kwin/eventsrc
+share/apps/kwin/kde.desktop
 share/apps/kwin/kde1.desktop
 share/apps/kwin/kstep.desktop
 share/apps/kwin/laptop.desktop
@@ -806,9 +881,10 @@ share/config/gravrc
 share/config/halorc
 share/config/imsmaprc
 share/config/interferencerc
-share/config/kdewizardrc
 share/config/kdmrc
 share/config/klipperrc
+share/config/konsolerc
+share/config/kshorturifilterrc
 share/config/kumpparc
 share/config/kuriikwsfilterrc
 share/config/laserrc
@@ -817,10 +893,10 @@ share/config/penroserc
 share/config/rocksrc
 share/config/sliprc
 share/doc/HTML/en/kcontrol/.anchors
-share/doc/HTML/en/kcontrol/action.html
 share/doc/HTML/en/kcontrol/advanced.html
 share/doc/HTML/en/kcontrol/application.html
 share/doc/HTML/en/kcontrol/background.html
+share/doc/HTML/en/kcontrol/batmon.html
 share/doc/HTML/en/kcontrol/blockdev.html
 share/doc/HTML/en/kcontrol/borders.html
 share/doc/HTML/en/kcontrol/browsing-files.html
@@ -860,8 +936,10 @@ share/doc/HTML/en/kcontrol/kbd.html
 share/doc/HTML/en/kcontrol/kcmaction.docbook
 share/doc/HTML/en/kcontrol/kcmadv.docbook
 share/doc/HTML/en/kcontrol/kcmbackgnd.docbook
+share/doc/HTML/en/kcontrol/kcmbatmon.docbook
 share/doc/HTML/en/kcontrol/kcmbell.cvlog
 share/doc/HTML/en/kcontrol/kcmbell.docbook
+share/doc/HTML/en/kcontrol/kcmbell.html
 share/doc/HTML/en/kcontrol/kcmblockdev.docbook
 share/doc/HTML/en/kcontrol/kcmborders.docbook
 share/doc/HTML/en/kcontrol/kcmcolor.docbook
@@ -938,6 +1016,7 @@ share/doc/HTML/en/kcontrol/konq-browsing.html
 share/doc/HTML/en/kcontrol/konqui.html
 share/doc/HTML/en/kcontrol/kthememgr.cvlog
 share/doc/HTML/en/kcontrol/kthememgr.docbook
+share/doc/HTML/en/kcontrol/kthememgr.html
 share/doc/HTML/en/kcontrol/laptop.html
 share/doc/HTML/en/kcontrol/lf-desktop.html
 share/doc/HTML/en/kcontrol/lf-panel.html
@@ -950,6 +1029,7 @@ share/doc/HTML/en/kcontrol/lowbatcrit.html
 share/doc/HTML/en/kcontrol/lowbatwarn.html
 share/doc/HTML/en/kcontrol/memory.html
 share/doc/HTML/en/kcontrol/module.html
+share/doc/HTML/en/kcontrol/modules.html
 share/doc/HTML/en/kcontrol/mouse-behav.html
 share/doc/HTML/en/kcontrol/mouse.html
 share/doc/HTML/en/kcontrol/network.html
@@ -998,28 +1078,20 @@ share/doc/HTML/en/kdesu/introduction.html
 share/doc/HTML/en/kdesu/password-checking.html
 share/doc/HTML/en/kdesu/secpasswordkeeping.html
 share/doc/HTML/en/kdesu/usingkdesu.html
-share/doc/HTML/en/kdewizard/desktop.html
-share/doc/HTML/en/kdewizard/intro.html
-share/doc/HTML/en/kdewizard/tips
 share/doc/HTML/en/kdm/.anchors
-share/doc/HTML/en/kdm/command-line-options.html
+share/doc/HTML/en/kdm/building-and-installing-kdm.html
+share/doc/HTML/en/kdm/configuring-kdm.html
+share/doc/HTML/en/kdm/configuring-your-system-for-kdm.html
 share/doc/HTML/en/kdm/credits.html
-share/doc/HTML/en/kdm/edit.html
-share/doc/HTML/en/kdm/go.html
-share/doc/HTML/en/kdm/help.html
+share/doc/HTML/en/kdm/different-window-managers-with-kdm.html
 share/doc/HTML/en/kdm/index.cvlog
 share/doc/HTML/en/kdm/index.docbook
 share/doc/HTML/en/kdm/index.html
 share/doc/HTML/en/kdm/introduction.html
-share/doc/HTML/en/kdm/keybindings.html
-share/doc/HTML/en/kdm/on-screen-fundamentals.html
-share/doc/HTML/en/kdm/pref-dialog.html
-share/doc/HTML/en/kdm/prefcolors.html
-share/doc/HTML/en/kdm/prefmisc.html
-share/doc/HTML/en/kdm/prefspellchecker.html
-share/doc/HTML/en/kdm/settings.html
-share/doc/HTML/en/kdm/the-menu-entries.html
-share/doc/HTML/en/kdm/tools.html
+share/doc/HTML/en/kdm/kdmdesktop.html
+share/doc/HTML/en/kdm/lilo.html
+share/doc/HTML/en/kdm/locale.html
+share/doc/HTML/en/kdm/other-information.html
 share/doc/HTML/en/khelpcenter/.anchors
 share/doc/HTML/en/khelpcenter/contact-developers.html
 share/doc/HTML/en/khelpcenter/contact-more-information.html
@@ -1027,163 +1099,9 @@ share/doc/HTML/en/khelpcenter/contact-official.html
 share/doc/HTML/en/khelpcenter/contact-the-kde-team.html
 share/doc/HTML/en/khelpcenter/contact.docbook
 share/doc/HTML/en/khelpcenter/faq/.anchors
-share/doc/HTML/en/khelpcenter/faq/aboutthisfaq.html
-share/doc/HTML/en/khelpcenter/faq/acronyms.html
-share/doc/HTML/en/khelpcenter/faq/aix.html
-share/doc/HTML/en/khelpcenter/faq/background.html
-share/doc/HTML/en/khelpcenter/faq/backspaceinkde.html
-share/doc/HTML/en/khelpcenter/faq/basepackages.html
-share/doc/HTML/en/khelpcenter/faq/bugreport.html
-share/doc/HTML/en/khelpcenter/faq/bzip2.html
-share/doc/HTML/en/khelpcenter/faq/cannotconnect.html
-share/doc/HTML/en/khelpcenter/faq/changemenus.html
-share/doc/HTML/en/khelpcenter/faq/changemimetypes.html
-share/doc/HTML/en/khelpcenter/faq/checknewmail.html
-share/doc/HTML/en/khelpcenter/faq/colordepth.html
-share/doc/HTML/en/khelpcenter/faq/comercial.html
-share/doc/HTML/en/khelpcenter/faq/compiling.html
-share/doc/HTML/en/khelpcenter/faq/configuringkde.html
-share/doc/HTML/en/khelpcenter/faq/contributing.html
-share/doc/HTML/en/khelpcenter/faq/copypaste.html
-share/doc/HTML/en/khelpcenter/faq/createicons.html
-share/doc/HTML/en/khelpcenter/faq/currentversion.html
-share/doc/HTML/en/khelpcenter/faq/cvs.html
-share/doc/HTML/en/khelpcenter/faq/cvsaccess.html
-share/doc/HTML/en/khelpcenter/faq/cvsmirrors.html
-share/doc/HTML/en/khelpcenter/faq/cvsreadonly.html
-share/doc/HTML/en/khelpcenter/faq/debian.html
-share/doc/HTML/en/khelpcenter/faq/defaultdir.html
-share/doc/HTML/en/khelpcenter/faq/deletefiles.html
-share/doc/HTML/en/khelpcenter/faq/desktopiconmenus.html
-share/doc/HTML/en/khelpcenter/faq/devellist.html
-share/doc/HTML/en/khelpcenter/faq/difffiles.html
-share/doc/HTML/en/khelpcenter/faq/dirappearance.html
-share/doc/HTML/en/khelpcenter/faq/disablesessionmgmt.html
-share/doc/HTML/en/khelpcenter/faq/distros.html
-share/doc/HTML/en/khelpcenter/faq/dosandext2.html
-share/doc/HTML/en/khelpcenter/faq/driveinfo.html
-share/doc/HTML/en/khelpcenter/faq/dualscreen.html
-share/doc/HTML/en/khelpcenter/faq/embedpanel.html
-share/doc/HTML/en/khelpcenter/faq/euro.html
-share/doc/HTML/en/khelpcenter/faq/exitkde.html
-share/doc/HTML/en/khelpcenter/faq/faqmaintainer.html
-share/doc/HTML/en/khelpcenter/faq/filestodesktop.html
-share/doc/HTML/en/khelpcenter/faq/fontstoosmall.html
-share/doc/HTML/en/khelpcenter/faq/ftpclient.html
-share/doc/HTML/en/khelpcenter/faq/getridicons.html
-share/doc/HTML/en/khelpcenter/faq/gettingkde.html
-share/doc/HTML/en/khelpcenter/faq/gettingmoreinformation.html
-share/doc/HTML/en/khelpcenter/faq/gifsupport.html
-share/doc/HTML/en/khelpcenter/faq/highlightmenus.html
-share/doc/HTML/en/khelpcenter/faq/howtostartkde.html
-share/doc/HTML/en/khelpcenter/faq/howtosubscribe.html
-share/doc/HTML/en/khelpcenter/faq/iconified.html
-share/doc/HTML/en/khelpcenter/faq/icons.html
 share/doc/HTML/en/khelpcenter/faq/index.cvlog
 share/doc/HTML/en/khelpcenter/faq/index.docbook
 share/doc/HTML/en/khelpcenter/faq/index.html
-share/doc/HTML/en/khelpcenter/faq/installation.html
-share/doc/HTML/en/khelpcenter/faq/installationinstructions.html
-share/doc/HTML/en/khelpcenter/faq/introduction.html
-share/doc/HTML/en/khelpcenter/faq/isaclone.html
-share/doc/HTML/en/khelpcenter/faq/isfreesoftware.html
-share/doc/HTML/en/khelpcenter/faq/kbiff.html
-share/doc/HTML/en/khelpcenter/faq/kbutton.html
-share/doc/HTML/en/khelpcenter/faq/kdeapplications.html
-share/doc/HTML/en/khelpcenter/faq/kdebase.html
-share/doc/HTML/en/khelpcenter/faq/kdelogin.html
-share/doc/HTML/en/khelpcenter/faq/kdemailinglists.html
-share/doc/HTML/en/khelpcenter/faq/kdenewsgroups.html
-share/doc/HTML/en/khelpcenter/faq/kdeprogramming.html
-share/doc/HTML/en/khelpcenter/faq/kdewithnonkdeapplications.html
-share/doc/HTML/en/khelpcenter/faq/kdewithnumlockon.html
-share/doc/HTML/en/khelpcenter/faq/kdminredhat.html
-share/doc/HTML/en/khelpcenter/faq/kdmnoreadsprofile.html
-share/doc/HTML/en/khelpcenter/faq/keyboardswitcher.html
-share/doc/HTML/en/khelpcenter/faq/killingwindows.html
-share/doc/HTML/en/khelpcenter/faq/killkwmpager.html
-share/doc/HTML/en/khelpcenter/faq/kmail.html
-share/doc/HTML/en/khelpcenter/faq/knownbugfixesforkde.html
-share/doc/HTML/en/khelpcenter/faq/koffice.html
-share/doc/HTML/en/khelpcenter/faq/kscd.html
-share/doc/HTML/en/khelpcenter/faq/ktop.html
-share/doc/HTML/en/khelpcenter/faq/kvt.html
-share/doc/HTML/en/khelpcenter/faq/laptop.html
-share/doc/HTML/en/khelpcenter/faq/latestversion.html
-share/doc/HTML/en/khelpcenter/faq/launchtodesktop.html
-share/doc/HTML/en/khelpcenter/faq/leftbuttonmenu.html
-share/doc/HTML/en/khelpcenter/faq/loopbackdevice.html
-share/doc/HTML/en/khelpcenter/faq/maclike.html
-share/doc/HTML/en/khelpcenter/faq/mailinglistarchive.html
-share/doc/HTML/en/khelpcenter/faq/maximizeonedim.html
-share/doc/HTML/en/khelpcenter/faq/miscellaneousquestions.html
-share/doc/HTML/en/khelpcenter/faq/mountfromdesktop.html
-share/doc/HTML/en/khelpcenter/faq/mountfs.html
-share/doc/HTML/en/khelpcenter/faq/mousewheel.html
-share/doc/HTML/en/khelpcenter/faq/movequickly.html
-share/doc/HTML/en/khelpcenter/faq/netscape.html
-share/doc/HTML/en/khelpcenter/faq/noborder.html
-share/doc/HTML/en/khelpcenter/faq/nonanonftp.html
-share/doc/HTML/en/khelpcenter/faq/noncompliant.html
-share/doc/HTML/en/khelpcenter/faq/noredhatlogo.html
-share/doc/HTML/en/khelpcenter/faq/notreallykderelated.html
-share/doc/HTML/en/khelpcenter/faq/nsbookmark.html
-share/doc/HTML/en/khelpcenter/faq/ownshortcuts.html
-share/doc/HTML/en/khelpcenter/faq/packageformats.html
-share/doc/HTML/en/khelpcenter/faq/panelcomplains.html
-share/doc/HTML/en/khelpcenter/faq/percentinexecline.html
-share/doc/HTML/en/khelpcenter/faq/platform.html
-share/doc/HTML/en/khelpcenter/faq/postinstallation.html
-share/doc/HTML/en/khelpcenter/faq/prerequisites.html
-share/doc/HTML/en/khelpcenter/faq/progwithouticons.html
-share/doc/HTML/en/khelpcenter/faq/qtclone.html
-share/doc/HTML/en/khelpcenter/faq/qtisntfree.html
-share/doc/HTML/en/khelpcenter/faq/redhat.html
-share/doc/HTML/en/khelpcenter/faq/redhatmenustokde.html
-share/doc/HTML/en/khelpcenter/faq/redhatstartmenu.html
-share/doc/HTML/en/khelpcenter/faq/removeold.html
-share/doc/HTML/en/khelpcenter/faq/replacewinmanager.html
-share/doc/HTML/en/khelpcenter/faq/rpmssuse.html
-share/doc/HTML/en/khelpcenter/faq/saveasinkfm.html
-share/doc/HTML/en/khelpcenter/faq/screenshots.html
-share/doc/HTML/en/khelpcenter/faq/shadingawindow.html
-share/doc/HTML/en/khelpcenter/faq/shadowpasswords.html
-share/doc/HTML/en/khelpcenter/faq/snapshotconfig.html
-share/doc/HTML/en/khelpcenter/faq/snapshots.html
-share/doc/HTML/en/khelpcenter/faq/solaris.html
-share/doc/HTML/en/khelpcenter/faq/staroffice.html
-share/doc/HTML/en/khelpcenter/faq/startupdir.html
-share/doc/HTML/en/khelpcenter/faq/stickywindow.html
-share/doc/HTML/en/khelpcenter/faq/systemsound.html
-share/doc/HTML/en/khelpcenter/faq/templatesfolder.html
-share/doc/HTML/en/khelpcenter/faq/thedesktop.html
-share/doc/HTML/en/khelpcenter/faq/thefilemanager.html
-share/doc/HTML/en/khelpcenter/faq/themes.html
-share/doc/HTML/en/khelpcenter/faq/thepanel.html
-share/doc/HTML/en/khelpcenter/faq/thewindowmanager.html
-share/doc/HTML/en/khelpcenter/faq/toolforwebpages.html
-share/doc/HTML/en/khelpcenter/faq/translating.html
-share/doc/HTML/en/khelpcenter/faq/transparentbgnd.html
-share/doc/HTML/en/khelpcenter/faq/truetype.html
-share/doc/HTML/en/khelpcenter/faq/twobutton.html
-share/doc/HTML/en/khelpcenter/faq/uninstall.html
-share/doc/HTML/en/khelpcenter/faq/upgrade.html
-share/doc/HTML/en/khelpcenter/faq/upgradekernel.html
-share/doc/HTML/en/khelpcenter/faq/usefultips.html
-share/doc/HTML/en/khelpcenter/faq/userdirectory.html
-share/doc/HTML/en/khelpcenter/faq/whatisqt.html
-share/doc/HTML/en/khelpcenter/faq/whatkstandfor.html
-share/doc/HTML/en/khelpcenter/faq/wheretogetqt.html
-share/doc/HTML/en/khelpcenter/faq/whichversion.html
-share/doc/HTML/en/khelpcenter/faq/whynotother.html
-share/doc/HTML/en/khelpcenter/faq/windowplacement.html
-share/doc/HTML/en/khelpcenter/faq/windowskeys.html
-share/doc/HTML/en/khelpcenter/faq/winmanager.html
-share/doc/HTML/en/khelpcenter/faq/winmanonthefly.html
-share/doc/HTML/en/khelpcenter/faq/wrongcharset.html
-share/doc/HTML/en/khelpcenter/faq/wrongtime.html
-share/doc/HTML/en/khelpcenter/faq/xmousetoarrow.html
-share/doc/HTML/en/khelpcenter/faq/xserverforwindows.html
 share/doc/HTML/en/khelpcenter/help-invokation.html
 share/doc/HTML/en/khelpcenter/help-navigation.html
 share/doc/HTML/en/khelpcenter/help-searching.html
@@ -1193,26 +1111,26 @@ share/doc/HTML/en/khelpcenter/index.docbook
 share/doc/HTML/en/khelpcenter/index.html
 share/doc/HTML/en/khelpcenter/links.docbook
 share/doc/HTML/en/khelpcenter/quickstart/.anchors
-share/doc/HTML/en/khelpcenter/quickstart/advancedtopics.html
-share/doc/HTML/en/khelpcenter/quickstart/anoverviewofkde.html
-share/doc/HTML/en/khelpcenter/quickstart/archivesandnetworks.html
-share/doc/HTML/en/khelpcenter/quickstart/commandline.html
-share/doc/HTML/en/khelpcenter/quickstart/configuration.html
+share/doc/HTML/en/khelpcenter/quickstart/advanced-topics.html
+share/doc/HTML/en/khelpcenter/quickstart/an-overview-of-kde.html
+share/doc/HTML/en/khelpcenter/quickstart/archives-and-networks.html
+share/doc/HTML/en/khelpcenter/quickstart/configuration-modules.html
 share/doc/HTML/en/khelpcenter/quickstart/configure.html
 share/doc/HTML/en/khelpcenter/quickstart/credits.html
 share/doc/HTML/en/khelpcenter/quickstart/index.cvlog
 share/doc/HTML/en/khelpcenter/quickstart/index.docbook
 share/doc/HTML/en/khelpcenter/quickstart/index.html
 share/doc/HTML/en/khelpcenter/quickstart/introduction.html
-share/doc/HTML/en/khelpcenter/quickstart/kdeanexcitingjourney.html
-share/doc/HTML/en/khelpcenter/quickstart/launchingapplications.html
-share/doc/HTML/en/khelpcenter/quickstart/loggingout.html
-share/doc/HTML/en/khelpcenter/quickstart/managingyourfiles.html
-share/doc/HTML/en/khelpcenter/quickstart/readysetgo.html
-share/doc/HTML/en/khelpcenter/quickstart/taskbar.html
-share/doc/HTML/en/khelpcenter/quickstart/templates.html
-share/doc/HTML/en/khelpcenter/quickstart/virtualdesktops.html
-share/doc/HTML/en/khelpcenter/quickstart/workingwithwindows.html
+share/doc/HTML/en/khelpcenter/quickstart/kde-an-exciting-journey.html
+share/doc/HTML/en/khelpcenter/quickstart/launching-applications.html
+share/doc/HTML/en/khelpcenter/quickstart/logging-out.html
+share/doc/HTML/en/khelpcenter/quickstart/managing-your-files.html
+share/doc/HTML/en/khelpcenter/quickstart/ready-set-go.html
+share/doc/HTML/en/khelpcenter/quickstart/using-taskbar.html
+share/doc/HTML/en/khelpcenter/quickstart/using-templates.html
+share/doc/HTML/en/khelpcenter/quickstart/using-v-desktops.html
+share/doc/HTML/en/khelpcenter/quickstart/want-command-line-back.html
+share/doc/HTML/en/khelpcenter/quickstart/working-with-windows.html
 share/doc/HTML/en/khelpcenter/support.docbook
 share/doc/HTML/en/khelpcenter/supporting-kde-financial-support.html
 share/doc/HTML/en/khelpcenter/supporting-kde-get-started.html
@@ -1308,30 +1226,49 @@ share/doc/HTML/en/kikbd/style.html
 share/doc/HTML/en/kikbd/style.png
 share/doc/HTML/en/kikbd/troubleshooting.html
 share/doc/HTML/en/konqueror/.anchors
+share/doc/HTML/en/konqueror/basics.html
+share/doc/HTML/en/konqueror/bookmarks.html
+share/doc/HTML/en/konqueror/browser.html
+share/doc/HTML/en/konqueror/bubble.html
+share/doc/HTML/en/konqueror/cmndline.png
+share/doc/HTML/en/konqueror/commandline.html
 share/doc/HTML/en/konqueror/commands.html
+share/doc/HTML/en/konqueror/config-prox.html
+share/doc/HTML/en/konqueror/config.html
+share/doc/HTML/en/konqueror/configure-bars.html
 share/doc/HTML/en/konqueror/credits.html
-share/doc/HTML/en/konqueror/developers.html
-share/doc/HTML/en/konqueror/faq.html
+share/doc/HTML/en/konqueror/deleting.html
+share/doc/HTML/en/konqueror/dirtree.png
+share/doc/HTML/en/konqueror/dragdrop.png
+share/doc/HTML/en/konqueror/fileassoc.html
+share/doc/HTML/en/konqueror/filemanager.html
+share/doc/HTML/en/konqueror/filetype1.png
+share/doc/HTML/en/konqueror/filetype3.png
+share/doc/HTML/en/konqueror/filetype4.png
+share/doc/HTML/en/konqueror/ftp.html
 share/doc/HTML/en/konqueror/index.docbook
 share/doc/HTML/en/konqueror/index.html
 share/doc/HTML/en/konqueror/installation.html
 share/doc/HTML/en/konqueror/introduction.html
-share/doc/HTML/en/konqueror/konqueror-browser.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-config-browser.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-config-fa.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-config-fm.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-config-keys.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-config-net.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-config-tool.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-dialog.html
-share/doc/HTML/en/konqueror/konqueror-commands-properties-saveas.html
-share/doc/HTML/en/konqueror/konqueror-commands-rmb-titlebar.html
-share/doc/HTML/en/konqueror/konqueror-commands-rmb-toolbar.html
-share/doc/HTML/en/konqueror/konqueror-commands-rmb-window.html
-share/doc/HTML/en/konqueror/konqueror-config.html
-share/doc/HTML/en/konqueror/konqueror-docviewer.html
-share/doc/HTML/en/konqueror/konqueror-filemanager.html
-share/doc/HTML/en/konqueror/using-konqueror.html
+share/doc/HTML/en/konqueror/kfind.png
+share/doc/HTML/en/konqueror/konqdoc5.png
+share/doc/HTML/en/konqueror/konqdoc9.png
+share/doc/HTML/en/konqueror/konqorg.png
+share/doc/HTML/en/konqueror/lmbmmb.html
+share/doc/HTML/en/konqueror/making.html
+share/doc/HTML/en/konqueror/miscbrowser.html
+share/doc/HTML/en/konqueror/moving.html
+share/doc/HTML/en/konqueror/multiple.html
+share/doc/HTML/en/konqueror/newname.html
+share/doc/HTML/en/konqueror/optionalbrowser.html
+share/doc/HTML/en/konqueror/parts.html
+share/doc/HTML/en/konqueror/parts.png
+share/doc/HTML/en/konqueror/plugin.html
+share/doc/HTML/en/konqueror/rmb-menus.html
+share/doc/HTML/en/konqueror/samba.html
+share/doc/HTML/en/konqueror/samba.png
+share/doc/HTML/en/konqueror/save-print-web.html
+share/doc/HTML/en/konqueror/surf.html
 share/doc/HTML/en/konsole/.anchors
 share/doc/HTML/en/konsole/command-line-options.html
 share/doc/HTML/en/konsole/credits.html
@@ -1387,18 +1324,28 @@ share/fonts/console8x8.pcf.gz
 share/fonts/fonts.dir
 share/fonts/override/fonts.dir
 share/icons/hicolor/16x16/apps/ktip.png
+share/icons/hicolor/22x22/actions/remove_view.png
+share/icons/hicolor/22x22/actions/view_bottom.png
 share/icons/hicolor/22x22/actions/view_choose.png
 share/icons/hicolor/22x22/actions/view_detailed.png
 share/icons/hicolor/22x22/actions/view_icon.png
+share/icons/hicolor/22x22/actions/view_left_right.png
 share/icons/hicolor/22x22/actions/view_multicolumn.png
+share/icons/hicolor/22x22/actions/view_right.png
 share/icons/hicolor/22x22/actions/view_text.png
+share/icons/hicolor/22x22/actions/view_top_bottom.png
 share/icons/hicolor/22x22/actions/view_tree.png
 share/icons/hicolor/22x22/apps/ktip.png
+share/icons/hicolor/32x32/actions/remove_view.png
+share/icons/hicolor/32x32/actions/view_bottom.png
 share/icons/hicolor/32x32/actions/view_choose.png
 share/icons/hicolor/32x32/actions/view_detailed.png
 share/icons/hicolor/32x32/actions/view_icon.png
+share/icons/hicolor/32x32/actions/view_left_right.png
 share/icons/hicolor/32x32/actions/view_multicolumn.png
+share/icons/hicolor/32x32/actions/view_right.png
 share/icons/hicolor/32x32/actions/view_text.png
+share/icons/hicolor/32x32/actions/view_top_bottom.png
 share/icons/hicolor/32x32/actions/view_tree.png
 share/icons/hicolor/32x32/apps/agent.png
 share/icons/hicolor/32x32/apps/bell.png
@@ -1406,11 +1353,14 @@ share/icons/hicolor/32x32/apps/buttons.png
 share/icons/hicolor/32x32/apps/clock.png
 share/icons/hicolor/32x32/apps/colors.png
 share/icons/hicolor/32x32/apps/date.png
+share/icons/hicolor/32x32/apps/designer.png
 share/icons/hicolor/32x32/apps/energy.png
 share/icons/hicolor/32x32/apps/fonts.png
 share/icons/hicolor/32x32/apps/go.png
 share/icons/hicolor/32x32/apps/icons.png
+share/icons/hicolor/32x32/apps/iconthemes.png
 share/icons/hicolor/32x32/apps/information.png
+share/icons/hicolor/32x32/apps/kappfinder.png
 share/icons/hicolor/32x32/apps/kcmdevices.png
 share/icons/hicolor/32x32/apps/kcmdrkonqi.png
 share/icons/hicolor/32x32/apps/kcmkwm.png
@@ -1429,6 +1379,7 @@ share/icons/hicolor/32x32/apps/kdmconfig.png
 share/icons/hicolor/32x32/apps/kfm_home.png
 share/icons/hicolor/32x32/apps/khelpcenter.png
 share/icons/hicolor/32x32/apps/klipper.png
+share/icons/hicolor/32x32/apps/kmenuedit.png
 share/icons/hicolor/32x32/apps/knotify.png
 share/icons/hicolor/32x32/apps/konqueror.png
 share/icons/hicolor/32x32/apps/konsole.png
@@ -1438,7 +1389,10 @@ share/icons/hicolor/32x32/apps/ktip.png
 share/icons/hicolor/32x32/apps/kwin.png
 share/icons/hicolor/32x32/apps/kwrite.png
 share/icons/hicolor/32x32/apps/locale.png
+share/icons/hicolor/32x32/apps/looknfeel.png
 share/icons/hicolor/32x32/apps/mouse.png
+share/icons/hicolor/32x32/apps/multimedia.png
+share/icons/hicolor/32x32/apps/netscape.png
 share/icons/hicolor/32x32/apps/package.png
 share/icons/hicolor/32x32/apps/package_applications.png
 share/icons/hicolor/32x32/apps/package_editors.png
@@ -1467,6 +1421,7 @@ share/icons/hicolor/32x32/devices/cdrom_mount.png
 share/icons/hicolor/32x32/devices/cdrom_unmount.png
 share/icons/hicolor/32x32/devices/cdwriter_mount.png
 share/icons/hicolor/32x32/devices/cdwriter_unmount.png
+share/icons/hicolor/32x32/devices/dvd_unmount.png
 share/icons/hicolor/32x32/devices/hdd_mount.png
 share/icons/hicolor/32x32/devices/hdd_unmount.png
 share/icons/hicolor/32x32/devices/memory.png
@@ -1486,10 +1441,13 @@ share/icons/hicolor/48x48/apps/clock.png
 share/icons/hicolor/48x48/apps/colors.png
 share/icons/hicolor/48x48/apps/cookie.png
 share/icons/hicolor/48x48/apps/date.png
+share/icons/hicolor/48x48/apps/designer.png
 share/icons/hicolor/48x48/apps/fonts.png
 share/icons/hicolor/48x48/apps/go.png
 share/icons/hicolor/48x48/apps/gvim.png
 share/icons/hicolor/48x48/apps/icons.png
+share/icons/hicolor/48x48/apps/iconthemes.png
+share/icons/hicolor/48x48/apps/kappfinder.png
 share/icons/hicolor/48x48/apps/kcmdevices.png
 share/icons/hicolor/48x48/apps/kcmdrkonqi.png
 share/icons/hicolor/48x48/apps/kcmkwm.png
@@ -1519,7 +1477,10 @@ share/icons/hicolor/48x48/apps/ktip.png
 share/icons/hicolor/48x48/apps/kwin.png
 share/icons/hicolor/48x48/apps/kwrite.png
 share/icons/hicolor/48x48/apps/locale.png
+share/icons/hicolor/48x48/apps/looknfeel.png
 share/icons/hicolor/48x48/apps/mouse.png
+share/icons/hicolor/48x48/apps/multimedia.png
+share/icons/hicolor/48x48/apps/netscape.png
 share/icons/hicolor/48x48/apps/package.png
 share/icons/hicolor/48x48/apps/package_applications.png
 share/icons/hicolor/48x48/apps/package_editors.png
@@ -1548,6 +1509,7 @@ share/icons/hicolor/48x48/devices/cdrom_mount.png
 share/icons/hicolor/48x48/devices/cdrom_unmount.png
 share/icons/hicolor/48x48/devices/cdwriter_mount.png
 share/icons/hicolor/48x48/devices/cdwriter_unmount.png
+share/icons/hicolor/48x48/devices/dvd_unmount.png
 share/icons/hicolor/48x48/devices/hdd_mount.png
 share/icons/hicolor/48x48/devices/hdd_unmount.png
 share/icons/hicolor/48x48/devices/memory.png
@@ -1559,15 +1521,24 @@ share/icons/hicolor/48x48/devices/scanner.png
 share/icons/hicolor/48x48/devices/tablet.png
 share/icons/hicolor/48x48/devices/zip_mount.png
 share/icons/hicolor/48x48/devices/zip_unmount.png
+share/icons/locolor/16x16/actions/kde1.png
+share/icons/locolor/16x16/actions/kde2.png
+share/icons/locolor/16x16/actions/kde3.png
+share/icons/locolor/16x16/actions/kde4.png
+share/icons/locolor/16x16/actions/kde5.png
+share/icons/locolor/16x16/actions/kde6.png
+share/icons/locolor/16x16/actions/locationbar_erase.png
+share/icons/locolor/16x16/actions/remove_view.png
+share/icons/locolor/16x16/actions/view_bottom.png
 share/icons/locolor/16x16/actions/view_choose.png
 share/icons/locolor/16x16/actions/view_detailed.png
 share/icons/locolor/16x16/actions/view_icon.png
+share/icons/locolor/16x16/actions/view_left_right.png
 share/icons/locolor/16x16/actions/view_multicolumn.png
+share/icons/locolor/16x16/actions/view_right.png
 share/icons/locolor/16x16/actions/view_text.png
+share/icons/locolor/16x16/actions/view_top_bottom.png
 share/icons/locolor/16x16/actions/view_tree.png
-share/icons/locolor/16x16/actions/viewmag+.png
-share/icons/locolor/16x16/actions/viewmag-.png
-share/icons/locolor/16x16/actions/viewmag.png
 share/icons/locolor/16x16/apps/access.png
 share/icons/locolor/16x16/apps/acroread.png
 share/icons/locolor/16x16/apps/agent.png
@@ -1598,8 +1569,10 @@ share/icons/locolor/16x16/apps/helpbook.png
 share/icons/locolor/16x16/apps/helpbook_open.png
 share/icons/locolor/16x16/apps/helpdoc.png
 share/icons/locolor/16x16/apps/icons.png
+share/icons/locolor/16x16/apps/iconthemes.png
 share/icons/locolor/16x16/apps/information_settings.png
 share/icons/locolor/16x16/apps/input_devices_settings.png
+share/icons/locolor/16x16/apps/kappfinder.png
 share/icons/locolor/16x16/apps/kcmdevices.png
 share/icons/locolor/16x16/apps/kcmdrkonqi.png
 share/icons/locolor/16x16/apps/kcmkicker.png
@@ -1619,9 +1592,12 @@ share/icons/locolor/16x16/apps/kdisknav.png
 share/icons/locolor/16x16/apps/kdmconfig.png
 share/icons/locolor/16x16/apps/keyboard.png
 share/icons/locolor/16x16/apps/kfm.png
+share/icons/locolor/16x16/apps/kfm_globe.png
 share/icons/locolor/16x16/apps/kfm_home.png
+share/icons/locolor/16x16/apps/kfm_network.png
 share/icons/locolor/16x16/apps/khelpcenter.png
 share/icons/locolor/16x16/apps/klipper.png
+share/icons/locolor/16x16/apps/kmenuedit.png
 share/icons/locolor/16x16/apps/knotify.png
 share/icons/locolor/16x16/apps/konqueror.png
 share/icons/locolor/16x16/apps/konsole.png
@@ -1631,9 +1607,11 @@ share/icons/locolor/16x16/apps/kthememgr.png
 share/icons/locolor/16x16/apps/kwin.png
 share/icons/locolor/16x16/apps/kwrite.png
 share/icons/locolor/16x16/apps/locale.png
+share/icons/locolor/16x16/apps/looknfeel.png
 share/icons/locolor/16x16/apps/lyx.png
 share/icons/locolor/16x16/apps/mathematica.png
 share/icons/locolor/16x16/apps/mouse.png
+share/icons/locolor/16x16/apps/multimedia.png
 share/icons/locolor/16x16/apps/nedit.png
 share/icons/locolor/16x16/apps/netscape.png
 share/icons/locolor/16x16/apps/network_settings.png
@@ -1733,9 +1711,11 @@ share/icons/locolor/32x32/apps/go.png
 share/icons/locolor/32x32/apps/gv.png
 share/icons/locolor/32x32/apps/gvim.png
 share/icons/locolor/32x32/apps/icons.png
+share/icons/locolor/32x32/apps/iconthemes.png
 share/icons/locolor/32x32/apps/information.png
 share/icons/locolor/32x32/apps/information_settings.png
 share/icons/locolor/32x32/apps/input_devices_settings.png
+share/icons/locolor/32x32/apps/kappfinder.png
 share/icons/locolor/32x32/apps/kcmdevices.png
 share/icons/locolor/32x32/apps/kcmdrkonqi.png
 share/icons/locolor/32x32/apps/kcmkicker.png
@@ -1768,9 +1748,11 @@ share/icons/locolor/32x32/apps/kwin.png
 share/icons/locolor/32x32/apps/kwrite.png
 share/icons/locolor/32x32/apps/locale.png
 share/icons/locolor/32x32/apps/logo.png
+share/icons/locolor/32x32/apps/looknfeel.png
 share/icons/locolor/32x32/apps/lyx.png
 share/icons/locolor/32x32/apps/mathematica.png
 share/icons/locolor/32x32/apps/mouse.png
+share/icons/locolor/32x32/apps/multimedia.png
 share/icons/locolor/32x32/apps/nedit.png
 share/icons/locolor/32x32/apps/netscape.png
 share/icons/locolor/32x32/apps/network.png
@@ -1926,6 +1908,7 @@ share/locale/l10n/jp/flag.png
 share/locale/l10n/kn/entry.desktop
 share/locale/l10n/kn/flag.png
 share/locale/l10n/kp/entry.desktop
+share/locale/l10n/kp/flag.png
 share/locale/l10n/kr/entry.desktop
 share/locale/l10n/kr/flag.png
 share/locale/l10n/lc/entry.desktop
@@ -2008,6 +1991,7 @@ share/services/konqueror.desktop
 share/services/konsolepart.desktop
 share/services/kshorturifilter.desktop
 share/services/kuriikwsfilter.desktop
+share/services/kurisearchfilter.desktop
 share/services/man.protocol
 share/services/nfs.protocol
 share/services/nntp.protocol
@@ -2030,55 +2014,45 @@ share/sounds/KDE_Window_UnSticky.wav
 share/sounds/pop.wav
 share/templates/.source/CDROM-Device.desktop
 share/templates/.source/Floppy.desktop
-share/templates/.source/FtpURL.desktop
 share/templates/.source/HTMLFile.html
 share/templates/.source/Program.desktop
 share/templates/.source/TextFile.txt
 share/templates/.source/URL.desktop
-share/templates/.source/WWWURL.desktop
 share/templates/Directory.desktop
 share/templates/HTMLFile.desktop
 share/templates/TextFile.desktop
 share/templates/linkCDROM.desktop
 share/templates/linkFloppy.desktop
-share/templates/linkFtpURL.desktop
 share/templates/linkProgram.desktop
 share/templates/linkURL.desktop
-share/templates/linkWWWURL.desktop
+share/wallpapers/All-Good-People-1.jpg
+share/wallpapers/Ancient_Glyphs.jpg
+share/wallpapers/Appropriately-Left-Handed-2.jpg
 share/wallpapers/Blkmarble.jpg
+share/wallpapers/Chicken-Songs-2.jpg
 share/wallpapers/Circuit.jpg
 share/wallpapers/Foggy1.jpg
 share/wallpapers/Marble01.jpg
+share/wallpapers/No-Ones-Laughing-3.jpg
 share/wallpapers/Paper01.jpg
+share/wallpapers/Planet-KDE.jpg
+share/wallpapers/Planning-And-Probing-1.jpg
 share/wallpapers/Prpbumps.jpg
+share/wallpapers/Superfluous-Organ-1.jpg
+share/wallpapers/The-Good-Times-1.jpg
+share/wallpapers/Time-For-Lunch-2.jpg
+share/wallpapers/Totally-New-Product-1.jpg
 share/wallpapers/Water01.jpg
-share/wallpapers/blue_angle_swirl.png
-share/wallpapers/bluecheck.png
-share/wallpapers/bluegreencrisscross.png
-share/wallpapers/bluegreensilver.png
-share/wallpapers/candystripe_chainlink.png
-share/wallpapers/charcoal_sunset.png
-share/wallpapers/fadedpaint.png
-share/wallpapers/garden_lattice.png
-share/wallpapers/ghost_lightning.png
-share/wallpapers/glassywarpcheck.png
-share/wallpapers/gold_crinkle.png
-share/wallpapers/greenish.png
-share/wallpapers/heavens_hex.png
+share/wallpapers/Whirling_Spirit.jpg
+share/wallpapers/Won-Ton-Soup-3.jpg
+share/wallpapers/blue_angle_swirl.jpg
+share/wallpapers/bluegreencrisscross.jpg
+share/wallpapers/gold_crinkle.jpg
 share/wallpapers/kdm_bg.jpg
-share/wallpapers/latte.png
-share/wallpapers/lime_vibration.png
-share/wallpapers/liquid_canvas.png
-share/wallpapers/northbeach.png
-share/wallpapers/orange_stacks.png
-share/wallpapers/purple_swirl.png
-share/wallpapers/string_theory.png
-share/wallpapers/sunday_brunch.png
-share/wallpapers/toothofthehoundthatbitcha.png
-share/wallpapers/vegetative_fog.png
-share/wallpapers/wavetron.png
-share/wallpapers/weave.png
-share/wallpapers/woodcheck.png
+share/wallpapers/northbeach.jpg
+share/wallpapers/simple_wallpaper.jpg
+share/wallpapers/sunday_brunch.jpg
+share/wallpapers/vegetative_fog.jpg
 @dirrm share/doc/HTML/en/kwm
 @dirrm share/doc/HTML/en/kpager
 @dirrm share/doc/HTML/en/konsole
@@ -2089,7 +2063,6 @@ share/wallpapers/woodcheck.png
 @dirrm share/doc/HTML/en/khelpcenter/faq
 @dirrm share/doc/HTML/en/khelpcenter
 @dirrm share/doc/HTML/en/kdm
-@dirrm share/doc/HTML/en/kdewizard
 @dirrm share/doc/HTML/en/kdesu
 @dirrm share/doc/HTML/en/kdebugdialog
 @dirrm share/doc/HTML/en/kcontrol
@@ -2097,8 +2070,13 @@ share/wallpapers/woodcheck.png
 @dirrm share/apps/kwrite
 @dirrm share/apps/kwin/pics
 @dirrm share/apps/kwin
-@dirrm share/apps/ktop/pics
+@dirrm share/apps/ksysguard/icons/locolor/16x16/apps
+@dirrm share/apps/ksysguard/icons/locolor/16x16
+@dirrm share/apps/ksysguard/icons/locolor
+@dirrm share/apps/ksysguard/icons
 @dirrm share/apps/ksysguard
+@dirrm share/apps/ksplash/pics
+@dirrm share/apps/ksplash
 @dirrm share/apps/kscreensaver
 @dirrm share/apps/konsole/pics
 @dirrm share/apps/konsole
@@ -2111,11 +2089,19 @@ share/wallpapers/woodcheck.png
 @dirrm share/apps/konqueror
 @dirrm share/apps/konqlistview
 @dirrm share/apps/konqiconview
+@dirrm share/apps/kmenuedit/icons/locolor/16x16/actions
+@dirrm share/apps/kmenuedit/icons/locolor/16x16
+@dirrm share/apps/kmenuedit/icons/locolor
+@dirrm share/apps/kmenuedit/icons/hicolor/32x32/actions
+@dirrm share/apps/kmenuedit/icons/hicolor/32x32
+@dirrm share/apps/kmenuedit/icons/hicolor/22x22/actions
+@dirrm share/apps/kmenuedit/icons/hicolor/22x22
+@dirrm share/apps/kmenuedit/icons/hicolor
+@dirrm share/apps/kmenuedit/icons
 @dirrm share/apps/kmenuedit
 @dirrm share/apps/kio_info
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
-@dirrm share/apps/kicker/default
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/khelpcenter/plugins/Tutorials
 @dirrm share/apps/khelpcenter/pics
@@ -2125,6 +2111,7 @@ share/wallpapers/woodcheck.png
 @dirrm share/apps/kdisplay/color-schemes
 @dirrm share/apps/kdisplay/app-defaults
 @dirrm share/apps/kdewizard/pics
+@dirrm share/apps/kdewizard
 @dirrm share/apps/kdesktop/programs
 @dirrm share/apps/kdesktop/pics
 @dirrm share/apps/kdesktop/patterns