Update to 3.3.2.

PR:		197437
Submitted by:	tkato432@yahoo.com

5 files changed, 339 insertions, 436 deletions

diff --git a/graphics/gthumb/Makefile b/graphics/gthumb/Makefile
index b0a45616af31..c72fc2e8d6c3 100644
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@@ -3,8 +3,7 @@
 #   $MCom: ports/trunk/graphics/gthumb/Makefile 19823 2014-08-20 09:28:14Z gusi $
 
 PORTNAME=	gthumb
-PORTVERSION=	3.2.8
-PORTREVISION=	2
+PORTVERSION=	3.3.2
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,22 +11,29 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	ports@FreeBSD.org
 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=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+LICENSE=	GPLv2 # (or later)
 
-USES=		desktop-file-utils bison gettext gmake libtool pathfix \
+BUILD_DEPENDS=	gsettings-desktop-schemas>0:${PORTSDIR}/devel/gsettings-desktop-schemas \
+		itstool:${PORTSDIR}/textproc/itstool
+RUN_DEPENDS=	gsettings-desktop-schemas>0:${PORTSDIR}/devel/gsettings-desktop-schemas
+
+USES=		bison compiler:c++11-lib desktop-file-utils gettext gmake libtool pathfix \
 		pkgconfig tar:xz
-USE_GNOME=	gnomeprefix gtk30 intlhack librsvg2
-USE_LDCONFIG=	yes
+USE_GNOME=	gtk30 librsvg2
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-silent-rules \
+		--disable-libchamplain \
+		--enable-compile-warnings=minimum \
+		--enable-librsvg
+INSTALL_TARGET=	install-strip
+USE_LDCONFIG=	yes
 INSTALLS_ICONS=	yes
+
+CFLAGS+=	-Wno-error=return-type
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ARGS=	--disable-libchamplain \
-		--enable-librsvg
-INSTALL_TARGET=	install-strip
+
+PLIST_SUB=	GTHUMB_VER="3.3"
 
 GLIB_SCHEMAS=	org.gnome.gthumb.change-date.gschema.xml \
 		org.gnome.gthumb.comments.gschema.xml \
@@ -53,37 +59,42 @@ GLIB_SCHEMAS=	org.gnome.gthumb.change-date.gschema.xml \
 		org.gnome.gthumb.slideshow.gschema.xml \
 		org.gnome.gthumb.webalbums.gschema.xml
 
-PLIST_SUB=	GTHUMB_VER=3.2
+OPTIONS_DEFINE=		BRASERO CLUTTER EXIV2 GSTREAMER RAW SECRET \
+			WEBP WEBSERVICES YELP
+OPTIONS_DEFAULT=	BRASERO CLUTTER EXIV2 GSTREAMER RAW SECRET \
+			WEBP WEBSERVICES YELP
+OPTIONS_SUB=		yes
 
-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
-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
-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
+BRASERO_DESC=		Write galleries to CD/DVD (large dependency)
+BRASERO_LIB_DEPENDS=	libbrasero-media3.so:${PORTSDIR}/sysutils/brasero
+BRASERO_CONFIGURE_ENABLE=	libbrasero
+CLUTTER_DESC=		Fancy slideshows
 CLUTTER_LIB_DEPENDS=	libclutter-gtk-1.0.so:${PORTSDIR}/graphics/clutter-gtk3
 CLUTTER_CONFIGURE_ENABLE=	clutter
-GSTREAMER_USE=	GSTREAMER1=yes
+EXIV2_LIB_DEPENDS=	libexiv2.so:${PORTSDIR}/graphics/exiv2
+EXIV2_CONFIGURE_ENABLE=	exiv2
+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
+RAW_DESC=		Raw image support via libraw
+RAW_LIB_DEPENDS=	libraw.so:${PORTSDIR}/graphics/libraw
+RAW_CONFIGURE_ENABLE=	libraw
+SECRET_DESC=		Libsecret support for storing passwords
 SECRET_LIB_DEPENDS=	libsecret-1.so:${PORTSDIR}/security/libsecret
-SECRET_CONFIGURE_ENABLE=	secret	
+SECRET_CONFIGURE_ENABLE=	libsecret
 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
