[Gpg4win-commits] r820 - in trunk: . packages src

Tue May 27 14:13:47 CEST 2008

Author: marcus
Date: 2008-05-27 14:13:46 +0200 (Tue, 27 May 2008)
New Revision: 820

Modified:
   trunk/ChangeLog
   trunk/packages/packages.current
   trunk/src/inst-kdelibs.nsi
   trunk/src/inst-kleopatra.nsi
   trunk/src/inst-oxygen-icons.nsi
   trunk/src/inst-qt.nsi
   trunk/src/uninst-kdelibs.nsi
   trunk/src/uninst-kleopatra.nsi
   trunk/src/uninst-oxygen-icons.nsi
   trunk/src/uninst-qt.nsi
Log:
2008-05-27  Marcus Brinkmann  <marcus at g10code.de>

	* packages/packages.current: Update gnupg2, dirmngr, oxygen-icons,
	qt, kdesupport, kdelibs, and kleopatra.
	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi,
	src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi, src/inst-qt.nsi,
	src/uninst-qt.nsi, src/inst-oxygen-icons.nsi,
	src/uninst-oxygen-icons.nsi: Update.


Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/ChangeLog	2008-05-27 12:13:46 UTC (rev 820)
@@ -1,3 +1,12 @@
+2008-05-27  Marcus Brinkmann  <marcus at g10code.de>
+
+	* packages/packages.current: Update gnupg2, dirmngr, oxygen-icons,
+	qt, kdesupport, kdelibs, and kleopatra.
+	* src/inst-kdelibs.nsi, src/uninst-kdelibs.nsi,
+	src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi, src/inst-qt.nsi,
+	src/uninst-qt.nsi, src/inst-oxygen-icons.nsi,
+	src/uninst-oxygen-icons.nsi: Update.
+
 2008-05-25  Werner Koch  <wk at g10code.com>
 
 	* packages/packages.current: Update libassuan.

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/packages/packages.current	2008-05-27 12:13:46 UTC (rev 820)
@@ -273,18 +273,14 @@
 file gnupg/gnupg-1.4.9.tar.bz2
 chk  826f4bef1effce61c3799c8f7d3cc8313b340b55
 
-name gnupg2-2.0.10-svn4762.tar.bz2
-file alpha/gnupg/gnupg-2.0.10-svn4762.tar.bz2
-chk  7f871edf72f0bcd6dbe21b5bfdef0e4ff02635e0
-
 file libgpg-error/libgpg-error-1.6.tar.bz2
 chk  2f387d0c34dd55eaf3b5f3c2570e9033eb540bc3
 
 file libksba/libksba-1.0.3.tar.bz2
 chk  7a4b3a8340087ed360269b567881ebfb9b67441b
 
-file libgcrypt/libgcrypt-1.4.0.tar.bz2
-chk  cd1b52e8ecfa361737c6f130ed2f1d850e312c16
+file libgcrypt/libgcrypt-1.4.1.tar.bz2
+chk  367fe7fecd2ed4ab743849279dbc2f7e148f9956
 
 file libassuan/libassuan-1.0.5.tar.bz2
 chk  f6c36e9d99736883a8ce5b80b0a51d854cbbbc70
@@ -296,9 +292,13 @@
 # (Snapshots)
 server ftp://ftp.g10code.com/g10code/scratch
 
-file dirmngr-1.0.2-svn297.tar.bz2
-chk  6140c65d71af3349bfaccdccdc4d89f25399f2f9
+name gnupg2-2.0.10-svn4773.tar.bz2
+file gnupg-2.0.10-svn4773.tar.bz2
+chk  6040e890f4383700b7459b02f94381c31a663813
 
+file dirmngr-1.0.2-svn299.tar.bz2
+chk  53547434d5a2de17891a68ef8cbfdd450833a6e7
+
 file gpgme-1.1.7-svn1313.tar.bz2
 chk  526325d020e533a0a9ebe4b34b581ad287c08d18
 
@@ -330,17 +330,17 @@
 #
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name qt-4.3.3-1-bin.zip
-file qt-gpg4win-4.3.3-1-bin.zip
-chk  ce4af57778a63b0a1369ae230a5cdf71735b2db5
+name qt-4.4.0-4-bin.zip
+file qt-gpg4win-4.4.0-4-bin.zip
+chk  363e017b4018d34a0340ef69b907c609c345f388
 
-name qt-4.3.3-1-lib.zip
-file qt-gpg4win-4.3.3-1-lib.zip
-chk  6f33ba41210d18d59b93cd331d0bdc6b107e132b
+name qt-4.4.0-4-lib.zip
+file qt-gpg4win-4.4.0-4-lib.zip
+chk  731e7bc44b4a71d75b012c43e080f7c67aa2acf7
 
-name qt-4.3.3-1-src.zip
-file qt-gpg4win-4.3.3-1-src.zip
-chk  3f918cc7d0a4e039db53df97cdce7aeac408d90c
+name qt-4.4.0-4-src.zip
+file qt-gpg4win-4.4.0-4-src.zip
+chk  3c86381ba5c416c6728ff5b839379cca9208f0c3
 
 #
 # Qt contains DBus and thus depends on kdesupport, which is a random
@@ -349,16 +349,16 @@
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-file kdesupport-4.0.0-3-bin.zip
-chk 3f853554066e49cd2f91f82215cfce72edbebb14
+file kdesupport-4.1-bin.zip
+chk 313b92fe2f706820ce554ae4cefbd1d3c294fc91
 
 # FIXME: This does not actually contain the development files, but
 # further binary files we need.
-file kdesupport-4.0.0-3-lib.zip
-chk 92ed0b77f4bcf7faae0924c92d382c64804686a1
+file kdesupport-4.1-lib.zip
+chk 2165a07dadcb34e3e3ef2a28a166df22cb35dd5c
 
-file kdesupport-4.0.0-3-src.zip
-chk 8a23a3ba8158b64cd5362cf88a58cd44be8a8b73
+file kdesupport-4.1-src.zip
+chk 09cf97659df49f3bb78152dfc2e6e3e30bb6455a
 
 # oxygen-icons
 #
@@ -366,36 +366,35 @@
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name oxygen-icons-20080104-bin.zip
-file oxygen-icons-20080104.zip
-chk  1aba4fc844259a20c72ca0a2718462efc1b1fc66
+name oxygen-icons-20080526-bin.zip
+file oxygen-icons-20080526.zip
+chk  86c68eef7ac8231124d5b594a65b9518b5450237
 
-file oxygen-icons-20080104-src.zip
-chk  ced2b1f3b111cf7f6cc28c4f7863a29cda05114b
+file oxygen-icons-20080526-src.zip
+chk  a4e673c1b1b1cc420e771413edc53ef89fe7773a
 
-
 # kdelibs
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-name kdelibs-20080512-bin.zip
-file kdelibs-for-kleo-20080512-bin.zip
-chk  b71eee889dc1c03e3d1c6e70b5503d71fd61a91a
+name kdelibs-20080526-bin.zip
+file kdelibs-for-kleo-20080526-bin.zip
+chk  cffd6f95db3c0fd52623c6805943b09cc768a31e
 
-name kdelibs-20080512-lib.zip
-file kdelibs-for-kleo-20080512-dev.zip
-chk  b51fb0d976ca46413e16894f3f6036604bf9f067
+name kdelibs-20080526-lib.zip
+file kdelibs-for-kleo-20080526-dev.zip
+chk  5cb519634735479ec7138fa0324ac5ec82371a2a
 
