The FreeBSD GNOME team proudly presents GNOME 3.14 and Cinnamon 2.2.

Gnome 3.14.1 and Cinnamon 2.2.16 are supported on FreeBSD 9.3-RELEASE and up.

This commit removes the old GNOME 2 desktop, bindings and some ports that
can't be compiled. A few ports where updated to more recent versions to
allow them to compile with this update.

Apart from updating ports to newer versions

GDM is more integrated with gnome-shell now, and handles several things for
the GNOME desktop such as screen locking. If you want to use GNOME 3 via
startx, you will have to add your own lock screen/screensaver. For example xscreensaver
can be used for sessions started without GDM.

Shell Extensions can be installed via https://extensions.gnome.org/ , we have
ported a few that can't be installed via this way.
The old gnome-utils and gnome-games ports where split up into single ports
and where converted to meta-ports.
gnome-terminal requires a UTF-8 locale to run, gdm handles this already, but
if you use startx you need to do this yourself.

Upgrade instructions:

Delete the old and conflicting packages:
# pkg delete clutter gnome-utils gnome-panel gnome-keyring vala-vapigen \
    guile gcalctool gnome-media libgnomekbd
# pkg delete gnome-screensaver gnome-applets bug-buddy evolution-exchange \
    evolution-webcal gnome-system-tools seahorse-plugins gnome-control-center

For package users the following lines will be enough:
# pkg upgrade
# pkg install gnome3

For ports users should do the following:
# portmaster -a
# portmaster x11/gnome3

We are currently aware of two issues. The first issue is a bug in the
file monitoring code in the glib20 port. This bug causes glib programs
to crash when files in a monitored directory are added or removed.
Upstream is aware of the problem, but since the problem is quite complex
there is no solution yet. This problem isn't restricted to BSD.

The second issue is that on certain video cards totem will display a
purple/pink overlay on the video. It not clear yet where the issues
comes from.

Major thanks goes to Gustau Perez for being a driving force behind getting
GNOME 3 up to speed again. Also thanks to Antoine Brodin for running the exp-runs.

This update was also made possible by:
	Joe Maloney
	Kris Moore
	Beeblebrox
	Ryan Lortie
	Antoine Jacoutot
	and everyone I missed

5 files changed, 788 insertions, 734 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index 2de63d8654c9..2c065fe67c37 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -1,100 +1,89 @@
 # Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
+#   $MCom: ports/trunk/graphics/gthumb/Makefile 19823 2014-08-20 09:28:14Z gusi $
 
 PORTNAME=	gthumb
-PORTVERSION=	2.14.1
-PORTREVISION=	11
+PORTVERSION=	3.2.8
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	rm@FreeBSD.org
-COMMENT=	Image viewer and browser for the GNOME 2 environment
+COMMENT=	Image viewer and browser for the GNOME 3 environment
 
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
+		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 LIB_DEPENDS=	libunique-1.0.so:${PORTSDIR}/x11-toolkits/unique
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gsettings-desktop-schemas.pc:${PORTSDIR}/devel/gsettings-desktop-schemas
+RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
 
-USES=		bison gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME=	gnomeprefix intlhack gnomedocutils gconf2
-WANT_GSTREAMER=	yes
+USES=		desktop-file-utils bison gettext gmake libtool pathfix \
+		pkgconfig tar:xz
+USE_GNOME=	gnomeprefix gtk30 intlhack librsvg2
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-
-GCONF_SCHEMAS=	gthumb.schemas gthumb-comments.schemas gthumb-file-manager.schemas \
-		gthumb-image-viewer.schemas gthumb-importer.schemas gthumb-pixbuf-savers.schemas \
-		gthumb-slideshow.schemas gthumb_change_date.schemas gthumb_contact_sheet.schemas \
-		gthumb_convert_format.schemas gthumb_crop_options.schemas gthumb_image_print.schemas \
-		gthumb_photo_importer.schemas gthumb_rename_series.schemas gthumb_resize_images.schemas \
-		gthumb_resize_options.schemas gthumb_rotate_options.schemas gthumb_webalbums.schemas
-
-PLIST_SUB=	GTHUMB_VER=2.14
-
-OPTIONS_DEFINE=	EXIV2 CLUTTER GSTREAMER OPENRAW SOUP BRASERO YELP
-OPTIONS_DEFAULT=	EXIV2 CLUTTER GSTREAMER OPENRAW SOUP BRASERO YELP
+CONFIGURE_ARGS=	--disable-libchamplain \
+		--enable-librsvg
+INSTALL_TARGET=	install-strip
+
+GLIB_SCHEMAS=	org.gnome.gthumb.change-date.gschema.xml \
+		org.gnome.gthumb.comments.gschema.xml \
+		org.gnome.gthumb.contact-sheet.gschema.xml \
+		org.gnome.gthumb.convert-format.gschema.xml \
+		org.gnome.gthumb.crop.gschema.xml \
+		org.gnome.gthumb.enums.xml \
+		org.gnome.gthumb.facebook.gschema.xml \
+		org.gnome.gthumb.file-manager.gschema.xml \
+		org.gnome.gthumb.flickr.gschema.xml \
+		org.gnome.gthumb.gschema.xml \
+		org.gnome.gthumb.gstreamer-tools.gschema.xml \
+		org.gnome.gthumb.image-print.gschema.xml \
+		org.gnome.gthumb.image-viewer.gschema.xml \
+		org.gnome.gthumb.importer.gschema.xml \
+		org.gnome.gthumb.photo-importer.gschema.xml \
+		org.gnome.gthumb.picasaweb.gschema.xml \
+		org.gnome.gthumb.pixbuf-savers.gschema.xml \
+		org.gnome.gthumb.rename-series.gschema.xml \
+		org.gnome.gthumb.resize-images.gschema.xml \
+		org.gnome.gthumb.resize.gschema.xml \
+		org.gnome.gthumb.rotate.gschema.xml \
+		org.gnome.gthumb.slideshow.gschema.xml \
+		org.gnome.gthumb.webalbums.gschema.xml
+
+PLIST_SUB=	GTHUMB_VER=3.2
+
+OPTIONS_SUB=	yes
+OPTIONS_DEFINE=	EXIV2 CLUTTER GSTREAMER OPENRAW BRASERO YELP SECRET WEBP WEBSERVICES
+OPTIONS_DEFAULT=	EXIV2 CLUTTER GSTREAMER OPENRAW BRASERO YELP SECRET WEBP WEBSERVICES
 CLUTTER_DESC=	Fancy slideshows
-SOUP_DESC=	Web services uploaders
+GSTREAMER_DESC=	Video playback
+WEBSERVICES_DESC=	Web services
 BRASERO_DESC=	Write galleries to CD/DVD (large dependency)
 YELP_DESC=	Viewer for built-in help system
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MEXIV2}
-LIB_DEPENDS+=	libexiv2.so:${PORTSDIR}/graphics/exiv2
-CONFIGURE_ARGS+=--enable-exiv2
-PLIST_SUB+=	EXIV2=""
-.else
-CONFIGURE_ARGS+=--disable-exiv2
-PLIST_SUB+=	EXIV2="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MCLUTTER}
-LIB_DEPENDS+=	libclutter-gtk-0.10.so:${PORTSDIR}/graphics/clutter-gtk
-CONFIGURE_ARGS+=--enable-clutter
-.else
-CONFIGURE_ARGS+=--disable-clutter
-.endif
-
-.if ${PORT_OPTIONS:MGSTREAMER}
-USE_GSTREAMER=	yes
-CONFIGURE_ARGS+=--enable-gstreamer
-PLIST_SUB+=	GSTREAMER=""
-GCONF_SCHEMAS+=	gthumb-gstreamer.schemas
-.else
-CONFIGURE_ARGS+=--disable-gstreamer
-PLIST_SUB+=	GSTREAMER="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MOPENRAW}
-LIB_DEPENDS+=	libopenrawgnome.so:${PORTSDIR}/graphics/libopenraw
-CONFIGURE_ARGS+=--enable-libopenraw
-.else
-CONFIGURE_ARGS+=--disable-libopenraw
-.endif
-
-.if ${PORT_OPTIONS:MSOUP}
-LIB_DEPENDS+=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome
-CONFIGURE_ARGS+=--enable-libsoup --enable-gnome-keyring
-PLIST_SUB+=	SOUP=""
-GCONF_SCHEMAS+=	gthumb-facebook.schemas gthumb-picasaweb.schemas
-.else
-CONFIGURE_ARGS+=--disable-libsoup --disable-gnome-keyring
-PLIST_SUB+=	SOUP="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MBRASERO}
-LIB_DEPENDS+=	libbrasero-burn.so:${PORTSDIR}/sysutils/brasero
-CONFIGURE_ARGS+=--enable-libbrasero
-PLIST_SUB+=	BRASERO=""
-.else
-CONFIGURE_ARGS+=--disable-libbrasero
-PLIST_SUB+=	BRASERO="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MYELP}
-RUN_DEPENDS+=	yelp:${PORTSDIR}/x11/yelp
-.endif
+SECRET_DESC=	Libsecret support for storing passwords
+WEBP_DESC=	Support for Google WebP conversion tool
+EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_CONFIGURE_ENABLE=	exiv2
+CLUTTER_LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
+CLUTTER_CONFIGURE_ENABLE=	clutter
+GSTREAMER_USE=	GSTREAMER1=yes
+GSTREAMER_CONFIGURE_ENABLE=	gstreamer
+OPENRAW_LIB_DEPENDS=	libopenrawgnome.so:${PORTSDIR}/graphics/libopenraw
+OPENRAW_CONFIGURE_ENABLE=	libopenraw
+BRASERO_LIB_DEPENDS=	libbrasero-media3.so:${PORTSDIR}/sysutils/brasero
+BRASERO_CONFIGURE_ENABLE=	brasero	
+YELP_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+SECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
+SECRET_CONFIGURE_ENABLE=	secret	
+WEBP_LIB_DEPENDS=	libwebp.so:${PORTSDIR}/graphics/webp
+WEBP_CONFIGURE_ENABLE=	webp	
+WEBSERVICES_LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
+				libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
+				libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+WEBSERVICES_CONFIGURE_ON=	--enable-libsoup --enable-webkit2 --enable-libjson-glib	
+WEBSERVICES_CONFIGURE_OFF=	--disable-libsoup --disable-webkit2 --disable-libjson-glib
 
 .include <bsd.port.mk>
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index 92f72c235066..fcb6d9f8b4ca 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/gthumb-2.14.1.tar.xz) = 002a6611112273189348871ff7c717fb3c776f5570656389e3d6c5b26bffa11f
-SIZE (gnome2/gthumb-2.14.1.tar.xz) = 5800780
+SHA256 (gnome3/gthumb-3.2.8.tar.xz) = d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8
+SIZE (gnome3/gthumb-3.2.8.tar.xz) = 3286620
diff --git a/graphics/gthumb/files/patch-configure b/graphics/gthumb/files/patch-configure
new file mode 100644
index 000000000000..453e1ad1dffe
--- /dev/null
+++ b/graphics/gthumb/files/patch-configure
@@ -0,0 +1,74 @@
+--- configure.orig	2014-03-28 13:22:13.878659889 +0000
++++ configure	2014-03-28 13:22:28.696658747 +0000
+@@ -17998,7 +17998,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= \$GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+@@ -18008,7 +18007,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= $GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ ") 2>&5
+   ac_status=$?
+@@ -18021,7 +18019,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= $GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+@@ -18042,7 +18039,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= \$GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ \""; } >&5
+   ($PKG_CONFIG --exists --print-errors "
+@@ -18052,7 +18048,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= $GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ ") 2>&5
+   ac_status=$?
+@@ -18065,7 +18060,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= $GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ " 2>/dev/null`
+ 		      test "x$?" != "x0" && pkg_failed=yes
+@@ -18095,7 +18089,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= $GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ " 2>&1`
+         else
+@@ -18106,7 +18099,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= $GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ " 2>&1`
+         fi
+@@ -18120,7 +18112,6 @@
+ 	gio-unix-2.0
+ 	gtk+-3.0 		>= $GTK_REQUIRED
+ 	libpng
+-	zlib
+ 	gsettings-desktop-schemas
+ ) were not met:
+ 
diff --git a/graphics/gthumb/files/patch-glib-utils.c b/graphics/gthumb/files/patch-glib-utils.c
deleted file mode 100644
index 9f5ea644355d..000000000000
--- a/graphics/gthumb/files/patch-glib-utils.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- gthumb/glib-utils.c.orig	2011-11-03 21:36:36.000000000 +0100
-+++ gthumb/glib-utils.c	2012-05-10 15:03:34.000000000 +0200
-@@ -552,7 +552,6 @@
- {
- 	int offset;
- 
--	offset = -timezone;
- #if defined (HAVE_TM_GMTOFF)
- 	offset = tm->tm_gmtoff;
- #elif defined (HAVE_TIMEZONE)
-@@ -564,6 +563,8 @@
-   #endif
- 	} else
- 		offset = -timezone;
-+#else
-+	offset = 0;
- #endif
- 
- 	return offset;
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index 928df22079ba..bfe4d1dc5c75 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -1,19 +1,19 @@
 bin/gthumb
 include/gthumb-%%GTHUMB_VER%%/gthumb.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/cairo-scale.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/cairo-utils.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/dom.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/eggfileformatchooser.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/egg-macros.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gconf-utils.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gedit-message-area.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gfixed.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gio-utils.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/glib-utils.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gnome-desktop-thumbnail.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gsignature.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-async-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-auto-paned.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-browser.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-buffer-data.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-cell-renderer-thumbnail.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-color-scale.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-dumb-notebook.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-duplicable.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-embedded-dialog.h
