Update to KDE 3.5

Many new features and refinements.

Notable changes include:
* Konqueror is the second web browser to pass the Acid2 CSS test,
  ahead of Firefox and Internet Explorer
* Konqueror can also now free web pages from adverts with its
  ad-block feature
* SuperKaramba is included in KDE, providing well-integrated and
  easy-to-install widgets for the user's desktop
* Kopete has support for MSN and Yahoo! webcams
* The edutainment module has three new applications (KGeography,
  Kanagram and blinKen), and has seen huge improvements in Kalzium

20 files changed, 1175 insertions, 341 deletions

diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 4e9256a7296..cb4f879a5ea 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2005/11/17 04:33:20 hubertf Exp $
+# $NetBSD: Makefile,v 1.97 2005/12/11 11:01:48 markd Exp $
 
 DISTNAME=	kdebase-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -33,7 +33,9 @@ REPLACE_PERL=		kcontrol/fileshare/fileshareset \
 			khelpcenter/searchhandlers/khc_htsearch.pl \
 			khelpcenter/searchhandlers/khc_docbookdig.pl \
 			khelpcenter/searchhandlers/khc_mansearch.pl \
-			kicker/kicker-3.1-properSizeSetting.pl \
+			kicker/kicker/kicker-3.1-properSizeSetting.pl \
+			kicker/kicker/kicker-3.5-kconfigXTize.pl \
+			kicker/kicker/kicker-3.5-taskbarEnums.pl \
 			kioslave/finger/kio_finger.pl \
 			kioslave/info/kde-info2html \
 			klipper/klipper-1-2.pl \
diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST
index 6ec291e922a..8dba166c288 100644
--- a/x11/kdebase3/PLIST
+++ b/x11/kdebase3/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.37 2005/06/26 23:48:58 markd Exp $
+@comment $NetBSD: PLIST,v 1.38 2005/12/11 11:01:48 markd Exp $
 bin/appletproxy
 bin/drkonqi
 bin/extensionproxy
 bin/genkdmconf
 bin/kaccess
 bin/kappfinder
+bin/kapplymousetheme
 bin/kasbar
 bin/kate
 bin/kblankscrn.kss
@@ -45,6 +46,7 @@ bin/khotkeys
 bin/kicker
 bin/kinfocenter
 bin/kio_media_mounthelper
+bin/kio_system_documenthelper
 bin/kjobviewer
 bin/klipper
 bin/klocaldomainurifilterhelper
@@ -57,7 +59,6 @@ bin/kpersonalizer
 bin/kpm
 bin/kprinter
 bin/krandom.kss
-bin/krandrinithack
 bin/krandrtray
 bin/krdb
 bin/kreadconfig
@@ -93,13 +94,12 @@ 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/kcommondecoration.h
 include/kdecoration.h
 include/kdecoration_p.h
 include/kdecoration_plugins_p.h
@@ -158,7 +158,6 @@ lib/kde3/imagethumbnail.la
 lib/kde3/kaccess.la
 lib/kde3/kasbar_panelextension.la
 lib/kde3/kate.la
-lib/kde3/katedefaultprojectplugin.la
 lib/kde3/kcm_access.la
 lib/kde3/kcm_arts.la
 lib/kde3/kcm_background.la
@@ -185,6 +184,7 @@ lib/kde3/kcm_kdnssd.la
 lib/kde3/kcm_keyboard.la
 lib/kde3/kcm_keys.la
 lib/kde3/kcm_khotkeys.la
+lib/kde3/kcm_khotkeys_init.la
 lib/kde3/kcm_kicker.la
 lib/kde3/kcm_kio.la
 lib/kde3/kcm_knotify.la
@@ -199,6 +199,7 @@ lib/kde3/kcm_kwinoptions.la
 lib/kde3/kcm_kwinrules.la
 lib/kde3/kcm_launch.la
 lib/kde3/kcm_locale.la
+lib/kde3/kcm_media.la
 lib/kde3/kcm_nic.la
 lib/kde3/kcm_nsplugins.la
 lib/kde3/kcm_performance.la
@@ -218,10 +219,12 @@ lib/kde3/kcminit.la
 lib/kde3/kcontrol.la
 lib/kde3/kcontroledit.la
 lib/kde3/kded_favicons.la
+lib/kde3/kded_homedirnotify.la
 lib/kde3/kded_khotkeys.la
 lib/kde3/kded_konqy_preloader.la
 lib/kde3/kded_kwrited.la
 lib/kde3/kded_mediamanager.la
+lib/kde3/kded_medianotifier.la
 lib/kde3/kded_remotedirnotify.la
 lib/kde3/kded_systemdirnotify.la
 lib/kde3/kdesktop.la
@@ -234,6 +237,7 @@ lib/kde3/kgreet_classic.la
 lib/kde3/kgreet_winbind.la
 lib/kde3/khelpcenter.la
 lib/kde3/khotkeys.la
+lib/kde3/khotkeys_shared_arts.la
 lib/kde3/kicker.la
 lib/kde3/kickermenu_find.la
 lib/kde3/kickermenu_kdeprint.la
@@ -250,6 +254,7 @@ lib/kde3/kio_finger.la
 lib/kde3/kio_fish.la
 lib/kde3/kio_floppy.la
 lib/kde3/kio_fonts.la
+lib/kde3/kio_home.la
 lib/kde3/kio_info.la
 lib/kde3/kio_ldap.la
 lib/kde3/kio_mac.la
@@ -287,7 +292,6 @@ lib/kde3/konqsidebar_web.la
 lib/kde3/konqueror.la
 lib/kde3/konsole.la
 lib/kde3/kprinter.la
-lib/kde3/krandrinithack.la
 lib/kde3/ksmserver.la
 lib/kde3/ksplashdefault.la
 lib/kde3/ksplashredmond.la
@@ -329,7 +333,6 @@ lib/kde3/media_panelapplet.la
 lib/kde3/menu_panelapplet.la
 lib/kde3/minipager_panelapplet.la
 lib/kde3/naughty_panelapplet.la
-lib/kde3/picturethumbnail.la
 lib/kde3/run_panelapplet.la
 lib/kde3/sidebar_panelextension.la
 lib/kde3/sysguard_panelapplet.la
@@ -361,13 +364,13 @@ lib/libkdeinit_kmenuedit.la
 lib/libkdeinit_konqueror.la
 lib/libkdeinit_konsole.la
 lib/libkdeinit_kprinter.la
-lib/libkdeinit_krandrinithack.la
 lib/libkdeinit_ksmserver.la
 lib/libkdeinit_kwin.la
 lib/libkdeinit_kwin_rules_dialog.la
 lib/libkdeinit_kwrite.la
 lib/libkdeinit_kxkb.la
 lib/libkfontinst.la
+lib/libkhotkeys_shared.la
 lib/libkickermain.la
 lib/libkonq.la
 lib/libkonqsidebarplugin.la
@@ -433,6 +436,7 @@ share/applications/kde/kfmclient_war.desktop
 share/applications/kde/kfontview.desktop
 share/applications/kde/khotkeys.desktop
 share/applications/kde/khtml_behavior.desktop
+share/applications/kde/khtml_filter.desktop
 share/applications/kde/khtml_fonts.desktop
 share/applications/kde/khtml_java_js.desktop
 share/applications/kde/khtml_plugins.desktop
@@ -458,6 +462,7 @@ share/applications/kde/kwinrules.desktop
 share/applications/kde/kwrite.desktop
 share/applications/kde/lanbrowser.desktop
 share/applications/kde/language.desktop
+share/applications/kde/media.desktop
 share/applications/kde/memory.desktop
 share/applications/kde/mouse.desktop
 share/applications/kde/netpref.desktop
@@ -479,6 +484,8 @@ share/applications/kde/spellchecking.desktop
 share/applications/kde/style.desktop
 share/applications/kde/useragent.desktop
 share/applications/kde/xserver.desktop
+share/desktop-directories/kde-development-translation.directory
+share/desktop-directories/kde-development-webdevelopment.directory
 share/desktop-directories/kde-development.directory
 share/desktop-directories/kde-editors.directory
 share/desktop-directories/kde-edutainment.directory
@@ -517,6 +524,11 @@ 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-accessibility.directory
+share/desktop-directories/kde-utilities-desktop.directory
+share/desktop-directories/kde-utilities-file.directory
+share/desktop-directories/kde-utilities-peripherals.directory
+share/desktop-directories/kde-utilities-pim.directory
 share/desktop-directories/kde-utilities-xutils.directory
 share/desktop-directories/kde-utilities.directory
 share/doc/kde/HTML/en/kappfinder/man-kappfinder.1.docbook
@@ -532,6 +544,7 @@ share/doc/kde/HTML/en/kate/highlighting.docbook
 share/doc/kde/HTML/en/kate/index.cache.bz2
 share/doc/kde/HTML/en/kate/index.docbook
 share/doc/kde/HTML/en/kate/kate.png
+share/doc/kde/HTML/en/kate/man-kate.1.docbook
 share/doc/kde/HTML/en/kate/mdi.docbook
 share/doc/kde/HTML/en/kate/menus.docbook
 share/doc/kde/HTML/en/kate/mimetypechooser.png
@@ -660,6 +673,9 @@ share/doc/kde/HTML/en/kcontrol/panelappearance/index.docbook
 share/doc/kde/HTML/en/kcontrol/passwords/common
 share/doc/kde/HTML/en/kcontrol/passwords/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/passwords/index.docbook
+share/doc/kde/HTML/en/kcontrol/performance/common
+share/doc/kde/HTML/en/kcontrol/performance/index.cache.bz2
+share/doc/kde/HTML/en/kcontrol/performance/index.docbook
 share/doc/kde/HTML/en/kcontrol/proxy/common
 share/doc/kde/HTML/en/kcontrol/proxy/index.cache.bz2
 share/doc/kde/HTML/en/kcontrol/proxy/index.docbook
@@ -683,7 +699,6 @@ share/doc/kde/HTML/en/kcontrol/windowmanagement/index.docbook
 share/doc/kde/HTML/en/kdcop/common
 share/doc/kde/HTML/en/kdcop/index.cache.bz2
 share/doc/kde/HTML/en/kdcop/index.docbook
-share/doc/kde/HTML/en/kdebase-apidocs/common
 share/doc/kde/HTML/en/kdebugdialog/common
 share/doc/kde/HTML/en/kdebugdialog/index.cache.bz2
 share/doc/kde/HTML/en/kdebugdialog/index.docbook
@@ -749,6 +764,7 @@ share/doc/kde/HTML/en/kdeprint/theory.docbook
 share/doc/kde/HTML/en/kdesu/common
 share/doc/kde/HTML/en/kdesu/index.cache.bz2
 share/doc/kde/HTML/en/kdesu/index.docbook
+share/doc/kde/HTML/en/kdesu/man-kdesu.1.docbook
 share/doc/kde/HTML/en/kdm/Daemon.README
 share/doc/kde/HTML/en/kdm/common
 share/doc/kde/HTML/en/kdm/index.cache.bz2
@@ -757,6 +773,7 @@ share/doc/kde/HTML/en/kdm/kdmrc-ref.docbook
 share/doc/kde/HTML/en/kfind/common
 share/doc/kde/HTML/en/kfind/index.cache.bz2
 share/doc/kde/HTML/en/kfind/index.docbook
+share/doc/kde/HTML/en/kfind/man-kfind.1.docbook
 share/doc/kde/HTML/en/khelpcenter/background.png
 share/doc/kde/HTML/en/khelpcenter/bgtable.png
 share/doc/kde/HTML/en/khelpcenter/common
@@ -779,6 +796,7 @@ share/doc/kde/HTML/en/khelpcenter/faq/moreinfo.docbook
 share/doc/kde/HTML/en/khelpcenter/faq/nonkdeapps.docbook
 share/doc/kde/HTML/en/khelpcenter/faq/notrelated.docbook
 share/doc/kde/HTML/en/khelpcenter/faq/panel.docbook
+share/doc/kde/HTML/en/khelpcenter/faq/qt.docbook
 share/doc/kde/HTML/en/khelpcenter/faq/questions.docbook
 share/doc/kde/HTML/en/khelpcenter/faq/sound.docbook
 share/doc/kde/HTML/en/khelpcenter/faq/tips.docbook
@@ -816,6 +834,7 @@ share/doc/kde/HTML/en/khelpcenter/userguide/creating-graphics.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/credits-and-license.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/desktop.png
 share/doc/kde/HTML/en/khelpcenter/userguide/email.docbook
+share/doc/kde/HTML/en/khelpcenter/userguide/extragear-applications.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/file-sharing.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/font-installation.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/getting-help.docbook
@@ -828,6 +847,7 @@ share/doc/kde/HTML/en/khelpcenter/userguide/juk-icon.png
 share/doc/kde/HTML/en/khelpcenter/userguide/juk.png
 share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle-icon.png
 share/doc/kde/HTML/en/khelpcenter/userguide/kaboodle.png
+share/doc/kde/HTML/en/khelpcenter/userguide/kcalc-systray.png
 share/doc/kde/HTML/en/khelpcenter/userguide/kcontrol.png
 share/doc/kde/HTML/en/khelpcenter/userguide/kde-as-root.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/kde-edutainment.docbook
@@ -848,6 +868,7 @@ share/doc/kde/HTML/en/khelpcenter/userguide/kopete.png
 share/doc/kde/HTML/en/khelpcenter/userguide/kppp-dialer-tab.png
 share/doc/kde/HTML/en/khelpcenter/userguide/kppp-wizard.png
 share/doc/kde/HTML/en/khelpcenter/userguide/messaging-intro.docbook
+share/doc/kde/HTML/en/khelpcenter/userguide/migrator-applications.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/migrator-dictionary.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/net-connection-setup.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/networking-with-windows.docbook
@@ -882,6 +903,7 @@ share/doc/kde/HTML/en/khelpcenter/userguide/where-next.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/windows-how-to.docbook
 share/doc/kde/HTML/en/khelpcenter/userguide/your-kde-account.docbook
 share/doc/kde/HTML/en/khelpcenter/visualdict/common
+share/doc/kde/HTML/en/khelpcenter/visualdict/contextmenu.png
 share/doc/kde/HTML/en/khelpcenter/visualdict/index.cache.bz2
 share/doc/kde/HTML/en/khelpcenter/visualdict/index.docbook
 share/doc/kde/HTML/en/khelpcenter/visualdict/pict1.png
@@ -912,6 +934,8 @@ share/doc/kde/HTML/en/kicker/desktop_icon.png
 share/doc/kde/HTML/en/kicker/index.cache.bz2
 share/doc/kde/HTML/en/kicker/index.docbook
 share/doc/kde/HTML/en/kicker/k_menu_icon.png
+share/doc/kde/HTML/en/kicker/man-appletproxy.1.docbook
+share/doc/kde/HTML/en/kicker/man-kicker.1.docbook
 share/doc/kde/HTML/en/kicker/printsys_icon.png
 share/doc/kde/HTML/en/kicker/quickbrowser_icon.png
 share/doc/kde/HTML/en/kicker/recent_docs_icon.png
@@ -1021,20 +1045,24 @@ share/doc/kde/HTML/en/klipper/index.cache.bz2
 share/doc/kde/HTML/en/klipper/index.docbook
 share/doc/kde/HTML/en/klipper/screenshot.png
 share/doc/kde/HTML/en/kmenuedit/common
-share/doc/kde/HTML/en/kmenuedit/i_copy.png
-share/doc/kde/HTML/en/kmenuedit/i_cut.png
-share/doc/kde/HTML/en/kmenuedit/i_delete.png
-share/doc/kde/HTML/en/kmenuedit/i_k_button.png
-share/doc/kde/HTML/en/kmenuedit/i_new_item.png
-share/doc/kde/HTML/en/kmenuedit/i_new_submenu.png
-share/doc/kde/HTML/en/kmenuedit/i_paste.png
-share/doc/kde/HTML/en/kmenuedit/icon_sets.png
+share/doc/kde/HTML/en/kmenuedit/done.png
 share/doc/kde/HTML/en/kmenuedit/index.cache.bz2
 share/doc/kde/HTML/en/kmenuedit/index.docbook
+share/doc/kde/HTML/en/kmenuedit/itemname.png
+share/doc/kde/HTML/en/kmenuedit/kmenueditmain.png
+share/doc/kde/HTML/en/kmenuedit/new.png
+share/doc/kde/HTML/en/kmenuedit/selecticon.png
+share/doc/kde/HTML/en/kmenuedit/selectinternet.png
 share/doc/kde/HTML/en/knetattach/common
 share/doc/kde/HTML/en/knetattach/index.cache.bz2
 share/doc/kde/HTML/en/knetattach/index.docbook
 share/doc/kde/HTML/en/knetattach/screenshot.png
+share/doc/kde/HTML/en/knetattach/screenshot2.png
+share/doc/kde/HTML/en/knetattach/screenshot3.png
+share/doc/kde/HTML/en/knetattach/screenshot4.png
+share/doc/kde/HTML/en/kompmgr/common
+share/doc/kde/HTML/en/kompmgr/index.cache.bz2
+share/doc/kde/HTML/en/kompmgr/index.docbook
 share/doc/kde/HTML/en/konqueror/basics.docbook
 share/doc/kde/HTML/en/konqueror/bookmarks.docbook
 share/doc/kde/HTML/en/konqueror/browser.docbook
@@ -1102,6 +1130,9 @@ share/kde/applnk/.hidden/kcmkonsole.desktop
 share/kde/applnk/.hidden/kcmkxmlrpcd.desktop
 share/kde/applnk/.hidden/kicker_config.desktop
 share/kde/applnk/.hidden/kicker_config_appearance.desktop
+share/kde/applnk/.hidden/kicker_config_arrangement.desktop
+share/kde/applnk/.hidden/kicker_config_hiding.desktop
+share/kde/applnk/.hidden/kicker_config_menus.desktop
 share/kde/applnk/.hidden/konqfilemgr.desktop
 share/kde/applnk/.hidden/konqhtml.desktop
 share/kde/applnk/.hidden/kwinactions.desktop
@@ -1139,6 +1170,7 @@ share/kde/apps/drkonqi/debuggers/gdbrc
 share/kde/apps/drkonqi/pics/konqi.png
 share/kde/apps/drkonqi/presets/developerrc
 share/kde/apps/drkonqi/presets/enduserrc
+share/kde/apps/kaccess/eventsrc
 share/kde/apps/kappfinder/apps/Development/Forte.desktop
 share/kde/apps/kappfinder/apps/Development/assistant.desktop
 share/kde/apps/kappfinder/apps/Development/ddd.desktop
@@ -1148,15 +1180,6 @@ share/kde/apps/kappfinder/apps/Development/eclipse.desktop
 share/kde/apps/kappfinder/apps/Development/j2mewtk.desktop
 share/kde/apps/kappfinder/apps/Development/linguist.desktop
 share/kde/apps/kappfinder/apps/Development/pose.desktop
-share/kde/apps/kappfinder/apps/Editors/emacs.desktop
-share/kde/apps/kappfinder/apps/Editors/gedit.desktop
-share/kde/apps/kappfinder/apps/Editors/gvim.desktop
-share/kde/apps/kappfinder/apps/Editors/lemacs.desktop
-share/kde/apps/kappfinder/apps/Editors/nano.desktop
-share/kde/apps/kappfinder/apps/Editors/nedit.desktop
-share/kde/apps/kappfinder/apps/Editors/pico.desktop
-share/kde/apps/kappfinder/apps/Editors/xedit.desktop
-share/kde/apps/kappfinder/apps/Editors/xemacs.desktop
 share/kde/apps/kappfinder/apps/Games/Arcade/ClanBomber.desktop
 share/kde/apps/kappfinder/apps/Games/Arcade/FrozenBubble.desktop
 share/kde/apps/kappfinder/apps/Games/Arcade/Gnibbles.desktop
@@ -1199,6 +1222,8 @@ share/kde/apps/kappfinder/apps/Games/Roguelikes/zangband.desktop
 share/kde/apps/kappfinder/apps/Games/TacticStrategy/freeciv.desktop
 share/kde/apps/kappfinder/apps/Games/TacticStrategy/freecivserver.desktop
 share/kde/apps/kappfinder/apps/Games/TacticStrategy/xscorch.desktop
+share/kde/apps/kappfinder/apps/Games/Toys/xeyes.desktop
+share/kde/apps/kappfinder/apps/Games/Toys/xpinguin.desktop
 share/kde/apps/kappfinder/apps/Games/defendguin.desktop
 share/kde/apps/kappfinder/apps/Games/penguin-command.desktop
 share/kde/apps/kappfinder/apps/Games/xshipwars.desktop
@@ -1259,10 +1284,10 @@ share/kde/apps/kappfinder/apps/Internet/gnomemeeting.desktop
 share/kde/apps/kappfinder/apps/Internet/gnometalk.desktop
 share/kde/apps/kappfinder/apps/Internet/gtelnet.desktop
 share/kde/apps/kappfinder/apps/Internet/ickle.desktop
+share/kde/apps/kappfinder/apps/Internet/javaws.desktop
 share/kde/apps/kappfinder/apps/Internet/knews.desktop
 share/kde/apps/kappfinder/apps/Internet/licq.desktop
 share/kde/apps/kappfinder/apps/Internet/mldonkey_gui.desktop
-share/kde/apps/kappfinder/apps/Internet/mozilla-firebird.desktop
 share/kde/apps/kappfinder/apps/Internet/mozilla-firefox.desktop
 share/kde/apps/kappfinder/apps/Internet/mozilla-thunderbird.desktop
 share/kde/apps/kappfinder/apps/Internet/mozilla.desktop
@@ -1329,8 +1354,15 @@ share/kde/apps/kappfinder/apps/System/editres.desktop
 share/kde/apps/kappfinder/apps/System/sam.desktop
 share/kde/apps/kappfinder/apps/System/wine.desktop
 share/kde/apps/kappfinder/apps/System/xosview.desktop
-share/kde/apps/kappfinder/apps/Toys/xeyes.desktop
-share/kde/apps/kappfinder/apps/Toys/xpinguin.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/emacs.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/gedit.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/gvim.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/lemacs.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/nano.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/nedit.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/pico.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/xedit.desktop
+share/kde/apps/kappfinder/apps/Utilities/Editors/xemacs.desktop
 share/kde/apps/kappfinder/apps/Utilities/GKrellM.desktop
 share/kde/apps/kappfinder/apps/Utilities/GnomeWho.desktop
 share/kde/apps/kappfinder/apps/Utilities/SystemInfo.desktop
@@ -1367,12 +1399,8 @@ share/kde/apps/kate/icons/locolor/16x16/actions/unindent.png
 share/kde/apps/kate/icons/locolor/22x22/actions/indent.png
 share/kde/apps/kate/icons/locolor/22x22/actions/unindent.png
 share/kde/apps/kate/kateui.rc
-share/kde/apps/kate/plugins/katedefaultproject/ui.rc
-share/kde/apps/kate/plugins/katekttsd/ui.rc
-share/kde/apps/kate/scripts/sample.desktop
-share/kde/apps/kate/scripts/sample.sh
+share/kde/apps/kate/pics/sessionchooser.png
 share/kde/apps/kate/tips
-share/kde/apps/katepart/kpartplugins/katepartkttsd.rc
 share/kde/apps/kbookmark/directory_bookmarkbar.desktop
 share/kde/apps/kcm_componentchooser/kcm_browser.desktop
 share/kde/apps/kcm_componentchooser/kcm_kemail.desktop
@@ -1401,6 +1429,8 @@ share/kde/apps/kconf_update/kfmclient_3_2.upd
 share/kde/apps/kconf_update/kfmclient_3_2_update.sh
 share/kde/apps/kconf_update/khotkeys_32b1_update.upd
 share/kde/apps/kconf_update/kicker-3.1-properSizeSetting.pl
+share/kde/apps/kconf_update/kicker-3.5-kconfigXTize.pl
+share/kde/apps/kconf_update/kicker-3.5-taskbarEnums.pl
 share/kde/apps/kconf_update/kickerrc.upd
 share/kde/apps/kconf_update/klipper-1-2.pl
 share/kde/apps/kconf_update/klipper-kde31.sh
@@ -1421,6 +1451,7 @@ share/kde/apps/kconf_update/kwin_focus2.upd
 share/kde/apps/kconf_update/kwiniconify.upd
 share/kde/apps/kconf_update/kwinsticky.upd
 share/kde/apps/kconf_update/kwinupdatewindowsettings.upd
+share/kde/apps/kconf_update/mouse_cursor_theme.upd
 share/kde/apps/kconf_update/move_favicons.sh
 share/kde/apps/kconf_update/move_konqsidebartng_entries.sh
 share/kde/apps/kconf_update/move_session_config.sh
@@ -1715,6 +1746,12 @@ share/kde/apps/kicker/applets/runapplet.desktop
 share/kde/apps/kicker/applets/systemtrayapplet.desktop
 share/kde/apps/kicker/applets/taskbarapplet.desktop
 share/kde/apps/kicker/applets/trashapplet.desktop
+share/kde/apps/kicker/builtins/bookmarks.desktop
+share/kde/apps/kicker/builtins/browser.desktop
+share/kde/apps/kicker/builtins/desktop.desktop
+share/kde/apps/kicker/builtins/exec.desktop
+share/kde/apps/kicker/builtins/kmenu.desktop
+share/kde/apps/kicker/builtins/windowlist.desktop
 share/kde/apps/kicker/default-apps
 share/kde/apps/kicker/extensions/childpanelextension.desktop
 share/kde/apps/kicker/extensions/dockbarextension.desktop
@@ -1854,6 +1891,7 @@ share/kde/apps/kio_finger/kio_finger.css
 share/kde/apps/kio_finger/kio_finger.pl
 share/kde/apps/kio_info/kde-info2html
 share/kde/apps/kio_info/kde-info2html.conf
+share/kde/apps/kio_man/kio_man.css
 share/kde/apps/kjobviewer/kjobviewerui.rc
 share/kde/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new.png
 share/kde/apps/kmenuedit/icons/crystalsvg/22x22/actions/menu_new_sep.png
@@ -1863,13 +1901,17 @@ share/kde/apps/kmenuedit/icons/locolor/16x16/actions/menu_new.png
 share/kde/apps/kmenuedit/kmenueditui.rc
 share/kde/apps/konqiconview/konq_iconview.rc
 share/kde/apps/konqiconview/konq_multicolumnview.rc
+share/kde/apps/konqiconview/kpartplugins/kremoteencodingplugin.desktop
 share/kde/apps/konqiconview/kpartplugins/kremoteencodingplugin.rc
+share/kde/apps/konqiconview/kpartplugins/kshellcmdplugin.desktop
 share/kde/apps/konqiconview/kpartplugins/kshellcmdplugin.rc
 share/kde/apps/konqlistview/konq_detailedlistview.rc
 share/kde/apps/konqlistview/konq_infolistview.rc
 share/kde/apps/konqlistview/konq_textview.rc
 share/kde/apps/konqlistview/konq_treeview.rc
+share/kde/apps/konqlistview/kpartplugins/kremoteencodingplugin.desktop
 share/kde/apps/konqlistview/kpartplugins/kremoteencodingplugin.rc