-name kdelibs-20080512-src.zip
-file kdelibs-for-kleo-20080512-src.zip
-chk  ad606f7010263aaea1d3a23d55eb7a0bb212a87e
+name kdelibs-20080526-src.zip
+file kdelibs-for-kleo-20080526-src.zip
+chk  d8ea0b5558fc56d8320368d0c671b28a2e93a00f
 
 # Kleopatra
 
 server ftp://ftp.kdab.net/pub/gpg4win
 
-file kleopatra-20080512-bin.zip
-chk  9e3907f2d66f063df64206b10dfcd21bc53d99d1
+file kleopatra-20080526-bin.zip
+chk  6ead93dff24f9a39e101b7e3e7731d3c9a40224b
 
-file kleopatra-20080512-src.zip
-chk  35bd995414ea5f397e70f8c82ea051013a075d87
+file kleopatra-20080526-src.zip
+chk  7b1cc5a7bb1e397ae928b09d4bec0799c6f2a4fe

Modified: trunk/src/inst-kdelibs.nsi
===================================================================
--- trunk/src/inst-kdelibs.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/inst-kdelibs.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -42,18 +42,13 @@
   File ${prefix}/bin/libgpgme++-glib.dll
   File ${prefix}/bin/libgpgme++-qt.dll
   File ${prefix}/bin/libgpgme++.dll
+  File ${prefix}/bin/libkdecore.dll
+  File ${prefix}/bin/libkdeui.dll
   File ${prefix}/bin/libkmime.dll
   File ${prefix}/bin/libqgpgme.dll
   File ${prefix}/lib/libkcmutils.dll
-  File ${prefix}/lib/libkdecore.dll
-  File ${prefix}/lib/libkdeinit4_kbuildsycoca4.dll
-  File ${prefix}/lib/libkdeui.dll
   File ${prefix}/lib/kde4/kded_globalaccel.dll
 
-  SetOutPath "$INSTDIR\etc\xdg\menus"
-
-  File ${prefix}/etc/xdg/menus/applications.menu
-
   SetOutPath "$INSTDIR\share\apps\kcharselect"
 
   File ${prefix}/share/apps/kcharselect/kcharselect-data
@@ -81,12 +76,16 @@
   File ${prefix}/share/apps/kdeui/about/box-top-right.png
   File ${prefix}/share/apps/kdeui/about/kde_infopage.css
   File ${prefix}/share/apps/kdeui/about/kde_infopage_rtl.css
-  File ${prefix}/share/apps/kdeui/about/top-left.png
   File ${prefix}/share/apps/kdeui/about/top-middle.png
+  File ${prefix}/share/apps/kdeui/about/top-right.png
 
   SetOutPath "$INSTDIR\share\apps\kdeui\pics"
 
   File ${prefix}/share/apps/kdeui/pics/aboutkde.png
+  File ${prefix}/share/apps/kdeui/pics/kdeprint_nup1.png
+  File ${prefix}/share/apps/kdeui/pics/kdeprint_nup2.png
+  File ${prefix}/share/apps/kdeui/pics/kdeprint_nup4.png
+  File ${prefix}/share/apps/kdeui/pics/kdeprint_nupother.png
   File ${prefix}/share/apps/kdeui/pics/ktip-bulb.png
 
   SetOutPath "$INSTDIR\share\config\colors"
@@ -112,6 +111,7 @@
 
   SetOutPath "$INSTDIR\share\kde4\servicetypes"
 
+  File ${prefix}/share/kde4/servicetypes/kconfigbackend.desktop
   File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
   File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
 

Modified: trunk/src/inst-kleopatra.nsi
===================================================================
--- trunk/src/inst-kleopatra.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/inst-kleopatra.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -39,6 +39,7 @@
   File ${prefix}/bin/kwatchgnupg.exe
   File ${prefix}/bin/libkleo.dll
   File ${prefix}/bin/libkleopatraclientcore.dll
+  File ${prefix}/bin/libkleopatraclientgui.dll
   File ${prefix}/lib/kde4/kcm_kleopatra.dll
 
   SetOutPath "$INSTDIR\share\applications\kde4"
@@ -105,9 +106,7 @@
 
   File ${prefix}/share/icons/oxygen/scalable/apps/kleopatra.svgz
 
-  # FIXME: The kcm .desktop files belong to share/kde4/services
-  # actually, but are not found if installed there.
-  SetOutPath "$INSTDIR\share\applications\kde4"
+  SetOutPath "$INSTDIR\share\kde4\services"
 
   File ${prefix}/share/kde4/services/kleopatra_config_appear.desktop
   File ${prefix}/share/kde4/services/kleopatra_config_dirserv.desktop

Modified: trunk/src/inst-oxygen-icons.nsi
===================================================================
--- trunk/src/inst-oxygen-icons.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/inst-oxygen-icons.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -1,5 +1,5 @@
 # inst-oxygen-icons.nsi - Snippet for oxygen-icons.   -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -51,21 +51,14 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/bookmark-new-list.png
   File ${prefix}/share/icons/oxygen/16x16/actions/bookmark-new.png
   File ${prefix}/share/icons/oxygen/16x16/actions/bookmark-toolbar.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/cd-data.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/cd.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/bookmarks-organize.png
   File ${prefix}/share/icons/oxygen/16x16/actions/character-set.png
   File ${prefix}/share/icons/oxygen/16x16/actions/chronometer.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/color-fill.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/color-line.png
   File ${prefix}/share/icons/oxygen/16x16/actions/color-picker.png
   File ${prefix}/share/icons/oxygen/16x16/actions/configure-shortcuts.png
   File ${prefix}/share/icons/oxygen/16x16/actions/configure-toolbars.png
   File ${prefix}/share/icons/oxygen/16x16/actions/configure.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/connect-no.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/connection-established.png
   File ${prefix}/share/icons/oxygen/16x16/actions/contact-new.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/datashow.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/datashowchart.png
   File ${prefix}/share/icons/oxygen/16x16/actions/dialog-cancel.png
   File ${prefix}/share/icons/oxygen/16x16/actions/dialog-close.png
   File ${prefix}/share/icons/oxygen/16x16/actions/dialog-ok-apply.png
@@ -90,18 +83,14 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/document-save-as.png
   File ${prefix}/share/icons/oxygen/16x16/actions/document-save.png
   File ${prefix}/share/icons/oxygen/16x16/actions/document-sign.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-start-presentation.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/domtreeviewer.png
   File ${prefix}/share/icons/oxygen/16x16/actions/draw-brush.png
   File ${prefix}/share/icons/oxygen/16x16/actions/draw-eraser.png
   File ${prefix}/share/icons/oxygen/16x16/actions/draw-freehand.png
   File ${prefix}/share/icons/oxygen/16x16/actions/draw-text.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-add.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear-history.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear-list.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear-locationbar-ltr.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear-locationbar-rtl.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear-locationbar.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-copy.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-cut.png
@@ -109,28 +98,15 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-delete-shred.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-delete.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-find-mail.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-find-next.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-find-previous.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-find-user.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-find.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/edit-link.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-paste.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-redo.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-rename.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-select-all.png
   File ${prefix}/share/icons/oxygen/16x16/actions/edit-undo.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-user.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/favorites.png
   File ${prefix}/share/icons/oxygen/16x16/actions/feed-subscribe.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-close-left.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-close-right.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-column.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-detailed.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-icon.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-multicolumn.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-preview.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-split.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/fileview-text.png
   File ${prefix}/share/icons/oxygen/16x16/actions/fill-color.png
   File ${prefix}/share/icons/oxygen/16x16/actions/flag-black.png
   File ${prefix}/share/icons/oxygen/16x16/actions/flag-blue.png