@@ -21,55 +21,58 @@ include/gthumb-%%GTHUMB_VER%%/gthumb/gth-empty-list.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-enum-types.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-error.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-extensions.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-data.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-chooser-dialog.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-data.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-list.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-properties.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-selection.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-source.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-source-vfs.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-source.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-store.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-tool.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-file-view.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filterbar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter-editor-dialog.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter-file.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filter.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-filterbar.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-folder-tree.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-histogram.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-grid-view.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-histogram-view.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-histogram.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-hook.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-icon-cache.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-icon-view.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-dragger.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-history.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-list-task.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-loader.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-navigator.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-preloader.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-saver.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-selector.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-viewer.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-utils.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-viewer-tool.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image-viewer.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-image.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-info-bar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-list-view.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-load-file-data-task.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-location-chooser.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-main.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-marshal.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-menu-action.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-menu-button.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata-chooser.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata-provider.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-metadata.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-monitor.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-multipage.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-overwrite-dialog.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-pixbuf-list-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-pixbuf-saver.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-pixbuf-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-paned.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-preferences.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-progress-dialog.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-request-dialog.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-save-file-data-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-save-image-task.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-screensaver.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-sidebar.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-source-tree.h
@@ -79,14 +82,15 @@ include/gthumb-%%GTHUMB_VER%%/gthumb/gth-string-list.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-tags-entry.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-tags-file.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-task.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-category.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-chain.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-selector.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test-simple.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-thumb-loader.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-time.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-time-selector.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-time.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-toggle-menu-action.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-toggle-menu-tool-button.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-toolbox.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-uri-list.h
@@ -101,7 +105,7 @@ include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-io.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/pixbuf-utils.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/typedefs.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/zlib-utils.h
-%%SOUP%%lib/gthumb/extensions/23hq.extension
+%%WEBSERVICES%%lib/gthumb/extensions/23hq.extension
 lib/gthumb/extensions/bookmarks.extension
 %%BRASERO%%lib/gthumb/extensions/burn_disc.extension
 lib/gthumb/extensions/cairo_io.extension
@@ -114,13 +118,13 @@ lib/gthumb/extensions/desktop_background.extension
 lib/gthumb/extensions/edit_metadata.extension
 %%EXIV2%%lib/gthumb/extensions/exiv2_tools.extension
 lib/gthumb/extensions/export_tools.extension
-%%SOUP%%lib/gthumb/extensions/facebook.extension
+%%WEBSERVICES%%lib/gthumb/extensions/facebook.extension
 lib/gthumb/extensions/file_manager.extension
 lib/gthumb/extensions/file_tools.extension
 lib/gthumb/extensions/file_viewer.extension
 lib/gthumb/extensions/find_duplicates.extension
-%%SOUP%%lib/gthumb/extensions/flicker.extension
-%%SOUP%%lib/gthumb/extensions/flicker_utils.extension
+%%WEBSERVICES%%lib/gthumb/extensions/flicker.extension
+%%WEBSERVICES%%lib/gthumb/extensions/flicker_utils.extension
 %%GSTREAMER%%lib/gthumb/extensions/gstreamer_tools.extension
 %%GSTREAMER%%lib/gthumb/extensions/gstreamer_utils.extension
 lib/gthumb/extensions/image_print.extension
@@ -128,8 +132,8 @@ lib/gthumb/extensions/image_rotation.extension
 lib/gthumb/extensions/image_viewer.extension
 lib/gthumb/extensions/importer.extension
 lib/gthumb/extensions/jpeg_utils.extension
-%%SOUP%%lib/gthumb/extensions/lib23hq.a
-%%SOUP%%lib/gthumb/extensions/lib23hq.so
+%%WEBSERVICES%%lib/gthumb/extensions/lib23hq.a
+%%WEBSERVICES%%lib/gthumb/extensions/lib23hq.so
 lib/gthumb/extensions/libbookmarks.a
 lib/gthumb/extensions/libbookmarks.so
 %%BRASERO%%lib/gthumb/extensions/libburn_disc.a
@@ -154,8 +158,8 @@ lib/gthumb/extensions/libedit_metadata.so
 %%EXIV2%%lib/gthumb/extensions/libexiv2_tools.so
 lib/gthumb/extensions/libexport_tools.a
 lib/gthumb/extensions/libexport_tools.so
-%%SOUP%%lib/gthumb/extensions/libfacebook.a
-%%SOUP%%lib/gthumb/extensions/libfacebook.so
+%%WEBSERVICES%%lib/gthumb/extensions/libfacebook.a
+%%WEBSERVICES%%lib/gthumb/extensions/libfacebook.so
 lib/gthumb/extensions/libfile_manager.a
 lib/gthumb/extensions/libfile_manager.so
 lib/gthumb/extensions/libfile_tools.a
@@ -164,10 +168,10 @@ lib/gthumb/extensions/libfile_viewer.a
 lib/gthumb/extensions/libfile_viewer.so
 lib/gthumb/extensions/libfind_duplicates.a
 lib/gthumb/extensions/libfind_duplicates.so
-%%SOUP%%lib/gthumb/extensions/libflicker.a
-%%SOUP%%lib/gthumb/extensions/libflicker.so
-%%SOUP%%lib/gthumb/extensions/libflicker_utils.a
-%%SOUP%%lib/gthumb/extensions/libflicker_utils.so
+%%WEBSERVICES%%lib/gthumb/extensions/libflicker.a
+%%WEBSERVICES%%lib/gthumb/extensions/libflicker.so
+%%WEBSERVICES%%lib/gthumb/extensions/libflicker_utils.a
+%%WEBSERVICES%%lib/gthumb/extensions/libflicker_utils.so
 %%GSTREAMER%%lib/gthumb/extensions/libgstreamer_tools.a
 %%GSTREAMER%%lib/gthumb/extensions/libgstreamer_tools.so
 %%GSTREAMER%%lib/gthumb/extensions/libgstreamer_utils.a
@@ -184,16 +188,14 @@ lib/gthumb/extensions/libjpeg_utils.a
 lib/gthumb/extensions/libjpeg_utils.so
 lib/gthumb/extensions/liblist_tools.a
 lib/gthumb/extensions/liblist_tools.so
-%%SOUP%%lib/gthumb/extensions/liboauth.a
-%%SOUP%%lib/gthumb/extensions/liboauth.so
+%%WEBSERVICES%%lib/gthumb/extensions/liboauth.a
+%%WEBSERVICES%%lib/gthumb/extensions/liboauth.so
 lib/gthumb/extensions/libphoto_importer.a
 lib/gthumb/extensions/libphoto_importer.so
-%%SOUP%%lib/gthumb/extensions/libphotobucket.a
-%%SOUP%%lib/gthumb/extensions/libphotobucket.so
-%%SOUP%%lib/gthumb/extensions/libpicasaweb.a
-%%SOUP%%lib/gthumb/extensions/libpicasaweb.so
-lib/gthumb/extensions/libpixbuf_savers.a
-lib/gthumb/extensions/libpixbuf_savers.so
+%%WEBSERVICES%%lib/gthumb/extensions/libphotobucket.a
+%%WEBSERVICES%%lib/gthumb/extensions/libphotobucket.so
+%%WEBSERVICES%%lib/gthumb/extensions/libpicasaweb.a
+%%WEBSERVICES%%lib/gthumb/extensions/libpicasaweb.so
 lib/gthumb/extensions/libraw_files.a
 lib/gthumb/extensions/libraw_files.so
 lib/gthumb/extensions/libred_eye_removal.a
@@ -204,477 +206,31 @@ lib/gthumb/extensions/libresize_images.a
 lib/gthumb/extensions/libresize_images.so
 lib/gthumb/extensions/libsearch.a
 lib/gthumb/extensions/libsearch.so
+lib/gthumb/extensions/libselections.a
+lib/gthumb/extensions/libselections.so
 lib/gthumb/extensions/libslideshow.a
 lib/gthumb/extensions/libslideshow.so
 lib/gthumb/extensions/libwebalbums.a
 lib/gthumb/extensions/libwebalbums.so
 lib/gthumb/extensions/list_tools.extension
-%%SOUP%%lib/gthumb/extensions/oauth.extension
+%%WEBSERVICES%%lib/gthumb/extensions/oauth.extension
 lib/gthumb/extensions/photo_importer.extension
-%%SOUP%%lib/gthumb/extensions/photobucket.extension
-%%SOUP%%lib/gthumb/extensions/picasaweb.extension
-lib/gthumb/extensions/pixbuf_savers.extension
+%%WEBSERVICES%%lib/gthumb/extensions/photobucket.extension
+%%WEBSERVICES%%lib/gthumb/extensions/picasaweb.extension
 lib/gthumb/extensions/raw_files.extension
 lib/gthumb/extensions/red_eye_removal.extension
 lib/gthumb/extensions/rename_series.extension
 lib/gthumb/extensions/resize_images.extension
 lib/gthumb/extensions/search.extension
+lib/gthumb/extensions/selections.extension
 lib/gthumb/extensions/slideshow.extension
 lib/gthumb/extensions/webalbums.extension
 libdata/pkgconfig/gthumb-%%GTHUMB_VER%%.pc
+man/man1/gthumb.1.gz
+share/GConf/gsettings/gthumb.convert
 share/aclocal/gthumb.m4
 share/applications/gthumb.desktop
 share/applications/gthumb-import.desktop