+share/kde/apps/konqlistview/kpartplugins/kshellcmdplugin.desktop
 share/kde/apps/konqlistview/kpartplugins/kshellcmdplugin.rc
 share/kde/apps/konqsidebartng/add/virtualfolderadd.desktop
 share/kde/apps/konqsidebartng/add/webmodule_add.desktop
@@ -1883,6 +1925,7 @@ share/kde/apps/konqsidebartng/entries/home.desktop
 share/kde/apps/konqsidebartng/entries/remote.desktop
 share/kde/apps/konqsidebartng/entries/root.desktop
 share/kde/apps/konqsidebartng/entries/services.desktop
+share/kde/apps/konqsidebartng/entries/system.desktop
 share/kde/apps/konqsidebartng/kicker_entries/bookmarks.desktop
 share/kde/apps/konqsidebartng/kicker_entries/history.desktop
 share/kde/apps/konqsidebartng/kicker_entries/home.desktop
@@ -1966,13 +2009,10 @@ share/kde/apps/konqueror/servicemenus/text-xml-print.desktop
 share/kde/apps/konqueror/servicemenus/text-xslt-print.desktop
 share/kde/apps/konqueror/tiles/bluemorning.png
 share/kde/apps/konqueror/tiles/canvas.png
-share/kde/apps/konqueror/tiles/checker.png
-share/kde/apps/konqueror/tiles/cubic.png
 share/kde/apps/konqueror/tiles/kde4ever.png
 share/kde/apps/konqueror/tiles/kenwimer.png
 share/kde/apps/konqueror/tiles/noise.png
 share/kde/apps/konqueror/tiles/paper_flieder.png
-share/kde/apps/konqueror/tiles/punika_attack.png
 share/kde/apps/konqueror/tiles/redfiber.png
 share/kde/apps/konsole/BlackOnLightColor.schema
 share/kde/apps/konsole/BlackOnLightYellow.schema
@@ -1982,6 +2022,7 @@ share/kde/apps/konsole/Example.Schema
 share/kde/apps/konsole/GreenOnBlack.schema
 share/kde/apps/konsole/GreenTint.schema
 share/kde/apps/konsole/GreenTint_MC.schema
+share/kde/apps/konsole/LightPaper.schema
 share/kde/apps/konsole/LightPicture.schema
 share/kde/apps/konsole/Linux.schema
 share/kde/apps/konsole/README.KeyTab
@@ -1995,12 +2036,21 @@ share/kde/apps/konsole/Transparent_lightbg.schema
 share/kde/apps/konsole/WhiteOnBlack.schema
 share/kde/apps/konsole/XTerm.schema
 share/kde/apps/konsole/eventsrc
+share/kde/apps/konsole/fonts/9x15.pcf.gz
+share/kde/apps/konsole/fonts/console8x16.pcf.gz
+share/kde/apps/konsole/fonts/fonts.dir
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/activity.png
+share/kde/apps/konsole/icons/crystalsvg/16x16/actions/konsoleblue.png
+share/kde/apps/konsole/icons/crystalsvg/16x16/actions/konsolered.png
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/opentermblue.png
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/opentermred.png
 share/kde/apps/konsole/icons/crystalsvg/16x16/actions/silence.png
+share/kde/apps/konsole/icons/crystalsvg/22x22/actions/konsoleblue.png
+share/kde/apps/konsole/icons/crystalsvg/22x22/actions/konsolered.png
 share/kde/apps/konsole/icons/crystalsvg/22x22/actions/opentermblue.png
 share/kde/apps/konsole/icons/crystalsvg/22x22/actions/opentermred.png
+share/kde/apps/konsole/icons/crystalsvg/32x32/actions/konsoleblue.png
+share/kde/apps/konsole/icons/crystalsvg/32x32/actions/konsolered.png
 share/kde/apps/konsole/icons/crystalsvg/32x32/actions/opentermblue.png
 share/kde/apps/konsole/icons/crystalsvg/32x32/actions/opentermred.png
 share/kde/apps/konsole/linux.desktop
@@ -2020,6 +2070,9 @@ share/kde/apps/konsole/tips
 share/kde/apps/konsole/vim.schema
 share/kde/apps/konsole/vt100.keytab
 share/kde/apps/konsole/vt420pc.keytab
+share/kde/apps/konsole/wallpapers/Blkmarble.jpg
+share/kde/apps/konsole/wallpapers/Paper01.jpg
+share/kde/apps/konsole/wallpapers/gray02.jpg
 share/kde/apps/konsole/x11r5.keytab
 share/kde/apps/kpersonalizer/pics/step1.png
 share/kde/apps/kpersonalizer/pics/step2.png
@@ -2120,11 +2173,12 @@ share/kde/apps/naughtyapplet/pics/naughty-happy.png
 share/kde/apps/naughtyapplet/pics/naughty-sad.png
 share/kde/apps/plugin/nspluginpart.rc
 ${HAVE_SMB}share/kde/apps/remoteview/smb-network.desktop
+share/kde/apps/systemview/documents.desktop
 share/kde/apps/systemview/home.desktop
 share/kde/apps/systemview/media.desktop
 share/kde/apps/systemview/remote.desktop
-share/kde/apps/systemview/settings.desktop
 share/kde/apps/systemview/trash.desktop
+share/kde/apps/systemview/users.desktop
 share/kde/autostart/kdesktop.desktop
 share/kde/autostart/khotkeys.desktop
 share/kde/autostart/klipper.desktop
@@ -2134,11 +2188,16 @@ share/kde/autostart/panel.desktop
 share/kde/config.kcfg/kcm_useraccount.kcfg
 share/kde/config.kcfg/kcm_useraccount_pass.kcfg
 share/kde/config.kcfg/kdesktop.kcfg
+share/kde/config.kcfg/keditbookmarks.kcfg
 share/kde/config.kcfg/khelpcenter.kcfg
+share/kde/config.kcfg/kickerSettings.kcfg
 share/kde/config.kcfg/klaunch.kcfg
+share/kde/config.kcfg/konq_listview.kcfg
 share/kde/config.kcfg/konqueror.kcfg
 share/kde/config.kcfg/kwebdesktop.kcfg
 share/kde/config.kcfg/kwin.kcfg
+share/kde/config.kcfg/launcherapplet.kcfg
+share/kde/config.kcfg/mediamanagersettings.kcfg
 share/kde/config.kcfg/taskbar.kcfg
 share/kde/config/katerc
 share/kde/config/kdesktop_custom_menu1
@@ -2157,10 +2216,6 @@ share/kde/config/konqsidebartng.rc
 share/kde/config/kshorturifilterrc
 share/kde/config/kxkb_groups
 share/kde/doc/kdm/README
-share/kde/fonts/9x15.pcf.gz
-share/kde/fonts/console8x16.pcf.gz
-share/kde/fonts/console8x8.pcf.gz
-share/kde/fonts/fonts.dir
 share/kde/fonts/override/fonts.dir
 share/kde/icons/Daemon.png
 share/kde/icons/NetBSD-flag.png
@@ -2183,8 +2238,6 @@ share/kde/icons/crystalsvg/128x128/apps/fonts.png
 share/kde/icons/crystalsvg/128x128/apps/gimp.png
 share/kde/icons/crystalsvg/128x128/apps/help_index.png
 share/kde/icons/crystalsvg/128x128/apps/hwinfo.png
-share/kde/icons/crystalsvg/128x128/apps/kappfinder.png
-share/kde/icons/crystalsvg/128x128/apps/kate.png
 share/kde/icons/crystalsvg/128x128/apps/kcmdevices.png
 share/kde/icons/crystalsvg/128x128/apps/kcmdf.png
 share/kde/icons/crystalsvg/128x128/apps/kcmkwm.png
@@ -2192,23 +2245,12 @@ share/kde/icons/crystalsvg/128x128/apps/kcmmemory.png
 share/kde/icons/crystalsvg/128x128/apps/kcmpartitions.png
 share/kde/icons/crystalsvg/128x128/apps/kcmpci.png
 share/kde/icons/crystalsvg/128x128/apps/kcontrol.png
-share/kde/icons/crystalsvg/128x128/apps/kdeprintfax.png
 share/kde/icons/crystalsvg/128x128/apps/kdmconfig.png
 share/kde/icons/crystalsvg/128x128/apps/key_bindings.png
 share/kde/icons/crystalsvg/128x128/apps/kfm_home.png
-share/kde/icons/crystalsvg/128x128/apps/khelpcenter.png
-share/kde/icons/crystalsvg/128x128/apps/kjobviewer.png
-share/kde/icons/crystalsvg/128x128/apps/klipper.png
-share/kde/icons/crystalsvg/128x128/apps/kmenu.png
-share/kde/icons/crystalsvg/128x128/apps/knetattach.png
-share/kde/icons/crystalsvg/128x128/apps/konqueror.png
-share/kde/icons/crystalsvg/128x128/apps/konsole.png
 share/kde/icons/crystalsvg/128x128/apps/kscreensaver.png
-share/kde/icons/crystalsvg/128x128/apps/ksplash.png
 share/kde/icons/crystalsvg/128x128/apps/ksysguard.png
 share/kde/icons/crystalsvg/128x128/apps/kthememgr.png
-share/kde/icons/crystalsvg/128x128/apps/ktip.png
-share/kde/icons/crystalsvg/128x128/apps/kwrite.png
 share/kde/icons/crystalsvg/128x128/apps/licq.png
 share/kde/icons/crystalsvg/128x128/apps/linuxconf.png
 share/kde/icons/crystalsvg/128x128/apps/locale.png
@@ -2229,19 +2271,21 @@ share/kde/icons/crystalsvg/128x128/apps/package_utilities.png
 share/kde/icons/crystalsvg/128x128/apps/penguin.png
 share/kde/icons/crystalsvg/128x128/apps/personal.png
 share/kde/icons/crystalsvg/128x128/apps/phppg.png
-share/kde/icons/crystalsvg/128x128/apps/printmgr.png
 share/kde/icons/crystalsvg/128x128/apps/proxy.png
 share/kde/icons/crystalsvg/128x128/apps/pysol.png
 share/kde/icons/crystalsvg/128x128/apps/randr.png
 share/kde/icons/crystalsvg/128x128/apps/samba.png
 share/kde/icons/crystalsvg/128x128/apps/staroffice.png
 share/kde/icons/crystalsvg/128x128/apps/stylesheet.png
+share/kde/icons/crystalsvg/128x128/apps/systemtray.png
+share/kde/icons/crystalsvg/128x128/apps/taskbar.png
 share/kde/icons/crystalsvg/128x128/apps/terminal.png
 share/kde/icons/crystalsvg/128x128/apps/tux.png
 share/kde/icons/crystalsvg/128x128/apps/wp.png
 share/kde/icons/crystalsvg/128x128/apps/xclock.png
 share/kde/icons/crystalsvg/128x128/apps/xfmail.png
 share/kde/icons/crystalsvg/128x128/apps/xmag.png
+share/kde/icons/crystalsvg/128x128/devices/laptop.png
 share/kde/icons/crystalsvg/16x16/actions/newfont.png
 share/kde/icons/crystalsvg/16x16/apps/abiword.png
 share/kde/icons/crystalsvg/16x16/apps/access.png
@@ -2275,6 +2319,7 @@ share/kde/icons/crystalsvg/16x16/apps/energy.png
 share/kde/icons/crystalsvg/16x16/apps/energy_star.png
 share/kde/icons/crystalsvg/16x16/apps/enhanced_browsing.png
 share/kde/icons/crystalsvg/16x16/apps/evolution.png
+share/kde/icons/crystalsvg/16x16/apps/fifteenpieces.png
 share/kde/icons/crystalsvg/16x16/apps/filetypes.png
 share/kde/icons/crystalsvg/16x16/apps/firefox.png
 share/kde/icons/crystalsvg/16x16/apps/fonts.png
@@ -2291,9 +2336,9 @@ share/kde/icons/crystalsvg/16x16/apps/help_index.png
 share/kde/icons/crystalsvg/16x16/apps/hwinfo.png
 share/kde/icons/crystalsvg/16x16/apps/icons.png
 share/kde/icons/crystalsvg/16x16/apps/iconthemes.png
+share/kde/icons/crystalsvg/16x16/apps/ieee1394.png
 share/kde/icons/crystalsvg/16x16/apps/input_devices_settings.png
-share/kde/icons/crystalsvg/16x16/apps/kappfinder.png
-share/kde/icons/crystalsvg/16x16/apps/kate.png
+share/kde/icons/crystalsvg/16x16/apps/kbinaryclock.png
 share/kde/icons/crystalsvg/16x16/apps/kcmdevices.png
 share/kde/icons/crystalsvg/16x16/apps/kcmkicker.png
 share/kde/icons/crystalsvg/16x16/apps/kcmkwm.png
@@ -2307,37 +2352,21 @@ share/kde/icons/crystalsvg/16x16/apps/kcmsound.png
 share/kde/icons/crystalsvg/16x16/apps/kcmsystem.png
 share/kde/icons/crystalsvg/16x16/apps/kcmx.png
 share/kde/icons/crystalsvg/16x16/apps/kcontrol.png
-share/kde/icons/crystalsvg/16x16/apps/kdeprintfax.png
 share/kde/icons/crystalsvg/16x16/apps/kdisknav.png
 share/kde/icons/crystalsvg/16x16/apps/kdmconfig.png
 share/kde/icons/crystalsvg/16x16/apps/keditbookmarks.png
 share/kde/icons/crystalsvg/16x16/apps/key_bindings.png
 share/kde/icons/crystalsvg/16x16/apps/keyboard.png
 share/kde/icons/crystalsvg/16x16/apps/keyboard_layout.png
-share/kde/icons/crystalsvg/16x16/apps/kfind.png
-share/kde/icons/crystalsvg/16x16/apps/kfm.png
 share/kde/icons/crystalsvg/16x16/apps/kfm_home.png
-share/kde/icons/crystalsvg/16x16/apps/khelpcenter.png
 share/kde/icons/crystalsvg/16x16/apps/kicker.png
-share/kde/icons/crystalsvg/16x16/apps/kjobviewer.png
-share/kde/icons/crystalsvg/16x16/apps/klipper.png
-share/kde/icons/crystalsvg/16x16/apps/kmenu.png
-share/kde/icons/crystalsvg/16x16/apps/kmenuedit.png
-share/kde/icons/crystalsvg/16x16/apps/knetattach.png
 share/kde/icons/crystalsvg/16x16/apps/knotify.png
-share/kde/icons/crystalsvg/16x16/apps/konqueror.png
-share/kde/icons/crystalsvg/16x16/apps/konsole.png
-share/kde/icons/crystalsvg/16x16/apps/kpager.png
 share/kde/icons/crystalsvg/16x16/apps/kpersonalizer.png
 share/kde/icons/crystalsvg/16x16/apps/kscreensaver.png
-share/kde/icons/crystalsvg/16x16/apps/ksplash.png
 share/kde/icons/crystalsvg/16x16/apps/ksysguard.png
 share/kde/icons/crystalsvg/16x16/apps/kthememgr.png
-share/kde/icons/crystalsvg/16x16/apps/ktip.png
 share/kde/icons/crystalsvg/16x16/apps/kvirc.png
 share/kde/icons/crystalsvg/16x16/apps/kwin.png
-share/kde/icons/crystalsvg/16x16/apps/kwrite.png
-share/kde/icons/crystalsvg/16x16/apps/kxkb.png
 share/kde/icons/crystalsvg/16x16/apps/licq.png
 share/kde/icons/crystalsvg/16x16/apps/linguist.png
 share/kde/icons/crystalsvg/16x16/apps/linuxconf.png
@@ -2381,17 +2410,19 @@ share/kde/icons/crystalsvg/16x16/apps/personal.png
 share/kde/icons/crystalsvg/16x16/apps/phppg.png
 share/kde/icons/crystalsvg/16x16/apps/plan.png
 share/kde/icons/crystalsvg/16x16/apps/planner.png
-share/kde/icons/crystalsvg/16x16/apps/printmgr.png
 share/kde/icons/crystalsvg/16x16/apps/proxy.png
 share/kde/icons/crystalsvg/16x16/apps/pybliographic.png
 share/kde/icons/crystalsvg/16x16/apps/randr.png
 share/kde/icons/crystalsvg/16x16/apps/realplayer.png
 share/kde/icons/crystalsvg/16x16/apps/remote.png
+share/kde/icons/crystalsvg/16x16/apps/runprocesscatcher.png
 share/kde/icons/crystalsvg/16x16/apps/samba.png
 share/kde/icons/crystalsvg/16x16/apps/scribus.png
 share/kde/icons/crystalsvg/16x16/apps/sodipodi.png
 share/kde/icons/crystalsvg/16x16/apps/style.png
 share/kde/icons/crystalsvg/16x16/apps/stylesheet.png
+share/kde/icons/crystalsvg/16x16/apps/systemtray.png
+share/kde/icons/crystalsvg/16x16/apps/taskbar.png
 share/kde/icons/crystalsvg/16x16/apps/terminal.png
 share/kde/icons/crystalsvg/16x16/apps/thunderbird.png
 share/kde/icons/crystalsvg/16x16/apps/tux.png
@@ -2417,6 +2448,7 @@ share/kde/icons/crystalsvg/16x16/apps/xmms.png
 share/kde/icons/crystalsvg/16x16/apps/xosview.png
 share/kde/icons/crystalsvg/16x16/apps/xpaint.png
 share/kde/icons/crystalsvg/16x16/apps/xv.png
+share/kde/icons/crystalsvg/16x16/devices/laptop.png
 share/kde/icons/crystalsvg/22x22/actions/newfont.png
 share/kde/icons/crystalsvg/22x22/apps/access.png
 share/kde/icons/crystalsvg/22x22/apps/agent.png
@@ -2430,11 +2462,14 @@ share/kde/icons/crystalsvg/22x22/apps/date.png
 share/kde/icons/crystalsvg/22x22/apps/email.png
 share/kde/icons/crystalsvg/22x22/apps/energy.png
 share/kde/icons/crystalsvg/22x22/apps/enhanced_browsing.png
+share/kde/icons/crystalsvg/22x22/apps/fifteenpieces.png
 share/kde/icons/crystalsvg/22x22/apps/filetypes.png
 share/kde/icons/crystalsvg/22x22/apps/fonts.png
 share/kde/icons/crystalsvg/22x22/apps/hwinfo.png
 share/kde/icons/crystalsvg/22x22/apps/icons.png
 share/kde/icons/crystalsvg/22x22/apps/iconthemes.png
+share/kde/icons/crystalsvg/22x22/apps/ieee1394.png
+share/kde/icons/crystalsvg/22x22/apps/kbinaryclock.png
 share/kde/icons/crystalsvg/22x22/apps/kcmdevices.png
 share/kde/icons/crystalsvg/22x22/apps/kcmkicker.png
 share/kde/icons/crystalsvg/22x22/apps/kcmkwm.png
@@ -2442,28 +2477,22 @@ share/kde/icons/crystalsvg/22x22/apps/kcmx.png
 share/kde/icons/crystalsvg/22x22/apps/kdmconfig.png
 share/kde/icons/crystalsvg/22x22/apps/key_bindings.png
 share/kde/icons/crystalsvg/22x22/apps/keyboard.png
-share/kde/icons/crystalsvg/22x22/apps/kfm.png
-share/kde/icons/crystalsvg/22x22/apps/khelpcenter.png
-share/kde/icons/crystalsvg/22x22/apps/kjobviewer.png
-share/kde/icons/crystalsvg/22x22/apps/klipper.png
-share/kde/icons/crystalsvg/22x22/apps/kmenu.png
-share/kde/icons/crystalsvg/22x22/apps/knetattach.png
-share/kde/icons/crystalsvg/22x22/apps/konqueror.png
-share/kde/icons/crystalsvg/22x22/apps/konsole.png
 share/kde/icons/crystalsvg/22x22/apps/kscreensaver.png
-share/kde/icons/crystalsvg/22x22/apps/ksplash.png
 share/kde/icons/crystalsvg/22x22/apps/kthememgr.png
 share/kde/icons/crystalsvg/22x22/apps/kvirc.png
 share/kde/icons/crystalsvg/22x22/apps/locale.png
 share/kde/icons/crystalsvg/22x22/apps/nedit.png
 share/kde/icons/crystalsvg/22x22/apps/package_development.png
 share/kde/icons/crystalsvg/22x22/apps/personal.png
-share/kde/icons/crystalsvg/22x22/apps/printmgr.png
 share/kde/icons/crystalsvg/22x22/apps/proxy.png
 share/kde/icons/crystalsvg/22x22/apps/randr.png
+share/kde/icons/crystalsvg/22x22/apps/runprocesscatcher.png
 share/kde/icons/crystalsvg/22x22/apps/samba.png
 share/kde/icons/crystalsvg/22x22/apps/style.png
 share/kde/icons/crystalsvg/22x22/apps/stylesheet.png
+share/kde/icons/crystalsvg/22x22/apps/systemtray.png
+share/kde/icons/crystalsvg/22x22/apps/taskbar.png
+share/kde/icons/crystalsvg/22x22/devices/laptop.png
 share/kde/icons/crystalsvg/32x32/actions/newfont.png
 share/kde/icons/crystalsvg/32x32/apps/abiword.png
 share/kde/icons/crystalsvg/32x32/apps/access.png
@@ -2498,6 +2527,7 @@ share/kde/icons/crystalsvg/32x32/apps/energy_star.png
 share/kde/icons/crystalsvg/32x32/apps/enhanced_browsing.png
 share/kde/icons/crystalsvg/32x32/apps/error.png
 share/kde/icons/crystalsvg/32x32/apps/evolution.png
+share/kde/icons/crystalsvg/32x32/apps/fifteenpieces.png
 share/kde/icons/crystalsvg/32x32/apps/filetypes.png
 share/kde/icons/crystalsvg/32x32/apps/firefox.png
 share/kde/icons/crystalsvg/32x32/apps/fonts.png
@@ -2515,9 +2545,9 @@ share/kde/icons/crystalsvg/32x32/apps/help_index.png
 share/kde/icons/crystalsvg/32x32/apps/hwinfo.png
 share/kde/icons/crystalsvg/32x32/apps/icons.png
 share/kde/icons/crystalsvg/32x32/apps/iconthemes.png
+share/kde/icons/crystalsvg/32x32/apps/ieee1394.png
 share/kde/icons/crystalsvg/32x32/apps/input_devices_settings.png
-share/kde/icons/crystalsvg/32x32/apps/kappfinder.png
-share/kde/icons/crystalsvg/32x32/apps/kate.png
+share/kde/icons/crystalsvg/32x32/apps/kbinaryclock.png
 share/kde/icons/crystalsvg/32x32/apps/kcmdevices.png
 share/kde/icons/crystalsvg/32x32/apps/kcmdrkonqi.png
 share/kde/icons/crystalsvg/32x32/apps/kcmkicker.png
@@ -2532,36 +2562,20 @@ share/kde/icons/crystalsvg/32x32/apps/kcmsound.png
 share/kde/icons/crystalsvg/32x32/apps/kcmsystem.png
 share/kde/icons/crystalsvg/32x32/apps/kcmx.png
 share/kde/icons/crystalsvg/32x32/apps/kcontrol.png
-share/kde/icons/crystalsvg/32x32/apps/kdeprintfax.png
 share/kde/icons/crystalsvg/32x32/apps/kdisknav.png
 share/kde/icons/crystalsvg/32x32/apps/kdmconfig.png
 share/kde/icons/crystalsvg/32x32/apps/keditbookmarks.png
 share/kde/icons/crystalsvg/32x32/apps/key_bindings.png
 share/kde/icons/crystalsvg/32x32/apps/keyboard.png
 share/kde/icons/crystalsvg/32x32/apps/keyboard_layout.png
-share/kde/icons/crystalsvg/32x32/apps/kfind.png
-share/kde/icons/crystalsvg/32x32/apps/kfm.png
 share/kde/icons/crystalsvg/32x32/apps/kfm_home.png
-share/kde/icons/crystalsvg/32x32/apps/khelpcenter.png
-share/kde/icons/crystalsvg/32x32/apps/kjobviewer.png
-share/kde/icons/crystalsvg/32x32/apps/klipper.png
-share/kde/icons/crystalsvg/32x32/apps/kmenu.png
-share/kde/icons/crystalsvg/32x32/apps/kmenuedit.png
-share/kde/icons/crystalsvg/32x32/apps/knetattach.png
 share/kde/icons/crystalsvg/32x32/apps/knotify.png
-share/kde/icons/crystalsvg/32x32/apps/konqueror.png
-share/kde/icons/crystalsvg/32x32/apps/konsole.png
-share/kde/icons/crystalsvg/32x32/apps/kpager.png
 share/kde/icons/crystalsvg/32x32/apps/kpersonalizer.png
 share/kde/icons/crystalsvg/32x32/apps/kscreensaver.png
-share/kde/icons/crystalsvg/32x32/apps/ksplash.png
 share/kde/icons/crystalsvg/32x32/apps/ksysguard.png
 share/kde/icons/crystalsvg/32x32/apps/kthememgr.png
-share/kde/icons/crystalsvg/32x32/apps/ktip.png
 share/kde/icons/crystalsvg/32x32/apps/kvirc.png
 share/kde/icons/crystalsvg/32x32/apps/kwin.png
-share/kde/icons/crystalsvg/32x32/apps/kwrite.png
-share/kde/icons/crystalsvg/32x32/apps/kxkb.png
 share/kde/icons/crystalsvg/32x32/apps/licq.png
 share/kde/icons/crystalsvg/32x32/apps/linguist.png
 share/kde/icons/crystalsvg/32x32/apps/linuxconf.png
@@ -2602,17 +2616,19 @@ share/kde/icons/crystalsvg/32x32/apps/personal.png
 share/kde/icons/crystalsvg/32x32/apps/phppg.png
 share/kde/icons/crystalsvg/32x32/apps/plan.png
 share/kde/icons/crystalsvg/32x32/apps/planner.png
-share/kde/icons/crystalsvg/32x32/apps/printmgr.png
 share/kde/icons/crystalsvg/32x32/apps/proxy.png
 share/kde/icons/crystalsvg/32x32/apps/pybliographic.png
 share/kde/icons/crystalsvg/32x32/apps/pysol.png
 share/kde/icons/crystalsvg/32x32/apps/randr.png
 share/kde/icons/crystalsvg/32x32/apps/realplayer.png
+share/kde/icons/crystalsvg/32x32/apps/runprocesscatcher.png
 share/kde/icons/crystalsvg/32x32/apps/samba.png
 share/kde/icons/crystalsvg/32x32/apps/scribus.png
 share/kde/icons/crystalsvg/32x32/apps/sodipodi.png
 share/kde/icons/crystalsvg/32x32/apps/style.png
 share/kde/icons/crystalsvg/32x32/apps/stylesheet.png
+share/kde/icons/crystalsvg/32x32/apps/systemtray.png
+share/kde/icons/crystalsvg/32x32/apps/taskbar.png
 share/kde/icons/crystalsvg/32x32/apps/terminal.png
 share/kde/icons/crystalsvg/32x32/apps/thunderbird.png
 share/kde/icons/crystalsvg/32x32/apps/tux.png