@@ -163,7 +139,6 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/format-text-subscript.png
   File ${prefix}/share/icons/oxygen/16x16/actions/format-text-superscript.png
   File ${prefix}/share/icons/oxygen/16x16/actions/format-text-underline.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/frame-edit.png
   File ${prefix}/share/icons/oxygen/16x16/actions/games-config-background.png
   File ${prefix}/share/icons/oxygen/16x16/actions/games-config-board.png
   File ${prefix}/share/icons/oxygen/16x16/actions/games-config-custom.png
@@ -175,50 +150,30 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/games-highscores.png
   File ${prefix}/share/icons/oxygen/16x16/actions/games-hint.png
   File ${prefix}/share/icons/oxygen/16x16/actions/games-solve.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/gear.png
   File ${prefix}/share/icons/oxygen/16x16/actions/get-hot-new-stuff.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-bottom.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-down-search.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-down.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-first-rtl.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-first.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-home.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-jump-locationbar.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-jump-today.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-jump.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-last-rtl.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-last.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-next-rtl.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-next.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-previous-rtl.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-previous.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-top.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-up-search.png
   File ${prefix}/share/icons/oxygen/16x16/actions/go-up.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/help-about-kde.png
   File ${prefix}/share/icons/oxygen/16x16/actions/help-about.png
   File ${prefix}/share/icons/oxygen/16x16/actions/help-contents.png
   File ${prefix}/share/icons/oxygen/16x16/actions/help-contextual.png
   File ${prefix}/share/icons/oxygen/16x16/actions/help-hint.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/history.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/insert-horizontal-rule.png
   File ${prefix}/share/icons/oxygen/16x16/actions/insert-image.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/insert-link.png
   File ${prefix}/share/icons/oxygen/16x16/actions/insert-table.png
   File ${prefix}/share/icons/oxygen/16x16/actions/insert-text.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-export-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-identity-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-import-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-info-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-key1-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-key2-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-key3-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-key4-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-sign-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kgpg-term-kgpg.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/knewstuff.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/knotes-delete-knotes.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/konv-message.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/konv-message2.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/kscd-dock.png
   File ${prefix}/share/icons/oxygen/16x16/actions/list-add-font.png
   File ${prefix}/share/icons/oxygen/16x16/actions/list-add-user.png
   File ${prefix}/share/icons/oxygen/16x16/actions/list-add.png
@@ -244,7 +199,6 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/media-playback-start.png
   File ${prefix}/share/icons/oxygen/16x16/actions/media-playback-stop.png
   File ${prefix}/share/icons/oxygen/16x16/actions/media-record.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/media-scripts.png
   File ${prefix}/share/icons/oxygen/16x16/actions/media-seek-backward.png
   File ${prefix}/share/icons/oxygen/16x16/actions/media-seek-forward.png
   File ${prefix}/share/icons/oxygen/16x16/actions/media-skip-backward.png
@@ -253,41 +207,39 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/network-disconnect.png
   File ${prefix}/share/icons/oxygen/16x16/actions/news-subscribe.png
   File ${prefix}/share/icons/oxygen/16x16/actions/news-unsubscribe.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/object-edit.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/object-flip-horizontal.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/object-flip-vertical.png
   File ${prefix}/share/icons/oxygen/16x16/actions/object-rotate-left.png
   File ${prefix}/share/icons/oxygen/16x16/actions/object-rotate-right.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/ok.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/page-zoom.png
   File ${prefix}/share/icons/oxygen/16x16/actions/player-time.png
   File ${prefix}/share/icons/oxygen/16x16/actions/player-volume.png
   File ${prefix}/share/icons/oxygen/16x16/actions/process-stop.png
   File ${prefix}/share/icons/oxygen/16x16/actions/project-open.png
   File ${prefix}/share/icons/oxygen/16x16/actions/rating.png
   File ${prefix}/share/icons/oxygen/16x16/actions/roll.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/rss-tag.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/rss.png
   File ${prefix}/share/icons/oxygen/16x16/actions/run-build-file.png
   File ${prefix}/share/icons/oxygen/16x16/actions/run-build.png
   File ${prefix}/share/icons/oxygen/16x16/actions/select-rectangular.png
   File ${prefix}/share/icons/oxygen/16x16/actions/services.png
   File ${prefix}/share/icons/oxygen/16x16/actions/show-menu.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/signature.png
   File ${prefix}/share/icons/oxygen/16x16/actions/speaker.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-lock-screen.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-log-out.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-restart.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-run.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-search.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/system-shutdown.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-suspend-hibernate.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-suspend.png
   File ${prefix}/share/icons/oxygen/16x16/actions/system-switch-user.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/tab-close-other.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tab-close.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tab-detach.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tab-duplicate.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tab-new-background.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tab-new.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/table.png
   File ${prefix}/share/icons/oxygen/16x16/actions/text-speak.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/text.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tools-check-spelling.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tools-media-optical-burn.png
   File ${prefix}/share/icons/oxygen/16x16/actions/tools-media-optical-copy.png
@@ -295,11 +247,10 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/tools-wizard.png
   File ${prefix}/share/icons/oxygen/16x16/actions/transform-move.png
   File ${prefix}/share/icons/oxygen/16x16/actions/transform-rotate.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/transform-scale.png
   File ${prefix}/share/icons/oxygen/16x16/actions/trash-empty.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/user-female.png
   File ${prefix}/share/icons/oxygen/16x16/actions/user-group-new.png
   File ${prefix}/share/icons/oxygen/16x16/actions/user-properties.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/user.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-calendar-day.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-calendar-list.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-calendar-month.png
@@ -315,9 +266,7 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/view-filter.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-fullscreen.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-history.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-icon.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-left-close.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-left-right.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-list-details.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-list-icons.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-list-text.png
@@ -353,61 +302,33 @@
   File ${prefix}/share/icons/oxygen/16x16/actions/view-split-left-right.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-split-top-bottom.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-statistics.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-top-bottom.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-tree.png
   File ${prefix}/share/icons/oxygen/16x16/actions/view-web-browser-dom-tree.png
   File ${prefix}/share/icons/oxygen/16x16/actions/window-close.png
   File ${prefix}/share/icons/oxygen/16x16/actions/window-duplicate.png
   File ${prefix}/share/icons/oxygen/16x16/actions/window-new.png
   File ${prefix}/share/icons/oxygen/16x16/actions/window-suppressed.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/zoom-best-fit.png
   File ${prefix}/share/icons/oxygen/16x16/actions/zoom-fit-best.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/zoom-fit-height.png
+  File ${prefix}/share/icons/oxygen/16x16/actions/zoom-fit-width.png
   File ${prefix}/share/icons/oxygen/16x16/actions/zoom-in.png
   File ${prefix}/share/icons/oxygen/16x16/actions/zoom-original.png
   File ${prefix}/share/icons/oxygen/16x16/actions/zoom-out.png
 
   SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"
 
-  File ${prefix}/share/icons/oxygen/16x16/apps/KEduca.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/KLatin.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/KPercentage.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/KVerbos.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/KWordQuiz.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/KmPlot.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/abiword.png
   File ${prefix}/share/icons/oxygen/16x16/apps/accessories-calculator.png
   File ${prefix}/share/icons/oxygen/16x16/apps/accessories-character-map.png
   File ${prefix}/share/icons/oxygen/16x16/apps/accessories-dictionary.png
   File ${prefix}/share/icons/oxygen/16x16/apps/accessories-text-editor.png
   File ${prefix}/share/icons/oxygen/16x16/apps/acroread.png