-share/gnome/help/gthumb/C/attributes.page
-share/gnome/help/gthumb/C/batch-convert-format.page
-share/gnome/help/gthumb/C/batch-change-date.page
-share/gnome/help/gthumb/C/batch-resize.page
-share/gnome/help/gthumb/C/batch-rotate.page
-share/gnome/help/gthumb/C/batch-scripts.page
-share/gnome/help/gthumb/C/bookmarks.page
-share/gnome/help/gthumb/C/browser.page
-share/gnome/help/gthumb/C/edit-colors.page
-share/gnome/help/gthumb/C/edit-redeye.page
-share/gnome/help/gthumb/C/edit-resize-crop.page
-share/gnome/help/gthumb/C/edit-rotate.page
-share/gnome/help/gthumb/C/edit-save-undo-redo.page
-share/gnome/help/gthumb/C/extensions.page
-share/gnome/help/gthumb/C/file-copy-move.page
-share/gnome/help/gthumb/C/figures/comment.png
-share/gnome/help/gthumb/C/figures/general-filter.png
-share/gnome/help/gthumb/C/figures/import.png
-share/gnome/help/gthumb/C/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/C/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/C/figures/main-win.png
-share/gnome/help/gthumb/C/figures/nav-button.png
-share/gnome/help/gthumb/C/figures/palette.png
-share/gnome/help/gthumb/C/figures/preferences.png
-share/gnome/help/gthumb/C/figures/specific-filter.png
-share/gnome/help/gthumb/C/figures/thumbnail-pane.png
-share/gnome/help/gthumb/C/filtering.page
-share/gnome/help/gthumb/C/fullscreen.page
-share/gnome/help/gthumb/C/gimp.page
-share/gnome/help/gthumb/C/import.page
-share/gnome/help/gthumb/C/index.page
-share/gnome/help/gthumb/C/introduction.page
-share/gnome/help/gthumb/C/legal.xml
-share/gnome/help/gthumb/C/printing.page
-share/gnome/help/gthumb/C/rename-series.page
-share/gnome/help/gthumb/C/sharing-disc.page
-share/gnome/help/gthumb/C/sharing-social.page
-share/gnome/help/gthumb/C/shortcuts.page
-share/gnome/help/gthumb/C/slideshow.page
-share/gnome/help/gthumb/C/sorting.page
-share/gnome/help/gthumb/C/strftime.page
-share/gnome/help/gthumb/C/thumbnails.page
-share/gnome/help/gthumb/C/thumbnail-pane.page
-share/gnome/help/gthumb/C/viewer.page
-share/gnome/help/gthumb/C/wallpaper.page
-share/gnome/help/gthumb/de/attributes.page
-share/gnome/help/gthumb/de/batch-convert-format.page
-share/gnome/help/gthumb/de/batch-change-date.page
-share/gnome/help/gthumb/de/batch-resize.page
-share/gnome/help/gthumb/de/batch-rotate.page
-share/gnome/help/gthumb/de/batch-scripts.page
-share/gnome/help/gthumb/de/bookmarks.page
-share/gnome/help/gthumb/de/browser.page
-share/gnome/help/gthumb/de/edit-colors.page
-share/gnome/help/gthumb/de/edit-redeye.page
-share/gnome/help/gthumb/de/edit-resize-crop.page
-share/gnome/help/gthumb/de/edit-rotate.page
-share/gnome/help/gthumb/de/edit-save-undo-redo.page
-share/gnome/help/gthumb/de/extensions.page
-share/gnome/help/gthumb/de/file-copy-move.page
-share/gnome/help/gthumb/de/figures/comment.png
-share/gnome/help/gthumb/de/figures/general-filter.png
-share/gnome/help/gthumb/de/figures/import.png
-share/gnome/help/gthumb/de/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/de/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/de/figures/main-win.png
-share/gnome/help/gthumb/de/figures/nav-button.png
-share/gnome/help/gthumb/de/figures/palette.png
-share/gnome/help/gthumb/de/figures/preferences.png
-share/gnome/help/gthumb/de/figures/specific-filter.png
-share/gnome/help/gthumb/de/figures/thumbnail-pane.png
-share/gnome/help/gthumb/de/filtering.page
-share/gnome/help/gthumb/de/fullscreen.page
-share/gnome/help/gthumb/de/gimp.page
-share/gnome/help/gthumb/de/import.page
-share/gnome/help/gthumb/de/index.page
-share/gnome/help/gthumb/de/introduction.page
-share/gnome/help/gthumb/de/legal.xml
-share/gnome/help/gthumb/de/printing.page
-share/gnome/help/gthumb/de/rename-series.page
-share/gnome/help/gthumb/de/sharing-disc.page
-share/gnome/help/gthumb/de/sharing-social.page
-share/gnome/help/gthumb/de/shortcuts.page
-share/gnome/help/gthumb/de/slideshow.page
-share/gnome/help/gthumb/de/sorting.page
-share/gnome/help/gthumb/de/strftime.page
-share/gnome/help/gthumb/de/thumbnails.page
-share/gnome/help/gthumb/de/thumbnail-pane.page
-share/gnome/help/gthumb/de/viewer.page
-share/gnome/help/gthumb/de/wallpaper.page
-share/gnome/help/gthumb/el/attributes.page
-share/gnome/help/gthumb/el/batch-convert-format.page
-share/gnome/help/gthumb/el/batch-change-date.page
-share/gnome/help/gthumb/el/batch-resize.page
-share/gnome/help/gthumb/el/batch-rotate.page
-share/gnome/help/gthumb/el/batch-scripts.page
-share/gnome/help/gthumb/el/bookmarks.page
-share/gnome/help/gthumb/el/browser.page
-share/gnome/help/gthumb/el/edit-colors.page
-share/gnome/help/gthumb/el/edit-redeye.page
-share/gnome/help/gthumb/el/edit-resize-crop.page
-share/gnome/help/gthumb/el/edit-rotate.page
-share/gnome/help/gthumb/el/edit-save-undo-redo.page
-share/gnome/help/gthumb/el/extensions.page
-share/gnome/help/gthumb/el/file-copy-move.page
-share/gnome/help/gthumb/el/figures/comment.png
-share/gnome/help/gthumb/el/figures/general-filter.png
-share/gnome/help/gthumb/el/figures/import.png
-share/gnome/help/gthumb/el/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/el/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/el/figures/main-win.png
-share/gnome/help/gthumb/el/figures/nav-button.png
-share/gnome/help/gthumb/el/figures/palette.png
-share/gnome/help/gthumb/el/figures/preferences.png
-share/gnome/help/gthumb/el/figures/specific-filter.png
-share/gnome/help/gthumb/el/figures/thumbnail-pane.png
-share/gnome/help/gthumb/el/filtering.page
-share/gnome/help/gthumb/el/fullscreen.page
-share/gnome/help/gthumb/el/gimp.page
-share/gnome/help/gthumb/el/import.page
-share/gnome/help/gthumb/el/index.page
-share/gnome/help/gthumb/el/introduction.page
-share/gnome/help/gthumb/el/legal.xml
-share/gnome/help/gthumb/el/printing.page
-share/gnome/help/gthumb/el/rename-series.page
-share/gnome/help/gthumb/el/sharing-disc.page
-share/gnome/help/gthumb/el/sharing-social.page
-share/gnome/help/gthumb/el/shortcuts.page
-share/gnome/help/gthumb/el/slideshow.page
-share/gnome/help/gthumb/el/sorting.page
-share/gnome/help/gthumb/el/strftime.page
-share/gnome/help/gthumb/el/thumbnails.page
-share/gnome/help/gthumb/el/thumbnail-pane.page
-share/gnome/help/gthumb/el/viewer.page
-share/gnome/help/gthumb/el/wallpaper.page
-share/gnome/help/gthumb/es/attributes.page
-share/gnome/help/gthumb/es/batch-convert-format.page
-share/gnome/help/gthumb/es/batch-change-date.page
-share/gnome/help/gthumb/es/batch-resize.page
-share/gnome/help/gthumb/es/batch-rotate.page
-share/gnome/help/gthumb/es/batch-scripts.page
-share/gnome/help/gthumb/es/bookmarks.page
-share/gnome/help/gthumb/es/browser.page
-share/gnome/help/gthumb/es/edit-colors.page
-share/gnome/help/gthumb/es/edit-redeye.page
-share/gnome/help/gthumb/es/edit-resize-crop.page
-share/gnome/help/gthumb/es/edit-rotate.page
-share/gnome/help/gthumb/es/edit-save-undo-redo.page
-share/gnome/help/gthumb/es/extensions.page
-share/gnome/help/gthumb/es/file-copy-move.page
-share/gnome/help/gthumb/es/figures/comment.png
-share/gnome/help/gthumb/es/figures/general-filter.png
-share/gnome/help/gthumb/es/figures/import.png
-share/gnome/help/gthumb/es/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/es/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/es/figures/main-win.png
-share/gnome/help/gthumb/es/figures/nav-button.png
-share/gnome/help/gthumb/es/figures/palette.png
-share/gnome/help/gthumb/es/figures/preferences.png
-share/gnome/help/gthumb/es/figures/specific-filter.png
-share/gnome/help/gthumb/es/figures/thumbnail-pane.png
-share/gnome/help/gthumb/es/filtering.page
-share/gnome/help/gthumb/es/fullscreen.page
-share/gnome/help/gthumb/es/gimp.page
-share/gnome/help/gthumb/es/import.page
-share/gnome/help/gthumb/es/index.page
-share/gnome/help/gthumb/es/introduction.page
-share/gnome/help/gthumb/es/legal.xml
-share/gnome/help/gthumb/es/printing.page
-share/gnome/help/gthumb/es/rename-series.page
-share/gnome/help/gthumb/es/sharing-disc.page
-share/gnome/help/gthumb/es/sharing-social.page
-share/gnome/help/gthumb/es/shortcuts.page
-share/gnome/help/gthumb/es/slideshow.page
-share/gnome/help/gthumb/es/sorting.page
-share/gnome/help/gthumb/es/strftime.page
-share/gnome/help/gthumb/es/thumbnails.page
-share/gnome/help/gthumb/es/thumbnail-pane.page
-share/gnome/help/gthumb/es/viewer.page
-share/gnome/help/gthumb/es/wallpaper.page
-share/gnome/help/gthumb/eu/attributes.page
-share/gnome/help/gthumb/eu/batch-change-date.page
-share/gnome/help/gthumb/eu/batch-convert-format.page
-share/gnome/help/gthumb/eu/batch-resize.page
-share/gnome/help/gthumb/eu/batch-rotate.page
-share/gnome/help/gthumb/eu/batch-scripts.page
-share/gnome/help/gthumb/eu/bookmarks.page
-share/gnome/help/gthumb/eu/browser.page
-share/gnome/help/gthumb/eu/edit-colors.page
-share/gnome/help/gthumb/eu/edit-redeye.page
-share/gnome/help/gthumb/eu/edit-resize-crop.page
-share/gnome/help/gthumb/eu/edit-rotate.page
-share/gnome/help/gthumb/eu/edit-save-undo-redo.page
-share/gnome/help/gthumb/eu/extensions.page
-share/gnome/help/gthumb/eu/file-copy-move.page
-share/gnome/help/gthumb/eu/figures/comment.png
-share/gnome/help/gthumb/eu/figures/general-filter.png
-share/gnome/help/gthumb/eu/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/eu/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/eu/figures/import.png
-share/gnome/help/gthumb/eu/figures/main-win.png
-share/gnome/help/gthumb/eu/figures/nav-button.png
-share/gnome/help/gthumb/eu/figures/palette.png
-share/gnome/help/gthumb/eu/figures/preferences.png
-share/gnome/help/gthumb/eu/figures/specific-filter.png
-share/gnome/help/gthumb/eu/figures/thumbnail-pane.png
-share/gnome/help/gthumb/eu/filtering.page
-share/gnome/help/gthumb/eu/fullscreen.page
-share/gnome/help/gthumb/eu/gimp.page
-share/gnome/help/gthumb/eu/import.page
-share/gnome/help/gthumb/eu/index.page
-share/gnome/help/gthumb/eu/introduction.page
-share/gnome/help/gthumb/eu/legal.xml
-share/gnome/help/gthumb/eu/printing.page
-share/gnome/help/gthumb/eu/rename-series.page
-share/gnome/help/gthumb/eu/sharing-disc.page
-share/gnome/help/gthumb/eu/sharing-social.page
-share/gnome/help/gthumb/eu/shortcuts.page
-share/gnome/help/gthumb/eu/slideshow.page
-share/gnome/help/gthumb/eu/sorting.page
-share/gnome/help/gthumb/eu/strftime.page
-share/gnome/help/gthumb/eu/thumbnail-pane.page
-share/gnome/help/gthumb/eu/thumbnails.page
-share/gnome/help/gthumb/eu/viewer.page
-share/gnome/help/gthumb/eu/wallpaper.page
-share/gnome/help/gthumb/fr/attributes.page
-share/gnome/help/gthumb/fr/batch-convert-format.page
-share/gnome/help/gthumb/fr/batch-change-date.page
-share/gnome/help/gthumb/fr/batch-resize.page
-share/gnome/help/gthumb/fr/batch-rotate.page
-share/gnome/help/gthumb/fr/batch-scripts.page
-share/gnome/help/gthumb/fr/bookmarks.page
-share/gnome/help/gthumb/fr/browser.page
-share/gnome/help/gthumb/fr/edit-colors.page
-share/gnome/help/gthumb/fr/edit-redeye.page
-share/gnome/help/gthumb/fr/edit-resize-crop.page
-share/gnome/help/gthumb/fr/edit-rotate.page
-share/gnome/help/gthumb/fr/edit-save-undo-redo.page
-share/gnome/help/gthumb/fr/extensions.page
-share/gnome/help/gthumb/fr/file-copy-move.page
-share/gnome/help/gthumb/fr/figures/comment.png
-share/gnome/help/gthumb/fr/figures/general-filter.png
-share/gnome/help/gthumb/fr/figures/import.png
-share/gnome/help/gthumb/fr/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/fr/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/fr/figures/main-win.png
-share/gnome/help/gthumb/fr/figures/nav-button.png
-share/gnome/help/gthumb/fr/figures/palette.png
-share/gnome/help/gthumb/fr/figures/preferences.png
-share/gnome/help/gthumb/fr/figures/specific-filter.png
-share/gnome/help/gthumb/fr/figures/thumbnail-pane.png
-share/gnome/help/gthumb/fr/filtering.page
-share/gnome/help/gthumb/fr/fullscreen.page
-share/gnome/help/gthumb/fr/gimp.page
-share/gnome/help/gthumb/fr/import.page
-share/gnome/help/gthumb/fr/index.page
-share/gnome/help/gthumb/fr/introduction.page
-share/gnome/help/gthumb/fr/legal.xml
-share/gnome/help/gthumb/fr/printing.page
-share/gnome/help/gthumb/fr/rename-series.page
-share/gnome/help/gthumb/fr/sharing-disc.page
-share/gnome/help/gthumb/fr/sharing-social.page
-share/gnome/help/gthumb/fr/shortcuts.page
-share/gnome/help/gthumb/fr/slideshow.page
-share/gnome/help/gthumb/fr/sorting.page
-share/gnome/help/gthumb/fr/strftime.page
-share/gnome/help/gthumb/fr/thumbnails.page
-share/gnome/help/gthumb/fr/thumbnail-pane.page
-share/gnome/help/gthumb/fr/viewer.page
-share/gnome/help/gthumb/fr/wallpaper.page
-share/gnome/help/gthumb/oc/attributes.page
-share/gnome/help/gthumb/oc/batch-convert-format.page
-share/gnome/help/gthumb/oc/batch-change-date.page
-share/gnome/help/gthumb/oc/batch-resize.page
-share/gnome/help/gthumb/oc/batch-rotate.page
-share/gnome/help/gthumb/oc/batch-scripts.page
-share/gnome/help/gthumb/oc/bookmarks.page
-share/gnome/help/gthumb/oc/browser.page
-share/gnome/help/gthumb/oc/edit-colors.page
-share/gnome/help/gthumb/oc/edit-redeye.page
-share/gnome/help/gthumb/oc/edit-resize-crop.page
-share/gnome/help/gthumb/oc/edit-rotate.page
-share/gnome/help/gthumb/oc/edit-save-undo-redo.page
-share/gnome/help/gthumb/oc/extensions.page
-share/gnome/help/gthumb/oc/file-copy-move.page
-share/gnome/help/gthumb/oc/figures/comment.png
-share/gnome/help/gthumb/oc/figures/general-filter.png
-share/gnome/help/gthumb/oc/figures/import.png
-share/gnome/help/gthumb/oc/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/oc/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/oc/figures/main-win.png
-share/gnome/help/gthumb/oc/figures/nav-button.png
-share/gnome/help/gthumb/oc/figures/palette.png
-share/gnome/help/gthumb/oc/figures/preferences.png
-share/gnome/help/gthumb/oc/figures/specific-filter.png
-share/gnome/help/gthumb/oc/figures/thumbnail-pane.png
-share/gnome/help/gthumb/oc/filtering.page
-share/gnome/help/gthumb/oc/fullscreen.page
-share/gnome/help/gthumb/oc/gimp.page
-share/gnome/help/gthumb/oc/import.page
-share/gnome/help/gthumb/oc/index.page
-share/gnome/help/gthumb/oc/introduction.page
-share/gnome/help/gthumb/oc/legal.xml
-share/gnome/help/gthumb/oc/printing.page
-share/gnome/help/gthumb/oc/rename-series.page
-share/gnome/help/gthumb/oc/sharing-disc.page
-share/gnome/help/gthumb/oc/sharing-social.page
-share/gnome/help/gthumb/oc/shortcuts.page
-share/gnome/help/gthumb/oc/slideshow.page
-share/gnome/help/gthumb/oc/sorting.page
-share/gnome/help/gthumb/oc/strftime.page
-share/gnome/help/gthumb/oc/thumbnails.page
-share/gnome/help/gthumb/oc/thumbnail-pane.page
-share/gnome/help/gthumb/oc/viewer.page
-share/gnome/help/gthumb/oc/wallpaper.page
-share/gnome/help/gthumb/sl/attributes.page
-share/gnome/help/gthumb/sl/batch-convert-format.page
-share/gnome/help/gthumb/sl/batch-change-date.page
-share/gnome/help/gthumb/sl/batch-resize.page
-share/gnome/help/gthumb/sl/batch-rotate.page
-share/gnome/help/gthumb/sl/batch-scripts.page
-share/gnome/help/gthumb/sl/bookmarks.page
-share/gnome/help/gthumb/sl/browser.page
-share/gnome/help/gthumb/sl/edit-colors.page
-share/gnome/help/gthumb/sl/edit-redeye.page
-share/gnome/help/gthumb/sl/edit-resize-crop.page
-share/gnome/help/gthumb/sl/edit-rotate.page
-share/gnome/help/gthumb/sl/edit-save-undo-redo.page
-share/gnome/help/gthumb/sl/extensions.page
-share/gnome/help/gthumb/sl/file-copy-move.page
-share/gnome/help/gthumb/sl/figures/comment.png
-share/gnome/help/gthumb/sl/figures/general-filter.png
-share/gnome/help/gthumb/sl/figures/import.png
-share/gnome/help/gthumb/sl/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/sl/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/sl/figures/main-win.png
-share/gnome/help/gthumb/sl/figures/nav-button.png
-share/gnome/help/gthumb/sl/figures/palette.png
-share/gnome/help/gthumb/sl/figures/preferences.png
-share/gnome/help/gthumb/sl/figures/specific-filter.png
-share/gnome/help/gthumb/sl/figures/thumbnail-pane.png
-share/gnome/help/gthumb/sl/filtering.page
-share/gnome/help/gthumb/sl/fullscreen.page
-share/gnome/help/gthumb/sl/gimp.page
-share/gnome/help/gthumb/sl/import.page
-share/gnome/help/gthumb/sl/index.page
-share/gnome/help/gthumb/sl/introduction.page
-share/gnome/help/gthumb/sl/legal.xml
-share/gnome/help/gthumb/sl/printing.page
-share/gnome/help/gthumb/sl/rename-series.page
-share/gnome/help/gthumb/sl/sharing-disc.page
-share/gnome/help/gthumb/sl/sharing-social.page
-share/gnome/help/gthumb/sl/shortcuts.page
-share/gnome/help/gthumb/sl/slideshow.page
-share/gnome/help/gthumb/sl/sorting.page
-share/gnome/help/gthumb/sl/strftime.page
-share/gnome/help/gthumb/sl/thumbnails.page
-share/gnome/help/gthumb/sl/thumbnail-pane.page
-share/gnome/help/gthumb/sl/viewer.page
-share/gnome/help/gthumb/sl/wallpaper.page
-share/gnome/help/gthumb/sv/attributes.page
-share/gnome/help/gthumb/sv/batch-convert-format.page
-share/gnome/help/gthumb/sv/batch-change-date.page
-share/gnome/help/gthumb/sv/batch-resize.page
-share/gnome/help/gthumb/sv/batch-rotate.page
-share/gnome/help/gthumb/sv/batch-scripts.page
-share/gnome/help/gthumb/sv/bookmarks.page
-share/gnome/help/gthumb/sv/browser.page
-share/gnome/help/gthumb/sv/edit-colors.page
-share/gnome/help/gthumb/sv/edit-redeye.page
-share/gnome/help/gthumb/sv/edit-resize-crop.page
-share/gnome/help/gthumb/sv/edit-rotate.page
-share/gnome/help/gthumb/sv/edit-save-undo-redo.page
-share/gnome/help/gthumb/sv/extensions.page
-share/gnome/help/gthumb/sv/file-copy-move.page
-share/gnome/help/gthumb/sv/figures/comment.png
-share/gnome/help/gthumb/sv/figures/general-filter.png
-share/gnome/help/gthumb/sv/figures/import.png
-share/gnome/help/gthumb/sv/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/sv/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/sv/figures/main-win.png
-share/gnome/help/gthumb/sv/figures/nav-button.png
-share/gnome/help/gthumb/sv/figures/palette.png
-share/gnome/help/gthumb/sv/figures/preferences.png
-share/gnome/help/gthumb/sv/figures/specific-filter.png
-share/gnome/help/gthumb/sv/figures/thumbnail-pane.png
-share/gnome/help/gthumb/sv/filtering.page
-share/gnome/help/gthumb/sv/fullscreen.page
-share/gnome/help/gthumb/sv/gimp.page
-share/gnome/help/gthumb/sv/import.page
-share/gnome/help/gthumb/sv/index.page
-share/gnome/help/gthumb/sv/introduction.page
-share/gnome/help/gthumb/sv/legal.xml
-share/gnome/help/gthumb/sv/printing.page
-share/gnome/help/gthumb/sv/rename-series.page
-share/gnome/help/gthumb/sv/sharing-disc.page
-share/gnome/help/gthumb/sv/sharing-social.page
-share/gnome/help/gthumb/sv/shortcuts.page
-share/gnome/help/gthumb/sv/slideshow.page
-share/gnome/help/gthumb/sv/sorting.page
-share/gnome/help/gthumb/sv/strftime.page
-share/gnome/help/gthumb/sv/thumbnails.page
-share/gnome/help/gthumb/sv/thumbnail-pane.page
-share/gnome/help/gthumb/sv/viewer.page
-share/gnome/help/gthumb/sv/wallpaper.page
-share/gnome/help/gthumb/zh_CN/attributes.page
-share/gnome/help/gthumb/zh_CN/batch-convert-format.page
-share/gnome/help/gthumb/zh_CN/batch-change-date.page
-share/gnome/help/gthumb/zh_CN/batch-resize.page
-share/gnome/help/gthumb/zh_CN/batch-rotate.page
-share/gnome/help/gthumb/zh_CN/batch-scripts.page
-share/gnome/help/gthumb/zh_CN/bookmarks.page
-share/gnome/help/gthumb/zh_CN/browser.page
-share/gnome/help/gthumb/zh_CN/edit-colors.page
-share/gnome/help/gthumb/zh_CN/edit-redeye.page
-share/gnome/help/gthumb/zh_CN/edit-resize-crop.page
-share/gnome/help/gthumb/zh_CN/edit-rotate.page
-share/gnome/help/gthumb/zh_CN/edit-save-undo-redo.page
-share/gnome/help/gthumb/zh_CN/extensions.page
-share/gnome/help/gthumb/zh_CN/file-copy-move.page
-share/gnome/help/gthumb/zh_CN/figures/comment.png
-share/gnome/help/gthumb/zh_CN/figures/general-filter.png
-share/gnome/help/gthumb/zh_CN/figures/import.png
-share/gnome/help/gthumb/zh_CN/figures/import-pref-auto-folder.png
-share/gnome/help/gthumb/zh_CN/figures/import-pref-custom-format.png
-share/gnome/help/gthumb/zh_CN/figures/main-win.png
-share/gnome/help/gthumb/zh_CN/figures/nav-button.png
-share/gnome/help/gthumb/zh_CN/figures/palette.png
-share/gnome/help/gthumb/zh_CN/figures/preferences.png
-share/gnome/help/gthumb/zh_CN/figures/specific-filter.png
-share/gnome/help/gthumb/zh_CN/figures/thumbnail-pane.png
-share/gnome/help/gthumb/zh_CN/filtering.page
-share/gnome/help/gthumb/zh_CN/fullscreen.page
-share/gnome/help/gthumb/zh_CN/gimp.page
-share/gnome/help/gthumb/zh_CN/import.page
-share/gnome/help/gthumb/zh_CN/index.page
-share/gnome/help/gthumb/zh_CN/introduction.page
-share/gnome/help/gthumb/zh_CN/legal.xml
-share/gnome/help/gthumb/zh_CN/printing.page
-share/gnome/help/gthumb/zh_CN/rename-series.page
-share/gnome/help/gthumb/zh_CN/sharing-disc.page
-share/gnome/help/gthumb/zh_CN/sharing-social.page
-share/gnome/help/gthumb/zh_CN/shortcuts.page
-share/gnome/help/gthumb/zh_CN/slideshow.page
-share/gnome/help/gthumb/zh_CN/sorting.page
-share/gnome/help/gthumb/zh_CN/strftime.page
-share/gnome/help/gthumb/zh_CN/thumbnails.page
-share/gnome/help/gthumb/zh_CN/thumbnail-pane.page
-share/gnome/help/gthumb/zh_CN/viewer.page
-share/gnome/help/gthumb/zh_CN/wallpaper.page
 share/gthumb/albumthemes/Classic/back.png
 share/gthumb/albumthemes/Classic/bot.png
 share/gthumb/albumthemes/Classic/image.gthtml