@@ -2641,6 +2657,7 @@ share/kde/icons/crystalsvg/32x32/apps/xmms.png
 share/kde/icons/crystalsvg/32x32/apps/xosview.png
 share/kde/icons/crystalsvg/32x32/apps/xpaint.png
 share/kde/icons/crystalsvg/32x32/apps/xv.png
+share/kde/icons/crystalsvg/32x32/devices/laptop.png
 share/kde/icons/crystalsvg/48x48/apps/abiword.png
 share/kde/icons/crystalsvg/48x48/apps/access.png
 share/kde/icons/crystalsvg/48x48/apps/acroread.png
@@ -2670,6 +2687,7 @@ share/kde/icons/crystalsvg/48x48/apps/energy.png
 share/kde/icons/crystalsvg/48x48/apps/energy_star.png
 share/kde/icons/crystalsvg/48x48/apps/enhanced_browsing.png
 share/kde/icons/crystalsvg/48x48/apps/evolution.png
+share/kde/icons/crystalsvg/48x48/apps/fifteenpieces.png
 share/kde/icons/crystalsvg/48x48/apps/filetypes.png
 share/kde/icons/crystalsvg/48x48/apps/firefox.png
 share/kde/icons/crystalsvg/48x48/apps/fonts.png
@@ -2686,9 +2704,9 @@ share/kde/icons/crystalsvg/48x48/apps/help_index.png
 share/kde/icons/crystalsvg/48x48/apps/hwinfo.png
 share/kde/icons/crystalsvg/48x48/apps/icons.png
 share/kde/icons/crystalsvg/48x48/apps/iconthemes.png
+share/kde/icons/crystalsvg/48x48/apps/ieee1394.png
 share/kde/icons/crystalsvg/48x48/apps/input_devices_settings.png
-share/kde/icons/crystalsvg/48x48/apps/kappfinder.png
-share/kde/icons/crystalsvg/48x48/apps/kate.png
+share/kde/icons/crystalsvg/48x48/apps/kbinaryclock.png
 share/kde/icons/crystalsvg/48x48/apps/kcmdevices.png
 share/kde/icons/crystalsvg/48x48/apps/kcmdf.png
 share/kde/icons/crystalsvg/48x48/apps/kcmdrkonqi.png
@@ -2703,35 +2721,19 @@ share/kde/icons/crystalsvg/48x48/apps/kcmscsi.png
 share/kde/icons/crystalsvg/48x48/apps/kcmsystem.png
 share/kde/icons/crystalsvg/48x48/apps/kcmx.png
 share/kde/icons/crystalsvg/48x48/apps/kcontrol.png
-share/kde/icons/crystalsvg/48x48/apps/kdeprintfax.png
 share/kde/icons/crystalsvg/48x48/apps/kdisknav.png
 share/kde/icons/crystalsvg/48x48/apps/kdmconfig.png
 share/kde/icons/crystalsvg/48x48/apps/keditbookmarks.png
 share/kde/icons/crystalsvg/48x48/apps/key_bindings.png
 share/kde/icons/crystalsvg/48x48/apps/keyboard.png
 share/kde/icons/crystalsvg/48x48/apps/keyboard_layout.png
-share/kde/icons/crystalsvg/48x48/apps/kfind.png
-share/kde/icons/crystalsvg/48x48/apps/kfm.png
 share/kde/icons/crystalsvg/48x48/apps/kfm_home.png
-share/kde/icons/crystalsvg/48x48/apps/khelpcenter.png
-share/kde/icons/crystalsvg/48x48/apps/kjobviewer.png
-share/kde/icons/crystalsvg/48x48/apps/klipper.png
-share/kde/icons/crystalsvg/48x48/apps/kmenu.png
-share/kde/icons/crystalsvg/48x48/apps/kmenuedit.png
-share/kde/icons/crystalsvg/48x48/apps/knetattach.png
 share/kde/icons/crystalsvg/48x48/apps/knotify.png
-share/kde/icons/crystalsvg/48x48/apps/konqueror.png
-share/kde/icons/crystalsvg/48x48/apps/konsole.png
-share/kde/icons/crystalsvg/48x48/apps/kpager.png
 share/kde/icons/crystalsvg/48x48/apps/kscreensaver.png
-share/kde/icons/crystalsvg/48x48/apps/ksplash.png
 share/kde/icons/crystalsvg/48x48/apps/ksysguard.png
 share/kde/icons/crystalsvg/48x48/apps/kthememgr.png
-share/kde/icons/crystalsvg/48x48/apps/ktip.png
 share/kde/icons/crystalsvg/48x48/apps/kvirc.png
 share/kde/icons/crystalsvg/48x48/apps/kwin.png
-share/kde/icons/crystalsvg/48x48/apps/kwrite.png
-share/kde/icons/crystalsvg/48x48/apps/kxkb.png
 share/kde/icons/crystalsvg/48x48/apps/licq.png
 share/kde/icons/crystalsvg/48x48/apps/linuxconf.png
 share/kde/icons/crystalsvg/48x48/apps/locale.png
@@ -2767,7 +2769,6 @@ share/kde/icons/crystalsvg/48x48/apps/penguin.png
 share/kde/icons/crystalsvg/48x48/apps/personal.png
 share/kde/icons/crystalsvg/48x48/apps/phppg.png
 share/kde/icons/crystalsvg/48x48/apps/planner.png
-share/kde/icons/crystalsvg/48x48/apps/printmgr.png
 share/kde/icons/crystalsvg/48x48/apps/proxy.png
 share/kde/icons/crystalsvg/48x48/apps/pysol.png
 share/kde/icons/crystalsvg/48x48/apps/randr.png
@@ -2778,6 +2779,8 @@ share/kde/icons/crystalsvg/48x48/apps/sodipodi.png
 share/kde/icons/crystalsvg/48x48/apps/staroffice.png
 share/kde/icons/crystalsvg/48x48/apps/style.png
 share/kde/icons/crystalsvg/48x48/apps/stylesheet.png
+share/kde/icons/crystalsvg/48x48/apps/systemtray.png
+share/kde/icons/crystalsvg/48x48/apps/taskbar.png
 share/kde/icons/crystalsvg/48x48/apps/terminal.png
 share/kde/icons/crystalsvg/48x48/apps/tux.png
 share/kde/icons/crystalsvg/48x48/apps/usb.png
@@ -2793,6 +2796,7 @@ share/kde/icons/crystalsvg/48x48/apps/xemacs.png
 share/kde/icons/crystalsvg/48x48/apps/xfmail.png
 share/kde/icons/crystalsvg/48x48/apps/xmag.png
 share/kde/icons/crystalsvg/48x48/apps/xv.png
+share/kde/icons/crystalsvg/48x48/devices/laptop.png
 share/kde/icons/crystalsvg/64x64/apps/access.png
 share/kde/icons/crystalsvg/64x64/apps/acroread.png
 share/kde/icons/crystalsvg/64x64/apps/applixware.png
@@ -2816,8 +2820,7 @@ share/kde/icons/crystalsvg/64x64/apps/gvim.png
 share/kde/icons/crystalsvg/64x64/apps/help_index.png
 share/kde/icons/crystalsvg/64x64/apps/hwinfo.png
 share/kde/icons/crystalsvg/64x64/apps/icons.png
-share/kde/icons/crystalsvg/64x64/apps/kappfinder.png
-share/kde/icons/crystalsvg/64x64/apps/kate.png
+share/kde/icons/crystalsvg/64x64/apps/ieee1394.png
 share/kde/icons/crystalsvg/64x64/apps/kcmdevices.png
 share/kde/icons/crystalsvg/64x64/apps/kcmdf.png
 share/kde/icons/crystalsvg/64x64/apps/kcmkwm.png
@@ -2826,28 +2829,15 @@ share/kde/icons/crystalsvg/64x64/apps/kcmpartitions.png
 share/kde/icons/crystalsvg/64x64/apps/kcmpci.png
 share/kde/icons/crystalsvg/64x64/apps/kcmx.png
 share/kde/icons/crystalsvg/64x64/apps/kcontrol.png
-share/kde/icons/crystalsvg/64x64/apps/kdeprintfax.png
 share/kde/icons/crystalsvg/64x64/apps/kdmconfig.png
 share/kde/icons/crystalsvg/64x64/apps/keditbookmarks.png
 share/kde/icons/crystalsvg/64x64/apps/key_bindings.png
-share/kde/icons/crystalsvg/64x64/apps/kfind.png
-share/kde/icons/crystalsvg/64x64/apps/kfm.png
 share/kde/icons/crystalsvg/64x64/apps/kfm_home.png
-share/kde/icons/crystalsvg/64x64/apps/khelpcenter.png
-share/kde/icons/crystalsvg/64x64/apps/kjobviewer.png
-share/kde/icons/crystalsvg/64x64/apps/klipper.png
-share/kde/icons/crystalsvg/64x64/apps/kmenu.png
-share/kde/icons/crystalsvg/64x64/apps/knetattach.png
 share/kde/icons/crystalsvg/64x64/apps/knotify.png
-share/kde/icons/crystalsvg/64x64/apps/konqueror.png
-share/kde/icons/crystalsvg/64x64/apps/konsole.png
 share/kde/icons/crystalsvg/64x64/apps/kscreensaver.png
-share/kde/icons/crystalsvg/64x64/apps/ksplash.png
 share/kde/icons/crystalsvg/64x64/apps/ksysguard.png
 share/kde/icons/crystalsvg/64x64/apps/kthememgr.png
-share/kde/icons/crystalsvg/64x64/apps/ktip.png
 share/kde/icons/crystalsvg/64x64/apps/kvirc.png
-share/kde/icons/crystalsvg/64x64/apps/kwrite.png
 share/kde/icons/crystalsvg/64x64/apps/licq.png
 share/kde/icons/crystalsvg/64x64/apps/linuxconf.png
 share/kde/icons/crystalsvg/64x64/apps/locale.png
@@ -2869,7 +2859,6 @@ share/kde/icons/crystalsvg/64x64/apps/package_utilities.png
 share/kde/icons/crystalsvg/64x64/apps/penguin.png
 share/kde/icons/crystalsvg/64x64/apps/personal.png
 share/kde/icons/crystalsvg/64x64/apps/phppg.png
-share/kde/icons/crystalsvg/64x64/apps/printmgr.png
 share/kde/icons/crystalsvg/64x64/apps/proxy.png
 share/kde/icons/crystalsvg/64x64/apps/pysol.png
 share/kde/icons/crystalsvg/64x64/apps/qtella.png
@@ -2878,12 +2867,15 @@ share/kde/icons/crystalsvg/64x64/apps/samba.png
 share/kde/icons/crystalsvg/64x64/apps/staroffice.png
 share/kde/icons/crystalsvg/64x64/apps/style.png
 share/kde/icons/crystalsvg/64x64/apps/stylesheet.png
+share/kde/icons/crystalsvg/64x64/apps/systemtray.png
+share/kde/icons/crystalsvg/64x64/apps/taskbar.png
 share/kde/icons/crystalsvg/64x64/apps/terminal.png
 share/kde/icons/crystalsvg/64x64/apps/tux.png
 share/kde/icons/crystalsvg/64x64/apps/wp.png
 share/kde/icons/crystalsvg/64x64/apps/xclock.png
 share/kde/icons/crystalsvg/64x64/apps/xfmail.png
 share/kde/icons/crystalsvg/64x64/apps/xmag.png
+share/kde/icons/crystalsvg/64x64/devices/laptop.png
 share/kde/icons/crystalsvg/scalable/apps/access.svgz
 share/kde/icons/crystalsvg/scalable/apps/acroread.svgz
 share/kde/icons/crystalsvg/scalable/apps/aim.svgz
@@ -2906,26 +2898,19 @@ share/kde/icons/crystalsvg/scalable/apps/download_manager.svgz
 share/kde/icons/crystalsvg/scalable/apps/email.svgz
 share/kde/icons/crystalsvg/scalable/apps/energy.svgz
 share/kde/icons/crystalsvg/scalable/apps/error.svgz
+share/kde/icons/crystalsvg/scalable/apps/fifteenpieces.svgz
 share/kde/icons/crystalsvg/scalable/apps/filetypes.svgz
 share/kde/icons/crystalsvg/scalable/apps/fonts.svgz
 share/kde/icons/crystalsvg/scalable/apps/galeon.svgz
 share/kde/icons/crystalsvg/scalable/apps/gnome_apps.svgz
 share/kde/icons/crystalsvg/scalable/apps/hardware.svgz
 share/kde/icons/crystalsvg/scalable/apps/hwinfo.svgz
-share/kde/icons/crystalsvg/scalable/apps/kate2.svgz
+share/kde/icons/crystalsvg/scalable/apps/ieee1394.svgz
+share/kde/icons/crystalsvg/scalable/apps/kbinaryclock.svgz
 share/kde/icons/crystalsvg/scalable/apps/kcmdevices.svgz
 share/kde/icons/crystalsvg/scalable/apps/kcmkwm.svgz
 share/kde/icons/crystalsvg/scalable/apps/kcmx.svgz
-share/kde/icons/crystalsvg/scalable/apps/kdeprintfax.svgz
-share/kde/icons/crystalsvg/scalable/apps/khelpcenter.svgz
-share/kde/icons/crystalsvg/scalable/apps/kjobviewer.svgz
-share/kde/icons/crystalsvg/scalable/apps/klipper.svgz
-share/kde/icons/crystalsvg/scalable/apps/kmenu.svgz
-share/kde/icons/crystalsvg/scalable/apps/knetattach.svgz
-share/kde/icons/crystalsvg/scalable/apps/konqueror.svgz
-share/kde/icons/crystalsvg/scalable/apps/konsole.svgz
-share/kde/icons/crystalsvg/scalable/apps/ktip.svgz
-share/kde/icons/crystalsvg/scalable/apps/kwrite2.svgz
+share/kde/icons/crystalsvg/scalable/apps/kfm_home.svgz
 share/kde/icons/crystalsvg/scalable/apps/locale.svgz
 share/kde/icons/crystalsvg/scalable/apps/my_mac.svgz
 share/kde/icons/crystalsvg/scalable/apps/netscape.svgz
@@ -2934,13 +2919,13 @@ share/kde/icons/crystalsvg/scalable/apps/package_development.svgz
 share/kde/icons/crystalsvg/scalable/apps/package_toys.svgz
 share/kde/icons/crystalsvg/scalable/apps/penguin.svgz
 share/kde/icons/crystalsvg/scalable/apps/personal.svgz
-share/kde/icons/crystalsvg/scalable/apps/printmgr.svgz
 share/kde/icons/crystalsvg/scalable/apps/quicktime.svgz
 share/kde/icons/crystalsvg/scalable/apps/realplayer.svgz
 share/kde/icons/crystalsvg/scalable/apps/samba.svgz
 share/kde/icons/crystalsvg/scalable/apps/shell.svgz
 share/kde/icons/crystalsvg/scalable/apps/staroffice.svgz
 share/kde/icons/crystalsvg/scalable/apps/stylesheet.svgz
+share/kde/icons/crystalsvg/scalable/apps/systemtray.svgz
 share/kde/icons/crystalsvg/scalable/apps/terminal.svgz
 share/kde/icons/crystalsvg/scalable/apps/tux.svgz
 share/kde/icons/crystalsvg/scalable/apps/wine.svgz
@@ -2951,20 +2936,133 @@ share/kde/icons/crystalsvg/scalable/apps/xchat.svgz
 share/kde/icons/crystalsvg/scalable/apps/xclock.svgz
 share/kde/icons/crystalsvg/scalable/apps/xeyes.svgz
 share/kde/icons/crystalsvg/scalable/apps/xpaint.svgz
+share/kde/icons/crystalsvg/scalable/devices/laptop.svgz
+share/kde/icons/hicolor/128x128/apps/kappfinder.png
+share/kde/icons/hicolor/128x128/apps/kate.png
+share/kde/icons/hicolor/128x128/apps/kdeprintfax.png
+share/kde/icons/hicolor/128x128/apps/khelpcenter.png
+share/kde/icons/hicolor/128x128/apps/kjobviewer.png
+share/kde/icons/hicolor/128x128/apps/klipper.png
+share/kde/icons/hicolor/128x128/apps/knetattach.png
+share/kde/icons/hicolor/128x128/apps/konqueror.png
+share/kde/icons/hicolor/128x128/apps/konsole.png
+share/kde/icons/hicolor/128x128/apps/ksplash.png
+share/kde/icons/hicolor/128x128/apps/ktip.png
+share/kde/icons/hicolor/128x128/apps/kwrite.png
+share/kde/icons/hicolor/128x128/apps/printmgr.png
+share/kde/icons/hicolor/16x16/apps/kappfinder.png
+share/kde/icons/hicolor/16x16/apps/kate.png
+share/kde/icons/hicolor/16x16/apps/kdeprintfax.png
+share/kde/icons/hicolor/16x16/apps/kfind.png
+share/kde/icons/hicolor/16x16/apps/kfm.png
+share/kde/icons/hicolor/16x16/apps/khelpcenter.png
 share/kde/icons/hicolor/16x16/apps/khotkeys.png
+share/kde/icons/hicolor/16x16/apps/kjobviewer.png
+share/kde/icons/hicolor/16x16/apps/klipper.png
+share/kde/icons/hicolor/16x16/apps/kmenuedit.png
+share/kde/icons/hicolor/16x16/apps/knetattach.png
+share/kde/icons/hicolor/16x16/apps/konqueror.png
+share/kde/icons/hicolor/16x16/apps/konsole.png
+share/kde/icons/hicolor/16x16/apps/kpager.png
+share/kde/icons/hicolor/16x16/apps/ksplash.png
+share/kde/icons/hicolor/16x16/apps/ktip.png
+share/kde/icons/hicolor/16x16/apps/kwrite.png
+share/kde/icons/hicolor/16x16/apps/kxkb.png
+share/kde/icons/hicolor/16x16/apps/printmgr.png
+share/kde/icons/hicolor/22x22/apps/kappfinder.png
+share/kde/icons/hicolor/22x22/apps/kate.png
+share/kde/icons/hicolor/22x22/apps/kdeprintfax.png
+share/kde/icons/hicolor/22x22/apps/kfind.png
+share/kde/icons/hicolor/22x22/apps/kfm.png
+share/kde/icons/hicolor/22x22/apps/khelpcenter.png
+share/kde/icons/hicolor/22x22/apps/kjobviewer.png
+share/kde/icons/hicolor/22x22/apps/klipper.png
+share/kde/icons/hicolor/22x22/apps/kmenuedit.png
+share/kde/icons/hicolor/22x22/apps/knetattach.png
+share/kde/icons/hicolor/22x22/apps/konqueror.png
+share/kde/icons/hicolor/22x22/apps/konsole.png
+share/kde/icons/hicolor/22x22/apps/kpager.png
+share/kde/icons/hicolor/22x22/apps/ksplash.png
+share/kde/icons/hicolor/22x22/apps/ktip.png
+share/kde/icons/hicolor/22x22/apps/kwrite.png
+share/kde/icons/hicolor/22x22/apps/printmgr.png
+share/kde/icons/hicolor/32x32/apps/kappfinder.png
+share/kde/icons/hicolor/32x32/apps/kate.png
+share/kde/icons/hicolor/32x32/apps/kdeprintfax.png
+share/kde/icons/hicolor/32x32/apps/kfind.png
+share/kde/icons/hicolor/32x32/apps/kfm.png
+share/kde/icons/hicolor/32x32/apps/khelpcenter.png
 share/kde/icons/hicolor/32x32/apps/khotkeys.png
-share/kde/mimelnk/application/x-kate-project.desktop
+share/kde/icons/hicolor/32x32/apps/kjobviewer.png
+share/kde/icons/hicolor/32x32/apps/klipper.png
+share/kde/icons/hicolor/32x32/apps/kmenuedit.png
+share/kde/icons/hicolor/32x32/apps/knetattach.png
+share/kde/icons/hicolor/32x32/apps/konqueror.png
+share/kde/icons/hicolor/32x32/apps/konsole.png
+share/kde/icons/hicolor/32x32/apps/kpager.png
+share/kde/icons/hicolor/32x32/apps/ksplash.png
+share/kde/icons/hicolor/32x32/apps/ktip.png
+share/kde/icons/hicolor/32x32/apps/kwrite.png
+share/kde/icons/hicolor/32x32/apps/kxkb.png
+share/kde/icons/hicolor/32x32/apps/printmgr.png
+share/kde/icons/hicolor/48x48/apps/kappfinder.png
+share/kde/icons/hicolor/48x48/apps/kate.png
+share/kde/icons/hicolor/48x48/apps/kdeprintfax.png
+share/kde/icons/hicolor/48x48/apps/kfind.png
+share/kde/icons/hicolor/48x48/apps/kfm.png
+share/kde/icons/hicolor/48x48/apps/khelpcenter.png
+share/kde/icons/hicolor/48x48/apps/kjobviewer.png
+share/kde/icons/hicolor/48x48/apps/klipper.png
+share/kde/icons/hicolor/48x48/apps/kmenuedit.png
+share/kde/icons/hicolor/48x48/apps/knetattach.png
+share/kde/icons/hicolor/48x48/apps/konqueror.png
+share/kde/icons/hicolor/48x48/apps/konsole.png
+share/kde/icons/hicolor/48x48/apps/kpager.png
+share/kde/icons/hicolor/48x48/apps/ksplash.png
+share/kde/icons/hicolor/48x48/apps/ktip.png
+share/kde/icons/hicolor/48x48/apps/kwrite.png
+share/kde/icons/hicolor/48x48/apps/kxkb.png
+share/kde/icons/hicolor/48x48/apps/printmgr.png
+share/kde/icons/hicolor/64x64/apps/kappfinder.png
+share/kde/icons/hicolor/64x64/apps/kate.png
+share/kde/icons/hicolor/64x64/apps/kdeprintfax.png
+share/kde/icons/hicolor/64x64/apps/kfind.png
+share/kde/icons/hicolor/64x64/apps/kfm.png
+share/kde/icons/hicolor/64x64/apps/khelpcenter.png
+share/kde/icons/hicolor/64x64/apps/kjobviewer.png
+share/kde/icons/hicolor/64x64/apps/klipper.png
+share/kde/icons/hicolor/64x64/apps/knetattach.png
+share/kde/icons/hicolor/64x64/apps/konqueror.png
+share/kde/icons/hicolor/64x64/apps/konsole.png
+share/kde/icons/hicolor/64x64/apps/ksplash.png
+share/kde/icons/hicolor/64x64/apps/ktip.png
+share/kde/icons/hicolor/64x64/apps/kwrite.png
+share/kde/icons/hicolor/64x64/apps/printmgr.png
+share/kde/icons/hicolor/scalable/apps/kate2.svgz
+share/kde/icons/hicolor/scalable/apps/kdeprintfax.svgz
+share/kde/icons/hicolor/scalable/apps/khelpcenter.svgz
+share/kde/icons/hicolor/scalable/apps/kjobviewer.svgz
+share/kde/icons/hicolor/scalable/apps/klipper.svgz
+share/kde/icons/hicolor/scalable/apps/knetattach.svgz
+share/kde/icons/hicolor/scalable/apps/konqueror.svgz
+share/kde/icons/hicolor/scalable/apps/konsole.svgz
+share/kde/icons/hicolor/scalable/apps/ktip.svgz
+share/kde/icons/hicolor/scalable/apps/kwrite2.svgz
+share/kde/icons/hicolor/scalable/apps/printmgr.svgz
 share/kde/mimelnk/application/x-konsole.desktop
 share/kde/mimelnk/application/x-ksysguard.desktop
 share/kde/mimelnk/application/x-ktheme.desktop
 ${HAVE_SMB}share/kde/mimelnk/application/x-smb-server.desktop
 ${HAVE_SMB}share/kde/mimelnk/application/x-smb-workgroup.desktop
 share/kde/mimelnk/fonts/folder.desktop
+share/kde/mimelnk/fonts/package.desktop
 share/kde/mimelnk/fonts/system-folder.desktop
 share/kde/mimelnk/inode/system_directory.desktop
 share/kde/mimelnk/media/audiocd.desktop
 share/kde/mimelnk/media/blankcd.desktop
 share/kde/mimelnk/media/blankdvd.desktop
+share/kde/mimelnk/media/camera_mounted.desktop
+share/kde/mimelnk/media/camera_unmounted.desktop
 share/kde/mimelnk/media/cdrom_mounted.desktop
 share/kde/mimelnk/media/cdrom_unmounted.desktop
 share/kde/mimelnk/media/cdwriter_mounted.desktop
@@ -3011,23 +3109,25 @@ share/kde/services/floppy.protocol
 share/kde/services/fonts.protocol
 share/kde/services/fontthumbnail.desktop
 share/kde/services/gzip.protocol
+share/kde/services/home.protocol
 share/kde/services/htmlthumbnail.desktop
 share/kde/services/imagethumbnail.desktop
 share/kde/services/info.protocol
 share/kde/services/kaccess.desktop
-share/kde/services/katedefaultproject.desktop
-share/kde/services/katekttsd.desktop
 share/kde/services/kded/favicons.desktop
+share/kde/services/kded/homedirnotify.desktop
 share/kde/services/kded/khotkeys.desktop
 share/kde/services/kded/konqy_preloader.desktop
 share/kde/services/kded/kwrited.desktop
 share/kde/services/kded/mediamanager.desktop
+share/kde/services/kded/medianotifier.desktop
 share/kde/services/kded/remotedirnotify.desktop
 share/kde/services/kded/systemdirnotify.desktop
 share/kde/services/kdeprint_part.desktop
 share/kde/services/kfile_font.desktop
 share/kde/services/kfile_media.desktop
 share/kde/services/kfile_trash.desktop
+share/kde/services/kfile_trash_system.desktop
 share/kde/services/kfindpart.desktop
 share/kde/services/kfontviewpart.desktop
 share/kde/services/khelpcenter.desktop
@@ -3059,7 +3159,8 @@ share/kde/services/man.protocol
 share/kde/services/media.protocol
 share/kde/services/nfs.protocol
 share/kde/services/nntp.protocol
-share/kde/services/picturethumbnail.desktop
+share/kde/services/nntps.protocol
+share/kde/services/nxfish.protocol
 share/kde/services/pop3.protocol
 share/kde/services/pop3s.protocol
 share/kde/services/print.protocol
@@ -3109,6 +3210,7 @@ share/kde/services/searchproviders/google_advanced.desktop
 share/kde/services/searchproviders/google_groups.desktop
 share/kde/services/searchproviders/google_images.desktop
 share/kde/services/searchproviders/google_lucky.desktop
+share/kde/services/searchproviders/google_movie.desktop
 share/kde/services/searchproviders/google_news.desktop
 share/kde/services/searchproviders/gracenote.desktop
 share/kde/services/searchproviders/grec.desktop
@@ -3120,7 +3222,7 @@ share/kde/services/searchproviders/it2en.desktop
 share/kde/services/searchproviders/jeeves.desktop
 share/kde/services/searchproviders/katatudo.desktop
 share/kde/services/searchproviders/kde.desktop
