4 files changed, 170 insertions, 84 deletions

diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile
index b934e0e2e860..ab15858fda36 100644
--- a/deskutils/gnome-utils/Makefile
+++ b/deskutils/gnome-utils/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.115 2007/03/11 20:46:37 mezz Exp $
+#   $MCom: ports/deskutils/gnome-utils/Makefile,v 1.125 2007/09/18 14:57:01 ahze Exp $
 #
 
 PORTNAME=	gnome-utils
-PORTVERSION=	2.18.1
-PORTREVISION=	1
+PORTVERSION=	2.20.0.1
 PORTEPOCH=	1
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo
index 8a308d2bb976..22234d1e1533 100644
--- a/deskutils/gnome-utils/distinfo
+++ b/deskutils/gnome-utils/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-utils-2.18.1.tar.bz2) = 10e8bd928d099a0d1f70919c8b7b7784
-SHA256 (gnome2/gnome-utils-2.18.1.tar.bz2) = 6ceb22d73d47a819ad08aaed7597d2158168e8af9eba41b93ff6d10d85a250e7
-SIZE (gnome2/gnome-utils-2.18.1.tar.bz2) = 4094695
+MD5 (gnome2/gnome-utils-2.20.0.1.tar.bz2) = 2d4385df2fb566b437b283bd2ce70190
+SHA256 (gnome2/gnome-utils-2.20.0.1.tar.bz2) = af208196c59443938b093a811aca7ca975761b9d0af028f9c2e49e84ddea26b1
+SIZE (gnome2/gnome-utils-2.20.0.1.tar.bz2) = 4592719
diff --git a/deskutils/gnome-utils/files/patch-ai b/deskutils/gnome-utils/files/patch-ai
deleted file mode 100644
index 927a2b461d2f..000000000000
--- a/deskutils/gnome-utils/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmldocs.make.orig	Thu Aug  7 09:56:16 2003
-+++ xmldocs.make	Thu Aug  7 13:55:58 2003
-@@ -36,7 +36,7 @@
- # **********  Begin of section some packagers may need to modify  **********
- # This variable (docdir) specifies where the documents should be installed.
- # This default value should work for most packages.
--docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-+docdir = $(datadir)/help/$(docname)/$(lang)
- 
- # **********  You should not have to edit below this line  **********
- xml_files = $(entities) $(docname).xml
diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist
index 13ed5f5e2db5..8f49667f7ae0 100644
--- a/deskutils/gnome-utils/pkg-plist
+++ b/deskutils/gnome-utils/pkg-plist
@@ -24,12 +24,21 @@ lib/libgdict-1.0.so.5
 libdata/bonobo/servers/GNOME_DictionaryApplet.server
 libdata/pkgconfig/gdict-1.0.pc
 libexec/gnome-dictionary-applet
-share/doc/gdict/gdict-GdictClientContext.html
-share/doc/gdict/gdict-GdictDefbox.html
-share/doc/gdict/gdict-GdictEntry.html
-share/doc/gdict/gdict-GdictSource.html
-share/doc/gdict/gdict-GdictSourceLoader.html
-share/doc/gdict/gdict-gdict-context.html
+share/doc/gdict/GdictClientContext.html
+share/doc/gdict/GdictDatabaseChooser.html
+share/doc/gdict/GdictDefbox.html
+share/doc/gdict/GdictSource.html
+share/doc/gdict/GdictSourceLoader.html
+share/doc/gdict/GdictSpeller.html
+share/doc/gdict/GdictStrategyChooser.html
+share/doc/gdict/ch05.html
+share/doc/gdict/ch06.html
+share/doc/gdict/context-types.html
+share/doc/gdict/context.html
+share/doc/gdict/gdict-Gdict-Utilities.html
+share/doc/gdict/gdict-Gdict-Version-Checking.html
+share/doc/gdict/gdict-GdictContext.html
+share/doc/gdict/gdict-utils.html
 share/doc/gdict/gdict.devhelp
 share/doc/gdict/gdict.devhelp2
 share/doc/gdict/gdict.html
@@ -40,27 +49,26 @@ share/doc/gdict/index.sgml
 share/doc/gdict/introduction.html
 share/doc/gdict/left.png
 share/doc/gdict/right.png
-share/doc/gdict/sources-loader.html
 share/doc/gdict/sources.html
 share/doc/gdict/style.css
 share/doc/gdict/up.png