@@ -722,64 +278,82 @@ share/gthumb/albumthemes/Wiki/thumbnail.gthtml
 share/gthumb/contactsheetthemes/default.cst
 share/gthumb/contactsheetthemes/minimalist.cst
 share/gthumb/contactsheetthemes/rainbow.cst
-share/gthumb/icons/hicolor/scalable/actions/browser-mode.svg
-share/gthumb/icons/hicolor/scalable/actions/file-catalog.svg
-share/gthumb/icons/hicolor/scalable/actions/file-library.svg
-share/gthumb/icons/hicolor/scalable/actions/file-search.svg
-share/gthumb/icons/hicolor/scalable/actions/palette.svg
-share/gthumb/icons/hicolor/scalable/actions/share.svg
-share/gthumb/icons/hicolor/scalable/actions/slideshow-pause.svg
-share/gthumb/icons/hicolor/scalable/actions/tag.svg
-share/gthumb/icons/hicolor/scalable/actions/tool-sharpen.svg
-share/gthumb/icons/hicolor/16x16/actions/browser-mode.png
-share/gthumb/icons/hicolor/16x16/actions/file-catalog.png
-share/gthumb/icons/hicolor/16x16/actions/file-library.png
-share/gthumb/icons/hicolor/16x16/actions/file-search.png
-share/gthumb/icons/hicolor/16x16/actions/histogram.png
-share/gthumb/icons/hicolor/16x16/actions/histogram-linear.png
-share/gthumb/icons/hicolor/16x16/actions/histogram-logarithmic.png
-share/gthumb/icons/hicolor/16x16/actions/image-navigator.png
-share/gthumb/icons/hicolor/16x16/actions/map.png
-share/gthumb/icons/hicolor/16x16/actions/site-facebook.png
-share/gthumb/icons/hicolor/16x16/actions/site-flickr.png
-share/gthumb/icons/hicolor/16x16/actions/site-photobucket.png
-share/gthumb/icons/hicolor/16x16/actions/site-picasaweb.png
-share/gthumb/icons/hicolor/16x16/actions/site-twentythree.png
-share/gthumb/icons/hicolor/16x16/actions/tool-adjust-colors.png
-share/gthumb/icons/hicolor/16x16/actions/tool-crop.png
-share/gthumb/icons/hicolor/16x16/actions/tool-desaturate.png
-share/gthumb/icons/hicolor/16x16/actions/tool-enhance.png
-share/gthumb/icons/hicolor/16x16/actions/tool-flip.png
-share/gthumb/icons/hicolor/16x16/actions/tool-invert.png
-share/gthumb/icons/hicolor/16x16/actions/tool-mirror.png
-share/gthumb/icons/hicolor/16x16/actions/tool-red-eye.png
-share/gthumb/icons/hicolor/16x16/actions/tool-resize.png
-share/gthumb/icons/hicolor/16x16/actions/tool-rotate.png
-share/gthumb/icons/hicolor/16x16/actions/tool-rotate-270.png
-share/gthumb/icons/hicolor/16x16/actions/tool-rotate-90.png
-share/gthumb/icons/hicolor/16x16/actions/tool-sharpen.png
-share/gthumb/icons/hicolor/22x22/actions/browser-mode.png
-share/gthumb/icons/hicolor/22x22/actions/file-catalog.png
-share/gthumb/icons/hicolor/22x22/actions/file-library.png
-share/gthumb/icons/hicolor/22x22/actions/file-search.png
-share/gthumb/icons/hicolor/22x22/actions/histogram.png
-share/gthumb/icons/hicolor/22x22/actions/palette.png
-share/gthumb/icons/hicolor/22x22/actions/share.png
-share/gthumb/icons/hicolor/22x22/actions/tag.png
-share/gthumb/icons/hicolor/22x22/actions/tool-adjust-colors.png
-share/gthumb/icons/hicolor/22x22/actions/tool-crop.png
-share/gthumb/icons/hicolor/22x22/actions/tool-desaturate.png
-share/gthumb/icons/hicolor/22x22/actions/tool-enhance.png
-share/gthumb/icons/hicolor/22x22/actions/tool-red-eye.png
-share/gthumb/icons/hicolor/22x22/actions/tool-resize.png
-share/gthumb/icons/hicolor/22x22/actions/tool-rotate.png
-share/gthumb/icons/hicolor/22x22/actions/tool-sharpen.png
-share/gthumb/icons/hicolor/22x22/actions/zoom-fit-width.png
-share/gthumb/icons/hicolor/48x48/actions/browser-mode.png
-share/gthumb/icons/hicolor/48x48/actions/file-catalog.png
-share/gthumb/icons/hicolor/48x48/actions/file-library.png
-share/gthumb/icons/hicolor/48x48/actions/file-search.png
-share/gthumb/icons/hicolor/48x48/actions/palette.png
+%%DATADIR%%/icons/filmholes.png
+%%DATADIR%%/icons/hicolor/16x16/actions/application-extension.png
+%%DATADIR%%/icons/hicolor/16x16/actions/browser-mode.png
+%%DATADIR%%/icons/hicolor/16x16/actions/file-catalog.png
+%%DATADIR%%/icons/hicolor/16x16/actions/file-library.png
+%%DATADIR%%/icons/hicolor/16x16/actions/file-search.png
+%%DATADIR%%/icons/hicolor/16x16/actions/histogram-linear.png
+%%DATADIR%%/icons/hicolor/16x16/actions/histogram-logarithmic.png
+%%DATADIR%%/icons/hicolor/16x16/actions/histogram.png
+%%DATADIR%%/icons/hicolor/16x16/actions/image-navigator.png
+%%DATADIR%%/icons/hicolor/16x16/actions/map.png
+%%DATADIR%%/icons/hicolor/16x16/actions/selection.png
+%%DATADIR%%/icons/hicolor/16x16/actions/selection1.png
+%%DATADIR%%/icons/hicolor/16x16/actions/selection2.png
+%%DATADIR%%/icons/hicolor/16x16/actions/selection3.png
+%%DATADIR%%/icons/hicolor/16x16/actions/site-facebook.png
+%%DATADIR%%/icons/hicolor/16x16/actions/site-flickr.png
+%%DATADIR%%/icons/hicolor/16x16/actions/site-photobucket.png
+%%DATADIR%%/icons/hicolor/16x16/actions/site-picasaweb.png
+%%DATADIR%%/icons/hicolor/16x16/actions/site-twentythree.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tag.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-adjust-colors.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-adjust-contrast.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-crop.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-flip.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-grayscale.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-invert.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-mirror.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-red-eye.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-resize.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-rotate-270.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-rotate-90.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-rotate.png
+%%DATADIR%%/icons/hicolor/16x16/actions/tool-sharpen.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-height.png
+%%DATADIR%%/icons/hicolor/16x16/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/22x22/actions/application-extension.png
+%%DATADIR%%/icons/hicolor/22x22/actions/browser-mode.png
+%%DATADIR%%/icons/hicolor/22x22/actions/file-catalog.png
+%%DATADIR%%/icons/hicolor/22x22/actions/file-library.png
+%%DATADIR%%/icons/hicolor/22x22/actions/file-search.png
+%%DATADIR%%/icons/hicolor/22x22/actions/histogram.png
+%%DATADIR%%/icons/hicolor/22x22/actions/palette.png
+%%DATADIR%%/icons/hicolor/22x22/actions/share.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tag.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-adjust-colors.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-adjust-contrast.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-crop.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-grayscale.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-red-eye.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-resize.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-rotate.png
+%%DATADIR%%/icons/hicolor/22x22/actions/tool-sharpen.png
+%%DATADIR%%/icons/hicolor/22x22/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/24x24/actions/browser-mode.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-height.png
+%%DATADIR%%/icons/hicolor/24x24/actions/zoom-fit-width.png
+%%DATADIR%%/icons/hicolor/48x48/actions/browser-mode.png
+%%DATADIR%%/icons/hicolor/48x48/actions/file-catalog.png
+%%DATADIR%%/icons/hicolor/48x48/actions/file-library.png
+%%DATADIR%%/icons/hicolor/48x48/actions/file-search.png
+%%DATADIR%%/icons/hicolor/48x48/actions/palette.png
+%%DATADIR%%/icons/hicolor/48x48/actions/selection.png
+%%DATADIR%%/icons/hicolor/48x48/actions/selection1.png
+%%DATADIR%%/icons/hicolor/48x48/actions/selection2.png
+%%DATADIR%%/icons/hicolor/48x48/actions/selection3.png
+%%DATADIR%%/icons/hicolor/scalable/actions/browser-mode.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/file-catalog.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/file-library.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/file-search.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/palette.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/share.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/slideshow-pause.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/tag.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/tool-adjust-contrast.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/tool-sharpen.svg
 share/gthumb/ui/add-to-catalog.ui
 share/gthumb/ui/adjust-colors-options.ui
 share/gthumb/ui/ask-value.ui