+WEBP_CONFIGURE_ENABLE=	libwebp
+WEBSERVICES_DESC=	Web services
+WEBSERVICES_LIB_DEPENDS=\
+			libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib \
+			libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
+			libwebkitgtk-3.0.so:${PORTSDIR}/www/webkit-gtk3
+WEBSERVICES_CONFIGURE_ENABLE=	libjson-glib libsoup webkit2
+YELP_DESC=		Viewer for built-in help system
+YELP_RUN_DEPENDS=	yelp:${PORTSDIR}/x11/yelp
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^[[:blank:]]zlib/d ; \
+		 s|-Wl,--as-needed||' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/gthumb/distinfo b/graphics/gthumb/distinfo
index fcb6d9f8b4ca..73fa755ab155 100644
--- a/graphics/gthumb/distinfo
+++ b/graphics/gthumb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gthumb-3.2.8.tar.xz) = d600aba747af551540f3bbae8e8afa1cc308c658d911318c98fd4bf52ecd61b8
-SIZE (gnome3/gthumb-3.2.8.tar.xz) = 3286620
+SHA256 (gnome3/gthumb-3.3.2.tar.xz) = 66f6c6824fb209f7f2ae43a6923f3c796c1e06f451a1ab7d0d2988fe727e7a80
+SIZE (gnome3/gthumb-3.3.2.tar.xz) = 3282832
diff --git a/graphics/gthumb/files/patch-configure b/graphics/gthumb/files/patch-configure
deleted file mode 100644
index 453e1ad1dffe..000000000000
--- a/graphics/gthumb/files/patch-configure
+++ /dev/null
@@ -1,74 +0,0 @@
---- 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/pkg-descr b/graphics/gthumb/pkg-descr
index 78f5ebfe682a..41a7e0dfa322 100644
--- a/graphics/gthumb/pkg-descr
+++ b/graphics/gthumb/pkg-descr
@@ -1,4 +1,4 @@
-gThumb is an image viewer and browser for the GNOME Desktop. It also includes
-an importer tool for transferring photos from cameras.
+gThumb is an image viewer and browser for the GNOME Desktop. It also
+includes an importer tool for transferring photos from cameras.
 
 WWW: https://wiki.gnome.org/Apps/gthumb/
diff --git a/graphics/gthumb/pkg-plist b/graphics/gthumb/pkg-plist
index bfe4d1dc5c75..e92e888e6e64 100644
--- a/graphics/gthumb/pkg-plist
+++ b/graphics/gthumb/pkg-plist
@@ -2,8 +2,8 @@ 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/color-utils.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/dom.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
@@ -16,7 +16,6 @@ include/gthumb-%%GTHUMB_VER%%/gthumb/gth-buffer-data.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
 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
@@ -46,9 +45,11 @@ 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-overview.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-task-chain.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
@@ -56,11 +57,11 @@ 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-load-file-data-task.h
+include/gthumb-%%GTHUMB_VER%%/gthumb/gth-location-bar.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-menu-manager.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
@@ -77,7 +78,6 @@ 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
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-statusbar.h
-include/gthumb-%%GTHUMB_VER%%/gthumb/gth-stock.h
 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
@@ -90,8 +90,6 @@ include/gthumb-%%GTHUMB_VER%%/gthumb/gth-test.h
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-thumb-loader.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
 include/gthumb-%%GTHUMB_VER%%/gthumb/gth-user-dir.h
@@ -229,206 +227,174 @@ 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/appdata/gthumb.appdata.xml
 share/applications/gthumb-import.desktop