-share/kde/services/searchproviders/kde_webcvs.desktop
+share/kde/services/searchproviders/kde_websvn.desktop
 share/kde/services/searchproviders/leo.desktop
 share/kde/services/searchproviders/lycos.desktop
 share/kde/services/searchproviders/mamma.desktop
@@ -3133,12 +3235,15 @@ share/kde/services/searchproviders/pgpkeys.desktop
 share/kde/services/searchproviders/php.desktop
 share/kde/services/searchproviders/python.desktop
 share/kde/services/searchproviders/qt.desktop
+share/kde/services/searchproviders/qt3.desktop
 share/kde/services/searchproviders/rae.desktop
 share/kde/services/searchproviders/rfc.desktop
 share/kde/services/searchproviders/rpmfind.desktop
 share/kde/services/searchproviders/ruby_application_archive.desktop
 share/kde/services/searchproviders/seek.desktop
 share/kde/services/searchproviders/sourceforge.desktop
+share/kde/services/searchproviders/technorati.desktop
+share/kde/services/searchproviders/technoratitags.desktop
 share/kde/services/searchproviders/thesaurus.desktop
 share/kde/services/searchproviders/tvtome.desktop
 share/kde/services/searchproviders/uspto.desktop
@@ -3147,6 +3252,7 @@ share/kde/services/searchproviders/voila.desktop
 share/kde/services/searchproviders/webster.desktop
 share/kde/services/searchproviders/whatis.desktop
 share/kde/services/searchproviders/wikipedia.desktop
+share/kde/services/searchproviders/wiktionary.desktop
 share/kde/services/searchproviders/wordref.desktop
 share/kde/services/settings.protocol
 share/kde/services/sftp.protocol
@@ -3161,6 +3267,7 @@ share/kde/services/trash.protocol
 share/kde/services/useragentstrings/firefoxoncurrent.desktop
 share/kde/services/useragentstrings/googlebot.desktop
 share/kde/services/useragentstrings/ie401onwinnt4.desktop
+share/kde/services/useragentstrings/ie45onwinnt5.desktop
 share/kde/services/useragentstrings/ie501onwinnt5.desktop
 share/kde/services/useragentstrings/ie50onppc.desktop
 share/kde/services/useragentstrings/ie55onwin98.desktop
@@ -3186,9 +3293,7 @@ share/kde/services/useragentstrings/w3moncurrent.desktop
 share/kde/services/useragentstrings/wgetoncurrent.desktop
 share/kde/services/zip.protocol
 share/kde/servicetypes/findpart.desktop
-share/kde/servicetypes/kateinitplugin.desktop
 share/kde/servicetypes/kateplugin.desktop
-share/kde/servicetypes/kateprojectplugin.desktop
 share/kde/servicetypes/konqaboutpage.desktop
 share/kde/servicetypes/konqpopupmenuplugin.desktop
 share/kde/servicetypes/ksplashplugins.desktop
@@ -3334,32 +3439,20 @@ share/kde/templates/linkURL.desktop
 share/kde/templates/linkZIP.desktop
 share/kde/wallpapers/All-Good-People-1.jpg
 share/kde/wallpapers/All-Good-People-1.jpg.desktop
-share/kde/wallpapers/Blkmarble.jpg
-share/kde/wallpapers/Blkmarble.jpg.desktop
 share/kde/wallpapers/Chicken-Songs-2.jpg
 share/kde/wallpapers/Chicken-Songs-2.jpg.desktop
-share/kde/wallpapers/Circuit.jpg
-share/kde/wallpapers/Circuit.jpg.desktop
-share/kde/wallpapers/Foggy1.jpg
-share/kde/wallpapers/Foggy1.jpg.desktop
-share/kde/wallpapers/Island-of-Elba.jpg
-share/kde/wallpapers/Island-of-Elba.jpg.desktop
 share/kde/wallpapers/KDE34.png
 share/kde/wallpapers/KDE34.png.desktop
-share/kde/wallpapers/Marble01.jpg
-share/kde/wallpapers/Marble01.jpg.desktop
 share/kde/wallpapers/No-Ones-Laughing-3.jpg
 share/kde/wallpapers/No-Ones-Laughing-3.jpg.desktop
-share/kde/wallpapers/Paper01.jpg
-share/kde/wallpapers/Paper01.jpg.desktop
-share/kde/wallpapers/Planning-And-Probing-1.jpg
-share/kde/wallpapers/Planning-And-Probing-1.jpg.desktop
 share/kde/wallpapers/Time-For-Lunch-2.jpg
 share/kde/wallpapers/Time-For-Lunch-2.jpg.desktop
 share/kde/wallpapers/Totally-New-Product-1.jpg
 share/kde/wallpapers/Totally-New-Product-1.jpg.desktop
 share/kde/wallpapers/Won-Ton-Soup-3.jpg
 share/kde/wallpapers/Won-Ton-Soup-3.jpg.desktop
+share/kde/wallpapers/alta-badia.jpg
+share/kde/wallpapers/alta-badia.jpg.desktop
 share/kde/wallpapers/andes-venezolanos.svgz
 share/kde/wallpapers/andes-venezolanos.svgz.desktop
 share/kde/wallpapers/aurora.svgz
@@ -3372,28 +3465,26 @@ share/kde/wallpapers/default_blue.jpg
 share/kde/wallpapers/default_blue.jpg.desktop
 share/kde/wallpapers/default_gears.jpg
 share/kde/wallpapers/default_gears.jpg.desktop
-share/kde/wallpapers/fulmine.jpg
-share/kde/wallpapers/fulmine.jpg.desktop
-share/kde/wallpapers/gear-flowers.svgz
-share/kde/wallpapers/gear-flowers.svgz.desktop
+share/kde/wallpapers/floating-leaves.jpg
+share/kde/wallpapers/floating-leaves.jpg.desktop
 share/kde/wallpapers/globe.svgz
 share/kde/wallpapers/globe.svgz.desktop
 share/kde/wallpapers/here-gear.svgz
 share/kde/wallpapers/here-gear.svgz.desktop
-share/kde/wallpapers/kde_box.png
-share/kde/wallpapers/kde_box.png.desktop
-share/kde/wallpapers/kde_passion.jpg
-share/kde/wallpapers/kde_passion.jpg.desktop
 share/kde/wallpapers/konqui.svgz
 share/kde/wallpapers/konqui.svgz.desktop
 share/kde/wallpapers/lineart.svgz
 share/kde/wallpapers/lineart.svgz.desktop
 share/kde/wallpapers/moon.svgz
 share/kde/wallpapers/moon.svgz.desktop
-share/kde/wallpapers/only_k.jpg
-share/kde/wallpapers/only_k.jpg.desktop
 share/kde/wallpapers/seaofconero.jpg
 share/kde/wallpapers/seaofconero.jpg.desktop
+share/kde/wallpapers/soft-green.jpg
+share/kde/wallpapers/soft-green.jpg.desktop
+share/kde/wallpapers/stelvio.jpg
+share/kde/wallpapers/stelvio.jpg.desktop
+share/kde/wallpapers/sunshine-after-the-rain.jpg
+share/kde/wallpapers/sunshine-after-the-rain.jpg.desktop
 share/kde/wallpapers/triplegears.jpg
 share/kde/wallpapers/triplegears.jpg.desktop
 ${PKGLOCALEDIR}/locale/en_US/entry.desktop
@@ -3427,6 +3518,8 @@ ${PKGLOCALEDIR}/locale/l10n/au/entry.desktop
 ${PKGLOCALEDIR}/locale/l10n/au/flag.png
 ${PKGLOCALEDIR}/locale/l10n/aw/entry.desktop
 ${PKGLOCALEDIR}/locale/l10n/aw/flag.png
+${PKGLOCALEDIR}/locale/l10n/ax/entry.desktop
+${PKGLOCALEDIR}/locale/l10n/ax/flag.png
 ${PKGLOCALEDIR}/locale/l10n/az/entry.desktop
 ${PKGLOCALEDIR}/locale/l10n/az/flag.png
 ${PKGLOCALEDIR}/locale/l10n/ba/entry.desktop
@@ -3558,6 +3651,8 @@ ${PKGLOCALEDIR}/locale/l10n/gh/entry.desktop
 ${PKGLOCALEDIR}/locale/l10n/gh/flag.png
 ${PKGLOCALEDIR}/locale/l10n/gi/entry.desktop
 ${PKGLOCALEDIR}/locale/l10n/gi/flag.png
+${PKGLOCALEDIR}/locale/l10n/gl/entry.desktop
+${PKGLOCALEDIR}/locale/l10n/gl/flag.png
 ${PKGLOCALEDIR}/locale/l10n/gm/entry.desktop
 ${PKGLOCALEDIR}/locale/l10n/gm/flag.png
 ${PKGLOCALEDIR}/locale/l10n/gn/entry.desktop
@@ -4017,6 +4112,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm ${PKGLOCALEDIR}/locale/l10n/gp
 @dirrm ${PKGLOCALEDIR}/locale/l10n/gn
 @dirrm ${PKGLOCALEDIR}/locale/l10n/gm
+@dirrm ${PKGLOCALEDIR}/locale/l10n/gl
 @dirrm ${PKGLOCALEDIR}/locale/l10n/gi
 @dirrm ${PKGLOCALEDIR}/locale/l10n/gh
 @dirrm ${PKGLOCALEDIR}/locale/l10n/ge
@@ -4079,6 +4175,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm ${PKGLOCALEDIR}/locale/l10n/bb
 @dirrm ${PKGLOCALEDIR}/locale/l10n/ba
 @dirrm ${PKGLOCALEDIR}/locale/l10n/az
+@dirrm ${PKGLOCALEDIR}/locale/l10n/ax
 @dirrm ${PKGLOCALEDIR}/locale/l10n/aw
 @dirrm ${PKGLOCALEDIR}/locale/l10n/au
 @dirrm ${PKGLOCALEDIR}/locale/l10n/at
@@ -4111,17 +4208,29 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @comment in kde: @dirrm share/kde/mimelnk/inode
 @comment in kde: @dirrm share/kde/mimelnk/fonts
 @comment in kde: @dirrm share/kde/mimelnk/application
+@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
 @comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
 @comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
+@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps
+@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps
 @comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions
+@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/devices
 @comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps
 @comment in kde: @dirrm share/kde/icons
 @dirrm share/kde/fonts/override
@@ -4170,6 +4279,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm share/kde/apps/ksmserver
 @dirrm share/kde/apps/kpersonalizer/pics
 @dirrm share/kde/apps/kpersonalizer
+@dirrm share/kde/apps/konsole/wallpapers
 @dirrm share/kde/apps/konsole/profiles
 @dirrm share/kde/apps/konsole/icons/crystalsvg/32x32/actions
 @dirrm share/kde/apps/konsole/icons/crystalsvg/32x32
@@ -4179,6 +4289,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm share/kde/apps/konsole/icons/crystalsvg/16x16
 @dirrm share/kde/apps/konsole/icons/crystalsvg
 @dirrm share/kde/apps/konsole/icons
+@dirrm share/kde/apps/konsole/fonts
 @dirrm share/kde/apps/konsole
 @dirrm share/kde/apps/konqueror/tiles
 @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
@@ -4218,6 +4329,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm share/kde/apps/kmenuedit/icons
 @dirrm share/kde/apps/kmenuedit
 @dirrm share/kde/apps/kjobviewer
+@dirrm share/kde/apps/kio_man
 @dirrm share/kde/apps/kio_info
 @dirrm share/kde/apps/kio_finger
 @dirrm share/kde/apps/kinfocenter
@@ -4234,6 +4346,7 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
 @dirrm share/kde/apps/kicker/icons/crystalsvg
 @dirrm share/kde/apps/kicker/icons
 @comment in kde: @dirrm share/kde/apps/kicker/extensions
+@dirrm share/kde/apps/kicker/builtins
 @comment in kde: @dirrm share/kde/apps/kicker/applets
 @comment in kde: @dirrm share/kde/apps/kicker
 @comment in kde: @dirrm share/kde/apps/khtml/kpartplugins