@@ -796,38 +370,33 @@ share/gthumb/ui/convert-format.ui
 share/gthumb/ui/crop-options.ui
 share/gthumb/ui/edit-comment-page.ui
 %%EXIV2%%share/gthumb/ui/edit-exiv2-page.ui
-%%SOUP%%share/gthumb/ui/export-to-facebook.ui
-%%SOUP%%share/gthumb/ui/export-to-flickr.ui
-%%SOUP%%share/gthumb/ui/export-to-photobucket.ui
-%%SOUP%%share/gthumb/ui/export-to-picasaweb.ui
+%%WEBSERVICES%%share/gthumb/ui/export-to-facebook.ui
+%%WEBSERVICES%%share/gthumb/ui/export-to-flickr.ui
+%%WEBSERVICES%%share/gthumb/ui/export-to-photobucket.ui
+%%WEBSERVICES%%share/gthumb/ui/export-to-picasaweb.ui
 share/gthumb/ui/extensions-preferences.ui
-%%SOUP%%share/gthumb/ui/facebook-account-chooser.ui
-%%SOUP%%share/gthumb/ui/facebook-account-manager.ui
-%%SOUP%%share/gthumb/ui/facebook-album-properties.ui
-%%SOUP%%share/gthumb/ui/facebook-ask-authorization.ui
-%%SOUP%%share/gthumb/ui/facebook-complete-authorization.ui
-%%SOUP%%share/gthumb/ui/facebook-export-completed.ui
+%%WEBSERVICES%%share/gthumb/ui/facebook-album-properties.ui
+%%WEBSERVICES%%share/gthumb/ui/facebook-export-completed.ui
+%%WEBSERVICES%%share/gthumb/ui/flicker-export-completed.ui
+%%WEBSERVICES%%share/gthumb/ui/flickr-ask-authorization-old.ui
 share/gthumb/ui/find-duplicates.ui
 share/gthumb/ui/find-duplicates-choose-folders.ui
 share/gthumb/ui/find-duplicates-dialog.ui
 share/gthumb/ui/filter-editor.ui
