Update to GNOME 2.4.0. For all the goodies on what's changed, known issues,

future plans, etc., please see http://www.gnome.org/start/2.4/.

This commit represents work done by adamw, bland, and myself as well as
many other contributers:

Koop Mast <einekoai@chello.nl>
Akifyev Sergey <asa@gascom.ru>
Franz Klammer <klammer@webonaut.com>
Øyvind Kolbu <oyvind@kebab.gaffel.nu>
Thomas E. Zander <riggs@rrr.de>
Jeremy Messenger <mezz7@cox.net>

Without these contirbuters, and our faithful users, GNOME 2.4.0 would not
be possible.

Please check the FreeBSD GNOME site for any FreeBSD gotchas, as well as
general FAQs and documentation (GNOME 2.4 updates to be posted soon).  The
best way to upgrade so that you get all shared library dependencies is:

portupgrade -rf -m BATCH=yes atk
portupgrade -R -m BATCH=yes gnome2

Approved by:	portmgr (kris, will, myself implicitly)
Requested by:	re as well as many other users

1 files changed, 124 insertions, 95 deletions

diff --git a/editors/gedit2/pkg-plist b/editors/gedit2/pkg-plist
index c7753de587fa..ca311d5789dd 100644
--- a/editors/gedit2/pkg-plist
+++ b/editors/gedit2/pkg-plist
@@ -7,11 +7,11 @@ etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent/%gconf.
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page/%gconf.xml
@@ -26,11 +26,11 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page/%gconf.xml
@@ -39,14 +39,35 @@ etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents/%gconf.
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar/%gconf.xml
 etc/gconf/schemas/gedit.schemas
-lib/gedit-2/plugins/ascii.gedit-plugin
-lib/gedit-2/plugins/cvschangelog.gedit-plugin
-lib/gedit-2/plugins/diff.gedit-plugin
+include/gedit-%%VERSION%%/gedit/bonobo-mdi-child.h
+include/gedit-%%VERSION%%/gedit/bonobo-mdi.h
+include/gedit-%%VERSION%%/gedit/gedit-convert.h
+include/gedit-%%VERSION%%/gedit/gedit-debug.h
+include/gedit-%%VERSION%%/gedit/gedit-document.h
+include/gedit-%%VERSION%%/gedit/gedit-encodings.h
+include/gedit-%%VERSION%%/gedit/gedit-file.h
+include/gedit-%%VERSION%%/gedit/gedit-mdi-child.h
+include/gedit-%%VERSION%%/gedit/gedit-mdi.h
+include/gedit-%%VERSION%%/gedit/gedit-menus.h
+include/gedit-%%VERSION%%/gedit/gedit-metadata-manager.h
+include/gedit-%%VERSION%%/gedit/gedit-output-window.h
+include/gedit-%%VERSION%%/gedit/gedit-plugin.h
+include/gedit-%%VERSION%%/gedit/gedit-prefs-manager-app.h
+include/gedit-%%VERSION%%/gedit/gedit-prefs-manager.h
+include/gedit-%%VERSION%%/gedit/gedit-print.h
+include/gedit-%%VERSION%%/gedit/gedit-recent.h
+include/gedit-%%VERSION%%/gedit/gedit-utils.h
+include/gedit-%%VERSION%%/gedit/gedit-view.h
+include/gedit-%%VERSION%%/gedit/gedit2.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-item.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-model.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-util.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-bonobo.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view-gtk.h
+include/gedit-%%VERSION%%/gedit/recent-files/egg-recent-view.h
+lib/bonobo/libgedit-control.so
 lib/gedit-2/plugins/docinfo.gedit-plugin
 lib/gedit-2/plugins/indent.gedit-plugin
-lib/gedit-2/plugins/libasciitable.so
-lib/gedit-2/plugins/libcvschangelog.so
-lib/gedit-2/plugins/libdiff.so
 lib/gedit-2/plugins/libdocinfo.so
 lib/gedit-2/plugins/libindent.so
 lib/gedit-2/plugins/libsample.so
@@ -62,15 +83,15 @@ lib/gedit-2/plugins/spell.gedit-plugin
 lib/gedit-2/plugins/taglist.gedit-plugin
 lib/gedit-2/plugins/time.gedit-plugin
 libdata/bonobo/servers/GNOME_Gedit.server
+libdata/pkgconfig/gedit-%%VERSION%%.pc
 share/gnome/application-registry/gedit.applications
 share/gnome/applications/gedit.desktop
-share/gnome/gedit-2/glade/asciitable.glade2
-share/gnome/gedit-2/glade/diff.glade2
 share/gnome/gedit-2/glade/docinfo.glade2
 share/gnome/gedit-2/glade/gedit-encodings-dialog.glade2
 share/gnome/gedit-2/glade/gedit-preferences.glade2
 share/gnome/gedit-2/glade/goto-line.glade2
 share/gnome/gedit-2/glade/languages-dialog.glade2