+  File ${prefix}/share/icons/oxygen/16x16/apps/akonadi.png
   File ${prefix}/share/icons/oxygen/16x16/apps/akregator.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/alevt.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/applixware.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/assistant.png
   File ${prefix}/share/icons/oxygen/16x16/apps/basket.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/blender.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/bluefish.png
   File ${prefix}/share/icons/oxygen/16x16/apps/bovo.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/clanbomber.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/designer.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/dia.png
   File ${prefix}/share/icons/oxygen/16x16/apps/digikam.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/eclipse.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/emacs.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/email.png
   File ${prefix}/share/icons/oxygen/16x16/apps/esd.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/evolution.png
   File ${prefix}/share/icons/oxygen/16x16/apps/fontforge.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gabber.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gaim.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gimp.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gnomemeeting.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gnucash.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gnumeric.png
   File ${prefix}/share/icons/oxygen/16x16/apps/graphics-viewer-document.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gv.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gvim.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/gwenview.png
   File ${prefix}/share/icons/oxygen/16x16/apps/help-browser.png
   File ${prefix}/share/icons/oxygen/16x16/apps/hwinfo.png
   File ${prefix}/share/icons/oxygen/16x16/apps/inkscape.png
@@ -416,64 +337,40 @@
   File ${prefix}/share/icons/oxygen/16x16/apps/internet-web-browser.png
   File ${prefix}/share/icons/oxygen/16x16/apps/java.png
   File ${prefix}/share/icons/oxygen/16x16/apps/k3b.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kaddressbook.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kaffeine.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kanagram.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kate.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kblogger.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kbruch.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kbugbuster.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kcall.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kchart.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kcolorchooser.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kde.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kexi.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kgeography.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kget.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/khangman.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kiten.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kjournal.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/klettres.png
   File ${prefix}/share/icons/oxygen/16x16/apps/klipper.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kmail.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kmplayer.png
   File ${prefix}/share/icons/oxygen/16x16/apps/knotes.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kolf.png
   File ${prefix}/share/icons/oxygen/16x16/apps/konqueror.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kontact.png
   File ${prefix}/share/icons/oxygen/16x16/apps/konversation.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kopete.png
   File ${prefix}/share/icons/oxygen/16x16/apps/krdc.png
   File ${prefix}/share/icons/oxygen/16x16/apps/krfb.png
   File ${prefix}/share/icons/oxygen/16x16/apps/krita.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kruler.png
   File ${prefix}/share/icons/oxygen/16x16/apps/ksnapshot.png
   File ${prefix}/share/icons/oxygen/16x16/apps/ksniffer.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kstars.png
   File ${prefix}/share/icons/oxygen/16x16/apps/ksudoku.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kteatime.png
   File ${prefix}/share/icons/oxygen/16x16/apps/ktip.png
   File ${prefix}/share/icons/oxygen/16x16/apps/ktorrent.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kuickshow.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/kvoctrain.png
+  File ${prefix}/share/icons/oxygen/16x16/apps/kverbos.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kwalletmanager.png
   File ${prefix}/share/icons/oxygen/16x16/apps/kword.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/laptop-battery.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/licq.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/linguist.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/lyx.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/marble.png
   File ${prefix}/share/icons/oxygen/16x16/apps/multimedia-volume-control.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/netscape.png
+  File ${prefix}/share/icons/oxygen/16x16/apps/nepomuk.png
   File ${prefix}/share/icons/oxygen/16x16/apps/office-address-book.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/office-addressbook.png
   File ${prefix}/share/icons/oxygen/16x16/apps/office-calendar.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/opera.png
   File ${prefix}/share/icons/oxygen/16x16/apps/oxygen.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/pan.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/penguin.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/plan.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/planner.png
   File ${prefix}/share/icons/oxygen/16x16/apps/plasma.png
   File ${prefix}/share/icons/oxygen/16x16/apps/plasmagik.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-contact-list.png
@@ -501,7 +398,6 @@
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-desktop-user.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-desktop-wallpaper.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-kcalc-constants.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/preferences-other.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-plugin-script.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-plugin.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-system-bluetooth.png
@@ -518,40 +414,18 @@
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-web-browser-identification.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-web-browser-shortcuts.png
   File ${prefix}/share/icons/oxygen/16x16/apps/preferences-web-browser-stylesheets.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/pybliographic.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/realplayer.png
   File ${prefix}/share/icons/oxygen/16x16/apps/scribus.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/sodipodi.png
   File ${prefix}/share/icons/oxygen/16x16/apps/strigi.png
   File ${prefix}/share/icons/oxygen/16x16/apps/system-file-manager.png
   File ${prefix}/share/icons/oxygen/16x16/apps/system-software-update.png
   File ${prefix}/share/icons/oxygen/16x16/apps/system-users.png
   File ${prefix}/share/icons/oxygen/16x16/apps/tagua.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/terminal.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/tux.png
   File ${prefix}/share/icons/oxygen/16x16/apps/utilities-file-archiver.png
   File ${prefix}/share/icons/oxygen/16x16/apps/utilities-log-viewer.png
   File ${prefix}/share/icons/oxygen/16x16/apps/utilities-system-monitor.png
   File ${prefix}/share/icons/oxygen/16x16/apps/utilities-terminal.png
   File ${prefix}/share/icons/oxygen/16x16/apps/wine.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/wp.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/x.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xcalc.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xchat.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xclipboard.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xclock.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xedit.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xemacs.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xeyes.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xfig.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xfmail.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xload.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xmag.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xmms.png
   File ${prefix}/share/icons/oxygen/16x16/apps/xorg.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xosview.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xpaint.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/xv.png
 
   SetOutPath "$INSTDIR\share\icons\oxygen\16x16\categories"
 
@@ -595,7 +469,6 @@
   File ${prefix}/share/icons/oxygen/16x16/devices/cpu.png
   File ${prefix}/share/icons/oxygen/16x16/devices/drive-harddisk.png
   File ${prefix}/share/icons/oxygen/16x16/devices/drive-optical.png
-  File ${prefix}/share/icons/oxygen/16x16/devices/drive-remote.png
   File ${prefix}/share/icons/oxygen/16x16/devices/drive-removable-media-usb-pendrive.png
   File ${prefix}/share/icons/oxygen/16x16/devices/drive-removable-media-usb.png
   File ${prefix}/share/icons/oxygen/16x16/devices/drive-removable-media.png
@@ -640,7 +513,6 @@
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/application-pgp-encrypted.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/application-pgp-keys.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/application-pgp-signature.png
-  File ${prefix}/share/icons/oxygen/16x16/mimetypes/application-pgp.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/application-pkcs7-mime.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/application-pkcs7-signature.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/application-relaxng.png
@@ -806,14 +678,11 @@
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/image-x-xfig.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/image-x-xpixmap.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/inode-directory.png
-  File ${prefix}/share/icons/oxygen/16x16/mimetypes/kwordquiz-do.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/message-news.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/message-rfc822.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/message.png
-  File ${prefix}/share/icons/oxygen/16x16/mimetypes/none.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/odf.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/package-x-generic.png
-  File ${prefix}/share/icons/oxygen/16x16/mimetypes/recycled.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/text-calendar.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/text-css.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/text-csv.png
@@ -875,19 +744,17 @@
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/video-x-msvideo.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/video-x-ogm+ogg.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/video-x-theora+ogg.png
+  File ${prefix}/share/icons/oxygen/16x16/mimetypes/x-kde-nsplugin-generated.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/x-media-podcast.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/x-office-address-book.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/x-office-calendar.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/x-office-contact.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/x-office-document.png
   File ${prefix}/share/icons/oxygen/16x16/mimetypes/x-office-spreadsheet.png