@@ -4302,11 +4415,9 @@ ${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/kde/apps/kcmcss
 @comment in kde: @dirrm share/kde/apps/kcm_componentchooser
 @dirrm share/kde/apps/kbookmark
-@dirrm share/kde/apps/katepart/kpartplugins
 @comment in kde: @dirrm share/kde/apps/kate/scripts
-@dirrm share/kde/apps/kate/plugins/katekttsd
-@dirrm share/kde/apps/kate/plugins/katedefaultproject
 @comment in kde: @dirrm share/kde/apps/kate/plugins
+@dirrm share/kde/apps/kate/pics
 @dirrm share/kde/apps/kate/icons/locolor/22x22/actions
 @dirrm share/kde/apps/kate/icons/locolor/22x22
 @dirrm share/kde/apps/kate/icons/locolor/16x16/actions
@@ -4320,8 +4431,8 @@ ${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/kde/apps/kate/icons
 @comment in kde: @dirrm share/kde/apps/kate
 @dirrm share/kde/apps/kappfinder/apps/Utilities/XUtilities
+@dirrm share/kde/apps/kappfinder/apps/Utilities/Editors
 @dirrm share/kde/apps/kappfinder/apps/Utilities
-@dirrm share/kde/apps/kappfinder/apps/Toys
 @dirrm share/kde/apps/kappfinder/apps/System/Terminal
 @dirrm share/kde/apps/kappfinder/apps/System
 @dirrm share/kde/apps/kappfinder/apps/Office
@@ -4329,6 +4440,7 @@ ${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/kde/apps/kappfinder/apps/Internet/Terminal
 @dirrm share/kde/apps/kappfinder/apps/Internet
 @dirrm share/kde/apps/kappfinder/apps/Graphics
+@dirrm share/kde/apps/kappfinder/apps/Games/Toys
 @dirrm share/kde/apps/kappfinder/apps/Games/TacticStrategy
 @dirrm share/kde/apps/kappfinder/apps/Games/Roguelikes
 @dirrm share/kde/apps/kappfinder/apps/Games/Emulators
@@ -4336,10 +4448,10 @@ ${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/kde/apps/kappfinder/apps/Games/Board
 @dirrm share/kde/apps/kappfinder/apps/Games/Arcade
 @dirrm share/kde/apps/kappfinder/apps/Games
-@dirrm share/kde/apps/kappfinder/apps/Editors
 @dirrm share/kde/apps/kappfinder/apps/Development
 @dirrm share/kde/apps/kappfinder/apps
 @dirrm share/kde/apps/kappfinder
+@dirrm share/kde/apps/kaccess
 @dirrm share/kde/apps/drkonqi/presets
 @dirrm share/kde/apps/drkonqi/pics
 @dirrm share/kde/apps/drkonqi/debuggers
@@ -4371,6 +4483,7 @@ ${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/doc/kde/HTML/en/kpager
 @dirrm share/doc/kde/HTML/en/konsole
 @dirrm share/doc/kde/HTML/en/konqueror
+@dirrm share/doc/kde/HTML/en/kompmgr
 @dirrm share/doc/kde/HTML/en/knetattach
 @dirrm share/doc/kde/HTML/en/kmenuedit
 @dirrm share/doc/kde/HTML/en/klipper
@@ -4425,6 +4538,7 @@ ${HAVE_USBVIEW}@dirrm share/kde/apps/kcmusb
 @dirrm share/doc/kde/HTML/en/kcontrol/smb
 @dirrm share/doc/kde/HTML/en/kcontrol/screensaver
 @dirrm share/doc/kde/HTML/en/kcontrol/proxy
+@dirrm share/doc/kde/HTML/en/kcontrol/performance
 @dirrm share/doc/kde/HTML/en/kcontrol/passwords
 @dirrm share/doc/kde/HTML/en/kcontrol/panelappearance
 @dirrm share/doc/kde/HTML/en/kcontrol/panel
diff --git a/x11/kdebase3/buildlink3.mk b/x11/kdebase3/buildlink3.mk
index 4cf663ea88f..2c4c7759627 100644
--- a/x11/kdebase3/buildlink3.mk
+++ b/x11/kdebase3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2005/05/11 22:08:19 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2005/12/11 11:01:48 markd Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDEBASE_BUILDLINK3_MK:=	${KDEBASE_BUILDLINK3_MK}+
@@ -12,7 +12,7 @@ BUILDLINK_PACKAGES+=	kdebase
 
 .if !empty(KDEBASE_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdebase+=	kdebase>=3.2.0
-BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.4.0
+BUILDLINK_RECOMMENDED.kdebase?=	kdebase>=3.5.0
 BUILDLINK_PKGSRCDIR.kdebase?=	../../x11/kdebase3
 .endif	# KDEBASE_BUILDLINK3_MK
 
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 6a5748c1658..340ae12f5f8 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.76 2005/11/09 22:26:21 wiz Exp $
+$NetBSD: distinfo,v 1.77 2005/12/11 11:01:48 markd Exp $
 
-SHA1 (kdebase-3.4.3.tar.bz2) = 87b72aaf291fdb78fa9feb9acf4476d41485e486
-RMD160 (kdebase-3.4.3.tar.bz2) = 7af02903b0fc750e7b9778391ef8948b54f69ce7
-Size (kdebase-3.4.3.tar.bz2) = 22425835 bytes
+SHA1 (kdebase-3.5.0.tar.bz2) = 8826fdd8884151cf224442da78d23d5685bd21e9
+RMD160 (kdebase-3.5.0.tar.bz2) = 5f8d5735a468f1c4e42cccfc0f006e63e3c3c762
+Size (kdebase-3.5.0.tar.bz2) = 23233185 bytes
 SHA1 (Daemon.png) = e77a42c644beecd66c4b95c0ae68c08c728a4e6d
 RMD160 (Daemon.png) = eb317dc7ac501ee03aac1276856eee14674e3da7
 Size (Daemon.png) = 15725 bytes
@@ -21,8 +21,9 @@ SHA1 (patch-ag) = 89f50ee8b328cd654aebf1da5424e87eb6b42628
 SHA1 (patch-aj) = bedd17a5a04bff32e4441ed1750ae8ab5a4fa323
 SHA1 (patch-ak) = df7ff2bf5ed6bb2442d49df1c277712712a7f966
 SHA1 (patch-al) = 555384dc03ab59845e5794e081dd5d1a92e2959e
+SHA1 (patch-am) = 07ed2a5717a8f72bc36906ef4fafc360ac63479c
 SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
-SHA1 (patch-bc) = c236cc8b3f9caebf2540425232f2d90ec66c70d1
+SHA1 (patch-bc) = fd7e784b584763b7351dbdaefda58443bd1aaadb
 SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
 SHA1 (patch-da) = 06da421a8adcb54712e7c04125cffa9bef9003fb
 SHA1 (patch-db) = f67ffaf0676484db40759574cc2822ad0d6933bd
@@ -30,7 +31,7 @@ SHA1 (patch-dc) = dd44652ad806d49d45ef86cbff58a01e506deeee
 SHA1 (patch-dd) = 4c98e62275ce9a632f79f99110e8fb4995e3f017
 SHA1 (patch-de) = 94d7f083784b8b56c2b23c320772a80a27df19d1
 SHA1 (patch-df) = ee6f6967d77d13217055d69dcf8be98b48d40598
-SHA1 (patch-ep) = 10e341753321415043b08cad0494a269f8d19643
+SHA1 (patch-ep) = a8124ccde88b487591107fbe16d0f29c16c5f78a
 SHA1 (patch-er) = 77df7513b54e09ef81100a75da45c2ed2e520380
 SHA1 (patch-ev) = 551dc4d79b637e15a580eb1dcd2f0930ff1e3dbc
 SHA1 (patch-ew) = f8f95cf602a9d88f620d5546ad58b87d5e6be2a5
diff --git a/x11/kdebase3/patches/patch-bc b/x11/kdebase3/patches/patch-bc
index f6ae19992fc..61d31300d5e 100644
--- a/x11/kdebase3/patches/patch-bc
+++ b/x11/kdebase3/patches/patch-bc
@@ -1,7 +1,7 @@
-$NetBSD: patch-bc,v 1.3 2004/08/21 12:35:15 markd Exp $
+$NetBSD: patch-bc,v 1.4 2005/12/11 11:01:48 markd Exp $
 
---- kdesktop/kdeeject.orig	2004-05-23 08:26:46.000000000 +1200
-+++ kdesktop/kdeeject
+--- kdeeject/kdeeject.orig	2005-09-10 20:25:38.000000000 +1200
++++ kdeeject/kdeeject
 @@ -1,6 +1,6 @@
  #!/bin/sh
  # Script used by kdesktop to eject a removable media (CDROM/Tape/SCSI/Floppy)
@@ -10,7 +10,7 @@ $NetBSD: patch-bc,v 1.3 2004/08/21 12:35:15 markd Exp $
  #
  # Copyright GPL v2 by David Faure <david@mandrakesoft.com>
  #
-@@ -12,7 +12,7 @@ if [ $# = 1 -a "$1" != "--help" ]; then
+@@ -17,7 +17,7 @@ if test $# -ge 1 -a "$1" != "--help"; th
      OpenBSD)
        cdio -f $1 eject >/dev/null 2>&1
        ;;
diff --git a/x11/kdebase3/patches/patch-ep b/x11/kdebase3/patches/patch-ep
index 9aad7669b3b..8daea302368 100644
--- a/x11/kdebase3/patches/patch-ep
+++ b/x11/kdebase3/patches/patch-ep
@@ -1,8 +1,8 @@
-$NetBSD: patch-ep,v 1.5 2004/02/04 14:25:59 markd Exp $
+$NetBSD: patch-ep,v 1.6 2005/12/11 11:01:48 markd Exp $
 
---- startkde.orig	2003-10-26 23:45:35.000000000 +1300
+--- startkde.orig	2005-11-09 11:37:01.000000000 +1300
 +++ startkde
-@@ -24,7 +24,7 @@ unset DYLD_FORCE_FLAT_NAMESPACE
+@@ -48,7 +48,7 @@ fi
  #
  # * Then ksmserver is started which in turn starts
  #   1) the window manager (kwin)
@@ -11,7 +11,28 @@ $NetBSD: patch-ep,v 1.5 2004/02/04 14:25:59 markd Exp $
  #   3) the rest of the session.
  
  # The user's personal KDE directory is usually ~/.kde, but this setting
-@@ -77,11 +77,11 @@ fi
+@@ -60,8 +60,9 @@ test -n "$KDEHOME" && kdehome=`echo "$KD
+ # see kstartupconfig source for usage
+ mkdir -m 700 -p $kdehome
+ mkdir -m 700 -p $kdehome/share
+-mkdir -m 700 -p $kdehome/share/config
+-cat >$kdehome/share/config/startupconfigkeys <<EOF
++mkdir -m 700 -p $kdehome/share/kde
++mkdir -m 700 -p $kdehome/share/kde/config
++cat >$kdehome/share/kde/config/startupconfigkeys <<EOF
+ kcminputrc Mouse cursorTheme ''
+ kcminputrc Mouse cursorSize ''
+ kpersonalizerrc General FirstLogin true
+@@ -76,7 +77,7 @@ kstartupconfig
+ if test $? -ne 0; then
+     xmessage -geometry 500x100 "Could not start kstartupconfig. Check your installation."
+ fi
+-. $kdehome/share/config/startupconfig
++. $kdehome/share/kde/config/startupconfig
+ 
+ # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
+ if test -n "$kcminputrc_mouse_cursortheme" -o -n "$kcminputrc_mouse_cursorsize" ; then
+@@ -200,11 +201,11 @@ fi
  
  if test -n "$KDEDIRS"; then
    kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index d9f882b060f..9131a8e7c43 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2005/12/05 20:51:17 rillig Exp $
+# $NetBSD: Makefile,v 1.96 2005/12/11 10:53:54 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
 CATEGORIES=	x11
@@ -43,6 +43,7 @@ SUBST_STAGE.kdelibsfix=		pre-configure
 SUBST_MESSAGE.kdelibsfix=	"Fixing hardcoded paths."
 SUBST_FILES.kdelibsfix= \
 	kdecore/kstandarddirs.cpp \
+	kdecore/ktimezones.cpp \
 	kdeui/ksconfig.cpp \
 	kio/kssl/kopenssl.cc
 SUBST_SED.kdelibsfix=		-e 's:@LOCALBASE@:${LOCALBASE}:g' \
@@ -80,8 +81,10 @@ PLIST_SUBST+=		KDED_WORKAROUND="@comment "
 .  else
 PLIST_SUBST+=		KDED_WORKAROUND=""
 .  endif
+PLIST_SUBST+=		NEED_ZONETAB=""
 .else
 PLIST_SUBST+=		KDED_WORKAROUND=""
+PLIST_SUBST+=		NEED_ZONETAB="@comment "
 .endif
 
 .include "../../mk/krb5.buildlink3.mk"
@@ -89,6 +92,7 @@ CONFIGURE_ARGS+=	--with-gssapi=yes
 
 post-install:
 .if ${OPSYS} == "NetBSD"
+	${INSTALL_DATA} ${FILESDIR}/zone.tab ${PREFIX}/share
 .  if ${OS_VERSION:M1.5.[12]*} || ${OS_VERSION:M1.[0-4]*}
 	@${RM} ${PREFIX}/lib/kded.*
 .  endif
diff --git a/x11/kdelibs3/PLIST b/x11/kdelibs3/PLIST
index a86abc42bae..d64ea26c9de 100644
--- a/x11/kdelibs3/PLIST
+++ b/x11/kdelibs3/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2005/10/13 12:31:59 markd Exp $
+@comment $NetBSD: PLIST,v 1.28 2005/12/11 10:53:54 markd Exp $
 bin/artsmessage
 bin/checkXML
 ${CUPS}bin/cupsdconf
@@ -33,11 +33,11 @@ bin/kdeinit_shutdown
 bin/kdeinit_wrapper
 bin/kdesu_stub
 bin/kdontchangethehostname
+bin/kdostartupconfig
 bin/kfile
 bin/kfmexec
 bin/kgrantpty
 bin/khotnewstuff
-bin/kimage_concat
 bin/kinstalltheme
 bin/kio_http_cache_cleaner
 bin/kio_uiserver
@@ -48,9 +48,11 @@ bin/kmailservice
 bin/kpac_dhcp_helper
 bin/ksendbugmail
 bin/kshell
+bin/kstartupconfig
 bin/ksvgtopng
 bin/ktelnetservice
 bin/ktradertest
+bin/kunittestmodrunner
 bin/kwrapper
 bin/lnusertemp
 ${CUPS}bin/make_driver_db_cups
@@ -161,6 +163,7 @@ include/kaboutkde.h
 include/kaccel.h
 include/kaccelgen.h
 include/kaccelmanager.h
+include/kacl.h
 include/kaction.h
 include/kactionclasses.h
 include/kactioncollection.h
@@ -558,6 +561,7 @@ include/kscan.h
 include/ksconfig.h
 include/kscreensaver.h
 include/kscreensaver_vroot.h
+include/kscrollview.h
 include/kselect.h
 include/kseparator.h
 include/kserversocket.h
@@ -684,6 +688,8 @@ include/ktexteditor/viewcursorinterface.h
 include/ktexteditor/viewstatusmsginterface.h
 include/ktexteditor/wordwrapinterface.h
 include/ktimewidget.h
+include/ktimezones.h
+include/ktimezonewidget.h
 include/ktip.h
 include/ktoolbar.h
 include/ktoolbarbutton.h
@@ -693,6 +699,9 @@ include/ktrader.h
 include/ktypelist.h
 include/kuniqueapp.h
 include/kuniqueapplication.h
+include/kunittest/module.h
+include/kunittest/runner.h
+include/kunittest/tester.h
 include/kunload.h
 include/kurifilter.h
 include/kurl.h
@@ -780,6 +789,7 @@ lib/kde3/khtmlimagepart.la
 lib/kde3/kimg_dds.la
 lib/kde3/kimg_eps.la
 lib/kde3/kimg_exr.la
+lib/kde3/kimg_hdr.la
 lib/kde3/kimg_ico.la
 lib/kde3/kimg_jp2.la
 lib/kde3/kimg_pcx.la
@@ -802,6 +812,7 @@ lib/kde3/klauncher.la
 lib/kde3/knotify.la
 lib/kde3/kspell_aspell.la
 lib/kde3/kspell_ispell.la
+lib/kde3/kstyle_highcontrast_config.la
 lib/kde3/kstyle_plastik_config.la
 lib/kde3/ktexteditor_docwordcompletion.la
 lib/kde3/ktexteditor_insertfile.la
@@ -867,6 +878,72 @@ lib/libkscript.la
 lib/libkspell.la
 lib/libkspell2.la
 lib/libktexteditor.la
+lib/kde3/kstyle_plastik_config.la
+lib/kde3/ktexteditor_docwordcompletion.la
+lib/kde3/ktexteditor_insertfile.la
+lib/kde3/ktexteditor_isearch.la
+lib/kde3/ktexteditor_kdatatool.la
+lib/kde3/libkatepart.la
+lib/kde3/libkcertpart.la
+lib/kde3/libkdeprint_management_module.la
+lib/kde3/libkhtmlpart.la
+lib/kde3/libkmultipart.la
+lib/kde3/libshellscript.la
+lib/kde3/plugins/designer/kdewidgets.la
+lib/kde3/plugins/styles/highcolor.la
+lib/kde3/plugins/styles/highcontrast.la
+lib/kde3/plugins/styles/keramik.la
+lib/kde3/plugins/styles/kthemestyle.la
+lib/kde3/plugins/styles/light.la
+lib/kde3/plugins/styles/plastik.la
+lib/libDCOP.la
+lib/libartskde.la
+lib/libkabc.la
+lib/libkabc_dir.la
+lib/libkabc_file.la
+lib/libkabc_ldapkio.la
+lib/libkabc_net.la
+lib/libkatepartinterfaces.la
+lib/libkdecore.la
+lib/libkdefakes.la
+lib/libkdefakes_nonpic.a
+lib/libkdefx.la
+${CUPS}lib/libkdeinit_cupsdconf.la
+lib/libkdeinit_dcopserver.la
+lib/libkdeinit_kaddprinterwizard.la
+lib/libkdeinit_kbuildsycoca.la
+lib/libkdeinit_kcmshell.la
+lib/libkdeinit_kconf_update.la
+lib/libkdeinit_kcookiejar.la
+lib/libkdeinit_kded.la
+lib/libkdeinit_kio_http_cache_cleaner.la
+lib/libkdeinit_kio_uiserver.la
+lib/libkdeinit_klauncher.la
+lib/libkdeprint.la
+lib/libkdeprint_management.la
+lib/libkdesasl.la
+lib/libkdesu.la
+lib/libkdeui.la
+lib/libkdnssd.la
+lib/libkhtml.la
+lib/libkimproxy.la
+lib/libkio.la
+lib/libkjava.la
+lib/libkjs.la
+lib/libkmdi.la
+lib/libkmdi2.la
+lib/libkmediaplayer.la
+lib/libkmid.la
+lib/libknewstuff.la
+lib/libkntlm.la
+lib/libkparts.la
+lib/libkresources.la
+lib/libkscreensaver.la
+lib/libkscript.la
+lib/libkspell.la
+lib/libkspell2.la
+lib/libktexteditor.la
+lib/libkunittest.la
 lib/libkutils.la
 lib/libkwalletbackend.la
 lib/libkwalletclient.la
@@ -896,8 +973,10 @@ share/doc/kde/HTML/en/common/doctop1a.png
 share/doc/kde/HTML/en/common/doctop1b.png
 share/doc/kde/HTML/en/common/doctop2.png
 share/doc/kde/HTML/en/common/doxygen.css
+share/doc/kde/HTML/en/common/favicon.ico
 share/doc/kde/HTML/en/common/fdl-license
 share/doc/kde/HTML/en/common/fdl-license.html
+share/doc/kde/HTML/en/common/fdl-notice.html
 share/doc/kde/HTML/en/common/footer.html
 share/doc/kde/HTML/en/common/gpl-license
 share/doc/kde/HTML/en/common/gpl-license.html
@@ -908,6 +987,7 @@ share/doc/kde/HTML/en/common/kde-common.css
 share/doc/kde/HTML/en/common/kde-default.css
 share/doc/kde/HTML/en/common/kde-localised.css.template
 share/doc/kde/HTML/en/common/kde-web.css
+share/doc/kde/HTML/en/common/kde_gear_64.png
 share/doc/kde/HTML/en/common/kde_logo.png
 share/doc/kde/HTML/en/common/kde_logo_bg.png
 share/doc/kde/HTML/en/common/kmenu.png
@@ -924,7 +1004,6 @@ share/doc/kde/HTML/en/common/web-docbottom.png
 share/doc/kde/HTML/en/common/web-doctop.png
 share/doc/kde/HTML/en/common/x11-license.html
 share/doc/kde/HTML/en/common/xml.dcl
-share/doc/kde/HTML/en/kdelibs-apidocs/common
 share/doc/kde/HTML/en/kspell/common
 share/doc/kde/HTML/en/kspell/index.cache.bz2
 share/doc/kde/HTML/en/kspell/index.docbook
@@ -945,11 +1024,19 @@ share/kde/apps/kabc/countrytransl.map
 share/kde/apps/kabc/formats/binary.desktop
 share/kde/apps/katepart/katepartreadonlyui.rc
 share/kde/apps/katepart/katepartui.rc
+share/kde/apps/katepart/scripts/indent/script-indent-c-test.js
+share/kde/apps/katepart/scripts/indent/script-indent-c1-test.lua
+share/kde/apps/katepart/scripts/jstest.desktop
+share/kde/apps/katepart/scripts/jstest.js
+share/kde/apps/katepart/scripts/script-indent-c-char.js
+share/kde/apps/katepart/scripts/script-indent-c-newline.js
+share/kde/apps/katepart/scripts/sort.js
 share/kde/apps/katepart/syntax/abc.xml
 share/kde/apps/katepart/syntax/ada.xml
 share/kde/apps/katepart/syntax/ahdl.xml
 share/kde/apps/katepart/syntax/alert.xml
 share/kde/apps/katepart/syntax/ansic89.xml
+share/kde/apps/katepart/syntax/apache.xml
 share/kde/apps/katepart/syntax/asm-avr.xml
 share/kde/apps/katepart/syntax/asm6502.xml
 share/kde/apps/katepart/syntax/asp.xml
@@ -984,6 +1071,7 @@ share/kde/apps/katepart/syntax/ferite.xml
 share/kde/apps/katepart/syntax/fgl-4gl.xml
 share/kde/apps/katepart/syntax/fgl-per.xml
 share/kde/apps/katepart/syntax/fortran.xml
+share/kde/apps/katepart/syntax/fstab.xml
 share/kde/apps/katepart/syntax/gdl.xml
 share/kde/apps/katepart/syntax/gettext.xml
 share/kde/apps/katepart/syntax/glsl.xml
@@ -995,6 +1083,7 @@ share/kde/apps/katepart/syntax/idconsole.xml
 share/kde/apps/katepart/syntax/idl.xml
 share/kde/apps/katepart/syntax/ilerpg.xml
 share/kde/apps/katepart/syntax/inform.xml
+share/kde/apps/katepart/syntax/ini.xml
 share/kde/apps/katepart/syntax/java.xml
 share/kde/apps/katepart/syntax/javadoc.xml
 share/kde/apps/katepart/syntax/javascript-php.xml
@@ -1010,10 +1099,12 @@ share/kde/apps/katepart/syntax/literate-haskell.xml
 share/kde/apps/katepart/syntax/logtalk.xml
 share/kde/apps/katepart/syntax/lpc.xml
 share/kde/apps/katepart/syntax/lua.xml
+share/kde/apps/katepart/syntax/m3u.xml
 share/kde/apps/katepart/syntax/mab.xml
 share/kde/apps/katepart/syntax/makefile.xml
 share/kde/apps/katepart/syntax/mason.xml
 share/kde/apps/katepart/syntax/matlab.xml
+share/kde/apps/katepart/syntax/mediawiki.xml
 share/kde/apps/katepart/syntax/mips.xml
 share/kde/apps/katepart/syntax/modula-2.xml
 share/kde/apps/katepart/syntax/mup.xml
@@ -1265,10 +1356,6 @@ share/kde/apps/khtml/icons/crystalsvg/16x16/actions/bug.png
 share/kde/apps/khtml/icons/crystalsvg/16x16/actions/images_display.png
 share/kde/apps/khtml/icons/crystalsvg/16x16/actions/wallet_open.png
 share/kde/apps/khtml/icons/crystalsvg/22x22/actions/bug.png
-share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgnext.png
-share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgrun.png
-share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgrunto.png
-share/kde/apps/khtml/icons/crystalsvg/22x22/actions/dbgstep.png
 share/kde/apps/khtml/icons/crystalsvg/22x22/actions/images_display.png
 share/kde/apps/khtml/icons/crystalsvg/32x32/actions/bug.png
 share/kde/apps/khtml/icons/crystalsvg/32x32/actions/images_display.png
@@ -1278,6 +1365,7 @@ share/kde/apps/khtml/khtml.rc
 share/kde/apps/khtml/khtml_browser.rc
 share/kde/apps/khtml/khtml_popupmenu.rc
 share/kde/apps/kio_uiserver/icons/crystalsvg/16x16/apps/kio_uiserver.png
+share/kde/apps/kjava/icons/crystalsvg/16x16/actions/java.png
 share/kde/apps/kjava/kjava.jar
 share/kde/apps/kjava/kjava.policy
 share/kde/apps/kjava/pluginsinfo
@@ -1872,6 +1960,7 @@ share/kde/apps/ksgmltools2/customization/sv/entities/underArtisticLicense.docboo
 share/kde/apps/ksgmltools2/customization/sv/entities/underBSDLicense.docbook
 share/kde/apps/ksgmltools2/customization/sv/entities/underFDL.docbook
 share/kde/apps/ksgmltools2/customization/sv/entities/underGPL.docbook
+share/kde/apps/ksgmltools2/customization/sv/entities/underLGPL.docbook
 share/kde/apps/ksgmltools2/customization/sv/entities/underX11License.docbook
 share/kde/apps/ksgmltools2/customization/sv/entities/update-doc.docbook
 share/kde/apps/ksgmltools2/customization/sv/lang.entities
@@ -2744,9 +2833,11 @@ share/kde/apps/ktexteditor_isearch/ktexteditor_isearchui.rc
 share/kde/apps/ktexteditor_kdatatool/ktexteditor_kdatatoolui.rc
 share/kde/apps/proxyscout/eventsrc
 share/kde/autostart/kab2kabc.desktop
-share/kde/config/colors/40 Colors
-share/kde/config/colors/Royal
-share/kde/config/colors/Web
+share/kde/config/colors/40.colors
+share/kde/config/colors/Rainbow.colors
+share/kde/config/colors/Royal.colors
+share/kde/config/colors/Web.colors
+share/kde/config/ipv6blacklist
 share/kde/config/katefiletyperc
 share/kde/config/katesyntaxhighlightingrc
 share/kde/config/kdebug.areas
@@ -2800,12 +2891,10 @@ share/kde/emoticons/Default/unhappy.png
 share/kde/emoticons/Default/unlove.png
 share/kde/emoticons/Default/wilted_rose.png
 share/kde/emoticons/Default/wink.png
-share/kde/icons/crystalsvg/128x128/actions/contents2.png
-share/kde/icons/crystalsvg/128x128/actions/fileprint.png
-share/kde/icons/crystalsvg/128x128/actions/filequickprint.png
-share/kde/icons/crystalsvg/128x128/actions/frameprint.png
-share/kde/icons/crystalsvg/128x128/actions/player_playlist.png
+share/kde/icons/crystalsvg/128x128/actions/launch.png
 share/kde/icons/crystalsvg/128x128/actions/share.png
+share/kde/icons/crystalsvg/128x128/apps/kmenu.png
+share/kde/icons/crystalsvg/128x128/apps/kttsd.png
 share/kde/icons/crystalsvg/128x128/apps/password.png
 share/kde/icons/crystalsvg/128x128/devices/blockdevice.png
 share/kde/icons/crystalsvg/128x128/devices/camera_mount.png
@@ -2815,6 +2904,8 @@ share/kde/icons/crystalsvg/128x128/devices/compact_flash_mount.png
 share/kde/icons/crystalsvg/128x128/devices/compact_flash_unmount.png
 share/kde/icons/crystalsvg/128x128/devices/hdd_mount.png
 share/kde/icons/crystalsvg/128x128/devices/hdd_unmount.png
+share/kde/icons/crystalsvg/128x128/devices/ipod_mount.png
+share/kde/icons/crystalsvg/128x128/devices/ipod_unmount.png
 share/kde/icons/crystalsvg/128x128/devices/memory_stick_mount.png
 share/kde/icons/crystalsvg/128x128/devices/memory_stick_unmount.png
 share/kde/icons/crystalsvg/128x128/devices/mouse.png
@@ -2858,14 +2949,15 @@ share/kde/icons/crystalsvg/128x128/filesystems/folder_violet.png
 share/kde/icons/crystalsvg/128x128/filesystems/folder_violet_open.png
 share/kde/icons/crystalsvg/128x128/filesystems/folder_yellow.png
 share/kde/icons/crystalsvg/128x128/filesystems/folder_yellow_open.png
-share/kde/icons/crystalsvg/128x128/filesystems/lockoverlay.png
+share/kde/icons/crystalsvg/128x128/filesystems/link_overlay.png
+share/kde/icons/crystalsvg/128x128/filesystems/lock_overlay.png
 share/kde/icons/crystalsvg/128x128/filesystems/network.png
 share/kde/icons/crystalsvg/128x128/filesystems/network_local.png
 share/kde/icons/crystalsvg/128x128/filesystems/pipe.png
 share/kde/icons/crystalsvg/128x128/filesystems/trashcan_empty.png
 share/kde/icons/crystalsvg/128x128/filesystems/trashcan_full.png
 share/kde/icons/crystalsvg/128x128/filesystems/www.png
-share/kde/icons/crystalsvg/128x128/filesystems/zip.png
+share/kde/icons/crystalsvg/128x128/filesystems/zip_overlay.png
 share/kde/icons/crystalsvg/128x128/mimetypes/applix.png
 share/kde/icons/crystalsvg/128x128/mimetypes/ascii.png
 share/kde/icons/crystalsvg/128x128/mimetypes/binary.png
@@ -2954,6 +3046,7 @@ share/kde/icons/crystalsvg/16x16/actions/2leftarrow.png
 share/kde/icons/crystalsvg/16x16/actions/2rightarrow.png
 share/kde/icons/crystalsvg/16x16/actions/2uparrow.png
 share/kde/icons/crystalsvg/16x16/actions/about_kde.png
+share/kde/icons/crystalsvg/16x16/actions/add.png
 share/kde/icons/crystalsvg/16x16/actions/airbrush.png
 share/kde/icons/crystalsvg/16x16/actions/apply.png
 share/kde/icons/crystalsvg/16x16/actions/attach.png
@@ -3038,6 +3131,7 @@ share/kde/icons/crystalsvg/16x16/actions/identity.png
 share/kde/icons/crystalsvg/16x16/actions/info.png
 share/kde/icons/crystalsvg/16x16/actions/inline_image.png
 share/kde/icons/crystalsvg/16x16/actions/inline_table.png
+share/kde/icons/crystalsvg/16x16/actions/kde.png
 share/kde/icons/crystalsvg/16x16/actions/kde1.png
 share/kde/icons/crystalsvg/16x16/actions/kde3.png
 share/kde/icons/crystalsvg/16x16/actions/kde4.png
@@ -3128,11 +3222,13 @@ share/kde/icons/crystalsvg/16x16/actions/run.png
 share/kde/icons/crystalsvg/16x16/actions/save_all.png
 share/kde/icons/crystalsvg/16x16/actions/services.png
 share/kde/icons/crystalsvg/16x16/actions/share.png
+share/kde/icons/crystalsvg/16x16/actions/show_side_panel.png
 share/kde/icons/crystalsvg/16x16/actions/signature.png
 share/kde/icons/crystalsvg/16x16/actions/spellcheck.png
 share/kde/icons/crystalsvg/16x16/actions/stamp.png
 share/kde/icons/crystalsvg/16x16/actions/start.png
 share/kde/icons/crystalsvg/16x16/actions/stop.png
+share/kde/icons/crystalsvg/16x16/actions/switchuser.png
 share/kde/icons/crystalsvg/16x16/actions/tab_breakoff.png
 share/kde/icons/crystalsvg/16x16/actions/tab_duplicate.png
 share/kde/icons/crystalsvg/16x16/actions/tab_new.png
@@ -3160,6 +3256,9 @@ share/kde/icons/crystalsvg/16x16/actions/up.png
 share/kde/icons/crystalsvg/16x16/actions/view_bottom.png
 share/kde/icons/crystalsvg/16x16/actions/view_choose.png
 share/kde/icons/crystalsvg/16x16/actions/view_detailed.png
+share/kde/icons/crystalsvg/16x16/actions/view_fit_height.png
+share/kde/icons/crystalsvg/16x16/actions/view_fit_width.png
+share/kde/icons/crystalsvg/16x16/actions/view_fit_window.png
 share/kde/icons/crystalsvg/16x16/actions/view_icon.png
 share/kde/icons/crystalsvg/16x16/actions/view_left_right.png
 share/kde/icons/crystalsvg/16x16/actions/view_multicolumn.png
@@ -3179,6 +3278,8 @@ share/kde/icons/crystalsvg/16x16/actions/window_new.png
 share/kde/icons/crystalsvg/16x16/actions/window_nofullscreen.png
 share/kde/icons/crystalsvg/16x16/actions/window_suppressed.png
 share/kde/icons/crystalsvg/16x16/actions/wizard.png
+share/kde/icons/crystalsvg/16x16/apps/kmenu.png
+share/kde/icons/crystalsvg/16x16/apps/kttsd.png
 share/kde/icons/crystalsvg/16x16/apps/password.png
 share/kde/icons/crystalsvg/16x16/devices/3floppy_mount.png
 share/kde/icons/crystalsvg/16x16/devices/3floppy_unmount.png
@@ -3200,6 +3301,8 @@ share/kde/icons/crystalsvg/16x16/devices/dvd_mount.png
 share/kde/icons/crystalsvg/16x16/devices/dvd_unmount.png
 share/kde/icons/crystalsvg/16x16/devices/hdd_mount.png
 share/kde/icons/crystalsvg/16x16/devices/hdd_unmount.png
+share/kde/icons/crystalsvg/16x16/devices/ipod_mount.png
+share/kde/icons/crystalsvg/16x16/devices/ipod_unmount.png
 share/kde/icons/crystalsvg/16x16/devices/joystick.png
 share/kde/icons/crystalsvg/16x16/devices/memory.png
 share/kde/icons/crystalsvg/16x16/devices/memory_stick_mount.png
@@ -3260,8 +3363,8 @@ share/kde/icons/crystalsvg/16x16/filesystems/folder_violet_open.png
 share/kde/icons/crystalsvg/16x16/filesystems/folder_yellow.png
 share/kde/icons/crystalsvg/16x16/filesystems/folder_yellow_open.png
 share/kde/icons/crystalsvg/16x16/filesystems/ftp.png
-share/kde/icons/crystalsvg/16x16/filesystems/link.png
-share/kde/icons/crystalsvg/16x16/filesystems/lockoverlay.png
+share/kde/icons/crystalsvg/16x16/filesystems/link_overlay.png
+share/kde/icons/crystalsvg/16x16/filesystems/lock_overlay.png
 share/kde/icons/crystalsvg/16x16/filesystems/network.png
 share/kde/icons/crystalsvg/16x16/filesystems/network_local.png
 share/kde/icons/crystalsvg/16x16/filesystems/pipe.png
@@ -3269,7 +3372,7 @@ share/kde/icons/crystalsvg/16x16/filesystems/server.png
 share/kde/icons/crystalsvg/16x16/filesystems/trashcan_empty.png
 share/kde/icons/crystalsvg/16x16/filesystems/trashcan_full.png
 share/kde/icons/crystalsvg/16x16/filesystems/www.png
-share/kde/icons/crystalsvg/16x16/filesystems/zip.png
+share/kde/icons/crystalsvg/16x16/filesystems/zip_overlay.png
 share/kde/icons/crystalsvg/16x16/mimetypes/applix.png
 share/kde/icons/crystalsvg/16x16/mimetypes/ascii.png
 share/kde/icons/crystalsvg/16x16/mimetypes/binary.png
@@ -3362,6 +3465,7 @@ share/kde/icons/crystalsvg/22x22/actions/2leftarrow.png
 share/kde/icons/crystalsvg/22x22/actions/2rightarrow.png
 share/kde/icons/crystalsvg/22x22/actions/2uparrow.png
 share/kde/icons/crystalsvg/22x22/actions/about_kde.png
+share/kde/icons/crystalsvg/22x22/actions/add.png
 share/kde/icons/crystalsvg/22x22/actions/airbrush.png
 share/kde/icons/crystalsvg/22x22/actions/apply.png
 share/kde/icons/crystalsvg/22x22/actions/attach.png
@@ -3391,6 +3495,10 @@ share/kde/icons/crystalsvg/22x22/actions/contents.png
 share/kde/icons/crystalsvg/22x22/actions/contents2.png
 share/kde/icons/crystalsvg/22x22/actions/contexthelp.png
 share/kde/icons/crystalsvg/22x22/actions/crop.png
+share/kde/icons/crystalsvg/22x22/actions/dbgnext.png
+share/kde/icons/crystalsvg/22x22/actions/dbgrun.png
+share/kde/icons/crystalsvg/22x22/actions/dbgrunto.png
+share/kde/icons/crystalsvg/22x22/actions/dbgstep.png
 share/kde/icons/crystalsvg/22x22/actions/decrypted.png
 share/kde/icons/crystalsvg/22x22/actions/down.png
 share/kde/icons/crystalsvg/22x22/actions/edit.png
@@ -3519,6 +3627,7 @@ share/kde/icons/crystalsvg/22x22/actions/reload.png
 share/kde/icons/crystalsvg/22x22/actions/reload3.png
 share/kde/icons/crystalsvg/22x22/actions/reload_all_tabs.png
 share/kde/icons/crystalsvg/22x22/actions/reload_page.png
+share/kde/icons/crystalsvg/22x22/actions/remove.png
 share/kde/icons/crystalsvg/22x22/actions/revert.png
 share/kde/icons/crystalsvg/22x22/actions/rightjust.png
 share/kde/icons/crystalsvg/22x22/actions/rotate.png
@@ -3527,11 +3636,13 @@ share/kde/icons/crystalsvg/22x22/actions/rotate_cw.png
 share/kde/icons/crystalsvg/22x22/actions/run.png
 share/kde/icons/crystalsvg/22x22/actions/save_all.png
 share/kde/icons/crystalsvg/22x22/actions/share.png
+share/kde/icons/crystalsvg/22x22/actions/show_side_panel.png
 share/kde/icons/crystalsvg/22x22/actions/showmenu.png
 share/kde/icons/crystalsvg/22x22/actions/signature.png
 share/kde/icons/crystalsvg/22x22/actions/spellcheck.png
 share/kde/icons/crystalsvg/22x22/actions/start.png
 share/kde/icons/crystalsvg/22x22/actions/stop.png
+share/kde/icons/crystalsvg/22x22/actions/switchuser.png
 share/kde/icons/crystalsvg/22x22/actions/text.png
 share/kde/icons/crystalsvg/22x22/actions/text_block.png
 share/kde/icons/crystalsvg/22x22/actions/text_bold.png
@@ -3554,6 +3665,9 @@ share/kde/icons/crystalsvg/22x22/actions/up.png
 share/kde/icons/crystalsvg/22x22/actions/view_bottom.png
 share/kde/icons/crystalsvg/22x22/actions/view_choose.png
 share/kde/icons/crystalsvg/22x22/actions/view_detailed.png
+share/kde/icons/crystalsvg/22x22/actions/view_fit_height.png
+share/kde/icons/crystalsvg/22x22/actions/view_fit_width.png
+share/kde/icons/crystalsvg/22x22/actions/view_fit_window.png
 share/kde/icons/crystalsvg/22x22/actions/view_icon.png
 share/kde/icons/crystalsvg/22x22/actions/view_left_right.png
 share/kde/icons/crystalsvg/22x22/actions/view_multicolumn.png
@@ -3572,6 +3686,8 @@ share/kde/icons/crystalsvg/22x22/actions/window_fullscreen.png
 share/kde/icons/crystalsvg/22x22/actions/window_new.png
 share/kde/icons/crystalsvg/22x22/actions/window_nofullscreen.png
 share/kde/icons/crystalsvg/22x22/actions/wizard.png
+share/kde/icons/crystalsvg/22x22/apps/kmenu.png
+share/kde/icons/crystalsvg/22x22/apps/kttsd.png
 share/kde/icons/crystalsvg/22x22/apps/password.png
 share/kde/icons/crystalsvg/22x22/devices/3floppy_mount.png
 share/kde/icons/crystalsvg/22x22/devices/3floppy_unmount.png
@@ -3582,6 +3698,8 @@ share/kde/icons/crystalsvg/22x22/devices/compact_flash_mount.png
 share/kde/icons/crystalsvg/22x22/devices/compact_flash_unmount.png
 share/kde/icons/crystalsvg/22x22/devices/hdd_mount.png
 share/kde/icons/crystalsvg/22x22/devices/hdd_unmount.png
+share/kde/icons/crystalsvg/22x22/devices/ipod_mount.png
+share/kde/icons/crystalsvg/22x22/devices/ipod_unmount.png
 share/kde/icons/crystalsvg/22x22/devices/joystick.png
 share/kde/icons/crystalsvg/22x22/devices/memory_stick_mount.png
 share/kde/icons/crystalsvg/22x22/devices/memory_stick_unmount.png
@@ -3611,10 +3729,12 @@ share/kde/icons/crystalsvg/22x22/filesystems/folder_violet.png
 share/kde/icons/crystalsvg/22x22/filesystems/folder_violet_open.png
 share/kde/icons/crystalsvg/22x22/filesystems/folder_yellow.png
 share/kde/icons/crystalsvg/22x22/filesystems/folder_yellow_open.png
+share/kde/icons/crystalsvg/22x22/filesystems/link_overlay.png
 share/kde/icons/crystalsvg/22x22/filesystems/network.png
 share/kde/icons/crystalsvg/22x22/filesystems/trashcan_empty.png
 share/kde/icons/crystalsvg/22x22/filesystems/trashcan_full.png
 share/kde/icons/crystalsvg/22x22/filesystems/www.png
+share/kde/icons/crystalsvg/22x22/filesystems/zip_overlay.png
 share/kde/icons/crystalsvg/22x22/mimetypes/applix.png
 share/kde/icons/crystalsvg/22x22/mimetypes/ascii.png
 share/kde/icons/crystalsvg/22x22/mimetypes/binary.png
@@ -3700,6 +3820,7 @@ share/kde/icons/crystalsvg/22x22/mimetypes/widget_doc.png
 share/kde/icons/crystalsvg/22x22/mimetypes/wordprocessing.png
 share/kde/icons/crystalsvg/22x22/mimetypes/zip.png
 share/kde/icons/crystalsvg/32x32/actions/about_kde.png
+share/kde/icons/crystalsvg/32x32/actions/add.png
 share/kde/icons/crystalsvg/32x32/actions/apply.png
 share/kde/icons/crystalsvg/32x32/actions/attach.png
 share/kde/icons/crystalsvg/32x32/actions/back.png
@@ -3716,6 +3837,7 @@ share/kde/icons/crystalsvg/32x32/actions/centrejust.png
 share/kde/icons/crystalsvg/32x32/actions/charset.png
 share/kde/icons/crystalsvg/32x32/actions/clear_left.png
 share/kde/icons/crystalsvg/32x32/actions/colorize.png
+share/kde/icons/crystalsvg/32x32/actions/colorpicker.png
 share/kde/icons/crystalsvg/32x32/actions/compfile.png
 share/kde/icons/crystalsvg/32x32/actions/configure.png
 share/kde/icons/crystalsvg/32x32/actions/connect_creating.png
@@ -3736,6 +3858,7 @@ share/kde/icons/crystalsvg/32x32/actions/editshred.png
 share/kde/icons/crystalsvg/32x32/actions/edittrash.png
 share/kde/icons/crystalsvg/32x32/actions/emptytrash.png
 share/kde/icons/crystalsvg/32x32/actions/encrypted.png
+share/kde/icons/crystalsvg/32x32/actions/eraser.png
 share/kde/icons/crystalsvg/32x32/actions/exec.png
 share/kde/icons/crystalsvg/32x32/actions/exit.png
 share/kde/icons/crystalsvg/32x32/actions/fileclose.png
@@ -3764,6 +3887,7 @@ share/kde/icons/crystalsvg/32x32/actions/indent.png
 share/kde/icons/crystalsvg/32x32/actions/kde.png
 share/kde/icons/crystalsvg/32x32/actions/kdevelop_down.png
 share/kde/icons/crystalsvg/32x32/actions/knewstuff.png
+share/kde/icons/crystalsvg/32x32/actions/launch.png
 share/kde/icons/crystalsvg/32x32/actions/leftjust.png
 share/kde/icons/crystalsvg/32x32/actions/locationbar_erase.png
 share/kde/icons/crystalsvg/32x32/actions/lock.png
@@ -3834,6 +3958,7 @@ share/kde/icons/crystalsvg/32x32/actions/redo.png
 share/kde/icons/crystalsvg/32x32/actions/reload.png
 share/kde/icons/crystalsvg/32x32/actions/reload_all_tabs.png
 share/kde/icons/crystalsvg/32x32/actions/reload_page.png
+share/kde/icons/crystalsvg/32x32/actions/remove.png
 share/kde/icons/crystalsvg/32x32/actions/revert.png
 share/kde/icons/crystalsvg/32x32/actions/rightjust.png
 share/kde/icons/crystalsvg/32x32/actions/rotate.png
@@ -3842,10 +3967,12 @@ share/kde/icons/crystalsvg/32x32/actions/rotate_cw.png
 share/kde/icons/crystalsvg/32x32/actions/run.png
 share/kde/icons/crystalsvg/32x32/actions/save_all.png
 share/kde/icons/crystalsvg/32x32/actions/share.png
+share/kde/icons/crystalsvg/32x32/actions/show_side_panel.png
 share/kde/icons/crystalsvg/32x32/actions/signature.png
 share/kde/icons/crystalsvg/32x32/actions/spellcheck.png
 share/kde/icons/crystalsvg/32x32/actions/start.png
 share/kde/icons/crystalsvg/32x32/actions/stop.png
+share/kde/icons/crystalsvg/32x32/actions/switchuser.png
 share/kde/icons/crystalsvg/32x32/actions/text_block.png
 share/kde/icons/crystalsvg/32x32/actions/text_bold.png
 share/kde/icons/crystalsvg/32x32/actions/text_center.png
@@ -3866,6 +3993,9 @@ share/kde/icons/crystalsvg/32x32/actions/up.png
 share/kde/icons/crystalsvg/32x32/actions/view_bottom.png
 share/kde/icons/crystalsvg/32x32/actions/view_choose.png
 share/kde/icons/crystalsvg/32x32/actions/view_detailed.png
+share/kde/icons/crystalsvg/32x32/actions/view_fit_height.png
+share/kde/icons/crystalsvg/32x32/actions/view_fit_width.png
+share/kde/icons/crystalsvg/32x32/actions/view_fit_window.png
 share/kde/icons/crystalsvg/32x32/actions/view_icon.png
 share/kde/icons/crystalsvg/32x32/actions/view_left_right.png
 share/kde/icons/crystalsvg/32x32/actions/view_multicolumn.png
@@ -3884,6 +4014,8 @@ share/kde/icons/crystalsvg/32x32/actions/window_fullscreen.png
 share/kde/icons/crystalsvg/32x32/actions/window_new.png
 share/kde/icons/crystalsvg/32x32/actions/window_nofullscreen.png
 share/kde/icons/crystalsvg/32x32/actions/wizard.png
+share/kde/icons/crystalsvg/32x32/apps/kmenu.png
+share/kde/icons/crystalsvg/32x32/apps/kttsd.png
 share/kde/icons/crystalsvg/32x32/apps/password.png
 share/kde/icons/crystalsvg/32x32/devices/3floppy_mount.png
 share/kde/icons/crystalsvg/32x32/devices/3floppy_unmount.png
@@ -3905,6 +4037,8 @@ share/kde/icons/crystalsvg/32x32/devices/dvd_mount.png
 share/kde/icons/crystalsvg/32x32/devices/dvd_unmount.png
 share/kde/icons/crystalsvg/32x32/devices/hdd_mount.png
 share/kde/icons/crystalsvg/32x32/devices/hdd_unmount.png
+share/kde/icons/crystalsvg/32x32/devices/ipod_mount.png
+share/kde/icons/crystalsvg/32x32/devices/ipod_unmount.png
 share/kde/icons/crystalsvg/32x32/devices/joystick.png
 share/kde/icons/crystalsvg/32x32/devices/memory.png
 share/kde/icons/crystalsvg/32x32/devices/memory_stick_mount.png
@@ -3962,15 +4096,15 @@ share/kde/icons/crystalsvg/32x32/filesystems/folder_violet_open.png
 share/kde/icons/crystalsvg/32x32/filesystems/folder_yellow.png
 share/kde/icons/crystalsvg/32x32/filesystems/folder_yellow_open.png
 share/kde/icons/crystalsvg/32x32/filesystems/ftp.png
-share/kde/icons/crystalsvg/32x32/filesystems/link.png
-share/kde/icons/crystalsvg/32x32/filesystems/lockoverlay.png
+share/kde/icons/crystalsvg/32x32/filesystems/link_overlay.png
+share/kde/icons/crystalsvg/32x32/filesystems/lock_overlay.png
 share/kde/icons/crystalsvg/32x32/filesystems/network.png
 share/kde/icons/crystalsvg/32x32/filesystems/network_local.png
 share/kde/icons/crystalsvg/32x32/filesystems/pipe.png
 share/kde/icons/crystalsvg/32x32/filesystems/trashcan_empty.png
 share/kde/icons/crystalsvg/32x32/filesystems/trashcan_full.png
 share/kde/icons/crystalsvg/32x32/filesystems/www.png
-share/kde/icons/crystalsvg/32x32/filesystems/zip.png
+share/kde/icons/crystalsvg/32x32/filesystems/zip_overlay.png
 share/kde/icons/crystalsvg/32x32/mimetypes/applix.png
 share/kde/icons/crystalsvg/32x32/mimetypes/ascii.png
 share/kde/icons/crystalsvg/32x32/mimetypes/binary.png
@@ -4056,10 +4190,14 @@ share/kde/icons/crystalsvg/32x32/mimetypes/vectorgfx.png
 share/kde/icons/crystalsvg/32x32/mimetypes/video.png
 share/kde/icons/crystalsvg/32x32/mimetypes/widget_doc.png
 share/kde/icons/crystalsvg/32x32/mimetypes/wordprocessing.png
+share/kde/icons/crystalsvg/32x32/mimetypes/zip.png
+share/kde/icons/crystalsvg/48x48/actions/add.png
 share/kde/icons/crystalsvg/48x48/actions/back.png
 share/kde/icons/crystalsvg/48x48/actions/bookmark.png
+share/kde/icons/crystalsvg/48x48/actions/colorpicker.png
 share/kde/icons/crystalsvg/48x48/actions/contents2.png
 share/kde/icons/crystalsvg/48x48/actions/down.png
+share/kde/icons/crystalsvg/48x48/actions/eraser.png
 share/kde/icons/crystalsvg/48x48/actions/exit.png
 share/kde/icons/crystalsvg/48x48/actions/fileclose.png
 share/kde/icons/crystalsvg/48x48/actions/filenew.png
@@ -4068,8 +4206,11 @@ share/kde/icons/crystalsvg/48x48/actions/filequickprint.png
 share/kde/icons/crystalsvg/48x48/actions/forward.png
 share/kde/icons/crystalsvg/48x48/actions/frameprint.png
 share/kde/icons/crystalsvg/48x48/actions/gear.png
+share/kde/icons/crystalsvg/48x48/actions/gohome.png
 share/kde/icons/crystalsvg/48x48/actions/identity.png
 share/kde/icons/crystalsvg/48x48/actions/indent.png
+share/kde/icons/crystalsvg/48x48/actions/kde.png
+share/kde/icons/crystalsvg/48x48/actions/launch.png
 share/kde/icons/crystalsvg/48x48/actions/lock.png
 share/kde/icons/crystalsvg/48x48/actions/mail_new.png
 share/kde/icons/crystalsvg/48x48/actions/mail_post_to.png
@@ -4078,10 +4219,21 @@ share/kde/icons/crystalsvg/48x48/actions/player_playlist.png
 share/kde/icons/crystalsvg/48x48/actions/presence_away.png
 share/kde/icons/crystalsvg/48x48/actions/presence_offline.png
 share/kde/icons/crystalsvg/48x48/actions/presence_online.png
+share/kde/icons/crystalsvg/48x48/actions/reload.png
+share/kde/icons/crystalsvg/48x48/actions/reload_all_tabs.png
+share/kde/icons/crystalsvg/48x48/actions/reload_page.png
+share/kde/icons/crystalsvg/48x48/actions/remove.png
+share/kde/icons/crystalsvg/48x48/actions/rotate.png
+share/kde/icons/crystalsvg/48x48/actions/rotate_ccw.png
+share/kde/icons/crystalsvg/48x48/actions/rotate_cw.png
 share/kde/icons/crystalsvg/48x48/actions/share.png
+share/kde/icons/crystalsvg/48x48/actions/stop.png
+share/kde/icons/crystalsvg/48x48/actions/switchuser.png
 share/kde/icons/crystalsvg/48x48/actions/unindent.png
 share/kde/icons/crystalsvg/48x48/actions/up.png
 share/kde/icons/crystalsvg/48x48/actions/wizard.png
+share/kde/icons/crystalsvg/48x48/apps/kmenu.png
+share/kde/icons/crystalsvg/48x48/apps/kttsd.png
 share/kde/icons/crystalsvg/48x48/apps/password.png
 share/kde/icons/crystalsvg/48x48/devices/3floppy_mount.png
 share/kde/icons/crystalsvg/48x48/devices/3floppy_unmount.png
@@ -4103,6 +4255,8 @@ share/kde/icons/crystalsvg/48x48/devices/dvd_mount.png
 share/kde/icons/crystalsvg/48x48/devices/dvd_unmount.png
 share/kde/icons/crystalsvg/48x48/devices/hdd_mount.png
 share/kde/icons/crystalsvg/48x48/devices/hdd_unmount.png
+share/kde/icons/crystalsvg/48x48/devices/ipod_mount.png
+share/kde/icons/crystalsvg/48x48/devices/ipod_unmount.png
 share/kde/icons/crystalsvg/48x48/devices/joystick.png
 share/kde/icons/crystalsvg/48x48/devices/memory.png
 share/kde/icons/crystalsvg/48x48/devices/memory_stick_mount.png
@@ -4162,8 +4316,8 @@ share/kde/icons/crystalsvg/48x48/filesystems/folder_violet_open.png
 share/kde/icons/crystalsvg/48x48/filesystems/folder_yellow.png
 share/kde/icons/crystalsvg/48x48/filesystems/folder_yellow_open.png
 share/kde/icons/crystalsvg/48x48/filesystems/ftp.png
-share/kde/icons/crystalsvg/48x48/filesystems/link.png
-share/kde/icons/crystalsvg/48x48/filesystems/lockoverlay.png
+share/kde/icons/crystalsvg/48x48/filesystems/link_overlay.png
+share/kde/icons/crystalsvg/48x48/filesystems/lock_overlay.png
 share/kde/icons/crystalsvg/48x48/filesystems/network.png
 share/kde/icons/crystalsvg/48x48/filesystems/network_local.png
 share/kde/icons/crystalsvg/48x48/filesystems/pipe.png
@@ -4171,7 +4325,7 @@ share/kde/icons/crystalsvg/48x48/filesystems/server.png
 share/kde/icons/crystalsvg/48x48/filesystems/trashcan_empty.png
 share/kde/icons/crystalsvg/48x48/filesystems/trashcan_full.png
 share/kde/icons/crystalsvg/48x48/filesystems/www.png
-share/kde/icons/crystalsvg/48x48/filesystems/zip.png
+share/kde/icons/crystalsvg/48x48/filesystems/zip_overlay.png
 share/kde/icons/crystalsvg/48x48/mimetypes/applix.png
 share/kde/icons/crystalsvg/48x48/mimetypes/ascii.png
 share/kde/icons/crystalsvg/48x48/mimetypes/binary.png
@@ -4259,15 +4413,12 @@ share/kde/icons/crystalsvg/48x48/mimetypes/video.png
 share/kde/icons/crystalsvg/48x48/mimetypes/widget_doc.png
 share/kde/icons/crystalsvg/48x48/mimetypes/wordprocessing.png
 share/kde/icons/crystalsvg/48x48/mimetypes/zip.png
-share/kde/icons/crystalsvg/64x64/actions/contents2.png
 share/kde/icons/crystalsvg/64x64/actions/favorites.png
-share/kde/icons/crystalsvg/64x64/actions/fileprint.png
-share/kde/icons/crystalsvg/64x64/actions/filequickprint.png
-share/kde/icons/crystalsvg/64x64/actions/frameprint.png
 share/kde/icons/crystalsvg/64x64/actions/knewstuff.png
 share/kde/icons/crystalsvg/64x64/actions/player_play.png
-share/kde/icons/crystalsvg/64x64/actions/player_playlist.png
 share/kde/icons/crystalsvg/64x64/actions/share.png
+share/kde/icons/crystalsvg/64x64/apps/kmenu.png
+share/kde/icons/crystalsvg/64x64/apps/kttsd.png
 share/kde/icons/crystalsvg/64x64/apps/password.png
 share/kde/icons/crystalsvg/64x64/devices/3floppy_mount.png
 share/kde/icons/crystalsvg/64x64/devices/3floppy_unmount.png
@@ -4289,6 +4440,8 @@ share/kde/icons/crystalsvg/64x64/devices/dvd_mount.png
 share/kde/icons/crystalsvg/64x64/devices/dvd_unmount.png
 share/kde/icons/crystalsvg/64x64/devices/hdd_mount.png
 share/kde/icons/crystalsvg/64x64/devices/hdd_unmount.png
+share/kde/icons/crystalsvg/64x64/devices/ipod_mount.png
+share/kde/icons/crystalsvg/64x64/devices/ipod_unmount.png
 share/kde/icons/crystalsvg/64x64/devices/joystick.png
 share/kde/icons/crystalsvg/64x64/devices/memory.png
 share/kde/icons/crystalsvg/64x64/devices/memory_stick_mount.png
@@ -4345,14 +4498,15 @@ share/kde/icons/crystalsvg/64x64/filesystems/folder_violet.png
 share/kde/icons/crystalsvg/64x64/filesystems/folder_violet_open.png
 share/kde/icons/crystalsvg/64x64/filesystems/folder_yellow.png
 share/kde/icons/crystalsvg/64x64/filesystems/folder_yellow_open.png
-share/kde/icons/crystalsvg/64x64/filesystems/lockoverlay.png
+share/kde/icons/crystalsvg/64x64/filesystems/link_overlay.png
+share/kde/icons/crystalsvg/64x64/filesystems/lock_overlay.png
 share/kde/icons/crystalsvg/64x64/filesystems/network.png
 share/kde/icons/crystalsvg/64x64/filesystems/network_local.png
 share/kde/icons/crystalsvg/64x64/filesystems/pipe.png
 share/kde/icons/crystalsvg/64x64/filesystems/trashcan_empty.png
 share/kde/icons/crystalsvg/64x64/filesystems/trashcan_full.png
 share/kde/icons/crystalsvg/64x64/filesystems/www.png
-share/kde/icons/crystalsvg/64x64/filesystems/zip.png
+share/kde/icons/crystalsvg/64x64/filesystems/zip_overlay.png
 share/kde/icons/crystalsvg/64x64/mimetypes/applix.png
 share/kde/icons/crystalsvg/64x64/mimetypes/ascii.png
 share/kde/icons/crystalsvg/64x64/mimetypes/binary.png
@@ -4440,26 +4594,66 @@ share/kde/icons/crystalsvg/64x64/mimetypes/wordprocessing.png
 share/kde/icons/crystalsvg/64x64/mimetypes/zip.png
 share/kde/icons/crystalsvg/index.theme
 share/kde/icons/crystalsvg/scalable/actions/about_kde.svgz
+share/kde/icons/crystalsvg/scalable/actions/add.svgz
+share/kde/icons/crystalsvg/scalable/actions/back.svgz
+share/kde/icons/crystalsvg/scalable/actions/bottom.svgz
+share/kde/icons/crystalsvg/scalable/actions/colorpicker.svgz
 share/kde/icons/crystalsvg/scalable/actions/configure.svgz
 share/kde/icons/crystalsvg/scalable/actions/contents2.svgz
+share/kde/icons/crystalsvg/scalable/actions/down.svgz
+share/kde/icons/crystalsvg/scalable/actions/eraser.svgz
 share/kde/icons/crystalsvg/scalable/actions/exit.svgz
+share/kde/icons/crystalsvg/scalable/actions/fileclose.svgz
 share/kde/icons/crystalsvg/scalable/actions/filenew.svgz
 share/kde/icons/crystalsvg/scalable/actions/fileprint.svgz
 share/kde/icons/crystalsvg/scalable/actions/filequickprint.svgz
+share/kde/icons/crystalsvg/scalable/actions/finish.svgz
+share/kde/icons/crystalsvg/scalable/actions/forward.svgz
 share/kde/icons/crystalsvg/scalable/actions/frameprint.svgz
+share/kde/icons/crystalsvg/scalable/actions/gohome.svgz
 share/kde/icons/crystalsvg/scalable/actions/info.svgz
+share/kde/icons/crystalsvg/scalable/actions/launch.svgz
 share/kde/icons/crystalsvg/scalable/actions/lock.svgz
 share/kde/icons/crystalsvg/scalable/actions/mail_generic.svgz
+share/kde/icons/crystalsvg/scalable/actions/mail_get.svgz
 share/kde/icons/crystalsvg/scalable/actions/mail_new.svgz
 share/kde/icons/crystalsvg/scalable/actions/mail_post_to.svgz
+share/kde/icons/crystalsvg/scalable/actions/next.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_eject.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_fwd.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_next.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_pause.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_play.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_rew.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_start.svgz
+share/kde/icons/crystalsvg/scalable/actions/player_stop.svgz
+share/kde/icons/crystalsvg/scalable/actions/previous.svgz
+share/kde/icons/crystalsvg/scalable/actions/reload.svgz
+share/kde/icons/crystalsvg/scalable/actions/reload_all_tabs.svgz
+share/kde/icons/crystalsvg/scalable/actions/reload_page.svgz
+share/kde/icons/crystalsvg/scalable/actions/remove.svgz
+share/kde/icons/crystalsvg/scalable/actions/rotate.svgz
+share/kde/icons/crystalsvg/scalable/actions/rotate_ccw.svgz
+share/kde/icons/crystalsvg/scalable/actions/rotate_cw.svgz
 share/kde/icons/crystalsvg/scalable/actions/share.svgz
+share/kde/icons/crystalsvg/scalable/actions/start.svgz
+share/kde/icons/crystalsvg/scalable/actions/stop.svgz
+share/kde/icons/crystalsvg/scalable/actions/switchuser.svgz
 share/kde/icons/crystalsvg/scalable/actions/text_bild.svgz
-share/kde/icons/crystalsvg/scalable/actions/text_bold.svg
+share/kde/icons/crystalsvg/scalable/actions/text_bold.svgz
+share/kde/icons/crystalsvg/scalable/actions/text_italic.svgz
 share/kde/icons/crystalsvg/scalable/actions/text_strike.svgz
 share/kde/icons/crystalsvg/scalable/actions/text_sub.svgz
 share/kde/icons/crystalsvg/scalable/actions/text_super.svgz
 share/kde/icons/crystalsvg/scalable/actions/text_under.svgz
+share/kde/icons/crystalsvg/scalable/actions/top.svgz
+share/kde/icons/crystalsvg/scalable/actions/up.svgz
+share/kde/icons/crystalsvg/scalable/actions/view_fit_height.svgz
+share/kde/icons/crystalsvg/scalable/actions/view_fit_width.svgz
+share/kde/icons/crystalsvg/scalable/actions/view_fit_window.svgz
 share/kde/icons/crystalsvg/scalable/actions/wizard.svgz
+share/kde/icons/crystalsvg/scalable/apps/kmenu.svgz
+share/kde/icons/crystalsvg/scalable/apps/kttsd.svgz
 share/kde/icons/crystalsvg/scalable/devices/3floppy_mount.svgz
 share/kde/icons/crystalsvg/scalable/devices/3floppy_unmount.svgz
 share/kde/icons/crystalsvg/scalable/devices/5floppy_mount.svgz
@@ -4480,6 +4674,8 @@ share/kde/icons/crystalsvg/scalable/devices/dvd_mount.svgz
 share/kde/icons/crystalsvg/scalable/devices/dvd_unmount.svgz
 share/kde/icons/crystalsvg/scalable/devices/hdd_mount.svgz
 share/kde/icons/crystalsvg/scalable/devices/hdd_unmount.svgz
+share/kde/icons/crystalsvg/scalable/devices/ipod_mount.svgz
+share/kde/icons/crystalsvg/scalable/devices/ipod_unmount.svgz
 share/kde/icons/crystalsvg/scalable/devices/joystick.svgz
 share/kde/icons/crystalsvg/scalable/devices/memory.svgz
 share/kde/icons/crystalsvg/scalable/devices/memory_stick_mount.svgz
@@ -4543,8 +4739,8 @@ share/kde/icons/crystalsvg/scalable/filesystems/folder_yellow.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/folder_yellow_open.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/home_blue.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/home_white.svgz
-share/kde/icons/crystalsvg/scalable/filesystems/link.svgz
-share/kde/icons/crystalsvg/scalable/filesystems/lockoverlay.svgz
+share/kde/icons/crystalsvg/scalable/filesystems/link_overlay.svgz
+share/kde/icons/crystalsvg/scalable/filesystems/lock_overlay.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/network.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/network_local.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/pipe.svgz
@@ -4553,7 +4749,7 @@ share/kde/icons/crystalsvg/scalable/filesystems/temporary.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/trashcan_empty.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/trashcan_full.svgz
 share/kde/icons/crystalsvg/scalable/filesystems/www.svgz
-share/kde/icons/crystalsvg/scalable/filesystems/zip.svgz
+share/kde/icons/crystalsvg/scalable/filesystems/zip_overlay.svgz
 share/kde/icons/crystalsvg/scalable/mimetypes/applix.svgz
 share/kde/icons/crystalsvg/scalable/mimetypes/ascii.svgz
 share/kde/icons/crystalsvg/scalable/mimetypes/binary.svgz
@@ -4633,18 +4829,11 @@ share/kde/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz
 share/kde/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
 share/kde/icons/crystalsvg/scalable/mimetypes/zip.svgz
 share/kde/icons/default.kde
-share/kde/icons/hicolor/16x16/actions/show_side_panel.png
-share/kde/icons/hicolor/16x16/actions/view_fit_width.png
-share/kde/icons/hicolor/16x16/actions/view_fit_window.png
-share/kde/icons/hicolor/22x22/actions/show_side_panel.png
-share/kde/icons/hicolor/22x22/actions/view_fit_width.png
-share/kde/icons/hicolor/22x22/actions/view_fit_window.png
-share/kde/icons/hicolor/32x32/actions/show_side_panel.png
-share/kde/icons/hicolor/32x32/actions/view_fit_width.png
-share/kde/icons/hicolor/32x32/actions/view_fit_window.png
 share/kde/icons/hicolor/index.theme
 share/kde/mimelnk/all/all.desktop
 share/kde/mimelnk/all/allfiles.desktop
+share/kde/mimelnk/application/chm.desktop
+share/kde/mimelnk/application/fits.desktop
 share/kde/mimelnk/application/illustrator.desktop
 share/kde/mimelnk/application/java.desktop
 share/kde/mimelnk/application/mathml+xml.desktop
@@ -4689,6 +4878,7 @@ share/kde/mimelnk/application/vnd.stardivision.impress.desktop
 share/kde/mimelnk/application/vnd.stardivision.math.desktop
 share/kde/mimelnk/application/vnd.stardivision.writer-global.desktop
 share/kde/mimelnk/application/vnd.stardivision.writer.desktop
+share/kde/mimelnk/application/vnd.sun.xml.base.desktop
 share/kde/mimelnk/application/vnd.sun.xml.calc.desktop
 share/kde/mimelnk/application/vnd.sun.xml.calc.template.desktop
 share/kde/mimelnk/application/vnd.sun.xml.draw.desktop
@@ -4749,6 +4939,7 @@ share/kde/mimelnk/application/x-ica.desktop
 share/kde/mimelnk/application/x-iso.desktop
 share/kde/mimelnk/application/x-jar.desktop
 share/kde/mimelnk/application/x-java-applet.desktop
+share/kde/mimelnk/application/x-java-jnlp-file.desktop
 share/kde/mimelnk/application/x-java.desktop
 share/kde/mimelnk/application/x-javascript.desktop
 share/kde/mimelnk/application/x-karbon.desktop
@@ -4787,12 +4978,15 @@ share/kde/mimelnk/application/x-pkcs12.desktop
 share/kde/mimelnk/application/x-python-bytecode.desktop
 share/kde/mimelnk/application/x-python.desktop
 share/kde/mimelnk/application/x-quattropro.desktop
+share/kde/mimelnk/application/x-rar-compressed.desktop
 share/kde/mimelnk/application/x-rar.desktop
 share/kde/mimelnk/application/x-rpm.desktop
 share/kde/mimelnk/application/x-ruby.desktop
 share/kde/mimelnk/application/x-sharedlib.desktop
 share/kde/mimelnk/application/x-shellscript.desktop
 share/kde/mimelnk/application/x-shockwave-flash.desktop
+share/kde/mimelnk/application/x-sqlite2.desktop
+share/kde/mimelnk/application/x-sqlite3.desktop
 share/kde/mimelnk/application/x-tar.desktop
 share/kde/mimelnk/application/x-tarz.desktop
 share/kde/mimelnk/application/x-tbz.desktop
@@ -4814,6 +5008,7 @@ share/kde/mimelnk/application/x-zerosize.desktop
 share/kde/mimelnk/application/x-zip.desktop
 share/kde/mimelnk/application/x-zoo.desktop
 share/kde/mimelnk/application/xhtml+xml.desktop
+share/kde/mimelnk/application/xml-dtd.desktop
 share/kde/mimelnk/application/xml.desktop
 share/kde/mimelnk/application/xsd.desktop
 share/kde/mimelnk/audio/aac.desktop
@@ -4844,9 +5039,11 @@ share/kde/mimelnk/audio/x-vorbis.desktop
 share/kde/mimelnk/audio/x-wav.desktop
 share/kde/mimelnk/image/cgm.desktop
 share/kde/mimelnk/image/fax-g3.desktop
+share/kde/mimelnk/image/fits.desktop
 share/kde/mimelnk/image/gif.desktop
 share/kde/mimelnk/image/jp2.desktop
 share/kde/mimelnk/image/jpeg.desktop
+share/kde/mimelnk/image/jpg.desktop
 share/kde/mimelnk/image/pjpeg.desktop
 share/kde/mimelnk/image/png.desktop
 share/kde/mimelnk/image/svg+xml.desktop
@@ -4855,8 +5052,10 @@ share/kde/mimelnk/image/tiff.desktop
 share/kde/mimelnk/image/wmf.desktop
 share/kde/mimelnk/image/x-bmp.desktop
 share/kde/mimelnk/image/x-dds.desktop
+share/kde/mimelnk/image/x-djvu.desktop
 share/kde/mimelnk/image/x-eps.desktop
 share/kde/mimelnk/image/x-exr.desktop
+share/kde/mimelnk/image/x-hdr.desktop
 share/kde/mimelnk/image/x-ico.desktop
 share/kde/mimelnk/image/x-jng.desktop
 share/kde/mimelnk/image/x-msod.desktop
@@ -4958,6 +5157,7 @@ share/kde/services/file.protocol
 share/kde/services/ftp.protocol
 share/kde/services/ghelp.protocol
 share/kde/services/gif.kimgio
+share/kde/services/hdr.kimgio
 share/kde/services/help.protocol
 share/kde/services/http.protocol
 share/kde/services/http_cache_cleaner.desktop
@@ -5050,6 +5250,7 @@ share/kde/servicetypes/ktexteditorplugin.desktop
 share/kde/servicetypes/kurifilterplugin.desktop
 share/kde/servicetypes/renamedlgplugin.desktop
 share/kde/servicetypes/scriptinterface.desktop
+${NEED_ZONETAB}share/zone.tab
 ${PKGLOCALEDIR}/locale/all_languages
 @comment in xmlcatmgr: share/sgml/catalog
 @dirrm share/kde/servicetypes
@@ -5301,6 +5502,10 @@ ${PKGLOCALEDIR}/locale/all_languages
 @dirrm share/kde/apps/ksgmltools2
 @dirrm share/kde/apps/knotify
 @dirrm share/kde/apps/knewstuff
+@dirrm share/kde/apps/kjava/icons/crystalsvg/16x16/actions
+@dirrm share/kde/apps/kjava/icons/crystalsvg/16x16
+@dirrm share/kde/apps/kjava/icons/crystalsvg
+@dirrm share/kde/apps/kjava/icons
 @dirrm share/kde/apps/kjava
 @dirrm share/kde/apps/kio_uiserver/icons/crystalsvg/16x16/apps
 @dirrm share/kde/apps/kio_uiserver/icons/crystalsvg/16x16
@@ -5352,6 +5557,8 @@ ${PKGLOCALEDIR}/locale/all_languages
 @dirrm share/kde/apps/kcm_componentchooser
 @dirrm share/kde/apps/kcertpart
 @dirrm share/kde/apps/katepart/syntax
+@dirrm share/kde/apps/katepart/scripts/indent
+@dirrm share/kde/apps/katepart/scripts
 @dirrm share/kde/apps/katepart
 @dirrm share/kde/apps/kabc/formats
 @dirrm share/kde/apps/kabc
@@ -5438,6 +5645,7 @@ ${PKGLOCALEDIR}/locale/all_languages
 @dirrm lib/kde3/plugins
 @dirrm lib/kde3
 @dirrm include/libkmid
+@dirrm include/kunittest
 @dirrm include/ktexteditor
 @dirrm include/kspell2
 @dirrm include/ksettings
diff --git a/x11/kdelibs3/buildlink3.mk b/x11/kdelibs3/buildlink3.mk
index 89cf174d55d..af05f93d0f0 100644
--- a/x11/kdelibs3/buildlink3.mk
+++ b/x11/kdelibs3/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2005/05/31 14:13:23 markd Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2005/12/11 10:53:54 markd Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 KDELIBS_BUILDLINK3_MK:=	${KDELIBS_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=	kdelibs
 
 .if !empty(KDELIBS_BUILDLINK3_MK:M+)
 BUILDLINK_DEPENDS.kdelibs+=	kdelibs>=3.2.0
-BUILDLINK_RECOMMENDED.kdelibs?=	kdelibs>=3.4.0nb1
+BUILDLINK_RECOMMENDED.kdelibs?=	kdelibs>=3.5.0
 BUILDLINK_PKGSRCDIR.kdelibs?=	../../x11/kdelibs3
 
 .include "../../x11/kdelibs3/dirs.mk"
diff --git a/x11/kdelibs3/distinfo b/x11/kdelibs3/distinfo
index 90b3115e52a..8ab1ab8d6b0 100644
--- a/x11/kdelibs3/distinfo
+++ b/x11/kdelibs3/distinfo
@@ -1,22 +1,24 @@
-$NetBSD: distinfo,v 1.61 2005/10/13 12:31:59 markd Exp $
+$NetBSD: distinfo,v 1.62 2005/12/11 10:53:54 markd Exp $
 
-SHA1 (kdelibs-3.4.3.tar.bz2) = ab701b90efc9cfe29e8e9c461d8b8c82357d8ef7
-RMD160 (kdelibs-3.4.3.tar.bz2) = 3bf89c0694f0fbabe46ae75d49f3eaf651fc2a90
-Size (kdelibs-3.4.3.tar.bz2) = 16877867 bytes
+SHA1 (kdelibs-3.5.0.tar.bz2) = c03bc6b09add3c487b3e28a5fb1d89efd30a9723
+RMD160 (kdelibs-3.5.0.tar.bz2) = a170428a7166f322ab86d1c0280f12e23a8f6df3
+Size (kdelibs-3.5.0.tar.bz2) = 15379557 bytes
 SHA1 (patch-aa) = be278f29b743c573b71c7804eff26324e78ed779
 SHA1 (patch-ab) = 3a79b3e7fadef1a93a5490b716dace60f3de30a1
-SHA1 (patch-ad) = 540dd7a07448647fde2a8b44e4b4cd44e50a5fb9
-SHA1 (patch-ae) = 338b33e580328a24d3ea2af4c5cf08a8721fa845
+SHA1 (patch-ad) = 861b2b4a82ef8075bc03d073396d0c6411ae12ba
+SHA1 (patch-ae) = a85911eb156ea53aca02bb2f3d550edbf377981d
 SHA1 (patch-af) = 7fbb3abcbf56020e3827ddf9d056beab9d1f3cd7
 SHA1 (patch-ag) = e471fdf5428e0f515ef3fe5427622854886ef952
-SHA1 (patch-an) = d3141b53409e7a5dfa324bbf8ddabebb18d775a6
+SHA1 (patch-an) = 9a6b1b5db5142a3ab940ec1dd7bf8d992f277d78
+SHA1 (patch-ao) = 7ae360b2ee2332ec3017dfd468457f2c1b139308
+SHA1 (patch-ap) = 94037230bb3d12549195d52b98ffdd821f94f90d
+SHA1 (patch-aq) = 91d970b5c2fb129e5656cf4841972453c83ba088
 SHA1 (patch-bc) = 434a48d290aa9716b8c6e372419460ebd33cf8ea
-SHA1 (patch-bd) = 172e1146d4e1e49a1a61d7ddc415dbfa4e5c4088
+SHA1 (patch-bd) = 5500290544b51c8896607d90d3412656dd90156e
 SHA1 (patch-bu) = 65aca46f30be04c0d8177498eac149437b21ba56
 SHA1 (patch-bv) = 882355f9dd9cdbbbe14d54e5c59b630ef0347e1c
 SHA1 (patch-cc) = 5581849c63bfc219a8262e83c3c66c7df51fbc1f
 SHA1 (patch-ce) = e9f7a348b0e4be1475ba8f56a8b474f139eb7781
 SHA1 (patch-cf) = 0409b64ee00f355bfc2056e596b519a241fcf522
-SHA1 (patch-cg) = e68fc3f4147b1c4760669318319e59bcf67cea51
-SHA1 (patch-ch) = ead902f4a8b7866915bab8319d38908eda025cc6
+SHA1 (patch-ch) = 2b3d573fbeefa4b1b0fb0946cb853b23fe8779eb
 SHA1 (patch-ci) = 83dd08af553c05c5d088880fa86d0633a8e4745a
diff --git a/x11/kdelibs3/files/zone.tab b/x11/kdelibs3/files/zone.tab
new file mode 100644
index 00000000000..d9b278b0ec0
--- /dev/null
+++ b/x11/kdelibs3/files/zone.tab
@@ -0,0 +1,407 @@
+# @(#)zone.tab	1.32
+#
+# TZ zone descriptions
+#
+# From Paul Eggert (1996-08-05):
+#
+# This file contains a table with the following columns:
+# 1.  ISO 3166 2-character country code.  See the file `iso3166.tab'.
+# 2.  Latitude and longitude of the zone's principal location
+#     in ISO 6709 sign-degrees-minutes-seconds format,
+#     either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS,
+#     first latitude (+ is north), then longitude (+ is east).
+# 3.  Zone name used in value of TZ environment variable.
+# 4.  Comments; present if and only if the country has multiple rows.
+#
+# Columns are separated by a single tab.
+# The table is sorted first by country, then an order within the country that
+# (1) makes some geographical sense, and
+# (2) puts the most populous zones first, where that does not contradict (1).
+#
+# Lines beginning with `#' are comments.
+#
+#country-
+#code	coordinates	TZ			comments
+AD	+4230+00131	Europe/Andorra
+AE	+2518+05518	Asia/Dubai
+AF	+3431+06912	Asia/Kabul
+AG	+1703-06148	America/Antigua
+AI	+1812-06304	America/Anguilla
+AL	+4120+01950	Europe/Tirane
+AM	+4011+04430	Asia/Yerevan
+AN	+1211-06900	America/Curacao
+AO	-0848+01314	Africa/Luanda
+AQ	-7750+16636	Antarctica/McMurdo	McMurdo Station, Ross Island
+AQ	-9000+00000	Antarctica/South_Pole	Amundsen-Scott Station, South Pole
+AQ	-6734-06808	Antarctica/Rothera	Rothera Station, Adelaide Island
+AQ	-6448-06406	Antarctica/Palmer	Palmer Station, Anvers Island
+AQ	-6736+06253	Antarctica/Mawson	Mawson Station, Holme Bay
+AQ	-6835+07758	Antarctica/Davis	Davis Station, Vestfold Hills
+AQ	-6617+11031	Antarctica/Casey	Casey Station, Bailey Peninsula
+AQ	-7824+10654	Antarctica/Vostok	Vostok Station, S Magnetic Pole
+AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Base, Terre Adelie
+AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
+AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
+AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
+AR	-3124-06411	America/Argentina/Tucuman	Tucuman (TM)
+AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
+AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
+AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
+AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
+AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
+AS	-1416-17042	Pacific/Pago_Pago
+AT	+4813+01620	Europe/Vienna
+AU	-3133+15905	Australia/Lord_Howe	Lord Howe Island
+AU	-4253+14719	Australia/Hobart	Tasmania - most locations
+AU	-3956+14352	Australia/Currie	Tasmania - King Island
+AU	-3749+14458	Australia/Melbourne	Victoria
+AU	-3352+15113	Australia/Sydney	New South Wales - most locations
+AU	-3157+14127	Australia/Broken_Hill	New South Wales - Yancowinna
+AU	-2728+15302	Australia/Brisbane	Queensland - most locations
+AU	-2016+14900	Australia/Lindeman	Queensland - Holiday Islands
+AU	-3455+13835	Australia/Adelaide	South Australia
+AU	-1228+13050	Australia/Darwin	Northern Territory
+AU	-3157+11551	Australia/Perth	Western Australia
+AW	+1230-06858	America/Aruba
+AX	+6006+01957	Europe/Mariehamn
+AZ	+4023+04951	Asia/Baku
+BA	+4352+01825	Europe/Sarajevo
+BB	+1306-05937	America/Barbados
+BD	+2343+09025	Asia/Dhaka
+BE	+5050+00420	Europe/Brussels
+BF	+1222-00131	Africa/Ouagadougou
+BG	+4241+02319	Europe/Sofia
+BH	+2623+05035	Asia/Bahrain
+BI	-0323+02922	Africa/Bujumbura
+BJ	+0629+00237	Africa/Porto-Novo
+BM	+3217-06446	Atlantic/Bermuda
+BN	+0456+11455	Asia/Brunei
+BO	-1630-06809	America/La_Paz
+BR	-0351-03225	America/Noronha	Atlantic islands
+BR	-0127-04829	America/Belem	Amapa, E Para
+BR	-0343-03830	America/Fortaleza	NE Brazil (MA, PI, CE, RN, PB)
+BR	-0803-03454	America/Recife	Pernambuco
+BR	-0712-04812	America/Araguaina	Tocantins
+BR	-0940-03543	America/Maceio	Alagoas, Sergipe
+BR	-1259-03831	America/Bahia	Bahia
+BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
+BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
+BR	-1535-05605	America/Cuiaba	Mato Grosso
+BR	-0846-06354	America/Porto_Velho	W Para, Rondonia
+BR	+0249-06040	America/Boa_Vista	Roraima
+BR	-0308-06001	America/Manaus	E Amazonas
+BR	-0640-06952	America/Eirunepe	W Amazonas
+BR	-0958-06748	America/Rio_Branco	Acre
+BS	+2505-07721	America/Nassau
+BT	+2728+08939	Asia/Thimphu
+BW	-2545+02555	Africa/Gaborone
+BY	+5354+02734	Europe/Minsk
+BZ	+1730-08812	America/Belize
+CA	+4734-05243	America/St_Johns	Newfoundland Island
+CA	+4439-06336	America/Halifax	Atlantic Time - Nova Scotia (most places), NB, W Labrador, E Quebec & PEI
+CA	+4612-05957	America/Glace_Bay	Atlantic Time - Nova Scotia - places that did not observe DST 1966-1971
+CA	+5320-06025	America/Goose_Bay	Atlantic Time - E Labrador
+CA	+4531-07334	America/Montreal	Eastern Time - Quebec - most locations
+CA	+4339-07923	America/Toronto	Eastern Time - Ontario - most locations
+CA	+4901-08816	America/Nipigon	Eastern Time - Ontario & Quebec - places that did not observe DST 1967-1973
+CA	+4823-08915	America/Thunder_Bay	Eastern Time - Thunder Bay, Ontario
+CA	+6608-06544	America/Pangnirtung	Eastern Time - Pangnirtung, Nunavut
+CA	+6344-06828	America/Iqaluit	Eastern Time - east Nunavut
+CA	+6408-08310	America/Coral_Harbour	Eastern Standard Time - Southampton Island
+CA	+6245-09210	America/Rankin_Inlet	Central Time - central Nunavut
+CA	+4953-09709	America/Winnipeg	Central Time - Manitoba & west Ontario
+CA	+4843-09429	America/Rainy_River	Central Time - Rainy River & Fort Frances, Ontario
+CA	+6903-10505	America/Cambridge_Bay	Central Time - west Nunavut
+CA	+5024-10439	America/Regina	Central Standard Time - Saskatchewan - most locations
+CA	+5017-10750	America/Swift_Current	Central Standard Time - Saskatchewan - midwest
+CA	+5333-11328	America/Edmonton	Mountain Time - Alberta, east British Columbia & west Saskatchewan
+CA	+6227-11421	America/Yellowknife	Mountain Time - central Northwest Territories
+CA	+6825-11330	America/Inuvik	Mountain Time - west Northwest Territories
+CA	+5946-12014	America/Dawson_Creek	Mountain Standard Time - Dawson Creek & Fort Saint John, British Columbia
+CA	+4916-12307	America/Vancouver	Pacific Time - west British Columbia
+CA	+6043-13503	America/Whitehorse	Pacific Time - south Yukon
+CA	+6404-13925	America/Dawson	Pacific Time - north Yukon
+CC	-1210+09655	Indian/Cocos
+CD	-0418+01518	Africa/Kinshasa	west Dem. Rep. of Congo
+CD	-1140+02728	Africa/Lubumbashi	east Dem. Rep. of Congo
+CF	+0422+01835	Africa/Bangui
+CG	-0416+01517	Africa/Brazzaville
+CH	+4723+00832	Europe/Zurich
+CI	+0519-00402	Africa/Abidjan
+CK	-2114-15946	Pacific/Rarotonga
+CL	-3327-07040	America/Santiago	most locations
+CL	-2710-10927	Pacific/Easter	Easter Island & Sala y Gomez
+CM	+0403+00942	Africa/Douala
+CN	+3114+12128	Asia/Shanghai	east China - Beijing, Guangdong, Shanghai, etc.
+CN	+4545+12641	Asia/Harbin	Heilongjiang
+CN	+2934+10635	Asia/Chongqing	central China - Gansu, Guizhou, Sichuan, Yunnan, etc.
+CN	+4348+08735	Asia/Urumqi	Tibet & most of Xinjiang Uyghur
+CN	+3929+07559	Asia/Kashgar	southwest Xinjiang Uyghur
+CO	+0436-07405	America/Bogota
+CR	+0956-08405	America/Costa_Rica
+CS	+4450+02030	Europe/Belgrade
+CU	+2308-08222	America/Havana
+CV	+1455-02331	Atlantic/Cape_Verde
+CX	-1025+10543	Indian/Christmas
+CY	+3510+03322	Asia/Nicosia
+CZ	+5005+01426	Europe/Prague
+DE	+5230+01322	Europe/Berlin
+DJ	+1136+04309	Africa/Djibouti
+DK	+5540+01235	Europe/Copenhagen
+DM	+1518-06124	America/Dominica
+DO	+1828-06954	America/Santo_Domingo
+DZ	+3647+00303	Africa/Algiers
+EC	-0210-07950	America/Guayaquil	mainland
+EC	-0054-08936	Pacific/Galapagos	Galapagos Islands
+EE	+5925+02445	Europe/Tallinn
+EG	+3003+03115	Africa/Cairo
+EH	+2709-01312	Africa/El_Aaiun
+ER	+1520+03853	Africa/Asmera
+ES	+4024-00341	Europe/Madrid	mainland
+ES	+3553-00519	Africa/Ceuta	Ceuta & Melilla
+ES	+2806-01524	Atlantic/Canary	Canary Islands
+ET	+0902+03842	Africa/Addis_Ababa
+FI	+6010+02458	Europe/Helsinki
+FJ	-1808+17825	Pacific/Fiji
+FK	-5142-05751	Atlantic/Stanley
+FM	+0725+15147	Pacific/Truk	Truk (Chuuk) and Yap
+FM	+0658+15813	Pacific/Ponape	Ponape (Pohnpei)
+FM	+0519+16259	Pacific/Kosrae	Kosrae
+FO	+6201-00646	Atlantic/Faeroe
+FR	+4852+00220	Europe/Paris
+GA	+0023+00927	Africa/Libreville
+GB	+512830-0001845	Europe/London
+GD	+1203-06145	America/Grenada
+GE	+4143+04449	Asia/Tbilisi
+GF	+0456-05220	America/Cayenne
+GH	+0533-00013	Africa/Accra
+GI	+3608-00521	Europe/Gibraltar
+GL	+6411-05144	America/Godthab	most locations
+GL	+7646-01840	America/Danmarkshavn	east coast, north of Scoresbysund
+GL	+7030-02215	America/Scoresbysund	Scoresbysund / Ittoqqortoormiit
+GL	+7634-06847	America/Thule	Thule / Pituffik
+GM	+1328-01639	Africa/Banjul
+GN	+0931-01343	Africa/Conakry
+GP	+1614-06132	America/Guadeloupe
+GQ	+0345+00847	Africa/Malabo
+GR	+3758+02343	Europe/Athens
+GS	-5416-03632	Atlantic/South_Georgia
+GT	+1438-09031	America/Guatemala
+GU	+1328+14445	Pacific/Guam
+GW	+1151-01535	Africa/Bissau
+GY	+0648-05810	America/Guyana
+HK	+2217+11409	Asia/Hong_Kong
+HN	+1406-08713	America/Tegucigalpa
+HR	+4548+01558	Europe/Zagreb
+HT	+1832-07220	America/Port-au-Prince
+HU	+4730+01905	Europe/Budapest
+ID	-0610+10648	Asia/Jakarta	Java & Sumatra
+ID	-0002+10920	Asia/Pontianak	west & central Borneo
+ID	-0507+11924	Asia/Makassar	east & south Borneo, Celebes, Bali, Nusa Tengarra, west Timor
+ID	-0232+14042	Asia/Jayapura	Irian Jaya & the Moluccas
+IE	+5320-00615	Europe/Dublin
+IL	+3146+03514	Asia/Jerusalem
+IN	+2232+08822	Asia/Calcutta
+IO	-0720+07225	Indian/Chagos
+IQ	+3321+04425	Asia/Baghdad
+IR	+3540+05126	Asia/Tehran
+IS	+6409-02151	Atlantic/Reykjavik
+IT	+4154+01229	Europe/Rome
+JM	+1800-07648	America/Jamaica
+JO	+3157+03556	Asia/Amman
+JP	+353916+1394441	Asia/Tokyo
+KE	-0117+03649	Africa/Nairobi
+KG	+4254+07436	Asia/Bishkek
+KH	+1133+10455	Asia/Phnom_Penh
+KI	+0125+17300	Pacific/Tarawa	Gilbert Islands
+KI	-0308-17105	Pacific/Enderbury	Phoenix Islands
+KI	+0152-15720	Pacific/Kiritimati	Line Islands
+KM	-1141+04316	Indian/Comoro
+KN	+1718-06243	America/St_Kitts
+KP	+3901+12545	Asia/Pyongyang
+KR	+3733+12658	Asia/Seoul
+KW	+2920+04759	Asia/Kuwait
+KY	+1918-08123	America/Cayman
+KZ	+4315+07657	Asia/Almaty	most locations
+KZ	+4448+06528	Asia/Qyzylorda	Qyzylorda (Kyzylorda, Kzyl-Orda)
+KZ	+5017+05710	Asia/Aqtobe	Aqtobe (Aktobe)
+KZ	+4431+05016	Asia/Aqtau	Atyrau (Atirau, Gur'yev), Mangghystau (Mankistau)
+KZ	+5113+05121	Asia/Oral	West Kazakhstan
+LA	+1758+10236	Asia/Vientiane
+LB	+3353+03530	Asia/Beirut
+LC	+1401-06100	America/St_Lucia
+LI	+4709+00931	Europe/Vaduz
+LK	+0656+07951	Asia/Colombo
+LR	+0618-01047	Africa/Monrovia
+LS	-2928+02730	Africa/Maseru
+LT	+5441+02519	Europe/Vilnius
+LU	+4936+00609	Europe/Luxembourg
+LV	+5657+02406	Europe/Riga
+LY	+3254+01311	Africa/Tripoli
+MA	+3339-00735	Africa/Casablanca
+MC	+4342+00723	Europe/Monaco
+MD	+4700+02850	Europe/Chisinau
+MG	-1855+04731	Indian/Antananarivo
+MH	+0709+17112	Pacific/Majuro	most locations
+MH	+0905+16720	Pacific/Kwajalein	Kwajalein
+MK	+4159+02126	Europe/Skopje
+ML	+1239-00800	Africa/Bamako
+MM	+1647+09610	Asia/Rangoon
+MN	+4755+10653	Asia/Ulaanbaatar	most locations
+MN	+4801+09139	Asia/Hovd	Bayan-Olgiy, Govi-Altai, Hovd, Uvs, Zavkhan
+MN	+4804+11430	Asia/Choibalsan	Dornod, Sukhbaatar
+MO	+2214+11335	Asia/Macau
+MP	+1512+14545	Pacific/Saipan
+MQ	+1436-06105	America/Martinique
+MR	+1806-01557	Africa/Nouakchott
+MS	+1644-06213	America/Montserrat
+MT	+3554+01431	Europe/Malta
+MU	-2010+05730	Indian/Mauritius
+MV	+0410+07330	Indian/Maldives
+MW	-1547+03500	Africa/Blantyre
+MX	+1924-09909	America/Mexico_City	Central Time - most locations
+MX	+2105-08646	America/Cancun	Central Time - Quintana Roo
+MX	+2058-08937	America/Merida	Central Time - Campeche, Yucatan
+MX	+2540-10019	America/Monterrey	Central Time - Coahuila, Durango, Nuevo Leon, Tamaulipas
+MX	+2313-10625	America/Mazatlan	Mountain Time - S Baja, Nayarit, Sinaloa
+MX	+2838-10605	America/Chihuahua	Mountain Time - Chihuahua
+MX	+2904-11058	America/Hermosillo	Mountain Standard Time - Sonora
+MX	+3232-11701	America/Tijuana	Pacific Time
+MY	+0310+10142	Asia/Kuala_Lumpur	peninsular Malaysia
+MY	+0133+11020	Asia/Kuching	Sabah & Sarawak
+MZ	-2558+03235	Africa/Maputo
+NA	-2234+01706	Africa/Windhoek
+NC	-2216+16530	Pacific/Noumea
+NE	+1331+00207	Africa/Niamey
+NF	-2903+16758	Pacific/Norfolk
+NG	+0627+00324	Africa/Lagos
+NI	+1209-08617	America/Managua
+NL	+5222+00454	Europe/Amsterdam
+NO	+5955+01045	Europe/Oslo
+NP	+2743+08519	Asia/Katmandu
+NR	-0031+16655	Pacific/Nauru
+NU	-1901+16955	Pacific/Niue
+NZ	-3652+17446	Pacific/Auckland	most locations
+NZ	-4357-17633	Pacific/Chatham	Chatham Islands
+OM	+2336+05835	Asia/Muscat
+PA	+0858-07932	America/Panama
+PE	-1203-07703	America/Lima
+PF	-1732-14934	Pacific/Tahiti	Society Islands
+PF	-0900-13930	Pacific/Marquesas	Marquesas Islands
+PF	-2308-13457	Pacific/Gambier	Gambier Islands
+PG	-0930+14710	Pacific/Port_Moresby
+PH	+1435+12100	Asia/Manila
+PK	+2452+06703	Asia/Karachi
+PL	+5215+02100	Europe/Warsaw
+PM	+4703-05620	America/Miquelon
+PN	-2504-13005	Pacific/Pitcairn
+PR	+182806-0660622	America/Puerto_Rico
+PS	+3130+03428	Asia/Gaza
+PT	+3843-00908	Europe/Lisbon	mainland
+PT	+3238-01654	Atlantic/Madeira	Madeira Islands
+PT	+3744-02540	Atlantic/Azores	Azores
+PW	+0720+13429	Pacific/Palau
+PY	-2516-05740	America/Asuncion
+QA	+2517+05132	Asia/Qatar
+RE	-2052+05528	Indian/Reunion
+RO	+4426+02606	Europe/Bucharest
+RU	+5443+02030	Europe/Kaliningrad	Moscow-01 - Kaliningrad
+RU	+5545+03735	Europe/Moscow	Moscow+00 - west Russia
+RU	+5312+05009	Europe/Samara	Moscow+01 - Caspian Sea
+RU	+5651+06036	Asia/Yekaterinburg	Moscow+02 - Urals
+RU	+5500+07324	Asia/Omsk	Moscow+03 - west Siberia
+RU	+5502+08255	Asia/Novosibirsk	Moscow+03 - Novosibirsk
+RU	+5601+09250	Asia/Krasnoyarsk	Moscow+04 - Yenisei River
+RU	+5216+10420	Asia/Irkutsk	Moscow+05 - Lake Baikal
+RU	+6200+12940	Asia/Yakutsk	Moscow+06 - Lena River
+RU	+4310+13156	Asia/Vladivostok	Moscow+07 - Amur River
+RU	+4658+14242	Asia/Sakhalin	Moscow+07 - Sakhalin Island
+RU	+5934+15048	Asia/Magadan	Moscow+08 - Magadan
+RU	+5301+15839	Asia/Kamchatka	Moscow+09 - Kamchatka
+RU	+6445+17729	Asia/Anadyr	Moscow+10 - Bering Sea
+RW	-0157+03004	Africa/Kigali
+SA	+2438+04643	Asia/Riyadh
+SB	-0932+16012	Pacific/Guadalcanal
+SC	-0440+05528	Indian/Mahe
+SD	+1536+03232	Africa/Khartoum
+SE	+5920+01803	Europe/Stockholm
+SG	+0117+10351	Asia/Singapore
+SH	-1555-00542	Atlantic/St_Helena
+SI	+4603+01431	Europe/Ljubljana
+SJ	+7800+01600	Arctic/Longyearbyen	Svalbard
+SJ	+7059-00805	Atlantic/Jan_Mayen	Jan Mayen
+SK	+4809+01707	Europe/Bratislava
+SL	+0830-01315	Africa/Freetown
+SM	+4355+01228	Europe/San_Marino
+SN	+1440-01726	Africa/Dakar
+SO	+0204+04522	Africa/Mogadishu
+SR	+0550-05510	America/Paramaribo
+ST	+0020+00644	Africa/Sao_Tome
+SV	+1342-08912	America/El_Salvador
+SY	+3330+03618	Asia/Damascus
+SZ	-2618+03106	Africa/Mbabane
+TC	+2128-07108	America/Grand_Turk
+TD	+1207+01503	Africa/Ndjamena
+TF	-492110+0701303	Indian/Kerguelen
+TG	+0608+00113	Africa/Lome
+TH	+1345+10031	Asia/Bangkok
+TJ	+3835+06848	Asia/Dushanbe
+TK	-0922-17114	Pacific/Fakaofo
+TL	-0833+12535	Asia/Dili
+TM	+3757+05823	Asia/Ashgabat
+TN	+3648+01011	Africa/Tunis
+TO	-2110+17510	Pacific/Tongatapu
+TR	+4101+02858	Europe/Istanbul
+TT	+1039-06131	America/Port_of_Spain
+TV	-0831+17913	Pacific/Funafuti
+TW	+2503+12130	Asia/Taipei
+TZ	-0648+03917	Africa/Dar_es_Salaam
+UA	+5026+03031	Europe/Kiev	most locations
+UA	+4837+02218	Europe/Uzhgorod	Ruthenia
+UA	+4750+03510	Europe/Zaporozhye	Zaporozh'ye, E Lugansk
+UA	+4457+03406	Europe/Simferopol	central Crimea
+UG	+0019+03225	Africa/Kampala
+UM	+1700-16830	Pacific/Johnston	Johnston Atoll
+UM	+2813-17722	Pacific/Midway	Midway Islands
+UM	+1917+16637	Pacific/Wake	Wake Island
+US	+404251-0740023	America/New_York	Eastern Time
+US	+421953-0830245	America/Detroit	Eastern Time - Michigan - most locations
+US	+381515-0854534	America/Kentucky/Louisville	Eastern Time - Kentucky - Louisville area
+US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
+US	+394606-0860929	America/Indiana/Indianapolis	Eastern Standard Time - Indiana - most locations
+US	+382232-0862041	America/Indiana/Marengo	Eastern Standard Time - Indiana - Crawford County
+US	+411745-0863730	America/Indiana/Knox	Eastern Standard Time - Indiana - Starke County
+US	+384452-0850402	America/Indiana/Vevay	Eastern Standard Time - Indiana - Switzerland County
+US	+415100-0873900	America/Chicago	Central Time
+US	+450628-0873651	America/Menominee	Central Time - Michigan - Wisconsin border
+US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
+US	+394421-1045903	America/Denver	Mountain Time
+US	+433649-1161209	America/Boise	Mountain Time - south Idaho & east Oregon
+US	+364708-1084111	America/Shiprock	Mountain Time - Navajo
+US	+332654-1120424	America/Phoenix	Mountain Standard Time - Arizona
+US	+340308-1181434	America/Los_Angeles	Pacific Time
+US	+611305-1495401	America/Anchorage	Alaska Time
+US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
+US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+US	+515248-1763929	America/Adak	Aleutian Islands
+US	+211825-1575130	Pacific/Honolulu	Hawaii
+UY	-3453-05611	America/Montevideo
+UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+UZ	+4120+06918	Asia/Tashkent	east Uzbekistan
+VA	+4154+01227	Europe/Vatican
+VC	+1309-06114	America/St_Vincent
+VE	+1030-06656	America/Caracas
+VG	+1827-06437	America/Tortola
+VI	+1821-06456	America/St_Thomas
+VN	+1045+10640	Asia/Saigon
+VU	-1740+16825	Pacific/Efate
+WF	-1318-17610	Pacific/Wallis
+WS	-1350-17144	Pacific/Apia
+YE	+1245+04512	Asia/Aden
+YT	-1247+04514	Indian/Mayotte
+ZA	-2615+02800	Africa/Johannesburg
+ZM	-1525+02817	Africa/Lusaka
+ZW	-1750+03103	Africa/Harare
diff --git a/x11/kdelibs3/patches/patch-ad b/x11/kdelibs3/patches/patch-ad
index d6d86fbc562..caee45b73e4 100644
--- a/x11/kdelibs3/patches/patch-ad
+++ b/x11/kdelibs3/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.7 2005/10/12 17:52:26 joerg Exp $
+$NetBSD: patch-ad,v 1.8 2005/12/11 10:53:54 markd Exp $
 
---- kinit/setproctitle.h.orig	2000-02-12 03:17:07.000000000 +1300
+--- kinit/setproctitle.h.orig	2005-09-10 20:26:42.000000000 +1200
 +++ kinit/setproctitle.h
 @@ -71,8 +71,8 @@
  # define SPT_PADCHAR    '\0'    /* pad process title with nulls */
  #endif
  
 -#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
--# if defined(__NetBSD__) && (NetBSD > 199307 || NetBSD0_9 > 1)
+-# if defined(__NetBSD__)
 +#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
 +# if defined(__NetBSD__) || defined(__DragonFly__)
  #  undef SPT_TYPE
diff --git a/x11/kdelibs3/patches/patch-ae b/x11/kdelibs3/patches/patch-ae
index 43f6b15ea15..b4bed320aa4 100644
--- a/x11/kdelibs3/patches/patch-ae
+++ b/x11/kdelibs3/patches/patch-ae
@@ -1,26 +1,26 @@
-$NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
+$NetBSD: patch-ae,v 1.8 2005/12/11 10:53:54 markd Exp $
 
---- configure.orig	2005-07-20 21:20:28.000000000 +0000
+--- configure.orig	2005-11-26 19:40:15.000000000 +1300
 +++ configure
-@@ -7524,7 +7524,7 @@ darwin* | rhapsody*)
+@@ -7246,7 +7246,7 @@ darwin* | rhapsody*)
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
-+freebsd* | dragonfly*)
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
      i*86 )
-@@ -10263,7 +10263,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -9985,7 +9985,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
+-    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
        archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
-@@ -10828,7 +10828,7 @@ freebsd*-gnu*)
+@@ -10550,7 +10550,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -29,16 +29,25 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -13181,7 +13181,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -12903,7 +12903,7 @@ if test -z "$aix_libpath"; then aix_libp
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
--  freebsd*)
-+  freebsd* | dragonfly*)
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -14494,7 +14494,7 @@ freebsd*-gnu*)
+@@ -13614,7 +13614,7 @@ echo $ECHO_N "checking for $compiler opt
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -14216,7 +14216,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -47,16 +56,16 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -17020,7 +17020,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -16742,7 +16742,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
+-    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
        archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