-share/gnome/applications/baobab.desktop
-share/gnome/applications/gnome-dictionary.desktop
-share/gnome/applications/gnome-screenshot.desktop
-share/gnome/applications/gnome-search-tool.desktop
-share/gnome/applications/gnome-system-log.desktop
-share/gnome/baobab/pixmaps/baobab.glade
-share/gnome/baobab/pixmaps/shot.png
-share/gnome/gdict-1.0/sources/default.desktop
-share/gnome/gdict-1.0/sources/spanish.desktop
-share/gnome/gdict-1.0/sources/thai.desktop
-share/gnome/gnome-2.0/ui/GNOME_DictionaryApplet.xml
-share/gnome/gnome-dictionary/gnome-dictionary-preferences.glade
-share/gnome/gnome-dictionary/gnome-dictionary-ui.xml
-share/gnome/gnome-screenshot/glade/gnome-screenshot.glade
-share/gnome/gnome-system-log/gnome-system-log-actions.db
-share/gnome/gnome-system-log/gnome-system-log-descript.db
-share/gnome/gnome-system-log/gnome-system-log-regexp.db
+share/applications/baobab.desktop
+share/applications/gnome-dictionary.desktop
+share/applications/gnome-screenshot.desktop
+share/applications/gnome-search-tool.desktop
+share/applications/gnome-system-log.desktop
+share/baobab/pixmaps/baobab.glade
+share/baobab/pixmaps/shot.png
+share/gdict-1.0/sources/default.desktop
+share/gdict-1.0/sources/spanish.desktop
+share/gdict-1.0/sources/thai.desktop
+share/gnome-2.0/ui/GNOME_DictionaryApplet.xml
+share/gnome-dictionary/gnome-dictionary-preferences.glade
+share/gnome-dictionary/gnome-dictionary-ui.xml
+share/gnome-screenshot/glade/gnome-screenshot.glade
+share/gnome-system-log/gnome-system-log-actions.db
+share/gnome-system-log/gnome-system-log-descript.db
+share/gnome-system-log/gnome-system-log-regexp.db
 share/gnome/help/baobab/C/baobab.xml
 share/gnome/help/baobab/C/figures/baobab_fullscan.png
 share/gnome/help/baobab/C/figures/baobab_prefs.png
@@ -68,6 +76,12 @@ share/gnome/help/baobab/C/figures/baobab_remote.png
 share/gnome/help/baobab/C/figures/baobab_treemaps.png
 share/gnome/help/baobab/C/figures/baobab_window.png
 share/gnome/help/baobab/C/legal.xml
+share/gnome/help/baobab/ca/baobab.xml
+share/gnome/help/baobab/ca/figures/baobab_fullscan.png
+share/gnome/help/baobab/ca/figures/baobab_prefs.png
+share/gnome/help/baobab/ca/figures/baobab_remote.png
+share/gnome/help/baobab/ca/figures/baobab_treemaps.png
+share/gnome/help/baobab/ca/figures/baobab_window.png
 share/gnome/help/baobab/en_GB/baobab.xml
 share/gnome/help/baobab/en_GB/figures/baobab_fullscan.png
 share/gnome/help/baobab/en_GB/figures/baobab_prefs.png
@@ -86,6 +100,12 @@ share/gnome/help/baobab/fr/figures/baobab_prefs.png
 share/gnome/help/baobab/fr/figures/baobab_remote.png
 share/gnome/help/baobab/fr/figures/baobab_treemaps.png
 share/gnome/help/baobab/fr/figures/baobab_window.png
+share/gnome/help/baobab/oc/baobab.xml
+share/gnome/help/baobab/oc/figures/baobab_fullscan.png
+share/gnome/help/baobab/oc/figures/baobab_prefs.png
+share/gnome/help/baobab/oc/figures/baobab_remote.png
+share/gnome/help/baobab/oc/figures/baobab_treemaps.png
+share/gnome/help/baobab/oc/figures/baobab_window.png
 share/gnome/help/baobab/sv/baobab.xml
 share/gnome/help/baobab/sv/figures/baobab_fullscan.png
 share/gnome/help/baobab/sv/figures/baobab_prefs.png
@@ -108,6 +128,15 @@ share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-print.p
 share/gnome/help/gnome-dictionary/C/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/C/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/C/legal.xml
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/ca/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/ca/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-applet.png
@@ -117,6 +146,15 @@ share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-lookup.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-preferences-print.png
 share/gnome/help/gnome-dictionary/el/figures/gnome-dictionary-preferences-source.png
 share/gnome/help/gnome-dictionary/el/gnome-dictionary.xml
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-add-source.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-applet-window.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-applet.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-application.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-find.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-lookup.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-preferences-print.png
+share/gnome/help/gnome-dictionary/en_GB/figures/gnome-dictionary-preferences-source.png
+share/gnome/help/gnome-dictionary/en_GB/gnome-dictionary.xml
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-add-source.png
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet-window.png
 share/gnome/help/gnome-dictionary/es/figures/gnome-dictionary-applet.png