-  File ${prefix}/share/icons/oxygen/16x16/mimetypes/zip.png
 
   SetOutPath "$INSTDIR\share\icons\oxygen\16x16\places"
 
-  File ${prefix}/share/icons/oxygen/16x16/places/bookmark.png
   File ${prefix}/share/icons/oxygen/16x16/places/bookmarks.png
-  File ${prefix}/share/icons/oxygen/16x16/places/contact.png
   File ${prefix}/share/icons/oxygen/16x16/places/document-multiple.png
   File ${prefix}/share/icons/oxygen/16x16/places/favorites.png
   File ${prefix}/share/icons/oxygen/16x16/places/folder-blue.png
@@ -916,16 +783,10 @@
   File ${prefix}/share/icons/oxygen/16x16/places/mail-folder-inbox.png
   File ${prefix}/share/icons/oxygen/16x16/places/mail-folder-outbox.png
   File ${prefix}/share/icons/oxygen/16x16/places/mail-folder-sent.png
-  File ${prefix}/share/icons/oxygen/16x16/places/mail-inbox.png
   File ${prefix}/share/icons/oxygen/16x16/places/mail-message.png
-  File ${prefix}/share/icons/oxygen/16x16/places/mail-outbox.png
-  File ${prefix}/share/icons/oxygen/16x16/places/media-album.png
-  File ${prefix}/share/icons/oxygen/16x16/places/media-playlist.png
-  File ${prefix}/share/icons/oxygen/16x16/places/media-podcast.png
   File ${prefix}/share/icons/oxygen/16x16/places/network-server-database.png
   File ${prefix}/share/icons/oxygen/16x16/places/network-server.png
   File ${prefix}/share/icons/oxygen/16x16/places/network-workgroup.png
-  File ${prefix}/share/icons/oxygen/16x16/places/network.png
   File ${prefix}/share/icons/oxygen/16x16/places/start-here-kde.png
   File ${prefix}/share/icons/oxygen/16x16/places/start-here.png
   File ${prefix}/share/icons/oxygen/16x16/places/user-desktop.png
@@ -956,6 +817,7 @@
   File ${prefix}/share/icons/oxygen/16x16/status/image-loading.png
   File ${prefix}/share/icons/oxygen/16x16/status/image-missing.png
   File ${prefix}/share/icons/oxygen/16x16/status/mail-attachment.png
+  File ${prefix}/share/icons/oxygen/16x16/status/mail-queued.png
   File ${prefix}/share/icons/oxygen/16x16/status/mail-read.png
   File ${prefix}/share/icons/oxygen/16x16/status/mail-unread-new.png
   File ${prefix}/share/icons/oxygen/16x16/status/mail-unread.png
@@ -979,6 +841,12 @@
   File ${prefix}/share/icons/oxygen/16x16/status/wallet-closed.png
   File ${prefix}/share/icons/oxygen/16x16/status/wallet-open.png
 
+  SetOutPath "$INSTDIR\share\icons\oxygen\8x8\emblems"
+
+  File ${prefix}/share/icons/oxygen/8x8/emblems/emblem-important.png
+  File ${prefix}/share/icons/oxygen/8x8/emblems/emblem-link.png
+  File ${prefix}/share/icons/oxygen/8x8/emblems/emblem-mounted.png
+
   SetOutPath "$INSTDIR\share\icons\oxygen"
 
   File ${prefix}/share/icons/oxygen/index.theme

Modified: trunk/src/inst-qt.nsi
===================================================================
--- trunk/src/inst-qt.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/inst-qt.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -1,5 +1,5 @@
 # inst-qt.nsi - Installer snippet for qt.      -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007 g10 Code GmbH
+# Copyright (C) 2005, 2007, 2008 g10 Code GmbH
 # 
 # This file is part of GPG4Win.
 # 
@@ -38,12 +38,10 @@
   File ${BUILD_DIR}/mingwm10.dll
 
   File ${prefix}/bin/Qt3Support4.dll
-  File ${prefix}/bin/QtAssistantClient4.dll
   File ${prefix}/bin/QtCore4.dll
   File ${prefix}/bin/QtDBus4.dll
-  File ${prefix}/bin/QtDesigner4.dll
-  File ${prefix}/bin/QtDesignerComponents4.dll
   File ${prefix}/bin/QtGui4.dll
+  File ${prefix}/bin/QtHelp4.dll
   File ${prefix}/bin/QtNetwork4.dll
   File ${prefix}/bin/QtOpenGL4.dll
   File ${prefix}/bin/QtScript4.dll
@@ -66,68 +64,58 @@
   SetOutPath "$INSTDIR\plugins\designer"
 
   File ${prefix}/plugins/designer/qt3supportwidgets.dll
+  File ${prefix}/plugins/designer/qwebview.dll
 
   SetOutPath "$INSTDIR\plugins\iconengines"
 
-  File ${prefix}/plugins/iconengines/qsvg4.dll
+  File ${prefix}/plugins/iconengines/qsvgicon4.dll
 
   SetOutPath "$INSTDIR\plugins\imageformats"
 
   File ${prefix}/plugins/imageformats/qgif4.dll
+  File ${prefix}/plugins/imageformats/qico4.dll
   File ${prefix}/plugins/imageformats/qjpeg4.dll
   File ${prefix}/plugins/imageformats/qmng4.dll
   File ${prefix}/plugins/imageformats/qsvg4.dll
   File ${prefix}/plugins/imageformats/qtiff4.dll
 
-  SetOutPath "$INSTDIR\plugins\plugins\accessible"
+  SetOutPath "$INSTDIR\plugins\script"
 
-  File ${prefix}/plugins/plugins/accessible/qtaccessiblecompatwidgetsd4.dll
-  File ${prefix}/plugins/plugins/accessible/qtaccessiblewidgetsd4.dll
+  File ${prefix}/plugins/script/qtscriptdbus4.dll
 
-  SetOutPath "$INSTDIR\plugins\plugins\codecs"
-
-  File ${prefix}/plugins/plugins/codecs/qcncodecsd4.dll
-  File ${prefix}/plugins/plugins/codecs/qjpcodecsd4.dll
-  File ${prefix}/plugins/plugins/codecs/qkrcodecsd4.dll
-  File ${prefix}/plugins/plugins/codecs/qtwcodecsd4.dll
-
-  SetOutPath "$INSTDIR\plugins\plugins\iconengines"
-
-  File ${prefix}/plugins/plugins/iconengines/qsvgd4.dll
-
-  SetOutPath "$INSTDIR\plugins\plugins\imageformats"
-
-  File ${prefix}/plugins/plugins/imageformats/qgifd4.dll
-  File ${prefix}/plugins/plugins/imageformats/qjpegd4.dll
-  File ${prefix}/plugins/plugins/imageformats/qmngd4.dll
-  File ${prefix}/plugins/plugins/imageformats/qsvgd4.dll
-  File ${prefix}/plugins/plugins/imageformats/qtiffd4.dll
-
-  SetOutPath "$INSTDIR\plugins\plugins\sqldrivers"
-
-  File ${prefix}/plugins/plugins/sqldrivers/qsqlited4.dll
-
   SetOutPath "$INSTDIR\plugins\sqldrivers"
 
   File ${prefix}/plugins/sqldrivers/qsqlite4.dll
 
   SetOutPath "$INSTDIR\translations"
 