-share/gthumb/albumthemes/Classic/back.png
-share/gthumb/albumthemes/Classic/bot.png
-share/gthumb/albumthemes/Classic/image.gthtml
-share/gthumb/albumthemes/Classic/index.gthtml
-share/gthumb/albumthemes/Classic/layout.css
-share/gthumb/albumthemes/Classic/left.png
-share/gthumb/albumthemes/Classic/next.png
-share/gthumb/albumthemes/Classic/prev.png
-share/gthumb/albumthemes/Classic/preview.png
-share/gthumb/albumthemes/Classic/right.png
-share/gthumb/albumthemes/Classic/style.css
-share/gthumb/albumthemes/Classic/thumbnail.gthtml
-share/gthumb/albumthemes/Classic/top.png
-share/gthumb/albumthemes/ClassicClips/back.png
-share/gthumb/albumthemes/ClassicClips/bot.png
-share/gthumb/albumthemes/ClassicClips/image.gthtml
-share/gthumb/albumthemes/ClassicClips/index.gthtml
-share/gthumb/albumthemes/ClassicClips/layout.css
-share/gthumb/albumthemes/ClassicClips/left.png
-share/gthumb/albumthemes/ClassicClips/next.png
-share/gthumb/albumthemes/ClassicClips/prev.png
-share/gthumb/albumthemes/ClassicClips/preview.png
-share/gthumb/albumthemes/ClassicClips/right.png
-share/gthumb/albumthemes/ClassicClips/style.css
-share/gthumb/albumthemes/ClassicClips/thumbnail.gthtml
-share/gthumb/albumthemes/ClassicClips/top.png
-share/gthumb/albumthemes/NeatRound/back.png
-share/gthumb/albumthemes/NeatRound/bot.png
-share/gthumb/albumthemes/NeatRound/image.gthtml
-share/gthumb/albumthemes/NeatRound/index.gthtml
-share/gthumb/albumthemes/NeatRound/layout.css
-share/gthumb/albumthemes/NeatRound/left.png
-share/gthumb/albumthemes/NeatRound/next.png
-share/gthumb/albumthemes/NeatRound/prev.png
-share/gthumb/albumthemes/NeatRound/preview.png
-share/gthumb/albumthemes/NeatRound/right.png
-share/gthumb/albumthemes/NeatRound/style.css
-share/gthumb/albumthemes/NeatRound/thumbnail.gthtml
-share/gthumb/albumthemes/NeatRound/top.png
-share/gthumb/albumthemes/Wiki/image.gthtml
-share/gthumb/albumthemes/Wiki/index.gthtml
-share/gthumb/albumthemes/Wiki/preview.png
-share/gthumb/albumthemes/Wiki/style.css
-share/gthumb/albumthemes/Wiki/thumbnail.gthtml
-share/gthumb/contactsheetthemes/default.cst
-share/gthumb/contactsheetthemes/minimalist.cst
-share/gthumb/contactsheetthemes/rainbow.cst
+share/applications/gthumb.desktop
+%%DATADIR%%/albumthemes/Classic/back.png
+%%DATADIR%%/albumthemes/Classic/bot.png
+%%DATADIR%%/albumthemes/Classic/image.gthtml
+%%DATADIR%%/albumthemes/Classic/index.gthtml
+%%DATADIR%%/albumthemes/Classic/layout.css
+%%DATADIR%%/albumthemes/Classic/left.png
+%%DATADIR%%/albumthemes/Classic/next.png
+%%DATADIR%%/albumthemes/Classic/prev.png
+%%DATADIR%%/albumthemes/Classic/preview.png
+%%DATADIR%%/albumthemes/Classic/right.png
+%%DATADIR%%/albumthemes/Classic/style.css
+%%DATADIR%%/albumthemes/Classic/thumbnail.gthtml
+%%DATADIR%%/albumthemes/Classic/top.png
+%%DATADIR%%/albumthemes/ClassicClips/back.png
+%%DATADIR%%/albumthemes/ClassicClips/bot.png
+%%DATADIR%%/albumthemes/ClassicClips/image.gthtml
+%%DATADIR%%/albumthemes/ClassicClips/index.gthtml
+%%DATADIR%%/albumthemes/ClassicClips/layout.css
+%%DATADIR%%/albumthemes/ClassicClips/left.png
+%%DATADIR%%/albumthemes/ClassicClips/next.png
+%%DATADIR%%/albumthemes/ClassicClips/prev.png
+%%DATADIR%%/albumthemes/ClassicClips/preview.png
+%%DATADIR%%/albumthemes/ClassicClips/right.png
+%%DATADIR%%/albumthemes/ClassicClips/style.css
+%%DATADIR%%/albumthemes/ClassicClips/thumbnail.gthtml
+%%DATADIR%%/albumthemes/ClassicClips/top.png
+%%DATADIR%%/albumthemes/NeatRound/back.png
+%%DATADIR%%/albumthemes/NeatRound/bot.png
+%%DATADIR%%/albumthemes/NeatRound/image.gthtml
+%%DATADIR%%/albumthemes/NeatRound/index.gthtml
+%%DATADIR%%/albumthemes/NeatRound/layout.css
+%%DATADIR%%/albumthemes/NeatRound/left.png
+%%DATADIR%%/albumthemes/NeatRound/next.png
+%%DATADIR%%/albumthemes/NeatRound/prev.png
+%%DATADIR%%/albumthemes/NeatRound/preview.png
+%%DATADIR%%/albumthemes/NeatRound/right.png
+%%DATADIR%%/albumthemes/NeatRound/style.css
+%%DATADIR%%/albumthemes/NeatRound/thumbnail.gthtml
+%%DATADIR%%/albumthemes/NeatRound/top.png
+%%DATADIR%%/albumthemes/Wiki/image.gthtml
+%%DATADIR%%/albumthemes/Wiki/index.gthtml
+%%DATADIR%%/albumthemes/Wiki/preview.png
+%%DATADIR%%/albumthemes/Wiki/style.css
+%%DATADIR%%/albumthemes/Wiki/thumbnail.gthtml
+%%DATADIR%%/contactsheetthemes/default.cst
+%%DATADIR%%/contactsheetthemes/minimalist.cst
+%%DATADIR%%/contactsheetthemes/rainbow.cst
 %%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/change-date-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/comment-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/convert-format-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/edit-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-blue.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-gray.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-green.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-red.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/emblem-flag-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/export-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/file-catalog-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/file-library-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/file-search-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/filter-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/format-linear-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/format-logarithmic-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/histogram-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-adjust-colors-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-adjust-contrast-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-crop-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-equalize-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-flip-horizontal-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-flip-vertical-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-grayscale-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-invert-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-navigator-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-red-eye-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-resize-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-rotate-left-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-rotate-right-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-rotate-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/image-sharpen-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/map-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/palette-symbolic.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