@@ -174,10 +212,18 @@ share/gnome/help/gnome-dictionary/uk/gnome-dictionary.xml
 share/gnome/help/gnome-search-tool/C/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/C/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/C/legal.xml
+share/gnome/help/gnome-search-tool/ca/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/ca/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/en_GB/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/en_GB/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/es/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/es/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/fr/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/fr/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/ko/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/ko/gnome-search-tool.xml
+share/gnome/help/gnome-search-tool/oc/figures/gnome-search-tool_window.png
+share/gnome/help/gnome-search-tool/oc/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/ru/figures/gnome-search-tool_window.png
 share/gnome/help/gnome-search-tool/ru/gnome-search-tool.xml
 share/gnome/help/gnome-search-tool/sv/figures/gnome-search-tool_window.png
@@ -187,50 +233,68 @@ share/gnome/help/gnome-search-tool/uk/gnome-search-tool.xml
 share/gnome/help/gnome-system-log/C/figures/syslog_window.png
 share/gnome/help/gnome-system-log/C/gnome-system-log.xml
 share/gnome/help/gnome-system-log/C/legal.xml
+share/gnome/help/gnome-system-log/ca/figures/syslog_window.png
+share/gnome/help/gnome-system-log/ca/gnome-system-log.xml
+share/gnome/help/gnome-system-log/en_GB/figures/syslog_window.png
+share/gnome/help/gnome-system-log/en_GB/gnome-system-log.xml
 share/gnome/help/gnome-system-log/es/figures/syslog_window.png
 share/gnome/help/gnome-system-log/es/gnome-system-log.xml
 share/gnome/help/gnome-system-log/fr/figures/syslog_window.png
 share/gnome/help/gnome-system-log/fr/gnome-system-log.xml
 share/gnome/help/gnome-system-log/it/figures/syslog_window.png
 share/gnome/help/gnome-system-log/it/gnome-system-log.xml
+share/gnome/help/gnome-system-log/ko/figures/syslog_window.png
+share/gnome/help/gnome-system-log/ko/gnome-system-log.xml
+share/gnome/help/gnome-system-log/oc/figures/syslog_window.png
+share/gnome/help/gnome-system-log/oc/gnome-system-log.xml
 share/gnome/help/gnome-system-log/ru/figures/syslog_window.png
 share/gnome/help/gnome-system-log/ru/gnome-system-log.xml
 share/gnome/help/gnome-system-log/sv/figures/syslog_window.png
 share/gnome/help/gnome-system-log/sv/gnome-system-log.xml
 share/gnome/help/gnome-system-log/uk/figures/syslog_window.png
 share/gnome/help/gnome-system-log/uk/gnome-system-log.xml