+share/gnome/gedit-2/glade/page-setup-dialog.glade2
 share/gnome/gedit-2/glade/plugin-manager.glade2
 share/gnome/gedit-2/glade/program-location-dialog.glade2
 share/gnome/gedit-2/glade/replace.glade2
@@ -83,116 +104,121 @@ share/gnome/gedit-2/taglist/HTML.tags
 share/gnome/gedit-2/taglist/Latex.tags
 share/gnome/gedit-2/taglist/XSLT.tags
 share/gnome/gedit-2/ui/gedit-ui.xml
+share/gnome/gnome-2.0/ui/gedit-viewer-ui.xml
 share/gnome/help/gedit/C/figures/gedit_recent_files_menu_icon.png
 share/gnome/help/gedit/C/figures/gedit_window.png
 share/gnome/help/gedit/C/gedit.xml
 share/gnome/help/gedit/C/legal.xml
-share/gnome/help/gedit/de/legal.xml
 share/gnome/help/gedit/de/gedit.xml
-share/gnome/help/gedit/es/legal.xml
+share/gnome/help/gedit/de/legal.xml
 share/gnome/help/gedit/es/gedit.xml
-share/gnome/help/gedit/fr/legal.xml
+share/gnome/help/gedit/es/legal.xml
 share/gnome/help/gedit/fr/gedit.xml
-share/gnome/help/gedit/it/legal.xml
+share/gnome/help/gedit/fr/legal.xml
 share/gnome/help/gedit/it/gedit.xml
-share/gnome/help/gedit/sv/legal.xml
-share/gnome/help/gedit/sv/gedit.xml
-share/gnome/help/gedit/ja/legal.xml
+share/gnome/help/gedit/it/legal.xml
 share/gnome/help/gedit/ja/gedit.xml
-share/gnome/help/gedit/ko/legal.xml
+share/gnome/help/gedit/ja/legal.xml
 share/gnome/help/gedit/ko/gedit.xml
+share/gnome/help/gedit/ko/legal.xml
 share/gnome/help/gedit/ro/figures/gedit_window.png
 share/gnome/help/gedit/ro/gedit.xml
 share/gnome/help/gedit/ro/legal.xml
-share/gnome/help/gedit/zh_CN/legal.xml
+share/gnome/help/gedit/sv/gedit.xml
+share/gnome/help/gedit/sv/legal.xml
 share/gnome/help/gedit/zh_CN/gedit.xml
-share/gnome/help/gedit/zh_TW/legal.xml
+share/gnome/help/gedit/zh_CN/legal.xml
 share/gnome/help/gedit/zh_TW/gedit.xml
+share/gnome/help/gedit/zh_TW/legal.xml
 share/gnome/idl/GNOME_Gedit.idl
 share/gnome/mime-info/gedit.keys
 share/gnome/omf/gedit/gedit-C.omf
-share/gnome/omf/gedit/gedit-de.omf
-share/gnome/omf/gedit/gedit-es.omf
-share/gnome/omf/gedit/gedit-fr.omf
-share/gnome/omf/gedit/gedit-it.omf
-share/gnome/omf/gedit/gedit-sv.omf
-share/gnome/omf/gedit/gedit-ja.omf
-share/gnome/omf/gedit/gedit-ko.omf
-share/gnome/omf/gedit/gedit-ro.omf
-share/gnome/omf/gedit/gedit-zh_CN.omf
-share/gnome/omf/gedit/gedit-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-de.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-es.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-fr.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-it.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
-@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ja.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ko.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-ro.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-sv.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gedit/gedit-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gedit-icon.png
 share/gnome/pixmaps/gedit-logo.png
 share/gnome/pixmaps/gedit-plugin-manager.png