+  File ${prefix}/translations/assistant_adp_de.qm
+#  File ${prefix}/translations/assistant_adp_ja.qm
+#  File ${prefix}/translations/assistant_adp_pl.qm
+#  File ${prefix}/translations/assistant_adp_zh_CN.qm
+#  File ${prefix}/translations/assistant_adp_zh_TW.qm
   File ${prefix}/translations/assistant_de.qm
-#  File ${prefix}/translations/assistant_ja.qm
 #  File ${prefix}/translations/assistant_pl.qm
 #  File ${prefix}/translations/assistant_zh_CN.qm
+#  File ${prefix}/translations/assistant_zh_TW.qm
   File ${prefix}/translations/designer_de.qm
 #  File ${prefix}/translations/designer_ja.qm
 #  File ${prefix}/translations/designer_pl.qm
 #  File ${prefix}/translations/designer_zh_CN.qm
+#  File ${prefix}/translations/designer_zh_TW.qm
+  File ${prefix}/translations/linguist_de.qm
 #  File ${prefix}/translations/linguist_ja.qm
 #  File ${prefix}/translations/linguist_pl.qm
 #  File ${prefix}/translations/linguist_zh_CN.qm
+#  File ${prefix}/translations/linguist_zh_TW.qm
 #  File ${prefix}/translations/qt_ar.qm
   File ${prefix}/translations/qt_de.qm
 #  File ${prefix}/translations/qt_es.qm
 #  File ${prefix}/translations/qt_fr.qm
+  File ${prefix}/translations/qt_help_de.qm
+#  File ${prefix}/translations/qt_help_pl.qm
+#  File ${prefix}/translations/qt_help_zh_CN.qm
+#  File ${prefix}/translations/qt_help_zh_TW.qm
 #  File ${prefix}/translations/qt_iw.qm
 #  File ${prefix}/translations/qt_ja_jp.qm
 #  File ${prefix}/translations/qt_pl.qm
@@ -137,10 +125,12 @@
 #  File ${prefix}/translations/qt_sv.qm
 #  File ${prefix}/translations/qt_uk.qm
 #  File ${prefix}/translations/qt_zh_CN.qm
+#  File ${prefix}/translations/qt_zh_TW.qm
 #  File ${prefix}/translations/qtconfig_pl.qm
 #  File ${prefix}/translations/qtconfig_zh_CN.qm
 #  File ${prefix}/translations/qvfb_pl.qm
 #  File ${prefix}/translations/qvfb_zh_CN.qm
+#  File ${prefix}/translations/qvfb_zh_TW.qm
 
 !endif
 SectionEnd

Modified: trunk/src/uninst-kdelibs.nsi
===================================================================
--- trunk/src/uninst-kdelibs.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/uninst-kdelibs.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -37,7 +37,6 @@
 
   Delete "$INSTDIR\kded_globalaccel.dll"
   Delete "$INSTDIR\libkdeui.dll"
-  Delete "$INSTDIR\libkdeinit4_kbuildsycoca4.dll"
   Delete "$INSTDIR\libkdecore.dll"
   Delete "$INSTDIR\libkcmutils.dll"
   Delete "$INSTDIR\libqgpgme.dll"
@@ -50,6 +49,7 @@
   Delete "$INSTDIR\share\locale\all_languages"
   Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
   Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
+  Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
   Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
   Delete "$INSTDIR\share\config\ui\ui_standards.rc"
   Delete "$INSTDIR\share\config\kdebugrc"
@@ -60,9 +60,13 @@
   Delete "$INSTDIR\share\config\colors\Oxygen.colors"
   Delete "$INSTDIR\share\config\colors\40.colors"
   Delete "$INSTDIR\share\apps\kdeui\pics\ktip-bulb.png"
+  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nupother.png"
+  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup4.png"
+  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup2.png"
+  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup1.png"
   Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
   Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\top-left.png"
+  Delete "$INSTDIR\share\apps\kdeui\about\top-right.png"
   Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
   Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
   Delete "$INSTDIR\share\apps\kdeui\about\box-top-right.png"
@@ -85,7 +89,6 @@
   Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
   Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
   Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
-  Delete "$INSTDIR\etc\xdg\menus\applications.menu"
 
   RMDir "$INSTDIR\share\locale"
   RMDir "$INSTDIR\share\kde4\servicetypes"

Modified: trunk/src/uninst-kleopatra.nsi
===================================================================
--- trunk/src/uninst-kleopatra.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/uninst-kleopatra.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -36,18 +36,17 @@
   RMDir "$INSTDIR\bin"
   Delete "$INSTDIR\kleopatra.exe"
 
-  # FIXME: See inst-kleopatra.nsi
+  Delete "$INSTDIR\share\kde4\services\kleopatra_config_smimevalidation.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dnorder.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dirserv.desktop"
+  Delete "$INSTDIR\share\kde4\services\kleopatra_config_appear.desktop"
 
-  Delete "$INSTDIR\share\applications\kde4\kleopatra_config_smimevalidation.desktop"
-  Delete "$INSTDIR\share\applications\kde4\kleopatra_config_dnorder.desktop"
-  Delete "$INSTDIR\share\applications\kde4\kleopatra_config_dirserv.desktop"
-  Delete "$INSTDIR\share\applications\kde4\kleopatra_config_appear.desktop"
-
   Delete "$INSTDIR\kcm_kleopatra.dll"
   Delete "$INSTDIR\libkleo.dll"
   Delete "$INSTDIR\kgpgconf.exe"
   Delete "$INSTDIR\kwatchgnupg.exe"
   Delete "$INSTDIR\libkleopatraclientcore.dll"
+  Delete "$INSTDIR\libkleopatraclientgui.dll"
 
   Delete "$INSTDIR\share\locale\de\entry.desktop"
   Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"

Modified: trunk/src/uninst-oxygen-icons.nsi
===================================================================
--- trunk/src/uninst-oxygen-icons.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/uninst-oxygen-icons.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -32,6 +32,9 @@
 !else
 
   Delete "$INSTDIR\share\icons\oxygen\index.theme"