-share/gnome/omf/baobab/baobab-C.omf
-share/gnome/omf/baobab/baobab-en_GB.omf
-share/gnome/omf/baobab/baobab-es.omf
-share/gnome/omf/baobab/baobab-fr.omf
-share/gnome/omf/baobab/baobab-sv.omf
-share/gnome/omf/baobab/baobab-uk.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-C.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-el.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-es.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-fr.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-it.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-ru.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-sv.omf
-share/gnome/omf/gnome-dictionary/gnome-dictionary-uk.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-C.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-es.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-fr.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-ru.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-sv.omf
-share/gnome/omf/gnome-search-tool/gnome-search-tool-uk.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-C.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-es.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-fr.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-it.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-ru.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-sv.omf
-share/gnome/omf/gnome-system-log/gnome-system-log-uk.omf
-share/gnome/pixmaps/gsearchtool/thumbnail_frame.png
+share/omf/baobab/baobab-C.omf
+share/omf/baobab/baobab-ca.omf
+share/omf/baobab/baobab-en_GB.omf
+share/omf/baobab/baobab-es.omf
+share/omf/baobab/baobab-fr.omf
+share/omf/baobab/baobab-oc.omf
+share/omf/baobab/baobab-sv.omf
+share/omf/baobab/baobab-uk.omf
+share/omf/gnome-dictionary/gnome-dictionary-C.omf
+share/omf/gnome-dictionary/gnome-dictionary-ca.omf
+share/omf/gnome-dictionary/gnome-dictionary-el.omf
+share/omf/gnome-dictionary/gnome-dictionary-en_GB.omf
+share/omf/gnome-dictionary/gnome-dictionary-es.omf
+share/omf/gnome-dictionary/gnome-dictionary-fr.omf
+share/omf/gnome-dictionary/gnome-dictionary-it.omf
+share/omf/gnome-dictionary/gnome-dictionary-ru.omf
+share/omf/gnome-dictionary/gnome-dictionary-sv.omf
+share/omf/gnome-dictionary/gnome-dictionary-uk.omf
+share/omf/gnome-search-tool/gnome-search-tool-C.omf
+share/omf/gnome-search-tool/gnome-search-tool-ca.omf
+share/omf/gnome-search-tool/gnome-search-tool-en_GB.omf
+share/omf/gnome-search-tool/gnome-search-tool-es.omf
+share/omf/gnome-search-tool/gnome-search-tool-ko.omf
+share/omf/gnome-search-tool/gnome-search-tool-oc.omf
+share/omf/gnome-search-tool/gnome-search-tool-fr.omf
+share/omf/gnome-search-tool/gnome-search-tool-ru.omf
+share/omf/gnome-search-tool/gnome-search-tool-sv.omf
+share/omf/gnome-search-tool/gnome-search-tool-uk.omf
+share/omf/gnome-system-log/gnome-system-log-C.omf
+share/omf/gnome-system-log/gnome-system-log-ca.omf
+share/omf/gnome-system-log/gnome-system-log-en_GB.omf
+share/omf/gnome-system-log/gnome-system-log-es.omf
+share/omf/gnome-system-log/gnome-system-log-fr.omf
+share/omf/gnome-system-log/gnome-system-log-it.omf
+share/omf/gnome-system-log/gnome-system-log-ko.omf
+share/omf/gnome-system-log/gnome-system-log-oc.omf
+share/omf/gnome-system-log/gnome-system-log-ru.omf
+share/omf/gnome-system-log/gnome-system-log-sv.omf
+share/omf/gnome-system-log/gnome-system-log-uk.omf
+share/pixmaps/gsearchtool/thumbnail_frame.png
 share/icons/hicolor/24x24/apps/baobab.png
-share/icons/hicolor/48x48/apps/gnome-dictionary.png
 share/icons/hicolor/scalable/apps/baobab.svg
-share/icons/hicolor/scalable/apps/gnome-dictionary.svg
 share/locale/am/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-utils-2.0.mo
@@ -278,6 +342,7 @@ share/locale/nb/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/oc/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/or/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-utils-2.0.mo
@@ -286,6 +351,7 @@ share/locale/pt_BR/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ro/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ru/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/rw/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/si/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sk/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-utils-2.0.mo
@@ -293,6 +359,7 @@ share/locale/sr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-utils-2.0.mo
+share/locale/te/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-utils-2.0.mo
@@ -302,23 +369,31 @@ share/locale/xh/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-utils-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
-@dirrm share/gnome/pixmaps/gsearchtool
-@dirrm share/gnome/omf/gnome-system-log
-@dirrm share/gnome/omf/gnome-search-tool
-@dirrm share/gnome/omf/gnome-dictionary
-@dirrm share/gnome/omf/baobab
+@dirrm share/pixmaps/gsearchtool
+@dirrm share/omf/gnome-system-log
+@dirrm share/omf/gnome-search-tool
+@dirrm share/omf/gnome-dictionary
+@dirrm share/omf/baobab
 @dirrm share/gnome/help/gnome-system-log/uk/figures
 @dirrm share/gnome/help/gnome-system-log/uk
 @dirrm share/gnome/help/gnome-system-log/sv/figures
 @dirrm share/gnome/help/gnome-system-log/sv
 @dirrm share/gnome/help/gnome-system-log/ru/figures
 @dirrm share/gnome/help/gnome-system-log/ru
+@dirrm share/gnome/help/gnome-system-log/oc/figures
+@dirrm share/gnome/help/gnome-system-log/oc
+@dirrm share/gnome/help/gnome-system-log/ko/figures
+@dirrm share/gnome/help/gnome-system-log/ko
 @dirrm share/gnome/help/gnome-system-log/it/figures
 @dirrm share/gnome/help/gnome-system-log/it
 @dirrm share/gnome/help/gnome-system-log/fr/figures
 @dirrm share/gnome/help/gnome-system-log/fr
 @dirrm share/gnome/help/gnome-system-log/es/figures
 @dirrm share/gnome/help/gnome-system-log/es