-%%SOUP%%share/gthumb/ui/flicker-account-chooser.ui
-%%SOUP%%share/gthumb/ui/flicker-account-manager.ui
-%%SOUP%%share/gthumb/ui/flicker-ask-authorization.ui
-%%SOUP%%share/gthumb/ui/flicker-complete-authorization.ui
-%%SOUP%%share/gthumb/ui/flicker-export-completed.ui
+share/gthumb/ui/grayscale-options.ui
 share/gthumb/ui/histogram-info.ui
 share/gthumb/ui/image-viewer-preferences.ui
 share/gthumb/ui/image-wall.ui
-%%SOUP%%share/gthumb/ui/import-from-flickr.ui
-%%SOUP%%share/gthumb/ui/import-from-picasaweb.ui
+%%WEBSERVICES%%share/gthumb/ui/import-from-facebook.ui
+%%WEBSERVICES%%share/gthumb/ui/import-from-flickr.ui
+%%WEBSERVICES%%share/gthumb/ui/import-from-picasaweb.ui
 share/gthumb/ui/import-preferences.ui
 share/gthumb/ui/jpeg-options.ui
+share/gthumb/ui/location.ui
 %%GSTREAMER%%share/gthumb/ui/mediabar.ui
-%%SOUP%%share/gthumb/ui/oauth-account-chooser.ui
-%%SOUP%%share/gthumb/ui/oauth-account-manager.ui
-%%SOUP%%share/gthumb/ui/oauth-ask-authorization.ui
-%%SOUP%%share/gthumb/ui/oauth-complete-authorization.ui
+%%WEBSERVICES%%share/gthumb/ui/oauth-account-chooser.ui
+%%WEBSERVICES%%share/gthumb/ui/oauth-account-manager.ui
+%%WEBSERVICES%%share/gthumb/ui/oauth-ask-authorization.ui
 share/gthumb/ui/organize-files.ui
 share/gthumb/ui/organize-files-task.ui
 share/gthumb/ui/overwrite-dialog.ui
@@ -835,13 +404,10 @@ share/gthumb/ui/personalize-filters.ui
 share/gthumb/ui/personalize-scripts.ui
 share/gthumb/ui/photo-importer.ui
 share/gthumb/ui/photo-importer-options.ui
-%%SOUP%%share/gthumb/ui/photobucket-album-properties.ui
-%%SOUP%%share/gthumb/ui/photobucket-export-completed.ui
-%%SOUP%%share/gthumb/ui/picasa-web-account-chooser.ui
-%%SOUP%%share/gthumb/ui/picasa-web-account-manager.ui
-%%SOUP%%share/gthumb/ui/picasa-web-account-properties.ui
-%%SOUP%%share/gthumb/ui/picasa-web-album-properties.ui
-%%SOUP%%share/gthumb/ui/picasa-web-export-completed.ui
+%%WEBSERVICES%%share/gthumb/ui/photobucket-album-properties.ui
+%%WEBSERVICES%%share/gthumb/ui/photobucket-export-completed.ui
+%%WEBSERVICES%%share/gthumb/ui/picasa-web-album-properties.ui
+%%WEBSERVICES%%share/gthumb/ui/picasa-web-export-completed.ui
 share/gthumb/ui/png-options.ui
 share/gthumb/ui/preferences.ui
 share/gthumb/ui/print-layout.ui
@@ -862,15 +428,511 @@ share/gthumb/ui/tag-chooser.ui
 share/gthumb/ui/tga-options.ui
 share/gthumb/ui/tiff-options.ui
 share/gthumb/ui/web-album-exporter.ui