-share/gthumb/ui/bookmarks.ui
-%%BRASERO%%share/gthumb/ui/burn-disc-options.ui
-%%BRASERO%%share/gthumb/ui/burn-source-selector.ui
-share/gthumb/ui/catalog-properties.ui
-share/gthumb/ui/change-date.ui
-share/gthumb/ui/code-selector.ui
-share/gthumb/ui/comments-preferences.ui
-share/gthumb/ui/contact-sheet.ui
-share/gthumb/ui/contact-sheet-theme-properties.ui
-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
-%%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
-%%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
-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
-%%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
-%%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
-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
-%%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
-share/gthumb/ui/print-preferences.ui
-share/gthumb/ui/red-eye-removal-options.ui
-share/gthumb/ui/rename-series.ui
-share/gthumb/ui/resize-images.ui
-share/gthumb/ui/resize-options.ui
-share/gthumb/ui/rotate-options.ui
-share/gthumb/ui/save-options-preferences.ui
-%%GSTREAMER%%share/gthumb/ui/save-screenshot.ui
-share/gthumb/ui/script-editor.ui
-share/gthumb/ui/search-editor.ui
-share/gthumb/ui/sharpen-options.ui
-share/gthumb/ui/slideshow-preferences.ui
-share/gthumb/ui/sort-order.ui
-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
+%%DATADIR%%/icons/hicolor/scalable/actions/swap-values-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/tag-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/tools-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-presentation-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-fit-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-fit-width-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-in-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-original-symbolic.svg
+%%DATADIR%%/icons/hicolor/scalable/actions/view-zoom-out-symbolic.svg
+%%DATADIR%%/ui/add-to-catalog.ui
+%%DATADIR%%/ui/adjust-colors-options.ui
+%%BRASERO%%%%DATADIR%%/ui/burn-disc-options.ui
+%%BRASERO%%%%DATADIR%%/ui/burn-source-selector.ui
+%%DATADIR%%/ui/catalog-properties.ui
+%%DATADIR%%/ui/change-date.ui
+%%DATADIR%%/ui/code-selector.ui
+%%DATADIR%%/ui/comments-preferences.ui
+%%DATADIR%%/ui/contact-sheet-theme-properties.ui
+%%DATADIR%%/ui/contact-sheet.ui
+%%DATADIR%%/ui/convert-format.ui
+%%DATADIR%%/ui/crop-options.ui
+%%DATADIR%%/ui/edit-comment-page.ui
+%%EXIV2%%%%DATADIR%%/ui/edit-exiv2-page.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/export-to-facebook.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/export-to-flickr.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/export-to-photobucket.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/export-to-picasaweb.ui
+%%DATADIR%%/ui/extensions-preferences.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/facebook-album-properties.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/facebook-export-completed.ui
+%%DATADIR%%/ui/filter-editor.ui
+%%DATADIR%%/ui/find-duplicates-choose-folders.ui
+%%DATADIR%%/ui/find-duplicates-dialog.ui
+%%DATADIR%%/ui/find-duplicates.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/flicker-export-completed.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/flickr-ask-authorization-old.ui
+%%DATADIR%%/ui/grayscale-options.ui
+%%DATADIR%%/ui/histogram-info.ui
+%%DATADIR%%/ui/image-viewer-preferences.ui
+%%DATADIR%%/ui/image-wall.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/import-from-facebook.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/import-from-flickr.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/import-from-picasaweb.ui
+%%DATADIR%%/ui/import-preferences.ui
+%%DATADIR%%/ui/jpeg-options.ui
+%%DATADIR%%/ui/location.ui
+%%GSTREAMER%%%%DATADIR%%/ui/mediabar.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/oauth-account-chooser.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/oauth-account-manager.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/oauth-ask-authorization.ui
+%%DATADIR%%/ui/organize-files-task.ui
+%%DATADIR%%/ui/organize-files.ui
+%%DATADIR%%/ui/overwrite-dialog.ui
+%%DATADIR%%/ui/personalize-filters.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/photobucket-album-properties.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/photobucket-export-completed.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/picasa-web-album-properties.ui
+%%WEBSERVICES%%%%DATADIR%%/ui/picasa-web-export-completed.ui
+%%DATADIR%%/ui/png-options.ui
+%%DATADIR%%/ui/preferences.ui
+%%DATADIR%%/ui/print-layout.ui
+%%DATADIR%%/ui/print-preferences.ui
+%%DATADIR%%/ui/red-eye-removal-options.ui
+%%DATADIR%%/ui/rename-series.ui
+%%DATADIR%%/ui/resize-images.ui
+%%DATADIR%%/ui/resize-options.ui
+%%DATADIR%%/ui/rotate-options.ui
+%%DATADIR%%/ui/save-options-preferences.ui
+%%DATADIR%%/ui/search-editor.ui
+%%DATADIR%%/ui/sharpen-options.ui
+%%DATADIR%%/ui/slideshow-preferences.ui
+%%DATADIR%%/ui/sort-order.ui
+%%DATADIR%%/ui/tag-chooser.ui
+%%DATADIR%%/ui/tga-options.ui
+%%DATADIR%%/ui/tiff-options.ui
+%%DATADIR%%/ui/web-album-exporter.ui
+%%DATADIR%%/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
@@ -443,6 +409,17 @@ 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/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/C/gthumb/file-copy-move.page
 share/help/C/gthumb/filtering.page
 share/help/C/gthumb/fullscreen.page
