Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

44 files changed, 2351 insertions, 678 deletions

diff --git a/misc/Makefile b/misc/Makefile
index 3e3629e481a8..0531f01ae055 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -121,10 +121,12 @@
     SUBDIR += gkx86info
     SUBDIR += gkx86info2
     SUBDIR += gman
+    SUBDIR += gnome-devel-docs
     SUBDIR += gnome-icon-theme
     SUBDIR += gnome-mime-data
     SUBDIR += gnome-osd
     SUBDIR += gnome-user-docs
+    SUBDIR += gnome2-reference
     SUBDIR += gnomehier
     SUBDIR += gnomesword
     SUBDIR += gnu-watch
diff --git a/misc/gnome-devel-docs/Makefile b/misc/gnome-devel-docs/Makefile
new file mode 100644
index 000000000000..997a6b4b2c0f
--- /dev/null
+++ b/misc/gnome-devel-docs/Makefile
@@ -0,0 +1,25 @@
+# New ports collection makefile for:	gnome-devel-docs
+# Date created:		2007-09-18
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/misc/gnome-devel-docs/Makefile,v 1.1 2007/09/18 15:23:15 ahze Exp $
+
+PORTNAME=	gnome-devel-docs
+PORTVERSION=	2.20.0
+CATEGORIES=	misc gnome
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	ahze@FreeBSD.org
+COMMENT=	Documents targeted for GNOME developers
+
+BUILD_DEPENDS=	gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils
+RUN_DEPENDS=	gnome-doc-prepare:${PORTSDIR}/textproc/gnome-doc-utils
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+INSTALLS_OMF=	yes
+
+.include <bsd.port.mk>
diff --git a/misc/gnome-devel-docs/distinfo b/misc/gnome-devel-docs/distinfo
new file mode 100644
index 000000000000..b8d1c3b1a78c
--- /dev/null
+++ b/misc/gnome-devel-docs/distinfo
@@ -0,0 +1,3 @@
+MD5 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 64d6e3594b2c6422ea8d17b78f501020
+SHA256 (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 0d966471c8199350df7d3ecc712cde7efd9c52d8d4d31c87060bc5d70c5448ff
+SIZE (gnome2/gnome-devel-docs-2.20.0.tar.bz2) = 2373648
diff --git a/misc/gnome-devel-docs/pkg-descr b/misc/gnome-devel-docs/pkg-descr
new file mode 100644
index 000000000000..141383ea37ec
--- /dev/null
+++ b/misc/gnome-devel-docs/pkg-descr
@@ -0,0 +1 @@
+Documents targeted for GNOME developers
diff --git a/misc/gnome-devel-docs/pkg-plist b/misc/gnome-devel-docs/pkg-plist
new file mode 100644
index 000000000000..3f2151d25f3f
--- /dev/null
+++ b/misc/gnome-devel-docs/pkg-plist
@@ -0,0 +1,387 @@
+share/gnome/help/gdp-handbook/C/builddocs.xml
+share/gnome/help/gdp-handbook/C/callout_procedure.xml
+share/gnome/help/gdp-handbook/C/contexthelp.xml
+share/gnome/help/gdp-handbook/C/conventions.xml
+share/gnome/help/gdp-handbook/C/crossreferencing.xml
+share/gnome/help/gdp-handbook/C/docbook.xml
+share/gnome/help/gdp-handbook/C/docsystem.xml
+share/gnome/help/gdp-handbook/C/finish.xml
+share/gnome/help/gdp-handbook/C/gdp-handbook.xml
+share/gnome/help/gdp-handbook/C/getstarted.xml
+share/gnome/help/gdp-handbook/C/introduction.xml
+share/gnome/help/gdp-handbook/C/legal.xml
+share/gnome/help/gdp-handbook/C/manuals.xml
+share/gnome/help/gdp-handbook/C/resources.xml
+share/gnome/help/gdp-handbook/C/screenshot_procedure.xml
+share/gnome/help/gdp-handbook/C/sectids.xml
+share/gnome/help/gdp-handbook/C/teamwork.xml
+share/gnome/help/gdp-style-guide/C/Authorlist.xml
+share/gnome/help/gdp-style-guide/C/accessibility.xml
+share/gnome/help/gdp-style-guide/C/figures/applet_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/arrow_button1.png
+share/gnome/help/gdp-style-guide/C/figures/arrow_button2.png
+share/gnome/help/gdp-style-guide/C/figures/callout_notflow.png
+share/gnome/help/gdp-style-guide/C/figures/check_box.png
+share/gnome/help/gdp-style-guide/C/figures/color_selector_button.png
+share/gnome/help/gdp-style-guide/C/figures/color_wheel1.png
+share/gnome/help/gdp-style-guide/C/figures/color_wheel2.png
+share/gnome/help/gdp-style-guide/C/figures/column_heading.png
+share/gnome/help/gdp-style-guide/C/figures/command_button.png
+share/gnome/help/gdp-style-guide/C/figures/desktop_background_menu.png
+share/gnome/help/gdp-style-guide/C/figures/desktop_elements.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_combination_box.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_list_box.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_section1.png
+share/gnome/help/gdp-style-guide/C/figures/dropdown_section2.png
+share/gnome/help/gdp-style-guide/C/figures/field.png
+share/gnome/help/gdp-style-guide/C/figures/font_selector_button.png
+share/gnome/help/gdp-style-guide/C/figures/footprint_icon.png
+share/gnome/help/gdp-style-guide/C/figures/gnome_menu.png
+share/gnome/help/gdp-style-guide/C/figures/group_box.png
+share/gnome/help/gdp-style-guide/C/figures/icon_selector_button1.png
+share/gnome/help/gdp-style-guide/C/figures/icon_selector_button2.png
+share/gnome/help/gdp-style-guide/C/figures/launcher_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/list_box.png
+share/gnome/help/gdp-style-guide/C/figures/panel_elements.png
+share/gnome/help/gdp-style-guide/C/figures/panel_object_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/panel_popup_menu.png
+share/gnome/help/gdp-style-guide/C/figures/radio_button.png
+share/gnome/help/gdp-style-guide/C/figures/sample_anno_panel.png
+share/gnome/help/gdp-style-guide/C/figures/scrollbar.png
+share/gnome/help/gdp-style-guide/C/figures/slider.png
+share/gnome/help/gdp-style-guide/C/figures/spin_box.png
+share/gnome/help/gdp-style-guide/C/figures/tabbed_section.png
+share/gnome/help/gdp-style-guide/C/figures/table.png
+share/gnome/help/gdp-style-guide/C/figures/tabs.png
+share/gnome/help/gdp-style-guide/C/figures/text_box.png
+share/gnome/help/gdp-style-guide/C/figures/toggle_button.png
+share/gnome/help/gdp-style-guide/C/figures/toolbar_button.png
+share/gnome/help/gdp-style-guide/C/figures/window_elements.png
+share/gnome/help/gdp-style-guide/C/figures/window_frame_button.png
+share/gnome/help/gdp-style-guide/C/figures/window_list_button.png
+share/gnome/help/gdp-style-guide/C/figures/window_menu.png
+share/gnome/help/gdp-style-guide/C/figures/window_panes.png
+share/gnome/help/gdp-style-guide/C/figures/window_titlebar_elements.png
+share/gnome/help/gdp-style-guide/C/fundamentals.xml
+share/gnome/help/gdp-style-guide/C/gdp-style-guide.xml
+share/gnome/help/gdp-style-guide/C/grammar_usage.xml
+share/gnome/help/gdp-style-guide/C/gui.xml
+share/gnome/help/gdp-style-guide/C/improving.xml
+share/gnome/help/gdp-style-guide/C/indexing.xml
+share/gnome/help/gdp-style-guide/C/infoblocks.xml
+share/gnome/help/gdp-style-guide/C/infodesign.xml
+share/gnome/help/gdp-style-guide/C/language.xml
+share/gnome/help/gdp-style-guide/C/legal.xml
+share/gnome/help/gdp-style-guide/C/legal_issues.xml
+share/gnome/help/gdp-style-guide/C/locale.xml
+share/gnome/help/gdp-style-guide/C/preface.xml
+share/gnome/help/gdp-style-guide/C/screenshot.xml
+share/gnome/help/gdp-style-guide/C/units.xml
+share/gnome/help/gdp-style-guide/C/usability.xml
+share/gnome/help/gdp-style-guide/C/wordlist.xml
+share/gnome/help/hig-book/C/hig-book.xml
+share/gnome/help/hig-book/C/hig-ch-bibliography.xml
+share/gnome/help/hig-book/C/hig-ch-checks.xml
+share/gnome/help/hig-book/C/hig-ch-controls.xml
+share/gnome/help/hig-book/C/hig-ch-credits.xml
+share/gnome/help/hig-book/C/hig-ch-desktop.xml
+share/gnome/help/hig-book/C/hig-ch-feedback.xml
+share/gnome/help/hig-book/C/hig-ch-icons-new.xml
+share/gnome/help/hig-book/C/hig-ch-icons.xml
+share/gnome/help/hig-book/C/hig-ch-input.xml
+share/gnome/help/hig-book/C/hig-ch-intro.xml
+share/gnome/help/hig-book/C/hig-ch-language.xml
+share/gnome/help/hig-book/C/hig-ch-layout.xml
+share/gnome/help/hig-book/C/hig-ch-menus.xml
+share/gnome/help/hig-book/C/hig-ch-principles.xml
+share/gnome/help/hig-book/C/hig-ch-toolbars.xml
+share/gnome/help/hig-book/C/hig-ch-windows.xml
+share/gnome/help/hig-book/C/images/EvoToolbar.png
+share/gnome/help/hig-book/C/images/GtkToolbar.png
+share/gnome/help/hig-book/C/images/GtkToolbar_browserdefault.png
+share/gnome/help/hig-book/C/images/GtkToolbar_gedit.png
+share/gnome/help/hig-book/C/images/GtkToolbar_productivitydefault.png
+share/gnome/help/hig-book/C/images/abiword-icon.png
+share/gnome/help/hig-book/C/images/action-icon.png
+share/gnome/help/hig-book/C/images/alert-button-order.png
+share/gnome/help/hig-book/C/images/alert-spacing.png
+share/gnome/help/hig-book/C/images/alert-text.png
+share/gnome/help/hig-book/C/images/application-edit-menu.png
+share/gnome/help/hig-book/C/images/application-icons.png
+share/gnome/help/hig-book/C/images/application-menubar.png
+share/gnome/help/hig-book/C/images/applications-menu.png
+share/gnome/help/hig-book/C/images/assistant-first-page.png
+share/gnome/help/hig-book/C/images/assistant-middle-page.png
+share/gnome/help/hig-book/C/images/authentication-alert.png
+share/gnome/help/hig-book/C/images/browser-toolbar.png
+share/gnome/help/hig-book/C/images/busy-pointers.png
+share/gnome/help/hig-book/C/images/caution.png
+share/gnome/help/hig-book/C/images/checkbox-menu.png
+share/gnome/help/hig-book/C/images/checkbox_label.png
+share/gnome/help/hig-book/C/images/checklist-window-done.png
+share/gnome/help/hig-book/C/images/checklist-window-in-progress.png
+share/gnome/help/hig-book/C/images/checklist-window-start.png
+share/gnome/help/hig-book/C/images/colour_and_arrows.png
+share/gnome/help/hig-book/C/images/colour_only.png
+share/gnome/help/hig-book/C/images/command-menu.png
+share/gnome/help/hig-book/C/images/confirmation-alert.png
+share/gnome/help/hig-book/C/images/controls-buttons.png
+share/gnome/help/hig-book/C/images/controls-check-box-ambiguous.png
+share/gnome/help/hig-book/C/images/controls-check-boxes-mixed.png
+share/gnome/help/hig-book/C/images/controls-check-boxes.png
+share/gnome/help/hig-book/C/images/controls-combo.png
+share/gnome/help/hig-book/C/images/controls-frames.png
+share/gnome/help/hig-book/C/images/controls-list-checkbox.png
+share/gnome/help/hig-book/C/images/controls-list.png
+share/gnome/help/hig-book/C/images/controls-locked.png
+share/gnome/help/hig-book/C/images/controls-notebook-list.png
+share/gnome/help/hig-book/C/images/controls-notebook-tabs.png
+share/gnome/help/hig-book/C/images/controls-notebook.png
+share/gnome/help/hig-book/C/images/controls-old-frames.png
+share/gnome/help/hig-book/C/images/controls-option-menu.png
+share/gnome/help/hig-book/C/images/controls-radio-button-mixed.png
+share/gnome/help/hig-book/C/images/controls-radio-buttons.png
+share/gnome/help/hig-book/C/images/controls-sensitivity.png
+share/gnome/help/hig-book/C/images/controls-slider-spinbox.png
+share/gnome/help/hig-book/C/images/controls-slider.png
+share/gnome/help/hig-book/C/images/controls-spin-box.png
+share/gnome/help/hig-book/C/images/controls-status-bar-interactive.png
+share/gnome/help/hig-book/C/images/controls-status-bar.png
+share/gnome/help/hig-book/C/images/controls-text-choose.png
+share/gnome/help/hig-book/C/images/controls-text-prompt.png
+share/gnome/help/hig-book/C/images/controls-text.png
+share/gnome/help/hig-book/C/images/controls-toggle-button-mixed.png
+share/gnome/help/hig-book/C/images/controls-toggle-buttons.png
+share/gnome/help/hig-book/C/images/controls-tree-checkbox.png
+share/gnome/help/hig-book/C/images/controls-tree.png
+share/gnome/help/hig-book/C/images/depend1.png
+share/gnome/help/hig-book/C/images/depend1a.png
+share/gnome/help/hig-book/C/images/depend2.png
+share/gnome/help/hig-book/C/images/depend2a.png
+share/gnome/help/hig-book/C/images/depend3.png
+share/gnome/help/hig-book/C/images/df.png
+share/gnome/help/hig-book/C/images/dragcursor-augmented.png
+share/gnome/help/hig-book/C/images/dragcursor-copy.png
+share/gnome/help/hig-book/C/images/dragcursor-link.png
+share/gnome/help/hig-book/C/images/dragcursor-move.png
+share/gnome/help/hig-book/C/images/dragcursor-nodrop.png
+share/gnome/help/hig-book/C/images/dragcursor-rmb.png
+share/gnome/help/hig-book/C/images/earthDeutan.png
+share/gnome/help/hig-book/C/images/earthNorm.png
+share/gnome/help/hig-book/C/images/earthTritan.png
+share/gnome/help/hig-book/C/images/error-alert.png
+share/gnome/help/hig-book/C/images/evolution-icon.png
+share/gnome/help/hig-book/C/images/explicit-apply.png
+share/gnome/help/hig-book/C/images/file-menu.png
+share/gnome/help/hig-book/C/images/floppy-dissected.png
+share/gnome/help/hig-book/C/images/fontsel-icon.png
+share/gnome/help/hig-book/C/images/fontsel-suggestion.png
+share/gnome/help/hig-book/C/images/gdiskfree-menu.png
+share/gnome/help/hig-book/C/images/gdiskfree.png
+share/gnome/help/hig-book/C/images/gedit-icon.png
+share/gnome/help/hig-book/C/images/generic-bookmarks-menu.png
+share/gnome/help/hig-book/C/images/generic-browser-go-menu.png
+share/gnome/help/hig-book/C/images/generic-document-go-menu.png
+share/gnome/help/hig-book/C/images/generic-format-menu.png
+share/gnome/help/hig-book/C/images/generic-help-menu.png
+share/gnome/help/hig-book/C/images/generic-insert-menu.png
+share/gnome/help/hig-book/C/images/generic-view-menu.png
+share/gnome/help/hig-book/C/images/generic-windows-menu.png
+share/gnome/help/hig-book/C/images/gide-icon.png
+share/gnome/help/hig-book/C/images/glyph-icon.png
+share/gnome/help/hig-book/C/images/gnome-http-url.png
+share/gnome/help/hig-book/C/images/gnome-package.png
+share/gnome/help/hig-book/C/images/gnome-text-x-readme.png
+share/gnome/help/hig-book/C/images/gnumeric-icon.png
+share/gnome/help/hig-book/C/images/highcontrast-book-blur.png
+share/gnome/help/hig-book/C/images/highcontrast-book.png
+share/gnome/help/hig-book/C/images/highcontrast-cdrom-blur.png
+share/gnome/help/hig-book/C/images/highcontrast-cdrom.png
+share/gnome/help/hig-book/C/images/highcontrast-copy-blur.png
+share/gnome/help/hig-book/C/images/highcontrast-copy.png
+share/gnome/help/hig-book/C/images/highcontrast-metaphors.png
+share/gnome/help/hig-book/C/images/icon-design-process-1.png
+share/gnome/help/hig-book/C/images/icon-design-process-10.png
+share/gnome/help/hig-book/C/images/icon-design-process-11.png
+share/gnome/help/hig-book/C/images/icon-design-process-12.png
+share/gnome/help/hig-book/C/images/icon-design-process-2.png
+share/gnome/help/hig-book/C/images/icon-design-process-3.png
+share/gnome/help/hig-book/C/images/icon-design-process-4.png
+share/gnome/help/hig-book/C/images/icon-design-process-5.png
+share/gnome/help/hig-book/C/images/icon-design-process-6.png
+share/gnome/help/hig-book/C/images/icon-design-process-7.png
+share/gnome/help/hig-book/C/images/icon-design-process-8.png
+share/gnome/help/hig-book/C/images/icon-design-process-9.png
+share/gnome/help/hig-book/C/images/icon-style-aqua.png
+share/gnome/help/hig-book/C/images/icon-style-gnome.png
+share/gnome/help/hig-book/C/images/icon-style-java.png
+share/gnome/help/hig-book/C/images/icon_perspective_shelf.png
+share/gnome/help/hig-book/C/images/icon_perspective_table.png
+share/gnome/help/hig-book/C/images/icons_labels.png
+share/gnome/help/hig-book/C/images/important.png
+share/gnome/help/hig-book/C/images/information-alert.png
+share/gnome/help/hig-book/C/images/installer-icon.png
+share/gnome/help/hig-book/C/images/label_above.png
+share/gnome/help/hig-book/C/images/label_below.png
+share/gnome/help/hig-book/C/images/label_left.png
+share/gnome/help/hig-book/C/images/label_right.png
+share/gnome/help/hig-book/C/images/large_icon_label.png
+share/gnome/help/hig-book/C/images/layout1.png
+share/gnome/help/hig-book/C/images/layout2.png
+share/gnome/help/hig-book/C/images/layout_callouts.png
+share/gnome/help/hig-book/C/images/levels-lowcontrast.png
+share/gnome/help/hig-book/C/images/list_control_label.png
+share/gnome/help/hig-book/C/images/log-icon.png
+share/gnome/help/hig-book/C/images/manual-alert-spacing.png
+share/gnome/help/hig-book/C/images/manual-button-ordering.png
+share/gnome/help/hig-book/C/images/mdi.png
+share/gnome/help/hig-book/C/images/menu-icons.png
+share/gnome/help/hig-book/C/images/mnemonics_and_shortcuts.png
+share/gnome/help/hig-book/C/images/nautilus-icon.png
+share/gnome/help/hig-book/C/images/note.png
+share/gnome/help/hig-book/C/images/object-icon.png
+share/gnome/help/hig-book/C/images/object-icons.png
+share/gnome/help/hig-book/C/images/object-menu.png
+share/gnome/help/hig-book/C/images/object-menubar.png
+share/gnome/help/hig-book/C/images/other_labels.png
+share/gnome/help/hig-book/C/images/palette-1.png
+share/gnome/help/hig-book/C/images/palette-10.png
+share/gnome/help/hig-book/C/images/palette-11.png
+share/gnome/help/hig-book/C/images/palette-12.png
+share/gnome/help/hig-book/C/images/palette-13.png
+share/gnome/help/hig-book/C/images/palette-14.png
+share/gnome/help/hig-book/C/images/palette-15.png
+share/gnome/help/hig-book/C/images/palette-16.png
+share/gnome/help/hig-book/C/images/palette-17.png
+share/gnome/help/hig-book/C/images/palette-18.png
+share/gnome/help/hig-book/C/images/palette-19.png
+share/gnome/help/hig-book/C/images/palette-2.png
+share/gnome/help/hig-book/C/images/palette-20.png
+share/gnome/help/hig-book/C/images/palette-21.png
+share/gnome/help/hig-book/C/images/palette-22.png
+share/gnome/help/hig-book/C/images/palette-23.png
+share/gnome/help/hig-book/C/images/palette-24.png
+share/gnome/help/hig-book/C/images/palette-25.png
+share/gnome/help/hig-book/C/images/palette-26.png
+share/gnome/help/hig-book/C/images/palette-27.png
+share/gnome/help/hig-book/C/images/palette-28.png
+share/gnome/help/hig-book/C/images/palette-29.png
+share/gnome/help/hig-book/C/images/palette-3.png
+share/gnome/help/hig-book/C/images/palette-30.png
+share/gnome/help/hig-book/C/images/palette-31.png
+share/gnome/help/hig-book/C/images/palette-32.png
+share/gnome/help/hig-book/C/images/palette-4.png
+share/gnome/help/hig-book/C/images/palette-5.png
+share/gnome/help/hig-book/C/images/palette-6.png
+share/gnome/help/hig-book/C/images/palette-7.png
+share/gnome/help/hig-book/C/images/palette-8.png
+share/gnome/help/hig-book/C/images/palette-9.png
+share/gnome/help/hig-book/C/images/pointingdevices.png
+share/gnome/help/hig-book/C/images/popup-menu.png
+share/gnome/help/hig-book/C/images/preferences-window.png
+share/gnome/help/hig-book/C/images/primary-window.png
+share/gnome/help/hig-book/C/images/progress-checklist-with-bar.png
+share/gnome/help/hig-book/C/images/progress-checklist.png
+share/gnome/help/hig-book/C/images/progress-indeterminate.png
+share/gnome/help/hig-book/C/images/progress-proportion.png
+share/gnome/help/hig-book/C/images/progress-time.png
+share/gnome/help/hig-book/C/images/progress-typical-time.png
+share/gnome/help/hig-book/C/images/progress-window-copy.png
+share/gnome/help/hig-book/C/images/progress-window.png
+share/gnome/help/hig-book/C/images/property-window.png
+share/gnome/help/hig-book/C/images/quit1.png
+share/gnome/help/hig-book/C/images/quit2.png
+share/gnome/help/hig-book/C/images/radio_button_label.png
+share/gnome/help/hig-book/C/images/radiobutton-menu.png
+share/gnome/help/hig-book/C/images/rubberband.png
+share/gnome/help/hig-book/C/images/rubberband_dia.png
+share/gnome/help/hig-book/C/images/save1.png
+share/gnome/help/hig-book/C/images/save2.png
+share/gnome/help/hig-book/C/images/save_alert.png
+share/gnome/help/hig-book/C/images/sdi.png
+share/gnome/help/hig-book/C/images/shutdown-icon.png
+share/gnome/help/hig-book/C/images/size-48x48.png
+share/gnome/help/hig-book/C/images/small_icon_label.png
+share/gnome/help/hig-book/C/images/sodipodi-icon.png
+share/gnome/help/hig-book/C/images/softwareupdateicon.png
+share/gnome/help/hig-book/C/images/stock_save.png
+share/gnome/help/hig-book/C/images/submenu.png
+share/gnome/help/hig-book/C/images/tabbed-dialog-box.png
+share/gnome/help/hig-book/C/images/textbox_label.png
+share/gnome/help/hig-book/C/images/tip.png
+share/gnome/help/hig-book/C/images/toolbar-icons.png
+share/gnome/help/hig-book/C/images/toolbar-silhouette.png
+share/gnome/help/hig-book/C/images/toolbox-small.png
+share/gnome/help/hig-book/C/images/toolbox.png
+share/gnome/help/hig-book/C/images/underline-icon.png
+share/gnome/help/hig-book/C/images/view-toolbar.png
+share/gnome/help/hig-book/C/images/warning.png
+share/gnome/help/hig-book/C/images/window-title.png
+share/gnome/help/hig-book/C/images/ximian-palette.png
+share/gnome/help/integration-guide/C/integration-guide.xml
+share/gnome/help/platform-overview/C/apx-modules.xml
+share/gnome/help/platform-overview/C/bindings.xml
+share/gnome/help/platform-overview/C/core-tech.xml
+share/gnome/help/platform-overview/C/desktop-tech.xml
+share/gnome/help/platform-overview/C/figures/graphics.png
+share/gnome/help/platform-overview/C/figures/i18n.png
+share/gnome/help/platform-overview/C/figures/pango.png
+share/gnome/help/platform-overview/C/intro.xml
+share/gnome/help/platform-overview/C/ipc-network.xml
+share/gnome/help/platform-overview/C/legal-fdl.xml
+share/gnome/help/platform-overview/C/platform-overview.xml
+share/gnome/help/platform-overview/C/platform.xml
+share/gnome/help/platform-overview/es/apx-modules.xml
+share/gnome/help/platform-overview/es/bindings.xml
+share/gnome/help/platform-overview/es/core-tech.xml
+share/gnome/help/platform-overview/es/desktop-tech.xml
+share/gnome/help/platform-overview/es/figures/graphics.png
+share/gnome/help/platform-overview/es/figures/i18n.png
+share/gnome/help/platform-overview/es/figures/pango.png
+share/gnome/help/platform-overview/es/intro.xml
+share/gnome/help/platform-overview/es/ipc-network.xml
+share/gnome/help/platform-overview/es/legal-fdl.xml
+share/gnome/help/platform-overview/es/platform-overview.xml
+share/gnome/help/platform-overview/es/platform.xml
+share/gnome/help/platform-overview/it/apx-modules.xml
+share/gnome/help/platform-overview/it/bindings.xml
+share/gnome/help/platform-overview/it/core-tech.xml
+share/gnome/help/platform-overview/it/desktop-tech.xml
+share/gnome/help/platform-overview/it/figures/graphics.png
+share/gnome/help/platform-overview/it/figures/i18n.png
+share/gnome/help/platform-overview/it/figures/pango.png
+share/gnome/help/platform-overview/it/intro.xml
+share/gnome/help/platform-overview/it/ipc-network.xml
+share/gnome/help/platform-overview/it/legal-fdl.xml
+share/gnome/help/platform-overview/it/platform-overview.xml
+share/gnome/help/platform-overview/it/platform.xml
+share/omf/gdp-handbook/gdp-handbook-C.omf
+share/omf/gdp-style-guide/gdp-style-guide-C.omf
+share/omf/hig-book/hig-book-C.omf
+share/omf/integration-guide/integration-guide-C.omf
+share/omf/platform-overview/platform-overview-C.omf
+share/omf/platform-overview/platform-overview-es.omf
+share/omf/platform-overview/platform-overview-it.omf
+@dirrm share/omf/platform-overview
+@dirrm share/omf/integration-guide
+@dirrm share/omf/hig-book
+@dirrm share/omf/gdp-style-guide
+@dirrm share/omf/gdp-handbook
+@dirrm share/omf
+@dirrm share/gnome/help/platform-overview/it/figures
+@dirrm share/gnome/help/platform-overview/it
+@dirrm share/gnome/help/platform-overview/es/figures
+@dirrm share/gnome/help/platform-overview/es
+@dirrm share/gnome/help/platform-overview/C/figures
+@dirrm share/gnome/help/platform-overview/C
+@dirrm share/gnome/help/platform-overview
+@dirrm share/gnome/help/integration-guide/C
+@dirrm share/gnome/help/integration-guide
+@dirrm share/gnome/help/hig-book/C/images
+@dirrm share/gnome/help/hig-book/C
+@dirrm share/gnome/help/hig-book
+@dirrm share/gnome/help/gdp-style-guide/C/figures
+@dirrm share/gnome/help/gdp-style-guide/C
+@dirrm share/gnome/help/gdp-style-guide
+@dirrm share/gnome/help/gdp-handbook/C
+@dirrm share/gnome/help/gdp-handbook
diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index c8e38bae8b91..9bb144679bd3 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.99 2007/03/12 23:58:09 marcus Exp $
+#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.107 2007/09/18 02:01:24 ahze Exp $
 #
 
 PORTNAME=	gnome-icon-theme
-PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTVERSION=	2.20.0
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,7 +17,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A collection of icons for the GNOME 2 desktop
 
 BUILD_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
-		icon-naming-utils>=0.8.0:${PORTSDIR}/x11-themes/icon-naming-utils
+		icon-naming-utils>=0.8.1:${PORTSDIR}/x11-themes/icon-naming-utils
 RUN_DEPENDS=	${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 USE_BZIP2=	yes
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 7c64ad2e2001..150d02fc7b51 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 0b9aa12c473e0be61dc324b059c106e3
-SHA256 (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 52177c009549b23924a091c6bc494a44343429f836fb19a3645b98ac3fd6306e
-SIZE (gnome2/gnome-icon-theme-2.18.0.tar.bz2) = 2734653
+MD5 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 56857a6d5f26c236b48fcf6760549d1b
+SHA256 (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3c911a7a35f6633bde3cc29bb6134e67dfec05dc13f5d6f03c04c6fa08448663
+SIZE (gnome2/gnome-icon-theme-2.20.0.tar.bz2) = 3470014
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index 4d2fef94a506..4d93cd0b101b 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -12,14 +12,18 @@ share/icons/gnome/16x16/actions/bottom.png
 share/icons/gnome/16x16/actions/centrejust.png
 share/icons/gnome/16x16/actions/contact-new.png
 share/icons/gnome/16x16/actions/document-new.png
+share/icons/gnome/16x16/actions/document-open-recent.png
 share/icons/gnome/16x16/actions/document-open.png
+share/icons/gnome/16x16/actions/document-page-setup.png
 share/icons/gnome/16x16/actions/document-print-preview.png
 share/icons/gnome/16x16/actions/document-print.png
 share/icons/gnome/16x16/actions/document-properties.png
 share/icons/gnome/16x16/actions/document-revert.png
 share/icons/gnome/16x16/actions/document-save-as.png
 share/icons/gnome/16x16/actions/document-save.png
+share/icons/gnome/16x16/actions/document-send.png
 share/icons/gnome/16x16/actions/down.png
+share/icons/gnome/16x16/actions/edit-clear.png
 share/icons/gnome/16x16/actions/edit-copy.png
 share/icons/gnome/16x16/actions/edit-cut.png
 share/icons/gnome/16x16/actions/edit-delete.png
@@ -29,6 +33,7 @@ share/icons/gnome/16x16/actions/edit-paste.png
 share/icons/gnome/16x16/actions/edit-redo.png
 share/icons/gnome/16x16/actions/edit-select-all.png
 share/icons/gnome/16x16/actions/edit-undo.png
+share/icons/gnome/16x16/actions/editclear.png
 share/icons/gnome/16x16/actions/editcopy.png
 share/icons/gnome/16x16/actions/editcut.png
 share/icons/gnome/16x16/actions/editdelete.png
@@ -52,21 +57,27 @@ share/icons/gnome/16x16/actions/format-justify-fill.png
 share/icons/gnome/16x16/actions/format-justify-left.png
 share/icons/gnome/16x16/actions/format-justify-right.png
 share/icons/gnome/16x16/actions/format-text-bold.png
+share/icons/gnome/16x16/actions/format-text-direction-ltr.png
+share/icons/gnome/16x16/actions/format-text-direction-rtl.png
 share/icons/gnome/16x16/actions/format-text-italic.png
 share/icons/gnome/16x16/actions/format-text-strikethrough.png
 share/icons/gnome/16x16/actions/format-text-underline.png
 share/icons/gnome/16x16/actions/forward.png
 share/icons/gnome/16x16/actions/gnome-lockscreen.png
+share/icons/gnome/16x16/actions/gnome-logout.png
 share/icons/gnome/16x16/actions/gnome-run.png
+share/icons/gnome/16x16/actions/gnome-searchtool.png
 share/icons/gnome/16x16/actions/gnome-stock-mail-fwd.png
 share/icons/gnome/16x16/actions/gnome-stock-mail-new.png
 share/icons/gnome/16x16/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/16x16/actions/gnome-stock-mail-snd.png
 share/icons/gnome/16x16/actions/gnome-stock-text-indent.png
 share/icons/gnome/16x16/actions/gnome-stock-text-unindent.png
 share/icons/gnome/16x16/actions/go-bottom.png
 share/icons/gnome/16x16/actions/go-down.png
 share/icons/gnome/16x16/actions/go-first.png
 share/icons/gnome/16x16/actions/go-home.png
+share/icons/gnome/16x16/actions/go-jump.png
 share/icons/gnome/16x16/actions/go-last.png
 share/icons/gnome/16x16/actions/go-next.png
 share/icons/gnome/16x16/actions/go-previous.png
@@ -75,6 +86,7 @@ share/icons/gnome/16x16/actions/go-up.png
 share/icons/gnome/16x16/actions/gohome.png
 share/icons/gnome/16x16/actions/gtk-add.png
 share/icons/gnome/16x16/actions/gtk-bold.png
+share/icons/gnome/16x16/actions/gtk-clear.png
 share/icons/gnome/16x16/actions/gtk-close.png
 share/icons/gnome/16x16/actions/gtk-copy.png
 share/icons/gnome/16x16/actions/gtk-cut.png
@@ -98,6 +110,8 @@ share/icons/gnome/16x16/actions/gtk-goto-top.png
 share/icons/gnome/16x16/actions/gtk-home.png
 share/icons/gnome/16x16/actions/gtk-indent.png
 share/icons/gnome/16x16/actions/gtk-italic.png
+share/icons/gnome/16x16/actions/gtk-jump-to-ltr.png
+share/icons/gnome/16x16/actions/gtk-jump-to-rtl.png
 share/icons/gnome/16x16/actions/gtk-justify-center.png
 share/icons/gnome/16x16/actions/gtk-justify-fill.png
 share/icons/gnome/16x16/actions/gtk-justify-left.png
@@ -139,26 +153,35 @@ share/icons/gnome/16x16/actions/gtk-zoom-100.png
 share/icons/gnome/16x16/actions/gtk-zoom-fit.png
 share/icons/gnome/16x16/actions/gtk-zoom-in.png
 share/icons/gnome/16x16/actions/gtk-zoom-out.png
+share/icons/gnome/16x16/actions/help-about.png
+share/icons/gnome/16x16/actions/help-contents.png
 share/icons/gnome/16x16/actions/help-faq.png
 share/icons/gnome/16x16/actions/insert-image.png
 share/icons/gnome/16x16/actions/insert-link.png
+share/icons/gnome/16x16/actions/insert-object.png
 share/icons/gnome/16x16/actions/insert-text.png
+share/icons/gnome/16x16/actions/kfind.png
 share/icons/gnome/16x16/actions/kfm_home.png
 share/icons/gnome/16x16/actions/leftjust.png
 share/icons/gnome/16x16/actions/list-add.png
 share/icons/gnome/16x16/actions/list-remove.png
 share/icons/gnome/16x16/actions/lock.png
 share/icons/gnome/16x16/actions/mail-forward.png
+share/icons/gnome/16x16/actions/mail-mark-important.png
 share/icons/gnome/16x16/actions/mail-mark-junk.png
-share/icons/gnome/16x16/actions/mail-mark-not-junk.png
+share/icons/gnome/16x16/actions/mail-mark-notjunk.png
+share/icons/gnome/16x16/actions/mail-mark-read.png
+share/icons/gnome/16x16/actions/mail-mark-unread.png
 share/icons/gnome/16x16/actions/mail-message-new.png
 share/icons/gnome/16x16/actions/mail-reply-all.png
 share/icons/gnome/16x16/actions/mail-reply-sender.png
 share/icons/gnome/16x16/actions/mail-send-receive.png
+share/icons/gnome/16x16/actions/mail-send.png
 share/icons/gnome/16x16/actions/mail_forward.png
 share/icons/gnome/16x16/actions/mail_new.png
 share/icons/gnome/16x16/actions/mail_reply.png
 share/icons/gnome/16x16/actions/mail_replyall.png
+share/icons/gnome/16x16/actions/mail_send.png
 share/icons/gnome/16x16/actions/mail_spam.png
 share/icons/gnome/16x16/actions/media-eject.png
 share/icons/gnome/16x16/actions/media-playback-pause.png
@@ -193,6 +216,7 @@ share/icons/gnome/16x16/actions/reload_all_tabs.png
 share/icons/gnome/16x16/actions/reload_page.png
 share/icons/gnome/16x16/actions/remove.png
 share/icons/gnome/16x16/actions/rightjust.png
+share/icons/gnome/16x16/actions/search.png
 share/icons/gnome/16x16/actions/start.png
 share/icons/gnome/16x16/actions/stock_add-bookmark.png
 share/icons/gnome/16x16/actions/stock_bottom.png
@@ -211,9 +235,12 @@ share/icons/gnome/16x16/actions/stock_leave-fullscreen.png
 share/icons/gnome/16x16/actions/stock_left.png
 share/icons/gnome/16x16/actions/stock_mail-compose.png
 share/icons/gnome/16x16/actions/stock_mail-forward.png
+share/icons/gnome/16x16/actions/stock_mail-open.png
 share/icons/gnome/16x16/actions/stock_mail-reply-to-all.png
 share/icons/gnome/16x16/actions/stock_mail-reply.png
 share/icons/gnome/16x16/actions/stock_mail-send-receive.png
+share/icons/gnome/16x16/actions/stock_mail-send.png
+share/icons/gnome/16x16/actions/stock_mail-unread.png
 share/icons/gnome/16x16/actions/stock_media-fwd.png
 share/icons/gnome/16x16/actions/stock_media-next.png
 share/icons/gnome/16x16/actions/stock_media-pause.png
@@ -229,7 +256,6 @@ share/icons/gnome/16x16/actions/stock_new-dir.png
 share/icons/gnome/16x16/actions/stock_new-tab.png
 share/icons/gnome/16x16/actions/stock_new-text.png
 share/icons/gnome/16x16/actions/stock_new-window.png
-share/icons/gnome/16x16/actions/stock_not-spam.png
 share/icons/gnome/16x16/actions/stock_paste.png
 share/icons/gnome/16x16/actions/stock_print-preview.png
 share/icons/gnome/16x16/actions/stock_print.png
@@ -263,13 +289,16 @@ share/icons/gnome/16x16/actions/stock_zoom-out.png
 share/icons/gnome/16x16/actions/stock_zoom-page.png
 share/icons/gnome/16x16/actions/stop.png
 share/icons/gnome/16x16/actions/system-lock-screen.png
+share/icons/gnome/16x16/actions/system-log-out.png
 share/icons/gnome/16x16/actions/system-run.png
+share/icons/gnome/16x16/actions/system-search.png
 share/icons/gnome/16x16/actions/tab-new.png
 share/icons/gnome/16x16/actions/tab_new.png
 share/icons/gnome/16x16/actions/text_bold.png
 share/icons/gnome/16x16/actions/text_italic.png
 share/icons/gnome/16x16/actions/text_strike.png
 share/icons/gnome/16x16/actions/text_under.png
+share/icons/gnome/16x16/actions/tools-check-spelling.png
 share/icons/gnome/16x16/actions/top.png
 share/icons/gnome/16x16/actions/undo.png
 share/icons/gnome/16x16/actions/up.png
@@ -300,6 +329,7 @@ share/icons/gnome/16x16/animations/process-working.png
 share/icons/gnome/16x16/apps/access.png
 share/icons/gnome/16x16/apps/accessibility-directory.png
 share/icons/gnome/16x16/apps/accessories-calculator.png
+share/icons/gnome/16x16/apps/accessories-character-map.png
 share/icons/gnome/16x16/apps/accessories-dictionary.png
 share/icons/gnome/16x16/apps/accessories-text-editor.png
 share/icons/gnome/16x16/apps/applets-screenshooter.png
@@ -312,8 +342,8 @@ share/icons/gnome/16x16/apps/config-users.png
 share/icons/gnome/16x16/apps/file-manager.png
 share/icons/gnome/16x16/apps/fonts.png
 share/icons/gnome/16x16/apps/gnome-calculator.png
+share/icons/gnome/16x16/apps/gnome-character-map.png
 share/icons/gnome/16x16/apps/gnome-help.png
-share/icons/gnome/16x16/apps/gnome-logout.png
 share/icons/gnome/16x16/apps/gnome-mixer.png
 share/icons/gnome/16x16/apps/gnome-monitor.png
 share/icons/gnome/16x16/apps/gnome-remote-desktop.png
@@ -327,6 +357,7 @@ share/icons/gnome/16x16/apps/gnome-shutdown.png
 share/icons/gnome/16x16/apps/gnome-terminal.png
 share/icons/gnome/16x16/apps/gnome-window-manager.png
 share/icons/gnome/16x16/apps/gtk-help.png
+share/icons/gnome/16x16/apps/gucharmap.png
 share/icons/gnome/16x16/apps/help-browser.png
 share/icons/gnome/16x16/apps/help.png
 share/icons/gnome/16x16/apps/im-aim.png
@@ -336,8 +367,8 @@ share/icons/gnome/16x16/apps/im-msn.png
 share/icons/gnome/16x16/apps/im-nov.png
 share/icons/gnome/16x16/apps/im-yahoo.png
 share/icons/gnome/16x16/apps/im.png
-share/icons/gnome/16x16/apps/image-viewer.png
 share/icons/gnome/16x16/apps/kcalc.png
+share/icons/gnome/16x16/apps/kcharselect.png
 share/icons/gnome/16x16/apps/kcmkwm.png
 share/icons/gnome/16x16/apps/kcmsound.png
 share/icons/gnome/16x16/apps/kedit.png
@@ -373,9 +404,11 @@ share/icons/gnome/16x16/apps/susehelpcenter.png
 share/icons/gnome/16x16/apps/system-config-users.png
 share/icons/gnome/16x16/apps/system-file-manager.png
 share/icons/gnome/16x16/apps/system-software-installer.png
+share/icons/gnome/16x16/apps/system-software-update.png
 share/icons/gnome/16x16/apps/system-users.png
 share/icons/gnome/16x16/apps/terminal.png
 share/icons/gnome/16x16/apps/text-editor.png
+share/icons/gnome/16x16/apps/update-manager.png
 share/icons/gnome/16x16/apps/user-info.png
 share/icons/gnome/16x16/apps/utilities-system-monitor.png
 share/icons/gnome/16x16/apps/utilities-terminal.png
@@ -388,8 +421,10 @@ share/icons/gnome/16x16/apps/xfce4-backdrop.png
 share/icons/gnome/16x16/apps/xfce4-mixer.png
 share/icons/gnome/16x16/apps/xfwm4.png
 share/icons/gnome/16x16/apps/xscreensaver.png
+share/icons/gnome/16x16/apps/zen-icon.png
 share/icons/gnome/16x16/categories/applications-accessories.png
 share/icons/gnome/16x16/categories/applications-development.png
+share/icons/gnome/16x16/categories/applications-engineering.png
 share/icons/gnome/16x16/categories/applications-games.png
 share/icons/gnome/16x16/categories/applications-graphics.png
 share/icons/gnome/16x16/categories/applications-internet.png
@@ -398,6 +433,7 @@ share/icons/gnome/16x16/categories/applications-office.png
 share/icons/gnome/16x16/categories/applications-other.png
 share/icons/gnome/16x16/categories/applications-science.png
 share/icons/gnome/16x16/categories/applications-system.png
+share/icons/gnome/16x16/categories/applications-utilities.png
 share/icons/gnome/16x16/categories/gnome-applications.png
 share/icons/gnome/16x16/categories/gnome-control-center.png
 share/icons/gnome/16x16/categories/gnome-devel.png
@@ -409,6 +445,7 @@ share/icons/gnome/16x16/categories/gnome-settings.png
 share/icons/gnome/16x16/categories/gnome-system.png
 share/icons/gnome/16x16/categories/gnome-util.png
 share/icons/gnome/16x16/categories/gtk-preferences.png
+share/icons/gnome/16x16/categories/input_devices_settings.png
 share/icons/gnome/16x16/categories/kcontrol.png
 share/icons/gnome/16x16/categories/package_development.png
 share/icons/gnome/16x16/categories/package_games.png
@@ -419,7 +456,11 @@ share/icons/gnome/16x16/categories/package_office.png
 share/icons/gnome/16x16/categories/package_settings.png
 share/icons/gnome/16x16/categories/package_system.png
 share/icons/gnome/16x16/categories/package_utilities.png
+share/icons/gnome/16x16/categories/preferences-desktop-peripherals.png
+share/icons/gnome/16x16/categories/preferences-desktop-personal.png
 share/icons/gnome/16x16/categories/preferences-desktop.png
+share/icons/gnome/16x16/categories/preferences-other.png
+share/icons/gnome/16x16/categories/preferences-system-network.png
 share/icons/gnome/16x16/categories/preferences-system.png
 share/icons/gnome/16x16/categories/redhat-accessories.png
 share/icons/gnome/16x16/categories/redhat-games.png
@@ -432,6 +473,7 @@ share/icons/gnome/16x16/categories/redhat-sound_video.png
 share/icons/gnome/16x16/categories/redhat-system_settings.png
 share/icons/gnome/16x16/categories/redhat-system_tools.png
 share/icons/gnome/16x16/categories/stock_internet.png
+share/icons/gnome/16x16/categories/system-help.png
 share/icons/gnome/16x16/categories/xfce-games.png
 share/icons/gnome/16x16/categories/xfce-graphics.png
 share/icons/gnome/16x16/categories/xfce-internet.png
@@ -441,9 +483,11 @@ share/icons/gnome/16x16/categories/xfce-system-settings.png
 share/icons/gnome/16x16/categories/xfce-utils.png
 share/icons/gnome/16x16/categories/xfce4-settings.png
 share/icons/gnome/16x16/devices/3floppy_unmount.png
+share/icons/gnome/16x16/devices/audio-card.png
 share/icons/gnome/16x16/devices/audio-input-microphone.png
 share/icons/gnome/16x16/devices/battery.png
 share/icons/gnome/16x16/devices/camera-photo.png
+share/icons/gnome/16x16/devices/camera-video.png
 share/icons/gnome/16x16/devices/camera-web.png
 share/icons/gnome/16x16/devices/camera.png
 share/icons/gnome/16x16/devices/camera_unmount.png
@@ -487,6 +531,7 @@ share/icons/gnome/16x16/devices/gnome-dev-removable-1394.png
 share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png
 share/icons/gnome/16x16/devices/gnome-dev-removable.png
 share/icons/gnome/16x16/devices/gnome-dev-wavelan.png
+share/icons/gnome/16x16/devices/gnome-dev-zipdisk.png
 share/icons/gnome/16x16/devices/gnome-fs-client.png
 share/icons/gnome/16x16/devices/gnome-modem.png
 share/icons/gnome/16x16/devices/gnome-stock-mic.png
@@ -495,10 +540,12 @@ share/icons/gnome/16x16/devices/gtk-floppy.png
 share/icons/gnome/16x16/devices/gtk-harddisk.png
 share/icons/gnome/16x16/devices/harddrive.png
 share/icons/gnome/16x16/devices/hdd_unmount.png
+share/icons/gnome/16x16/devices/input-gaming.png
 share/icons/gnome/16x16/devices/input-keyboard.png
 share/icons/gnome/16x16/devices/input-mouse.png
 share/icons/gnome/16x16/devices/input-tablet.png
 share/icons/gnome/16x16/devices/ipod_mount.png
+share/icons/gnome/16x16/devices/joystick.png
 share/icons/gnome/16x16/devices/keyboard.png
 share/icons/gnome/16x16/devices/kjobviewer.png
 share/icons/gnome/16x16/devices/kxkb.png
@@ -507,15 +554,19 @@ share/icons/gnome/16x16/devices/media-flash.png
 share/icons/gnome/16x16/devices/media-floppy.png
 share/icons/gnome/16x16/devices/media-optical.png
 share/icons/gnome/16x16/devices/media-tape.png
+share/icons/gnome/16x16/devices/media-zip.png
 share/icons/gnome/16x16/devices/modem.png
 share/icons/gnome/16x16/devices/mouse.png
 share/icons/gnome/16x16/devices/multimedia-player.png
 share/icons/gnome/16x16/devices/network-wired.png
 share/icons/gnome/16x16/devices/network-wireless.png
+share/icons/gnome/16x16/devices/pda.png
+share/icons/gnome/16x16/devices/phone.png
 share/icons/gnome/16x16/devices/printer-remote.png
 share/icons/gnome/16x16/devices/printer.png
 share/icons/gnome/16x16/devices/printer1.png
 share/icons/gnome/16x16/devices/printmgr.png
+share/icons/gnome/16x16/devices/scanner.png
 share/icons/gnome/16x16/devices/stock_mic.png
 share/icons/gnome/16x16/devices/stock_printers.png
 share/icons/gnome/16x16/devices/system-floppy.png
@@ -528,16 +579,43 @@ share/icons/gnome/16x16/devices/xfce4-keyboard.png
 share/icons/gnome/16x16/devices/xfce4-mouse.png
 share/icons/gnome/16x16/devices/yast_HD.png
 share/icons/gnome/16x16/devices/yast_idetude.png
+share/icons/gnome/16x16/devices/yast_joystick.png
 share/icons/gnome/16x16/devices/yast_mouse.png
 share/icons/gnome/16x16/devices/yast_printer.png
+share/icons/gnome/16x16/devices/yast_soundcard.png
 share/icons/gnome/16x16/emblems/emblem-default.png
+share/icons/gnome/16x16/emblems/emblem-documents.png
+share/icons/gnome/16x16/emblems/emblem-downloads.png
 share/icons/gnome/16x16/emblems/emblem-favorite.png
+share/icons/gnome/16x16/emblems/emblem-generic.png
 share/icons/gnome/16x16/emblems/emblem-important.png
+share/icons/gnome/16x16/emblems/emblem-mail.png
 share/icons/gnome/16x16/emblems/emblem-new.png
 share/icons/gnome/16x16/emblems/emblem-package.png
+share/icons/gnome/16x16/emblems/emblem-photos.png
+share/icons/gnome/16x16/emblems/emblem-readonly.png
+share/icons/gnome/16x16/emblems/emblem-shared.png
 share/icons/gnome/16x16/emblems/emblem-symbolic-link.png
+share/icons/gnome/16x16/emblems/emblem-system.png
+share/icons/gnome/16x16/emblems/emblem-unreadable.png
+share/icons/gnome/16x16/emblems/emblem-urgent.png
 share/icons/gnome/16x16/emblems/emblem-web.png
 share/icons/gnome/16x16/emblems/stock_mail-priority-high.png
+share/icons/gnome/16x16/emotes/face-angel.png
+share/icons/gnome/16x16/emotes/face-cool.png
+share/icons/gnome/16x16/emotes/face-crying.png
+share/icons/gnome/16x16/emotes/face-devilish.png
+share/icons/gnome/16x16/emotes/face-embarrassed.png
+share/icons/gnome/16x16/emotes/face-kiss.png
+share/icons/gnome/16x16/emotes/face-monkey.png
+share/icons/gnome/16x16/emotes/face-plain.png
+share/icons/gnome/16x16/emotes/face-raspberry.png
+share/icons/gnome/16x16/emotes/face-sad.png
+share/icons/gnome/16x16/emotes/face-smile-big.png
+share/icons/gnome/16x16/emotes/face-smile.png
+share/icons/gnome/16x16/emotes/face-smirk.png
+share/icons/gnome/16x16/emotes/face-surprise.png
+share/icons/gnome/16x16/emotes/face-wink.png
 share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png
 share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png
 share/icons/gnome/16x16/mimetypes/application-certificate.png
@@ -694,9 +772,11 @@ share/icons/gnome/16x16/places/distributor-logo.png
 share/icons/gnome/16x16/places/emptytrash.png
 share/icons/gnome/16x16/places/folder-remote.png
 share/icons/gnome/16x16/places/folder-saved-search.png
+share/icons/gnome/16x16/places/folder.icon
 share/icons/gnome/16x16/places/folder.png
 share/icons/gnome/16x16/places/folder_home.png
 share/icons/gnome/16x16/places/gnome-fs-desktop.png
+share/icons/gnome/16x16/places/gnome-fs-directory.icon
 share/icons/gnome/16x16/places/gnome-fs-directory.png
 share/icons/gnome/16x16/places/gnome-fs-ftp.png
 share/icons/gnome/16x16/places/gnome-fs-home.png
@@ -722,6 +802,7 @@ share/icons/gnome/16x16/places/novell-button.png
 share/icons/gnome/16x16/places/redhat-network-server.png
 share/icons/gnome/16x16/places/server.png
 share/icons/gnome/16x16/places/start-here.png
+share/icons/gnome/16x16/places/stock_folder.icon
 share/icons/gnome/16x16/places/stock_folder.png
 share/icons/gnome/16x16/places/trashcan_empty.png
 share/icons/gnome/16x16/places/user-desktop.png
@@ -734,11 +815,15 @@ share/icons/gnome/16x16/status/audio-volume-high.png
 share/icons/gnome/16x16/status/audio-volume-low.png
 share/icons/gnome/16x16/status/audio-volume-medium.png
 share/icons/gnome/16x16/status/audio-volume-muted.png
+share/icons/gnome/16x16/status/battery-caution.png
+share/icons/gnome/16x16/status/battery-low.png
 share/icons/gnome/16x16/status/connect_creating.png
 share/icons/gnome/16x16/status/connect_established.png
 share/icons/gnome/16x16/status/connect_no.png
 share/icons/gnome/16x16/status/dialog-error.png
 share/icons/gnome/16x16/status/dialog-information.png
+share/icons/gnome/16x16/status/dialog-password.png
+share/icons/gnome/16x16/status/dialog-question.png
 share/icons/gnome/16x16/status/dialog-warning.png
 share/icons/gnome/16x16/status/edittrash.png
 share/icons/gnome/16x16/status/error.png
@@ -758,13 +843,20 @@ share/icons/gnome/16x16/status/gnome-netstatus-rx.png
 share/icons/gnome/16x16/status/gnome-netstatus-tx.png
 share/icons/gnome/16x16/status/gnome-netstatus-txrx.png
 share/icons/gnome/16x16/status/gnome-stock-trash-full.png
+share/icons/gnome/16x16/status/gtk-dialog-authentication.png
 share/icons/gnome/16x16/status/gtk-dialog-error.png
 share/icons/gnome/16x16/status/gtk-dialog-info.png
+share/icons/gnome/16x16/status/gtk-dialog-question.png
 share/icons/gnome/16x16/status/gtk-dialog-warning.png
+share/icons/gnome/16x16/status/gtk-missing-image.png
 share/icons/gnome/16x16/status/image-loading.png
+share/icons/gnome/16x16/status/image-missing.png
 share/icons/gnome/16x16/status/important.png
 share/icons/gnome/16x16/status/info.png
 share/icons/gnome/16x16/status/mail-attachment.png
+share/icons/gnome/16x16/status/mail-read.png
+share/icons/gnome/16x16/status/mail-replied.png
+share/icons/gnome/16x16/status/mail-unread.png
 share/icons/gnome/16x16/status/media-playlist-repeat.png
 share/icons/gnome/16x16/status/media-playlist-shuffle.png
 share/icons/gnome/16x16/status/messagebox_critical.png
@@ -782,11 +874,22 @@ share/icons/gnome/16x16/status/nm-device-wired.png
 share/icons/gnome/16x16/status/nm-device-wireless.png
 share/icons/gnome/16x16/status/nm-no-connection.png
 share/icons/gnome/16x16/status/printer-error.png
+share/icons/gnome/16x16/status/printer-printing.png
+share/icons/gnome/16x16/status/security-high.png
+share/icons/gnome/16x16/status/security-low.png
+share/icons/gnome/16x16/status/security-medium.png
+share/icons/gnome/16x16/status/software-update-available.png
+share/icons/gnome/16x16/status/software-update-urgent.png
 share/icons/gnome/16x16/status/stock_appointment-reminder-excl.png
 share/icons/gnome/16x16/status/stock_appointment-reminder.png
 share/icons/gnome/16x16/status/stock_dialog-error.png
 share/icons/gnome/16x16/status/stock_dialog-info.png
+share/icons/gnome/16x16/status/stock_dialog-question.png
 share/icons/gnome/16x16/status/stock_dialog-warning.png
+share/icons/gnome/16x16/status/stock_lock-broken.png
+share/icons/gnome/16x16/status/stock_lock-ok.png
+share/icons/gnome/16x16/status/stock_lock-open.png
+share/icons/gnome/16x16/status/stock_lock.png
 share/icons/gnome/16x16/status/stock_open.png
 share/icons/gnome/16x16/status/stock_repeat.png
 share/icons/gnome/16x16/status/stock_shuffle.png
@@ -807,6 +910,8 @@ share/icons/gnome/16x16/status/stock_weather-snow.png
 share/icons/gnome/16x16/status/stock_weather-storm.png
 share/icons/gnome/16x16/status/stock_weather-sunny.png
 share/icons/gnome/16x16/status/sunny.png
+share/icons/gnome/16x16/status/task-due.png
+share/icons/gnome/16x16/status/task-past-due.png
 share/icons/gnome/16x16/status/trashcan_full.png
 share/icons/gnome/16x16/status/user-trash-full.png
 share/icons/gnome/16x16/status/weather-clear-night.png
@@ -927,7 +1032,6 @@ share/icons/gnome/16x16/stock/data/stock_sort-row-ascending.png
 share/icons/gnome/16x16/stock/data/stock_standard-filter.png
 share/icons/gnome/16x16/stock/data/stock_sum.png
 share/icons/gnome/16x16/stock/data/stock_update-data.png
-share/icons/gnome/16x16/stock/document/stock_attach.png
 share/icons/gnome/16x16/stock/document/stock_certificate.png
 share/icons/gnome/16x16/stock/document/stock_new-drawing.png
 share/icons/gnome/16x16/stock/document/stock_new-formula.png
@@ -952,31 +1056,16 @@ share/icons/gnome/16x16/stock/document/stock_task-recurring.png
 share/icons/gnome/16x16/stock/document/stock_task.png
 share/icons/gnome/16x16/stock/document/stock_todo.png
 share/icons/gnome/16x16/stock/document/stock_view-html-source.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-1.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-10.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-11.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-12.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-13.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-14.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-15.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-16.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-17.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-18.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-19.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-2.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-20.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-21.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-22.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-23.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-24.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-25.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-26.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-3.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-4.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-5.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-6.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-7.png
-share/icons/gnome/16x16/stock/emoticons/stock_smiley-8.png
 share/icons/gnome/16x16/stock/emoticons/stock_smiley-9.png
 share/icons/gnome/16x16/stock/form/stock_form-activation-order.png
 share/icons/gnome/16x16/stock/form/stock_form-add-field.png
@@ -1030,7 +1119,6 @@ share/icons/gnome/16x16/stock/generic/stock_briefcase.png
 share/icons/gnome/16x16/stock/generic/stock_calc-accept.png
 share/icons/gnome/16x16/stock/generic/stock_calc-cancel.png
 share/icons/gnome/16x16/stock/generic/stock_calendar-and-tasks.png
-share/icons/gnome/16x16/stock/generic/stock_cell-phone.png
 share/icons/gnome/16x16/stock/generic/stock_check-filled.png
 share/icons/gnome/16x16/stock/generic/stock_color.png
 share/icons/gnome/16x16/stock/generic/stock_default-folder.png
@@ -1312,12 +1400,9 @@ share/icons/gnome/16x16/stock/navigation/stock_previous.png
 share/icons/gnome/16x16/stock/navigation/stock_right-with-subpoints.png
 share/icons/gnome/16x16/stock/navigation/stock_undo-history.png
 share/icons/gnome/16x16/stock/navigation/stock_up-with-subpoints.png
-share/icons/gnome/16x16/stock/navigation/stock_zoom-1.png
-share/icons/gnome/16x16/stock/navigation/stock_zoom-in.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-next.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-object.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-optimal.png
-share/icons/gnome/16x16/stock/navigation/stock_zoom-out.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-page-width.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-page.png
 share/icons/gnome/16x16/stock/navigation/stock_zoom-previous.png
@@ -1620,14 +1705,18 @@ share/icons/gnome/22x22/actions/bottom.png
 share/icons/gnome/22x22/actions/centrejust.png
 share/icons/gnome/22x22/actions/contact-new.png
 share/icons/gnome/22x22/actions/document-new.png
+share/icons/gnome/22x22/actions/document-open-recent.png
 share/icons/gnome/22x22/actions/document-open.png
+share/icons/gnome/22x22/actions/document-page-setup.png
 share/icons/gnome/22x22/actions/document-print-preview.png
 share/icons/gnome/22x22/actions/document-print.png
 share/icons/gnome/22x22/actions/document-properties.png
 share/icons/gnome/22x22/actions/document-revert.png
 share/icons/gnome/22x22/actions/document-save-as.png
 share/icons/gnome/22x22/actions/document-save.png
+share/icons/gnome/22x22/actions/document-send.png
 share/icons/gnome/22x22/actions/down.png
+share/icons/gnome/22x22/actions/edit-clear.png
 share/icons/gnome/22x22/actions/edit-copy.png
 share/icons/gnome/22x22/actions/edit-cut.png
 share/icons/gnome/22x22/actions/edit-delete.png
@@ -1637,6 +1726,7 @@ share/icons/gnome/22x22/actions/edit-paste.png
 share/icons/gnome/22x22/actions/edit-redo.png
 share/icons/gnome/22x22/actions/edit-select-all.png
 share/icons/gnome/22x22/actions/edit-undo.png
+share/icons/gnome/22x22/actions/editclear.png
 share/icons/gnome/22x22/actions/editcopy.png
 share/icons/gnome/22x22/actions/editcut.png
 share/icons/gnome/22x22/actions/editdelete.png
@@ -1660,21 +1750,27 @@ share/icons/gnome/22x22/actions/format-justify-fill.png
 share/icons/gnome/22x22/actions/format-justify-left.png
 share/icons/gnome/22x22/actions/format-justify-right.png
 share/icons/gnome/22x22/actions/format-text-bold.png
+share/icons/gnome/22x22/actions/format-text-direction-ltr.png
+share/icons/gnome/22x22/actions/format-text-direction-rtl.png
 share/icons/gnome/22x22/actions/format-text-italic.png
 share/icons/gnome/22x22/actions/format-text-strikethrough.png
 share/icons/gnome/22x22/actions/format-text-underline.png
 share/icons/gnome/22x22/actions/forward.png
 share/icons/gnome/22x22/actions/gnome-lockscreen.png
+share/icons/gnome/22x22/actions/gnome-logout.png
 share/icons/gnome/22x22/actions/gnome-run.png
+share/icons/gnome/22x22/actions/gnome-searchtool.png
 share/icons/gnome/22x22/actions/gnome-stock-mail-fwd.png
 share/icons/gnome/22x22/actions/gnome-stock-mail-new.png
 share/icons/gnome/22x22/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/22x22/actions/gnome-stock-mail-snd.png
 share/icons/gnome/22x22/actions/gnome-stock-text-indent.png
 share/icons/gnome/22x22/actions/gnome-stock-text-unindent.png
 share/icons/gnome/22x22/actions/go-bottom.png
 share/icons/gnome/22x22/actions/go-down.png
 share/icons/gnome/22x22/actions/go-first.png
 share/icons/gnome/22x22/actions/go-home.png
+share/icons/gnome/22x22/actions/go-jump.png
 share/icons/gnome/22x22/actions/go-last.png
 share/icons/gnome/22x22/actions/go-next.png
 share/icons/gnome/22x22/actions/go-previous.png
@@ -1683,6 +1779,7 @@ share/icons/gnome/22x22/actions/go-up.png
 share/icons/gnome/22x22/actions/gohome.png
 share/icons/gnome/22x22/actions/gtk-add.png
 share/icons/gnome/22x22/actions/gtk-bold.png
+share/icons/gnome/22x22/actions/gtk-clear.png
 share/icons/gnome/22x22/actions/gtk-close.png
 share/icons/gnome/22x22/actions/gtk-copy.png
 share/icons/gnome/22x22/actions/gtk-cut.png
@@ -1706,6 +1803,8 @@ share/icons/gnome/22x22/actions/gtk-goto-top.png
 share/icons/gnome/22x22/actions/gtk-home.png
 share/icons/gnome/22x22/actions/gtk-indent.png
 share/icons/gnome/22x22/actions/gtk-italic.png
+share/icons/gnome/22x22/actions/gtk-jump-to-ltr.png
+share/icons/gnome/22x22/actions/gtk-jump-to-rtl.png
 share/icons/gnome/22x22/actions/gtk-justify-center.png
 share/icons/gnome/22x22/actions/gtk-justify-fill.png
 share/icons/gnome/22x22/actions/gtk-justify-left.png
@@ -1747,26 +1846,35 @@ share/icons/gnome/22x22/actions/gtk-zoom-100.png
 share/icons/gnome/22x22/actions/gtk-zoom-fit.png
 share/icons/gnome/22x22/actions/gtk-zoom-in.png
 share/icons/gnome/22x22/actions/gtk-zoom-out.png
+share/icons/gnome/22x22/actions/help-about.png
+share/icons/gnome/22x22/actions/help-contents.png
 share/icons/gnome/22x22/actions/help-faq.png
 share/icons/gnome/22x22/actions/insert-image.png
 share/icons/gnome/22x22/actions/insert-link.png
+share/icons/gnome/22x22/actions/insert-object.png
 share/icons/gnome/22x22/actions/insert-text.png
+share/icons/gnome/22x22/actions/kfind.png
 share/icons/gnome/22x22/actions/kfm_home.png
 share/icons/gnome/22x22/actions/leftjust.png
 share/icons/gnome/22x22/actions/list-add.png
 share/icons/gnome/22x22/actions/list-remove.png
 share/icons/gnome/22x22/actions/lock.png
 share/icons/gnome/22x22/actions/mail-forward.png
+share/icons/gnome/22x22/actions/mail-mark-important.png
 share/icons/gnome/22x22/actions/mail-mark-junk.png
-share/icons/gnome/22x22/actions/mail-mark-not-junk.png
+share/icons/gnome/22x22/actions/mail-mark-notjunk.png
+share/icons/gnome/22x22/actions/mail-mark-read.png
+share/icons/gnome/22x22/actions/mail-mark-unread.png
 share/icons/gnome/22x22/actions/mail-message-new.png
 share/icons/gnome/22x22/actions/mail-reply-all.png
 share/icons/gnome/22x22/actions/mail-reply-sender.png
 share/icons/gnome/22x22/actions/mail-send-receive.png
+share/icons/gnome/22x22/actions/mail-send.png
 share/icons/gnome/22x22/actions/mail_forward.png
 share/icons/gnome/22x22/actions/mail_new.png
 share/icons/gnome/22x22/actions/mail_reply.png
 share/icons/gnome/22x22/actions/mail_replyall.png
+share/icons/gnome/22x22/actions/mail_send.png
 share/icons/gnome/22x22/actions/mail_spam.png
 share/icons/gnome/22x22/actions/media-eject.png
 share/icons/gnome/22x22/actions/media-playback-pause.png
@@ -1801,6 +1909,7 @@ share/icons/gnome/22x22/actions/reload_all_tabs.png
 share/icons/gnome/22x22/actions/reload_page.png
 share/icons/gnome/22x22/actions/remove.png
 share/icons/gnome/22x22/actions/rightjust.png
+share/icons/gnome/22x22/actions/search.png
 share/icons/gnome/22x22/actions/start.png
 share/icons/gnome/22x22/actions/stock_add-bookmark.png
 share/icons/gnome/22x22/actions/stock_bottom.png
@@ -1819,9 +1928,12 @@ share/icons/gnome/22x22/actions/stock_leave-fullscreen.png
 share/icons/gnome/22x22/actions/stock_left.png
 share/icons/gnome/22x22/actions/stock_mail-compose.png
 share/icons/gnome/22x22/actions/stock_mail-forward.png
+share/icons/gnome/22x22/actions/stock_mail-open.png
 share/icons/gnome/22x22/actions/stock_mail-reply-to-all.png
 share/icons/gnome/22x22/actions/stock_mail-reply.png
 share/icons/gnome/22x22/actions/stock_mail-send-receive.png
+share/icons/gnome/22x22/actions/stock_mail-send.png
+share/icons/gnome/22x22/actions/stock_mail-unread.png
 share/icons/gnome/22x22/actions/stock_media-fwd.png
 share/icons/gnome/22x22/actions/stock_media-next.png
 share/icons/gnome/22x22/actions/stock_media-pause.png
@@ -1837,7 +1949,6 @@ share/icons/gnome/22x22/actions/stock_new-dir.png
 share/icons/gnome/22x22/actions/stock_new-tab.png
 share/icons/gnome/22x22/actions/stock_new-text.png
 share/icons/gnome/22x22/actions/stock_new-window.png
-share/icons/gnome/22x22/actions/stock_not-spam.png
 share/icons/gnome/22x22/actions/stock_paste.png
 share/icons/gnome/22x22/actions/stock_print-preview.png
 share/icons/gnome/22x22/actions/stock_print.png
@@ -1871,13 +1982,16 @@ share/icons/gnome/22x22/actions/stock_zoom-out.png
 share/icons/gnome/22x22/actions/stock_zoom-page.png
 share/icons/gnome/22x22/actions/stop.png
 share/icons/gnome/22x22/actions/system-lock-screen.png
+share/icons/gnome/22x22/actions/system-log-out.png
 share/icons/gnome/22x22/actions/system-run.png
+share/icons/gnome/22x22/actions/system-search.png
 share/icons/gnome/22x22/actions/tab-new.png
 share/icons/gnome/22x22/actions/tab_new.png
 share/icons/gnome/22x22/actions/text_bold.png
 share/icons/gnome/22x22/actions/text_italic.png
 share/icons/gnome/22x22/actions/text_strike.png
 share/icons/gnome/22x22/actions/text_under.png
+share/icons/gnome/22x22/actions/tools-check-spelling.png
 share/icons/gnome/22x22/actions/top.png
 share/icons/gnome/22x22/actions/undo.png
 share/icons/gnome/22x22/actions/up.png
@@ -1908,6 +2022,7 @@ share/icons/gnome/22x22/animations/process-working.png
 share/icons/gnome/22x22/apps/access.png
 share/icons/gnome/22x22/apps/accessibility-directory.png
 share/icons/gnome/22x22/apps/accessories-calculator.png
+share/icons/gnome/22x22/apps/accessories-character-map.png
 share/icons/gnome/22x22/apps/accessories-dictionary.png
 share/icons/gnome/22x22/apps/accessories-text-editor.png
 share/icons/gnome/22x22/apps/applets-screenshooter.png
@@ -1920,6 +2035,7 @@ share/icons/gnome/22x22/apps/config-users.png
 share/icons/gnome/22x22/apps/file-manager.png
 share/icons/gnome/22x22/apps/fonts.png
 share/icons/gnome/22x22/apps/gnome-calculator.png
+share/icons/gnome/22x22/apps/gnome-character-map.png
 share/icons/gnome/22x22/apps/gnome-help.png
 share/icons/gnome/22x22/apps/gnome-mixer.png
 share/icons/gnome/22x22/apps/gnome-monitor.png
@@ -1934,6 +2050,7 @@ share/icons/gnome/22x22/apps/gnome-shutdown.png
 share/icons/gnome/22x22/apps/gnome-terminal.png
 share/icons/gnome/22x22/apps/gnome-window-manager.png
 share/icons/gnome/22x22/apps/gtk-help.png
+share/icons/gnome/22x22/apps/gucharmap.png
 share/icons/gnome/22x22/apps/help-browser.png
 share/icons/gnome/22x22/apps/help.png
 share/icons/gnome/22x22/apps/im-aim.png
@@ -1943,6 +2060,7 @@ share/icons/gnome/22x22/apps/im-msn.png
 share/icons/gnome/22x22/apps/im-nov.png
 share/icons/gnome/22x22/apps/im-yahoo.png
 share/icons/gnome/22x22/apps/kcalc.png
+share/icons/gnome/22x22/apps/kcharselect.png
 share/icons/gnome/22x22/apps/kcmkwm.png
 share/icons/gnome/22x22/apps/kcmsound.png
 share/icons/gnome/22x22/apps/kedit.png
@@ -1978,9 +2096,11 @@ share/icons/gnome/22x22/apps/susehelpcenter.png
 share/icons/gnome/22x22/apps/system-config-users.png
 share/icons/gnome/22x22/apps/system-file-manager.png
 share/icons/gnome/22x22/apps/system-software-installer.png
+share/icons/gnome/22x22/apps/system-software-update.png
 share/icons/gnome/22x22/apps/system-users.png
 share/icons/gnome/22x22/apps/terminal.png
 share/icons/gnome/22x22/apps/text-editor.png
+share/icons/gnome/22x22/apps/update-manager.png
 share/icons/gnome/22x22/apps/user-info.png
 share/icons/gnome/22x22/apps/utilities-system-monitor.png
 share/icons/gnome/22x22/apps/utilities-terminal.png
@@ -1993,8 +2113,10 @@ share/icons/gnome/22x22/apps/xfce4-backdrop.png
 share/icons/gnome/22x22/apps/xfce4-mixer.png
 share/icons/gnome/22x22/apps/xfwm4.png
 share/icons/gnome/22x22/apps/xscreensaver.png
+share/icons/gnome/22x22/apps/zen-icon.png
 share/icons/gnome/22x22/categories/applications-accessories.png
 share/icons/gnome/22x22/categories/applications-development.png
+share/icons/gnome/22x22/categories/applications-engineering.png
 share/icons/gnome/22x22/categories/applications-games.png
 share/icons/gnome/22x22/categories/applications-graphics.png
 share/icons/gnome/22x22/categories/applications-internet.png
@@ -2003,6 +2125,7 @@ share/icons/gnome/22x22/categories/applications-office.png
 share/icons/gnome/22x22/categories/applications-other.png
 share/icons/gnome/22x22/categories/applications-science.png
 share/icons/gnome/22x22/categories/applications-system.png
+share/icons/gnome/22x22/categories/applications-utilities.png
 share/icons/gnome/22x22/categories/gnome-applications.png
 share/icons/gnome/22x22/categories/gnome-control-center.png
 share/icons/gnome/22x22/categories/gnome-devel.png
@@ -2014,6 +2137,7 @@ share/icons/gnome/22x22/categories/gnome-settings.png
 share/icons/gnome/22x22/categories/gnome-system.png
 share/icons/gnome/22x22/categories/gnome-util.png
 share/icons/gnome/22x22/categories/gtk-preferences.png
+share/icons/gnome/22x22/categories/input_devices_settings.png
 share/icons/gnome/22x22/categories/kcontrol.png
 share/icons/gnome/22x22/categories/package_development.png
 share/icons/gnome/22x22/categories/package_games.png
@@ -2024,7 +2148,11 @@ share/icons/gnome/22x22/categories/package_office.png
 share/icons/gnome/22x22/categories/package_settings.png
 share/icons/gnome/22x22/categories/package_system.png
 share/icons/gnome/22x22/categories/package_utilities.png
+share/icons/gnome/22x22/categories/preferences-desktop-peripherals.png
+share/icons/gnome/22x22/categories/preferences-desktop-personal.png
 share/icons/gnome/22x22/categories/preferences-desktop.png
+share/icons/gnome/22x22/categories/preferences-other.png
+share/icons/gnome/22x22/categories/preferences-system-network.png
 share/icons/gnome/22x22/categories/preferences-system.png
 share/icons/gnome/22x22/categories/redhat-accessories.png
 share/icons/gnome/22x22/categories/redhat-games.png
@@ -2037,6 +2165,7 @@ share/icons/gnome/22x22/categories/redhat-sound_video.png
 share/icons/gnome/22x22/categories/redhat-system_settings.png
 share/icons/gnome/22x22/categories/redhat-system_tools.png
 share/icons/gnome/22x22/categories/stock_internet.png
+share/icons/gnome/22x22/categories/system-help.png
 share/icons/gnome/22x22/categories/xfce-games.png
 share/icons/gnome/22x22/categories/xfce-graphics.png
 share/icons/gnome/22x22/categories/xfce-internet.png
@@ -2046,9 +2175,11 @@ share/icons/gnome/22x22/categories/xfce-system-settings.png
 share/icons/gnome/22x22/categories/xfce-utils.png
 share/icons/gnome/22x22/categories/xfce4-settings.png
 share/icons/gnome/22x22/devices/3floppy_unmount.png
+share/icons/gnome/22x22/devices/audio-card.png
 share/icons/gnome/22x22/devices/audio-input-microphone.png
 share/icons/gnome/22x22/devices/battery.png
 share/icons/gnome/22x22/devices/camera-photo.png
+share/icons/gnome/22x22/devices/camera-video.png
 share/icons/gnome/22x22/devices/camera-web.png
 share/icons/gnome/22x22/devices/camera.png
 share/icons/gnome/22x22/devices/camera_unmount.png
@@ -2092,6 +2223,7 @@ share/icons/gnome/22x22/devices/gnome-dev-removable-1394.png
 share/icons/gnome/22x22/devices/gnome-dev-removable-usb.png
 share/icons/gnome/22x22/devices/gnome-dev-removable.png
 share/icons/gnome/22x22/devices/gnome-dev-wavelan.png
+share/icons/gnome/22x22/devices/gnome-dev-zipdisk.png
 share/icons/gnome/22x22/devices/gnome-fs-client.png
 share/icons/gnome/22x22/devices/gnome-modem.png
 share/icons/gnome/22x22/devices/gnome-stock-mic.png
@@ -2100,10 +2232,12 @@ share/icons/gnome/22x22/devices/gtk-floppy.png
 share/icons/gnome/22x22/devices/gtk-harddisk.png
 share/icons/gnome/22x22/devices/harddrive.png
 share/icons/gnome/22x22/devices/hdd_unmount.png
+share/icons/gnome/22x22/devices/input-gaming.png
 share/icons/gnome/22x22/devices/input-keyboard.png
 share/icons/gnome/22x22/devices/input-mouse.png
 share/icons/gnome/22x22/devices/input-tablet.png
 share/icons/gnome/22x22/devices/ipod_mount.png
+share/icons/gnome/22x22/devices/joystick.png
 share/icons/gnome/22x22/devices/keyboard.png
 share/icons/gnome/22x22/devices/kjobviewer.png
 share/icons/gnome/22x22/devices/kxkb.png
@@ -2112,15 +2246,19 @@ share/icons/gnome/22x22/devices/media-flash.png
 share/icons/gnome/22x22/devices/media-floppy.png
 share/icons/gnome/22x22/devices/media-optical.png
 share/icons/gnome/22x22/devices/media-tape.png
+share/icons/gnome/22x22/devices/media-zip.png
 share/icons/gnome/22x22/devices/modem.png
 share/icons/gnome/22x22/devices/mouse.png
 share/icons/gnome/22x22/devices/multimedia-player.png
 share/icons/gnome/22x22/devices/network-wired.png
 share/icons/gnome/22x22/devices/network-wireless.png
+share/icons/gnome/22x22/devices/pda.png
+share/icons/gnome/22x22/devices/phone.png
 share/icons/gnome/22x22/devices/printer-remote.png
 share/icons/gnome/22x22/devices/printer.png
 share/icons/gnome/22x22/devices/printer1.png
 share/icons/gnome/22x22/devices/printmgr.png
+share/icons/gnome/22x22/devices/scanner.png
 share/icons/gnome/22x22/devices/stock_mic.png
 share/icons/gnome/22x22/devices/stock_printers.png
 share/icons/gnome/22x22/devices/system-floppy.png
@@ -2133,16 +2271,43 @@ share/icons/gnome/22x22/devices/xfce4-keyboard.png
 share/icons/gnome/22x22/devices/xfce4-mouse.png
 share/icons/gnome/22x22/devices/yast_HD.png
 share/icons/gnome/22x22/devices/yast_idetude.png
+share/icons/gnome/22x22/devices/yast_joystick.png
 share/icons/gnome/22x22/devices/yast_mouse.png
 share/icons/gnome/22x22/devices/yast_printer.png
+share/icons/gnome/22x22/devices/yast_soundcard.png
 share/icons/gnome/22x22/emblems/emblem-default.png
+share/icons/gnome/22x22/emblems/emblem-documents.png
+share/icons/gnome/22x22/emblems/emblem-downloads.png
 share/icons/gnome/22x22/emblems/emblem-favorite.png
+share/icons/gnome/22x22/emblems/emblem-generic.png
 share/icons/gnome/22x22/emblems/emblem-important.png
+share/icons/gnome/22x22/emblems/emblem-mail.png
 share/icons/gnome/22x22/emblems/emblem-new.png
 share/icons/gnome/22x22/emblems/emblem-package.png
+share/icons/gnome/22x22/emblems/emblem-photos.png
+share/icons/gnome/22x22/emblems/emblem-readonly.png
+share/icons/gnome/22x22/emblems/emblem-shared.png
 share/icons/gnome/22x22/emblems/emblem-symbolic-link.png
+share/icons/gnome/22x22/emblems/emblem-system.png
+share/icons/gnome/22x22/emblems/emblem-unreadable.png
+share/icons/gnome/22x22/emblems/emblem-urgent.png
 share/icons/gnome/22x22/emblems/emblem-web.png
 share/icons/gnome/22x22/emblems/stock_mail-priority-high.png
+share/icons/gnome/22x22/emotes/face-angel.png
+share/icons/gnome/22x22/emotes/face-cool.png
+share/icons/gnome/22x22/emotes/face-crying.png
+share/icons/gnome/22x22/emotes/face-devilish.png
+share/icons/gnome/22x22/emotes/face-embarrassed.png
+share/icons/gnome/22x22/emotes/face-kiss.png
+share/icons/gnome/22x22/emotes/face-monkey.png
+share/icons/gnome/22x22/emotes/face-plain.png
+share/icons/gnome/22x22/emotes/face-raspberry.png
+share/icons/gnome/22x22/emotes/face-sad.png
+share/icons/gnome/22x22/emotes/face-smile-big.png
+share/icons/gnome/22x22/emotes/face-smile.png
+share/icons/gnome/22x22/emotes/face-smirk.png
+share/icons/gnome/22x22/emotes/face-surprise.png
+share/icons/gnome/22x22/emotes/face-wink.png
 share/icons/gnome/22x22/mimetypes/application-certificate.png
 share/icons/gnome/22x22/mimetypes/application-x-executable.png
 share/icons/gnome/22x22/mimetypes/ascii.png
@@ -2340,11 +2505,15 @@ share/icons/gnome/22x22/status/audio-volume-high.png
 share/icons/gnome/22x22/status/audio-volume-low.png
 share/icons/gnome/22x22/status/audio-volume-medium.png
 share/icons/gnome/22x22/status/audio-volume-muted.png
+share/icons/gnome/22x22/status/battery-caution.png
+share/icons/gnome/22x22/status/battery-low.png
 share/icons/gnome/22x22/status/connect_creating.png
 share/icons/gnome/22x22/status/connect_established.png
 share/icons/gnome/22x22/status/connect_no.png
 share/icons/gnome/22x22/status/dialog-error.png
 share/icons/gnome/22x22/status/dialog-information.png
+share/icons/gnome/22x22/status/dialog-password.png
+share/icons/gnome/22x22/status/dialog-question.png
 share/icons/gnome/22x22/status/dialog-warning.png
 share/icons/gnome/22x22/status/edittrash.png
 share/icons/gnome/22x22/status/error.png
@@ -2364,13 +2533,20 @@ share/icons/gnome/22x22/status/gnome-netstatus-rx.png
 share/icons/gnome/22x22/status/gnome-netstatus-tx.png
 share/icons/gnome/22x22/status/gnome-netstatus-txrx.png
 share/icons/gnome/22x22/status/gnome-stock-trash-full.png
+share/icons/gnome/22x22/status/gtk-dialog-authentication.png
 share/icons/gnome/22x22/status/gtk-dialog-error.png
 share/icons/gnome/22x22/status/gtk-dialog-info.png
+share/icons/gnome/22x22/status/gtk-dialog-question.png
 share/icons/gnome/22x22/status/gtk-dialog-warning.png
+share/icons/gnome/22x22/status/gtk-missing-image.png
 share/icons/gnome/22x22/status/image-loading.png
+share/icons/gnome/22x22/status/image-missing.png
 share/icons/gnome/22x22/status/important.png
 share/icons/gnome/22x22/status/info.png
 share/icons/gnome/22x22/status/mail-attachment.png
+share/icons/gnome/22x22/status/mail-read.png
+share/icons/gnome/22x22/status/mail-replied.png
+share/icons/gnome/22x22/status/mail-unread.png
 share/icons/gnome/22x22/status/media-playlist-repeat.png
 share/icons/gnome/22x22/status/media-playlist-shuffle.png
 share/icons/gnome/22x22/status/messagebox_critical.png
@@ -2388,11 +2564,22 @@ share/icons/gnome/22x22/status/nm-device-wired.png
 share/icons/gnome/22x22/status/nm-device-wireless.png
 share/icons/gnome/22x22/status/nm-no-connection.png
 share/icons/gnome/22x22/status/printer-error.png
+share/icons/gnome/22x22/status/printer-printing.png
+share/icons/gnome/22x22/status/security-high.png
+share/icons/gnome/22x22/status/security-low.png
+share/icons/gnome/22x22/status/security-medium.png
+share/icons/gnome/22x22/status/software-update-available.png
+share/icons/gnome/22x22/status/software-update-urgent.png
 share/icons/gnome/22x22/status/stock_appointment-reminder-excl.png
 share/icons/gnome/22x22/status/stock_appointment-reminder.png
 share/icons/gnome/22x22/status/stock_dialog-error.png
 share/icons/gnome/22x22/status/stock_dialog-info.png
+share/icons/gnome/22x22/status/stock_dialog-question.png
 share/icons/gnome/22x22/status/stock_dialog-warning.png
+share/icons/gnome/22x22/status/stock_lock-broken.png
+share/icons/gnome/22x22/status/stock_lock-ok.png
+share/icons/gnome/22x22/status/stock_lock-open.png
+share/icons/gnome/22x22/status/stock_lock.png
 share/icons/gnome/22x22/status/stock_open.png
 share/icons/gnome/22x22/status/stock_repeat.png
 share/icons/gnome/22x22/status/stock_shuffle.png
@@ -2405,6 +2592,7 @@ share/icons/gnome/22x22/status/stock_volume-mute.png
 share/icons/gnome/22x22/status/stock_volume.png
 share/icons/gnome/22x22/status/stock_weather-cloudy.png
 share/icons/gnome/22x22/status/stock_weather-few-clouds.png
+share/icons/gnome/22x22/status/stock_weather-fog.png
 share/icons/gnome/22x22/status/stock_weather-night-clear.png
 share/icons/gnome/22x22/status/stock_weather-night-few-clouds.png
 share/icons/gnome/22x22/status/stock_weather-showers.png
@@ -2412,12 +2600,15 @@ share/icons/gnome/22x22/status/stock_weather-snow.png
 share/icons/gnome/22x22/status/stock_weather-storm.png
 share/icons/gnome/22x22/status/stock_weather-sunny.png
 share/icons/gnome/22x22/status/sunny.png
+share/icons/gnome/22x22/status/task-due.png
+share/icons/gnome/22x22/status/task-past-due.png
 share/icons/gnome/22x22/status/trashcan_full.png
 share/icons/gnome/22x22/status/user-trash-full.png
 share/icons/gnome/22x22/status/weather-clear-night.png
 share/icons/gnome/22x22/status/weather-clear.png
 share/icons/gnome/22x22/status/weather-few-clouds-night.png
 share/icons/gnome/22x22/status/weather-few-clouds.png
+share/icons/gnome/22x22/status/weather-fog.png
 share/icons/gnome/22x22/status/weather-overcast.png
 share/icons/gnome/22x22/status/weather-severe-alert.png
 share/icons/gnome/22x22/status/weather-showers-scattered.png
@@ -2438,14 +2629,18 @@ share/icons/gnome/24x24/actions/bottom.png
 share/icons/gnome/24x24/actions/centrejust.png
 share/icons/gnome/24x24/actions/contact-new.png
 share/icons/gnome/24x24/actions/document-new.png
+share/icons/gnome/24x24/actions/document-open-recent.png
 share/icons/gnome/24x24/actions/document-open.png
+share/icons/gnome/24x24/actions/document-page-setup.png
 share/icons/gnome/24x24/actions/document-print-preview.png
 share/icons/gnome/24x24/actions/document-print.png
 share/icons/gnome/24x24/actions/document-properties.png
 share/icons/gnome/24x24/actions/document-revert.png
 share/icons/gnome/24x24/actions/document-save-as.png
 share/icons/gnome/24x24/actions/document-save.png
+share/icons/gnome/24x24/actions/document-send.png
 share/icons/gnome/24x24/actions/down.png
+share/icons/gnome/24x24/actions/edit-clear.png
 share/icons/gnome/24x24/actions/edit-copy.png
 share/icons/gnome/24x24/actions/edit-cut.png
 share/icons/gnome/24x24/actions/edit-delete.png
@@ -2455,6 +2650,7 @@ share/icons/gnome/24x24/actions/edit-paste.png
 share/icons/gnome/24x24/actions/edit-redo.png
 share/icons/gnome/24x24/actions/edit-select-all.png
 share/icons/gnome/24x24/actions/edit-undo.png
+share/icons/gnome/24x24/actions/editclear.png
 share/icons/gnome/24x24/actions/editcopy.png
 share/icons/gnome/24x24/actions/editcut.png
 share/icons/gnome/24x24/actions/editdelete.png
@@ -2478,21 +2674,27 @@ share/icons/gnome/24x24/actions/format-justify-fill.png
 share/icons/gnome/24x24/actions/format-justify-left.png
 share/icons/gnome/24x24/actions/format-justify-right.png
 share/icons/gnome/24x24/actions/format-text-bold.png
+share/icons/gnome/24x24/actions/format-text-direction-ltr.png
+share/icons/gnome/24x24/actions/format-text-direction-rtl.png
 share/icons/gnome/24x24/actions/format-text-italic.png
 share/icons/gnome/24x24/actions/format-text-strikethrough.png
 share/icons/gnome/24x24/actions/format-text-underline.png
 share/icons/gnome/24x24/actions/forward.png
 share/icons/gnome/24x24/actions/gnome-lockscreen.png
+share/icons/gnome/24x24/actions/gnome-logout.png
 share/icons/gnome/24x24/actions/gnome-run.png
+share/icons/gnome/24x24/actions/gnome-searchtool.png
 share/icons/gnome/24x24/actions/gnome-stock-mail-fwd.png
 share/icons/gnome/24x24/actions/gnome-stock-mail-new.png
 share/icons/gnome/24x24/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/24x24/actions/gnome-stock-mail-snd.png
 share/icons/gnome/24x24/actions/gnome-stock-text-indent.png
 share/icons/gnome/24x24/actions/gnome-stock-text-unindent.png
 share/icons/gnome/24x24/actions/go-bottom.png
 share/icons/gnome/24x24/actions/go-down.png
 share/icons/gnome/24x24/actions/go-first.png
 share/icons/gnome/24x24/actions/go-home.png
+share/icons/gnome/24x24/actions/go-jump.png
 share/icons/gnome/24x24/actions/go-last.png
 share/icons/gnome/24x24/actions/go-next.png
 share/icons/gnome/24x24/actions/go-previous.png
@@ -2501,6 +2703,7 @@ share/icons/gnome/24x24/actions/go-up.png
 share/icons/gnome/24x24/actions/gohome.png
 share/icons/gnome/24x24/actions/gtk-add.png
 share/icons/gnome/24x24/actions/gtk-bold.png
+share/icons/gnome/24x24/actions/gtk-clear.png
 share/icons/gnome/24x24/actions/gtk-close.png
 share/icons/gnome/24x24/actions/gtk-copy.png
 share/icons/gnome/24x24/actions/gtk-cut.png
@@ -2524,6 +2727,8 @@ share/icons/gnome/24x24/actions/gtk-goto-top.png
 share/icons/gnome/24x24/actions/gtk-home.png
 share/icons/gnome/24x24/actions/gtk-indent.png
 share/icons/gnome/24x24/actions/gtk-italic.png
+share/icons/gnome/24x24/actions/gtk-jump-to-ltr.png
+share/icons/gnome/24x24/actions/gtk-jump-to-rtl.png
 share/icons/gnome/24x24/actions/gtk-justify-center.png
 share/icons/gnome/24x24/actions/gtk-justify-fill.png
 share/icons/gnome/24x24/actions/gtk-justify-left.png
@@ -2565,26 +2770,35 @@ share/icons/gnome/24x24/actions/gtk-zoom-100.png
 share/icons/gnome/24x24/actions/gtk-zoom-fit.png
 share/icons/gnome/24x24/actions/gtk-zoom-in.png
 share/icons/gnome/24x24/actions/gtk-zoom-out.png
+share/icons/gnome/24x24/actions/help-about.png
+share/icons/gnome/24x24/actions/help-contents.png
 share/icons/gnome/24x24/actions/help-faq.png
 share/icons/gnome/24x24/actions/insert-image.png
 share/icons/gnome/24x24/actions/insert-link.png
+share/icons/gnome/24x24/actions/insert-object.png
 share/icons/gnome/24x24/actions/insert-text.png
+share/icons/gnome/24x24/actions/kfind.png
 share/icons/gnome/24x24/actions/kfm_home.png
 share/icons/gnome/24x24/actions/leftjust.png
 share/icons/gnome/24x24/actions/list-add.png
 share/icons/gnome/24x24/actions/list-remove.png
 share/icons/gnome/24x24/actions/lock.png
 share/icons/gnome/24x24/actions/mail-forward.png
+share/icons/gnome/24x24/actions/mail-mark-important.png
 share/icons/gnome/24x24/actions/mail-mark-junk.png
-share/icons/gnome/24x24/actions/mail-mark-not-junk.png
+share/icons/gnome/24x24/actions/mail-mark-notjunk.png
+share/icons/gnome/24x24/actions/mail-mark-read.png
+share/icons/gnome/24x24/actions/mail-mark-unread.png
 share/icons/gnome/24x24/actions/mail-message-new.png
 share/icons/gnome/24x24/actions/mail-reply-all.png
 share/icons/gnome/24x24/actions/mail-reply-sender.png
 share/icons/gnome/24x24/actions/mail-send-receive.png
+share/icons/gnome/24x24/actions/mail-send.png
 share/icons/gnome/24x24/actions/mail_forward.png
 share/icons/gnome/24x24/actions/mail_new.png
 share/icons/gnome/24x24/actions/mail_reply.png
 share/icons/gnome/24x24/actions/mail_replyall.png
+share/icons/gnome/24x24/actions/mail_send.png
 share/icons/gnome/24x24/actions/mail_spam.png
 share/icons/gnome/24x24/actions/media-eject.png
 share/icons/gnome/24x24/actions/media-playback-pause.png
@@ -2619,6 +2833,7 @@ share/icons/gnome/24x24/actions/reload_all_tabs.png
 share/icons/gnome/24x24/actions/reload_page.png
 share/icons/gnome/24x24/actions/remove.png
 share/icons/gnome/24x24/actions/rightjust.png
+share/icons/gnome/24x24/actions/search.png
 share/icons/gnome/24x24/actions/start.png
 share/icons/gnome/24x24/actions/stock_add-bookmark.png
 share/icons/gnome/24x24/actions/stock_bottom.png
@@ -2637,9 +2852,12 @@ share/icons/gnome/24x24/actions/stock_leave-fullscreen.png
 share/icons/gnome/24x24/actions/stock_left.png
 share/icons/gnome/24x24/actions/stock_mail-compose.png
 share/icons/gnome/24x24/actions/stock_mail-forward.png
+share/icons/gnome/24x24/actions/stock_mail-open.png
 share/icons/gnome/24x24/actions/stock_mail-reply-to-all.png
 share/icons/gnome/24x24/actions/stock_mail-reply.png
 share/icons/gnome/24x24/actions/stock_mail-send-receive.png
+share/icons/gnome/24x24/actions/stock_mail-send.png
+share/icons/gnome/24x24/actions/stock_mail-unread.png
 share/icons/gnome/24x24/actions/stock_media-fwd.png
 share/icons/gnome/24x24/actions/stock_media-next.png
 share/icons/gnome/24x24/actions/stock_media-pause.png
@@ -2655,7 +2873,6 @@ share/icons/gnome/24x24/actions/stock_new-dir.png
 share/icons/gnome/24x24/actions/stock_new-tab.png
 share/icons/gnome/24x24/actions/stock_new-text.png
 share/icons/gnome/24x24/actions/stock_new-window.png
-share/icons/gnome/24x24/actions/stock_not-spam.png
 share/icons/gnome/24x24/actions/stock_paste.png
 share/icons/gnome/24x24/actions/stock_print-preview.png
 share/icons/gnome/24x24/actions/stock_print.png
@@ -2689,13 +2906,16 @@ share/icons/gnome/24x24/actions/stock_zoom-out.png
 share/icons/gnome/24x24/actions/stock_zoom-page.png
 share/icons/gnome/24x24/actions/stop.png
 share/icons/gnome/24x24/actions/system-lock-screen.png
+share/icons/gnome/24x24/actions/system-log-out.png
 share/icons/gnome/24x24/actions/system-run.png
+share/icons/gnome/24x24/actions/system-search.png
 share/icons/gnome/24x24/actions/tab-new.png
 share/icons/gnome/24x24/actions/tab_new.png
 share/icons/gnome/24x24/actions/text_bold.png
 share/icons/gnome/24x24/actions/text_italic.png
 share/icons/gnome/24x24/actions/text_strike.png
 share/icons/gnome/24x24/actions/text_under.png
+share/icons/gnome/24x24/actions/tools-check-spelling.png
 share/icons/gnome/24x24/actions/top.png
 share/icons/gnome/24x24/actions/undo.png
 share/icons/gnome/24x24/actions/up.png
@@ -2726,6 +2946,7 @@ share/icons/gnome/24x24/animations/process-working.png
 share/icons/gnome/24x24/apps/access.png
 share/icons/gnome/24x24/apps/accessibility-directory.png
 share/icons/gnome/24x24/apps/accessories-calculator.png
+share/icons/gnome/24x24/apps/accessories-character-map.png
 share/icons/gnome/24x24/apps/accessories-dictionary.png
 share/icons/gnome/24x24/apps/accessories-text-editor.png
 share/icons/gnome/24x24/apps/administration.png
@@ -2749,19 +2970,18 @@ share/icons/gnome/24x24/apps/gdm.png
 share/icons/gnome/24x24/apps/gnome-amusements.png
 share/icons/gnome/24x24/apps/gnome-audio.png
 share/icons/gnome/24x24/apps/gnome-calculator.png
+share/icons/gnome/24x24/apps/gnome-character-map.png
 share/icons/gnome/24x24/apps/gnome-cpu.png
 share/icons/gnome/24x24/apps/gnome-desktop-config.png
 share/icons/gnome/24x24/apps/gnome-eyes.png
 share/icons/gnome/24x24/apps/gnome-favorites.png
 share/icons/gnome/24x24/apps/gnome-finance.png
 share/icons/gnome/24x24/apps/gnome-help.png
-share/icons/gnome/24x24/apps/gnome-logout.png
 share/icons/gnome/24x24/apps/gnome-mini-commander.png
 share/icons/gnome/24x24/apps/gnome-mixer.png
 share/icons/gnome/24x24/apps/gnome-monitor.png
 share/icons/gnome/24x24/apps/gnome-networktool.png
 share/icons/gnome/24x24/apps/gnome-remote-desktop.png
-share/icons/gnome/24x24/apps/gnome-searchtool.png
 share/icons/gnome/24x24/apps/gnome-settings-accessibility-technologies.png
 share/icons/gnome/24x24/apps/gnome-settings-background.png
 share/icons/gnome/24x24/apps/gnome-settings-font.png
@@ -2775,6 +2995,7 @@ share/icons/gnome/24x24/apps/gnome-terminal.png
 share/icons/gnome/24x24/apps/gnome-unknown.png
 share/icons/gnome/24x24/apps/gnome-window-manager.png
 share/icons/gnome/24x24/apps/gtk-help.png
+share/icons/gnome/24x24/apps/gucharmap.png
 share/icons/gnome/24x24/apps/help-browser.png
 share/icons/gnome/24x24/apps/help.png
 share/icons/gnome/24x24/apps/im-aim.png
@@ -2783,8 +3004,8 @@ share/icons/gnome/24x24/apps/im-jabber.png
 share/icons/gnome/24x24/apps/im-msn.png
 share/icons/gnome/24x24/apps/im-nov.png
 share/icons/gnome/24x24/apps/im-yahoo.png
-share/icons/gnome/24x24/apps/image-viewer.png
 share/icons/gnome/24x24/apps/kcalc.png
+share/icons/gnome/24x24/apps/kcharselect.png
 share/icons/gnome/24x24/apps/kcmkwm.png
 share/icons/gnome/24x24/apps/kcmsound.png
 share/icons/gnome/24x24/apps/kedit.png
@@ -2832,9 +3053,11 @@ share/icons/gnome/24x24/apps/susehelpcenter.png
 share/icons/gnome/24x24/apps/system-config-users.png
 share/icons/gnome/24x24/apps/system-file-manager.png
 share/icons/gnome/24x24/apps/system-software-installer.png
+share/icons/gnome/24x24/apps/system-software-update.png
 share/icons/gnome/24x24/apps/system-users.png
 share/icons/gnome/24x24/apps/terminal.png
 share/icons/gnome/24x24/apps/text-editor.png
+share/icons/gnome/24x24/apps/update-manager.png
 share/icons/gnome/24x24/apps/user-info.png
 share/icons/gnome/24x24/apps/utilities-system-monitor.png
 share/icons/gnome/24x24/apps/utilities-terminal.png
@@ -2847,8 +3070,10 @@ share/icons/gnome/24x24/apps/xfce4-backdrop.png
 share/icons/gnome/24x24/apps/xfce4-mixer.png
 share/icons/gnome/24x24/apps/xfwm4.png
 share/icons/gnome/24x24/apps/xscreensaver.png
+share/icons/gnome/24x24/apps/zen-icon.png
 share/icons/gnome/24x24/categories/applications-accessories.png
 share/icons/gnome/24x24/categories/applications-development.png
+share/icons/gnome/24x24/categories/applications-engineering.png
 share/icons/gnome/24x24/categories/applications-games.png
 share/icons/gnome/24x24/categories/applications-graphics.png
 share/icons/gnome/24x24/categories/applications-internet.png
@@ -2857,6 +3082,7 @@ share/icons/gnome/24x24/categories/applications-office.png
 share/icons/gnome/24x24/categories/applications-other.png
 share/icons/gnome/24x24/categories/applications-science.png
 share/icons/gnome/24x24/categories/applications-system.png
+share/icons/gnome/24x24/categories/applications-utilities.png
 share/icons/gnome/24x24/categories/gnome-applications.png
 share/icons/gnome/24x24/categories/gnome-control-center.png
 share/icons/gnome/24x24/categories/gnome-devel.png
@@ -2868,6 +3094,7 @@ share/icons/gnome/24x24/categories/gnome-settings.png
 share/icons/gnome/24x24/categories/gnome-system.png
 share/icons/gnome/24x24/categories/gnome-util.png
 share/icons/gnome/24x24/categories/gtk-preferences.png
+share/icons/gnome/24x24/categories/input_devices_settings.png
 share/icons/gnome/24x24/categories/kcontrol.png
 share/icons/gnome/24x24/categories/package_development.png
 share/icons/gnome/24x24/categories/package_games.png
@@ -2878,7 +3105,11 @@ share/icons/gnome/24x24/categories/package_office.png
 share/icons/gnome/24x24/categories/package_settings.png
 share/icons/gnome/24x24/categories/package_system.png
 share/icons/gnome/24x24/categories/package_utilities.png
+share/icons/gnome/24x24/categories/preferences-desktop-peripherals.png
+share/icons/gnome/24x24/categories/preferences-desktop-personal.png
 share/icons/gnome/24x24/categories/preferences-desktop.png
+share/icons/gnome/24x24/categories/preferences-other.png
+share/icons/gnome/24x24/categories/preferences-system-network.png
 share/icons/gnome/24x24/categories/preferences-system.png
 share/icons/gnome/24x24/categories/redhat-accessories.png
 share/icons/gnome/24x24/categories/redhat-games.png
@@ -2891,6 +3122,7 @@ share/icons/gnome/24x24/categories/redhat-sound_video.png
 share/icons/gnome/24x24/categories/redhat-system_settings.png
 share/icons/gnome/24x24/categories/redhat-system_tools.png
 share/icons/gnome/24x24/categories/stock_internet.png
+share/icons/gnome/24x24/categories/system-help.png
 share/icons/gnome/24x24/categories/xfce-games.png
 share/icons/gnome/24x24/categories/xfce-graphics.png
 share/icons/gnome/24x24/categories/xfce-internet.png
@@ -2900,9 +3132,11 @@ share/icons/gnome/24x24/categories/xfce-system-settings.png
 share/icons/gnome/24x24/categories/xfce-utils.png
 share/icons/gnome/24x24/categories/xfce4-settings.png
 share/icons/gnome/24x24/devices/3floppy_unmount.png
+share/icons/gnome/24x24/devices/audio-card.png
 share/icons/gnome/24x24/devices/audio-input-microphone.png
 share/icons/gnome/24x24/devices/battery.png
 share/icons/gnome/24x24/devices/camera-photo.png
+share/icons/gnome/24x24/devices/camera-video.png
 share/icons/gnome/24x24/devices/camera-web.png
 share/icons/gnome/24x24/devices/camera.png
 share/icons/gnome/24x24/devices/camera_unmount.png
@@ -2946,6 +3180,7 @@ share/icons/gnome/24x24/devices/gnome-dev-removable-1394.png
 share/icons/gnome/24x24/devices/gnome-dev-removable-usb.png
 share/icons/gnome/24x24/devices/gnome-dev-removable.png
 share/icons/gnome/24x24/devices/gnome-dev-wavelan.png
+share/icons/gnome/24x24/devices/gnome-dev-zipdisk.png
 share/icons/gnome/24x24/devices/gnome-fs-client.png
 share/icons/gnome/24x24/devices/gnome-modem.png
 share/icons/gnome/24x24/devices/gnome-stock-mic.png
@@ -2954,10 +3189,12 @@ share/icons/gnome/24x24/devices/gtk-floppy.png
 share/icons/gnome/24x24/devices/gtk-harddisk.png
 share/icons/gnome/24x24/devices/harddrive.png
 share/icons/gnome/24x24/devices/hdd_unmount.png
+share/icons/gnome/24x24/devices/input-gaming.png
 share/icons/gnome/24x24/devices/input-keyboard.png
 share/icons/gnome/24x24/devices/input-mouse.png
 share/icons/gnome/24x24/devices/input-tablet.png
 share/icons/gnome/24x24/devices/ipod_mount.png
+share/icons/gnome/24x24/devices/joystick.png
 share/icons/gnome/24x24/devices/keyboard.png
 share/icons/gnome/24x24/devices/kjobviewer.png
 share/icons/gnome/24x24/devices/kxkb.png
@@ -2966,15 +3203,19 @@ share/icons/gnome/24x24/devices/media-flash.png
 share/icons/gnome/24x24/devices/media-floppy.png
 share/icons/gnome/24x24/devices/media-optical.png
 share/icons/gnome/24x24/devices/media-tape.png
+share/icons/gnome/24x24/devices/media-zip.png
 share/icons/gnome/24x24/devices/modem.png
 share/icons/gnome/24x24/devices/mouse.png
 share/icons/gnome/24x24/devices/multimedia-player.png
 share/icons/gnome/24x24/devices/network-wired.png
 share/icons/gnome/24x24/devices/network-wireless.png
+share/icons/gnome/24x24/devices/pda.png
+share/icons/gnome/24x24/devices/phone.png
 share/icons/gnome/24x24/devices/printer-remote.png
 share/icons/gnome/24x24/devices/printer.png
 share/icons/gnome/24x24/devices/printer1.png
 share/icons/gnome/24x24/devices/printmgr.png
+share/icons/gnome/24x24/devices/scanner.png
 share/icons/gnome/24x24/devices/stock_mic.png
 share/icons/gnome/24x24/devices/stock_printers.png
 share/icons/gnome/24x24/devices/system-floppy.png
@@ -2987,16 +3228,43 @@ share/icons/gnome/24x24/devices/xfce4-keyboard.png
 share/icons/gnome/24x24/devices/xfce4-mouse.png
 share/icons/gnome/24x24/devices/yast_HD.png
 share/icons/gnome/24x24/devices/yast_idetude.png
+share/icons/gnome/24x24/devices/yast_joystick.png
 share/icons/gnome/24x24/devices/yast_mouse.png
 share/icons/gnome/24x24/devices/yast_printer.png
+share/icons/gnome/24x24/devices/yast_soundcard.png
 share/icons/gnome/24x24/emblems/emblem-default.png
+share/icons/gnome/24x24/emblems/emblem-documents.png
+share/icons/gnome/24x24/emblems/emblem-downloads.png
 share/icons/gnome/24x24/emblems/emblem-favorite.png
+share/icons/gnome/24x24/emblems/emblem-generic.png
 share/icons/gnome/24x24/emblems/emblem-important.png
+share/icons/gnome/24x24/emblems/emblem-mail.png
 share/icons/gnome/24x24/emblems/emblem-new.png
 share/icons/gnome/24x24/emblems/emblem-package.png
+share/icons/gnome/24x24/emblems/emblem-photos.png
+share/icons/gnome/24x24/emblems/emblem-readonly.png
+share/icons/gnome/24x24/emblems/emblem-shared.png
 share/icons/gnome/24x24/emblems/emblem-symbolic-link.png
+share/icons/gnome/24x24/emblems/emblem-system.png
+share/icons/gnome/24x24/emblems/emblem-unreadable.png
+share/icons/gnome/24x24/emblems/emblem-urgent.png
 share/icons/gnome/24x24/emblems/emblem-web.png
 share/icons/gnome/24x24/emblems/stock_mail-priority-high.png
+share/icons/gnome/24x24/emotes/face-angel.png
+share/icons/gnome/24x24/emotes/face-cool.png
+share/icons/gnome/24x24/emotes/face-crying.png
+share/icons/gnome/24x24/emotes/face-devilish.png
+share/icons/gnome/24x24/emotes/face-embarrassed.png
+share/icons/gnome/24x24/emotes/face-kiss.png
+share/icons/gnome/24x24/emotes/face-monkey.png
+share/icons/gnome/24x24/emotes/face-plain.png
+share/icons/gnome/24x24/emotes/face-raspberry.png
+share/icons/gnome/24x24/emotes/face-sad.png
+share/icons/gnome/24x24/emotes/face-smile-big.png
+share/icons/gnome/24x24/emotes/face-smile.png
+share/icons/gnome/24x24/emotes/face-smirk.png
+share/icons/gnome/24x24/emotes/face-surprise.png
+share/icons/gnome/24x24/emotes/face-wink.png
 share/icons/gnome/24x24/filesystems/gnome-fs-bookmark-missing.png
 share/icons/gnome/24x24/filesystems/gnome-fs-bookmark.png
 share/icons/gnome/24x24/mimetypes/application-certificate.png
@@ -3196,11 +3464,15 @@ share/icons/gnome/24x24/status/audio-volume-high.png
 share/icons/gnome/24x24/status/audio-volume-low.png
 share/icons/gnome/24x24/status/audio-volume-medium.png
 share/icons/gnome/24x24/status/audio-volume-muted.png
+share/icons/gnome/24x24/status/battery-caution.png
+share/icons/gnome/24x24/status/battery-low.png
 share/icons/gnome/24x24/status/connect_creating.png
 share/icons/gnome/24x24/status/connect_established.png
 share/icons/gnome/24x24/status/connect_no.png
 share/icons/gnome/24x24/status/dialog-error.png
 share/icons/gnome/24x24/status/dialog-information.png
+share/icons/gnome/24x24/status/dialog-password.png
+share/icons/gnome/24x24/status/dialog-question.png
 share/icons/gnome/24x24/status/dialog-warning.png
 share/icons/gnome/24x24/status/edittrash.png
 share/icons/gnome/24x24/status/error.png
@@ -3224,12 +3496,20 @@ share/icons/gnome/24x24/status/gnome-netstatus-rx.png
 share/icons/gnome/24x24/status/gnome-netstatus-tx.png
 share/icons/gnome/24x24/status/gnome-netstatus-txrx.png
 share/icons/gnome/24x24/status/gnome-stock-trash-full.png
+share/icons/gnome/24x24/status/gtk-dialog-authentication.png
 share/icons/gnome/24x24/status/gtk-dialog-error.png
 share/icons/gnome/24x24/status/gtk-dialog-info.png
+share/icons/gnome/24x24/status/gtk-dialog-question.png
 share/icons/gnome/24x24/status/gtk-dialog-warning.png
+share/icons/gnome/24x24/status/gtk-missing-image.png
 share/icons/gnome/24x24/status/image-loading.png
+share/icons/gnome/24x24/status/image-missing.png
 share/icons/gnome/24x24/status/important.png
 share/icons/gnome/24x24/status/info.png
+share/icons/gnome/24x24/status/mail-attachment.png
+share/icons/gnome/24x24/status/mail-read.png
+share/icons/gnome/24x24/status/mail-replied.png
+share/icons/gnome/24x24/status/mail-unread.png
 share/icons/gnome/24x24/status/media-playlist-repeat.png
 share/icons/gnome/24x24/status/media-playlist-shuffle.png
 share/icons/gnome/24x24/status/messagebox_critical.png
@@ -3247,11 +3527,22 @@ share/icons/gnome/24x24/status/nm-device-wired.png
 share/icons/gnome/24x24/status/nm-device-wireless.png
 share/icons/gnome/24x24/status/nm-no-connection.png
 share/icons/gnome/24x24/status/printer-error.png
+share/icons/gnome/24x24/status/printer-printing.png
+share/icons/gnome/24x24/status/security-high.png
+share/icons/gnome/24x24/status/security-low.png
+share/icons/gnome/24x24/status/security-medium.png
+share/icons/gnome/24x24/status/software-update-available.png
+share/icons/gnome/24x24/status/software-update-urgent.png
 share/icons/gnome/24x24/status/stock_appointment-reminder-excl.png
 share/icons/gnome/24x24/status/stock_appointment-reminder.png
 share/icons/gnome/24x24/status/stock_dialog-error.png
 share/icons/gnome/24x24/status/stock_dialog-info.png
+share/icons/gnome/24x24/status/stock_dialog-question.png
 share/icons/gnome/24x24/status/stock_dialog-warning.png
+share/icons/gnome/24x24/status/stock_lock-broken.png
+share/icons/gnome/24x24/status/stock_lock-ok.png
+share/icons/gnome/24x24/status/stock_lock-open.png
+share/icons/gnome/24x24/status/stock_lock.png
 share/icons/gnome/24x24/status/stock_open.png
 share/icons/gnome/24x24/status/stock_repeat.png
 share/icons/gnome/24x24/status/stock_shuffle.png
@@ -3264,6 +3555,7 @@ share/icons/gnome/24x24/status/stock_volume-mute.png
 share/icons/gnome/24x24/status/stock_volume.png
 share/icons/gnome/24x24/status/stock_weather-cloudy.png
 share/icons/gnome/24x24/status/stock_weather-few-clouds.png
+share/icons/gnome/24x24/status/stock_weather-fog.png
 share/icons/gnome/24x24/status/stock_weather-night-clear.png
 share/icons/gnome/24x24/status/stock_weather-night-few-clouds.png
 share/icons/gnome/24x24/status/stock_weather-showers.png
@@ -3271,12 +3563,15 @@ share/icons/gnome/24x24/status/stock_weather-snow.png
 share/icons/gnome/24x24/status/stock_weather-storm.png
 share/icons/gnome/24x24/status/stock_weather-sunny.png
 share/icons/gnome/24x24/status/sunny.png
+share/icons/gnome/24x24/status/task-due.png
+share/icons/gnome/24x24/status/task-past-due.png
 share/icons/gnome/24x24/status/trashcan_full.png
 share/icons/gnome/24x24/status/user-trash-full.png
 share/icons/gnome/24x24/status/weather-clear-night.png
 share/icons/gnome/24x24/status/weather-clear.png
 share/icons/gnome/24x24/status/weather-few-clouds-night.png
 share/icons/gnome/24x24/status/weather-few-clouds.png
+share/icons/gnome/24x24/status/weather-fog.png
 share/icons/gnome/24x24/status/weather-overcast.png
 share/icons/gnome/24x24/status/weather-severe-alert.png
 share/icons/gnome/24x24/status/weather-showers-scattered.png
@@ -3367,7 +3662,6 @@ share/icons/gnome/24x24/stock/data/stock_sort-row-ascending.png
 share/icons/gnome/24x24/stock/data/stock_standard-filter.png
 share/icons/gnome/24x24/stock/data/stock_sum.png
 share/icons/gnome/24x24/stock/data/stock_update-data.png
-share/icons/gnome/24x24/stock/document/stock_attach.png
 share/icons/gnome/24x24/stock/document/stock_certificate.png
 share/icons/gnome/24x24/stock/document/stock_new-drawing.png
 share/icons/gnome/24x24/stock/document/stock_new-formula.png
@@ -3448,7 +3742,6 @@ share/icons/gnome/24x24/stock/generic/stock_calendar-view-month.png
 share/icons/gnome/24x24/stock/generic/stock_calendar-view-week.png
 share/icons/gnome/24x24/stock/generic/stock_calendar-view-work-week.png
 share/icons/gnome/24x24/stock/generic/stock_calendar-view-year.png
-share/icons/gnome/24x24/stock/generic/stock_cell-phone.png
 share/icons/gnome/24x24/stock/generic/stock_color.png
 share/icons/gnome/24x24/stock/generic/stock_edit.png
 share/icons/gnome/24x24/stock/generic/stock_equals.png
@@ -3663,12 +3956,9 @@ share/icons/gnome/24x24/stock/navigation/stock_previous.png
 share/icons/gnome/24x24/stock/navigation/stock_right-with-subpoints.png
 share/icons/gnome/24x24/stock/navigation/stock_undo-history.png
 share/icons/gnome/24x24/stock/navigation/stock_up-with-subpoints.png
-share/icons/gnome/24x24/stock/navigation/stock_zoom-1.png
-share/icons/gnome/24x24/stock/navigation/stock_zoom-in.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-next.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-object.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-optimal.png
-share/icons/gnome/24x24/stock/navigation/stock_zoom-out.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-page-width.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-page.png
 share/icons/gnome/24x24/stock/navigation/stock_zoom-previous.png
@@ -3908,6 +4198,9 @@ share/icons/gnome/24x24/stock/text/stock_wrap-optimal.png
 share/icons/gnome/24x24/stock/text/stock_wrap-right.png
 share/icons/gnome/32x32/actions/add.png
 share/icons/gnome/32x32/actions/address-book-new.png
+share/icons/gnome/32x32/actions/application-exit.png
+share/icons/gnome/32x32/actions/appointment-new.png
+share/icons/gnome/32x32/actions/appointment.png
 share/icons/gnome/32x32/actions/back.png
 share/icons/gnome/32x32/actions/bookmark-new.png
 share/icons/gnome/32x32/actions/bookmark_add.png
@@ -3916,37 +4209,72 @@ share/icons/gnome/32x32/actions/bottom.png
 share/icons/gnome/32x32/actions/centrejust.png
 share/icons/gnome/32x32/actions/contact-new.png
 share/icons/gnome/32x32/actions/document-new.png
+share/icons/gnome/32x32/actions/document-open-recent.png
 share/icons/gnome/32x32/actions/document-open.png
+share/icons/gnome/32x32/actions/document-page-setup.png
+share/icons/gnome/32x32/actions/document-print-preview.png
+share/icons/gnome/32x32/actions/document-print.png
 share/icons/gnome/32x32/actions/document-properties.png
 share/icons/gnome/32x32/actions/document-revert.png
 share/icons/gnome/32x32/actions/document-save-as.png
 share/icons/gnome/32x32/actions/document-save.png
+share/icons/gnome/32x32/actions/document-send.png
 share/icons/gnome/32x32/actions/down.png
+share/icons/gnome/32x32/actions/edit-clear.png
+share/icons/gnome/32x32/actions/edit-copy.png
 share/icons/gnome/32x32/actions/edit-cut.png
+share/icons/gnome/32x32/actions/edit-delete.png
+share/icons/gnome/32x32/actions/edit-find-replace.png
+share/icons/gnome/32x32/actions/edit-find.png
 share/icons/gnome/32x32/actions/edit-paste.png
 share/icons/gnome/32x32/actions/edit-redo.png
 share/icons/gnome/32x32/actions/edit-select-all.png
 share/icons/gnome/32x32/actions/edit-undo.png
+share/icons/gnome/32x32/actions/editclear.png
+share/icons/gnome/32x32/actions/editcopy.png
 share/icons/gnome/32x32/actions/editcut.png
+share/icons/gnome/32x32/actions/editdelete.png
 share/icons/gnome/32x32/actions/editpaste.png
+share/icons/gnome/32x32/actions/exit.png
+share/icons/gnome/32x32/actions/filefind.png
 share/icons/gnome/32x32/actions/filenew.png
 share/icons/gnome/32x32/actions/fileopen.png
+share/icons/gnome/32x32/actions/fileprint.png
+share/icons/gnome/32x32/actions/filequickprint.png
 share/icons/gnome/32x32/actions/filesave.png
 share/icons/gnome/32x32/actions/filesaveas.png
+share/icons/gnome/32x32/actions/find.png
 share/icons/gnome/32x32/actions/finish.png
 share/icons/gnome/32x32/actions/folder-new.png
 share/icons/gnome/32x32/actions/folder_new.png
+share/icons/gnome/32x32/actions/format-indent-less.png
+share/icons/gnome/32x32/actions/format-indent-more.png
 share/icons/gnome/32x32/actions/format-justify-center.png
 share/icons/gnome/32x32/actions/format-justify-fill.png
 share/icons/gnome/32x32/actions/format-justify-left.png
 share/icons/gnome/32x32/actions/format-justify-right.png
+share/icons/gnome/32x32/actions/format-text-bold.png
+share/icons/gnome/32x32/actions/format-text-direction-ltr.png
+share/icons/gnome/32x32/actions/format-text-direction-rtl.png
+share/icons/gnome/32x32/actions/format-text-italic.png
+share/icons/gnome/32x32/actions/format-text-strikethrough.png
+share/icons/gnome/32x32/actions/format-text-underline.png
 share/icons/gnome/32x32/actions/forward.png
 share/icons/gnome/32x32/actions/gnome-lockscreen.png
+share/icons/gnome/32x32/actions/gnome-logout.png
 share/icons/gnome/32x32/actions/gnome-run.png
+share/icons/gnome/32x32/actions/gnome-searchtool.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-fwd.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-new.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-rpl.png
+share/icons/gnome/32x32/actions/gnome-stock-mail-snd.png
+share/icons/gnome/32x32/actions/gnome-stock-text-indent.png
+share/icons/gnome/32x32/actions/gnome-stock-text-unindent.png
 share/icons/gnome/32x32/actions/go-bottom.png
 share/icons/gnome/32x32/actions/go-down.png
 share/icons/gnome/32x32/actions/go-first.png
 share/icons/gnome/32x32/actions/go-home.png
+share/icons/gnome/32x32/actions/go-jump.png
 share/icons/gnome/32x32/actions/go-last.png
 share/icons/gnome/32x32/actions/go-next.png
 share/icons/gnome/32x32/actions/go-previous.png
@@ -3954,7 +4282,14 @@ share/icons/gnome/32x32/actions/go-top.png
 share/icons/gnome/32x32/actions/go-up.png
 share/icons/gnome/32x32/actions/gohome.png
 share/icons/gnome/32x32/actions/gtk-add.png
+share/icons/gnome/32x32/actions/gtk-bold.png
+share/icons/gnome/32x32/actions/gtk-clear.png
+share/icons/gnome/32x32/actions/gtk-close.png
+share/icons/gnome/32x32/actions/gtk-copy.png
 share/icons/gnome/32x32/actions/gtk-cut.png
+share/icons/gnome/32x32/actions/gtk-delete.png
+share/icons/gnome/32x32/actions/gtk-find-and-replace.png
+share/icons/gnome/32x32/actions/gtk-find.png
 share/icons/gnome/32x32/actions/gtk-fullscreen.png
 share/icons/gnome/32x32/actions/gtk-go-back-ltr.png
 share/icons/gnome/32x32/actions/gtk-go-back-rtl.png
@@ -3969,16 +4304,36 @@ share/icons/gnome/32x32/actions/gtk-goto-last-ltr.png
 share/icons/gnome/32x32/actions/gtk-goto-last-rtl.png
 share/icons/gnome/32x32/actions/gtk-goto-top.png
 share/icons/gnome/32x32/actions/gtk-home.png
+share/icons/gnome/32x32/actions/gtk-indent.png
+share/icons/gnome/32x32/actions/gtk-italic.png
+share/icons/gnome/32x32/actions/gtk-jump-to-ltr.png
+share/icons/gnome/32x32/actions/gtk-jump-to-rtl.png
 share/icons/gnome/32x32/actions/gtk-justify-center.png
 share/icons/gnome/32x32/actions/gtk-justify-fill.png
 share/icons/gnome/32x32/actions/gtk-justify-left.png
 share/icons/gnome/32x32/actions/gtk-justify-right.png
 share/icons/gnome/32x32/actions/gtk-leave-fullscreen.png
+share/icons/gnome/32x32/actions/gtk-media-forward-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-forward-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-next-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-next-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-pause.png
+share/icons/gnome/32x32/actions/gtk-media-play-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-previous-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-previous-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-record.png
+share/icons/gnome/32x32/actions/gtk-media-rewind-ltr.png
+share/icons/gnome/32x32/actions/gtk-media-rewind-rtl.png
+share/icons/gnome/32x32/actions/gtk-media-stop.png
 share/icons/gnome/32x32/actions/gtk-new.png
 share/icons/gnome/32x32/actions/gtk-open.png
 share/icons/gnome/32x32/actions/gtk-paste.png
+share/icons/gnome/32x32/actions/gtk-print-preview.png
+share/icons/gnome/32x32/actions/gtk-print.png
 share/icons/gnome/32x32/actions/gtk-properties.png
+share/icons/gnome/32x32/actions/gtk-quit.png
 share/icons/gnome/32x32/actions/gtk-redo-ltr.png
+share/icons/gnome/32x32/actions/gtk-refresh.png
 share/icons/gnome/32x32/actions/gtk-remove.png
 share/icons/gnome/32x32/actions/gtk-save-as.png
 share/icons/gnome/32x32/actions/gtk-save.png
@@ -3986,32 +4341,82 @@ share/icons/gnome/32x32/actions/gtk-select-all.png
 share/icons/gnome/32x32/actions/gtk-sort-ascending.png
 share/icons/gnome/32x32/actions/gtk-sort-descending.png
 share/icons/gnome/32x32/actions/gtk-stop.png
+share/icons/gnome/32x32/actions/gtk-strikethrough.png
+share/icons/gnome/32x32/actions/gtk-underline.png
 share/icons/gnome/32x32/actions/gtk-undo-ltr.png
+share/icons/gnome/32x32/actions/gtk-unindent.png
 share/icons/gnome/32x32/actions/gtk-zoom-100.png
 share/icons/gnome/32x32/actions/gtk-zoom-fit.png
 share/icons/gnome/32x32/actions/gtk-zoom-in.png
 share/icons/gnome/32x32/actions/gtk-zoom-out.png
+share/icons/gnome/32x32/actions/help-about.png
+share/icons/gnome/32x32/actions/help-contents.png
 share/icons/gnome/32x32/actions/help-faq.png
+share/icons/gnome/32x32/actions/insert-image.png
+share/icons/gnome/32x32/actions/insert-link.png
+share/icons/gnome/32x32/actions/insert-object.png
+share/icons/gnome/32x32/actions/insert-text.png
+share/icons/gnome/32x32/actions/kfind.png
 share/icons/gnome/32x32/actions/kfm_home.png
 share/icons/gnome/32x32/actions/leftjust.png
 share/icons/gnome/32x32/actions/list-add.png
 share/icons/gnome/32x32/actions/list-remove.png
 share/icons/gnome/32x32/actions/lock.png
+share/icons/gnome/32x32/actions/mail-forward.png
+share/icons/gnome/32x32/actions/mail-mark-important.png
+share/icons/gnome/32x32/actions/mail-mark-read.png
+share/icons/gnome/32x32/actions/mail-mark-unread.png
+share/icons/gnome/32x32/actions/mail-message-new.png
+share/icons/gnome/32x32/actions/mail-reply-all.png
+share/icons/gnome/32x32/actions/mail-reply-sender.png
+share/icons/gnome/32x32/actions/mail-send-receive.png
+share/icons/gnome/32x32/actions/mail-send.png
+share/icons/gnome/32x32/actions/mail_forward.png
+share/icons/gnome/32x32/actions/mail_new.png
+share/icons/gnome/32x32/actions/mail_reply.png
+share/icons/gnome/32x32/actions/mail_replyall.png
+share/icons/gnome/32x32/actions/mail_send.png
 share/icons/gnome/32x32/actions/media-eject.png
+share/icons/gnome/32x32/actions/media-playback-pause.png
+share/icons/gnome/32x32/actions/media-playback-start.png
+share/icons/gnome/32x32/actions/media-playback-stop.png
+share/icons/gnome/32x32/actions/media-record.png
+share/icons/gnome/32x32/actions/media-seek-backward.png
+share/icons/gnome/32x32/actions/media-seek-forward.png
+share/icons/gnome/32x32/actions/media-skip-backward.png
+share/icons/gnome/32x32/actions/media-skip-forward.png
 share/icons/gnome/32x32/actions/next.png
+share/icons/gnome/32x32/actions/object-flip-horizontal.png
+share/icons/gnome/32x32/actions/object-flip-vertical.png
 share/icons/gnome/32x32/actions/object-rotate-left.png
 share/icons/gnome/32x32/actions/object-rotate-right.png
 share/icons/gnome/32x32/actions/player_eject.png
+share/icons/gnome/32x32/actions/player_end.png
+share/icons/gnome/32x32/actions/player_fwd.png
+share/icons/gnome/32x32/actions/player_pause.png
+share/icons/gnome/32x32/actions/player_play.png
+share/icons/gnome/32x32/actions/player_record.png
+share/icons/gnome/32x32/actions/player_rew.png
+share/icons/gnome/32x32/actions/player_start.png
+share/icons/gnome/32x32/actions/player_stop.png
 share/icons/gnome/32x32/actions/previous.png
 share/icons/gnome/32x32/actions/process-stop.png
 share/icons/gnome/32x32/actions/redhat-home.png
 share/icons/gnome/32x32/actions/redo.png
+share/icons/gnome/32x32/actions/reload.png
+share/icons/gnome/32x32/actions/reload3.png
+share/icons/gnome/32x32/actions/reload_all_tabs.png
+share/icons/gnome/32x32/actions/reload_page.png
 share/icons/gnome/32x32/actions/remove.png
 share/icons/gnome/32x32/actions/rightjust.png
+share/icons/gnome/32x32/actions/search.png
 share/icons/gnome/32x32/actions/start.png
 share/icons/gnome/32x32/actions/stock_add-bookmark.png
 share/icons/gnome/32x32/actions/stock_bottom.png
+share/icons/gnome/32x32/actions/stock_close.png
+share/icons/gnome/32x32/actions/stock_copy.png
 share/icons/gnome/32x32/actions/stock_cut.png
+share/icons/gnome/32x32/actions/stock_delete.png
 share/icons/gnome/32x32/actions/stock_down.png
 share/icons/gnome/32x32/actions/stock_file-properites.png
 share/icons/gnome/32x32/actions/stock_first.png
@@ -4021,23 +4426,51 @@ share/icons/gnome/32x32/actions/stock_home.png
 share/icons/gnome/32x32/actions/stock_last.png
 share/icons/gnome/32x32/actions/stock_leave-fullscreen.png
 share/icons/gnome/32x32/actions/stock_left.png
+share/icons/gnome/32x32/actions/stock_mail-compose.png
+share/icons/gnome/32x32/actions/stock_mail-forward.png
+share/icons/gnome/32x32/actions/stock_mail-open.png
+share/icons/gnome/32x32/actions/stock_mail-reply-to-all.png
+share/icons/gnome/32x32/actions/stock_mail-reply.png
+share/icons/gnome/32x32/actions/stock_mail-send-receive.png
+share/icons/gnome/32x32/actions/stock_mail-send.png
+share/icons/gnome/32x32/actions/stock_mail-unread.png
+share/icons/gnome/32x32/actions/stock_media-fwd.png
+share/icons/gnome/32x32/actions/stock_media-next.png
+share/icons/gnome/32x32/actions/stock_media-pause.png
+share/icons/gnome/32x32/actions/stock_media-play.png
+share/icons/gnome/32x32/actions/stock_media-prev.png
+share/icons/gnome/32x32/actions/stock_media-rec.png
+share/icons/gnome/32x32/actions/stock_media-rew.png
+share/icons/gnome/32x32/actions/stock_media-stop.png
 share/icons/gnome/32x32/actions/stock_new-address-book.png
+share/icons/gnome/32x32/actions/stock_new-appointment.png
 share/icons/gnome/32x32/actions/stock_new-bcard.png
 share/icons/gnome/32x32/actions/stock_new-dir.png
 share/icons/gnome/32x32/actions/stock_new-text.png
 share/icons/gnome/32x32/actions/stock_new-window.png
 share/icons/gnome/32x32/actions/stock_paste.png
+share/icons/gnome/32x32/actions/stock_print-preview.png
+share/icons/gnome/32x32/actions/stock_print.png
 share/icons/gnome/32x32/actions/stock_properties.png
 share/icons/gnome/32x32/actions/stock_redo.png
+share/icons/gnome/32x32/actions/stock_refresh.png
 share/icons/gnome/32x32/actions/stock_right.png
 share/icons/gnome/32x32/actions/stock_save-as.png
 share/icons/gnome/32x32/actions/stock_save.png
+share/icons/gnome/32x32/actions/stock_search-and-replace.png
+share/icons/gnome/32x32/actions/stock_search.png
 share/icons/gnome/32x32/actions/stock_select-all.png
 share/icons/gnome/32x32/actions/stock_stop.png
+share/icons/gnome/32x32/actions/stock_text-strikethrough.png
+share/icons/gnome/32x32/actions/stock_text_bold.png
 share/icons/gnome/32x32/actions/stock_text_center.png
+share/icons/gnome/32x32/actions/stock_text_indent.png
+share/icons/gnome/32x32/actions/stock_text_italic.png
 share/icons/gnome/32x32/actions/stock_text_justify.png
 share/icons/gnome/32x32/actions/stock_text_left.png
 share/icons/gnome/32x32/actions/stock_text_right.png
+share/icons/gnome/32x32/actions/stock_text_underlined.png
+share/icons/gnome/32x32/actions/stock_text_unindent.png
 share/icons/gnome/32x32/actions/stock_top.png
 share/icons/gnome/32x32/actions/stock_undo.png
 share/icons/gnome/32x32/actions/stock_up.png
@@ -4047,11 +4480,19 @@ share/icons/gnome/32x32/actions/stock_zoom-out.png
 share/icons/gnome/32x32/actions/stock_zoom-page.png
 share/icons/gnome/32x32/actions/stop.png
 share/icons/gnome/32x32/actions/system-lock-screen.png
+share/icons/gnome/32x32/actions/system-log-out.png
 share/icons/gnome/32x32/actions/system-run.png
+share/icons/gnome/32x32/actions/system-search.png
+share/icons/gnome/32x32/actions/text_bold.png
+share/icons/gnome/32x32/actions/text_italic.png
+share/icons/gnome/32x32/actions/text_strike.png
+share/icons/gnome/32x32/actions/text_under.png
+share/icons/gnome/32x32/actions/tools-check-spelling.png
 share/icons/gnome/32x32/actions/top.png
 share/icons/gnome/32x32/actions/undo.png
 share/icons/gnome/32x32/actions/up.png
 share/icons/gnome/32x32/actions/view-fullscreen.png
+share/icons/gnome/32x32/actions/view-refresh.png
 share/icons/gnome/32x32/actions/view-restore.png
 share/icons/gnome/32x32/actions/view-sort-ascending.png
 share/icons/gnome/32x32/actions/view-sort-descending.png
@@ -4059,10 +4500,12 @@ share/icons/gnome/32x32/actions/viewmag+.png
 share/icons/gnome/32x32/actions/viewmag-.png
 share/icons/gnome/32x32/actions/viewmag1.png
 share/icons/gnome/32x32/actions/viewmagfit.png
+share/icons/gnome/32x32/actions/window-close.png
 share/icons/gnome/32x32/actions/window-new.png
 share/icons/gnome/32x32/actions/window_fullscreen.png
 share/icons/gnome/32x32/actions/window_new.png
 share/icons/gnome/32x32/actions/window_nofullscreen.png
+share/icons/gnome/32x32/actions/xfce-system-exit.png
 share/icons/gnome/32x32/actions/xfce-system-lock.png
 share/icons/gnome/32x32/actions/zoom-best-fit.png
 share/icons/gnome/32x32/actions/zoom-in.png
@@ -4075,7 +4518,10 @@ share/icons/gnome/32x32/animations/process-working.png
 share/icons/gnome/32x32/apps/access.png
 share/icons/gnome/32x32/apps/accessibility-directory.png
 share/icons/gnome/32x32/apps/accessories-calculator.png
+share/icons/gnome/32x32/apps/accessories-character-map.png
+share/icons/gnome/32x32/apps/accessories-dictionary.png
 share/icons/gnome/32x32/apps/accessories-text-editor.png
+share/icons/gnome/32x32/apps/arts.png
 share/icons/gnome/32x32/apps/background.png
 share/icons/gnome/32x32/apps/calc.png
 share/icons/gnome/32x32/apps/config-language.png
@@ -4083,7 +4529,9 @@ share/icons/gnome/32x32/apps/config-users.png
 share/icons/gnome/32x32/apps/file-manager.png
 share/icons/gnome/32x32/apps/fonts.png
 share/icons/gnome/32x32/apps/gnome-calculator.png
+share/icons/gnome/32x32/apps/gnome-character-map.png
 share/icons/gnome/32x32/apps/gnome-help.png
+share/icons/gnome/32x32/apps/gnome-mixer.png
 share/icons/gnome/32x32/apps/gnome-monitor.png
 share/icons/gnome/32x32/apps/gnome-remote-desktop.png
 share/icons/gnome/32x32/apps/gnome-settings-accessibility-technologies.png
@@ -4095,10 +4543,13 @@ share/icons/gnome/32x32/apps/gnome-settings-ui-behavior.png
 share/icons/gnome/32x32/apps/gnome-terminal.png
 share/icons/gnome/32x32/apps/gnome-window-manager.png
 share/icons/gnome/32x32/apps/gtk-help.png
+share/icons/gnome/32x32/apps/gucharmap.png
 share/icons/gnome/32x32/apps/help-browser.png
 share/icons/gnome/32x32/apps/help.png
 share/icons/gnome/32x32/apps/kcalc.png
+share/icons/gnome/32x32/apps/kcharselect.png
 share/icons/gnome/32x32/apps/kcmkwm.png
+share/icons/gnome/32x32/apps/kcmsound.png
 share/icons/gnome/32x32/apps/kedit.png
 share/icons/gnome/32x32/apps/key_bindings.png
 share/icons/gnome/32x32/apps/kfm.png
@@ -4111,6 +4562,8 @@ share/icons/gnome/32x32/apps/kuser.png
 share/icons/gnome/32x32/apps/kwin.png
 share/icons/gnome/32x32/apps/locale.png
 share/icons/gnome/32x32/apps/logviewer.png
+share/icons/gnome/32x32/apps/multimedia-volume-control.png
+share/icons/gnome/32x32/apps/multimedia.png
 share/icons/gnome/32x32/apps/openterm.png
 share/icons/gnome/32x32/apps/preferences-desktop-accessibility.png
 share/icons/gnome/32x32/apps/preferences-desktop-font.png
@@ -4130,20 +4583,26 @@ share/icons/gnome/32x32/apps/susehelpcenter.png
 share/icons/gnome/32x32/apps/system-config-users.png
 share/icons/gnome/32x32/apps/system-file-manager.png
 share/icons/gnome/32x32/apps/system-software-installer.png
+share/icons/gnome/32x32/apps/system-software-update.png
 share/icons/gnome/32x32/apps/system-users.png
 share/icons/gnome/32x32/apps/terminal.png
 share/icons/gnome/32x32/apps/text-editor.png
+share/icons/gnome/32x32/apps/update-manager.png
 share/icons/gnome/32x32/apps/user-info.png
 share/icons/gnome/32x32/apps/utilities-system-monitor.png
 share/icons/gnome/32x32/apps/utilities-terminal.png
+share/icons/gnome/32x32/apps/volume-knob.png
 share/icons/gnome/32x32/apps/wallpaper.png
 share/icons/gnome/32x32/apps/xfce-filemanager.png
 share/icons/gnome/32x32/apps/xfce-terminal.png
 share/icons/gnome/32x32/apps/xfce4-backdrop.png
+share/icons/gnome/32x32/apps/xfce4-mixer.png
 share/icons/gnome/32x32/apps/xfwm4.png
 share/icons/gnome/32x32/apps/xscreensaver.png
+share/icons/gnome/32x32/apps/zen-icon.png
 share/icons/gnome/32x32/categories/applications-accessories.png
 share/icons/gnome/32x32/categories/applications-development.png
+share/icons/gnome/32x32/categories/applications-engineering.png
 share/icons/gnome/32x32/categories/applications-games.png
 share/icons/gnome/32x32/categories/applications-graphics.png
 share/icons/gnome/32x32/categories/applications-internet.png
@@ -4152,6 +4611,7 @@ share/icons/gnome/32x32/categories/applications-office.png
 share/icons/gnome/32x32/categories/applications-other.png
 share/icons/gnome/32x32/categories/applications-science.png
 share/icons/gnome/32x32/categories/applications-system.png
+share/icons/gnome/32x32/categories/applications-utilities.png
 share/icons/gnome/32x32/categories/gnome-applications.png
 share/icons/gnome/32x32/categories/gnome-control-center.png
 share/icons/gnome/32x32/categories/gnome-devel.png
@@ -4163,6 +4623,7 @@ share/icons/gnome/32x32/categories/gnome-settings.png
 share/icons/gnome/32x32/categories/gnome-system.png
 share/icons/gnome/32x32/categories/gnome-util.png
 share/icons/gnome/32x32/categories/gtk-preferences.png
+share/icons/gnome/32x32/categories/input_devices_settings.png
 share/icons/gnome/32x32/categories/kcontrol.png
 share/icons/gnome/32x32/categories/package_development.png
 share/icons/gnome/32x32/categories/package_games.png
@@ -4173,7 +4634,11 @@ share/icons/gnome/32x32/categories/package_office.png
 share/icons/gnome/32x32/categories/package_settings.png
 share/icons/gnome/32x32/categories/package_system.png
 share/icons/gnome/32x32/categories/package_utilities.png
+share/icons/gnome/32x32/categories/preferences-desktop-peripherals.png
+share/icons/gnome/32x32/categories/preferences-desktop-personal.png
 share/icons/gnome/32x32/categories/preferences-desktop.png
+share/icons/gnome/32x32/categories/preferences-other.png
+share/icons/gnome/32x32/categories/preferences-system-network.png
 share/icons/gnome/32x32/categories/preferences-system.png
 share/icons/gnome/32x32/categories/redhat-accessories.png
 share/icons/gnome/32x32/categories/redhat-games.png
@@ -4186,18 +4651,21 @@ share/icons/gnome/32x32/categories/redhat-sound_video.png
 share/icons/gnome/32x32/categories/redhat-system_settings.png
 share/icons/gnome/32x32/categories/redhat-system_tools.png
 share/icons/gnome/32x32/categories/stock_internet.png
+share/icons/gnome/32x32/categories/system-help.png
 share/icons/gnome/32x32/categories/xfce-games.png
 share/icons/gnome/32x32/categories/xfce-graphics.png
 share/icons/gnome/32x32/categories/xfce-internet.png
 share/icons/gnome/32x32/categories/xfce-multimedia.png
 share/icons/gnome/32x32/categories/xfce-office.png
-share/icons/gnome/32x32/categories/xfce4-settings.png
 share/icons/gnome/32x32/categories/xfce-system-settings.png
 share/icons/gnome/32x32/categories/xfce-utils.png
+share/icons/gnome/32x32/categories/xfce4-settings.png
 share/icons/gnome/32x32/devices/3floppy_unmount.png
+share/icons/gnome/32x32/devices/audio-card.png
 share/icons/gnome/32x32/devices/audio-input-microphone.png
 share/icons/gnome/32x32/devices/battery.png
 share/icons/gnome/32x32/devices/camera-photo.png
+share/icons/gnome/32x32/devices/camera-video.png
 share/icons/gnome/32x32/devices/camera-web.png
 share/icons/gnome/32x32/devices/camera.png
 share/icons/gnome/32x32/devices/camera_unmount.png
@@ -4223,6 +4691,7 @@ share/icons/gnome/32x32/devices/gnome-dev-disc-dvdram.png
 share/icons/gnome/32x32/devices/gnome-dev-disc-dvdrom.png
 share/icons/gnome/32x32/devices/gnome-dev-disc-dvdrw.png
 share/icons/gnome/32x32/devices/gnome-dev-dvd.png
+share/icons/gnome/32x32/devices/gnome-dev-ethernet.png
 share/icons/gnome/32x32/devices/gnome-dev-floppy.png
 share/icons/gnome/32x32/devices/gnome-dev-harddisk-1394.png
 share/icons/gnome/32x32/devices/gnome-dev-harddisk-usb.png
@@ -4239,6 +4708,8 @@ share/icons/gnome/32x32/devices/gnome-dev-printer.png
 share/icons/gnome/32x32/devices/gnome-dev-removable-1394.png
 share/icons/gnome/32x32/devices/gnome-dev-removable-usb.png
 share/icons/gnome/32x32/devices/gnome-dev-removable.png
+share/icons/gnome/32x32/devices/gnome-dev-wavelan.png
+share/icons/gnome/32x32/devices/gnome-dev-zipdisk.png
 share/icons/gnome/32x32/devices/gnome-fs-client.png
 share/icons/gnome/32x32/devices/gnome-modem.png
 share/icons/gnome/32x32/devices/gnome-stock-mic.png
@@ -4247,10 +4718,12 @@ share/icons/gnome/32x32/devices/gtk-floppy.png
 share/icons/gnome/32x32/devices/gtk-harddisk.png
 share/icons/gnome/32x32/devices/harddrive.png
 share/icons/gnome/32x32/devices/hdd_unmount.png
+share/icons/gnome/32x32/devices/input-gaming.png
 share/icons/gnome/32x32/devices/input-keyboard.png
 share/icons/gnome/32x32/devices/input-mouse.png
 share/icons/gnome/32x32/devices/input-tablet.png
 share/icons/gnome/32x32/devices/ipod_mount.png
+share/icons/gnome/32x32/devices/joystick.png
 share/icons/gnome/32x32/devices/keyboard.png
 share/icons/gnome/32x32/devices/kjobviewer.png
 share/icons/gnome/32x32/devices/kxkb.png
@@ -4259,13 +4732,19 @@ share/icons/gnome/32x32/devices/media-flash.png
 share/icons/gnome/32x32/devices/media-floppy.png
 share/icons/gnome/32x32/devices/media-optical.png
 share/icons/gnome/32x32/devices/media-tape.png
+share/icons/gnome/32x32/devices/media-zip.png
 share/icons/gnome/32x32/devices/modem.png
 share/icons/gnome/32x32/devices/mouse.png
 share/icons/gnome/32x32/devices/multimedia-player.png
+share/icons/gnome/32x32/devices/network-wired.png
+share/icons/gnome/32x32/devices/network-wireless.png
+share/icons/gnome/32x32/devices/pda.png
+share/icons/gnome/32x32/devices/phone.png
 share/icons/gnome/32x32/devices/printer-remote.png
 share/icons/gnome/32x32/devices/printer.png
 share/icons/gnome/32x32/devices/printer1.png
 share/icons/gnome/32x32/devices/printmgr.png
+share/icons/gnome/32x32/devices/scanner.png
 share/icons/gnome/32x32/devices/stock_mic.png
 share/icons/gnome/32x32/devices/stock_printers.png
 share/icons/gnome/32x32/devices/system-floppy.png
@@ -4278,16 +4757,43 @@ share/icons/gnome/32x32/devices/xfce4-keyboard.png
 share/icons/gnome/32x32/devices/xfce4-mouse.png
 share/icons/gnome/32x32/devices/yast_HD.png
 share/icons/gnome/32x32/devices/yast_idetude.png
+share/icons/gnome/32x32/devices/yast_joystick.png
 share/icons/gnome/32x32/devices/yast_mouse.png
 share/icons/gnome/32x32/devices/yast_printer.png
+share/icons/gnome/32x32/devices/yast_soundcard.png
 share/icons/gnome/32x32/emblems/emblem-default.png
+share/icons/gnome/32x32/emblems/emblem-documents.png
+share/icons/gnome/32x32/emblems/emblem-downloads.png
 share/icons/gnome/32x32/emblems/emblem-favorite.png
+share/icons/gnome/32x32/emblems/emblem-generic.png
 share/icons/gnome/32x32/emblems/emblem-important.png
+share/icons/gnome/32x32/emblems/emblem-mail.png
 share/icons/gnome/32x32/emblems/emblem-new.png
 share/icons/gnome/32x32/emblems/emblem-package.png
+share/icons/gnome/32x32/emblems/emblem-photos.png
+share/icons/gnome/32x32/emblems/emblem-readonly.png
+share/icons/gnome/32x32/emblems/emblem-shared.png
 share/icons/gnome/32x32/emblems/emblem-symbolic-link.png
+share/icons/gnome/32x32/emblems/emblem-system.png
+share/icons/gnome/32x32/emblems/emblem-unreadable.png
+share/icons/gnome/32x32/emblems/emblem-urgent.png
 share/icons/gnome/32x32/emblems/emblem-web.png
 share/icons/gnome/32x32/emblems/stock_mail-priority-high.png
+share/icons/gnome/32x32/emotes/face-angel.png
+share/icons/gnome/32x32/emotes/face-cool.png
+share/icons/gnome/32x32/emotes/face-crying.png
+share/icons/gnome/32x32/emotes/face-devilish.png
+share/icons/gnome/32x32/emotes/face-embarrassed.png
+share/icons/gnome/32x32/emotes/face-kiss.png
+share/icons/gnome/32x32/emotes/face-monkey.png
+share/icons/gnome/32x32/emotes/face-plain.png
+share/icons/gnome/32x32/emotes/face-raspberry.png
+share/icons/gnome/32x32/emotes/face-sad.png
+share/icons/gnome/32x32/emotes/face-smile-big.png
+share/icons/gnome/32x32/emotes/face-smile.png
+share/icons/gnome/32x32/emotes/face-smirk.png
+share/icons/gnome/32x32/emotes/face-surprise.png
+share/icons/gnome/32x32/emotes/face-wink.png
 share/icons/gnome/32x32/mimetypes/application-certificate.png
 share/icons/gnome/32x32/mimetypes/application-x-executable.png
 share/icons/gnome/32x32/mimetypes/ascii.png
@@ -4442,9 +4948,11 @@ share/icons/gnome/32x32/places/distributor-logo.png
 share/icons/gnome/32x32/places/emptytrash.png
 share/icons/gnome/32x32/places/folder-remote.png
 share/icons/gnome/32x32/places/folder-saved-search.png
+share/icons/gnome/32x32/places/folder.icon
 share/icons/gnome/32x32/places/folder.png
 share/icons/gnome/32x32/places/folder_home.png
 share/icons/gnome/32x32/places/gnome-fs-desktop.png
+share/icons/gnome/32x32/places/gnome-fs-directory.icon
 share/icons/gnome/32x32/places/gnome-fs-directory.png
 share/icons/gnome/32x32/places/gnome-fs-ftp.png
 share/icons/gnome/32x32/places/gnome-fs-home.png
@@ -4470,17 +4978,28 @@ share/icons/gnome/32x32/places/novell-button.png
 share/icons/gnome/32x32/places/redhat-network-server.png
 share/icons/gnome/32x32/places/server.png
 share/icons/gnome/32x32/places/start-here.png
+share/icons/gnome/32x32/places/stock_folder.icon
 share/icons/gnome/32x32/places/stock_folder.png
 share/icons/gnome/32x32/places/trashcan_empty.png
 share/icons/gnome/32x32/places/user-desktop.png
 share/icons/gnome/32x32/places/user-home.png
 share/icons/gnome/32x32/places/user-trash.png
 share/icons/gnome/32x32/places/xfce-trash_empty.png
+share/icons/gnome/32x32/status/appointment-missed.png
+share/icons/gnome/32x32/status/appointment-soon.png
+share/icons/gnome/32x32/status/audio-volume-high.png
+share/icons/gnome/32x32/status/audio-volume-low.png
+share/icons/gnome/32x32/status/audio-volume-medium.png
+share/icons/gnome/32x32/status/audio-volume-muted.png
+share/icons/gnome/32x32/status/battery-caution.png
+share/icons/gnome/32x32/status/battery-low.png
 share/icons/gnome/32x32/status/connect_creating.png
 share/icons/gnome/32x32/status/connect_established.png
 share/icons/gnome/32x32/status/connect_no.png
 share/icons/gnome/32x32/status/dialog-error.png
 share/icons/gnome/32x32/status/dialog-information.png
+share/icons/gnome/32x32/status/dialog-password.png
+share/icons/gnome/32x32/status/dialog-question.png
 share/icons/gnome/32x32/status/dialog-warning.png
 share/icons/gnome/32x32/status/edittrash.png
 share/icons/gnome/32x32/status/error.png
@@ -4499,13 +5018,22 @@ share/icons/gnome/32x32/status/gnome-netstatus-rx.png
 share/icons/gnome/32x32/status/gnome-netstatus-tx.png
 share/icons/gnome/32x32/status/gnome-netstatus-txrx.png
 share/icons/gnome/32x32/status/gnome-stock-trash-full.png
+share/icons/gnome/32x32/status/gtk-dialog-authentication.png
 share/icons/gnome/32x32/status/gtk-dialog-error.png
 share/icons/gnome/32x32/status/gtk-dialog-info.png
+share/icons/gnome/32x32/status/gtk-dialog-question.png
 share/icons/gnome/32x32/status/gtk-dialog-warning.png
+share/icons/gnome/32x32/status/gtk-missing-image.png
 share/icons/gnome/32x32/status/image-loading.png
+share/icons/gnome/32x32/status/image-missing.png
 share/icons/gnome/32x32/status/important.png
 share/icons/gnome/32x32/status/info.png
 share/icons/gnome/32x32/status/mail-attachment.png
+share/icons/gnome/32x32/status/mail-read.png
+share/icons/gnome/32x32/status/mail-replied.png
+share/icons/gnome/32x32/status/mail-unread.png
+share/icons/gnome/32x32/status/media-playlist-repeat.png
+share/icons/gnome/32x32/status/media-playlist-shuffle.png
 share/icons/gnome/32x32/status/messagebox_critical.png
 share/icons/gnome/32x32/status/messagebox_info.png
 share/icons/gnome/32x32/status/messagebox_warning.png
@@ -4520,13 +5048,35 @@ share/icons/gnome/32x32/status/nm-device-wired.png
 share/icons/gnome/32x32/status/nm-device-wireless.png
 share/icons/gnome/32x32/status/nm-no-connection.png
 share/icons/gnome/32x32/status/printer-error.png
+share/icons/gnome/32x32/status/printer-printing.png
+share/icons/gnome/32x32/status/security-high.png
+share/icons/gnome/32x32/status/security-low.png
+share/icons/gnome/32x32/status/security-medium.png
+share/icons/gnome/32x32/status/software-update-available.png
+share/icons/gnome/32x32/status/software-update-urgent.png
+share/icons/gnome/32x32/status/stock_appointment-reminder-excl.png
+share/icons/gnome/32x32/status/stock_appointment-reminder.png
 share/icons/gnome/32x32/status/stock_dialog-error.png
 share/icons/gnome/32x32/status/stock_dialog-info.png
+share/icons/gnome/32x32/status/stock_dialog-question.png
 share/icons/gnome/32x32/status/stock_dialog-warning.png
+share/icons/gnome/32x32/status/stock_lock-broken.png
+share/icons/gnome/32x32/status/stock_lock-ok.png
+share/icons/gnome/32x32/status/stock_lock-open.png
+share/icons/gnome/32x32/status/stock_lock.png
 share/icons/gnome/32x32/status/stock_open.png
+share/icons/gnome/32x32/status/stock_repeat.png
+share/icons/gnome/32x32/status/stock_shuffle.png
 share/icons/gnome/32x32/status/stock_trash_full.png
+share/icons/gnome/32x32/status/stock_volume-0.png
+share/icons/gnome/32x32/status/stock_volume-max.png
+share/icons/gnome/32x32/status/stock_volume-med.png
+share/icons/gnome/32x32/status/stock_volume-min.png
+share/icons/gnome/32x32/status/stock_volume-mute.png
+share/icons/gnome/32x32/status/stock_volume.png
 share/icons/gnome/32x32/status/stock_weather-cloudy.png
 share/icons/gnome/32x32/status/stock_weather-few-clouds.png
+share/icons/gnome/32x32/status/stock_weather-fog.png
 share/icons/gnome/32x32/status/stock_weather-night-clear.png
 share/icons/gnome/32x32/status/stock_weather-night-few-clouds.png
 share/icons/gnome/32x32/status/stock_weather-showers.png
@@ -4534,12 +5084,15 @@ share/icons/gnome/32x32/status/stock_weather-snow.png
 share/icons/gnome/32x32/status/stock_weather-storm.png
 share/icons/gnome/32x32/status/stock_weather-sunny.png
 share/icons/gnome/32x32/status/sunny.png
+share/icons/gnome/32x32/status/task-due.png
+share/icons/gnome/32x32/status/task-past-due.png
 share/icons/gnome/32x32/status/trashcan_full.png
 share/icons/gnome/32x32/status/user-trash-full.png
 share/icons/gnome/32x32/status/weather-clear-night.png
 share/icons/gnome/32x32/status/weather-clear.png
 share/icons/gnome/32x32/status/weather-few-clouds-night.png
 share/icons/gnome/32x32/status/weather-few-clouds.png
+share/icons/gnome/32x32/status/weather-fog.png
 share/icons/gnome/32x32/status/weather-overcast.png
 share/icons/gnome/32x32/status/weather-severe-alert.png
 share/icons/gnome/32x32/status/weather-showers-scattered.png
@@ -4582,12 +5135,10 @@ share/icons/gnome/48x48/apps/gnome-desktop-config.png
 share/icons/gnome/48x48/apps/gnome-favorites.png
 share/icons/gnome/48x48/apps/gnome-finance.png
 share/icons/gnome/48x48/apps/gnome-grecord.png
-share/icons/gnome/48x48/apps/gnome-logout.png
 share/icons/gnome/48x48/apps/gnome-networktool.png
 share/icons/gnome/48x48/apps/gnome-pdf.png
 share/icons/gnome/48x48/apps/gnome-searchtool-animation-rest.png
 share/icons/gnome/48x48/apps/gnome-searchtool-animation.png
-share/icons/gnome/48x48/apps/gnome-searchtool.png
 share/icons/gnome/48x48/apps/gnome-server-config.png
 share/icons/gnome/48x48/apps/gnome-settings-accessibility-keyboard.png
 share/icons/gnome/48x48/apps/gnome-settings-default-applications.png
@@ -4597,7 +5148,6 @@ share/icons/gnome/48x48/apps/gnome-unknown.png
 share/icons/gnome/48x48/apps/hint.png
 share/icons/gnome/48x48/apps/hwbrowser.png
 share/icons/gnome/48x48/apps/im.png
-share/icons/gnome/48x48/apps/image-viewer.png
 share/icons/gnome/48x48/apps/launcher-program.png
 share/icons/gnome/48x48/apps/network-config.png
 share/icons/gnome/48x48/apps/palm-pilot-sync.png
@@ -4607,9 +5157,7 @@ share/icons/gnome/48x48/apps/serviceconf.png
 share/icons/gnome/48x48/apps/stock-ticker.png
 share/icons/gnome/48x48/apps/visor.png
 share/icons/gnome/48x48/devices/gnome-dev-jazdisk.png
-share/icons/gnome/48x48/devices/gnome-dev-zipdisk.png
 share/icons/gnome/48x48/devices/media-jaz.png
-share/icons/gnome/48x48/devices/media-zip.png
 share/icons/gnome/48x48/emblems/emblem-OK.icon
 share/icons/gnome/48x48/emblems/emblem-OK.png
 share/icons/gnome/48x48/emblems/emblem-art.icon
@@ -4620,20 +5168,12 @@ share/icons/gnome/48x48/emblems/emblem-certified.icon
 share/icons/gnome/48x48/emblems/emblem-certified.png
 share/icons/gnome/48x48/emblems/emblem-cool.icon
 share/icons/gnome/48x48/emblems/emblem-cool.png
-share/icons/gnome/48x48/emblems/emblem-cvs-controlled.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-controlled.png
-share/icons/gnome/48x48/emblems/emblem-cvs-modified.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-modified.png
-share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.icon
-share/icons/gnome/48x48/emblems/emblem-cvs-sticky-tag.png
 share/icons/gnome/48x48/emblems/emblem-danger.icon
 share/icons/gnome/48x48/emblems/emblem-danger.png
 share/icons/gnome/48x48/emblems/emblem-desktop.icon
 share/icons/gnome/48x48/emblems/emblem-desktop.png
 share/icons/gnome/48x48/emblems/emblem-distinguished.icon
 share/icons/gnome/48x48/emblems/emblem-distinguished.png
-share/icons/gnome/48x48/emblems/emblem-documents.icon
-share/icons/gnome/48x48/emblems/emblem-documents.png
 share/icons/gnome/48x48/emblems/emblem-draft.icon
 share/icons/gnome/48x48/emblems/emblem-draft.png
 share/icons/gnome/48x48/emblems/emblem-handshake.icon
@@ -4644,12 +5184,8 @@ share/icons/gnome/48x48/emblems/emblem-money.icon
 share/icons/gnome/48x48/emblems/emblem-money.png
 share/icons/gnome/48x48/emblems/emblem-multimedia.icon
 share/icons/gnome/48x48/emblems/emblem-multimedia.png
-share/icons/gnome/48x48/emblems/emblem-noread.icon
-share/icons/gnome/48x48/emblems/emblem-noread.png
 share/icons/gnome/48x48/emblems/emblem-note.icon
 share/icons/gnome/48x48/emblems/emblem-note.png
-share/icons/gnome/48x48/emblems/emblem-nowrite.icon
-share/icons/gnome/48x48/emblems/emblem-nowrite.png
 share/icons/gnome/48x48/emblems/emblem-ohno.icon
 share/icons/gnome/48x48/emblems/emblem-ohno.png
 share/icons/gnome/48x48/emblems/emblem-people.icon
@@ -4664,8 +5200,6 @@ share/icons/gnome/48x48/emblems/emblem-presentation.icon
 share/icons/gnome/48x48/emblems/emblem-presentation.png
 share/icons/gnome/48x48/emblems/emblem-sales.icon
 share/icons/gnome/48x48/emblems/emblem-sales.png
-share/icons/gnome/48x48/emblems/emblem-shared.icon
-share/icons/gnome/48x48/emblems/emblem-shared.png
 share/icons/gnome/48x48/emblems/emblem-sound.icon
 share/icons/gnome/48x48/emblems/emblem-sound.png
 share/icons/gnome/48x48/emblems/emblem-trash.icon
@@ -4696,7 +5230,6 @@ share/icons/gnome/48x48/stock/generic/stock_autocompletion.png
 share/icons/gnome/48x48/stock/generic/stock_autopilot.png
 share/icons/gnome/48x48/stock/generic/stock_briefcase.png
 share/icons/gnome/48x48/stock/generic/stock_calendar-and-tasks.png
-share/icons/gnome/48x48/stock/generic/stock_cell-phone.png
 share/icons/gnome/48x48/stock/generic/stock_creditcard.png
 share/icons/gnome/48x48/stock/generic/stock_edit.png
 share/icons/gnome/48x48/stock/generic/stock_example.png
@@ -4745,7 +5278,6 @@ share/icons/gnome/48x48/stock/net/stock_mail-replied.png
 share/icons/gnome/48x48/stock/net/stock_mail-send-receive.png
 share/icons/gnome/48x48/stock/net/stock_mail-send.png
 share/icons/gnome/48x48/stock/net/stock_mail.png
-share/icons/gnome/48x48/stock/net/stock_not-spam.png
 share/icons/gnome/48x48/stock/net/stock_outbox.png
 share/icons/gnome/48x48/stock/net/stock_post-message.png
 share/icons/gnome/48x48/stock/net/stock_proxy.png
@@ -4753,10 +5285,15 @@ share/icons/gnome/48x48/stock/net/stock_sent-mail.png
 share/icons/gnome/48x48/stock/net/stock_spam.png
 share/icons/gnome/8x8/emblems/emblem-default.png
 share/icons/gnome/8x8/emblems/emblem-new.png
+share/icons/gnome/8x8/emblems/emblem-readonly.png
 share/icons/gnome/8x8/emblems/emblem-symbolic-link.png
+share/icons/gnome/8x8/emblems/emblem-unreadable.png
 share/icons/gnome/index.theme
 share/icons/gnome/scalable/actions/add.svg
 share/icons/gnome/scalable/actions/address-book-new.svg
+share/icons/gnome/scalable/actions/application-exit.svg
+share/icons/gnome/scalable/actions/appointment-new.svg
+share/icons/gnome/scalable/actions/appointment.svg
 share/icons/gnome/scalable/actions/back.svg
 share/icons/gnome/scalable/actions/bookmark-new.svg
 share/icons/gnome/scalable/actions/bookmark_add.svg
@@ -4765,14 +5302,19 @@ share/icons/gnome/scalable/actions/bottom.svg
 share/icons/gnome/scalable/actions/centrejust.svg
 share/icons/gnome/scalable/actions/contact-new.svg
 share/icons/gnome/scalable/actions/document-new.svg
+share/icons/gnome/scalable/actions/document-open-recent.svg
 share/icons/gnome/scalable/actions/document-open.svg
+share/icons/gnome/scalable/actions/document-page-setup.svg
 share/icons/gnome/scalable/actions/document-print-preview.svg
 share/icons/gnome/scalable/actions/document-print.svg
 share/icons/gnome/scalable/actions/document-properties.svg
 share/icons/gnome/scalable/actions/document-revert.svg
 share/icons/gnome/scalable/actions/document-save-as.svg
 share/icons/gnome/scalable/actions/document-save.svg
+share/icons/gnome/scalable/actions/document-send.svg
 share/icons/gnome/scalable/actions/down.svg
+share/icons/gnome/scalable/actions/edit-clear.svg
+share/icons/gnome/scalable/actions/edit-copy.svg
 share/icons/gnome/scalable/actions/edit-cut.svg
 share/icons/gnome/scalable/actions/edit-delete.svg
 share/icons/gnome/scalable/actions/edit-find-replace.svg
@@ -4781,9 +5323,12 @@ share/icons/gnome/scalable/actions/edit-paste.svg
 share/icons/gnome/scalable/actions/edit-redo.svg
 share/icons/gnome/scalable/actions/edit-select-all.svg
 share/icons/gnome/scalable/actions/edit-undo.svg
+share/icons/gnome/scalable/actions/editclear.svg
+share/icons/gnome/scalable/actions/editcopy.svg
 share/icons/gnome/scalable/actions/editcut.svg
-share/icons/gnome/scalable/actions/editpaste.svg
 share/icons/gnome/scalable/actions/editdelete.svg
+share/icons/gnome/scalable/actions/editpaste.svg
+share/icons/gnome/scalable/actions/exit.svg
 share/icons/gnome/scalable/actions/filefind.svg
 share/icons/gnome/scalable/actions/filenew.svg
 share/icons/gnome/scalable/actions/fileopen.svg
@@ -4795,17 +5340,34 @@ share/icons/gnome/scalable/actions/find.svg
 share/icons/gnome/scalable/actions/finish.svg
 share/icons/gnome/scalable/actions/folder-new.svg
 share/icons/gnome/scalable/actions/folder_new.svg
+share/icons/gnome/scalable/actions/format-indent-less.svg
+share/icons/gnome/scalable/actions/format-indent-more.svg
 share/icons/gnome/scalable/actions/format-justify-center.svg
 share/icons/gnome/scalable/actions/format-justify-fill.svg
 share/icons/gnome/scalable/actions/format-justify-left.svg
 share/icons/gnome/scalable/actions/format-justify-right.svg
+share/icons/gnome/scalable/actions/format-text-bold.svg
+share/icons/gnome/scalable/actions/format-text-direction-ltr.svg
+share/icons/gnome/scalable/actions/format-text-direction-rtl.svg
+share/icons/gnome/scalable/actions/format-text-italic.svg
+share/icons/gnome/scalable/actions/format-text-strikethrough.svg
+share/icons/gnome/scalable/actions/format-text-underline.svg
 share/icons/gnome/scalable/actions/forward.svg
 share/icons/gnome/scalable/actions/gnome-lockscreen.svg
+share/icons/gnome/scalable/actions/gnome-logout.svg
 share/icons/gnome/scalable/actions/gnome-run.svg
+share/icons/gnome/scalable/actions/gnome-searchtool.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-fwd.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-new.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-rpl.svg
+share/icons/gnome/scalable/actions/gnome-stock-mail-snd.svg
+share/icons/gnome/scalable/actions/gnome-stock-text-indent.svg
+share/icons/gnome/scalable/actions/gnome-stock-text-unindent.svg
 share/icons/gnome/scalable/actions/go-bottom.svg
 share/icons/gnome/scalable/actions/go-down.svg
 share/icons/gnome/scalable/actions/go-first.svg
 share/icons/gnome/scalable/actions/go-home.svg
+share/icons/gnome/scalable/actions/go-jump.svg
 share/icons/gnome/scalable/actions/go-last.svg
 share/icons/gnome/scalable/actions/go-next.svg
 share/icons/gnome/scalable/actions/go-previous.svg
@@ -4813,6 +5375,10 @@ share/icons/gnome/scalable/actions/go-top.svg
 share/icons/gnome/scalable/actions/go-up.svg
 share/icons/gnome/scalable/actions/gohome.svg
 share/icons/gnome/scalable/actions/gtk-add.svg
+share/icons/gnome/scalable/actions/gtk-bold.svg
+share/icons/gnome/scalable/actions/gtk-clear.svg
+share/icons/gnome/scalable/actions/gtk-close.svg
+share/icons/gnome/scalable/actions/gtk-copy.svg
 share/icons/gnome/scalable/actions/gtk-cut.svg
 share/icons/gnome/scalable/actions/gtk-delete.svg
 share/icons/gnome/scalable/actions/gtk-find-and-replace.svg
@@ -4831,18 +5397,36 @@ share/icons/gnome/scalable/actions/gtk-goto-last-ltr.svg
 share/icons/gnome/scalable/actions/gtk-goto-last-rtl.svg
 share/icons/gnome/scalable/actions/gtk-goto-top.svg
 share/icons/gnome/scalable/actions/gtk-home.svg
+share/icons/gnome/scalable/actions/gtk-indent.svg
+share/icons/gnome/scalable/actions/gtk-italic.svg
+share/icons/gnome/scalable/actions/gtk-jump-to-ltr.svg
+share/icons/gnome/scalable/actions/gtk-jump-to-rtl.svg
 share/icons/gnome/scalable/actions/gtk-justify-center.svg
 share/icons/gnome/scalable/actions/gtk-justify-fill.svg
 share/icons/gnome/scalable/actions/gtk-justify-left.svg
 share/icons/gnome/scalable/actions/gtk-justify-right.svg
 share/icons/gnome/scalable/actions/gtk-leave-fullscreen.svg
+share/icons/gnome/scalable/actions/gtk-media-forward-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-forward-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-next-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-next-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-pause.svg
+share/icons/gnome/scalable/actions/gtk-media-play-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-previous-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-previous-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-record.svg
+share/icons/gnome/scalable/actions/gtk-media-rewind-ltr.svg
+share/icons/gnome/scalable/actions/gtk-media-rewind-rtl.svg
+share/icons/gnome/scalable/actions/gtk-media-stop.svg
 share/icons/gnome/scalable/actions/gtk-new.svg
 share/icons/gnome/scalable/actions/gtk-open.svg
 share/icons/gnome/scalable/actions/gtk-paste.svg
 share/icons/gnome/scalable/actions/gtk-print-preview.svg
 share/icons/gnome/scalable/actions/gtk-print.svg
 share/icons/gnome/scalable/actions/gtk-properties.svg
+share/icons/gnome/scalable/actions/gtk-quit.svg
 share/icons/gnome/scalable/actions/gtk-redo-ltr.svg
+share/icons/gnome/scalable/actions/gtk-refresh.svg
 share/icons/gnome/scalable/actions/gtk-remove.svg
 share/icons/gnome/scalable/actions/gtk-save-as.svg
 share/icons/gnome/scalable/actions/gtk-save.svg
@@ -4850,36 +5434,80 @@ share/icons/gnome/scalable/actions/gtk-select-all.svg
 share/icons/gnome/scalable/actions/gtk-sort-ascending.svg
 share/icons/gnome/scalable/actions/gtk-sort-descending.svg
 share/icons/gnome/scalable/actions/gtk-stop.svg
+share/icons/gnome/scalable/actions/gtk-strikethrough.svg
+share/icons/gnome/scalable/actions/gtk-underline.svg
 share/icons/gnome/scalable/actions/gtk-undo-ltr.svg
+share/icons/gnome/scalable/actions/gtk-unindent.svg
 share/icons/gnome/scalable/actions/gtk-zoom-100.svg
 share/icons/gnome/scalable/actions/gtk-zoom-fit.svg
 share/icons/gnome/scalable/actions/gtk-zoom-in.svg
 share/icons/gnome/scalable/actions/gtk-zoom-out.svg
+share/icons/gnome/scalable/actions/help-about.svg
+share/icons/gnome/scalable/actions/help-contents.svg
 share/icons/gnome/scalable/actions/help-faq.svg
 share/icons/gnome/scalable/actions/insert-image.svg
 share/icons/gnome/scalable/actions/insert-link.svg
+share/icons/gnome/scalable/actions/insert-object.svg
 share/icons/gnome/scalable/actions/insert-text.svg
+share/icons/gnome/scalable/actions/kfind.svg
 share/icons/gnome/scalable/actions/kfm_home.svg
 share/icons/gnome/scalable/actions/leftjust.svg
 share/icons/gnome/scalable/actions/list-add.svg
 share/icons/gnome/scalable/actions/list-remove.svg
 share/icons/gnome/scalable/actions/lock.svg
+share/icons/gnome/scalable/actions/mail-forward.svg
+share/icons/gnome/scalable/actions/mail-mark-important.svg
+share/icons/gnome/scalable/actions/mail-mark-read.svg
+share/icons/gnome/scalable/actions/mail-mark-unread.svg
+share/icons/gnome/scalable/actions/mail-message-new.svg
+share/icons/gnome/scalable/actions/mail-reply-all.svg
+share/icons/gnome/scalable/actions/mail-reply-sender.svg
+share/icons/gnome/scalable/actions/mail-send-receive.svg
+share/icons/gnome/scalable/actions/mail-send.svg
+share/icons/gnome/scalable/actions/mail_forward.svg
+share/icons/gnome/scalable/actions/mail_new.svg
+share/icons/gnome/scalable/actions/mail_reply.svg
+share/icons/gnome/scalable/actions/mail_replyall.svg
+share/icons/gnome/scalable/actions/mail_send.svg
 share/icons/gnome/scalable/actions/media-eject.svg
+share/icons/gnome/scalable/actions/media-playback-pause.svg
+share/icons/gnome/scalable/actions/media-playback-start.svg
+share/icons/gnome/scalable/actions/media-playback-stop.svg
+share/icons/gnome/scalable/actions/media-record.svg
+share/icons/gnome/scalable/actions/media-seek-backward.svg
+share/icons/gnome/scalable/actions/media-seek-forward.svg
+share/icons/gnome/scalable/actions/media-skip-backward.svg
+share/icons/gnome/scalable/actions/media-skip-forward.svg
 share/icons/gnome/scalable/actions/next.svg
 share/icons/gnome/scalable/actions/object-flip-horizontal.svg
 share/icons/gnome/scalable/actions/object-flip-vertical.svg
 share/icons/gnome/scalable/actions/object-rotate-left.svg
 share/icons/gnome/scalable/actions/object-rotate-right.svg
 share/icons/gnome/scalable/actions/player_eject.svg
+share/icons/gnome/scalable/actions/player_end.svg
+share/icons/gnome/scalable/actions/player_fwd.svg
+share/icons/gnome/scalable/actions/player_pause.svg
+share/icons/gnome/scalable/actions/player_play.svg
+share/icons/gnome/scalable/actions/player_record.svg
+share/icons/gnome/scalable/actions/player_rew.svg
+share/icons/gnome/scalable/actions/player_start.svg
+share/icons/gnome/scalable/actions/player_stop.svg
 share/icons/gnome/scalable/actions/previous.svg
 share/icons/gnome/scalable/actions/process-stop.svg
 share/icons/gnome/scalable/actions/redhat-home.svg
 share/icons/gnome/scalable/actions/redo.svg
+share/icons/gnome/scalable/actions/reload.svg
+share/icons/gnome/scalable/actions/reload3.svg
+share/icons/gnome/scalable/actions/reload_all_tabs.svg
+share/icons/gnome/scalable/actions/reload_page.svg
 share/icons/gnome/scalable/actions/remove.svg
 share/icons/gnome/scalable/actions/rightjust.svg
+share/icons/gnome/scalable/actions/search.svg
 share/icons/gnome/scalable/actions/start.svg
 share/icons/gnome/scalable/actions/stock_add-bookmark.svg
 share/icons/gnome/scalable/actions/stock_bottom.svg
+share/icons/gnome/scalable/actions/stock_close.svg
+share/icons/gnome/scalable/actions/stock_copy.svg
 share/icons/gnome/scalable/actions/stock_cut.svg
 share/icons/gnome/scalable/actions/stock_delete.svg
 share/icons/gnome/scalable/actions/stock_down.svg
@@ -4891,7 +5519,24 @@ share/icons/gnome/scalable/actions/stock_home.svg
 share/icons/gnome/scalable/actions/stock_last.svg
 share/icons/gnome/scalable/actions/stock_leave-fullscreen.svg
 share/icons/gnome/scalable/actions/stock_left.svg
+share/icons/gnome/scalable/actions/stock_mail-compose.svg
+share/icons/gnome/scalable/actions/stock_mail-forward.svg
+share/icons/gnome/scalable/actions/stock_mail-open.svg
+share/icons/gnome/scalable/actions/stock_mail-reply-to-all.svg
+share/icons/gnome/scalable/actions/stock_mail-reply.svg
+share/icons/gnome/scalable/actions/stock_mail-send-receive.svg
+share/icons/gnome/scalable/actions/stock_mail-send.svg
+share/icons/gnome/scalable/actions/stock_mail-unread.svg
+share/icons/gnome/scalable/actions/stock_media-fwd.svg
+share/icons/gnome/scalable/actions/stock_media-next.svg
+share/icons/gnome/scalable/actions/stock_media-pause.svg
+share/icons/gnome/scalable/actions/stock_media-play.svg
+share/icons/gnome/scalable/actions/stock_media-prev.svg
+share/icons/gnome/scalable/actions/stock_media-rec.svg
+share/icons/gnome/scalable/actions/stock_media-rew.svg
+share/icons/gnome/scalable/actions/stock_media-stop.svg
 share/icons/gnome/scalable/actions/stock_new-address-book.svg
+share/icons/gnome/scalable/actions/stock_new-appointment.svg
 share/icons/gnome/scalable/actions/stock_new-bcard.svg
 share/icons/gnome/scalable/actions/stock_new-dir.svg
 share/icons/gnome/scalable/actions/stock_new-text.svg
@@ -4901,6 +5546,7 @@ share/icons/gnome/scalable/actions/stock_print-preview.svg
 share/icons/gnome/scalable/actions/stock_print.svg
 share/icons/gnome/scalable/actions/stock_properties.svg
 share/icons/gnome/scalable/actions/stock_redo.svg
+share/icons/gnome/scalable/actions/stock_refresh.svg
 share/icons/gnome/scalable/actions/stock_right.svg
 share/icons/gnome/scalable/actions/stock_save-as.svg
 share/icons/gnome/scalable/actions/stock_save.svg
@@ -4908,10 +5554,16 @@ share/icons/gnome/scalable/actions/stock_search-and-replace.svg
 share/icons/gnome/scalable/actions/stock_search.svg
 share/icons/gnome/scalable/actions/stock_select-all.svg
 share/icons/gnome/scalable/actions/stock_stop.svg
+share/icons/gnome/scalable/actions/stock_text-strikethrough.svg
+share/icons/gnome/scalable/actions/stock_text_bold.svg
 share/icons/gnome/scalable/actions/stock_text_center.svg
+share/icons/gnome/scalable/actions/stock_text_indent.svg
+share/icons/gnome/scalable/actions/stock_text_italic.svg
 share/icons/gnome/scalable/actions/stock_text_justify.svg
 share/icons/gnome/scalable/actions/stock_text_left.svg
 share/icons/gnome/scalable/actions/stock_text_right.svg
+share/icons/gnome/scalable/actions/stock_text_underlined.svg
+share/icons/gnome/scalable/actions/stock_text_unindent.svg
 share/icons/gnome/scalable/actions/stock_top.svg
 share/icons/gnome/scalable/actions/stock_undo.svg
 share/icons/gnome/scalable/actions/stock_up.svg
@@ -4921,11 +5573,19 @@ share/icons/gnome/scalable/actions/stock_zoom-out.svg
 share/icons/gnome/scalable/actions/stock_zoom-page.svg
 share/icons/gnome/scalable/actions/stop.svg
 share/icons/gnome/scalable/actions/system-lock-screen.svg
+share/icons/gnome/scalable/actions/system-log-out.svg
 share/icons/gnome/scalable/actions/system-run.svg
+share/icons/gnome/scalable/actions/system-search.svg
+share/icons/gnome/scalable/actions/text_bold.svg
+share/icons/gnome/scalable/actions/text_italic.svg
+share/icons/gnome/scalable/actions/text_strike.svg
+share/icons/gnome/scalable/actions/text_under.svg
+share/icons/gnome/scalable/actions/tools-check-spelling.svg
 share/icons/gnome/scalable/actions/top.svg
 share/icons/gnome/scalable/actions/undo.svg
 share/icons/gnome/scalable/actions/up.svg
 share/icons/gnome/scalable/actions/view-fullscreen.svg
+share/icons/gnome/scalable/actions/view-refresh.svg
 share/icons/gnome/scalable/actions/view-restore.svg
 share/icons/gnome/scalable/actions/view-sort-ascending.svg
 share/icons/gnome/scalable/actions/view-sort-descending.svg
@@ -4933,10 +5593,12 @@ share/icons/gnome/scalable/actions/viewmag+.svg
 share/icons/gnome/scalable/actions/viewmag-.svg
 share/icons/gnome/scalable/actions/viewmag1.svg
 share/icons/gnome/scalable/actions/viewmagfit.svg
+share/icons/gnome/scalable/actions/window-close.svg
 share/icons/gnome/scalable/actions/window-new.svg
 share/icons/gnome/scalable/actions/window_fullscreen.svg
 share/icons/gnome/scalable/actions/window_new.svg
 share/icons/gnome/scalable/actions/window_nofullscreen.svg
+share/icons/gnome/scalable/actions/xfce-system-exit.svg
 share/icons/gnome/scalable/actions/xfce-system-lock.svg
 share/icons/gnome/scalable/actions/zoom-best-fit.svg
 share/icons/gnome/scalable/actions/zoom-in.svg
@@ -4945,6 +5607,7 @@ share/icons/gnome/scalable/actions/zoom-out.svg
 share/icons/gnome/scalable/apps/access.svg
 share/icons/gnome/scalable/apps/accessibility-directory.svg
 share/icons/gnome/scalable/apps/accessories-calculator.svg
+share/icons/gnome/scalable/apps/accessories-character-map.svg
 share/icons/gnome/scalable/apps/accessories-dictionary.svg
 share/icons/gnome/scalable/apps/accessories-text-editor.svg
 share/icons/gnome/scalable/apps/arts.svg
@@ -4955,6 +5618,7 @@ share/icons/gnome/scalable/apps/config-users.svg
 share/icons/gnome/scalable/apps/file-manager.svg
 share/icons/gnome/scalable/apps/fonts.svg
 share/icons/gnome/scalable/apps/gnome-calculator.svg
+share/icons/gnome/scalable/apps/gnome-character-map.svg
 share/icons/gnome/scalable/apps/gnome-help.svg
 share/icons/gnome/scalable/apps/gnome-mixer.svg
 share/icons/gnome/scalable/apps/gnome-monitor.svg
@@ -4969,6 +5633,7 @@ share/icons/gnome/scalable/apps/gnome-shutdown.svg
 share/icons/gnome/scalable/apps/gnome-terminal.svg
 share/icons/gnome/scalable/apps/gnome-window-manager.svg
 share/icons/gnome/scalable/apps/gtk-help.svg
+share/icons/gnome/scalable/apps/gucharmap.svg
 share/icons/gnome/scalable/apps/help-browser.svg
 share/icons/gnome/scalable/apps/help.svg
 share/icons/gnome/scalable/apps/im-aim.svg
@@ -4978,6 +5643,7 @@ share/icons/gnome/scalable/apps/im-msn.svg
 share/icons/gnome/scalable/apps/im-nov.svg
 share/icons/gnome/scalable/apps/im-yahoo.svg
 share/icons/gnome/scalable/apps/kcalc.svg
+share/icons/gnome/scalable/apps/kcharselect.svg
 share/icons/gnome/scalable/apps/kcmkwm.svg
 share/icons/gnome/scalable/apps/kcmsound.svg
 share/icons/gnome/scalable/apps/kedit.svg
@@ -5013,9 +5679,11 @@ share/icons/gnome/scalable/apps/susehelpcenter.svg
 share/icons/gnome/scalable/apps/system-config-users.svg
 share/icons/gnome/scalable/apps/system-file-manager.svg
 share/icons/gnome/scalable/apps/system-software-installer.svg
+share/icons/gnome/scalable/apps/system-software-update.svg
 share/icons/gnome/scalable/apps/system-users.svg
 share/icons/gnome/scalable/apps/terminal.svg
 share/icons/gnome/scalable/apps/text-editor.svg
+share/icons/gnome/scalable/apps/update-manager.svg
 share/icons/gnome/scalable/apps/user-info.svg
 share/icons/gnome/scalable/apps/utilities-system-monitor.svg
 share/icons/gnome/scalable/apps/utilities-terminal.svg
@@ -5028,8 +5696,10 @@ share/icons/gnome/scalable/apps/xfce4-backdrop.svg
 share/icons/gnome/scalable/apps/xfce4-mixer.svg
 share/icons/gnome/scalable/apps/xfwm4.svg
 share/icons/gnome/scalable/apps/xscreensaver.svg
+share/icons/gnome/scalable/apps/zen-icon.svg
 share/icons/gnome/scalable/categories/applications-accessories.svg
 share/icons/gnome/scalable/categories/applications-development.svg
+share/icons/gnome/scalable/categories/applications-engineering.svg
 share/icons/gnome/scalable/categories/applications-games.svg
 share/icons/gnome/scalable/categories/applications-graphics.svg
 share/icons/gnome/scalable/categories/applications-internet.svg
@@ -5038,6 +5708,7 @@ share/icons/gnome/scalable/categories/applications-office.svg
 share/icons/gnome/scalable/categories/applications-other.svg
 share/icons/gnome/scalable/categories/applications-science.svg
 share/icons/gnome/scalable/categories/applications-system.svg
+share/icons/gnome/scalable/categories/applications-utilities.svg
 share/icons/gnome/scalable/categories/gnome-applications.svg
 share/icons/gnome/scalable/categories/gnome-control-center.svg
 share/icons/gnome/scalable/categories/gnome-devel.svg
@@ -5049,6 +5720,7 @@ share/icons/gnome/scalable/categories/gnome-settings.svg
 share/icons/gnome/scalable/categories/gnome-system.svg
 share/icons/gnome/scalable/categories/gnome-util.svg
 share/icons/gnome/scalable/categories/gtk-preferences.svg
+share/icons/gnome/scalable/categories/input_devices_settings.svg
 share/icons/gnome/scalable/categories/kcontrol.svg
 share/icons/gnome/scalable/categories/package_development.svg
 share/icons/gnome/scalable/categories/package_games.svg
@@ -5059,7 +5731,11 @@ share/icons/gnome/scalable/categories/package_office.svg
 share/icons/gnome/scalable/categories/package_settings.svg
 share/icons/gnome/scalable/categories/package_system.svg
 share/icons/gnome/scalable/categories/package_utilities.svg
+share/icons/gnome/scalable/categories/preferences-desktop-peripherals.svg
+share/icons/gnome/scalable/categories/preferences-desktop-personal.svg
 share/icons/gnome/scalable/categories/preferences-desktop.svg
+share/icons/gnome/scalable/categories/preferences-other.svg
+share/icons/gnome/scalable/categories/preferences-system-network.svg
 share/icons/gnome/scalable/categories/preferences-system.svg
 share/icons/gnome/scalable/categories/redhat-accessories.svg
 share/icons/gnome/scalable/categories/redhat-games.svg
@@ -5072,18 +5748,21 @@ share/icons/gnome/scalable/categories/redhat-sound_video.svg
 share/icons/gnome/scalable/categories/redhat-system_settings.svg
 share/icons/gnome/scalable/categories/redhat-system_tools.svg
 share/icons/gnome/scalable/categories/stock_internet.svg
+share/icons/gnome/scalable/categories/system-help.svg
 share/icons/gnome/scalable/categories/xfce-games.svg
 share/icons/gnome/scalable/categories/xfce-graphics.svg
 share/icons/gnome/scalable/categories/xfce-internet.svg
 share/icons/gnome/scalable/categories/xfce-multimedia.svg
 share/icons/gnome/scalable/categories/xfce-office.svg
-share/icons/gnome/scalable/categories/xfce4-settings.svg
 share/icons/gnome/scalable/categories/xfce-system-settings.svg
 share/icons/gnome/scalable/categories/xfce-utils.svg
+share/icons/gnome/scalable/categories/xfce4-settings.svg
 share/icons/gnome/scalable/devices/3floppy_unmount.svg
+share/icons/gnome/scalable/devices/audio-card.svg
 share/icons/gnome/scalable/devices/audio-input-microphone.svg
 share/icons/gnome/scalable/devices/battery.svg
 share/icons/gnome/scalable/devices/camera-photo.svg
+share/icons/gnome/scalable/devices/camera-video.svg
 share/icons/gnome/scalable/devices/camera-web.svg
 share/icons/gnome/scalable/devices/camera.svg
 share/icons/gnome/scalable/devices/camera_unmount.svg
@@ -5109,6 +5788,7 @@ share/icons/gnome/scalable/devices/gnome-dev-disc-dvdram.svg
 share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrom.svg
 share/icons/gnome/scalable/devices/gnome-dev-disc-dvdrw.svg
 share/icons/gnome/scalable/devices/gnome-dev-dvd.svg
+share/icons/gnome/scalable/devices/gnome-dev-ethernet.svg
 share/icons/gnome/scalable/devices/gnome-dev-floppy.svg
 share/icons/gnome/scalable/devices/gnome-dev-harddisk-1394.svg
 share/icons/gnome/scalable/devices/gnome-dev-harddisk-usb.svg
@@ -5125,6 +5805,8 @@ share/icons/gnome/scalable/devices/gnome-dev-printer.svg
 share/icons/gnome/scalable/devices/gnome-dev-removable-1394.svg
 share/icons/gnome/scalable/devices/gnome-dev-removable-usb.svg
 share/icons/gnome/scalable/devices/gnome-dev-removable.svg
+share/icons/gnome/scalable/devices/gnome-dev-wavelan.svg
+share/icons/gnome/scalable/devices/gnome-dev-zipdisk.svg
 share/icons/gnome/scalable/devices/gnome-fs-client.svg
 share/icons/gnome/scalable/devices/gnome-modem.svg
 share/icons/gnome/scalable/devices/gnome-stock-mic.svg
@@ -5133,10 +5815,12 @@ share/icons/gnome/scalable/devices/gtk-floppy.svg
 share/icons/gnome/scalable/devices/gtk-harddisk.svg
 share/icons/gnome/scalable/devices/harddrive.svg
 share/icons/gnome/scalable/devices/hdd_unmount.svg
+share/icons/gnome/scalable/devices/input-gaming.svg
 share/icons/gnome/scalable/devices/input-keyboard.svg
 share/icons/gnome/scalable/devices/input-mouse.svg
 share/icons/gnome/scalable/devices/input-tablet.svg
 share/icons/gnome/scalable/devices/ipod_mount.svg
+share/icons/gnome/scalable/devices/joystick.svg
 share/icons/gnome/scalable/devices/keyboard.svg
 share/icons/gnome/scalable/devices/kjobviewer.svg
 share/icons/gnome/scalable/devices/kxkb.svg
@@ -5145,13 +5829,19 @@ share/icons/gnome/scalable/devices/media-flash.svg
 share/icons/gnome/scalable/devices/media-floppy.svg
 share/icons/gnome/scalable/devices/media-optical.svg
 share/icons/gnome/scalable/devices/media-tape.svg
+share/icons/gnome/scalable/devices/media-zip.svg
 share/icons/gnome/scalable/devices/modem.svg
 share/icons/gnome/scalable/devices/mouse.svg
 share/icons/gnome/scalable/devices/multimedia-player.svg
+share/icons/gnome/scalable/devices/network-wired.svg
+share/icons/gnome/scalable/devices/network-wireless.svg
+share/icons/gnome/scalable/devices/pda.svg
+share/icons/gnome/scalable/devices/phone.svg
 share/icons/gnome/scalable/devices/printer-remote.svg
 share/icons/gnome/scalable/devices/printer.svg
 share/icons/gnome/scalable/devices/printer1.svg
 share/icons/gnome/scalable/devices/printmgr.svg
+share/icons/gnome/scalable/devices/scanner.svg
 share/icons/gnome/scalable/devices/stock_mic.svg
 share/icons/gnome/scalable/devices/stock_printers.svg
 share/icons/gnome/scalable/devices/system-floppy.svg
@@ -5164,15 +5854,15 @@ share/icons/gnome/scalable/devices/xfce4-keyboard.svg
 share/icons/gnome/scalable/devices/xfce4-mouse.svg
 share/icons/gnome/scalable/devices/yast_HD.svg
 share/icons/gnome/scalable/devices/yast_idetude.svg
+share/icons/gnome/scalable/devices/yast_joystick.svg
 share/icons/gnome/scalable/devices/yast_mouse.svg
 share/icons/gnome/scalable/devices/yast_printer.svg
-share/icons/gnome/scalable/emblems/emblem-cvs-added.icon
-share/icons/gnome/scalable/emblems/emblem-cvs-added.svg
-share/icons/gnome/scalable/emblems/emblem-cvs-conflict.icon
-share/icons/gnome/scalable/emblems/emblem-cvs-conflict.svg
-share/icons/gnome/scalable/emblems/emblem-cvs-removed.icon
-share/icons/gnome/scalable/emblems/emblem-cvs-removed.svg
+share/icons/gnome/scalable/devices/yast_soundcard.svg
 share/icons/gnome/scalable/emblems/emblem-default.svg
+share/icons/gnome/scalable/emblems/emblem-documents.icon
+share/icons/gnome/scalable/emblems/emblem-documents.svg
+share/icons/gnome/scalable/emblems/emblem-downloads.icon
+share/icons/gnome/scalable/emblems/emblem-downloads.svg
 share/icons/gnome/scalable/emblems/emblem-favorite.icon
 share/icons/gnome/scalable/emblems/emblem-favorite.svg
 share/icons/gnome/scalable/emblems/emblem-generic.icon
@@ -5185,15 +5875,36 @@ share/icons/gnome/scalable/emblems/emblem-new.icon
 share/icons/gnome/scalable/emblems/emblem-new.svg
 share/icons/gnome/scalable/emblems/emblem-package.icon
 share/icons/gnome/scalable/emblems/emblem-package.svg
-share/icons/gnome/scalable/emblems/emblem-special.icon
-share/icons/gnome/scalable/emblems/emblem-special.svg
+share/icons/gnome/scalable/emblems/emblem-photos.icon
+share/icons/gnome/scalable/emblems/emblem-photos.svg
+share/icons/gnome/scalable/emblems/emblem-readonly.icon
+share/icons/gnome/scalable/emblems/emblem-readonly.svg
+share/icons/gnome/scalable/emblems/emblem-shared.svg
 share/icons/gnome/scalable/emblems/emblem-symbolic-link.svg
+share/icons/gnome/scalable/emblems/emblem-system.svg
+share/icons/gnome/scalable/emblems/emblem-unreadable.icon
+share/icons/gnome/scalable/emblems/emblem-unreadable.svg
 share/icons/gnome/scalable/emblems/emblem-urgent.icon
 share/icons/gnome/scalable/emblems/emblem-urgent.svg
 share/icons/gnome/scalable/emblems/emblem-web.icon
 share/icons/gnome/scalable/emblems/emblem-web.svg
 share/icons/gnome/scalable/emblems/stock_mail-priority-high.icon
 share/icons/gnome/scalable/emblems/stock_mail-priority-high.svg
+share/icons/gnome/scalable/emotes/face-angel.svg
+share/icons/gnome/scalable/emotes/face-cool.svg
+share/icons/gnome/scalable/emotes/face-crying.svg
+share/icons/gnome/scalable/emotes/face-devilish.svg
+share/icons/gnome/scalable/emotes/face-embarrassed.svg
+share/icons/gnome/scalable/emotes/face-kiss.svg
+share/icons/gnome/scalable/emotes/face-monkey.svg
+share/icons/gnome/scalable/emotes/face-plain.svg
+share/icons/gnome/scalable/emotes/face-raspberry.svg
+share/icons/gnome/scalable/emotes/face-sad.svg
+share/icons/gnome/scalable/emotes/face-smile-big.svg
+share/icons/gnome/scalable/emotes/face-smile.svg
+share/icons/gnome/scalable/emotes/face-smirk.svg
+share/icons/gnome/scalable/emotes/face-surprise.svg
+share/icons/gnome/scalable/emotes/face-wink.svg
 share/icons/gnome/scalable/mimetypes/application-certificate.svg
 share/icons/gnome/scalable/mimetypes/application-x-executable.svg
 share/icons/gnome/scalable/mimetypes/ascii.svg
@@ -5402,11 +6113,15 @@ share/icons/gnome/scalable/status/audio-volume-high.svg
 share/icons/gnome/scalable/status/audio-volume-low.svg
 share/icons/gnome/scalable/status/audio-volume-medium.svg
 share/icons/gnome/scalable/status/audio-volume-muted.svg
+share/icons/gnome/scalable/status/battery-caution.svg
+share/icons/gnome/scalable/status/battery-low.svg
 share/icons/gnome/scalable/status/connect_creating.svg
 share/icons/gnome/scalable/status/connect_established.svg
 share/icons/gnome/scalable/status/connect_no.svg
 share/icons/gnome/scalable/status/dialog-error.svg
 share/icons/gnome/scalable/status/dialog-information.svg
+share/icons/gnome/scalable/status/dialog-password.svg
+share/icons/gnome/scalable/status/dialog-question.svg
 share/icons/gnome/scalable/status/dialog-warning.svg
 share/icons/gnome/scalable/status/edittrash.svg
 share/icons/gnome/scalable/status/error.svg
@@ -5431,13 +6146,22 @@ share/icons/gnome/scalable/status/gnome-netstatus-rx.svg
 share/icons/gnome/scalable/status/gnome-netstatus-tx.svg
 share/icons/gnome/scalable/status/gnome-netstatus-txrx.svg
 share/icons/gnome/scalable/status/gnome-stock-trash-full.svg
+share/icons/gnome/scalable/status/gtk-dialog-authentication.svg
 share/icons/gnome/scalable/status/gtk-dialog-error.svg
 share/icons/gnome/scalable/status/gtk-dialog-info.svg
+share/icons/gnome/scalable/status/gtk-dialog-question.svg
 share/icons/gnome/scalable/status/gtk-dialog-warning.svg
+share/icons/gnome/scalable/status/gtk-missing-image.svg
 share/icons/gnome/scalable/status/image-loading.svg
+share/icons/gnome/scalable/status/image-missing.svg
 share/icons/gnome/scalable/status/important.svg
 share/icons/gnome/scalable/status/info.svg
 share/icons/gnome/scalable/status/mail-attachment.svg
+share/icons/gnome/scalable/status/mail-read.svg
+share/icons/gnome/scalable/status/mail-replied.svg
+share/icons/gnome/scalable/status/mail-unread.svg
+share/icons/gnome/scalable/status/media-playlist-repeat.svg
+share/icons/gnome/scalable/status/media-playlist-shuffle.svg
 share/icons/gnome/scalable/status/messagebox_critical.svg
 share/icons/gnome/scalable/status/messagebox_info.svg
 share/icons/gnome/scalable/status/messagebox_warning.svg
@@ -5452,13 +6176,26 @@ share/icons/gnome/scalable/status/nm-device-wired.svg
 share/icons/gnome/scalable/status/nm-device-wireless.svg
 share/icons/gnome/scalable/status/nm-no-connection.svg
 share/icons/gnome/scalable/status/printer-error.svg
+share/icons/gnome/scalable/status/printer-printing.svg
+share/icons/gnome/scalable/status/security-high.svg
+share/icons/gnome/scalable/status/security-low.svg
+share/icons/gnome/scalable/status/security-medium.svg
+share/icons/gnome/scalable/status/software-update-available.svg
+share/icons/gnome/scalable/status/software-update-urgent.svg
 share/icons/gnome/scalable/status/stock_appointment-reminder-excl.svg
 share/icons/gnome/scalable/status/stock_appointment-reminder.svg
 share/icons/gnome/scalable/status/stock_dialog-error.svg
 share/icons/gnome/scalable/status/stock_dialog-info.svg
+share/icons/gnome/scalable/status/stock_dialog-question.svg
 share/icons/gnome/scalable/status/stock_dialog-warning.svg
+share/icons/gnome/scalable/status/stock_lock-broken.svg
+share/icons/gnome/scalable/status/stock_lock-ok.svg
+share/icons/gnome/scalable/status/stock_lock-open.svg
+share/icons/gnome/scalable/status/stock_lock.svg
 share/icons/gnome/scalable/status/stock_open.icon
 share/icons/gnome/scalable/status/stock_open.svg
+share/icons/gnome/scalable/status/stock_repeat.svg
+share/icons/gnome/scalable/status/stock_shuffle.svg
 share/icons/gnome/scalable/status/stock_trash_full.svg
 share/icons/gnome/scalable/status/stock_volume-0.svg
 share/icons/gnome/scalable/status/stock_volume-max.svg
@@ -5468,6 +6205,7 @@ share/icons/gnome/scalable/status/stock_volume-mute.svg
 share/icons/gnome/scalable/status/stock_volume.svg
 share/icons/gnome/scalable/status/stock_weather-cloudy.svg
 share/icons/gnome/scalable/status/stock_weather-few-clouds.svg
+share/icons/gnome/scalable/status/stock_weather-fog.svg
 share/icons/gnome/scalable/status/stock_weather-night-clear.svg
 share/icons/gnome/scalable/status/stock_weather-night-few-clouds.svg
 share/icons/gnome/scalable/status/stock_weather-showers.svg
@@ -5475,12 +6213,15 @@ share/icons/gnome/scalable/status/stock_weather-snow.svg
 share/icons/gnome/scalable/status/stock_weather-storm.svg
 share/icons/gnome/scalable/status/stock_weather-sunny.svg
 share/icons/gnome/scalable/status/sunny.svg
+share/icons/gnome/scalable/status/task-due.svg
+share/icons/gnome/scalable/status/task-past-due.svg
 share/icons/gnome/scalable/status/trashcan_full.svg
 share/icons/gnome/scalable/status/user-trash-full.svg
 share/icons/gnome/scalable/status/weather-clear-night.svg
 share/icons/gnome/scalable/status/weather-clear.svg
 share/icons/gnome/scalable/status/weather-few-clouds-night.svg
 share/icons/gnome/scalable/status/weather-few-clouds.svg
+share/icons/gnome/scalable/status/weather-fog.svg
 share/icons/gnome/scalable/status/weather-overcast.svg
 share/icons/gnome/scalable/status/weather-severe-alert.svg
 share/icons/gnome/scalable/status/weather-showers-scattered.svg
@@ -5495,8 +6236,12 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mg/LC_MESSAGES
@@ -5505,11 +6250,14 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrmtry share/icons/gnome/scalable/stock/generic
 @dirrmtry share/icons/gnome/scalable/stock
 @dirrmtry share/icons/gnome/scalable/status
 @dirrmtry share/icons/gnome/scalable/places
 @dirrmtry share/icons/gnome/scalable/mimetypes
+@dirrmtry share/icons/gnome/scalable/emotes
 @dirrmtry share/icons/gnome/scalable/emblems
 @dirrmtry share/icons/gnome/scalable/devices
 @dirrmtry share/icons/gnome/scalable/categories
@@ -5537,6 +6285,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/32x32/status
 @dirrmtry share/icons/gnome/32x32/places
 @dirrmtry share/icons/gnome/32x32/mimetypes
+@dirrmtry share/icons/gnome/32x32/emotes
 @dirrmtry share/icons/gnome/32x32/emblems
 @dirrmtry share/icons/gnome/32x32/devices
 @dirrmtry share/icons/gnome/32x32/categories
@@ -5563,6 +6312,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/24x24/places
 @dirrmtry share/icons/gnome/24x24/mimetypes
 @dirrmtry share/icons/gnome/24x24/filesystems
+@dirrmtry share/icons/gnome/24x24/emotes
 @dirrmtry share/icons/gnome/24x24/emblems
 @dirrmtry share/icons/gnome/24x24/devices
 @dirrmtry share/icons/gnome/24x24/categories
@@ -5573,6 +6323,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/22x22/status
 @dirrmtry share/icons/gnome/22x22/places
 @dirrmtry share/icons/gnome/22x22/mimetypes
+@dirrmtry share/icons/gnome/22x22/emotes
 @dirrmtry share/icons/gnome/22x22/emblems
 @dirrmtry share/icons/gnome/22x22/devices
 @dirrmtry share/icons/gnome/22x22/categories
@@ -5600,6 +6351,7 @@ share/icons/gnome/scalable/stock/generic/stock_person.svg
 @dirrmtry share/icons/gnome/16x16/places
 @dirrmtry share/icons/gnome/16x16/mimetypes
 @dirrmtry share/icons/gnome/16x16/filesystems
+@dirrmtry share/icons/gnome/16x16/emotes
 @dirrmtry share/icons/gnome/16x16/emblems
 @dirrmtry share/icons/gnome/16x16/devices
 @dirrmtry share/icons/gnome/16x16/categories
diff --git a/misc/gnome-mime-data/Makefile b/misc/gnome-mime-data/Makefile
index 5d671f97e6a4..1d90551ef356 100644
--- a/misc/gnome-mime-data/Makefile
+++ b/misc/gnome-mime-data/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#
+#    $MCom: ports/misc/gnome-mime-data/Makefile,v 1.14 2007/05/22 04:59:18 marcus Exp $
 
 PORTNAME=	gnome-mime-data
 PORTVERSION=	2.18.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,7 +20,7 @@ COMMENT=	A MIME and Application database for GNOME
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomehier intlhack gnomeprefix gnometarget pkgconfig
+USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
diff --git a/misc/gnome-mime-data/pkg-plist b/misc/gnome-mime-data/pkg-plist
index fcffef85746d..e1b3d4658bc1 100644
--- a/misc/gnome-mime-data/pkg-plist
+++ b/misc/gnome-mime-data/pkg-plist
@@ -1,8 +1,8 @@
 etc/gnome-vfs-mime-magic
 libdata/pkgconfig/gnome-mime-data-2.0.pc
-share/gnome/application-registry/gnome-vfs.applications
-share/gnome/mime-info/gnome-vfs.keys
-share/gnome/mime-info/gnome-vfs.mime
+share/application-registry/gnome-vfs.applications
+share/mime-info/gnome-vfs.keys
+share/mime-info/gnome-vfs.mime
 share/locale/af/LC_MESSAGES/gnome-mime-data.mo
 share/locale/am/LC_MESSAGES/gnome-mime-data.mo
 share/locale/ar/LC_MESSAGES/gnome-mime-data.mo
diff --git a/misc/gnome-osd/Makefile b/misc/gnome-osd/Makefile
index afe3b1c97bfb..210662072530 100644
--- a/misc/gnome-osd/Makefile
+++ b/misc/gnome-osd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnome-osd
 DISTVERSION=	0.11.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://telecom.inescporto.pt/~gjc/gnome-osd/${DISTVERSION:C|-.*$||}/
 
@@ -25,8 +25,7 @@ PORTDOCS=	AUTHORS NEWS README
 MAN1=		gnome-osd-client.1
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|; \
-		s|$$(datadir)/dbus-1|$$(prefix)/share/dbus-1|' \
+	@${REINPLACE_CMD} -e 's|control-center-2.0/capplets|applications|' \
 		${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/misc/gnome-osd/pkg-plist b/misc/gnome-osd/pkg-plist
index cddba282c61c..26ff6f4e0f90 100644
--- a/misc/gnome-osd/pkg-plist
+++ b/misc/gnome-osd/pkg-plist
@@ -39,17 +39,18 @@ libdata/bonobo/servers/GNOME_OSD.server
 libexec/gnome-osd-server
 share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.EventBridge.service
 share/dbus-1/services/pt.inescporto.telecom.GnomeOSD.service
-share/gnome/applications/gnome-osd-properties.desktop
-share/gnome/gnome-osd/xchatosd.py
-share/gnome/pixmaps/gnome-osd.png
+share/applications/gnome-osd-properties.desktop
+share/gnome-osd/xchatosd.py
+share/pixmaps/gnome-osd.png
 share/locale/cs/LC_MESSAGES/gnome-osd.mo
 share/locale/ja/LC_MESSAGES/gnome-osd.mo
 share/locale/pt/LC_MESSAGES/gnome-osd.mo
 @dirrmtry etc/xdg/autostart
 @dirrmtry etc/xdg
-@dirrm share/gnome/gnome-osd
+@dirrm share/gnome-osd
 @dirrm %%PYTHON_SITELIBDIR%%/gnomeosd
 @dirrmtry %%PYTHON_SITELIBDIR%%
 @dirrmtry %%PYTHON_LIBDIR%%
 @comment only remove the dbus directories if dbus is not installed
 @unexec if ! [ -e %%LOCALBASE%%/bin/dbus-daemon ]; then rmdir %D/share/dbus-1/services 2>/dev/null; rmdir %D/share/dbus-1 2>/dev/null; fi
+@dirrmtry share/applications
diff --git a/misc/gnome-user-docs/Makefile b/misc/gnome-user-docs/Makefile
index 9b848799c099..6d4bce23777c 100644
--- a/misc/gnome-user-docs/Makefile
+++ b/misc/gnome-user-docs/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-user-docs/Makefile,v 1.33 2007/03/13 00:11:38 marcus Exp $
+#   $MCom: ports/misc/gnome-user-docs/Makefile,v 1.40 2007/10/13 21:06:54 marcus Exp $
 #
 
 PORTNAME=	gnome-user-docs
-PORTVERSION=	2.18.2
+PORTVERSION=	2.20.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,8 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 users guide
 
-BUILD_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
-RUN_DEPENDS=	scrollkeeper-config:${PORTSDIR}/textproc/scrollkeeper
+BUILD_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
+RUN_DEPENDS=	rarian-sk-config:${PORTSDIR}/textproc/rarian
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
diff --git a/misc/gnome-user-docs/distinfo b/misc/gnome-user-docs/distinfo
index 55b263b32c23..9a0f5ece6467 100644
--- a/misc/gnome-user-docs/distinfo
+++ b/misc/gnome-user-docs/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-user-docs-2.18.2.tar.bz2) = 4d3b5c8bd3cc8008f2a44d98efaa2502
-SHA256 (gnome2/gnome-user-docs-2.18.2.tar.bz2) = 930c67d304fdb4ad9042430bfac59998011b8be02183733b93f1a08dcb5a7400
-SIZE (gnome2/gnome-user-docs-2.18.2.tar.bz2) = 6520221
+MD5 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = d6bba44acaed20117769ec8dce378f71
+SHA256 (gnome2/gnome-user-docs-2.20.1.tar.bz2) = cec02e5e31bc7ab1fa892314368d6021e6c80ded8af3f727122aa355f86d18c9
+SIZE (gnome2/gnome-user-docs-2.20.1.tar.bz2) = 9827506
diff --git a/misc/gnome-user-docs/pkg-plist b/misc/gnome-user-docs/pkg-plist
index c36c3ba07bfa..fbf3f44041f1 100644
--- a/misc/gnome-user-docs/pkg-plist
+++ b/misc/gnome-user-docs/pkg-plist
@@ -1,6 +1,5 @@
 share/gnome/help/gnome-access-guide/C/accessintro.xml
-share/gnome/help/gnome-access-guide/C/ats.xml
-share/gnome/help/gnome-access-guide/C/dtconfig.xml
+share/gnome/help/gnome-access-guide/C/enable.xml
 share/gnome/help/gnome-access-guide/C/figures/accessx.png
 share/gnome/help/gnome-access-guide/C/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/C/figures/button.png
@@ -27,12 +26,67 @@ share/gnome/help/gnome-access-guide/C/figures/stickywindowlock.png
 share/gnome/help/gnome-access-guide/C/figures/tabbed_section.png
 share/gnome/help/gnome-access-guide/C/figures/text_box.png
 share/gnome/help/gnome-access-guide/C/figures/tree.png
+share/gnome/help/gnome-access-guide/C/general.xml
 share/gnome/help/gnome-access-guide/C/gnome-access-guide.xml
-share/gnome/help/gnome-access-guide/C/keynav.xml
 share/gnome/help/gnome-access-guide/C/legal.xml
+share/gnome/help/gnome-access-guide/C/low-vision.xml
+share/gnome/help/gnome-access-guide/C/mobility.xml
 share/gnome/help/gnome-access-guide/C/preface.xml
 share/gnome/help/gnome-access-guide/C/sysadmin.xml
-share/gnome/help/gnome-access-guide/C/themes.xml
+share/gnome/help/gnome-access-guide/de/figures/accessx.png
+share/gnome/help/gnome-access-guide/de/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/de/figures/button.png
+share/gnome/help/gnome-access-guide/de/figures/check_box.png
+share/gnome/help/gnome-access-guide/de/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/de/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/de/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/de/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/de/figures/radio_button.png
+share/gnome/help/gnome-access-guide/de/figures/slider.png
+share/gnome/help/gnome-access-guide/de/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/de/figures/spin_box.png
+share/gnome/help/gnome-access-guide/de/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/de/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/de/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/de/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/de/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/de/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/de/figures/text_box.png
+share/gnome/help/gnome-access-guide/de/figures/tree.png
+share/gnome/help/gnome-access-guide/de/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/el/figures/accessx.png
+share/gnome/help/gnome-access-guide/el/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/el/figures/button.png
+share/gnome/help/gnome-access-guide/el/figures/check_box.png
+share/gnome/help/gnome-access-guide/el/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/el/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/el/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/el/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/el/figures/radio_button.png
+share/gnome/help/gnome-access-guide/el/figures/slider.png
+share/gnome/help/gnome-access-guide/el/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/el/figures/spin_box.png
+share/gnome/help/gnome-access-guide/el/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/el/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/el/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/el/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/el/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/el/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/el/figures/text_box.png
+share/gnome/help/gnome-access-guide/el/figures/tree.png
+share/gnome/help/gnome-access-guide/el/gnome-access-guide.xml
 share/gnome/help/gnome-access-guide/en_GB/figures/accessx.png
 share/gnome/help/gnome-access-guide/en_GB/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/en_GB/figures/button.png
@@ -141,6 +195,33 @@ share/gnome/help/gnome-access-guide/it/figures/tabbed_section.png
 share/gnome/help/gnome-access-guide/it/figures/text_box.png
 share/gnome/help/gnome-access-guide/it/figures/tree.png
 share/gnome/help/gnome-access-guide/it/gnome-access-guide.xml
+share/gnome/help/gnome-access-guide/pt/figures/accessx.png
+share/gnome/help/gnome-access-guide/pt/figures/bouncekeys.png
+share/gnome/help/gnome-access-guide/pt/figures/button.png
+share/gnome/help/gnome-access-guide/pt/figures/check_box.png
+share/gnome/help/gnome-access-guide/pt/figures/dropdown_combination_box.png
+share/gnome/help/gnome-access-guide/pt/figures/dropdown_list_box.png
+share/gnome/help/gnome-access-guide/pt/figures/mousekeys.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_arrows.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_before.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_jump.png
+share/gnome/help/gnome-access-guide/pt/figures/move_object_push.png
+share/gnome/help/gnome-access-guide/pt/figures/radio_button.png
+share/gnome/help/gnome-access-guide/pt/figures/slider.png
+share/gnome/help/gnome-access-guide/pt/figures/slowkeys.png
+share/gnome/help/gnome-access-guide/pt/figures/spin_box.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyaltlatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyaltlock.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyctrllatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyctrllock.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyshiftlatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickyshiftlock.png
+share/gnome/help/gnome-access-guide/pt/figures/stickywindowlatch.png
+share/gnome/help/gnome-access-guide/pt/figures/stickywindowlock.png
+share/gnome/help/gnome-access-guide/pt/figures/tabbed_section.png
+share/gnome/help/gnome-access-guide/pt/figures/text_box.png
+share/gnome/help/gnome-access-guide/pt/figures/tree.png
+share/gnome/help/gnome-access-guide/pt/gnome-access-guide.xml
 share/gnome/help/gnome-access-guide/sv/figures/accessx.png
 share/gnome/help/gnome-access-guide/sv/figures/bouncekeys.png
 share/gnome/help/gnome-access-guide/sv/figures/button.png
@@ -187,6 +268,7 @@ share/gnome/help/system-admin-guide/es/system-admin-guide.xml
 share/gnome/help/system-admin-guide/fr/system-admin-guide.xml
 share/gnome/help/system-admin-guide/it/system-admin-guide.xml
 share/gnome/help/system-admin-guide/pa/system-admin-guide.xml
+share/gnome/help/system-admin-guide/pt/system-admin-guide.xml
 share/gnome/help/system-admin-guide/sv/system-admin-guide.xml
 share/gnome/help/user-guide/C/figures/ask_pointer.png
 share/gnome/help/user-guide/C/figures/busy_pointer.png
@@ -420,6 +502,160 @@ share/gnome/help/user-guide/bg/gospanel.xml
 share/gnome/help/user-guide/bg/gosstartsession.xml
 share/gnome/help/user-guide/bg/gostools.xml
 share/gnome/help/user-guide/bg/user-guide.xml
+share/gnome/help/user-guide/de/figures/ask_pointer.png
+share/gnome/help/user-guide/de/figures/busy_pointer.png
+share/gnome/help/user-guide/de/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/de/figures/copy_pointer.png
+share/gnome/help/user-guide/de/figures/force_quit.png
+share/gnome/help/user-guide/de/figures/four_hide_button.png
+share/gnome/help/user-guide/de/figures/gedit_window.png
+share/gnome/help/user-guide/de/figures/gnome_panel.png
+share/gnome/help/user-guide/de/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/de/figures/ibeam_pointer.png
+share/gnome/help/user-guide/de/figures/link_pointer.png
+share/gnome/help/user-guide/de/figures/lockscreen_icon.png
+share/gnome/help/user-guide/de/figures/logout_icon.png
+share/gnome/help/user-guide/de/figures/menu_bar_applet.png
+share/gnome/help/user-guide/de/figures/menu_panel.png
+share/gnome/help/user-guide/de/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/de/figures/move_pointer.png
+share/gnome/help/user-guide/de/figures/movewindow_pointer.png
+share/gnome/help/user-guide/de/figures/naut_browser_mode.png
+share/gnome/help/user-guide/de/figures/naut_button_bar.png
+share/gnome/help/user-guide/de/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/de/figures/naut_emblem.png
+share/gnome/help/user-guide/de/figures/naut_go_to_location.png
+share/gnome/help/user-guide/de/figures/naut_link_emblem.png
+share/gnome/help/user-guide/de/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/de/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/de/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/de/figures/naut_refine_search.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/de/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/de/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/de/figures/naut_search_bar.png
+share/gnome/help/user-guide/de/figures/naut_search_results.png
+share/gnome/help/user-guide/de/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/de/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/de/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/de/figures/naut_spatial_view.png
+share/gnome/help/user-guide/de/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/de/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/de/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/de/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/de/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/de/figures/normal_pointer.png
+share/gnome/help/user-guide/de/figures/not_available_pointer.png
+share/gnome/help/user-guide/de/figures/notification_area_icon.png
+share/gnome/help/user-guide/de/figures/open_drawer.png
+share/gnome/help/user-guide/de/figures/openwindows_menu.png
+share/gnome/help/user-guide/de/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/de/figures/resize_pointer.png
+share/gnome/help/user-guide/de/figures/run_button.png
+share/gnome/help/user-guide/de/figures/sample_applet.png
+share/gnome/help/user-guide/de/figures/screenshot_button.png
+share/gnome/help/user-guide/de/figures/searchtool_button.png
+share/gnome/help/user-guide/de/figures/show_desktop_button.png
+share/gnome/help/user-guide/de/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/de/figures/titlebar_window.png
+share/gnome/help/user-guide/de/figures/typical_menu.png
+share/gnome/help/user-guide/de/figures/window_list_applet.png
+share/gnome/help/user-guide/de/figures/window_list_group_applet.png
+share/gnome/help/user-guide/de/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/de/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/de/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/de/figures/yelp_preferences.png
+share/gnome/help/user-guide/de/figures/yelp_window.png
+share/gnome/help/user-guide/de/glossary.xml
+share/gnome/help/user-guide/de/gosbasic.xml
+share/gnome/help/user-guide/de/goscustdesk.xml
+share/gnome/help/user-guide/de/goseditmainmenu.xml
+share/gnome/help/user-guide/de/gosfeedback.xml
+share/gnome/help/user-guide/de/gosnautilus.xml
+share/gnome/help/user-guide/de/gosoverview.xml
+share/gnome/help/user-guide/de/gospanel.xml
+share/gnome/help/user-guide/de/gosstartsession.xml
+share/gnome/help/user-guide/de/gostools.xml
+share/gnome/help/user-guide/de/user-guide.xml
+share/gnome/help/user-guide/el/figures/ask_pointer.png
+share/gnome/help/user-guide/el/figures/busy_pointer.png
+share/gnome/help/user-guide/el/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/el/figures/copy_pointer.png
+share/gnome/help/user-guide/el/figures/force_quit.png
+share/gnome/help/user-guide/el/figures/four_hide_button.png
+share/gnome/help/user-guide/el/figures/gedit_window.png
+share/gnome/help/user-guide/el/figures/gnome_panel.png
+share/gnome/help/user-guide/el/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/el/figures/ibeam_pointer.png
+share/gnome/help/user-guide/el/figures/link_pointer.png
+share/gnome/help/user-guide/el/figures/lockscreen_icon.png
+share/gnome/help/user-guide/el/figures/logout_icon.png
+share/gnome/help/user-guide/el/figures/menu_bar_applet.png
+share/gnome/help/user-guide/el/figures/menu_panel.png
+share/gnome/help/user-guide/el/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/el/figures/move_pointer.png
+share/gnome/help/user-guide/el/figures/movewindow_pointer.png
+share/gnome/help/user-guide/el/figures/naut_browser_mode.png
+share/gnome/help/user-guide/el/figures/naut_button_bar.png
+share/gnome/help/user-guide/el/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/el/figures/naut_emblem.png
+share/gnome/help/user-guide/el/figures/naut_go_to_location.png
+share/gnome/help/user-guide/el/figures/naut_link_emblem.png
+share/gnome/help/user-guide/el/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/el/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/el/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/el/figures/naut_refine_search.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/el/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/el/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/el/figures/naut_search_bar.png
+share/gnome/help/user-guide/el/figures/naut_search_results.png
+share/gnome/help/user-guide/el/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/el/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/el/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/el/figures/naut_spatial_view.png
+share/gnome/help/user-guide/el/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/el/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/el/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/el/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/el/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/el/figures/normal_pointer.png
+share/gnome/help/user-guide/el/figures/not_available_pointer.png
+share/gnome/help/user-guide/el/figures/notification_area_icon.png
+share/gnome/help/user-guide/el/figures/open_drawer.png
+share/gnome/help/user-guide/el/figures/openwindows_menu.png
+share/gnome/help/user-guide/el/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/el/figures/resize_pointer.png
+share/gnome/help/user-guide/el/figures/run_button.png
+share/gnome/help/user-guide/el/figures/sample_applet.png
+share/gnome/help/user-guide/el/figures/screenshot_button.png
+share/gnome/help/user-guide/el/figures/searchtool_button.png
+share/gnome/help/user-guide/el/figures/show_desktop_button.png
+share/gnome/help/user-guide/el/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/el/figures/titlebar_window.png
+share/gnome/help/user-guide/el/figures/typical_menu.png
+share/gnome/help/user-guide/el/figures/window_list_applet.png
+share/gnome/help/user-guide/el/figures/window_list_group_applet.png
+share/gnome/help/user-guide/el/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/el/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/el/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/el/figures/yelp_preferences.png
+share/gnome/help/user-guide/el/figures/yelp_window.png
+share/gnome/help/user-guide/el/glossary.xml
+share/gnome/help/user-guide/el/gosbasic.xml
+share/gnome/help/user-guide/el/goscustdesk.xml
+share/gnome/help/user-guide/el/goseditmainmenu.xml
+share/gnome/help/user-guide/el/gosfeedback.xml
+share/gnome/help/user-guide/el/gosnautilus.xml
+share/gnome/help/user-guide/el/gosoverview.xml
+share/gnome/help/user-guide/el/gospanel.xml
+share/gnome/help/user-guide/el/gosstartsession.xml
+share/gnome/help/user-guide/el/gostools.xml
+share/gnome/help/user-guide/el/user-guide.xml
 share/gnome/help/user-guide/es/figures/ask_pointer.png
 share/gnome/help/user-guide/es/figures/busy_pointer.png
 share/gnome/help/user-guide/es/figures/com_file_manager_menu.png
@@ -497,6 +733,83 @@ share/gnome/help/user-guide/es/gospanel.xml
 share/gnome/help/user-guide/es/gosstartsession.xml
 share/gnome/help/user-guide/es/gostools.xml
 share/gnome/help/user-guide/es/user-guide.xml
+share/gnome/help/user-guide/fi/figures/ask_pointer.png
+share/gnome/help/user-guide/fi/figures/busy_pointer.png
+share/gnome/help/user-guide/fi/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/fi/figures/copy_pointer.png
+share/gnome/help/user-guide/fi/figures/force_quit.png
+share/gnome/help/user-guide/fi/figures/four_hide_button.png
+share/gnome/help/user-guide/fi/figures/gedit_window.png
+share/gnome/help/user-guide/fi/figures/gnome_panel.png
+share/gnome/help/user-guide/fi/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/fi/figures/ibeam_pointer.png
+share/gnome/help/user-guide/fi/figures/link_pointer.png
+share/gnome/help/user-guide/fi/figures/lockscreen_icon.png
+share/gnome/help/user-guide/fi/figures/logout_icon.png
+share/gnome/help/user-guide/fi/figures/menu_bar_applet.png
+share/gnome/help/user-guide/fi/figures/menu_panel.png
+share/gnome/help/user-guide/fi/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/fi/figures/move_pointer.png
+share/gnome/help/user-guide/fi/figures/movewindow_pointer.png
+share/gnome/help/user-guide/fi/figures/naut_browser_mode.png
+share/gnome/help/user-guide/fi/figures/naut_button_bar.png
+share/gnome/help/user-guide/fi/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/fi/figures/naut_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_go_to_location.png
+share/gnome/help/user-guide/fi/figures/naut_link_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/fi/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/fi/figures/naut_refine_search.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/fi/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/fi/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/fi/figures/naut_search_bar.png
+share/gnome/help/user-guide/fi/figures/naut_search_results.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/fi/figures/naut_spatial_view.png
+share/gnome/help/user-guide/fi/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/fi/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/fi/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/fi/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/fi/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/fi/figures/normal_pointer.png
+share/gnome/help/user-guide/fi/figures/not_available_pointer.png
+share/gnome/help/user-guide/fi/figures/notification_area_icon.png
+share/gnome/help/user-guide/fi/figures/open_drawer.png
+share/gnome/help/user-guide/fi/figures/openwindows_menu.png
+share/gnome/help/user-guide/fi/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/fi/figures/resize_pointer.png
+share/gnome/help/user-guide/fi/figures/run_button.png
+share/gnome/help/user-guide/fi/figures/sample_applet.png
+share/gnome/help/user-guide/fi/figures/screenshot_button.png
+share/gnome/help/user-guide/fi/figures/searchtool_button.png
+share/gnome/help/user-guide/fi/figures/show_desktop_button.png
+share/gnome/help/user-guide/fi/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/fi/figures/titlebar_window.png
+share/gnome/help/user-guide/fi/figures/typical_menu.png
+share/gnome/help/user-guide/fi/figures/window_list_applet.png
+share/gnome/help/user-guide/fi/figures/window_list_group_applet.png
+share/gnome/help/user-guide/fi/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/fi/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/fi/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/fi/figures/yelp_preferences.png
+share/gnome/help/user-guide/fi/figures/yelp_window.png
+share/gnome/help/user-guide/fi/glossary.xml
+share/gnome/help/user-guide/fi/gosbasic.xml
+share/gnome/help/user-guide/fi/goscustdesk.xml
+share/gnome/help/user-guide/fi/goseditmainmenu.xml
+share/gnome/help/user-guide/fi/gosfeedback.xml
+share/gnome/help/user-guide/fi/gosnautilus.xml
+share/gnome/help/user-guide/fi/gosoverview.xml
+share/gnome/help/user-guide/fi/gospanel.xml
+share/gnome/help/user-guide/fi/gosstartsession.xml
+share/gnome/help/user-guide/fi/gostools.xml
+share/gnome/help/user-guide/fi/user-guide.xml
 share/gnome/help/user-guide/fr/figures/ask_pointer.png
 share/gnome/help/user-guide/fr/figures/busy_pointer.png
 share/gnome/help/user-guide/fr/figures/com_file_manager_menu.png
@@ -574,6 +887,83 @@ share/gnome/help/user-guide/fr/gospanel.xml
 share/gnome/help/user-guide/fr/gosstartsession.xml
 share/gnome/help/user-guide/fr/gostools.xml
 share/gnome/help/user-guide/fr/user-guide.xml
+share/gnome/help/user-guide/hu/figures/ask_pointer.png
+share/gnome/help/user-guide/hu/figures/busy_pointer.png
+share/gnome/help/user-guide/hu/figures/com_file_manager_menu.png
+share/gnome/help/user-guide/hu/figures/copy_pointer.png
+share/gnome/help/user-guide/hu/figures/force_quit.png
+share/gnome/help/user-guide/hu/figures/four_hide_button.png
+share/gnome/help/user-guide/hu/figures/gedit_window.png
+share/gnome/help/user-guide/hu/figures/gnome_panel.png
+share/gnome/help/user-guide/hu/figures/hyperlink_pointer.png
+share/gnome/help/user-guide/hu/figures/ibeam_pointer.png
+share/gnome/help/user-guide/hu/figures/link_pointer.png
+share/gnome/help/user-guide/hu/figures/lockscreen_icon.png
+share/gnome/help/user-guide/hu/figures/logout_icon.png
+share/gnome/help/user-guide/hu/figures/menu_bar_applet.png
+share/gnome/help/user-guide/hu/figures/menu_panel.png
+share/gnome/help/user-guide/hu/figures/move_panel_object_pointer.png
+share/gnome/help/user-guide/hu/figures/move_pointer.png
+share/gnome/help/user-guide/hu/figures/movewindow_pointer.png
+share/gnome/help/user-guide/hu/figures/naut_browser_mode.png
+share/gnome/help/user-guide/hu/figures/naut_button_bar.png
+share/gnome/help/user-guide/hu/figures/naut_computer_launcher.png
+share/gnome/help/user-guide/hu/figures/naut_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_go_to_location.png
+share/gnome/help/user-guide/hu/figures/naut_link_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_noread_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_normal_size_button.png
+share/gnome/help/user-guide/hu/figures/naut_nowrite_emblem.png
+share/gnome/help/user-guide/hu/figures/naut_refine_search.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem1_icon.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem2_icon.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem3_icon.png
+share/gnome/help/user-guide/hu/figures/naut_sampleemblem_icon.png
+share/gnome/help/user-guide/hu/figures/naut_samplesymlink_icon.png
+share/gnome/help/user-guide/hu/figures/naut_search_bar.png
+share/gnome/help/user-guide/hu/figures/naut_search_results.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_icon_view.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_list_view.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_mode.png
+share/gnome/help/user-guide/hu/figures/naut_spatial_view.png
+share/gnome/help/user-guide/hu/figures/naut_starthere_launcher.png
+share/gnome/help/user-guide/hu/figures/naut_trash_launcher.png
+share/gnome/help/user-guide/hu/figures/naut_zoom_in_button.png
+share/gnome/help/user-guide/hu/figures/naut_zoom_out_button.png
+share/gnome/help/user-guide/hu/figures/nautilus_restore_saved_search.png
+share/gnome/help/user-guide/hu/figures/normal_pointer.png
+share/gnome/help/user-guide/hu/figures/not_available_pointer.png
+share/gnome/help/user-guide/hu/figures/notification_area_icon.png
+share/gnome/help/user-guide/hu/figures/open_drawer.png
+share/gnome/help/user-guide/hu/figures/openwindows_menu.png
+share/gnome/help/user-guide/hu/figures/panel_object_popup_menu.png
+share/gnome/help/user-guide/hu/figures/resize_pointer.png
+share/gnome/help/user-guide/hu/figures/run_button.png
+share/gnome/help/user-guide/hu/figures/sample_applet.png
+share/gnome/help/user-guide/hu/figures/screenshot_button.png
+share/gnome/help/user-guide/hu/figures/searchtool_button.png
+share/gnome/help/user-guide/hu/figures/show_desktop_button.png
+share/gnome/help/user-guide/hu/figures/titlebar_anno_window.png
+share/gnome/help/user-guide/hu/figures/titlebar_window.png
+share/gnome/help/user-guide/hu/figures/typical_menu.png
+share/gnome/help/user-guide/hu/figures/window_list_applet.png
+share/gnome/help/user-guide/hu/figures/window_list_group_applet.png
+share/gnome/help/user-guide/hu/figures/workspace_switcher_applet.png
+share/gnome/help/user-guide/hu/figures/yelp_add_bookmark.png
+share/gnome/help/user-guide/hu/figures/yelp_edit_bookmarks.png
+share/gnome/help/user-guide/hu/figures/yelp_preferences.png
+share/gnome/help/user-guide/hu/figures/yelp_window.png
+share/gnome/help/user-guide/hu/glossary.xml
+share/gnome/help/user-guide/hu/gosbasic.xml
+share/gnome/help/user-guide/hu/goscustdesk.xml
+share/gnome/help/user-guide/hu/goseditmainmenu.xml
+share/gnome/help/user-guide/hu/gosfeedback.xml
+share/gnome/help/user-guide/hu/gosnautilus.xml
+share/gnome/help/user-guide/hu/gosoverview.xml
+share/gnome/help/user-guide/hu/gospanel.xml
+share/gnome/help/user-guide/hu/gosstartsession.xml
+share/gnome/help/user-guide/hu/gostools.xml
+share/gnome/help/user-guide/hu/user-guide.xml
 share/gnome/help/user-guide/it/figures/ask_pointer.png
 share/gnome/help/user-guide/it/figures/busy_pointer.png
 share/gnome/help/user-guide/it/figures/com_file_manager_menu.png
@@ -1190,34 +1580,42 @@ share/gnome/help/user-guide/zh_CN/gospanel.xml
 share/gnome/help/user-guide/zh_CN/gosstartsession.xml
 share/gnome/help/user-guide/zh_CN/gostools.xml
 share/gnome/help/user-guide/zh_CN/user-guide.xml
-share/gnome/omf/gnome-access-guide/gnome-access-guide-C.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-en_GB.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-es.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-fr.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-it.omf
-share/gnome/omf/gnome-access-guide/gnome-access-guide-sv.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-C.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-es.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-fr.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-it.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-pa.omf
-share/gnome/omf/system-admin-guide/system-admin-guide-sv.omf
-share/gnome/omf/user-guide/user-guide-C.omf
-share/gnome/omf/user-guide/user-guide-ar.omf
-share/gnome/omf/user-guide/user-guide-bg.omf
-share/gnome/omf/user-guide/user-guide-es.omf
-share/gnome/omf/user-guide/user-guide-fr.omf
-share/gnome/omf/user-guide/user-guide-it.omf
-share/gnome/omf/user-guide/user-guide-ko.omf
-share/gnome/omf/user-guide/user-guide-pa.omf
-share/gnome/omf/user-guide/user-guide-pt.omf
-share/gnome/omf/user-guide/user-guide-pt_BR.omf
-share/gnome/omf/user-guide/user-guide-ru.omf
-share/gnome/omf/user-guide/user-guide-sv.omf
-share/gnome/omf/user-guide/user-guide-zh_CN.omf
-@dirrm share/gnome/omf/user-guide
-@dirrm share/gnome/omf/system-admin-guide
-@dirrm share/gnome/omf/gnome-access-guide
+share/omf/gnome-access-guide/gnome-access-guide-C.omf
+share/omf/gnome-access-guide/gnome-access-guide-de.omf
+share/omf/gnome-access-guide/gnome-access-guide-el.omf
+share/omf/gnome-access-guide/gnome-access-guide-en_GB.omf
+share/omf/gnome-access-guide/gnome-access-guide-es.omf
+share/omf/gnome-access-guide/gnome-access-guide-fr.omf
+share/omf/gnome-access-guide/gnome-access-guide-it.omf
+share/omf/gnome-access-guide/gnome-access-guide-pt.omf
+share/omf/gnome-access-guide/gnome-access-guide-sv.omf
+share/omf/system-admin-guide/system-admin-guide-C.omf
+share/omf/system-admin-guide/system-admin-guide-es.omf
+share/omf/system-admin-guide/system-admin-guide-fr.omf
+share/omf/system-admin-guide/system-admin-guide-it.omf
+share/omf/system-admin-guide/system-admin-guide-pa.omf
+share/omf/system-admin-guide/system-admin-guide-pt.omf
+share/omf/system-admin-guide/system-admin-guide-sv.omf
+share/omf/user-guide/user-guide-C.omf
+share/omf/user-guide/user-guide-ar.omf
+share/omf/user-guide/user-guide-bg.omf
+share/omf/user-guide/user-guide-de.omf
+share/omf/user-guide/user-guide-el.omf
+share/omf/user-guide/user-guide-es.omf
+share/omf/user-guide/user-guide-fi.omf
+share/omf/user-guide/user-guide-fr.omf
+share/omf/user-guide/user-guide-hu.omf
+share/omf/user-guide/user-guide-it.omf
+share/omf/user-guide/user-guide-ko.omf
+share/omf/user-guide/user-guide-pa.omf
+share/omf/user-guide/user-guide-pt.omf
+share/omf/user-guide/user-guide-pt_BR.omf
+share/omf/user-guide/user-guide-ru.omf
+share/omf/user-guide/user-guide-sv.omf
+share/omf/user-guide/user-guide-zh_CN.omf
+@dirrm share/omf/user-guide
+@dirrm share/omf/system-admin-guide
+@dirrm share/omf/gnome-access-guide
 @dirrm share/gnome/help/user-guide/zh_CN/figures
 @dirrm share/gnome/help/user-guide/zh_CN
 @dirrm share/gnome/help/user-guide/sv/figures
@@ -1234,10 +1632,18 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/user-guide/ko
 @dirrm share/gnome/help/user-guide/it/figures
 @dirrm share/gnome/help/user-guide/it
+@dirrm share/gnome/help/user-guide/hu/figures
+@dirrm share/gnome/help/user-guide/hu
 @dirrm share/gnome/help/user-guide/fr/figures
 @dirrm share/gnome/help/user-guide/fr
+@dirrm share/gnome/help/user-guide/fi/figures
+@dirrm share/gnome/help/user-guide/fi
 @dirrm share/gnome/help/user-guide/es/figures
 @dirrm share/gnome/help/user-guide/es
+@dirrm share/gnome/help/user-guide/el/figures
+@dirrm share/gnome/help/user-guide/el
+@dirrm share/gnome/help/user-guide/de/figures
+@dirrm share/gnome/help/user-guide/de
 @dirrm share/gnome/help/user-guide/bg/figures
 @dirrm share/gnome/help/user-guide/bg
 @dirrm share/gnome/help/user-guide/ar/figures
@@ -1246,6 +1652,7 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/user-guide/C
 @dirrm share/gnome/help/user-guide
 @dirrm share/gnome/help/system-admin-guide/sv
+@dirrm share/gnome/help/system-admin-guide/pt
 @dirrm share/gnome/help/system-admin-guide/pa
 @dirrm share/gnome/help/system-admin-guide/it
 @dirrm share/gnome/help/system-admin-guide/fr
@@ -1254,6 +1661,8 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/system-admin-guide
 @dirrm share/gnome/help/gnome-access-guide/sv/figures
 @dirrm share/gnome/help/gnome-access-guide/sv
+@dirrm share/gnome/help/gnome-access-guide/pt/figures
+@dirrm share/gnome/help/gnome-access-guide/pt
 @dirrm share/gnome/help/gnome-access-guide/it/figures
 @dirrm share/gnome/help/gnome-access-guide/it
 @dirrm share/gnome/help/gnome-access-guide/fr/figures
@@ -1262,6 +1671,10 @@ share/gnome/omf/user-guide/user-guide-zh_CN.omf
 @dirrm share/gnome/help/gnome-access-guide/es
 @dirrm share/gnome/help/gnome-access-guide/en_GB/figures
 @dirrm share/gnome/help/gnome-access-guide/en_GB
+@dirrm share/gnome/help/gnome-access-guide/el/figures
+@dirrm share/gnome/help/gnome-access-guide/el
+@dirrm share/gnome/help/gnome-access-guide/de/figures
+@dirrm share/gnome/help/gnome-access-guide/de
 @dirrm share/gnome/help/gnome-access-guide/C/figures
 @dirrm share/gnome/help/gnome-access-guide/C
 @dirrm share/gnome/help/gnome-access-guide
diff --git a/misc/gnome2-reference/Makefile b/misc/gnome2-reference/Makefile
new file mode 100644
index 000000000000..4913ad0db5a7
--- /dev/null
+++ b/misc/gnome2-reference/Makefile
@@ -0,0 +1,85 @@
+# New ports collection makefile for:	gnome2-reference
+# Date created:		2006-07-24
+# Whom:			Michael Johnson <ahze@FreeBSD.org>
+#
+# $FreeBSD$
+#    $MCom: ports/misc/gnome2-reference/Makefile,v 1.7 2007/09/04 21:54:03 ahze Exp $
+
+PORTNAME=	gnome2-reference
+PORTVERSION=	2.20
+CATEGORIES=	misc gnome
+MASTER_SITES=	# empty
+DISTFILES=	# empty
+EXTRACT_ONLY=	# empty
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	The "meta-port" for GNOME 2 programming references
+
+# Please keep this list alphabetically sorted.
+# If you add or remove an entry from REF_LIST you must
+# run 'make create-ref-list'
+
+REF_LIST=	accessibility/at-spi-reference \
+		accessibility/atk-reference \
+		accessibility/gail-reference \
+		databases/libgda2-reference \
+		databases/libgda3-reference \
+		databases/libgnomedb-reference \
+		devel/ORBit2-reference \
+		devel/gconf2-reference \
+		devel/glib20-reference \
+		devel/glibmm-reference \
+		devel/gnome-vfs-reference \
+		devel/libbonobo-reference \
+		devel/libglade2-reference \
+		devel/libsoup-reference \
+		graphics/cairo-reference \
+		graphics/libgnomecanvas-reference \
+		net/linc-reference \
+		print/libgnomeprint-reference \
+		textproc/gtkspell-reference \
+		textproc/libxml2-reference \
+		textproc/libxslt-reference \
+		x11/gnome-desktop-reference \
+		x11/gnome-panel-reference \
+		x11/libgnome-reference \
+		x11-fonts/fontconfig-reference \
+		x11-toolkits/gal2-reference \
+		x11-toolkits/gtk20-reference \
+		x11-toolkits/gtkmm20-reference \
+		x11-toolkits/gtkmm24-reference \
+		x11-toolkits/gtksourceview-reference \
+		x11-toolkits/libbonoboui-reference \
+		x11-toolkits/libgnomeui-reference \
+		x11-toolkits/libwnck-reference \
+		x11-toolkits/pango-reference \
+		x11-toolkits/vte-reference
+
+OPTIONS=	# empty
+NO_BUILD=	yes
+
+REF_LIST_INC=	${.CURDIR}/Makefile.inc
+.include "${REF_LIST_INC}"
+
+.include <bsd.port.pre.mk>
+
+.for ref in ${_PORT_REF_LIST:C/^([^:]+).*/\1/}
+OPTIONS+=	${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U} "Install ${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//} programing reference " on
+.endfor
+
+.for ref in ${_PORT_REF_LIST}
+.if !defined(WITHOUT_${ref:C|^[^/]+/([^/]+).*|\1|:S/-reference//:S/-/_/:U:C/^([^:]+).*/\1/})
+RUN_DEPENDS+=	${ref:C|^[^:]+:([^:]+).*|\1|:C|^[^/]+/([^/]+).*|\1|}>0:${PORTSDIR}/${ref:C/^([^:]+).*/\1/}
+.endif
+.endfor
+
+do-install:	# empty
+
+create-ref-list:
+	${CP} ${REF_LIST_INC} ${REF_LIST_INC}.bak
+	${ECHO_CMD} "_PORT_REF_LIST= \\" > ${REF_LIST_INC}
+.for port in ${REF_LIST}
+	(cd ${PORTSDIR}/${port} && ${ECHO_CMD} "${port}:`${MAKE} -V PORTNAME` \\" >> ${REF_LIST_INC})
+.endfor
+
+.include <bsd.port.post.mk>
diff --git a/misc/gnome2-reference/Makefile.inc b/misc/gnome2-reference/Makefile.inc
new file mode 100644
index 000000000000..3f1b5ec7afb4
--- /dev/null
+++ b/misc/gnome2-reference/Makefile.inc
@@ -0,0 +1,36 @@
+_PORT_REF_LIST= \
+accessibility/at-spi-reference:at-spi-reference \
+accessibility/atk-reference:atk-reference \
+accessibility/gail-reference:gail-reference \
+databases/libgda2-reference:libgda2-reference \
+databases/libgda3-reference:libgda3-reference \
+databases/libgnomedb-reference:libgnomedb-reference \
+devel/ORBit2-reference:ORBit2-reference \
+devel/gconf2-reference:gconf2-reference \
+devel/glib20-reference:glib-reference \
+devel/glibmm-reference:glibmm-reference \
+devel/gnome-vfs-reference:gnome-vfs-reference \
+devel/libbonobo-reference:libbonobo-reference \
+devel/libglade2-reference:libglade2-reference \
+devel/libsoup-reference:libsoup-reference \
+graphics/cairo-reference:cairo-reference \
+graphics/libgnomecanvas-reference:libgnomecanvas-reference \
+net/linc-reference:linc-reference \
+print/libgnomeprint-reference:libgnomeprint-reference \
+textproc/gtkspell-reference:gtkspell-reference \
+textproc/libxml2-reference:libxml2-reference \
+textproc/libxslt-reference:libxslt-reference \
+x11/gnome-desktop-reference:gnome-desktop-reference \
+x11/gnome-panel-reference:gnome-panel-reference \
+x11/libgnome-reference:libgnome-reference \
+x11-fonts/fontconfig-reference:fontconfig-reference \
+x11-toolkits/gal2-reference:gal2-reference \
+x11-toolkits/gtk20-reference:gtk-reference \
+x11-toolkits/gtkmm20-reference:gtkmm-reference \
+x11-toolkits/gtkmm24-reference:gtkmm-reference \
+x11-toolkits/gtksourceview-reference:gtksourceview-reference \
+x11-toolkits/libbonoboui-reference:libbonoboui-reference \
+x11-toolkits/libgnomeui-reference:libgnomeui-reference \
+x11-toolkits/libwnck-reference:libwnck-reference \
+x11-toolkits/pango-reference:pango-reference \
+x11-toolkits/vte-reference:vte-reference \
diff --git a/misc/gnome2-reference/pkg-descr b/misc/gnome2-reference/pkg-descr
new file mode 100644
index 000000000000..3ca7ff2fa4df
--- /dev/null
+++ b/misc/gnome2-reference/pkg-descr
@@ -0,0 +1 @@
+The "meta-port" for GNOME 2 programming references
diff --git a/misc/gnomehier/Makefile b/misc/gnomehier/Makefile
index 53dce1b470b3..2b96e5b7fd54 100644
--- a/misc/gnomehier/Makefile
+++ b/misc/gnomehier/Makefile
@@ -3,13 +3,13 @@
 # Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/misc/gnomehier/Makefile,v 1.14 2006/10/10 20:22:15 mezz Exp $
+#    $MCom: ports/misc/gnomehier/Makefile,v 1.29 2007/09/12 14:40:40 ahze Exp $
 #
 # !!DON'T BUMP PORTREVISION ON MTREE CHANGES ANYMORE!!
 
 PORTNAME=	gnomehier
-PORTVERSION=	2.2
-PORTREVISION=	2
+PORTVERSION=	2.3
+PORTREVISION=	10
 CATEGORIES=	misc gnome
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -44,8 +44,8 @@ pre-install:
 		< ${FILESDIR}/pkg-install.in > ${PKGINSTALL}
 
 pre-su-install:
-	${CHGRP} games ${WRKSRC}/share/gnome/games
-	${CHMOD} g=rwXs ${WRKSRC}/share/gnome/games
+	${CHGRP} games ${WRKSRC}/share/games
+	${CHMOD} g=rwXs ${WRKSRC}/share/games
 	cd ${WRKSRC} && \
 		${MTREE_CMD} -U -d -n -i -c -k "uname, gname, mode" \
 			> ${WRKDIR}/${GNOME_MTREE}
diff --git a/misc/gnomehier/files/dirlist b/misc/gnomehier/files/dirlist
index 65d17732c66a..5cadd8d1c75f 100644
--- a/misc/gnomehier/files/dirlist
+++ b/misc/gnomehier/files/dirlist
@@ -9,9 +9,9 @@ etc/gconf/gconf.xml.defaults
 etc/gconf/gconf.xml.mandatory
 etc/gconf/schemas
 etc/gnome
-etc/gnome/config
 etc/gnome-vfs-2.0
 etc/gnome-vfs-2.0/modules
+etc/gnome/config
 etc/sound
 etc/sound/events
 etc/vfs
@@ -29,17 +29,32 @@ lib/vfs
 lib/vfs/modules
 libdata/bonobo
 libdata/bonobo/servers
+share/applets
+share/applets/Amusements
+share/applets/Clocks
+share/applets/Monitors
+share/applets/Multimedia
+share/applets/Network
+share/applets/Utility
+share/application-registry
+share/capplets
+share/control-center
+share/control-center-2.0
+share/control-center-2.0/capplets
+share/control-center/Desktop
+share/control-center/Documents
+share/control-center/Peripherals
+share/control-center/Session
+share/control-center/capplets
+share/control-center/keybindings
 share/doc/libgda
+share/games
 share/gnome
-share/gnome/applets
-share/gnome/applets/Amusements
-share/gnome/applets/Clocks
-share/gnome/applets/Monitors
-share/gnome/applets/Multimedia
-share/gnome/applets/Network
-share/gnome/applets/Utility
-share/gnome/application-registry
-share/gnome/applications
+share/gnome-2.0
+share/gnome-2.0/ui
+share/gnome-about
+share/gnome-control-center
+share/gnome-control-center/keybindings
 share/gnome/apps
 share/gnome/apps/Applications
 share/gnome/apps/Audio
@@ -55,20 +70,7 @@ share/gnome/apps/Settings/Peripherals
 share/gnome/apps/Settings/Session
 share/gnome/apps/System
 share/gnome/apps/Utilities
-share/gnome/capplets
-share/gnome/control-center
-share/gnome/control-center-2.0
-share/gnome/control-center-2.0/capplets
-share/gnome/control-center/Desktop
-share/gnome/control-center/Documents
-share/gnome/control-center/Peripherals
-share/gnome/control-center/Session
-share/gnome/control-center/capplets
-share/gnome/fonts
-share/gnome/games
-share/gnome/gnome-2.0
-share/gnome/gnome-2.0/ui
-share/gnome/gnome-about
+share/gnome/autostart
 share/gnome/help
 share/gnome/help/fdl
 share/gnome/help/fdl/C
@@ -76,24 +78,21 @@ share/gnome/help/gpl
 share/gnome/help/gpl/C
 share/gnome/help/lgpl
 share/gnome/help/lgpl/C
-share/gnome/icons
-share/gnome/idl
-share/gnome/images
-share/gnome/mc
-share/gnome/mc/templates
-share/gnome/mime-info
-share/gnome/oaf
-share/gnome/omf
 share/gnome/panel
-share/gnome/pixmaps
-share/gnome/pixmaps/document-icons
-share/gnome/pixmaps/splash
-share/gnome/sgml
-share/gnome/sgml/docbook
-share/gnome/sgml/docbook/gnome-customization-0.1
-share/gnome/sounds
-share/gnome/themes
 share/gnome/ui
-share/gnome/vfolders
 share/gnome/wm-properties
-share/gnome/xmodmap
+share/images
+share/mc
+share/mc/templates
+share/mime-info
+share/oaf
+share/omf
+share/pixmaps/document-icons
+share/pixmaps/splash
+share/sgml/docbook
+share/sgml/docbook/gnome-customization-0.1
+share/sounds
+share/vala
+share/vala/vapi
+share/vfolders
+share/xmodmap
diff --git a/misc/gnomesword/Makefile b/misc/gnomesword/Makefile
index a478378f50f0..ac643d243e50 100644
--- a/misc/gnomesword/Makefile
+++ b/misc/gnomesword/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomesword
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gnomesword/files/patch-configure b/misc/gnomesword/files/patch-configure
index e5971dfbb18b..2338d3377c15 100644
--- a/misc/gnomesword/files/patch-configure
+++ b/misc/gnomesword/files/patch-configure
@@ -114,15 +114,3 @@
  
  
  
-@@ -26461,9 +26461,9 @@
- packagedatadir=share/${PACKAGE}
- packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
-+packagemenudir=share/gnome/applications
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
diff --git a/misc/gnomesword/pkg-plist b/misc/gnomesword/pkg-plist
index 114dc9592e5a..cfc98df237b8 100644
--- a/misc/gnomesword/pkg-plist
+++ b/misc/gnomesword/pkg-plist
@@ -5,15 +5,15 @@ bin/gnomesword2
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gnomesword.desktop
-share/gnome/gnomesword/bookmarks.glade
-share/gnome/gnomesword/editor_note.xml
-share/gnome/gnomesword/editor_studypad.xml
-share/gnome/gnomesword/logo.png
-share/gnome/gnomesword/module-manager.glade
-share/gnome/gnomesword/prefs.glade
-share/gnome/gnomesword/search-dialog.glade
-share/gnome/gnomesword/sword3.png
+share/applications/gnomesword.desktop
+share/gnomesword/bookmarks.glade
+share/gnomesword/editor_note.xml
+share/gnomesword/editor_studypad.xml
+share/gnomesword/logo.png
+share/gnomesword/module-manager.glade
+share/gnomesword/prefs.glade
+share/gnomesword/search-dialog.glade
+share/gnomesword/sword3.png
 share/gnome/help/gnomesword/C/authors.xml
 share/gnome/help/gnomesword/C/figures/first_start.png
 share/gnome/help/gnomesword/C/figures/interface.png
@@ -144,25 +144,25 @@ share/gnome/help/gnomesword/fr/preferences.xml
 share/gnome/help/gnomesword/fr/search.xml
 share/gnome/help/gnomesword/fr/start.xml
 share/gnome/help/gnomesword/fr/studypad.xml
-share/gnome/pixmaps/gnomesword/about.png
-share/gnome/pixmaps/gnomesword/dlg-un.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmark-page.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmarks.png
-share/gnome/pixmaps/gnomesword/epiphany-secure.png
-share/gnome/pixmaps/gnomesword/epiphany-unsecure.png
-share/gnome/pixmaps/gnomesword/gnome-session.png
-share/gnome/pixmaps/gnomesword/gnome-window-manager.png
-share/gnome/pixmaps/gnomesword/gnome-windows.png
-share/gnome/pixmaps/gnomesword/gs2-48x48.ico
-share/gnome/pixmaps/gnomesword/gs2-48x48.png
-share/gnome/pixmaps/gnomesword/init-settings.png
-share/gnome/pixmaps/gnomesword/logo.png
-share/gnome/pixmaps/gnomesword/new_tab_button.png
-share/gnome/pixmaps/gnomesword/splash.png
-share/gnome/pixmaps/gnomesword/splash2.png
-share/gnome/pixmaps/gnomesword/sword.png
-share/gnome/pixmaps/gnomesword/sword3.png
-share/gnome/pixmaps/gnomesword/tt.png
+share/pixmaps/gnomesword/about.png
+share/pixmaps/gnomesword/dlg-un.png
+share/pixmaps/gnomesword/epiphany-bookmark-page.png
+share/pixmaps/gnomesword/epiphany-bookmarks.png
+share/pixmaps/gnomesword/epiphany-secure.png
+share/pixmaps/gnomesword/epiphany-unsecure.png
+share/pixmaps/gnomesword/gnome-session.png
+share/pixmaps/gnomesword/gnome-window-manager.png
+share/pixmaps/gnomesword/gnome-windows.png
+share/pixmaps/gnomesword/gs2-48x48.ico
+share/pixmaps/gnomesword/gs2-48x48.png
+share/pixmaps/gnomesword/init-settings.png
+share/pixmaps/gnomesword/logo.png
+share/pixmaps/gnomesword/new_tab_button.png
+share/pixmaps/gnomesword/splash.png
+share/pixmaps/gnomesword/splash2.png
+share/pixmaps/gnomesword/sword.png
+share/pixmaps/gnomesword/sword3.png
+share/pixmaps/gnomesword/tt.png
 share/locale/bg/LC_MESSAGES/gnomesword.mo
 share/locale/cs/LC_MESSAGES/gnomesword.mo
 share/locale/de/LC_MESSAGES/gnomesword.mo
@@ -174,7 +174,7 @@ share/locale/nl/LC_MESSAGES/gnomesword.mo
 share/locale/ru/LC_MESSAGES/gnomesword.mo
 share/locale/sk/LC_MESSAGES/gnomesword.mo
 share/locale/uk/LC_MESSAGES/gnomesword.mo
-@dirrm share/gnome/pixmaps/gnomesword
+@dirrm share/pixmaps/gnomesword
 @dirrm share/gnome/help/gnomesword/fr/figures
 @dirrm share/gnome/help/gnomesword/fr
 @dirrm share/gnome/help/gnomesword/de/figures
@@ -182,5 +182,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
 @dirrm share/gnome/help/gnomesword/C/figures
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
-@dirrm share/gnome/gnomesword
+@dirrm share/gnomesword
 @dirrm %%DOCSDIR%%
+@dirrmtry share/applications
diff --git a/misc/gregexp/Makefile b/misc/gregexp/Makefile
index 1a99398a71d9..33cef335c225 100644
--- a/misc/gregexp/Makefile
+++ b/misc/gregexp/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gregexp
 PORTVERSION=	0.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://dentrassi.de/download/gregexp/%SUBDIR%/
 MASTER_SITE_SUBDIR=	${PORTVERSION}
diff --git a/misc/gregexp/pkg-plist b/misc/gregexp/pkg-plist
index 6af56fd53fb3..ccee0944ca07 100644
--- a/misc/gregexp/pkg-plist
+++ b/misc/gregexp/pkg-plist
@@ -1,6 +1,7 @@
 bin/gregexp
-share/gnome/applications/gregexp.desktop
-share/gnome/pixmaps/gregexp.png
-share/gnome/gregexp/glade/gregexp.glade
-@dirrm share/gnome/gregexp/glade
-@dirrm share/gnome/gregexp
+share/applications/gregexp.desktop
+share/pixmaps/gregexp.png
+share/gregexp/glade/gregexp.glade
+@dirrm share/gregexp/glade
+@dirrm share/gregexp
+@dirrmtry share/applications
diff --git a/misc/gtktalog/Makefile b/misc/gtktalog/Makefile
index 204a2070e581..09b4d28aef56 100644
--- a/misc/gtktalog/Makefile
+++ b/misc/gtktalog/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gtktalog
 PORTVERSION=	1.0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SAVANNAH}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/gtktalog/pkg-plist b/misc/gtktalog/pkg-plist
index 4985306d311a..a98d60ed9336 100644
--- a/misc/gtktalog/pkg-plist
+++ b/misc/gtktalog/pkg-plist
@@ -11,53 +11,53 @@ lib/gtktalog/mpeginfo
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
 share/gnome/apps/Applications/gtktalog.desktop
-share/gnome/gtktalog/gtktalog.cf
-share/gnome/gtktalog/icons/c.xpm
-share/gnome/gtktalog/icons/cat.xpm
-share/gnome/gtktalog/icons/cpp.xpm
-share/gnome/gtktalog/icons/deb.xpm
-share/gnome/gtktalog/icons/default_dir.xpm
-share/gnome/gtktalog/icons/default_disk.xpm
-share/gnome/gtktalog/icons/default_file.xpm
-share/gnome/gtktalog/icons/default_opened_dir.xpm
-share/gnome/gtktalog/icons/default_opened_disk.xpm
-share/gnome/gtktalog/icons/default_opened_vfs.xpm
-share/gnome/gtktalog/icons/default_unreadable.xpm
-share/gnome/gtktalog/icons/default_vfs.xpm
-share/gnome/gtktalog/icons/doc.xpm
-share/gnome/gtktalog/icons/file.xpm
-share/gnome/gtktalog/icons/gz.xpm
-share/gnome/gtktalog/icons/h.xpm
-share/gnome/gtktalog/icons/html.xpm
-share/gnome/gtktalog/icons/image.xpm
-share/gnome/gtktalog/icons/java.xpm
-share/gnome/gtktalog/icons/logo.xpm
-share/gnome/gtktalog/icons/movie.xpm
-share/gnome/gtktalog/icons/mp3.xpm
-share/gnome/gtktalog/icons/pdf.xpm
-share/gnome/gtktalog/icons/rpm.xpm
-share/gnome/gtktalog/icons/so.xpm
-share/gnome/gtktalog/icons/son.xpm
-share/gnome/gtktalog/icons/txt.xpm
-share/gnome/gtktalog/xpm/add.xpm
-share/gnome/gtktalog/xpm/exit.xpm
-share/gnome/gtktalog/xpm/find.xpm
-share/gnome/gtktalog/xpm/help.xpm
-share/gnome/gtktalog/xpm/new.xpm
-share/gnome/gtktalog/xpm/off.xpm
-share/gnome/gtktalog/xpm/on.xpm
-share/gnome/gtktalog/xpm/open.xpm
-share/gnome/gtktalog/xpm/report.xpm
-share/gnome/gtktalog/xpm/save.xpm
-share/gnome/gtktalog/xpm/setup__Disk_setup.xpm
-share/gnome/gtktalog/xpm/setup__General_options.xpm
-share/gnome/gtktalog/xpm/setup__Information_plugins.xpm
-share/gnome/gtktalog/xpm/setup__LoadSave_options.xpm
-share/gnome/gtktalog/xpm/setup__MIME_type_icons.xpm
-share/gnome/gtktalog/xpm/setup__MIME_types_to_skip_during_a_scan.xpm
-share/gnome/gtktalog/xpm/setup__Scan_mime_types.xpm
-share/gnome/gtktalog/xpm/setup__Scan_options.xpm
-share/gnome/gtktalog/xpm/setup__Virtual_File_Systems.xpm
+%%DATADIR%%/gtktalog.cf
+%%DATADIR%%/icons/c.xpm
+%%DATADIR%%/icons/cat.xpm
+%%DATADIR%%/icons/cpp.xpm
+%%DATADIR%%/icons/deb.xpm
+%%DATADIR%%/icons/default_dir.xpm
+%%DATADIR%%/icons/default_disk.xpm
+%%DATADIR%%/icons/default_file.xpm
+%%DATADIR%%/icons/default_opened_dir.xpm
+%%DATADIR%%/icons/default_opened_disk.xpm
+%%DATADIR%%/icons/default_opened_vfs.xpm
+%%DATADIR%%/icons/default_unreadable.xpm
+%%DATADIR%%/icons/default_vfs.xpm
+%%DATADIR%%/icons/doc.xpm
+%%DATADIR%%/icons/file.xpm
+%%DATADIR%%/icons/gz.xpm
+%%DATADIR%%/icons/h.xpm
+%%DATADIR%%/icons/html.xpm
+%%DATADIR%%/icons/image.xpm
+%%DATADIR%%/icons/java.xpm
+%%DATADIR%%/icons/logo.xpm
+%%DATADIR%%/icons/movie.xpm
+%%DATADIR%%/icons/mp3.xpm
+%%DATADIR%%/icons/pdf.xpm
+%%DATADIR%%/icons/rpm.xpm
+%%DATADIR%%/icons/so.xpm
+%%DATADIR%%/icons/son.xpm
+%%DATADIR%%/icons/txt.xpm
+%%DATADIR%%/xpm/add.xpm
+%%DATADIR%%/xpm/exit.xpm
+%%DATADIR%%/xpm/find.xpm
+%%DATADIR%%/xpm/help.xpm
+%%DATADIR%%/xpm/new.xpm
+%%DATADIR%%/xpm/off.xpm
+%%DATADIR%%/xpm/on.xpm
+%%DATADIR%%/xpm/open.xpm
+%%DATADIR%%/xpm/report.xpm
+%%DATADIR%%/xpm/save.xpm
+%%DATADIR%%/xpm/setup__Disk_setup.xpm
+%%DATADIR%%/xpm/setup__General_options.xpm
+%%DATADIR%%/xpm/setup__Information_plugins.xpm
+%%DATADIR%%/xpm/setup__LoadSave_options.xpm
+%%DATADIR%%/xpm/setup__MIME_type_icons.xpm
+%%DATADIR%%/xpm/setup__MIME_types_to_skip_during_a_scan.xpm
+%%DATADIR%%/xpm/setup__Scan_mime_types.xpm
+%%DATADIR%%/xpm/setup__Scan_options.xpm
+%%DATADIR%%/xpm/setup__Virtual_File_Systems.xpm
 share/gnome/help/gtktalog/C/book1.html
 share/gnome/help/gtktalog/C/c1019.html
 share/gnome/help/gtktalog/C/c114.html
@@ -152,7 +152,7 @@ share/gnome/help/gtktalog/fr/x779.html
 share/gnome/help/gtktalog/fr/x835.html
 share/gnome/help/gtktalog/fr/x846.html
 share/gnome/help/gtktalog/fr/x947.html
-share/gnome/pixmaps/gtktalog.png
+share/pixmaps/gtktalog.png
 %%NLS%%share/locale/ca/LC_MESSAGES/gtktalog.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gtktalog.mo
 %%NLS%%share/locale/de/LC_MESSAGES/gtktalog.mo
@@ -171,7 +171,7 @@ share/gnome/pixmaps/gtktalog.png
 @dirrm share/gnome/help/gtktalog/fr
 @dirrm share/gnome/help/gtktalog/C
 @dirrm share/gnome/help/gtktalog
-@dirrm share/gnome/gtktalog/xpm
-@dirrm share/gnome/gtktalog/icons
-@dirrm share/gnome/gtktalog
+@dirrm %%DATADIR%%/xpm
+@dirrm %%DATADIR%%/icons
+@dirrm %%DATADIR%%
 @dirrm lib/gtktalog
diff --git a/misc/misterproper/Makefile b/misc/misterproper/Makefile
index 33e841fba8c2..6505db4a27e5 100644
--- a/misc/misterproper/Makefile
+++ b/misc/misterproper/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	misterproper
 PORTVERSION=	0.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 #ftp://misterproper.sourceforge.net/pub/misterproper/releases/ \
diff --git a/misc/misterproper/pkg-plist b/misc/misterproper/pkg-plist
index 024a47d0c863..d488520f5aaa 100644
--- a/misc/misterproper/pkg-plist
+++ b/misc/misterproper/pkg-plist
@@ -1,8 +1,8 @@
 bin/misterproper
-share/gnome/pixmaps/misterproper/misterproper.xpm
 share/locale/de/LC_MESSAGES/misterproper.mo
 share/locale/es/LC_MESSAGES/misterproper.mo
 share/locale/fr/LC_MESSAGES/misterproper.mo
 share/locale/pt/LC_MESSAGES/misterproper.mo
 share/locale/sv/LC_MESSAGES/misterproper.mo
-@dirrm share/gnome/pixmaps/misterproper
+share/pixmaps/misterproper/misterproper.xpm
+@dirrm share/pixmaps/misterproper
diff --git a/misc/pybliographer/Makefile b/misc/pybliographer/Makefile
index 95c7f18bba05..91234a6c1c02 100644
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pybliographer
 PORTVERSION=	1.0.11
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc python gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/pybliographer/1.0
@@ -41,8 +41,8 @@ pre-patch:
 
 post-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/${PORTNAME}
+		${PREFIX}/share/${PORTNAME}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
-		${PREFIX}/share/gnome/${PORTNAME}
+		${PREFIX}/share/${PORTNAME}
 
 .include <bsd.port.post.mk>
diff --git a/misc/pybliographer/pkg-plist b/misc/pybliographer/pkg-plist
index 70d8b74a6cdb..84c9934906b6 100644
--- a/misc/pybliographer/pkg-plist
+++ b/misc/pybliographer/pkg-plist
@@ -96,224 +96,224 @@ share/gnome/help/pybliographic/it/x305.html
 share/gnome/help/pybliographic/it/x329.html
 share/gnome/help/pybliographic/it/x369.html
 share/gnome/help/pybliographic/it/x55.html
-share/gnome/mime-info/pybliographic.keys
-share/gnome/mime-info/pybliographic.mime
-share/gnome/pixmaps/pybliographic-logo.png
-share/gnome/pixmaps/pybliographic.png
-share/gnome/pybliographer/Pyblio/Autoload.py
-share/gnome/pybliographer/Pyblio/Autoload.pyc
-share/gnome/pybliographer/Pyblio/Autoload.pyo
-share/gnome/pybliographer/Pyblio/Base.py
-share/gnome/pybliographer/Pyblio/Base.pyc
-share/gnome/pybliographer/Pyblio/Base.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Base.py
-share/gnome/pybliographer/Pyblio/ConfDir/Base.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Base.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX+.py
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX+.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX+.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX.py
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/BibTeX.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Gnome.py
-share/gnome/pybliographer/Pyblio/ConfDir/Gnome.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Gnome.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/GnomeUI.py
-share/gnome/pybliographer/Pyblio/ConfDir/GnomeUI.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/GnomeUI.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Medline.py
-share/gnome/pybliographer/Pyblio/ConfDir/Medline.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Medline.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Ovid.py
-share/gnome/pybliographer/Pyblio/ConfDir/Ovid.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Ovid.pyo
-share/gnome/pybliographer/Pyblio/ConfDir/Refer.py
-share/gnome/pybliographer/Pyblio/ConfDir/Refer.pyc
-share/gnome/pybliographer/Pyblio/ConfDir/Refer.pyo
-share/gnome/pybliographer/Pyblio/Config.py
-share/gnome/pybliographer/Pyblio/Config.pyc
-share/gnome/pybliographer/Pyblio/Config.pyo
-share/gnome/pybliographer/Pyblio/Connector.py
-share/gnome/pybliographer/Pyblio/Connector.pyc
-share/gnome/pybliographer/Pyblio/Connector.pyo
-share/gnome/pybliographer/Pyblio/Exceptions.py
-share/gnome/pybliographer/Pyblio/Exceptions.pyc
-share/gnome/pybliographer/Pyblio/Exceptions.pyo
-share/gnome/pybliographer/Pyblio/Fields.py
-share/gnome/pybliographer/Pyblio/Fields.pyc
-share/gnome/pybliographer/Pyblio/Fields.pyo
-share/gnome/pybliographer/Pyblio/Format/BibTeX.py
-share/gnome/pybliographer/Pyblio/Format/BibTeX.pyc
-share/gnome/pybliographer/Pyblio/Format/BibTeX.pyo
-share/gnome/pybliographer/Pyblio/Format/Medline.py
-share/gnome/pybliographer/Pyblio/Format/Medline.pyc
-share/gnome/pybliographer/Pyblio/Format/Medline.pyo
-share/gnome/pybliographer/Pyblio/Format/Ovid.py
-share/gnome/pybliographer/Pyblio/Format/Ovid.pyc
-share/gnome/pybliographer/Pyblio/Format/Ovid.pyo
-share/gnome/pybliographer/Pyblio/Format/OvidLike.py
-share/gnome/pybliographer/Pyblio/Format/OvidLike.pyc
-share/gnome/pybliographer/Pyblio/Format/OvidLike.pyo
-share/gnome/pybliographer/Pyblio/Format/Refer.py
-share/gnome/pybliographer/Pyblio/Format/Refer.pyc
-share/gnome/pybliographer/Pyblio/Format/Refer.pyo
-share/gnome/pybliographer/Pyblio/Format/__init__.py
-share/gnome/pybliographer/Pyblio/Format/__init__.pyc
-share/gnome/pybliographer/Pyblio/Format/__init__.pyo
-share/gnome/pybliographer/Pyblio/Format/isifile.py
-share/gnome/pybliographer/Pyblio/Format/isifile.pyc
-share/gnome/pybliographer/Pyblio/Format/isifile.pyo
-share/gnome/pybliographer/Pyblio/Formatter.py
-share/gnome/pybliographer/Pyblio/Formatter.pyc
-share/gnome/pybliographer/Pyblio/Formatter.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Config.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Config.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Config.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Document.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Document.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Document.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Editor.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Editor.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Editor.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Entry.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Entry.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Entry.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Fields.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Fields.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Fields.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/FieldsInfo.py
-share/gnome/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/FileSelector.py
-share/gnome/pybliographer/Pyblio/GnomeUI/FileSelector.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/FileSelector.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Format.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Format.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Format.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Index.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Index.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Index.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Mime.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Mime.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Mime.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Pybliographic.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Pybliographic.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Pybliographic.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Search.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Search.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Search.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Sort.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Sort.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Sort.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/Utils.py
-share/gnome/pybliographer/Pyblio/GnomeUI/Utils.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/Utils.pyo
-share/gnome/pybliographer/Pyblio/GnomeUI/__init__.py
-share/gnome/pybliographer/Pyblio/GnomeUI/__init__.pyc
-share/gnome/pybliographer/Pyblio/GnomeUI/__init__.pyo
-share/gnome/pybliographer/Pyblio/Help.py
-share/gnome/pybliographer/Pyblio/Help.pyc
-share/gnome/pybliographer/Pyblio/Help.pyo
-share/gnome/pybliographer/Pyblio/Iterator.py
-share/gnome/pybliographer/Pyblio/Iterator.pyc
-share/gnome/pybliographer/Pyblio/Iterator.pyo
-share/gnome/pybliographer/Pyblio/Key.py
-share/gnome/pybliographer/Pyblio/Key.pyc
-share/gnome/pybliographer/Pyblio/Key.pyo
-share/gnome/pybliographer/Pyblio/LyX.py
-share/gnome/pybliographer/Pyblio/LyX.pyc
-share/gnome/pybliographer/Pyblio/LyX.pyo
-share/gnome/pybliographer/Pyblio/Open.py
-share/gnome/pybliographer/Pyblio/Open.pyc
-share/gnome/pybliographer/Pyblio/Open.pyo
-share/gnome/pybliographer/Pyblio/Output/LaTeX.py
-share/gnome/pybliographer/Pyblio/Output/LaTeX.pyc
-share/gnome/pybliographer/Pyblio/Output/LaTeX.pyo
-share/gnome/pybliographer/Pyblio/Output/__init__.py
-share/gnome/pybliographer/Pyblio/Output/__init__.pyc
-share/gnome/pybliographer/Pyblio/Output/__init__.pyo
-share/gnome/pybliographer/Pyblio/Output/html.py
-share/gnome/pybliographer/Pyblio/Output/html.pyc
-share/gnome/pybliographer/Pyblio/Output/html.pyo
-share/gnome/pybliographer/Pyblio/Output/latexutils.py
-share/gnome/pybliographer/Pyblio/Output/latexutils.pyc
-share/gnome/pybliographer/Pyblio/Output/latexutils.pyo
-share/gnome/pybliographer/Pyblio/Output/raw.py
-share/gnome/pybliographer/Pyblio/Output/raw.pyc
-share/gnome/pybliographer/Pyblio/Output/raw.pyo
-share/gnome/pybliographer/Pyblio/Output/text.py
-share/gnome/pybliographer/Pyblio/Output/text.pyc
-share/gnome/pybliographer/Pyblio/Output/text.pyo
-share/gnome/pybliographer/Pyblio/Search.py
-share/gnome/pybliographer/Pyblio/Search.pyc
-share/gnome/pybliographer/Pyblio/Search.pyo
-share/gnome/pybliographer/Pyblio/Selection.py
-share/gnome/pybliographer/Pyblio/Selection.pyc
-share/gnome/pybliographer/Pyblio/Selection.pyo
-share/gnome/pybliographer/Pyblio/Sort.py
-share/gnome/pybliographer/Pyblio/Sort.pyc
-share/gnome/pybliographer/Pyblio/Sort.pyo
-share/gnome/pybliographer/Pyblio/Style/Generic.py
-share/gnome/pybliographer/Pyblio/Style/Generic.pyc
-share/gnome/pybliographer/Pyblio/Style/Generic.pyo
-share/gnome/pybliographer/Pyblio/Style/Parser.py
-share/gnome/pybliographer/Pyblio/Style/Parser.pyc
-share/gnome/pybliographer/Pyblio/Style/Parser.pyo
-share/gnome/pybliographer/Pyblio/Style/Utils.py
-share/gnome/pybliographer/Pyblio/Style/Utils.pyc
-share/gnome/pybliographer/Pyblio/Style/Utils.pyo
-share/gnome/pybliographer/Pyblio/Style/apa4e.py
-share/gnome/pybliographer/Pyblio/Style/apa4e.pyc
-share/gnome/pybliographer/Pyblio/Style/apa4e.pyo
-share/gnome/pybliographer/Pyblio/Style/__init__.py
-share/gnome/pybliographer/Pyblio/Style/__init__.pyc
-share/gnome/pybliographer/Pyblio/Style/__init__.pyo
-share/gnome/pybliographer/Pyblio/TextUI.py
-share/gnome/pybliographer/Pyblio/TextUI.pyc
-share/gnome/pybliographer/Pyblio/TextUI.pyo
-share/gnome/pybliographer/Pyblio/Types.py
-share/gnome/pybliographer/Pyblio/Types.pyc
-share/gnome/pybliographer/Pyblio/Types.pyo
-share/gnome/pybliographer/Pyblio/Utils.py
-share/gnome/pybliographer/Pyblio/Utils.pyc
-share/gnome/pybliographer/Pyblio/Utils.pyo
-share/gnome/pybliographer/Pyblio/__init__.py
-share/gnome/pybliographer/Pyblio/__init__.pyc
-share/gnome/pybliographer/Pyblio/__init__.pyo
-share/gnome/pybliographer/Pyblio/recode.py
-share/gnome/pybliographer/Pyblio/recode.pyc
-share/gnome/pybliographer/Pyblio/recode.pyo
-share/gnome/pybliographer/Pyblio/version.py
-share/gnome/pybliographer/Pyblio/version.pyc
-share/gnome/pybliographer/Pyblio/version.pyo
-share/gnome/pybliographer/Styles/Abbrev.xml
-share/gnome/pybliographer/Styles/Alpha.xml
-share/gnome/pybliographer/Styles/apa4e.xml
-share/gnome/pybliographer/Styles/bibstyle.dtd
-share/gnome/pybliographer/Pyblio/Query.py
-share/gnome/pybliographer/Pyblio/Query.pyc
-share/gnome/pybliographer/Pyblio/Query.pyo
-share/gnome/pybliographer/pybcheck.py
-share/gnome/pybliographer/pybcheck.pyc
-share/gnome/pybliographer/pybcheck.pyo
-share/gnome/pybliographer/pybcompact.py
-share/gnome/pybliographer/pybcompact.pyc
-share/gnome/pybliographer/pybcompact.pyo
-share/gnome/pybliographer/pybconvert.py
-share/gnome/pybliographer/pybconvert.pyc
-share/gnome/pybliographer/pybconvert.pyo
-share/gnome/pybliographer/pybformat.py
-share/gnome/pybliographer/pybformat.pyc
-share/gnome/pybliographer/pybformat.pyo
-share/gnome/pybliographer/pybliographic.py
-share/gnome/pybliographer/pybliographic.pyc
-share/gnome/pybliographer/pybliographic.pyo
-share/gnome/pybliographer/pybrc.py
-share/gnome/pybliographer/pybrc.pyc
-share/gnome/pybliographer/pybrc.pyo
-share/gnome/pybliographer/pybtex.py
-share/gnome/pybliographer/pybtex.pyc
-share/gnome/pybliographer/pybtex.pyo
+share/mime-info/pybliographic.keys
+share/mime-info/pybliographic.mime
+share/pixmaps/pybliographic-logo.png
+share/pixmaps/pybliographic.png
+share/pybliographer/Pyblio/Autoload.py
+share/pybliographer/Pyblio/Autoload.pyc
+share/pybliographer/Pyblio/Autoload.pyo
+share/pybliographer/Pyblio/Base.py
+share/pybliographer/Pyblio/Base.pyc
+share/pybliographer/Pyblio/Base.pyo
+share/pybliographer/Pyblio/ConfDir/Base.py
+share/pybliographer/Pyblio/ConfDir/Base.pyc
+share/pybliographer/Pyblio/ConfDir/Base.pyo
+share/pybliographer/Pyblio/ConfDir/BibTeX+.py
+share/pybliographer/Pyblio/ConfDir/BibTeX+.pyc
+share/pybliographer/Pyblio/ConfDir/BibTeX+.pyo
+share/pybliographer/Pyblio/ConfDir/BibTeX.py
+share/pybliographer/Pyblio/ConfDir/BibTeX.pyc
+share/pybliographer/Pyblio/ConfDir/BibTeX.pyo
+share/pybliographer/Pyblio/ConfDir/Gnome.py
+share/pybliographer/Pyblio/ConfDir/Gnome.pyc
+share/pybliographer/Pyblio/ConfDir/Gnome.pyo
+share/pybliographer/Pyblio/ConfDir/GnomeUI.py
+share/pybliographer/Pyblio/ConfDir/GnomeUI.pyc
+share/pybliographer/Pyblio/ConfDir/GnomeUI.pyo
+share/pybliographer/Pyblio/ConfDir/Medline.py
+share/pybliographer/Pyblio/ConfDir/Medline.pyc
+share/pybliographer/Pyblio/ConfDir/Medline.pyo
+share/pybliographer/Pyblio/ConfDir/Ovid.py
+share/pybliographer/Pyblio/ConfDir/Ovid.pyc
+share/pybliographer/Pyblio/ConfDir/Ovid.pyo
+share/pybliographer/Pyblio/ConfDir/Refer.py
+share/pybliographer/Pyblio/ConfDir/Refer.pyc
+share/pybliographer/Pyblio/ConfDir/Refer.pyo
+share/pybliographer/Pyblio/Config.py
+share/pybliographer/Pyblio/Config.pyc
+share/pybliographer/Pyblio/Config.pyo
+share/pybliographer/Pyblio/Connector.py
+share/pybliographer/Pyblio/Connector.pyc
+share/pybliographer/Pyblio/Connector.pyo
+share/pybliographer/Pyblio/Exceptions.py
+share/pybliographer/Pyblio/Exceptions.pyc
+share/pybliographer/Pyblio/Exceptions.pyo
+share/pybliographer/Pyblio/Fields.py
+share/pybliographer/Pyblio/Fields.pyc
+share/pybliographer/Pyblio/Fields.pyo
+share/pybliographer/Pyblio/Format/BibTeX.py
+share/pybliographer/Pyblio/Format/BibTeX.pyc
+share/pybliographer/Pyblio/Format/BibTeX.pyo
+share/pybliographer/Pyblio/Format/Medline.py
+share/pybliographer/Pyblio/Format/Medline.pyc
+share/pybliographer/Pyblio/Format/Medline.pyo
+share/pybliographer/Pyblio/Format/Ovid.py
+share/pybliographer/Pyblio/Format/Ovid.pyc
+share/pybliographer/Pyblio/Format/Ovid.pyo
+share/pybliographer/Pyblio/Format/OvidLike.py
+share/pybliographer/Pyblio/Format/OvidLike.pyc
+share/pybliographer/Pyblio/Format/OvidLike.pyo
+share/pybliographer/Pyblio/Format/Refer.py
+share/pybliographer/Pyblio/Format/Refer.pyc
+share/pybliographer/Pyblio/Format/Refer.pyo
+share/pybliographer/Pyblio/Format/__init__.py
+share/pybliographer/Pyblio/Format/__init__.pyc
+share/pybliographer/Pyblio/Format/__init__.pyo
+share/pybliographer/Pyblio/Format/isifile.py
+share/pybliographer/Pyblio/Format/isifile.pyc
+share/pybliographer/Pyblio/Format/isifile.pyo
+share/pybliographer/Pyblio/Formatter.py
+share/pybliographer/Pyblio/Formatter.pyc
+share/pybliographer/Pyblio/Formatter.pyo
+share/pybliographer/Pyblio/GnomeUI/Config.py
+share/pybliographer/Pyblio/GnomeUI/Config.pyc
+share/pybliographer/Pyblio/GnomeUI/Config.pyo
+share/pybliographer/Pyblio/GnomeUI/Document.py
+share/pybliographer/Pyblio/GnomeUI/Document.pyc
+share/pybliographer/Pyblio/GnomeUI/Document.pyo
+share/pybliographer/Pyblio/GnomeUI/Editor.py
+share/pybliographer/Pyblio/GnomeUI/Editor.pyc
+share/pybliographer/Pyblio/GnomeUI/Editor.pyo
+share/pybliographer/Pyblio/GnomeUI/Entry.py
+share/pybliographer/Pyblio/GnomeUI/Entry.pyc
+share/pybliographer/Pyblio/GnomeUI/Entry.pyo
+share/pybliographer/Pyblio/GnomeUI/Fields.py
+share/pybliographer/Pyblio/GnomeUI/Fields.pyc
+share/pybliographer/Pyblio/GnomeUI/Fields.pyo
+share/pybliographer/Pyblio/GnomeUI/FieldsInfo.py
+share/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyc
+share/pybliographer/Pyblio/GnomeUI/FieldsInfo.pyo
+share/pybliographer/Pyblio/GnomeUI/FileSelector.py
+share/pybliographer/Pyblio/GnomeUI/FileSelector.pyc
+share/pybliographer/Pyblio/GnomeUI/FileSelector.pyo
+share/pybliographer/Pyblio/GnomeUI/Format.py
+share/pybliographer/Pyblio/GnomeUI/Format.pyc
+share/pybliographer/Pyblio/GnomeUI/Format.pyo
+share/pybliographer/Pyblio/GnomeUI/Index.py
+share/pybliographer/Pyblio/GnomeUI/Index.pyc
+share/pybliographer/Pyblio/GnomeUI/Index.pyo
+share/pybliographer/Pyblio/GnomeUI/Mime.py
+share/pybliographer/Pyblio/GnomeUI/Mime.pyc
+share/pybliographer/Pyblio/GnomeUI/Mime.pyo
+share/pybliographer/Pyblio/GnomeUI/Pybliographic.py
+share/pybliographer/Pyblio/GnomeUI/Pybliographic.pyc
+share/pybliographer/Pyblio/GnomeUI/Pybliographic.pyo
+share/pybliographer/Pyblio/GnomeUI/Search.py
+share/pybliographer/Pyblio/GnomeUI/Search.pyc
+share/pybliographer/Pyblio/GnomeUI/Search.pyo
+share/pybliographer/Pyblio/GnomeUI/Sort.py
+share/pybliographer/Pyblio/GnomeUI/Sort.pyc
+share/pybliographer/Pyblio/GnomeUI/Sort.pyo
+share/pybliographer/Pyblio/GnomeUI/Utils.py
+share/pybliographer/Pyblio/GnomeUI/Utils.pyc
+share/pybliographer/Pyblio/GnomeUI/Utils.pyo
+share/pybliographer/Pyblio/GnomeUI/__init__.py
+share/pybliographer/Pyblio/GnomeUI/__init__.pyc
+share/pybliographer/Pyblio/GnomeUI/__init__.pyo
+share/pybliographer/Pyblio/Help.py
+share/pybliographer/Pyblio/Help.pyc
+share/pybliographer/Pyblio/Help.pyo
+share/pybliographer/Pyblio/Iterator.py
+share/pybliographer/Pyblio/Iterator.pyc
+share/pybliographer/Pyblio/Iterator.pyo
+share/pybliographer/Pyblio/Key.py
+share/pybliographer/Pyblio/Key.pyc
+share/pybliographer/Pyblio/Key.pyo
+share/pybliographer/Pyblio/LyX.py
+share/pybliographer/Pyblio/LyX.pyc
+share/pybliographer/Pyblio/LyX.pyo
+share/pybliographer/Pyblio/Open.py
+share/pybliographer/Pyblio/Open.pyc
+share/pybliographer/Pyblio/Open.pyo
+share/pybliographer/Pyblio/Output/LaTeX.py
+share/pybliographer/Pyblio/Output/LaTeX.pyc
+share/pybliographer/Pyblio/Output/LaTeX.pyo
+share/pybliographer/Pyblio/Output/__init__.py
+share/pybliographer/Pyblio/Output/__init__.pyc
+share/pybliographer/Pyblio/Output/__init__.pyo
+share/pybliographer/Pyblio/Output/html.py
+share/pybliographer/Pyblio/Output/html.pyc
+share/pybliographer/Pyblio/Output/html.pyo
+share/pybliographer/Pyblio/Output/latexutils.py
+share/pybliographer/Pyblio/Output/latexutils.pyc
+share/pybliographer/Pyblio/Output/latexutils.pyo
+share/pybliographer/Pyblio/Output/raw.py
+share/pybliographer/Pyblio/Output/raw.pyc
+share/pybliographer/Pyblio/Output/raw.pyo
+share/pybliographer/Pyblio/Output/text.py
+share/pybliographer/Pyblio/Output/text.pyc
+share/pybliographer/Pyblio/Output/text.pyo
+share/pybliographer/Pyblio/Search.py
+share/pybliographer/Pyblio/Search.pyc
+share/pybliographer/Pyblio/Search.pyo
+share/pybliographer/Pyblio/Selection.py
+share/pybliographer/Pyblio/Selection.pyc
+share/pybliographer/Pyblio/Selection.pyo
+share/pybliographer/Pyblio/Sort.py
+share/pybliographer/Pyblio/Sort.pyc
+share/pybliographer/Pyblio/Sort.pyo
+share/pybliographer/Pyblio/Style/Generic.py
+share/pybliographer/Pyblio/Style/Generic.pyc
+share/pybliographer/Pyblio/Style/Generic.pyo
+share/pybliographer/Pyblio/Style/Parser.py
+share/pybliographer/Pyblio/Style/Parser.pyc
+share/pybliographer/Pyblio/Style/Parser.pyo
+share/pybliographer/Pyblio/Style/Utils.py
+share/pybliographer/Pyblio/Style/Utils.pyc
+share/pybliographer/Pyblio/Style/Utils.pyo
+share/pybliographer/Pyblio/Style/apa4e.py
+share/pybliographer/Pyblio/Style/apa4e.pyc
+share/pybliographer/Pyblio/Style/apa4e.pyo
+share/pybliographer/Pyblio/Style/__init__.py
+share/pybliographer/Pyblio/Style/__init__.pyc
+share/pybliographer/Pyblio/Style/__init__.pyo
+share/pybliographer/Pyblio/TextUI.py
+share/pybliographer/Pyblio/TextUI.pyc
+share/pybliographer/Pyblio/TextUI.pyo
+share/pybliographer/Pyblio/Types.py
+share/pybliographer/Pyblio/Types.pyc
+share/pybliographer/Pyblio/Types.pyo
+share/pybliographer/Pyblio/Utils.py
+share/pybliographer/Pyblio/Utils.pyc
+share/pybliographer/Pyblio/Utils.pyo
+share/pybliographer/Pyblio/__init__.py
+share/pybliographer/Pyblio/__init__.pyc
+share/pybliographer/Pyblio/__init__.pyo
+share/pybliographer/Pyblio/recode.py
+share/pybliographer/Pyblio/recode.pyc
+share/pybliographer/Pyblio/recode.pyo
+share/pybliographer/Pyblio/version.py
+share/pybliographer/Pyblio/version.pyc
+share/pybliographer/Pyblio/version.pyo
+share/pybliographer/Styles/Abbrev.xml
+share/pybliographer/Styles/Alpha.xml
+share/pybliographer/Styles/apa4e.xml
+share/pybliographer/Styles/bibstyle.dtd
+share/pybliographer/Pyblio/Query.py
+share/pybliographer/Pyblio/Query.pyc
+share/pybliographer/Pyblio/Query.pyo
+share/pybliographer/pybcheck.py
+share/pybliographer/pybcheck.pyc
+share/pybliographer/pybcheck.pyo
+share/pybliographer/pybcompact.py
+share/pybliographer/pybcompact.pyc
+share/pybliographer/pybcompact.pyo
+share/pybliographer/pybconvert.py
+share/pybliographer/pybconvert.pyc
+share/pybliographer/pybconvert.pyo
+share/pybliographer/pybformat.py
+share/pybliographer/pybformat.pyc
+share/pybliographer/pybformat.pyo
+share/pybliographer/pybliographic.py
+share/pybliographer/pybliographic.pyc
+share/pybliographer/pybliographic.pyo
+share/pybliographer/pybrc.py
+share/pybliographer/pybrc.pyc
+share/pybliographer/pybrc.pyo
+share/pybliographer/pybtex.py
+share/pybliographer/pybtex.pyc
+share/pybliographer/pybtex.pyo
 share/locale/az/LC_MESSAGES/pybliographer.mo
 share/locale/da/LC_MESSAGES/pybliographer.mo
 share/locale/de/LC_MESSAGES/pybliographer.mo
@@ -328,15 +328,15 @@ share/locale/ru/LC_MESSAGES/pybliographer.mo
 share/locale/sv/LC_MESSAGES/pybliographer.mo
 share/locale/tr/LC_MESSAGES/pybliographer.mo
 share/locale/uk/LC_MESSAGES/pybliographer.mo
-@unexec rm -f %D/share/gnome/pybliographer/pybrc.old
-@dirrm share/gnome/pybliographer/Styles
-@dirrm share/gnome/pybliographer/Pyblio/Style
-@dirrm share/gnome/pybliographer/Pyblio/Output
-@dirrm share/gnome/pybliographer/Pyblio/GnomeUI
-@dirrm share/gnome/pybliographer/Pyblio/Format
-@dirrm share/gnome/pybliographer/Pyblio/ConfDir
-@dirrm share/gnome/pybliographer/Pyblio
-@dirrm share/gnome/pybliographer
+@unexec rm -f %D/share/pybliographer/pybrc.old
+@dirrm share/pybliographer/Styles
+@dirrm share/pybliographer/Pyblio/Style
+@dirrm share/pybliographer/Pyblio/Output
+@dirrm share/pybliographer/Pyblio/GnomeUI
+@dirrm share/pybliographer/Pyblio/Format
+@dirrm share/pybliographer/Pyblio/ConfDir
+@dirrm share/pybliographer/Pyblio
+@dirrm share/pybliographer
 @dirrm share/gnome/help/pybliographic/it/stylesheet-images
 @dirrm share/gnome/help/pybliographic/it
 @dirrm share/gnome/help/pybliographic/C/stylesheet-images
diff --git a/misc/quick-lounge-applet/Makefile b/misc/quick-lounge-applet/Makefile
index 393b398d2ade..346bd3206c91 100644
--- a/misc/quick-lounge-applet/Makefile
+++ b/misc/quick-lounge-applet/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.8 2005/09/18 13:53:05 kwm Exp $
+#   $MCom: ports/misc/quick-lounge-applet/Makefile,v 1.11 2007/05/19 21:36:14 marcus Exp $
 #
 
 PORTNAME=	quick-lounge-applet
 PORTVERSION=	2.12.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.12
diff --git a/misc/quick-lounge-applet/pkg-plist b/misc/quick-lounge-applet/pkg-plist
index e206c256f8ab..b7fe7f01d43b 100644
--- a/misc/quick-lounge-applet/pkg-plist
+++ b/misc/quick-lounge-applet/pkg-plist
@@ -1,6 +1,6 @@
 libdata/bonobo/servers/GNOME_QuickLoungeApplet_Factory.server
 libexec/quick-lounge-applet
-share/gnome/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
+share/gnome-2.0/ui/GNOME_QuickLoungeApplet.xml
 share/gnome/help/quick-lounge/C/figures/quick-lounge_down.png
 share/gnome/help/quick-lounge/C/figures/quick-lounge_end.png
 share/gnome/help/quick-lounge/C/figures/quick-lounge_start.png
@@ -88,18 +88,18 @@ share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_up.png
 share/gnome/help/quick-lounge/zh_TW/figures/quick-lounge_window.png
 share/gnome/help/quick-lounge/zh_TW/legal.xml
 share/gnome/help/quick-lounge/zh_TW/quick-lounge.xml
-share/gnome/omf/quick-lounge-applet/quick-lounge-C.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-de.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-es.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-fr.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-it.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-ja.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-ko.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-sv.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-zh_CN.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-zh_HK.omf
-share/gnome/omf/quick-lounge-applet/quick-lounge-zh_TW.omf
-share/gnome/quick-lounge-applet/glade/quick-lounge.glade
+share/omf/quick-lounge-applet/quick-lounge-C.omf
+share/omf/quick-lounge-applet/quick-lounge-de.omf
+share/omf/quick-lounge-applet/quick-lounge-es.omf
+share/omf/quick-lounge-applet/quick-lounge-fr.omf
+share/omf/quick-lounge-applet/quick-lounge-it.omf
+share/omf/quick-lounge-applet/quick-lounge-ja.omf
+share/omf/quick-lounge-applet/quick-lounge-ko.omf
+share/omf/quick-lounge-applet/quick-lounge-sv.omf
+share/omf/quick-lounge-applet/quick-lounge-zh_CN.omf
+share/omf/quick-lounge-applet/quick-lounge-zh_HK.omf
+share/omf/quick-lounge-applet/quick-lounge-zh_TW.omf
+share/quick-lounge-applet/glade/quick-lounge.glade
 share/icons/hicolor/48x48/apps/quick-lounge-applet.png
 share/locale/ar/LC_MESSAGES/quick-lounge-applet.mo
 share/locale/az/LC_MESSAGES/quick-lounge-applet.mo
@@ -144,9 +144,9 @@ share/locale/zh_CN/LC_MESSAGES/quick-lounge-applet.mo
 @dirrmtry share/locale/rw
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
-@dirrm share/gnome/quick-lounge-applet/glade
-@dirrm share/gnome/quick-lounge-applet
-@dirrm share/gnome/omf/quick-lounge-applet
+@dirrm share/quick-lounge-applet/glade
+@dirrm share/quick-lounge-applet
+@dirrm share/omf/quick-lounge-applet
 @dirrm share/gnome/help/quick-lounge/zh_TW/figures
 @dirrm share/gnome/help/quick-lounge/zh_TW
 @dirrm share/gnome/help/quick-lounge/zh_HK/figures
diff --git a/misc/shared-mime-info/Makefile b/misc/shared-mime-info/Makefile
index 98ace38e9e75..3302ea452dde 100644
--- a/misc/shared-mime-info/Makefile
+++ b/misc/shared-mime-info/Makefile
@@ -3,9 +3,12 @@
 # Whom:                olgeni@FreeBSD.org
 #
 # $FreeBSD$
+#   $MCom: ports/misc/shared-mime-info/Makefile,v 1.11 2007/08/09 19:33:41 marcus Exp $
+#
 
 PORTNAME=	shared-mime-info
 PORTVERSION=	0.22
+PORTREVISION=	1
 CATEGORIES=	misc gnome
 MASTER_SITES=	http://people.freedesktop.org/~hadess/
 
@@ -24,10 +27,8 @@ MAN1=		update-mime-database.1
 
 PKGINSTALL=	${WRKDIR}/pkg-install
 
-MIMEDIRS=	${LOCALBASE}/share/gnome/mime \
-		${LOCALBASE}/share/mime \
-		${PREFIX}/share/mime \
-		/usr/share/mime
+MIMEDIRS=	${LOCALBASE}/share/mime \
+		${PREFIX}/share/mime
 MIMESUBDIRS=	application audio image inode message model multipart \
 		packages text video
 
diff --git a/misc/shared-mime-info/files/patch-Makefile.in b/misc/shared-mime-info/files/patch-Makefile.in
index 4566071c59e5..6adf72809f1c 100644
--- a/misc/shared-mime-info/files/patch-Makefile.in
+++ b/misc/shared-mime-info/files/patch-Makefile.in
@@ -1,19 +1,10 @@
---- Makefile.in.orig	Sat Feb 10 04:50:08 2007
-+++ Makefile.in	Sat Feb 10 04:52:30 2007
-@@ -251,7 +251,7 @@ EXTRA_DIST = \
- 
- CLEANFILES = freedesktop.org.xml po/stamp-it
- DISTCLEANFILES = intltool-extract intltool-merge intltool-update
--pkgconfigdir = $(datadir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = shared-mime-info.pc
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-@@ -871,7 +871,11 @@ $(pkgconfig_DATA): config.status
+--- Makefile.in.orig	Fri Apr 27 16:56:45 2007
++++ Makefile.in	Fri Apr 27 16:57:14 2007
+@@ -901,7 +901,11 @@ $(pkgconfig_DATA): config.status
  @INTLTOOL_DESKTOP_RULE@
  
  install-data-hook: 
--@ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(prefix)/share/mime"
+-@ENABLE_UPDATE_MIMEDB_TRUE@	$(DESTDIR)"$(bindir)/update-mime-database" -V "$(DESTDIR)$(datadir)/mime"
 +@ENABLE_UPDATE_MIMEDB_TRUE@	for mdir in %%MIMEDIRS%%; do \
 +@ENABLE_UPDATE_MIMEDB_TRUE@		if [ -d $${mdir} ]; then \
 +@ENABLE_UPDATE_MIMEDB_TRUE@			$(DESTDIR)"$(bindir)/update-mime-database" "$${mdir}" ; \
@@ -21,4 +12,4 @@
 +@ENABLE_UPDATE_MIMEDB_TRUE@	done
  
  uninstall-hook:
- 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(prefix)/share/mime/$${media}/"*.xml; done
+ 	for media in text application image audio inode video message model multipart; do rm -f "$(DESTDIR)$(datadir)/mime/$${media}/"*.xml; done
diff --git a/misc/shared-mime-info/files/patch-update-mime-database.c b/misc/shared-mime-info/files/patch-update-mime-database.c
index bea38c5677ac..045f753d2035 100644
--- a/misc/shared-mime-info/files/patch-update-mime-database.c
+++ b/misc/shared-mime-info/files/patch-update-mime-database.c
@@ -1,5 +1,5 @@
 --- update-mime-database.c.orig	2007-06-27 15:46:53.000000000 -0400
-+++ update-mime-database.c	2007-08-09 15:21:39.000000000 -0400
++++ update-mime-database.c	2007-08-09 15:32:31.000000000 -0400
 @@ -445,7 +445,8 @@ static void remove_old(Type *type, xmlNo
  		}
  	}
@@ -15,7 +15,7 @@
  	env = getenv("XDG_DATA_DIRS");
  	if (!env)
 -		env = "/usr/local/share/"PATH_SEPARATOR"/usr/share/";
-+		env = "/usr/local/gnome/share/"PATH_SEPARATOR"/usr/local/share/"PATH_SEPARATOR"/usr/share/";
++		env = "/usr/local/share/";
  	dirs = g_strsplit(env, PATH_SEPARATOR, 0);
  	g_return_if_fail(dirs != NULL);
  	for (n = 0; dirs[n]; n++)
diff --git a/misc/terraform/Makefile b/misc/terraform/Makefile
index 118a60a4ecbe..a7023a8280ec 100644
--- a/misc/terraform/Makefile
+++ b/misc/terraform/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	terraform
 PORTVERSION=	0.9.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -32,8 +32,6 @@ post-patch:
 		 s|#define  1|#define HAVE_LIB_TRIO 1|g ; \
 		 s|(HAVE_LIB_TRIO)||g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e "s|malloc\.h|stdlib.h|g" ${WRKSRC}/src/xmlsupport.c
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|@datadir@/gnome/|@datadir@/|g'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/misc/terraform/files/patch-desktop-links::Makefile.in b/misc/terraform/files/patch-desktop-links::Makefile.in
index a279be1d90cf..f2a285ae6141 100644
--- a/misc/terraform/files/patch-desktop-links::Makefile.in
+++ b/misc/terraform/files/patch-desktop-links::Makefile.in
@@ -8,8 +8,8 @@
 -		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/apps/Graphics; \
 -		$(mkinstalldirs) $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
 -		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
-+		$(mkinstalldirs) $(GNOME_DATADIR)/apps/Graphics; \
-+		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/apps/Graphics; \
++		$(mkinstalldirs) $(GNOME_DATADIR)/gnome/apps/Graphics; \
++		$(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/apps/Graphics; \
  		$(mkinstalldirs) $(GNOME_DATADIR)/pixmaps; \
  		$(INSTALL_DATA) terraform.png $(GNOME_DATADIR)/pixmaps; \
  	fi
diff --git a/misc/terraform/pkg-plist b/misc/terraform/pkg-plist
index 2ca313f9eaa1..a345881e718f 100644
--- a/misc/terraform/pkg-plist
+++ b/misc/terraform/pkg-plist
@@ -20,78 +20,78 @@ share/gnome/help/terraform/fr/index.html
 share/gnome/help/terraform/fr/templates.html
 share/gnome/help/terraform/fr/topic.dat
 share/gnome/help/terraform/fr/tutorial.html
-share/gnome/pixmaps/terraform.png
-share/gnome/pixmaps/terraform/add.xpm
-share/gnome/pixmaps/terraform/arrow.xpm
-share/gnome/pixmaps/terraform/circle.xpm
-share/gnome/pixmaps/terraform/crop.xpm
-share/gnome/pixmaps/terraform/die.xpm
-share/gnome/pixmaps/terraform/gnome-question.png
-share/gnome/pixmaps/terraform/rectangle.xpm
-share/gnome/pixmaps/terraform/replace.xpm
-share/gnome/pixmaps/terraform/seed.xpm
-share/gnome/pixmaps/terraform/subtract.xpm
-share/gnome/pixmaps/terraform/terraform_logo.xpm
-share/gnome/pixmaps/terraform/zoom.xpm
-share/gnome/terraform/image_maps/moon_moon.png
-share/gnome/terraform/image_maps/sky_test_320x180.tga
-share/gnome/terraform/include/atmospheres/earth_fog.inc
-share/gnome/terraform/include/atmospheres/earth_haze_fast.inc
-share/gnome/terraform/include/atmospheres/earth_haze_slow.inc
-share/gnome/terraform/include/atmospheres/fog_ground.inc
-share/gnome/terraform/include/atmospheres/rainbow.inc
-share/gnome/terraform/include/defaults.inc
-share/gnome/terraform/include/earth_textures/earth_canyon_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_desert_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_green_landscape.inc
-share/gnome/terraform/include/earth_textures/earth_mountain_landscape.inc
-share/gnome/terraform/include/generic_land.inc
-share/gnome/terraform/include/generic_river.inc
-share/gnome/terraform/include/river_texture.inc
-share/gnome/terraform/include/skies/earth_regular_sky.inc
-share/gnome/terraform/include/skies/earth_static_sky.inc
-share/gnome/terraform/include/skies/include/clouds_01.inc
-share/gnome/terraform/include/skies/include/clouds_02.inc
-share/gnome/terraform/include/skies/include/clouds_03.inc
-share/gnome/terraform/include/skies/include/clouds_04.inc
-share/gnome/terraform/include/skies/include/clouds_05.inc
-share/gnome/terraform/include/skies/include/clouds_06.inc
-share/gnome/terraform/include/skies/include/clouds_07.inc
-share/gnome/terraform/include/skies/include/lights_standard.inc
-share/gnome/terraform/include/skies/include/lights_toymodel.inc
-share/gnome/terraform/include/skies/include/skycolor_earth.inc
-share/gnome/terraform/include/skies/include/stars_01.inc
-share/gnome/terraform/include/skies/include/stars_02.inc
-share/gnome/terraform/include/skies/include/stars_03.inc
-share/gnome/terraform/include/skies/include/stars_04.inc
-share/gnome/terraform/include/skies/include/stars_05.inc
-share/gnome/terraform/include/skies/include/stars_06.inc
-share/gnome/terraform/include/skies/mapped_sky.inc
-share/gnome/terraform/include/water/earth_water.inc
-share/gnome/terraform/objects/fern.gif
-share/gnome/terraform/objects/fern.inc
-share/gnome/terraform/objects/monolith.inc
-share/gnome/terraform/objects/tree_1.inc
-share/gnome/terraform/objects/tree_2.inc
-share/gnome/terraform/objects/tree_3.inc
-share/gnome/terraform/objects/tree_4.gif
-share/gnome/terraform/objects/tree_4.inc
-share/gnome/terraform/objects/tree_5.gif
-share/gnome/terraform/objects/tree_5.inc
-share/gnome/terraform/objects/tree_6.gif
-share/gnome/terraform/objects/tree_6.inc
+share/pixmaps/terraform.png
+share/pixmaps/terraform/add.xpm
+share/pixmaps/terraform/arrow.xpm
+share/pixmaps/terraform/circle.xpm
+share/pixmaps/terraform/crop.xpm
+share/pixmaps/terraform/die.xpm
+share/pixmaps/terraform/gnome-question.png
+share/pixmaps/terraform/rectangle.xpm
+share/pixmaps/terraform/replace.xpm
+share/pixmaps/terraform/seed.xpm
+share/pixmaps/terraform/subtract.xpm
+share/pixmaps/terraform/terraform_logo.xpm
+share/pixmaps/terraform/zoom.xpm
+share/terraform/image_maps/moon_moon.png
+share/terraform/image_maps/sky_test_320x180.tga
+share/terraform/include/atmospheres/earth_fog.inc
+share/terraform/include/atmospheres/earth_haze_fast.inc
+share/terraform/include/atmospheres/earth_haze_slow.inc
+share/terraform/include/atmospheres/fog_ground.inc
+share/terraform/include/atmospheres/rainbow.inc
+share/terraform/include/defaults.inc
+share/terraform/include/earth_textures/earth_canyon_landscape.inc
+share/terraform/include/earth_textures/earth_desert_landscape.inc
+share/terraform/include/earth_textures/earth_green_landscape.inc
+share/terraform/include/earth_textures/earth_mountain_landscape.inc
+share/terraform/include/generic_land.inc
+share/terraform/include/generic_river.inc
+share/terraform/include/river_texture.inc
+share/terraform/include/skies/earth_regular_sky.inc
+share/terraform/include/skies/earth_static_sky.inc
+share/terraform/include/skies/include/clouds_01.inc
+share/terraform/include/skies/include/clouds_02.inc
+share/terraform/include/skies/include/clouds_03.inc
+share/terraform/include/skies/include/clouds_04.inc
+share/terraform/include/skies/include/clouds_05.inc
+share/terraform/include/skies/include/clouds_06.inc
+share/terraform/include/skies/include/clouds_07.inc
+share/terraform/include/skies/include/lights_standard.inc
+share/terraform/include/skies/include/lights_toymodel.inc
+share/terraform/include/skies/include/skycolor_earth.inc
+share/terraform/include/skies/include/stars_01.inc
+share/terraform/include/skies/include/stars_02.inc
+share/terraform/include/skies/include/stars_03.inc
+share/terraform/include/skies/include/stars_04.inc
+share/terraform/include/skies/include/stars_05.inc
+share/terraform/include/skies/include/stars_06.inc
+share/terraform/include/skies/mapped_sky.inc
+share/terraform/include/water/earth_water.inc
+share/terraform/objects/fern.gif
+share/terraform/objects/fern.inc
+share/terraform/objects/monolith.inc
+share/terraform/objects/tree_1.inc
+share/terraform/objects/tree_2.inc
+share/terraform/objects/tree_3.inc
+share/terraform/objects/tree_4.gif
+share/terraform/objects/tree_4.inc
+share/terraform/objects/tree_5.gif
+share/terraform/objects/tree_5.inc
+share/terraform/objects/tree_6.gif
+share/terraform/objects/tree_6.inc
 share/locale/fr/LC_MESSAGES/terraform.mo
 share/locale/nl/LC_MESSAGES/terraform.mo
-@dirrm share/gnome/terraform/objects
-@dirrm share/gnome/terraform/include/water
-@dirrm share/gnome/terraform/include/skies/include
-@dirrm share/gnome/terraform/include/skies
-@dirrm share/gnome/terraform/include/earth_textures
-@dirrm share/gnome/terraform/include/atmospheres
-@dirrm share/gnome/terraform/include
-@dirrm share/gnome/terraform/image_maps
-@dirrm share/gnome/terraform
-@dirrm share/gnome/pixmaps/terraform
+@dirrm share/terraform/objects
+@dirrm share/terraform/include/water
+@dirrm share/terraform/include/skies/include
+@dirrm share/terraform/include/skies
+@dirrm share/terraform/include/earth_textures
+@dirrm share/terraform/include/atmospheres
+@dirrm share/terraform/include
+@dirrm share/terraform/image_maps
+@dirrm share/terraform
+@dirrm share/pixmaps/terraform
 @dirrm share/gnome/help/terraform/fr
 @dirrm share/gnome/help/terraform/C
 @dirrm share/gnome/help/terraform
diff --git a/misc/uf-view/Makefile b/misc/uf-view/Makefile
index bcf7066439a3..349c0acfdbd8 100644
--- a/misc/uf-view/Makefile
+++ b/misc/uf-view/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	uf-view
 PORTVERSION=	2.4
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc
 MASTER_SITES=	http://www.hadess.net/files/software/uf-view/
 
diff --git a/misc/uf-view/pkg-plist b/misc/uf-view/pkg-plist
index 2a257159072b..9d7e91604679 100644
--- a/misc/uf-view/pkg-plist
+++ b/misc/uf-view/pkg-plist
@@ -1,15 +1,15 @@
 bin/uf-view
-share/gnome/applications/uf-view.desktop
-share/gnome/pixmaps/uf-view/gnome-uf-view.png
-share/gnome/pixmaps/uf-view/uf-logo.png
-share/gnome/uf-view/at.desktop
-share/gnome/uf-view/ch.desktop
-share/gnome/uf-view/lg.desktop
-share/gnome/uf-view/ft.desktop
-share/gnome/uf-view/uf.desktop
-share/gnome/uf-view/pa.desktop
-share/gnome/uf-view/pvp.desktop
-share/gnome/uf-view/sf.desktop
+share/applications/uf-view.desktop
+share/pixmaps/uf-view/gnome-uf-view.png
+share/pixmaps/uf-view/uf-logo.png
+share/uf-view/at.desktop
+share/uf-view/ch.desktop
+share/uf-view/lg.desktop
+share/uf-view/ft.desktop
+share/uf-view/uf.desktop
+share/uf-view/pa.desktop
+share/uf-view/pvp.desktop
+share/uf-view/sf.desktop
 share/locale/az/LC_MESSAGES/uf-view.mo
 share/locale/be/LC_MESSAGES/uf-view.mo
 share/locale/cs/LC_MESSAGES/uf-view.mo
@@ -34,5 +34,6 @@ share/locale/sv/LC_MESSAGES/uf-view.mo
 share/locale/vi/LC_MESSAGES/uf-view.mo
 share/locale/wa/LC_MESSAGES/uf-view.mo
 share/locale/zh_CN/LC_MESSAGES/uf-view.mo
-@dirrm share/gnome/pixmaps/uf-view
-@dirrm share/gnome/uf-view
+@dirrm share/pixmaps/uf-view
+@dirrm share/uf-view
+@dirrmtry share/applications
diff --git a/misc/xiphos/Makefile b/misc/xiphos/Makefile
index a478378f50f0..ac643d243e50 100644
--- a/misc/xiphos/Makefile
+++ b/misc/xiphos/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	gnomesword
 PORTVERSION=	2.2.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/misc/xiphos/files/patch-configure b/misc/xiphos/files/patch-configure
index e5971dfbb18b..2338d3377c15 100644
--- a/misc/xiphos/files/patch-configure
+++ b/misc/xiphos/files/patch-configure
@@ -114,15 +114,3 @@
  
  
  
-@@ -26461,9 +26461,9 @@
- packagedatadir=share/${PACKAGE}
- packagedocdir=share/doc/${PACKAGE}
- 
--packagepixmapsdir=share/pixmaps/${PACKAGE}
-+packagepixmapsdir=share/gnome/pixmaps/${PACKAGE}
- packagehelpdir=share/gnome/help/${PACKAGE}
--packagemenudir=share/applications
-+packagemenudir=share/gnome/applications
- 
- NO_PREFIX_PACKAGE_DATA_DIR="${packagedatadir}"
- 
diff --git a/misc/xiphos/pkg-plist b/misc/xiphos/pkg-plist
index 114dc9592e5a..cfc98df237b8 100644
--- a/misc/xiphos/pkg-plist
+++ b/misc/xiphos/pkg-plist
@@ -5,15 +5,15 @@ bin/gnomesword2
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/TODO
-share/gnome/applications/gnomesword.desktop
-share/gnome/gnomesword/bookmarks.glade
-share/gnome/gnomesword/editor_note.xml
-share/gnome/gnomesword/editor_studypad.xml
-share/gnome/gnomesword/logo.png
-share/gnome/gnomesword/module-manager.glade
-share/gnome/gnomesword/prefs.glade
-share/gnome/gnomesword/search-dialog.glade
-share/gnome/gnomesword/sword3.png
+share/applications/gnomesword.desktop
+share/gnomesword/bookmarks.glade
+share/gnomesword/editor_note.xml
+share/gnomesword/editor_studypad.xml
+share/gnomesword/logo.png
+share/gnomesword/module-manager.glade
+share/gnomesword/prefs.glade
+share/gnomesword/search-dialog.glade
+share/gnomesword/sword3.png
 share/gnome/help/gnomesword/C/authors.xml
 share/gnome/help/gnomesword/C/figures/first_start.png
 share/gnome/help/gnomesword/C/figures/interface.png
@@ -144,25 +144,25 @@ share/gnome/help/gnomesword/fr/preferences.xml
 share/gnome/help/gnomesword/fr/search.xml
 share/gnome/help/gnomesword/fr/start.xml
 share/gnome/help/gnomesword/fr/studypad.xml
-share/gnome/pixmaps/gnomesword/about.png
-share/gnome/pixmaps/gnomesword/dlg-un.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmark-page.png
-share/gnome/pixmaps/gnomesword/epiphany-bookmarks.png
-share/gnome/pixmaps/gnomesword/epiphany-secure.png
-share/gnome/pixmaps/gnomesword/epiphany-unsecure.png
-share/gnome/pixmaps/gnomesword/gnome-session.png
-share/gnome/pixmaps/gnomesword/gnome-window-manager.png
-share/gnome/pixmaps/gnomesword/gnome-windows.png
-share/gnome/pixmaps/gnomesword/gs2-48x48.ico
-share/gnome/pixmaps/gnomesword/gs2-48x48.png
-share/gnome/pixmaps/gnomesword/init-settings.png
-share/gnome/pixmaps/gnomesword/logo.png
-share/gnome/pixmaps/gnomesword/new_tab_button.png
-share/gnome/pixmaps/gnomesword/splash.png
-share/gnome/pixmaps/gnomesword/splash2.png
-share/gnome/pixmaps/gnomesword/sword.png
-share/gnome/pixmaps/gnomesword/sword3.png
-share/gnome/pixmaps/gnomesword/tt.png
+share/pixmaps/gnomesword/about.png
+share/pixmaps/gnomesword/dlg-un.png
+share/pixmaps/gnomesword/epiphany-bookmark-page.png
+share/pixmaps/gnomesword/epiphany-bookmarks.png
+share/pixmaps/gnomesword/epiphany-secure.png
+share/pixmaps/gnomesword/epiphany-unsecure.png
+share/pixmaps/gnomesword/gnome-session.png
+share/pixmaps/gnomesword/gnome-window-manager.png
+share/pixmaps/gnomesword/gnome-windows.png
+share/pixmaps/gnomesword/gs2-48x48.ico
+share/pixmaps/gnomesword/gs2-48x48.png
+share/pixmaps/gnomesword/init-settings.png
+share/pixmaps/gnomesword/logo.png
+share/pixmaps/gnomesword/new_tab_button.png
+share/pixmaps/gnomesword/splash.png
+share/pixmaps/gnomesword/splash2.png
+share/pixmaps/gnomesword/sword.png
+share/pixmaps/gnomesword/sword3.png
+share/pixmaps/gnomesword/tt.png
 share/locale/bg/LC_MESSAGES/gnomesword.mo
 share/locale/cs/LC_MESSAGES/gnomesword.mo
 share/locale/de/LC_MESSAGES/gnomesword.mo
@@ -174,7 +174,7 @@ share/locale/nl/LC_MESSAGES/gnomesword.mo
 share/locale/ru/LC_MESSAGES/gnomesword.mo
 share/locale/sk/LC_MESSAGES/gnomesword.mo
 share/locale/uk/LC_MESSAGES/gnomesword.mo
-@dirrm share/gnome/pixmaps/gnomesword
+@dirrm share/pixmaps/gnomesword
 @dirrm share/gnome/help/gnomesword/fr/figures
 @dirrm share/gnome/help/gnomesword/fr
 @dirrm share/gnome/help/gnomesword/de/figures
@@ -182,5 +182,6 @@ share/locale/uk/LC_MESSAGES/gnomesword.mo
 @dirrm share/gnome/help/gnomesword/C/figures
 @dirrm share/gnome/help/gnomesword/C
 @dirrm share/gnome/help/gnomesword
-@dirrm share/gnome/gnomesword
+@dirrm share/gnomesword
 @dirrm %%DOCSDIR%%
+@dirrmtry share/applications