-share/locale/am/LC_MESSAGES/gedit-2.2.mo
-share/locale/ar/LC_MESSAGES/gedit-2.2.mo
-share/locale/az/LC_MESSAGES/gedit-2.2.mo
-share/locale/be/LC_MESSAGES/gedit-2.2.mo
-share/locale/bg/LC_MESSAGES/gedit-2.2.mo
-share/locale/ca/LC_MESSAGES/gedit-2.2.mo
-share/locale/cs/LC_MESSAGES/gedit-2.2.mo
-share/locale/da/LC_MESSAGES/gedit-2.2.mo
-share/locale/de/LC_MESSAGES/gedit-2.2.mo
-share/locale/el/LC_MESSAGES/gedit-2.2.mo
-share/locale/es/LC_MESSAGES/gedit-2.2.mo
-share/locale/et/LC_MESSAGES/gedit-2.2.mo
-share/locale/eu/LC_MESSAGES/gedit-2.2.mo
-share/locale/fa/LC_MESSAGES/gedit-2.2.mo
-share/locale/fi/LC_MESSAGES/gedit-2.2.mo
-share/locale/fr/LC_MESSAGES/gedit-2.2.mo
-share/locale/ga/LC_MESSAGES/gedit-2.2.mo
-share/locale/gl/LC_MESSAGES/gedit-2.2.mo
-share/locale/he/LC_MESSAGES/gedit-2.2.mo
-share/locale/hi/LC_MESSAGES/gedit-2.2.mo
-share/locale/hu/LC_MESSAGES/gedit-2.2.mo
-share/locale/it/LC_MESSAGES/gedit-2.2.mo
-share/locale/ja/LC_MESSAGES/gedit-2.2.mo
-share/locale/kn/LC_MESSAGES/gedit-2.2.mo
-share/locale/ko/LC_MESSAGES/gedit-2.2.mo
-share/locale/lt/LC_MESSAGES/gedit-2.2.mo
-share/locale/lv/LC_MESSAGES/gedit-2.2.mo
-share/locale/mk/LC_MESSAGES/gedit-2.2.mo
-share/locale/ml/LC_MESSAGES/gedit-2.2.mo
-share/locale/mn/LC_MESSAGES/gedit-2.2.mo
-share/locale/ms/LC_MESSAGES/gedit-2.2.mo
-share/locale/nl/LC_MESSAGES/gedit-2.2.mo
-share/locale/nn/LC_MESSAGES/gedit-2.2.mo
-share/locale/no/LC_MESSAGES/gedit-2.2.mo
-share/locale/pl/LC_MESSAGES/gedit-2.2.mo
-share/locale/pt/LC_MESSAGES/gedit-2.2.mo
-share/locale/pt_BR/LC_MESSAGES/gedit-2.2.mo
-share/locale/ro/LC_MESSAGES/gedit-2.2.mo
-share/locale/ru/LC_MESSAGES/gedit-2.2.mo
-share/locale/sk/LC_MESSAGES/gedit-2.2.mo
-share/locale/sl/LC_MESSAGES/gedit-2.2.mo
-share/locale/sr/LC_MESSAGES/gedit-2.2.mo
-share/locale/sr@Latn/LC_MESSAGES/gedit-2.2.mo
-share/locale/sv/LC_MESSAGES/gedit-2.2.mo
-share/locale/ta/LC_MESSAGES/gedit-2.2.mo
-share/locale/th/LC_MESSAGES/gedit-2.2.mo
-share/locale/tr/LC_MESSAGES/gedit-2.2.mo
-share/locale/uk/LC_MESSAGES/gedit-2.2.mo
-share/locale/vi/LC_MESSAGES/gedit-2.2.mo
-share/locale/wa/LC_MESSAGES/gedit-2.2.mo
-share/locale/zh_CN/LC_MESSAGES/gedit-2.2.mo
-share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
+share/locale/am/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ar/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/be/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/bg/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/bn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/cy/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/et/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/he/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/hi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/kn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/lv/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/mk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/mn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/nn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/no/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/ta/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/th/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/wa/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/gedit-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/gedit-%%VERSION%%.mo
 @dirrm share/gnome/omf/gedit
 @dirrm share/gnome/help/gedit/zh_TW
 @dirrm share/gnome/help/gedit/zh_CN
+@dirrm share/gnome/help/gedit/sv
 @dirrm share/gnome/help/gedit/ro/figures
 @dirrm share/gnome/help/gedit/ro
-@dirrm share/gnome/help/gedit/sv
 @dirrm share/gnome/help/gedit/ko
 @dirrm share/gnome/help/gedit/ja
 @dirrm share/gnome/help/gedit/it
@@ -206,6 +232,9 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
 @dirrm share/gnome/gedit-2
 @dirrm lib/gedit-2/plugins
 @dirrm lib/gedit-2
+@dirrm include/gedit-%%VERSION%%/gedit/recent-files
+@dirrm include/gedit-%%VERSION%%/gedit
+@dirrm include/gedit-%%VERSION%%
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/toolbar
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/statusbar
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/ui/recents
@@ -213,12 +242,12 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/page
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print/fonts
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/print
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/encodings
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/wrap_mode
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/undo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/tabs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/save
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/load
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/font
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/colors
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gedit-2/preferences/editor/auto_indent
@@ -232,26 +261,26 @@ share/locale/zh_TW/LC_MESSAGES/gedit-2.2.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/page
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print/fonts
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/print
+@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/encodings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/wrap_mode
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/undo
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/tabs
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/save
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/line_numbers
-@dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/load
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/font
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/colors
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor/auto_indent
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences/editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2/preferences
 @dirrm etc/gconf/gconf.xml.defaults/apps/gedit-2
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ro.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-sv.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ko.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-ja.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-it.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-fr.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-es.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-de.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_CN.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gedit/gedit-zh_TW.omf 2>/dev/null || /usr/bin/true