-@@ -17585,7 +17585,7 @@ freebsd*-gnu*)
+@@ -17307,7 +17307,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -65,16 +74,16 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -19313,7 +19313,7 @@ if test -z "$aix_libpath"; then aix_libp
+@@ -19035,7 +19035,7 @@ if test -z "$aix_libpath"; then aix_libp
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
-+    freebsd* | dragonfly*)
+-    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
        archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
-@@ -19878,7 +19878,7 @@ freebsd*-gnu*)
+@@ -19600,7 +19600,7 @@ kfreebsd*-gnu*)
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -83,7 +92,7 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
    version_type=freebsd-$objformat
    case $version_type in
-@@ -23115,7 +23115,7 @@ else
+@@ -22841,7 +22841,7 @@ else
  	linux*)
  	  libltdl_cv_sys_dlopen_deplibs=yes
  	  ;;
@@ -92,7 +101,7 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
  	  libltdl_cv_sys_dlopen_deplibs=yes
  	  ;;
  	solaris*)
-@@ -43145,7 +43145,7 @@ echo "$as_me: error: Fast malloc is not 
+@@ -44967,7 +44967,7 @@ echo "$as_me: error: Fast malloc is not 
      esac
      case $target_os in
          linux*) ;;
@@ -101,7 +110,7 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
          *)
              if test "$kde_fast_malloc" = "notgiven"; then
                  kde_fast_malloc=no