+  Delete "$INSTDIR\share\icons\oxygen\8x8\emblems\emblem-mounted.png"
+  Delete "$INSTDIR\share\icons\oxygen\8x8\emblems\emblem-link.png"
+  Delete "$INSTDIR\share\icons\oxygen\8x8\emblems\emblem-important.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\wallet-open.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\wallet-closed.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\user-trash-full.png"
@@ -54,6 +57,7 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\mail-unread.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\mail-unread-new.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\mail-read.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\status\mail-queued.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\mail-attachment.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\image-missing.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\status\image-loading.png"
@@ -81,16 +85,10 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\user-desktop.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\start-here.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\start-here-kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\network.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\network-workgroup.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\network-server.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\network-server-database.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\media-podcast.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\media-playlist.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\media-album.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\mail-outbox.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\mail-message.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\mail-inbox.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\mail-folder-sent.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\mail-folder-outbox.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\mail-folder-inbox.png"
@@ -119,16 +117,14 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\folder-blue.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\favorites.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\document-multiple.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\contact.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\places\bookmarks.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\places\bookmark.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\zip.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\x-office-spreadsheet.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\x-office-document.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\x-office-contact.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\x-office-calendar.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\x-office-address-book.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\x-media-podcast.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\x-kde-nsplugin-generated.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\video-x-theora+ogg.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\video-x-ogm+ogg.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\video-x-msvideo.png"
@@ -190,14 +186,11 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\text-csv.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\text-css.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\text-calendar.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\recycled.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\package-x-generic.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\odf.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\none.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\message.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\message-rfc822.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\message-news.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\kwordquiz-do.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\inode-directory.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\image-x-xpixmap.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\image-x-xfig.png"
@@ -363,7 +356,6 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\application-relaxng.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\application-pkcs7-signature.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\application-pkcs7-mime.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\application-pgp.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\application-pgp-signature.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\application-pgp-keys.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\mimetypes\application-pgp-encrypted.png"
@@ -402,7 +394,6 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\devices\drive-removable-media.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\devices\drive-removable-media-usb.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\devices\drive-removable-media-usb-pendrive.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\devices\drive-remote.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\devices\drive-optical.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\devices\drive-harddisk.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\devices\cpu.png"
@@ -440,40 +431,18 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\categories\applications-development-web.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\categories\applications-development-translation.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\categories\applications-accessories.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xv.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xpaint.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xosview.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xorg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xmms.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xmag.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xload.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xfmail.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xfig.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xeyes.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xemacs.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xedit.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xclock.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xclipboard.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xchat.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\xcalc.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\x.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\wp.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\wine.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\utilities-terminal.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\utilities-system-monitor.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\utilities-log-viewer.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\utilities-file-archiver.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\tux.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\terminal.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\tagua.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\system-users.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\system-software-update.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\system-file-manager.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\strigi.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\sodipodi.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\scribus.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\realplayer.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\pybliographic.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-web-browser-stylesheets.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-web-browser-shortcuts.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-web-browser-identification.png"
@@ -490,7 +459,6 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-system-bluetooth.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-plugin.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-plugin-script.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-other.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-kcalc-constants.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-desktop-wallpaper.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-desktop-user.png"
@@ -518,64 +486,40 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\preferences-contact-list.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\plasmagik.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\plasma.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\planner.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\plan.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\penguin.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\pan.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\oxygen.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\opera.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\office-calendar.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\office-addressbook.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\office-address-book.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\netscape.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\nepomuk.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\multimedia-volume-control.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\marble.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\lyx.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\linguist.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\licq.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\laptop-battery.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kword.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kwalletmanager.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kvoctrain.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kverbos.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kuickshow.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\ktorrent.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\ktip.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kteatime.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\ksudoku.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kstars.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\ksniffer.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\ksnapshot.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kruler.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\krita.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\krfb.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\krdc.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kopete.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\konversation.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kontact.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\konqueror.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kolf.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\knotes.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kmplayer.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kmail.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\klipper.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\klettres.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kjournal.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kiten.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\khangman.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kget.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kgeography.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kexi.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kde.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kcolorchooser.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kchart.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kcall.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kbugbuster.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kbruch.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kblogger.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kate.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kanagram.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kaffeine.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kaddressbook.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\k3b.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\java.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\internet-web-browser.png"
@@ -584,58 +528,30 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\inkscape.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\hwinfo.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\help-browser.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gwenview.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gvim.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gv.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\graphics-viewer-document.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gnumeric.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gnucash.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gnomemeeting.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gimp.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gaim.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\gabber.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\fontforge.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\evolution.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\esd.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\email.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\emacs.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\eclipse.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\digikam.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\dia.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\designer.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\clanbomber.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\bovo.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\bluefish.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\blender.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\basket.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\assistant.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\applixware.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\alevt.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\akregator.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\akonadi.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\acroread.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\accessories-text-editor.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\accessories-dictionary.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\accessories-character-map.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\apps\accessories-calculator.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\abiword.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\KmPlot.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\KWordQuiz.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\KVerbos.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\KPercentage.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\KLatin.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\KEduca.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\zoom-out.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\zoom-original.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\zoom-in.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\zoom-fit-width.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\zoom-fit-height.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\zoom-fit-best.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\zoom-best-fit.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\window-suppressed.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\window-new.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\window-duplicate.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\window-close.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-web-browser-dom-tree.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-tree.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-top-bottom.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-statistics.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-split-top-bottom.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-split-left-right.png"
@@ -671,9 +587,7 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-list-text.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-list-icons.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-list-details.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-left-right.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-left-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-icon.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-history.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-fullscreen.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-filter.png"
@@ -689,11 +603,10 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-calendar-month.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-calendar-list.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-calendar-day.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\user.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\user-properties.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\user-group-new.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\user-female.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\trash-empty.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\transform-scale.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\transform-rotate.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\transform-move.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tools-wizard.png"
@@ -701,41 +614,39 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tools-media-optical-copy.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tools-media-optical-burn.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tools-check-spelling.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\text.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\text-speak.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\table.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-new.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-new-background.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-duplicate.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-detach.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-close.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-close-other.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-switch-user.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-suspend.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-suspend-hibernate.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-shutdown.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-search.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-run.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-restart.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-log-out.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\system-lock-screen.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\speaker.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\signature.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\show-menu.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\services.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\select-rectangular.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\run-build.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\run-build-file.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\rss.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\rss-tag.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\roll.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\rating.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\project-open.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\process-stop.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\player-volume.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\player-time.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\ok.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\page-zoom.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\object-rotate-right.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\object-rotate-left.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\object-edit.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\object-flip-vertical.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\object-flip-horizontal.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\news-unsubscribe.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\news-subscribe.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\network-disconnect.png"
@@ -744,7 +655,6 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\media-skip-backward.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\media-seek-forward.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\media-seek-backward.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\media-scripts.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\media-record.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\media-playback-stop.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\media-playback-start.png"
@@ -770,50 +680,30 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\list-add.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\list-add-user.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\list-add-font.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kscd-dock.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\konv-message2.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\konv-message.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\knotes-delete-knotes.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\knewstuff.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-term-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-sign-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-key4-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-key3-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-key2-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-key1-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-info-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-import-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-identity-kgpg.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\kgpg-export-kgpg.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\insert-text.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\insert-table.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\insert-link.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\insert-image.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\history.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\insert-horizontal-rule.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\help-hint.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\help-contextual.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\help-contents.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\help-about.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\help-about-kde.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-up.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-up-search.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-top.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-previous-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-next.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-next-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-last.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-last-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-jump.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-jump-today.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-jump-locationbar.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-home.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-first.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-first-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-down.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-down-search.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-bottom.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\get-hot-new-stuff.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\gear.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\games-solve.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\games-hint.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\games-highscores.png"
@@ -825,7 +715,6 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\games-config-custom.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\games-config-board.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\games-config-background.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\frame-edit.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\format-text-underline.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\format-text-superscript.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\format-text-subscript.png"
@@ -858,28 +747,15 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\flag-blue.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\flag-black.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fill-color.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-text.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-split.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-preview.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-multicolumn.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-icon.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-detailed.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-column.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-close-right.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\fileview-close-left.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\feed-subscribe.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\favorites.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-user.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-undo.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-select-all.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-rename.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-redo.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-paste.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-link.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-find.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-find-user.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-find-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-find-next.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-find-mail.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-delete.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-delete-shred.png"
@@ -887,18 +763,14 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-cut.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-copy.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear-locationbar.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear-locationbar-rtl.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear-locationbar-ltr.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear-list.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear-history.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-add.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\draw-text.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\draw-freehand.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\draw-eraser.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\draw-brush.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\domtreeviewer.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-start-presentation.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-sign.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-save.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-save-as.png"
@@ -923,21 +795,14 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\dialog-ok-apply.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\dialog-close.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\dialog-cancel.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\datashowchart.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\datashow.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\contact-new.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\connection-established.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\connect-no.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\configure.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\configure-toolbars.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\configure-shortcuts.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\color-picker.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\color-line.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\color-fill.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\chronometer.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\character-set.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\cd.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\cd-data.png"
+  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\bookmarks-organize.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\bookmark-toolbar.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\bookmark-new.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\bookmark-new-list.png"
@@ -955,8 +820,8 @@
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\archive-extract.png"
   Delete "$INSTDIR\share\icons\oxygen\16x16\actions\application-exit.png"
 