+share/gthumb/ui/webp-options.ui
+share/help/C/gthumb/attributes.page
+share/help/C/gthumb/batch-change-date.page
+share/help/C/gthumb/batch-convert-format.page
+share/help/C/gthumb/batch-resize.page
+share/help/C/gthumb/batch-rotate.page
+share/help/C/gthumb/batch-scripts.page
+share/help/C/gthumb/bookmarks.page
+share/help/C/gthumb/browser.page
+share/help/C/gthumb/edit-colors.page
+share/help/C/gthumb/edit-redeye.page
+share/help/C/gthumb/edit-resize-crop.page
+share/help/C/gthumb/edit-rotate.page
+share/help/C/gthumb/edit-save-undo-redo.page
+share/help/C/gthumb/extensions.page
+share/help/C/gthumb/file-copy-move.page
+share/help/C/gthumb/filtering.page
+share/help/C/gthumb/fullscreen.page
+share/help/C/gthumb/gimp.page
+share/help/C/gthumb/import.page
+share/help/C/gthumb/index.page
+share/help/C/gthumb/introduction.page
+share/help/C/gthumb/legal.xml
+share/help/C/gthumb/printing.page
+share/help/C/gthumb/rename-series.page
+share/help/C/gthumb/sharing-disc.page
+share/help/C/gthumb/sharing-social.page
+share/help/C/gthumb/shortcuts.page
+share/help/C/gthumb/slideshow.page
+share/help/C/gthumb/sorting.page
+share/help/C/gthumb/strftime.page
+share/help/C/gthumb/thumbnail-pane.page
+share/help/C/gthumb/thumbnails.page
+share/help/C/gthumb/viewer.page
+share/help/C/gthumb/wallpaper.page
+share/help/C/gthumb/figures/comment.png
+share/help/C/gthumb/figures/general-filter.png
+share/help/C/gthumb/figures/import-pref-auto-folder.png
+share/help/C/gthumb/figures/import-pref-custom-format.png
+share/help/C/gthumb/figures/import.png
+share/help/C/gthumb/figures/main-win.png
+share/help/C/gthumb/figures/nav-button.png
+share/help/C/gthumb/figures/palette.png
+share/help/C/gthumb/figures/preferences.png
+share/help/C/gthumb/figures/specific-filter.png
+share/help/C/gthumb/figures/thumbnail-pane.png
+share/help/cs/gthumb/attributes.page
+share/help/cs/gthumb/batch-change-date.page
+share/help/cs/gthumb/batch-convert-format.page
+share/help/cs/gthumb/batch-resize.page
+share/help/cs/gthumb/batch-rotate.page
+share/help/cs/gthumb/batch-scripts.page
+share/help/cs/gthumb/bookmarks.page
+share/help/cs/gthumb/browser.page
+share/help/cs/gthumb/edit-colors.page
+share/help/cs/gthumb/edit-redeye.page
+share/help/cs/gthumb/edit-resize-crop.page
+share/help/cs/gthumb/edit-rotate.page
+share/help/cs/gthumb/edit-save-undo-redo.page
+share/help/cs/gthumb/extensions.page
+share/help/cs/gthumb/file-copy-move.page
+share/help/cs/gthumb/filtering.page
+share/help/cs/gthumb/fullscreen.page
+share/help/cs/gthumb/gimp.page
+share/help/cs/gthumb/import.page
+share/help/cs/gthumb/index.page
+share/help/cs/gthumb/introduction.page
+share/help/cs/gthumb/legal.xml
+share/help/cs/gthumb/printing.page
+share/help/cs/gthumb/rename-series.page
+share/help/cs/gthumb/sharing-disc.page
+share/help/cs/gthumb/sharing-social.page
+share/help/cs/gthumb/shortcuts.page
+share/help/cs/gthumb/slideshow.page
+share/help/cs/gthumb/sorting.page
+share/help/cs/gthumb/strftime.page
+share/help/cs/gthumb/thumbnail-pane.page
+share/help/cs/gthumb/thumbnails.page
+share/help/cs/gthumb/viewer.page
+share/help/cs/gthumb/wallpaper.page
+share/help/cs/gthumb/figures/comment.png
+share/help/cs/gthumb/figures/general-filter.png
+share/help/cs/gthumb/figures/import-pref-auto-folder.png
+share/help/cs/gthumb/figures/import-pref-custom-format.png
+share/help/cs/gthumb/figures/import.png
+share/help/cs/gthumb/figures/main-win.png
+share/help/cs/gthumb/figures/nav-button.png
+share/help/cs/gthumb/figures/palette.png
+share/help/cs/gthumb/figures/preferences.png
+share/help/cs/gthumb/figures/specific-filter.png
+share/help/cs/gthumb/figures/thumbnail-pane.png
+share/help/de/gthumb/attributes.page
+share/help/de/gthumb/batch-change-date.page
+share/help/de/gthumb/batch-convert-format.page
+share/help/de/gthumb/batch-resize.page
+share/help/de/gthumb/batch-rotate.page
+share/help/de/gthumb/batch-scripts.page
+share/help/de/gthumb/bookmarks.page
+share/help/de/gthumb/browser.page
+share/help/de/gthumb/edit-colors.page
+share/help/de/gthumb/edit-redeye.page
+share/help/de/gthumb/edit-resize-crop.page
+share/help/de/gthumb/edit-rotate.page
+share/help/de/gthumb/edit-save-undo-redo.page
+share/help/de/gthumb/extensions.page
+share/help/de/gthumb/file-copy-move.page
+share/help/de/gthumb/filtering.page
+share/help/de/gthumb/fullscreen.page
+share/help/de/gthumb/gimp.page
+share/help/de/gthumb/import.page
+share/help/de/gthumb/index.page
+share/help/de/gthumb/introduction.page
+share/help/de/gthumb/legal.xml
+share/help/de/gthumb/printing.page
+share/help/de/gthumb/rename-series.page
+share/help/de/gthumb/sharing-disc.page
+share/help/de/gthumb/sharing-social.page
+share/help/de/gthumb/shortcuts.page
+share/help/de/gthumb/slideshow.page
+share/help/de/gthumb/sorting.page
+share/help/de/gthumb/strftime.page
+share/help/de/gthumb/thumbnail-pane.page
+share/help/de/gthumb/thumbnails.page
+share/help/de/gthumb/viewer.page
+share/help/de/gthumb/wallpaper.page
+share/help/de/gthumb/figures/comment.png
+share/help/de/gthumb/figures/general-filter.png
+share/help/de/gthumb/figures/import-pref-auto-folder.png
+share/help/de/gthumb/figures/import-pref-custom-format.png
+share/help/de/gthumb/figures/import.png
+share/help/de/gthumb/figures/main-win.png
+share/help/de/gthumb/figures/nav-button.png
+share/help/de/gthumb/figures/palette.png
+share/help/de/gthumb/figures/preferences.png
+share/help/de/gthumb/figures/specific-filter.png
+share/help/de/gthumb/figures/thumbnail-pane.png
+share/help/el/gthumb/attributes.page
+share/help/el/gthumb/batch-change-date.page
+share/help/el/gthumb/batch-convert-format.page
+share/help/el/gthumb/batch-resize.page
+share/help/el/gthumb/batch-rotate.page
+share/help/el/gthumb/batch-scripts.page
+share/help/el/gthumb/bookmarks.page
+share/help/el/gthumb/browser.page
+share/help/el/gthumb/edit-colors.page
+share/help/el/gthumb/edit-redeye.page
+share/help/el/gthumb/edit-resize-crop.page
+share/help/el/gthumb/edit-rotate.page
+share/help/el/gthumb/edit-save-undo-redo.page
+share/help/el/gthumb/extensions.page
+share/help/el/gthumb/file-copy-move.page
+share/help/el/gthumb/filtering.page
+share/help/el/gthumb/fullscreen.page
+share/help/el/gthumb/gimp.page
+share/help/el/gthumb/import.page
+share/help/el/gthumb/index.page
+share/help/el/gthumb/introduction.page
+share/help/el/gthumb/legal.xml
+share/help/el/gthumb/printing.page
+share/help/el/gthumb/rename-series.page
+share/help/el/gthumb/sharing-disc.page
+share/help/el/gthumb/sharing-social.page
+share/help/el/gthumb/shortcuts.page
+share/help/el/gthumb/slideshow.page
+share/help/el/gthumb/sorting.page
+share/help/el/gthumb/strftime.page
+share/help/el/gthumb/thumbnail-pane.page
+share/help/el/gthumb/thumbnails.page
+share/help/el/gthumb/viewer.page
+share/help/el/gthumb/wallpaper.page
+share/help/el/gthumb/figures/comment.png
+share/help/el/gthumb/figures/general-filter.png
+share/help/el/gthumb/figures/import-pref-auto-folder.png
+share/help/el/gthumb/figures/import-pref-custom-format.png
+share/help/el/gthumb/figures/import.png
+share/help/el/gthumb/figures/main-win.png
+share/help/el/gthumb/figures/nav-button.png
+share/help/el/gthumb/figures/palette.png
+share/help/el/gthumb/figures/preferences.png
+share/help/el/gthumb/figures/specific-filter.png
+share/help/el/gthumb/figures/thumbnail-pane.png
+share/help/es/gthumb/attributes.page
+share/help/es/gthumb/batch-change-date.page
+share/help/es/gthumb/batch-convert-format.page
+share/help/es/gthumb/batch-resize.page
+share/help/es/gthumb/batch-rotate.page
+share/help/es/gthumb/batch-scripts.page
+share/help/es/gthumb/bookmarks.page
+share/help/es/gthumb/browser.page
+share/help/es/gthumb/edit-colors.page
+share/help/es/gthumb/edit-redeye.page
+share/help/es/gthumb/edit-resize-crop.page
+share/help/es/gthumb/edit-rotate.page
+share/help/es/gthumb/edit-save-undo-redo.page
+share/help/es/gthumb/extensions.page
+share/help/es/gthumb/file-copy-move.page
+share/help/es/gthumb/filtering.page
+share/help/es/gthumb/fullscreen.page
+share/help/es/gthumb/gimp.page
+share/help/es/gthumb/import.page
+share/help/es/gthumb/index.page
+share/help/es/gthumb/introduction.page
+share/help/es/gthumb/legal.xml
+share/help/es/gthumb/printing.page
+share/help/es/gthumb/rename-series.page
+share/help/es/gthumb/sharing-disc.page
+share/help/es/gthumb/sharing-social.page
+share/help/es/gthumb/shortcuts.page
+share/help/es/gthumb/slideshow.page
+share/help/es/gthumb/sorting.page
+share/help/es/gthumb/strftime.page
+share/help/es/gthumb/thumbnail-pane.page
+share/help/es/gthumb/thumbnails.page
+share/help/es/gthumb/viewer.page
+share/help/es/gthumb/wallpaper.page
+share/help/es/gthumb/figures/comment.png
+share/help/es/gthumb/figures/general-filter.png
+share/help/es/gthumb/figures/import-pref-auto-folder.png
+share/help/es/gthumb/figures/import-pref-custom-format.png
+share/help/es/gthumb/figures/import.png
+share/help/es/gthumb/figures/main-win.png
+share/help/es/gthumb/figures/nav-button.png
+share/help/es/gthumb/figures/palette.png
+share/help/es/gthumb/figures/preferences.png
+share/help/es/gthumb/figures/specific-filter.png
+share/help/es/gthumb/figures/thumbnail-pane.png
+share/help/eu/gthumb/attributes.page
+share/help/eu/gthumb/batch-change-date.page
+share/help/eu/gthumb/batch-convert-format.page
+share/help/eu/gthumb/batch-resize.page
+share/help/eu/gthumb/batch-rotate.page
+share/help/eu/gthumb/batch-scripts.page
+share/help/eu/gthumb/bookmarks.page
+share/help/eu/gthumb/browser.page
+share/help/eu/gthumb/edit-colors.page
+share/help/eu/gthumb/edit-redeye.page
+share/help/eu/gthumb/edit-resize-crop.page
+share/help/eu/gthumb/edit-rotate.page
+share/help/eu/gthumb/edit-save-undo-redo.page
+share/help/eu/gthumb/extensions.page
+share/help/eu/gthumb/file-copy-move.page
+share/help/eu/gthumb/filtering.page
+share/help/eu/gthumb/fullscreen.page
+share/help/eu/gthumb/gimp.page
+share/help/eu/gthumb/import.page
+share/help/eu/gthumb/index.page
+share/help/eu/gthumb/introduction.page
+share/help/eu/gthumb/legal.xml
+share/help/eu/gthumb/printing.page
+share/help/eu/gthumb/rename-series.page
+share/help/eu/gthumb/sharing-disc.page
+share/help/eu/gthumb/sharing-social.page
+share/help/eu/gthumb/shortcuts.page
+share/help/eu/gthumb/slideshow.page
+share/help/eu/gthumb/sorting.page
+share/help/eu/gthumb/strftime.page
+share/help/eu/gthumb/thumbnail-pane.page
+share/help/eu/gthumb/thumbnails.page
+share/help/eu/gthumb/viewer.page
+share/help/eu/gthumb/wallpaper.page
+share/help/eu/gthumb/figures/comment.png
+share/help/eu/gthumb/figures/general-filter.png
+share/help/eu/gthumb/figures/import-pref-auto-folder.png
+share/help/eu/gthumb/figures/import-pref-custom-format.png
+share/help/eu/gthumb/figures/import.png
+share/help/eu/gthumb/figures/main-win.png
+share/help/eu/gthumb/figures/nav-button.png
+share/help/eu/gthumb/figures/palette.png
+share/help/eu/gthumb/figures/preferences.png
+share/help/eu/gthumb/figures/specific-filter.png
+share/help/eu/gthumb/figures/thumbnail-pane.png
+share/help/fr/gthumb/attributes.page
+share/help/fr/gthumb/batch-change-date.page
+share/help/fr/gthumb/batch-convert-format.page
+share/help/fr/gthumb/batch-resize.page
+share/help/fr/gthumb/batch-rotate.page
+share/help/fr/gthumb/batch-scripts.page
+share/help/fr/gthumb/bookmarks.page
+share/help/fr/gthumb/browser.page
+share/help/fr/gthumb/edit-colors.page
+share/help/fr/gthumb/edit-redeye.page
+share/help/fr/gthumb/edit-resize-crop.page
+share/help/fr/gthumb/edit-rotate.page
+share/help/fr/gthumb/edit-save-undo-redo.page
+share/help/fr/gthumb/extensions.page
+share/help/fr/gthumb/file-copy-move.page
+share/help/fr/gthumb/filtering.page
+share/help/fr/gthumb/fullscreen.page
+share/help/fr/gthumb/gimp.page
+share/help/fr/gthumb/import.page
+share/help/fr/gthumb/index.page
+share/help/fr/gthumb/introduction.page
+share/help/fr/gthumb/legal.xml
+share/help/fr/gthumb/printing.page
+share/help/fr/gthumb/rename-series.page
+share/help/fr/gthumb/sharing-disc.page
+share/help/fr/gthumb/sharing-social.page
+share/help/fr/gthumb/shortcuts.page
+share/help/fr/gthumb/slideshow.page
+share/help/fr/gthumb/sorting.page
+share/help/fr/gthumb/strftime.page
+share/help/fr/gthumb/thumbnail-pane.page
+share/help/fr/gthumb/thumbnails.page
+share/help/fr/gthumb/viewer.page
+share/help/fr/gthumb/wallpaper.page
+share/help/fr/gthumb/figures/comment.png
+share/help/fr/gthumb/figures/general-filter.png
+share/help/fr/gthumb/figures/import-pref-auto-folder.png
+share/help/fr/gthumb/figures/import-pref-custom-format.png
+share/help/fr/gthumb/figures/import.png
+share/help/fr/gthumb/figures/main-win.png
+share/help/fr/gthumb/figures/nav-button.png
+share/help/fr/gthumb/figures/palette.png
+share/help/fr/gthumb/figures/preferences.png
+share/help/fr/gthumb/figures/specific-filter.png
+share/help/fr/gthumb/figures/thumbnail-pane.png
+share/help/oc/gthumb/attributes.page
+share/help/oc/gthumb/batch-change-date.page
+share/help/oc/gthumb/batch-convert-format.page
+share/help/oc/gthumb/batch-resize.page
+share/help/oc/gthumb/batch-rotate.page
+share/help/oc/gthumb/batch-scripts.page
+share/help/oc/gthumb/bookmarks.page
+share/help/oc/gthumb/browser.page
+share/help/oc/gthumb/edit-colors.page
+share/help/oc/gthumb/edit-redeye.page
+share/help/oc/gthumb/edit-resize-crop.page
+share/help/oc/gthumb/edit-rotate.page
+share/help/oc/gthumb/edit-save-undo-redo.page
+share/help/oc/gthumb/extensions.page
+share/help/oc/gthumb/file-copy-move.page
+share/help/oc/gthumb/filtering.page
+share/help/oc/gthumb/fullscreen.page
+share/help/oc/gthumb/gimp.page
+share/help/oc/gthumb/import.page
+share/help/oc/gthumb/index.page
+share/help/oc/gthumb/introduction.page
+share/help/oc/gthumb/legal.xml
+share/help/oc/gthumb/printing.page
+share/help/oc/gthumb/rename-series.page
+share/help/oc/gthumb/sharing-disc.page
+share/help/oc/gthumb/sharing-social.page
+share/help/oc/gthumb/shortcuts.page
+share/help/oc/gthumb/slideshow.page
+share/help/oc/gthumb/sorting.page
+share/help/oc/gthumb/strftime.page
+share/help/oc/gthumb/thumbnail-pane.page
+share/help/oc/gthumb/thumbnails.page
+share/help/oc/gthumb/viewer.page
+share/help/oc/gthumb/wallpaper.page
+share/help/oc/gthumb/figures/comment.png
+share/help/oc/gthumb/figures/general-filter.png
+share/help/oc/gthumb/figures/import-pref-auto-folder.png
+share/help/oc/gthumb/figures/import-pref-custom-format.png
+share/help/oc/gthumb/figures/import.png
+share/help/oc/gthumb/figures/main-win.png
+share/help/oc/gthumb/figures/nav-button.png
+share/help/oc/gthumb/figures/palette.png
+share/help/oc/gthumb/figures/preferences.png
+share/help/oc/gthumb/figures/specific-filter.png
+share/help/oc/gthumb/figures/thumbnail-pane.png
+share/help/sl/gthumb/attributes.page
+share/help/sl/gthumb/batch-change-date.page
+share/help/sl/gthumb/batch-convert-format.page
+share/help/sl/gthumb/batch-resize.page
+share/help/sl/gthumb/batch-rotate.page
+share/help/sl/gthumb/batch-scripts.page
+share/help/sl/gthumb/bookmarks.page
+share/help/sl/gthumb/browser.page
+share/help/sl/gthumb/edit-colors.page
+share/help/sl/gthumb/edit-redeye.page
+share/help/sl/gthumb/edit-resize-crop.page
+share/help/sl/gthumb/edit-rotate.page
+share/help/sl/gthumb/edit-save-undo-redo.page
+share/help/sl/gthumb/extensions.page
+share/help/sl/gthumb/file-copy-move.page
+share/help/sl/gthumb/filtering.page
+share/help/sl/gthumb/fullscreen.page
+share/help/sl/gthumb/gimp.page
+share/help/sl/gthumb/import.page
+share/help/sl/gthumb/index.page
+share/help/sl/gthumb/introduction.page
+share/help/sl/gthumb/legal.xml
+share/help/sl/gthumb/printing.page
+share/help/sl/gthumb/rename-series.page
+share/help/sl/gthumb/sharing-disc.page
+share/help/sl/gthumb/sharing-social.page
+share/help/sl/gthumb/shortcuts.page
+share/help/sl/gthumb/slideshow.page
+share/help/sl/gthumb/sorting.page
+share/help/sl/gthumb/strftime.page
+share/help/sl/gthumb/thumbnail-pane.page
+share/help/sl/gthumb/thumbnails.page
+share/help/sl/gthumb/viewer.page
+share/help/sl/gthumb/wallpaper.page
+share/help/sl/gthumb/figures/comment.png
+share/help/sl/gthumb/figures/general-filter.png
+share/help/sl/gthumb/figures/import-pref-auto-folder.png
+share/help/sl/gthumb/figures/import-pref-custom-format.png
+share/help/sl/gthumb/figures/import.png
+share/help/sl/gthumb/figures/main-win.png
+share/help/sl/gthumb/figures/nav-button.png
+share/help/sl/gthumb/figures/palette.png
+share/help/sl/gthumb/figures/preferences.png
+share/help/sl/gthumb/figures/specific-filter.png
+share/help/sl/gthumb/figures/thumbnail-pane.png
+share/help/sv/gthumb/attributes.page
+share/help/sv/gthumb/batch-change-date.page
+share/help/sv/gthumb/batch-convert-format.page
+share/help/sv/gthumb/batch-resize.page
+share/help/sv/gthumb/batch-rotate.page
+share/help/sv/gthumb/batch-scripts.page
+share/help/sv/gthumb/bookmarks.page
+share/help/sv/gthumb/browser.page
+share/help/sv/gthumb/edit-colors.page
+share/help/sv/gthumb/edit-redeye.page
+share/help/sv/gthumb/edit-resize-crop.page
+share/help/sv/gthumb/edit-rotate.page
+share/help/sv/gthumb/edit-save-undo-redo.page
+share/help/sv/gthumb/extensions.page
+share/help/sv/gthumb/file-copy-move.page
+share/help/sv/gthumb/filtering.page
+share/help/sv/gthumb/fullscreen.page
+share/help/sv/gthumb/gimp.page
+share/help/sv/gthumb/import.page
+share/help/sv/gthumb/index.page
+share/help/sv/gthumb/introduction.page
+share/help/sv/gthumb/legal.xml
+share/help/sv/gthumb/printing.page
+share/help/sv/gthumb/rename-series.page
+share/help/sv/gthumb/sharing-disc.page
+share/help/sv/gthumb/sharing-social.page
+share/help/sv/gthumb/shortcuts.page
+share/help/sv/gthumb/slideshow.page
+share/help/sv/gthumb/sorting.page
+share/help/sv/gthumb/strftime.page
+share/help/sv/gthumb/thumbnail-pane.page
+share/help/sv/gthumb/thumbnails.page
+share/help/sv/gthumb/viewer.page
+share/help/sv/gthumb/wallpaper.page
+share/help/sv/gthumb/figures/comment.png
+share/help/sv/gthumb/figures/general-filter.png
+share/help/sv/gthumb/figures/import-pref-auto-folder.png
+share/help/sv/gthumb/figures/import-pref-custom-format.png
+share/help/sv/gthumb/figures/import.png
+share/help/sv/gthumb/figures/main-win.png
+share/help/sv/gthumb/figures/nav-button.png
+share/help/sv/gthumb/figures/palette.png
+share/help/sv/gthumb/figures/preferences.png
+share/help/sv/gthumb/figures/specific-filter.png
+share/help/sv/gthumb/figures/thumbnail-pane.png
+share/help/zh_CN/gthumb/attributes.page
+share/help/zh_CN/gthumb/batch-change-date.page
+share/help/zh_CN/gthumb/batch-convert-format.page
+share/help/zh_CN/gthumb/batch-resize.page
+share/help/zh_CN/gthumb/batch-rotate.page
+share/help/zh_CN/gthumb/batch-scripts.page
+share/help/zh_CN/gthumb/bookmarks.page
+share/help/zh_CN/gthumb/browser.page
+share/help/zh_CN/gthumb/edit-colors.page
+share/help/zh_CN/gthumb/edit-redeye.page
+share/help/zh_CN/gthumb/edit-resize-crop.page
+share/help/zh_CN/gthumb/edit-rotate.page
+share/help/zh_CN/gthumb/edit-save-undo-redo.page
+share/help/zh_CN/gthumb/extensions.page
+share/help/zh_CN/gthumb/file-copy-move.page
+share/help/zh_CN/gthumb/filtering.page
+share/help/zh_CN/gthumb/fullscreen.page
+share/help/zh_CN/gthumb/gimp.page
+share/help/zh_CN/gthumb/import.page
+share/help/zh_CN/gthumb/index.page
+share/help/zh_CN/gthumb/introduction.page
+share/help/zh_CN/gthumb/legal.xml
+share/help/zh_CN/gthumb/printing.page
+share/help/zh_CN/gthumb/rename-series.page
+share/help/zh_CN/gthumb/sharing-disc.page
+share/help/zh_CN/gthumb/sharing-social.page
+share/help/zh_CN/gthumb/shortcuts.page
+share/help/zh_CN/gthumb/slideshow.page
+share/help/zh_CN/gthumb/sorting.page
+share/help/zh_CN/gthumb/strftime.page
+share/help/zh_CN/gthumb/thumbnail-pane.page
+share/help/zh_CN/gthumb/thumbnails.page
+share/help/zh_CN/gthumb/viewer.page
+share/help/zh_CN/gthumb/wallpaper.page
+share/help/zh_CN/gthumb/figures/comment.png
+share/help/zh_CN/gthumb/figures/general-filter.png
+share/help/zh_CN/gthumb/figures/import-pref-auto-folder.png
+share/help/zh_CN/gthumb/figures/import-pref-custom-format.png
+share/help/zh_CN/gthumb/figures/import.png
+share/help/zh_CN/gthumb/figures/main-win.png
+share/help/zh_CN/gthumb/figures/nav-button.png
+share/help/zh_CN/gthumb/figures/palette.png
+share/help/zh_CN/gthumb/figures/preferences.png
+share/help/zh_CN/gthumb/figures/specific-filter.png
+share/help/zh_CN/gthumb/figures/thumbnail-pane.png
 share/icons/hicolor/16x16/apps/gthumb.png
 share/icons/hicolor/22x22/apps/gthumb.png