+@dirrm share/gnome/help/gnome-system-log/en_GB/figures
+@dirrm share/gnome/help/gnome-system-log/en_GB
+@dirrm share/gnome/help/gnome-system-log/ca/figures
+@dirrm share/gnome/help/gnome-system-log/ca
 @dirrm share/gnome/help/gnome-system-log/C/figures
 @dirrm share/gnome/help/gnome-system-log/C
 @dirrm share/gnome/help/gnome-system-log
@@ -328,10 +403,18 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-search-tool/sv
 @dirrm share/gnome/help/gnome-search-tool/ru/figures
 @dirrm share/gnome/help/gnome-search-tool/ru
+@dirrm share/gnome/help/gnome-search-tool/oc/figures
+@dirrm share/gnome/help/gnome-search-tool/oc
+@dirrm share/gnome/help/gnome-search-tool/ko/figures
+@dirrm share/gnome/help/gnome-search-tool/ko
 @dirrm share/gnome/help/gnome-search-tool/fr/figures
 @dirrm share/gnome/help/gnome-search-tool/fr
 @dirrm share/gnome/help/gnome-search-tool/es/figures
 @dirrm share/gnome/help/gnome-search-tool/es
+@dirrm share/gnome/help/gnome-search-tool/en_GB/figures
+@dirrm share/gnome/help/gnome-search-tool/en_GB
+@dirrm share/gnome/help/gnome-search-tool/ca/figures
+@dirrm share/gnome/help/gnome-search-tool/ca
 @dirrm share/gnome/help/gnome-search-tool/C/figures
 @dirrm share/gnome/help/gnome-search-tool/C
 @dirrm share/gnome/help/gnome-search-tool
@@ -347,8 +430,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/gnome-dictionary/fr
 @dirrm share/gnome/help/gnome-dictionary/es/figures
 @dirrm share/gnome/help/gnome-dictionary/es
+@dirrm share/gnome/help/gnome-dictionary/en_GB/figures
+@dirrm share/gnome/help/gnome-dictionary/en_GB
 @dirrm share/gnome/help/gnome-dictionary/el/figures
 @dirrm share/gnome/help/gnome-dictionary/el
+@dirrm share/gnome/help/gnome-dictionary/ca/figures
+@dirrm share/gnome/help/gnome-dictionary/ca
 @dirrm share/gnome/help/gnome-dictionary/C/figures
 @dirrm share/gnome/help/gnome-dictionary/C
 @dirrm share/gnome/help/gnome-dictionary
@@ -356,23 +443,27 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrm share/gnome/help/baobab/uk
 @dirrm share/gnome/help/baobab/sv/figures
 @dirrm share/gnome/help/baobab/sv
+@dirrm share/gnome/help/baobab/oc/figures
+@dirrm share/gnome/help/baobab/oc
 @dirrm share/gnome/help/baobab/fr/figures
 @dirrm share/gnome/help/baobab/fr
 @dirrm share/gnome/help/baobab/es/figures
 @dirrm share/gnome/help/baobab/es
 @dirrm share/gnome/help/baobab/en_GB/figures
 @dirrm share/gnome/help/baobab/en_GB
+@dirrm share/gnome/help/baobab/ca/figures
+@dirrm share/gnome/help/baobab/ca
 @dirrm share/gnome/help/baobab/C/figures
 @dirrm share/gnome/help/baobab/C
 @dirrm share/gnome/help/baobab
-@dirrm share/gnome/gnome-system-log
-@dirrm share/gnome/gnome-screenshot/glade
-@dirrm share/gnome/gnome-screenshot
-@dirrm share/gnome/gnome-dictionary
-@dirrm share/gnome/gdict-1.0/sources
-@dirrm share/gnome/gdict-1.0
-@dirrm share/gnome/baobab/pixmaps
-@dirrm share/gnome/baobab
+@dirrm share/gnome-system-log
+@dirrm share/gnome-screenshot/glade
+@dirrm share/gnome-screenshot
+@dirrm share/gnome-dictionary
+@dirrm share/gdict-1.0/sources
+@dirrm share/gdict-1.0
+@dirrm share/baobab/pixmaps
+@dirrm share/baobab
 @dirrm share/doc/gdict
 @dirrm include/gdict-1.0/gdict
 @dirrm include/gdict-1.0
@@ -380,8 +471,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @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/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
@@ -390,3 +487,4 @@ share/locale/zh_TW/LC_MESSAGES/gnome-utils-2.0.mo
 @dirrmtry share/locale/dz
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/applications