-  RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\scalable"
+  RMDir "$INSTDIR\share\icons\oxygen\8x8\emblems"
+  RMDir "$INSTDIR\share\icons\oxygen\8x8"
   RMDir "$INSTDIR\share\icons\oxygen\16x16\status"
   RMDir "$INSTDIR\share\icons\oxygen\16x16\places"
   RMDir "$INSTDIR\share\icons\oxygen\16x16\mimetypes"

Modified: trunk/src/uninst-qt.nsi
===================================================================
--- trunk/src/uninst-qt.nsi	2008-05-26 14:48:32 UTC (rev 819)
+++ trunk/src/uninst-qt.nsi	2008-05-27 12:13:46 UTC (rev 820)
@@ -34,12 +34,10 @@
   Delete "$INSTDIR\qt.conf"
 
   Delete "$INSTDIR\Qt3Support4.dll"
-  Delete "$INSTDIR\QtAssistantClient4.dll"
   Delete "$INSTDIR\QtCore4.dll"
   Delete "$INSTDIR\QtDBus4.dll"
-  Delete "$INSTDIR\QtDesigner4.dll"
-  Delete "$INSTDIR\QtDesignerComponents4.dll"
   Delete "$INSTDIR\QtGui4.dll"
+  Delete "$INSTDIR\QtHelp4.dll"
   Delete "$INSTDIR\QtNetwork4.dll"
   Delete "$INSTDIR\QtOpenGL4.dll"
   Delete "$INSTDIR\QtScript4.dll"
@@ -61,6 +59,7 @@
 
   RMDir "$INSTDIR\plugins\codecs"
 
+  Delete "$INSTDIR\plugins\designer\qwebview.dll"
   Delete "$INSTDIR\plugins\designer\qt3supportwidgets.dll"
   # Not in Qt anymore since 4.3.3.
   Delete "$INSTDIR\plugins\designer\arthurplugin.dll"
@@ -76,6 +75,7 @@
   RMDir "$INSTDIR\plugins\iconengines"
 
   Delete "$INSTDIR\plugins\imageformats\qgif4.dll"
+  Delete "$INSTDIR\plugins\imageformats\qico4.dll"
   Delete "$INSTDIR\plugins\imageformats\qjpeg4.dll"
   Delete "$INSTDIR\plugins\imageformats\qmng4.dll"
   Delete "$INSTDIR\plugins\imageformats\qsvg4.dll"
@@ -83,49 +83,39 @@
 
   RMDir "$INSTDIR\plugins\imageformats"
 
-  Delete "$INSTDIR\plugins\plugins\accessible\qtaccessiblecompatwidgetsd4.dll"
-  Delete "$INSTDIR\plugins\plugins\accessible\qtaccessiblewidgetsd4.dll"
+  Delete "$INSTDIR\plugins\script\qtscriptdbus4.dll"
 
-  RMDir "$INSTDIR\plugins\plugins\accessible"
-
-  Delete "$INSTDIR\plugins\plugins\codecs\qcncodecsd4.dll"
-  Delete "$INSTDIR\plugins\plugins\codecs\qjpcodecsd4.dll"
-  Delete "$INSTDIR\plugins\plugins\codecs\qkrcodecsd4.dll"
-  Delete "$INSTDIR\plugins\plugins\codecs\qtwcodecsd4.dll"
-
-  RMDir "$INSTDIR\plugins\plugins\codecs"
-
-  Delete "$INSTDIR\plugins\plugins\iconengines\qsvgd4.dll"
-
-  RMDir "$INSTDIR\plugins\plugins\iconengines"
-
-  Delete "$INSTDIR\plugins\plugins\imageformats\qgifd4.dll"
-  Delete "$INSTDIR\plugins\plugins\imageformats\qjpegd4.dll"
-  Delete "$INSTDIR\plugins\plugins\imageformats\qmngd4.dll"
-  Delete "$INSTDIR\plugins\plugins\imageformats\qsvgd4.dll"
-  Delete "$INSTDIR\plugins\plugins\imageformats\qtiffd4.dll"
-
-  RMDir "$INSTDIR\plugins\plugins\imageformats"
-
-  Delete "$INSTDIR\plugins\plugins\sqldrivers\qsqlited4.dll"
-
-  RMDir "$INSTDIR\plugins\plugins\sqldrivers"
-
-  Delete "$INSTDIR\plugins\sqldrivers\qsqlite4.dll"
-
-  RMDir "$INSTDIR\plugins\sqldrivers"
+  RMDir "$INSTDIR\plugins\script"
   RMDir "$INSTDIR\plugins"
 
+  Delete "$INSTDIR\translations\assistant_adp_de.qm"
+#  Delete "$INSTDIR\translations\assistant_adp_ja.qm"
+#  Delete "$INSTDIR\translations\assistant_adp_pl.qm"
+#  Delete "$INSTDIR\translations\assistant_adp_zh_CN.qm"
+#  Delete "$INSTDIR\translations\assistant_adp_zh_TW.qm"
   Delete "$INSTDIR\translations\assistant_de.qm"
-#  Delete "$INSTDIR\translations\assistant_ja.qm"
+#  Delete "$INSTDIR\translations\assistant_pl.qm"
+#  Delete "$INSTDIR\translations\assistant_zh_CN.qm"
+#  Delete "$INSTDIR\translations\assistant_zh_TW.qm"
   Delete "$INSTDIR\translations\designer_de.qm"
 #  Delete "$INSTDIR\translations\designer_ja.qm"
+#  Delete "$INSTDIR\translations\designer_pl.qm"
+#  Delete "$INSTDIR\translations\designer_zh_CN.qm"
+#  Delete "$INSTDIR\translations\designer_zh_TW.qm"
+  Delete "$INSTDIR\translations\linguist_de.qm"
 #  Delete "$INSTDIR\translations\linguist_ja.qm"
+#  Delete "$INSTDIR\translations\linguist_pl.qm"
+#  Delete "$INSTDIR\translations\linguist_zh_CN.qm"
+#  Delete "$INSTDIR\translations\linguist_zh_TW.qm"
 #  Delete "$INSTDIR\translations\qt_ar.qm"
   Delete "$INSTDIR\translations\qt_de.qm"
 #  Delete "$INSTDIR\translations\qt_es.qm"
 #  Delete "$INSTDIR\translations\qt_fr.qm"
 #  Delete "$INSTDIR\translations\qt_iw.qm"
+  Delete "$INSTDIR\translations\qt_help_de.qm"
+#  Delete "$INSTDIR\translations\qt_help_pl.qm"
+#  Delete "$INSTDIR\translations\qt_help_zh_CN.qm"
+#  Delete "$INSTDIR\translations\qt_help_zh_TW.qm"
 #  Delete "$INSTDIR\translations\qt_ja_jp.qm"
 #  Delete "$INSTDIR\translations\qt_pt.qm"
 #  Delete "$INSTDIR\translations\qt_ru.qm"
@@ -133,6 +123,7 @@
 #  Delete "$INSTDIR\translations\qt_sv.qm"
 #  Delete "$INSTDIR\translations\qt_uk.qm"
 #  Delete "$INSTDIR\translations\qt_zh_CN.qm"
+#  Delete "$INSTDIR\translations\qt_zh_TW.qm"
 
   RMDir "$INSTDIR\translations"
 