-@@ -48909,7 +48909,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
+@@ -50643,7 +50643,7 @@ echo "${ECHO_T}$kde_cv_path" >&6
        gssapi_flavor=HEIMDAL
      fi
    else
@@ -110,7 +119,7 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
  
  gssapi_incdir=NO
  for i in $search_incs;
-@@ -48952,7 +48952,7 @@ done
+@@ -50686,7 +50686,7 @@ done
              GSSAPI_LIBS="-L$gssapi_libdir "
              test "$USE_RPATH" = yes && GSSAPI_RPATH="-R $gssapi_libdir"
            fi
@@ -119,7 +128,7 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
            with_gssapi=FOUND
            gssapi_flavor=HEIMDAL
            break
-@@ -48996,7 +48996,7 @@ echo "${ECHO_T}searched but not found" >
+@@ -50730,7 +50730,7 @@ echo "${ECHO_T}searched but not found" >
        GSSAPI_LIBS="${GSSAPI_LIBS}-lgssapi_krb5 -lkrb5 -lk5crypto -lcom_err ${LIBRESOLV}"
      else
        gssapi_flavor=HEIMDAL
@@ -128,7 +137,7 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
      fi
    fi
    if test "x$gssapi_flavor" = "xMIT" ; then
-@@ -49186,18 +49186,12 @@ _ACEOF
+@@ -50919,18 +50919,12 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -149,7 +158,7 @@ $NetBSD: patch-ae,v 1.7 2005/10/12 17:52:26 joerg Exp $
    ;
    return 0;
  }