+share/icons/hicolor/256x256/apps/gthumb.png
 share/icons/hicolor/32x32/apps/gthumb.png
 share/icons/hicolor/48x48/apps/gthumb.png
 share/icons/hicolor/scalable/apps/gthumb.svg
 share/locale/am/LC_MESSAGES/gthumb.mo
 share/locale/ar/LC_MESSAGES/gthumb.mo
 share/locale/az/LC_MESSAGES/gthumb.mo
-share/locale/be/LC_MESSAGES/gthumb.mo
 share/locale/bg/LC_MESSAGES/gthumb.mo
 share/locale/ca/LC_MESSAGES/gthumb.mo
 share/locale/ca@valencia/LC_MESSAGES/gthumb.mo
@@ -924,65 +986,13 @@ share/locale/sl/LC_MESSAGES/gthumb.mo
 share/locale/sq/LC_MESSAGES/gthumb.mo
 share/locale/sr/LC_MESSAGES/gthumb.mo
 share/locale/sr@Latn/LC_MESSAGES/gthumb.mo
+share/locale/sr@latin/LC_MESSAGES/gthumb.mo
 share/locale/sv/LC_MESSAGES/gthumb.mo
 share/locale/th/LC_MESSAGES/gthumb.mo
 share/locale/tr/LC_MESSAGES/gthumb.mo
-share/locale/vi/LC_MESSAGES/gthumb.mo
 share/locale/uk/LC_MESSAGES/gthumb.mo
+share/locale/vi/LC_MESSAGES/gthumb.mo
 share/locale/xh/LC_MESSAGES/gthumb.mo
 share/locale/zh_CN/LC_MESSAGES/gthumb.mo
 share/locale/zh_HK/LC_MESSAGES/gthumb.mo
 share/locale/zh_TW/LC_MESSAGES/gthumb.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/nds/LC_MESSAGES
-@dirrmtry share/locale/nds
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrm share/gnome/help/gthumb/zh_CN/figures
-@dirrm share/gnome/help/gthumb/zh_CN
-@dirrm share/gnome/help/gthumb/sv/figures
-@dirrm share/gnome/help/gthumb/sv
-@dirrm share/gnome/help/gthumb/sl/figures
-@dirrm share/gnome/help/gthumb/sl
-@dirrm share/gnome/help/gthumb/oc/figures
-@dirrm share/gnome/help/gthumb/oc
-@dirrm share/gnome/help/gthumb/fr/figures
-@dirrm share/gnome/help/gthumb/fr
-@dirrm share/gnome/help/gthumb/eu/figures
-@dirrm share/gnome/help/gthumb/eu
-@dirrm share/gnome/help/gthumb/es/figures
-@dirrm share/gnome/help/gthumb/es
-@dirrm share/gnome/help/gthumb/el/figures
-@dirrm share/gnome/help/gthumb/el
-@dirrm share/gnome/help/gthumb/de/figures
-@dirrm share/gnome/help/gthumb/de
-@dirrm share/gnome/help/gthumb/C/figures
-@dirrm share/gnome/help/gthumb/C
-@dirrm share/gnome/help/gthumb
-@dirrm share/gthumb/ui
-@dirrm share/gthumb/icons/hicolor/48x48/actions
-@dirrm share/gthumb/icons/hicolor/48x48
-@dirrm share/gthumb/icons/hicolor/22x22/actions
-@dirrm share/gthumb/icons/hicolor/22x22
-@dirrm share/gthumb/icons/hicolor/16x16/actions
-@dirrm share/gthumb/icons/hicolor/16x16
-@dirrm share/gthumb/icons/hicolor/scalable/actions
-@dirrm share/gthumb/icons/hicolor/scalable
-@dirrm share/gthumb/icons/hicolor
-@dirrm share/gthumb/icons
-@dirrm share/gthumb/contactsheetthemes
-@dirrm share/gthumb/albumthemes/Wiki
-@dirrm share/gthumb/albumthemes/NeatRound
-@dirrm share/gthumb/albumthemes/ClassicClips
-@dirrm share/gthumb/albumthemes/Classic
-@dirrm share/gthumb/albumthemes
-@dirrm share/gthumb
-@dirrm lib/gthumb/extensions
-@dirrm lib/gthumb
-@dirrm include/gthumb-%%GTHUMB_VER%%/gthumb
-@dirrm include/gthumb-%%GTHUMB_VER%%