@@ -463,17 +440,6 @@ 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
@@ -488,6 +454,17 @@ 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/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/cs/gthumb/file-copy-move.page
 share/help/cs/gthumb/filtering.page
 share/help/cs/gthumb/fullscreen.page
@@ -508,17 +485,6 @@ 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
@@ -533,6 +499,17 @@ 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/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/de/gthumb/file-copy-move.page
 share/help/de/gthumb/filtering.page
 share/help/de/gthumb/fullscreen.page
@@ -553,17 +530,6 @@ 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
@@ -578,6 +544,17 @@ 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/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/el/gthumb/file-copy-move.page
 share/help/el/gthumb/filtering.page
 share/help/el/gthumb/fullscreen.page
@@ -598,17 +575,6 @@ 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
@@ -623,6 +589,17 @@ 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/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/es/gthumb/file-copy-move.page
 share/help/es/gthumb/filtering.page
 share/help/es/gthumb/fullscreen.page
@@ -643,17 +620,6 @@ 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
@@ -668,6 +634,17 @@ 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/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/eu/gthumb/file-copy-move.page
 share/help/eu/gthumb/filtering.page
 share/help/eu/gthumb/fullscreen.page
@@ -688,17 +665,6 @@ 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
@@ -713,6 +679,17 @@ 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/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/fr/gthumb/file-copy-move.page
 share/help/fr/gthumb/filtering.page
 share/help/fr/gthumb/fullscreen.page
@@ -733,17 +710,6 @@ 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
@@ -758,6 +724,17 @@ 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/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/oc/gthumb/file-copy-move.page
 share/help/oc/gthumb/filtering.page
 share/help/oc/gthumb/fullscreen.page
@@ -778,17 +755,6 @@ 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
@@ -803,6 +769,17 @@ 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/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/sl/gthumb/file-copy-move.page
 share/help/sl/gthumb/filtering.page
 share/help/sl/gthumb/fullscreen.page
@@ -823,17 +800,6 @@ 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
@@ -848,6 +814,17 @@ 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/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/sv/gthumb/file-copy-move.page
 share/help/sv/gthumb/filtering.page
 share/help/sv/gthumb/fullscreen.page
@@ -868,17 +845,6 @@ 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
@@ -893,6 +859,17 @@ 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/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/help/zh_CN/gthumb/file-copy-move.page
 share/help/zh_CN/gthumb/filtering.page
 share/help/zh_CN/gthumb/fullscreen.page
@@ -913,17 +890,6 @@ 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