-@@ -49408,18 +49402,12 @@ _ACEOF
+@@ -51141,18 +51135,12 @@ _ACEOF
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
diff --git a/x11/kdelibs3/patches/patch-an b/x11/kdelibs3/patches/patch-an
index 262eb7ecf72..6b4453ac525 100644
--- a/x11/kdelibs3/patches/patch-an
+++ b/x11/kdelibs3/patches/patch-an
@@ -1,6 +1,6 @@
-$NetBSD: patch-an,v 1.8 2005/03/23 21:37:48 markd Exp $
+$NetBSD: patch-an,v 1.9 2005/12/11 10:53:54 markd Exp $
 
---- kdecore/kstandarddirs.cpp.orig	2005-02-04 12:33:08.000000000 +1300
+--- kdecore/kstandarddirs.cpp.orig	2005-10-11 04:06:02.000000000 +1300
 +++ kdecore/kstandarddirs.cpp
 @@ -1018,33 +1018,33 @@ static int tokenize( QStringList& tokens
  
@@ -62,7 +62,7 @@ $NetBSD: patch-an,v 1.8 2005/03/23 21:37:48 markd Exp $
  
  
      qFatal("unknown resource type %s", type);
-@@ -1383,6 +1383,7 @@ void KStandardDirs::addKDEDefaults()
+@@ -1386,6 +1386,7 @@ void KStandardDirs::addKDEDefaults()
          }
  
          xdgdirList.append("/usr/local/share/");
@@ -70,8 +70,8 @@ $NetBSD: patch-an,v 1.8 2005/03/23 21:37:48 markd Exp $
          xdgdirList.append("/usr/share/");
      }
  
-@@ -1557,7 +1558,7 @@ bool KStandardDirs::addCustomized(KConfi
-             for (QStringList::ConstIterator it = list.begin(); it != list.end(); it++)
+@@ -1560,7 +1561,7 @@ bool KStandardDirs::addCustomized(KConfi
+             for (QStringList::ConstIterator it = list.begin(); it != list.end(); ++it)
              {
                  addPrefix(*it, priority);
 -                addXdgConfigPrefix(*it+"/etc/xdg", priority);
@@ -79,7 +79,7 @@ $NetBSD: patch-an,v 1.8 2005/03/23 21:37:48 markd Exp $
                  addXdgDataPrefix(*it+"/share", priority);
              }
              // If there are no prefixes defined, check if there is a directory
-@@ -1566,7 +1567,7 @@ bool KStandardDirs::addCustomized(KConfi
+@@ -1569,7 +1570,7 @@ bool KStandardDirs::addCustomized(KConfi
              {
                  QString dir = profileDirsPrefix + profile;
                  addPrefix(dir, priority);
diff --git a/x11/kdelibs3/patches/patch-ao b/x11/kdelibs3/patches/patch-ao
new file mode 100644
index 00000000000..31c8f5ae515
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.7 2005/12/11 10:53:54 markd Exp $
+
+--- kinit/kdostartupconfig.cpp.orig	2005-12-01 20:46:26.000000000 +1300
++++ kinit/kdostartupconfig.cpp
+@@ -131,7 +131,7 @@ int main()
+              it != dirs.end();
+              ++it )
+             {
+-            QString cfg = *it + "share/config/" + file;
++            QString cfg = *it + "share/kde/config/" + file;
+             if( KStandardDirs::exists( cfg ))
+                 startupconfigfiles << cfg << "\n";
+             else
diff --git a/x11/kdelibs3/patches/patch-ap b/x11/kdelibs3/patches/patch-ap
new file mode 100644
index 00000000000..e1ac2b418e6
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-ap
@@ -0,0 +1,43 @@
+$NetBSD: patch-ap,v 1.12 2005/12/11 10:53:54 markd Exp $
+
+--- kinit/kstartupconfig.cpp.orig	2005-12-01 20:47:00.000000000 +1300
++++ kinit/kstartupconfig.cpp
+@@ -28,10 +28,10 @@ This utility helps to have some configur
+ without the need to launch anything linked to KDE libraries (which may need
+ some time to load).
+ 
+-The configuration options are written to $KDEHOME/share/config/startupconfigkeys,
++The configuration options are written to $KDEHOME/share/kde/config/startupconfigkeys,
+ one option per line, as <file> <group> <key> <default>. It is possible to
+ use ' for quoting multiword entries. Values of these options will be written
+-to $KDEHOME/share/config/startupconfig as a shell script that will set
++to $KDEHOME/share/kde/config/startupconfig as a shell script that will set
+ the values to shell variables, named <file>_<group>_<key> (all spaces replaced
+ by underscores, everything lowercase). So e.g. line
+ "ksplashrc KSplash Theme Default" may result in "ksplashrc_ksplash_theme=Default".
+@@ -89,14 +89,14 @@ int main()
+         return 1;
+     char filename[ 1024 ];
+     strlcpy( filename, kdehome, 1024 );
+-    strlcat( filename, "/share/config/startupconfig", 1024 );
++    strlcat( filename, "/share/kde/config/startupconfig", 1024 );
+     if( access( filename, R_OK ) != 0 )
+         {
+         int ret = system( "kdostartupconfig" );
+         return WEXITSTATUS( ret );
+         }
+     strlcpy( filename, kdehome, 1024 );
+-    strlcat( filename, "/share/config/startupconfigfiles", 1024 );
++    strlcat( filename, "/share/kde/config/startupconfigfiles", 1024 );
+     struct stat st;
+     if( stat( filename, &st ) != 0 )
+         {
+@@ -111,7 +111,7 @@ int main()
+         return WEXITSTATUS( ret );
+         }
+     strlcpy( filename, kdehome, 1024 );
+-    strlcat( filename, "/share/config/startupconfigkeys", 1024 );
++    strlcat( filename, "/share/kde/config/startupconfigkeys", 1024 );
+     FILE* keys = fopen( filename, "r" );
+     if( keys == NULL )
+         {
diff --git a/x11/kdelibs3/patches/patch-aq b/x11/kdelibs3/patches/patch-aq
new file mode 100644
index 00000000000..671722c7ebc
--- /dev/null
+++ b/x11/kdelibs3/patches/patch-aq
@@ -0,0 +1,18 @@
+$NetBSD: patch-aq,v 1.9 2005/12/11 10:53:54 markd Exp $
+
+--- kdecore/ktimezones.cpp.orig	2005-10-11 04:06:02.000000000 +1300
++++ kdecore/ktimezones.cpp
+@@ -372,7 +372,13 @@ const KTimezones::ZoneMap KTimezones::al
+     // For Unix its all easy except knowing where to look. Try the LSB location first.
+     QFile f;
+     m_zoneinfoDir = "/usr/share/zoneinfo";
++#ifndef __NetBSD__
+     f.setName(m_zoneinfoDir + "/zone.tab");
++#else
++    // NetBSD doesn't have a zone.tab in its zoneinfo dir so point at
++    // one the package installs
++    f.setName("@LOCALBASE@/share/zone.tab");
++#endif
+     if (!f.open(IO_ReadOnly))
+     {
+         kdDebug() << "Can't open " << f.name() << endl;
diff --git a/x11/kdelibs3/patches/patch-bd b/x11/kdelibs3/patches/patch-bd
index 4104acec98b..a5a4a7649c0 100644
--- a/x11/kdelibs3/patches/patch-bd
+++ b/x11/kdelibs3/patches/patch-bd
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.9 2004/08/21 12:16:45 markd Exp $
+$NetBSD: patch-bd,v 1.10 2005/12/11 10:53:54 markd Exp $
 
---- kio/kssl/kopenssl.cc.orig	2004-05-23 08:55:48.000000000 +1200
+--- kio/kssl/kopenssl.cc.orig	2005-10-11 04:05:44.000000000 +1300
 +++ kio/kssl/kopenssl.cc
-@@ -215,7 +215,7 @@ void KOpenSSLProxy::destroy() {
+@@ -216,7 +216,7 @@ void KOpenSSLProxy::destroy() {
    _me = 0L;
  }
  
@@ -11,7 +11,7 @@ $NetBSD: patch-bd,v 1.9 2004/08/21 12:16:45 markd Exp $
  #include <qdir.h>
  #include <qstring.h>
  #include <qstringlist.h>
-@@ -278,26 +278,23 @@ KConfig *cfg;
+@@ -279,42 +279,23 @@ KConfig *cfg;
  
     delete cfg;
  
@@ -21,6 +21,22 @@ $NetBSD: patch-bd,v 1.9 2004/08/21 12:16:45 markd Exp $
 -   if (!libname.isNull())
 -         _cryptoLib = ll->globalLibrary(libname.latin1());
 -   }
+-#elif defined(__CYGWIN__)
+-   libpaths << "/usr/bin/"             
+-   		<< "/usr/local/bin"             
+-   		<< "/usr/local/openssl/bin"     
+-   		<< "/opt/openssl/bin"           
+-   		<< "/opt/kde3/bin"              
+-   		<< "";                          
+-                                       
+-   libnamess << "cygssl-0.9.7.dll"     
+-		 << "cygssl.dll"                    
+-		 << "libssl.dll"                    
+-		 << "";                         
+-                                       
+-   libnamesc << "cygcrypto.dll"        
+-		 << "libcrypto.dll"                 
+-		 << "";                         
 -#else
     libpaths
 -            #ifdef _AIX
@@ -39,40 +55,32 @@ $NetBSD: patch-bd,v 1.9 2004/08/21 12:16:45 markd Exp $
  	    << "/lib" KDELIBSUFF "/"
 +#endif
              << "";
- 
+     
 +#if !defined(__NetBSD__) && !defined(__OpenBSD__)
  // FIXME: #define here for the various OS types to optimize
     libnamess
  	     #ifdef hpux
-@@ -332,10 +329,16 @@ KConfig *cfg;
- 	     << "libcrypto.so.0"
-              #endif
- 	     ;
-+#endif
- 
+@@ -354,6 +335,11 @@ KConfig *cfg;
     for (QStringList::Iterator it = libpaths.begin();
                                it != libpaths.end();
                                ++it) {
 +#if defined(__NetBSD__) || defined(__OpenBSD__)
-+      QString libname = findMostRecentLib(*it, "crypto");
-+      if (!libname.isNull())
-+            _cryptoLib = ll->globalLibrary(libname.latin1());
++	QString libname = findMostRecentLib(*it, "crypto");
++	if (!libname.isNull())
++		_cryptoLib = ll->globalLibrary(libname.latin1());
 +#else
        for (QStringList::Iterator shit = libnamesc.begin();
                                   shit != libnamesc.end();
                                   ++shit) {
-@@ -349,9 +352,9 @@ KConfig *cfg;
+@@ -367,6 +353,7 @@ KConfig *cfg;
              _cryptoLib = ll->globalLibrary(alib.latin1());
           if (_cryptoLib) break;
        }
 +#endif
        if (_cryptoLib) break;
     }
--#endif
  
-    if (_cryptoLib) {
- #ifdef KSSL_HAVE_SSL
-@@ -478,16 +481,14 @@ KConfig *cfg;
+@@ -496,16 +483,14 @@ KConfig *cfg;
  #endif
     }
  
@@ -94,7 +102,7 @@ $NetBSD: patch-bd,v 1.9 2004/08/21 12:16:45 markd Exp $
        for (QStringList::Iterator shit = libnamess.begin();
                                   shit != libnamess.end();
                                   ++shit) {
-@@ -501,9 +502,9 @@ KConfig *cfg;
+@@ -519,9 +504,9 @@ KConfig *cfg;
           	_sslLib = ll->globalLibrary(alib.latin1());
           if (_sslLib) break;
        }
diff --git a/x11/kdelibs3/patches/patch-cg b/x11/kdelibs3/patches/patch-cg
deleted file mode 100644
index d875262daa9..00000000000
--- a/x11/kdelibs3/patches/patch-cg
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-cg,v 1.3 2005/03/23 21:37:48 markd Exp $
-
---- kio/kio/kurlcompletion.cpp.orig	2005-03-19 22:43:14.000000000 +1300
-+++ kio/kio/kurlcompletion.cpp
-@@ -229,7 +229,11 @@ void DirectoryListThread::run()
- 		struct dirent *dirPosition = (struct dirent *) malloc( sizeof( struct dirent ) + MAXPATHLEN + 1 );
- 		struct dirent *dirEntry = 0;
- 		while ( !terminationRequested() &&
-+#if defined(__NetBSD__) && __NetBSD_Version__ < 106210000  /* NetBSD 1.6U */
-+			(dirEntry = ::readdir( dir )))
-+#else
- 		        ::readdir_r( dir, dirPosition, &dirEntry ) == 0 && dirEntry )
-+#endif
- 		{
- 			// Skip hidden files if m_noHidden is true
- 
diff --git a/x11/kdelibs3/patches/patch-ch b/x11/kdelibs3/patches/patch-ch
index e3e98e33300..8b6f3bd2700 100644
--- a/x11/kdelibs3/patches/patch-ch
+++ b/x11/kdelibs3/patches/patch-ch
@@ -1,6 +1,6 @@
-$NetBSD: patch-ch,v 1.3 2005/10/12 17:52:26 joerg Exp $
+$NetBSD: patch-ch,v 1.4 2005/12/11 10:53:54 markd Exp $
 
---- kdecore/kpty.cpp.orig	2005-08-16 21:00:45.000000000 +0000
+--- kdecore/kpty.cpp.orig	2005-10-11 04:06:03.000000000 +1300
 +++ kdecore/kpty.cpp
 @@ -95,7 +95,7 @@ extern "C" {
  # endif
@@ -10,7 +10,7 @@ $NetBSD: patch-ch,v 1.3 2005/10/12 17:52:26 joerg Exp $
 +#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
  # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode)
  #else
- # if defined(_HPUX_SOURCE) || defined(__Lynx__)
+ # if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
 @@ -105,7 +105,7 @@ extern "C" {
  # endif
  #endif
@@ -19,4 +19,4 @@ $NetBSD: patch-ch,v 1.3 2005/10/12 17:52:26 joerg Exp $
 +#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined(__DragonFly__)
  # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode)
  #else
- # ifdef _HPUX_SOURCE
+ # if defined(_HPUX_SOURCE) || defined(__CYGWIN__)