New upstream version 2.10.6

2018-08-20 09:59:39 -04:00
parent efdf9e63ac 0a8173ffde
commit 9bb61b2a3c
4408 changed files with 280653 additions and 152638 deletions
--- a/1
+++ b/1
@ -203,6 +203,7 @@ The following people have contributed code to GIMP:
 Christopher Montgomery
 Tim Mooney
 Adam D Moss
+ Simon Müller
 Tobias Mueller
 Michael Muré
 Lionel N.
--- a/8
+++ b/8
@ -1,7 +1,7 @@
                    GNU GENERAL PUBLIC LICENSE
                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
 Everyone is permitted to copy and distribute verbatim copies
 of this license document, but changing it is not allowed.

@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
    GNU General Public License for more details.

    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.

 Also add information on how to contact you by electronic and paper mail.

@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
  You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
+<https://www.gnu.org/licenses/>.

  The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<https://www.gnu.org/philosophy/why-not-lgpl.html>.
--- a/17383
+++ b/17383
--- a/19
+++ b/19
@ -10,14 +10,14 @@ to have the following packages (or newer versions) installed:
    * GNU libtool 1.5
        - ftp://ftp.gnu.org/gnu/libtool/

-Fine GNU mirrors are listed at http://www.gnu.org/prep/ftp.html
+Fine GNU mirrors are listed at https://www.gnu.org/prep/ftp.html
 Beta software can be found at alpha.gnu.org.

    * pkg-config 0.16.0 (or preferably a newer version)
-        - http://www.freedesktop.org/software/pkgconfig/
+        - https://www.freedesktop.org/software/pkgconfig/

    * gtkdocize
-        - http://ftp.gnome.org/pub/GNOME/sources/gtk-doc/
+        - https://ftp.gnome.org/pub/GNOME/sources/gtk-doc/

    * xsltproc
        - ftp://ftp.gnome.org/pub/GNOME/sources/libxslt/1.1/
@ -79,12 +79,12 @@ Git
 GIMP is available from GNOME Git. You can use the following commands
 to get GIMP from the the git server:

-    $ git clone git://git.gnome.org/gimp
+    $ git clone https://gitlab.gnome.org/GNOME/gimp.git

 You can read more on using GNOME's git service at these URLs:

-    http://live.gnome.org/Git
-    http://www.kernel.org/pub/software/scm/git/docs/
+    https://wiki.gnome.org/Git
+    https://www.kernel.org/pub/software/scm/git/docs/


 You will also need relatively new stable releases of glib, pango, atk,
@ -99,9 +99,10 @@ The best way to submit patches is to provide files created with
 git-format-patch.

 It is recommended that you file a bug report at
-http://bugzilla.gnome.org/ and attach your patch to it as a plain text
-file, not compressed. If your patch is reasonably small you can submit
-it to the gimp-developer-list@gnome.org mailing list.
+https://gitlab.gnome.org/GNOME/gimp
+and either create a merge request or attach your patch to it as a plain
+text file, not compressed. If your patch is reasonably small you can
+submit it to the gimp-developer-list@gnome.org mailing list.

 If the patch needs to be discussed, you should also consider using the
 mailing list instead of Bugzilla because bug reports tend to be hard
--- a/53
+++ b/53
@ -1,6 +1,6 @@
--------------------------------------
+---------------------------------------
 Installation instructions for GIMP 2.10
--------------------------------------
+---------------------------------------

 There are some basic steps to building and installing GIMP.

@ -30,20 +30,24 @@ header files installed.


  1. You need to have installed a recent version of pkg-config (>= 2.0) available
-     from http://www.freedesktop.org/software/pkgconfig/.
+     from https://www.freedesktop.org/software/pkgconfig/.

  2. You need intltool (at least 0.40.1, but preferably a newer version).
     Intltool can be downloaded from
-     http://ftp.gnome.org/pub/gnome/sources/intltool/
-     You are recommended to install gettext version 0.19 or over. Earlier gettext had
+     https://ftp.gnome.org/pub/gnome/sources/intltool/
+     You also need gettext version 0.19 or over. Earlier gettext had
     issues with script-fu localization, ending up in incomplete GIMP localization.

-  3. You need to have GEGL version 0.4.2 or newer and babl version
-     0.1.50 or newer. You can get them from http://gegl.org/ or clone
+  3. You need to have GEGL version 0.4.8 or newer and babl version
+     0.1.56 or newer. You can get them from https://gegl.org/ or clone
     them from the GNOME git repository:

-       git://git.gnome.org/babl
-       git://git.gnome.org/gegl
+       https://gitlab.gnome.org/GNOME/babl.git
+       https://gitlab.gnome.org/GNOME/gegl.git
+
+     Note: install GEGL with libumfpack (SuiteSparse) for alternative Matting
+     engine "gegl:matting-levin" and OpenEXR library for OpenEXR format
+     support.

  4. You need to have installed GTK+ version 2.24.10 or newer.
     GIMP also needs a recent version of GLib (>= 2.54.2), GDK-Pixbuf
@ -51,7 +55,7 @@ header files installed.
     from ftp://ftp.gtk.org/.

  5. We use cairo >= 1.12.2, which is hosted at
-     http://www.cairographics.org/.
+     https://www.cairographics.org/.

  6. We require PangoCairo, a Pango backend using Cairo. Make sure you
     have Cairo, FreeType2 and fontconfig installed before you compile
@ -99,7 +103,7 @@ header files installed.

 12. You may want to install other third party libraries or programs
     that are needed for some of the available plug-ins. We recommend
-     to check that the following libraries are installed: libjasper,
+     to check that the following libraries are installed: openjpeg,
     webkit, libmng, librsvg, libwmf, libaa and libgs (Ghostscript).

 13. HEIF support depends on the libheif library. If you don't have
@ -107,8 +111,9 @@ header files installed.

        https://github.com/strukturag/libheif

-     Make sure you build libheif with libde265 support, otherwise the
-     plug-in is mostly useless.
+     Make sure you build libheif with libde265 and libx265 support (for
+     respectively decoding and encoding), otherwise the plug-in is
+     mostly useless.

 14. The Python extension requires Python 2 development headers (2.5.0
     or newer) to be present. You will also need PyGTK and the
@ -137,12 +142,12 @@ header files installed.
     Package Name         Version

     ATK                  2.2.0
-     babl                 0.1.50
+     babl                 0.1.56
     cairo                1.12.2
     Fontconfig           2.12.4
     freetype2            2.1.7
     GDK-PixBuf           2.30.8
-     GEGL                 0.4.2
+     GEGL                 0.4.8
     GIO
     GLib                 2.54.2
     glib-networking
@ -171,13 +176,13 @@ header files installed.
     gs                  -              ghostscript
     libaa               -              ASCII art
     libheif             1.1.0          HEIF
-     libjasper           -              JPEG 2000
     libmng              -              MNG
     libwebp             0.6.0          WebP (built with --enable-libwebpmux and --enable-libwebpdemux)
     libwmf              0.2.8          WMF
     libXcursor          -              X11 Mouse Cursor
     libxpm              -              XPM
     openexr             1.6.1          OpenEXR
+     OpenJPEG            2.1.0          JPEG 2000
     python 2            2.5.0          Python plug-ins
     webkit              1.6.1          Help browser & webpage

@ -199,11 +204,11 @@ packages are included below. Here is an illustration of commands that
 might be used to build and install GIMP. The actual configuration,
 compilation and installation output is not shown.

-  % tar xvfz gimp-2.10.2.tar.gz   # unpack the sources
-  % cd gimp-2.10.2                # change to the toplevel directory
-  % ./configure                           # run the `configure' script
-  % make                                  # build GIMP
-  % make install                          # install GIMP
+  % tar xvfz gimp-2.10.6.tar.gz   # unpack the sources
+  % cd gimp-2.10.6                # change to the toplevel directory
+  % ./configure                   # run the `configure' script
+  % make                          # build GIMP
+  % make install                  # install GIMP


 The `configure' script examines your system, and adapts GIMP to run on
@ -216,6 +221,10 @@ These are:
  --disable-vector-icons.  This option installs raster icons instead of
     vector icons.

+  --enable-relocatable-bundle.  This option forces GIMP to search some
+     resources (e.g. MyPaint brushes or libwmf fonts) relatively to the
+     running prefix, rather than using build-time paths.
+
  --enable-shared and --disable-shared.  This option affects whether
     shared libraries will be built or not. Shared libraries provide
     for much smaller executables. The default is to enable shared
@ -365,7 +374,7 @@ When ./configure fails

 'configure' uses pkg-config, a tool that replaces the old foo-config
 scripts. The most recent version is available from
-	http://www.freedesktop.org/software/pkgconfig/
+	https://www.freedesktop.org/software/pkgconfig/

 'configure' tries to compile and run a short GTK+ program. There are
 several reasons why this might fail:
--- a/INSTALL.in
+++ b/INSTALL.in
@ -1,6 +1,6 @@
--------------------------------------
+---------------------------------------
 Installation instructions for GIMP @GIMP_APP_VERSION@
--------------------------------------
+---------------------------------------

 There are some basic steps to building and installing GIMP.

@ -30,20 +30,24 @@ header files installed.


  1. You need to have installed a recent version of pkg-config (>= @GIMP_PKGCONFIG_VERSION@) available
-     from http://www.freedesktop.org/software/pkgconfig/.
+     from https://www.freedesktop.org/software/pkgconfig/.

  2. You need intltool (at least @INTLTOOL_REQUIRED_VERSION@, but preferably a newer version).
     Intltool can be downloaded from
-     http://ftp.gnome.org/pub/gnome/sources/intltool/
-     You are recommended to install gettext version @XGETTEXT_RECOMMENDED_VERSION@ or over. Earlier gettext had
+     https://ftp.gnome.org/pub/gnome/sources/intltool/
+     You also need gettext version @XGETTEXT_REQUIRED_VERSION@ or over. Earlier gettext had
     issues with script-fu localization, ending up in incomplete GIMP localization.

  3. You need to have GEGL version @GEGL_REQUIRED_VERSION@ or newer and babl version
-     @BABL_REQUIRED_VERSION@ or newer. You can get them from http://gegl.org/ or clone
+     @BABL_REQUIRED_VERSION@ or newer. You can get them from https://gegl.org/ or clone
     them from the GNOME git repository:

-       git://git.gnome.org/babl
-       git://git.gnome.org/gegl
+       https://gitlab.gnome.org/GNOME/babl.git
+       https://gitlab.gnome.org/GNOME/gegl.git
+
+     Note: install GEGL with libumfpack (SuiteSparse) for alternative Matting
+     engine "gegl:matting-levin" and OpenEXR library for OpenEXR format
+     support.

  4. You need to have installed GTK+ version @GTK_REQUIRED_VERSION@ or newer.
     GIMP also needs a recent version of GLib (>= @GLIB_REQUIRED_VERSION@), GDK-Pixbuf
@ -51,7 +55,7 @@ header files installed.
     from ftp://ftp.gtk.org/.

  5. We use cairo >= @CAIRO_REQUIRED_VERSION@, which is hosted at
-     http://www.cairographics.org/.
+     https://www.cairographics.org/.

  6. We require PangoCairo, a Pango backend using Cairo. Make sure you
     have Cairo, FreeType2 and fontconfig installed before you compile
@ -99,7 +103,7 @@ header files installed.

 12. You may want to install other third party libraries or programs
     that are needed for some of the available plug-ins. We recommend
-     to check that the following libraries are installed: libjasper,
+     to check that the following libraries are installed: openjpeg,
     webkit, libmng, librsvg, libwmf, libaa and libgs (Ghostscript).

 13. HEIF support depends on the libheif library. If you don't have
@ -107,8 +111,9 @@ header files installed.

        https://github.com/strukturag/libheif

-     Make sure you build libheif with libde265 support, otherwise the
-     plug-in is mostly useless.
+     Make sure you build libheif with libde265 and libx265 support (for
+     respectively decoding and encoding), otherwise the plug-in is
+     mostly useless.

 14. The Python extension requires Python 2 development headers (@PYTHON2_REQUIRED_VERSION@
     or newer) to be present. You will also need PyGTK and the
@ -171,13 +176,13 @@ header files installed.
     gs                  -              ghostscript
     libaa               -              ASCII art
     libheif             @LIBHEIF_REQUIRED_VERSION@          HEIF
-     libjasper           -              JPEG 2000
     libmng              -              MNG
     libwebp             @WEBP_REQUIRED_VERSION@          WebP (built with --enable-libwebpmux and --enable-libwebpdemux)
     libwmf              @WMF_REQUIRED_VERSION@          WMF
     libXcursor          -              X11 Mouse Cursor
     libxpm              -              XPM
     openexr             @OPENEXR_REQUIRED_VERSION@          OpenEXR
+     OpenJPEG            @OPENJPEG_REQUIRED_VERSION@          JPEG 2000
     python 2            @PYTHON2_REQUIRED_VERSION@          Python plug-ins
     webkit              @WEBKIT_REQUIRED_VERSION@          Help browser & webpage

@ -201,9 +206,9 @@ compilation and installation output is not shown.

  % tar xvfz gimp-@GIMP_VERSION@.tar.gz   # unpack the sources
  % cd gimp-@GIMP_VERSION@                # change to the toplevel directory
-  % ./configure                           # run the `configure' script
-  % make                                  # build GIMP
-  % make install                          # install GIMP
+  % ./configure                   # run the `configure' script
+  % make                          # build GIMP
+  % make install                  # install GIMP


 The `configure' script examines your system, and adapts GIMP to run on
@ -216,6 +221,10 @@ These are:
  --disable-vector-icons.  This option installs raster icons instead of
     vector icons.

+  --enable-relocatable-bundle.  This option forces GIMP to search some
+     resources (e.g. MyPaint brushes or libwmf fonts) relatively to the
+     running prefix, rather than using build-time paths.
+
  --enable-shared and --disable-shared.  This option affects whether
     shared libraries will be built or not. Shared libraries provide
     for much smaller executables. The default is to enable shared
@ -365,7 +374,7 @@ When ./configure fails

 'configure' uses pkg-config, a tool that replaces the old foo-config
 scripts. The most recent version is available from
-	http://www.freedesktop.org/software/pkgconfig/
+	https://www.freedesktop.org/software/pkgconfig/

 'configure' tries to compile and run a short GTK+ program. There are
 several reasons why this might fail:
--- a/Makefile.in
+++ b/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -90,14 +90,8 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
-	$(top_srcdir)/m4macros/intltool.m4 \
-	$(top_srcdir)/m4macros/libtool.m4 \
-	$(top_srcdir)/m4macros/ltoptions.m4 \
-	$(top_srcdir)/m4macros/ltsugar.m4 \
-	$(top_srcdir)/m4macros/ltversion.m4 \
-	$(top_srcdir)/m4macros/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
 	$(top_srcdir)/m4macros/ax_compare_version.m4 \
 	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
@ -180,7 +174,7 @@ am__recursive_targets = \
  $(RECURSIVE_CLEAN_TARGETS) \
  $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	cscope distdir dist dist-all distcheck
+	cscope distdir distdir-am dist dist-all distcheck
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
 	$(LISP)config.h.in
 # Read a list of newline-separated strings from the standard input,
@ -212,8 +206,8 @@ am__DIST_COMMON = $(srcdir)/INSTALL.in $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in $(srcdir)/gimp-zip.in \
 	$(srcdir)/gimp.pc.in $(srcdir)/gimpthumb.pc.in \
 	$(srcdir)/gimpui.pc.in AUTHORS COPYING ChangeLog INSTALL NEWS \
-	README compile config.guess config.sub depcomp install-sh \
-	ltmain.sh missing py-compile
+	README compile config.guess config.sub install-sh ltmain.sh \
+	missing
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@ -280,6 +274,7 @@ BABL_LIBS = @BABL_LIBS@
 BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
 BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
 BINRELOC_LIBS = @BINRELOC_LIBS@
+BUG_REPORT_URL = @BUG_REPORT_URL@
 BUILD_EXEEXT = @BUILD_EXEEXT@
 BUILD_OBJEXT = @BUILD_OBJEXT@
 BZIP2_LIBS = @BZIP2_LIBS@
@ -418,6 +413,7 @@ HAVE_CXX14 = @HAVE_CXX14@
 HAVE_FINITE = @HAVE_FINITE@
 HAVE_ISFINITE = @HAVE_ISFINITE@
 HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@ -492,6 +488,7 @@ OPENEXR_LIBS = @OPENEXR_LIBS@
 OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
 OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
 OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@ -582,7 +579,7 @@ XDG_EMAIL = @XDG_EMAIL@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
 XFIXES_LIBS = @XFIXES_LIBS@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_RECOMMENDED_VERSION = @XGETTEXT_RECOMMENDED_VERSION@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
 XMC_CFLAGS = @XMC_CFLAGS@
 XMC_LIBS = @XMC_LIBS@
 XMKMF = @XMKMF@
@ -773,8 +770,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	    echo ' $(SHELL) ./config.status'; \
 	    $(SHELL) ./config.status;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -947,7 +944,10 @@ distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
 	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	$(am__remove_distdir)
 	test -d "$(distdir)" || mkdir "$(distdir)"
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
--- a/160
+++ b/160
@ -8,6 +8,166 @@ we do allow some new features here, if they are not too invasive.
 Otherwise, this branch is only for bug-fixes.


+Overview of Changes from GIMP 2.10.4 to GIMP 2.10.6
+===================================================
+
+Core:
+
+  - Render drawable previews asynchronously.
+  - Merge the file view filter and file format lists in GimpFileDialog.
+    The presence of 2 lists was very confusing.
+  - DLL search priority is now updated before running a plug-in on
+    Windows, depending on the executable bitness. This gets rid of one
+    of the last remnant of DLL hell in GIMP, which was when running
+    32-bit plug-ins from a 64-bit build of GIMP.
+
+Filters:
+
+  - New "Little Planet" (gegl:stereographic-projection) filter.
+  - New "Long Shadow" (gegl:long-shadow) filter.
+
+Tools:
+
+  - Halt the Measure tool after straightening.
+  - Add an "orientation" option to the measure tool, corresponding to
+    the "orientation" property of GimpToolCompass (i.e., it controls the
+    orientation against which the angle is measured, when not in 3-
+    point mode.)  The orientation is "auto" by default, so that the
+    angle is always <= 45 deg.  Note that the "orientation" option
+    affects the tool's "straighten" function, so that the layer is
+    rotated toward the current orientation.
+  - Text layers can now represent vertical texts, with 4 variants:
+    left-to-right and right-to-left lines, and forcing all characters to
+    be upright or following Unicode's vertical orientation property.
+    See also:
+    * https://www.unicode.org/reports/tr50/
+    * http://www.unicode.org/Public/UCD/latest/ucd/VerticalOrientation.txt
+
+User Interface:
+
+  - The Dashboard dockable dialog now has an "async" field to the
+    dashboard's "misc" group, showing the number of async operations
+    currently in the "running" state.
+  - New Preferences option to enable/disable layer-group previews, since
+    these can get quite time-expensive.
+
+Translations:
+
+  - New language: Marathi
+  - 12 translations were updated: Brazilian Portuguese, Dutch, French,
+    German, Greek, Italian, Latvian, Polish, Romanian, Slovenian,
+    Spanish, Swedish.
+
+Build:
+
+  - Add --with-win32-32bit-dll-folder configuration option to override
+    the folder where 32-bit versions of DLL will be installed (default:
+    32/bin/).
+  - Install all plug-ins in their own directories. Unlike on master,
+    this is not mandatory to do so, but it would protect our core
+    plug-ins against any DLL installed directly under plug-ins/ by
+    third-party plug-ins (cf. Windows DLL hell).
+
+Overview of Changes from GIMP 2.10.2 to GIMP 2.10.4
+===================================================
+
+Core:
+
+  - Remove gimp_display_shell_draw_background() and all clipping hacks
+    for drawing the canvas background. This optimizes away one entire
+    step of drawing of image size, for each expose.
+  - Font loading does not block startup anymore. Only consequence is
+    that the Text tool may not be usable immediately if fonts are not
+    fully loaded yet (and will output an appropriate error if you do
+    so). All non-text related activities can be performed right away.
+  - Change of the URL from bugzilla to gitlab where appropriate.
+  - New tool option manager to better keep track of user context and
+    paint options in a consistent manner.
+
+User Interface:
+
+  - The Dashboard dockable dialog now has a 'Memory' group that shows
+    memory-usage information: the currently used memory size, the
+    available physical memory size, and the total physical memory
+    size.  It can also show the tile-cache size, for comparison
+    against the other memory stats. Note that the upper-bound of the
+    meter is the physical memory size, so the memory usage may be over
+    100% when GIMP uses the swap.
+  - The Dashboard dockable dialog now has "read" and "written" fields in
+    the dashboard swap group, which report the total amount of data
+    read-from/written-to the tile swap, respetively. Additionally, the
+    swap busy indicator (used as the meter's LED) has been improved,
+    so that it's active whenever data has been read-from/written-to
+    the swap during the last sampling interval, rather than at the
+    point of sampling.
+  - Fonts can now be tagged. The user interface is the same as for
+    brushes, patterns etc.
+  - Some icons fixed: larger spacing between broken chains and
+    gimp-tool-ellipse-select made symmetrical.
+
+Usability:
+
+  - When a plug-in cannot be applied to an image because of mismatch
+    in image types (e.g. layer has no alpha or image is greyscale),
+    GIMP now displays a message listing supported image types for this
+    plug-in.
+
+Tools:
+
+  - The Measurement tool now has an "Auto straighten" option allowing
+    to rotate the active drawable (layer, channel…) so that the
+    measurement line is used as horizon. As other transform tools, the
+    feature will work on linked drawables as well.
+  - The Smudge tool now paints correctly on images with a color
+    profile other than the GIMP's built-in one.
+
+Build:
+
+  - Installer: set compatibility options to run Python plugins in
+    HiDPI-aware mode.
+  - Put back compatibility DLLs for really old plugins.
+  - Install binary tool `gimp-test-clipboard` on the system to allow
+    people to help us debug clipboard bugs.
+  - --enable-bundled-mypaint-brushes renamed
+    --enable-relocatable-bundle and also make WMF fonts looked up on
+    the runtime prefix of GIMP (instead of the build-time path) when
+    this build option was set.
+  
+Plug-ins:
+
+  - gimptool-2.0 binary now accepts source files with non-standard
+    extensions if it can try to guess appropriate language from the
+    compiler being used. It will also properly quote arguments for
+    shell usage.
+  - Run explicitly Python 2 as Python plug-in interpreter to prevent
+    breakage on systems where Python 3 is the default.
+  - raw_input()'s argument in Python console is now optional, and
+    input() support has been added.
+
+File Formats:
+
+  - The PSD loader now provides an option to load "merged",
+    pre-composited version of the images that becomes available when a
+    PSD file was saved with "Maximize Compatibility" option enabled in
+    Photoshop. This is useful when loading PSD files that use features
+    that GIMP doesn't currently support, and therefore can't render
+    correctly, such as adjustment layers. When loading the merged
+    image version, we avoid loading certain additional data from the
+    file, such as channels, paths, and guides, while still loading
+    metadata. This option is currently exposed as an additional file
+    type ("Photoshop image (merged)"), which has to be explicitly
+    selected from the file-type list when opening the image.
+  - Embedding GIMP's built-in sRGB color profile to exported files is
+    now optional. The default choice can be set in the Preferences
+    dialog.
+
+Translations:
+
+  - Updated translations: Catalan, Czech, Danish, Dutch, Finnish,
+    Greek, Hungarian, Italian, Latvian, Polish, Romanian, Russian,
+    Spanish, Swedish, Ukrainian.
+
+
 Overview of Changes from GIMP 2.10.0 to GIMP 2.10.2
 ===================================================

--- a/8
+++ b/8
@ -25,21 +25,21 @@ detailed installation instructions, see the file INSTALL.

 GIMP's home page is at:

-	http://www.gimp.org/
+	https://www.gimp.org/

 Please be sure to visit this site for information, documentation,
 tutorials, news, etc.  All things GIMP-ish are available from there.

 The automated plug-in registry is located at:

-	http://registry.gimp.org/
+	https://registry.gimp.org/

 There you can get the latest versions of plug-ins, using a convenient
 forms-based interface.

 The latest version of GIMP can be found at:

-	http://www.gimp.org/downloads/
+	https://www.gimp.org/downloads/


 2. Mailing Lists
@ -48,7 +48,7 @@ The latest version of GIMP can be found at:
 We have several mailing lists dedicated to GIMP user and development
 discussion.  There is more info at

-	http://www.gimp.org/mail_lists.html
+	https://www.gimp.org/mail_lists.html

 Links to several archives of the mailing lists are included in that page.

--- a/README.i18n
+++ b/README.i18n
@ -3,13 +3,13 @@ This file contains some important hints for translators.

 The current status of the GIMP translation can be checked at

-  http://l10n.gnome.org/module/gimp
+  https://l10n.gnome.org/module/gimp


 Translation of the GNU Image Manipulation Program is handled by the
-GNOME Translation Project (see http://l10n.gnome.org/). If you want to
+GNOME Translation Project (see https://l10n.gnome.org/). If you want to
 help, we suggest that you get in touch with the translation team of
-your language (see http://l10n.gnome.org/teams/).
+your language (see https://l10n.gnome.org/teams/).


 GIMP is different
--- a/aclocal.m4
+++ b/aclocal.m4
--- a/app-tools/Makefile.am
+++ b/app-tools/Makefile.am
@ -9,6 +9,7 @@ if PLATFORM_OSX
 xobjective_c = "-xobjective-c"
 xobjective_cxx = "-xobjective-c++"
 xnone = "-xnone"
+framework_appkit = -framework AppKit
 endif

 if OS_WIN32
@ -78,4 +79,5 @@ AM_CXXFLAGS = \
 	$(xobjective_cxx)

 AM_LDFLAGS = \
+	$(framework_appkit)	\
 	$(xnone)
--- a/app-tools/Makefile.in
+++ b/app-tools/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -94,14 +94,8 @@ host_triplet = @host@
@OS_WIN32_FALSE@@PLATFORM_OSX_FALSE@libexec_PROGRAMS = gimp-debug-tool-@GIMP_TOOL_VERSION@$(EXEEXT)
 subdir = app-tools
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
-	$(top_srcdir)/m4macros/intltool.m4 \
-	$(top_srcdir)/m4macros/libtool.m4 \
-	$(top_srcdir)/m4macros/ltoptions.m4 \
-	$(top_srcdir)/m4macros/ltsugar.m4 \
-	$(top_srcdir)/m4macros/ltversion.m4 \
-	$(top_srcdir)/m4macros/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
 	$(top_srcdir)/m4macros/ax_compare_version.m4 \
 	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
@ -145,7 +139,8 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/gimp_debug_tool_@GIMP_TOOL_VERSION@-gimp-debug-tool.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -199,6 +194,7 @@ BABL_LIBS = @BABL_LIBS@
 BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
 BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
 BINRELOC_LIBS = @BINRELOC_LIBS@
+BUG_REPORT_URL = @BUG_REPORT_URL@
 BUILD_EXEEXT = @BUILD_EXEEXT@
 BUILD_OBJEXT = @BUILD_OBJEXT@
 BZIP2_LIBS = @BZIP2_LIBS@
@ -337,6 +333,7 @@ HAVE_CXX14 = @HAVE_CXX14@
 HAVE_FINITE = @HAVE_FINITE@
 HAVE_ISFINITE = @HAVE_ISFINITE@
 HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@ -411,6 +408,7 @@ OPENEXR_LIBS = @OPENEXR_LIBS@
 OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
 OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
 OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@ -501,7 +499,7 @@ XDG_EMAIL = @XDG_EMAIL@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
 XFIXES_LIBS = @XFIXES_LIBS@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_RECOMMENDED_VERSION = @XGETTEXT_RECOMMENDED_VERSION@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
 XMC_CFLAGS = @XMC_CFLAGS@
 XMC_LIBS = @XMC_LIBS@
 XMKMF = @XMKMF@
@ -590,6 +588,7 @@ libappwidgets = $(top_builddir)/app/widgets/libappwidgets.a
@PLATFORM_OSX_TRUE@xobjective_c = "-xobjective-c"
@PLATFORM_OSX_TRUE@xobjective_cxx = "-xobjective-c++"
@PLATFORM_OSX_TRUE@xnone = "-xnone"
+@PLATFORM_OSX_TRUE@framework_appkit = -framework AppKit
 gimp_debug_tool_@GIMP_TOOL_VERSION@_SOURCES = \
 	gimp-debug-tool.c

@ -643,6 +642,7 @@ AM_CXXFLAGS = \
 	$(xobjective_cxx)

 AM_LDFLAGS = \
+	$(framework_appkit)	\
 	$(xnone)

 all: all-am
@ -666,8 +666,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -787,7 +787,13 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_debug_tool_@GIMP_TOOL_VERSION@-gimp-debug-tool.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_debug_tool_@GIMP_TOOL_VERSION@-gimp-debug-tool.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)

 .c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@ -839,7 +845,10 @@ ctags CTAGS:
 cscope cscopelist:


-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -912,7 +921,7 @@ clean-am: clean-binPROGRAMS clean-generic clean-libexecPROGRAMS \
 	clean-libtool mostlyclean-am

 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gimp_debug_tool_@GIMP_TOOL_VERSION@-gimp-debug-tool.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic

@ -957,7 +966,7 @@ install-ps-am:
 installcheck-am:

 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/gimp_debug_tool_@GIMP_TOOL_VERSION@-gimp-debug-tool.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@ -978,7 +987,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-libexecPROGRAMS

 .MAKE: install-am install-strip

-.PHONY: all all-am check check-am clean clean-binPROGRAMS \
+.PHONY: all all-am am--depfiles check check-am clean clean-binPROGRAMS \
 	clean-generic clean-libexecPROGRAMS clean-libtool \
 	cscopelist-am ctags-am distclean distclean-compile \
 	distclean-generic distclean-libtool distdir dvi dvi-am html \
--- a/app-tools/gimp-debug-tool.c
+++ b/app-tools/gimp-debug-tool.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 /*
--- a/app/Makefile.am
+++ b/app/Makefile.am
@ -81,6 +81,10 @@ endif
 if OS_WIN32
 win32_ldflags = -mwindows -Wl,--tsaware $(WIN32_LARGE_ADDRESS_AWARE)

+# for GetProcessMemoryInfo() in the dashboard
+psapi_cflags = -DPSAPI_VERSION=1
+libpsapi = -lpsapi
+
 if HAVE_EXCHNDL
 exchndl = -lexchndl
 endif
@ -113,6 +117,7 @@ AM_CPPFLAGS = \
 	$(GEGL_CFLAGS)					\
 	$(LCMS_CFLAGS)					\
 	$(GEXIV2_CFLAGS)				\
+	$(psapi_cflags)					\
 	-I$(includedir)					\
 	-I$(builddir)/gui

@ -129,7 +134,8 @@ AM_LDFLAGS = \
 	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
 	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
 	-Wl,-u,$(SYMPREFIX)gimp_parallel_init			\
-	-Wl,-u,$(SYMPREFIX)gimp_parallel_exit
+	-Wl,-u,$(SYMPREFIX)gimp_async_set_new			\
+	-Wl,-u,$(SYMPREFIX)gimp_uncancelable_waitable_new

 gimpconsoleldadd = \
 	xcf/libappxcf.a						\
@ -191,6 +197,7 @@ gimp_@GIMP_APP_VERSION@_LDADD = \
 	$(GTK_MAC_INTEGRATION_LIBS)	\
 	$(DBUS_GLIB_LIBS)		\
 	$(gimpconsoleldadd)		\
+	$(libpsapi)			\
 	$(exchndl)			\
 	$(GIMPRC)

--- a/app/Makefile.in
+++ b/app/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -98,14 +98,8 @@ host_triplet = @host@
@ENABLE_GIMP_CONSOLE_TRUE@	gimp-console-@GIMP_APP_VERSION@$(EXEEXT)
 subdir = app
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
-	$(top_srcdir)/m4macros/intltool.m4 \
-	$(top_srcdir)/m4macros/libtool.m4 \
-	$(top_srcdir)/m4macros/ltoptions.m4 \
-	$(top_srcdir)/m4macros/ltsugar.m4 \
-	$(top_srcdir)/m4macros/ltversion.m4 \
-	$(top_srcdir)/m4macros/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
 	$(top_srcdir)/m4macros/ax_compare_version.m4 \
 	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
@ -121,6 +115,8 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
+am__installdirs = "$(DESTDIR)$(bindir)"
+PROGRAMS = $(bin_PROGRAMS)
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 AM_V_AR = $(am__v_AR_@AM_V@)
@ -135,8 +131,6 @@ am__objects_1 = app.$(OBJEXT) errors.$(OBJEXT) language.$(OBJEXT) \
 	gimp-version.$(OBJEXT)
 am_libapp_a_OBJECTS = $(am__objects_1)
 libapp_a_OBJECTS = $(am_libapp_a_OBJECTS)
-am__installdirs = "$(DESTDIR)$(bindir)"
-PROGRAMS = $(bin_PROGRAMS)
 am_gimp_@GIMP_APP_VERSION@_OBJECTS = $(am__objects_1) main.$(OBJEXT)
 gimp_@GIMP_APP_VERSION@_OBJECTS =  \
 	$(am_gimp_@GIMP_APP_VERSION@_OBJECTS)
@ -165,7 +159,8 @@ gimp_@GIMP_APP_VERSION@_DEPENDENCIES = gui/libappgui.a \
 	display/libappdisplay.a propgui/libapppropgui.a \
 	widgets/libappwidgets.a $(libgimpwidgets) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) $(GIMPRC)
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) $(GIMPRC)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@ -211,7 +206,24 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/app.Po ./$(DEPDIR)/errors.Po \
+	./$(DEPDIR)/gimp-debug.Po ./$(DEPDIR)/gimp-log.Po \
+	./$(DEPDIR)/gimp-version.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po \
+	./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po \
+	./$(DEPDIR)/language.Po ./$(DEPDIR)/main.Po \
+	./$(DEPDIR)/sanity.Po ./$(DEPDIR)/signals.Po \
+	./$(DEPDIR)/tests.Po ./$(DEPDIR)/unique.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -255,7 +267,7 @@ am__recursive_targets = \
  $(RECURSIVE_CLEAN_TARGETS) \
  $(am__extra_recursive_targets)
 AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
-	distdir
+	distdir distdir-am
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 # Read a list of newline-separated strings from the standard input,
 # and print each of them once, without duplicates.  Input order is
@ -328,6 +340,7 @@ BABL_LIBS = @BABL_LIBS@
 BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
 BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
 BINRELOC_LIBS = @BINRELOC_LIBS@
+BUG_REPORT_URL = @BUG_REPORT_URL@
 BUILD_EXEEXT = @BUILD_EXEEXT@
 BUILD_OBJEXT = @BUILD_OBJEXT@
 BZIP2_LIBS = @BZIP2_LIBS@
@ -466,6 +479,7 @@ HAVE_CXX14 = @HAVE_CXX14@
 HAVE_FINITE = @HAVE_FINITE@
 HAVE_ISFINITE = @HAVE_ISFINITE@
 HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@ -540,6 +554,7 @@ OPENEXR_LIBS = @OPENEXR_LIBS@
 OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
 OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
 OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@ -630,7 +645,7 @@ XDG_EMAIL = @XDG_EMAIL@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
 XFIXES_LIBS = @XFIXES_LIBS@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_RECOMMENDED_VERSION = @XGETTEXT_RECOMMENDED_VERSION@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
 XMC_CFLAGS = @XMC_CFLAGS@
 XMC_LIBS = @XMC_LIBS@
 XMKMF = @XMKMF@
@ -780,6 +795,10 @@ libapp_a_SOURCES = $(libapp_sources)
 gimp_@GIMP_APP_VERSION@_SOURCES = $(libapp_sources) main.c
@PLATFORM_OSX_TRUE@framework_cocoa = -framework Cocoa
@OS_WIN32_TRUE@win32_ldflags = -mwindows -Wl,--tsaware $(WIN32_LARGE_ADDRESS_AWARE)
+
+# for GetProcessMemoryInfo() in the dashboard
+@OS_WIN32_TRUE@psapi_cflags = -DPSAPI_VERSION=1
+@OS_WIN32_TRUE@libpsapi = -lpsapi
@HAVE_EXCHNDL_TRUE@@OS_WIN32_TRUE@exchndl = -lexchndl
@OS_WIN32_FALSE@libm = -lm
@USE_BINRELOC_TRUE@munix = -Wl,-rpath '-Wl,$$ORIGIN/../lib'
@ -800,6 +819,7 @@ AM_CPPFLAGS = \
 	$(GEGL_CFLAGS)					\
 	$(LCMS_CFLAGS)					\
 	$(GEXIV2_CFLAGS)				\
+	$(psapi_cflags)					\
 	-I$(includedir)					\
 	-I$(builddir)/gui

@ -817,7 +837,8 @@ AM_LDFLAGS = \
 	-Wl,-u,$(SYMPREFIX)gimp_pdb_compat_param_spec		\
 	-Wl,-u,$(SYMPREFIX)gimp_layer_mode_is_legacy		\
 	-Wl,-u,$(SYMPREFIX)gimp_parallel_init			\
-	-Wl,-u,$(SYMPREFIX)gimp_parallel_exit
+	-Wl,-u,$(SYMPREFIX)gimp_async_set_new			\
+	-Wl,-u,$(SYMPREFIX)gimp_uncancelable_waitable_new

 gimpconsoleldadd = \
 	xcf/libappxcf.a						\
@ -879,6 +900,7 @@ gimp_@GIMP_APP_VERSION@_LDADD = \
 	$(GTK_MAC_INTEGRATION_LIBS)	\
 	$(DBUS_GLIB_LIBS)		\
 	$(gimpconsoleldadd)		\
+	$(libpsapi)			\
 	$(exchndl)			\
 	$(GIMPRC)

@ -912,8 +934,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;
 $(top_srcdir)/build/windows/gimprc.rule $(am__empty):

@ -925,14 +947,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-
-libapp.a: $(libapp_a_OBJECTS) $(libapp_a_DEPENDENCIES) $(EXTRA_libapp_a_DEPENDENCIES) 
-	$(AM_V_at)-rm -f libapp.a
-	$(AM_V_AR)$(libapp_a_AR) libapp.a $(libapp_a_OBJECTS) $(libapp_a_LIBADD)
-	$(AM_V_at)$(RANLIB) libapp.a
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@ -983,6 +997,14 @@ clean-binPROGRAMS:
 	echo " rm -f" $$list; \
 	rm -f $$list

+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+libapp.a: $(libapp_a_OBJECTS) $(libapp_a_DEPENDENCIES) $(EXTRA_libapp_a_DEPENDENCIES) 
+	$(AM_V_at)-rm -f libapp.a
+	$(AM_V_AR)$(libapp_a_AR) libapp.a $(libapp_a_OBJECTS) $(libapp_a_LIBADD)
+	$(AM_V_at)$(RANLIB) libapp.a
+
 gimp-@GIMP_APP_VERSION@$(EXEEXT): $(gimp_@GIMP_APP_VERSION@_OBJECTS) $(gimp_@GIMP_APP_VERSION@_DEPENDENCIES) $(EXTRA_gimp_@GIMP_APP_VERSION@_DEPENDENCIES) 
 	@rm -f gimp-@GIMP_APP_VERSION@$(EXEEXT)
 	$(AM_V_CCLD)$(gimp_@GIMP_APP_VERSION@_LINK) $(gimp_@GIMP_APP_VERSION@_OBJECTS) $(gimp_@GIMP_APP_VERSION@_LDADD) $(LIBS)
@ -997,28 +1019,34 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/app.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-log.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-version.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/language.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sanity.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unique.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/app.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/errors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-debug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-log.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp-version.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/language.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sanity.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/signals.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tests.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/unique.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)

 .c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@ -1300,7 +1328,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -1360,7 +1391,7 @@ distdir: $(DISTFILES)
 	  dist-hook
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+all-am: Makefile $(PROGRAMS) $(LIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
 	for dir in "$(DESTDIR)$(bindir)"; do \
@ -1402,7 +1433,28 @@ clean-am: clean-binPROGRAMS clean-generic clean-libtool \
 	clean-noinstLIBRARIES mostlyclean-am

 distclean: distclean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/app.Po
+	-rm -f ./$(DEPDIR)/errors.Po
+	-rm -f ./$(DEPDIR)/gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po
+	-rm -f ./$(DEPDIR)/language.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/sanity.Po
+	-rm -f ./$(DEPDIR)/signals.Po
+	-rm -f ./$(DEPDIR)/tests.Po
+	-rm -f ./$(DEPDIR)/unique.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@ -1449,7 +1501,28 @@ install-ps-am:
 installcheck-am:

 maintainer-clean: maintainer-clean-recursive
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/app.Po
+	-rm -f ./$(DEPDIR)/errors.Po
+	-rm -f ./$(DEPDIR)/gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-app.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-errors.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-debug.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-log.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-gimp-version.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-language.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-main.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-sanity.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-signals.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-tests.Po
+	-rm -f ./$(DEPDIR)/gimp_console_@GIMP_APP_VERSION@-unique.Po
+	-rm -f ./$(DEPDIR)/language.Po
+	-rm -f ./$(DEPDIR)/main.Po
+	-rm -f ./$(DEPDIR)/sanity.Po
+	-rm -f ./$(DEPDIR)/signals.Po
+	-rm -f ./$(DEPDIR)/tests.Po
+	-rm -f ./$(DEPDIR)/unique.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@ -1471,21 +1544,22 @@ uninstall-am: uninstall-binPROGRAMS uninstall-local
 .MAKE: $(am__recursive_targets) install-am install-exec-am \
 	install-strip

-.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-binPROGRAMS clean-generic clean-libtool \
-	clean-noinstLIBRARIES cscopelist-am ctags ctags-am dist-hook \
-	distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-exec-hook install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-local
+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
+	am--depfiles check check-am clean clean-binPROGRAMS \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am dist-hook distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-hook install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs installdirs-am \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+	pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-local

 .PRECIOUS: Makefile

--- a/app/about.h
+++ b/app/about.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __ABOUT_H__
@ -47,7 +47,7 @@
    "GNU General Public License for more details."                       \
    "\n\n"                                                               \
    "You should have received a copy of the GNU General Public License " \
-    "along with GIMP. If not, see: http://www.gnu.org/licenses/")
+    "along with GIMP. If not, see: https://www.gnu.org/licenses/")


 #endif /* __ABOUT_H__ */
--- a/app/actions/Makefile.am
+++ b/app/actions/Makefile.am
@ -98,8 +98,6 @@ libappactions_a_SOURCES = \
 	filters-commands.h		\
 	fonts-actions.c			\
 	fonts-actions.h			\
-	fonts-commands.c		\
-	fonts-commands.h		\
 	gradient-editor-actions.c	\
 	gradient-editor-actions.h	\
 	gradient-editor-commands.c	\
--- a/app/actions/Makefile.in
+++ b/app/actions/Makefile.in
@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15.1 from Makefile.am.
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
 # @configure_input@

-# Copyright (C) 1994-2017 Free Software Foundation, Inc.
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@ -90,14 +90,8 @@ build_triplet = @build@
 host_triplet = @host@
 subdir = app/actions
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
-	$(top_srcdir)/m4macros/intltool.m4 \
-	$(top_srcdir)/m4macros/libtool.m4 \
-	$(top_srcdir)/m4macros/ltoptions.m4 \
-	$(top_srcdir)/m4macros/ltsugar.m4 \
-	$(top_srcdir)/m4macros/ltversion.m4 \
-	$(top_srcdir)/m4macros/lt~obsolete.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/m4macros/alsa.m4 \
 	$(top_srcdir)/m4macros/ax_compare_version.m4 \
 	$(top_srcdir)/m4macros/ax_cxx_compile_stdcxx.m4 \
 	$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
@ -142,7 +136,7 @@ am_libappactions_a_OBJECTS = actions.$(OBJEXT) \
 	error-console-commands.$(OBJEXT) file-actions.$(OBJEXT) \
 	file-commands.$(OBJEXT) filters-actions.$(OBJEXT) \
 	filters-commands.$(OBJEXT) fonts-actions.$(OBJEXT) \
-	fonts-commands.$(OBJEXT) gradient-editor-actions.$(OBJEXT) \
+	gradient-editor-actions.$(OBJEXT) \
 	gradient-editor-commands.$(OBJEXT) gradients-actions.$(OBJEXT) \
 	gradients-commands.$(OBJEXT) help-actions.$(OBJEXT) \
 	help-commands.$(OBJEXT) image-actions.$(OBJEXT) \
@ -185,7 +179,77 @@ am__v_at_0 = @
 am__v_at_1 = 
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/actions.Po \
+	./$(DEPDIR)/brush-editor-actions.Po \
+	./$(DEPDIR)/brushes-actions.Po ./$(DEPDIR)/buffers-actions.Po \
+	./$(DEPDIR)/buffers-commands.Po \
+	./$(DEPDIR)/channels-actions.Po \
+	./$(DEPDIR)/channels-commands.Po \
+	./$(DEPDIR)/colormap-actions.Po \
+	./$(DEPDIR)/colormap-commands.Po \
+	./$(DEPDIR)/context-actions.Po ./$(DEPDIR)/context-commands.Po \
+	./$(DEPDIR)/cursor-info-actions.Po \
+	./$(DEPDIR)/cursor-info-commands.Po \
+	./$(DEPDIR)/dashboard-actions.Po \
+	./$(DEPDIR)/dashboard-commands.Po ./$(DEPDIR)/data-commands.Po \
+	./$(DEPDIR)/data-editor-commands.Po \
+	./$(DEPDIR)/debug-actions.Po ./$(DEPDIR)/debug-commands.Po \
+	./$(DEPDIR)/dialogs-actions.Po ./$(DEPDIR)/dialogs-commands.Po \
+	./$(DEPDIR)/dock-actions.Po ./$(DEPDIR)/dock-commands.Po \
+	./$(DEPDIR)/dockable-actions.Po \
+	./$(DEPDIR)/dockable-commands.Po \
+	./$(DEPDIR)/documents-actions.Po \
+	./$(DEPDIR)/documents-commands.Po \
+	./$(DEPDIR)/drawable-actions.Po \
+	./$(DEPDIR)/drawable-commands.Po \
+	./$(DEPDIR)/dynamics-actions.Po \
+	./$(DEPDIR)/dynamics-editor-actions.Po \
+	./$(DEPDIR)/edit-actions.Po ./$(DEPDIR)/edit-commands.Po \
+	./$(DEPDIR)/error-console-actions.Po \
+	./$(DEPDIR)/error-console-commands.Po \
+	./$(DEPDIR)/file-actions.Po ./$(DEPDIR)/file-commands.Po \
+	./$(DEPDIR)/filters-actions.Po ./$(DEPDIR)/filters-commands.Po \
+	./$(DEPDIR)/fonts-actions.Po ./$(DEPDIR)/gimpgeglprocedure.Po \
+	./$(DEPDIR)/gradient-editor-actions.Po \
+	./$(DEPDIR)/gradient-editor-commands.Po \
+	./$(DEPDIR)/gradients-actions.Po \
+	./$(DEPDIR)/gradients-commands.Po ./$(DEPDIR)/help-actions.Po \
+	./$(DEPDIR)/help-commands.Po ./$(DEPDIR)/image-actions.Po \
+	./$(DEPDIR)/image-commands.Po ./$(DEPDIR)/images-actions.Po \
+	./$(DEPDIR)/images-commands.Po ./$(DEPDIR)/items-actions.Po \
+	./$(DEPDIR)/items-commands.Po ./$(DEPDIR)/layers-actions.Po \
+	./$(DEPDIR)/layers-commands.Po \
+	./$(DEPDIR)/mypaint-brushes-actions.Po \
+	./$(DEPDIR)/palette-editor-actions.Po \
+	./$(DEPDIR)/palette-editor-commands.Po \
+	./$(DEPDIR)/palettes-actions.Po \
+	./$(DEPDIR)/palettes-commands.Po \
+	./$(DEPDIR)/patterns-actions.Po ./$(DEPDIR)/plug-in-actions.Po \
+	./$(DEPDIR)/plug-in-commands.Po \
+	./$(DEPDIR)/procedure-commands.Po \
+	./$(DEPDIR)/quick-mask-actions.Po \
+	./$(DEPDIR)/quick-mask-commands.Po \
+	./$(DEPDIR)/sample-points-actions.Po \
+	./$(DEPDIR)/sample-points-commands.Po \
+	./$(DEPDIR)/select-actions.Po ./$(DEPDIR)/select-commands.Po \
+	./$(DEPDIR)/templates-actions.Po \
+	./$(DEPDIR)/templates-commands.Po \
+	./$(DEPDIR)/text-editor-actions.Po \
+	./$(DEPDIR)/text-editor-commands.Po \
+	./$(DEPDIR)/text-tool-actions.Po \
+	./$(DEPDIR)/text-tool-commands.Po \
+	./$(DEPDIR)/tool-options-actions.Po \
+	./$(DEPDIR)/tool-options-commands.Po \
+	./$(DEPDIR)/tool-preset-editor-actions.Po \
+	./$(DEPDIR)/tool-preset-editor-commands.Po \
+	./$(DEPDIR)/tool-presets-actions.Po \
+	./$(DEPDIR)/tool-presets-commands.Po \
+	./$(DEPDIR)/tools-actions.Po ./$(DEPDIR)/tools-commands.Po \
+	./$(DEPDIR)/vectors-actions.Po ./$(DEPDIR)/vectors-commands.Po \
+	./$(DEPDIR)/view-actions.Po ./$(DEPDIR)/view-commands.Po \
+	./$(DEPDIR)/window-actions.Po ./$(DEPDIR)/window-commands.Po \
+	./$(DEPDIR)/windows-actions.Po ./$(DEPDIR)/windows-commands.Po
 am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@ -261,6 +325,7 @@ BABL_LIBS = @BABL_LIBS@
 BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
 BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
 BINRELOC_LIBS = @BINRELOC_LIBS@
+BUG_REPORT_URL = @BUG_REPORT_URL@
 BUILD_EXEEXT = @BUILD_EXEEXT@
 BUILD_OBJEXT = @BUILD_OBJEXT@
 BZIP2_LIBS = @BZIP2_LIBS@
@ -399,6 +464,7 @@ HAVE_CXX14 = @HAVE_CXX14@
 HAVE_FINITE = @HAVE_FINITE@
 HAVE_ISFINITE = @HAVE_ISFINITE@
 HAVE_VFORK = @HAVE_VFORK@
+HOST_GLIB_COMPILE_RESOURCES = @HOST_GLIB_COMPILE_RESOURCES@
 HTML_DIR = @HTML_DIR@
 INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
@ -473,6 +539,7 @@ OPENEXR_LIBS = @OPENEXR_LIBS@
 OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
 OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
 OPENJPEG_LIBS = @OPENJPEG_LIBS@
+OPENJPEG_REQUIRED_VERSION = @OPENJPEG_REQUIRED_VERSION@
 OTOOL = @OTOOL@
 OTOOL64 = @OTOOL64@
 PACKAGE = @PACKAGE@
@ -563,7 +630,7 @@ XDG_EMAIL = @XDG_EMAIL@
 XFIXES_CFLAGS = @XFIXES_CFLAGS@
 XFIXES_LIBS = @XFIXES_LIBS@
 XGETTEXT = @XGETTEXT@
-XGETTEXT_RECOMMENDED_VERSION = @XGETTEXT_RECOMMENDED_VERSION@
+XGETTEXT_REQUIRED_VERSION = @XGETTEXT_REQUIRED_VERSION@
 XMC_CFLAGS = @XMC_CFLAGS@
 XMC_LIBS = @XMC_LIBS@
 XMKMF = @XMKMF@
@ -743,8 +810,6 @@ libappactions_a_SOURCES = \
 	filters-commands.h		\
 	fonts-actions.c			\
 	fonts-actions.h			\
-	fonts-commands.c		\
-	fonts-commands.h		\
 	gradient-editor-actions.c	\
 	gradient-editor-actions.h	\
 	gradient-editor-commands.c	\
@ -869,8 +934,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	  *config.status*) \
 	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
 	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
 	esac;

 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
@ -896,99 +961,104 @@ mostlyclean-compile:
 distclean-compile:
 	-rm -f *.tab.c

-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brush-editor-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brushes-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channels-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channels-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormap-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormap-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor-info-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor-info-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dashboard-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dashboard-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-editor-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dock-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dock-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockable-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockable-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/documents-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/documents-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-editor-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error-console-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error-console-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonts-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonts-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgeglprocedure.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-editor-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-editor-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradients-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradients-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/images-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/images-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layers-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layers-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mypaint-brushes-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-editor-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-editor-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palettes-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palettes-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patterns-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procedure-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick-mask-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick-mask-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample-points-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample-points-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/templates-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/templates-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-editor-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-editor-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-tool-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-tool-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-options-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-options-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-preset-editor-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-preset-editor-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-presets-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-presets-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-commands.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-actions.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-commands.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brush-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/brushes-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channels-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/channels-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormap-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/colormap-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/context-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor-info-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor-info-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dashboard-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dashboard-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/data-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/debug-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dialogs-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dock-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dock-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockable-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dockable-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/documents-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/documents-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drawable-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dynamics-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/edit-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error-console-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/error-console-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filters-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fonts-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gimpgeglprocedure.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradient-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradients-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gradients-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/help-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/images-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/images-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/items-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layers-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layers-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mypaint-brushes-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palette-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palettes-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/palettes-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/patterns-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/plug-in-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/procedure-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick-mask-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/quick-mask-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample-points-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sample-points-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/select-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/templates-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/templates-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-tool-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text-tool-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-options-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-options-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-preset-editor-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-preset-editor-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-presets-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tool-presets-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tools-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vectors-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/view-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/window-commands.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-actions.Po@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/windows-commands.Po@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)

 .c.o:
@am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@ -1069,7 +1139,10 @@ cscopelist-am: $(am__tagged_files)
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

-distdir: $(DISTFILES)
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@ -1139,7 +1212,98 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
 	mostlyclean-am

 distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/actions.Po
+	-rm -f ./$(DEPDIR)/brush-editor-actions.Po
+	-rm -f ./$(DEPDIR)/brushes-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-commands.Po
+	-rm -f ./$(DEPDIR)/channels-actions.Po
+	-rm -f ./$(DEPDIR)/channels-commands.Po
+	-rm -f ./$(DEPDIR)/colormap-actions.Po
+	-rm -f ./$(DEPDIR)/colormap-commands.Po
+	-rm -f ./$(DEPDIR)/context-actions.Po
+	-rm -f ./$(DEPDIR)/context-commands.Po
+	-rm -f ./$(DEPDIR)/cursor-info-actions.Po
+	-rm -f ./$(DEPDIR)/cursor-info-commands.Po
+	-rm -f ./$(DEPDIR)/dashboard-actions.Po
+	-rm -f ./$(DEPDIR)/dashboard-commands.Po
+	-rm -f ./$(DEPDIR)/data-commands.Po
+	-rm -f ./$(DEPDIR)/data-editor-commands.Po
+	-rm -f ./$(DEPDIR)/debug-actions.Po
+	-rm -f ./$(DEPDIR)/debug-commands.Po
+	-rm -f ./$(DEPDIR)/dialogs-actions.Po
+	-rm -f ./$(DEPDIR)/dialogs-commands.Po
+	-rm -f ./$(DEPDIR)/dock-actions.Po
+	-rm -f ./$(DEPDIR)/dock-commands.Po
+	-rm -f ./$(DEPDIR)/dockable-actions.Po
+	-rm -f ./$(DEPDIR)/dockable-commands.Po
+	-rm -f ./$(DEPDIR)/documents-actions.Po
+	-rm -f ./$(DEPDIR)/documents-commands.Po
+	-rm -f ./$(DEPDIR)/drawable-actions.Po
+	-rm -f ./$(DEPDIR)/drawable-commands.Po
+	-rm -f ./$(DEPDIR)/dynamics-actions.Po
+	-rm -f ./$(DEPDIR)/dynamics-editor-actions.Po
+	-rm -f ./$(DEPDIR)/edit-actions.Po
+	-rm -f ./$(DEPDIR)/edit-commands.Po
+	-rm -f ./$(DEPDIR)/error-console-actions.Po
+	-rm -f ./$(DEPDIR)/error-console-commands.Po
+	-rm -f ./$(DEPDIR)/file-actions.Po
+	-rm -f ./$(DEPDIR)/file-commands.Po
+	-rm -f ./$(DEPDIR)/filters-actions.Po
+	-rm -f ./$(DEPDIR)/filters-commands.Po
+	-rm -f ./$(DEPDIR)/fonts-actions.Po
+	-rm -f ./$(DEPDIR)/gimpgeglprocedure.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-actions.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-commands.Po
+	-rm -f ./$(DEPDIR)/gradients-actions.Po
+	-rm -f ./$(DEPDIR)/gradients-commands.Po
+	-rm -f ./$(DEPDIR)/help-actions.Po
+	-rm -f ./$(DEPDIR)/help-commands.Po
+	-rm -f ./$(DEPDIR)/image-actions.Po
+	-rm -f ./$(DEPDIR)/image-commands.Po
+	-rm -f ./$(DEPDIR)/images-actions.Po
+	-rm -f ./$(DEPDIR)/images-commands.Po
+	-rm -f ./$(DEPDIR)/items-actions.Po
+	-rm -f ./$(DEPDIR)/items-commands.Po
+	-rm -f ./$(DEPDIR)/layers-actions.Po
+	-rm -f ./$(DEPDIR)/layers-commands.Po
+	-rm -f ./$(DEPDIR)/mypaint-brushes-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-commands.Po
+	-rm -f ./$(DEPDIR)/palettes-actions.Po
+	-rm -f ./$(DEPDIR)/palettes-commands.Po
+	-rm -f ./$(DEPDIR)/patterns-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-commands.Po
+	-rm -f ./$(DEPDIR)/procedure-commands.Po
+	-rm -f ./$(DEPDIR)/quick-mask-actions.Po
+	-rm -f ./$(DEPDIR)/quick-mask-commands.Po
+	-rm -f ./$(DEPDIR)/sample-points-actions.Po
+	-rm -f ./$(DEPDIR)/sample-points-commands.Po
+	-rm -f ./$(DEPDIR)/select-actions.Po
+	-rm -f ./$(DEPDIR)/select-commands.Po
+	-rm -f ./$(DEPDIR)/templates-actions.Po
+	-rm -f ./$(DEPDIR)/templates-commands.Po
+	-rm -f ./$(DEPDIR)/text-editor-actions.Po
+	-rm -f ./$(DEPDIR)/text-editor-commands.Po
+	-rm -f ./$(DEPDIR)/text-tool-actions.Po
+	-rm -f ./$(DEPDIR)/text-tool-commands.Po
+	-rm -f ./$(DEPDIR)/tool-options-actions.Po
+	-rm -f ./$(DEPDIR)/tool-options-commands.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-actions.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-commands.Po
+	-rm -f ./$(DEPDIR)/tool-presets-actions.Po
+	-rm -f ./$(DEPDIR)/tool-presets-commands.Po
+	-rm -f ./$(DEPDIR)/tools-actions.Po
+	-rm -f ./$(DEPDIR)/tools-commands.Po
+	-rm -f ./$(DEPDIR)/vectors-actions.Po
+	-rm -f ./$(DEPDIR)/vectors-commands.Po
+	-rm -f ./$(DEPDIR)/view-actions.Po
+	-rm -f ./$(DEPDIR)/view-commands.Po
+	-rm -f ./$(DEPDIR)/window-actions.Po
+	-rm -f ./$(DEPDIR)/window-commands.Po
+	-rm -f ./$(DEPDIR)/windows-actions.Po
+	-rm -f ./$(DEPDIR)/windows-commands.Po
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@ -1185,7 +1349,98 @@ install-ps-am:
 installcheck-am:

 maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
+		-rm -f ./$(DEPDIR)/actions.Po
+	-rm -f ./$(DEPDIR)/brush-editor-actions.Po
+	-rm -f ./$(DEPDIR)/brushes-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-actions.Po
+	-rm -f ./$(DEPDIR)/buffers-commands.Po
+	-rm -f ./$(DEPDIR)/channels-actions.Po
+	-rm -f ./$(DEPDIR)/channels-commands.Po
+	-rm -f ./$(DEPDIR)/colormap-actions.Po
+	-rm -f ./$(DEPDIR)/colormap-commands.Po
+	-rm -f ./$(DEPDIR)/context-actions.Po
+	-rm -f ./$(DEPDIR)/context-commands.Po
+	-rm -f ./$(DEPDIR)/cursor-info-actions.Po
+	-rm -f ./$(DEPDIR)/cursor-info-commands.Po
+	-rm -f ./$(DEPDIR)/dashboard-actions.Po
+	-rm -f ./$(DEPDIR)/dashboard-commands.Po
+	-rm -f ./$(DEPDIR)/data-commands.Po
+	-rm -f ./$(DEPDIR)/data-editor-commands.Po
+	-rm -f ./$(DEPDIR)/debug-actions.Po
+	-rm -f ./$(DEPDIR)/debug-commands.Po
+	-rm -f ./$(DEPDIR)/dialogs-actions.Po
+	-rm -f ./$(DEPDIR)/dialogs-commands.Po
+	-rm -f ./$(DEPDIR)/dock-actions.Po
+	-rm -f ./$(DEPDIR)/dock-commands.Po
+	-rm -f ./$(DEPDIR)/dockable-actions.Po
+	-rm -f ./$(DEPDIR)/dockable-commands.Po
+	-rm -f ./$(DEPDIR)/documents-actions.Po
+	-rm -f ./$(DEPDIR)/documents-commands.Po
+	-rm -f ./$(DEPDIR)/drawable-actions.Po
+	-rm -f ./$(DEPDIR)/drawable-commands.Po
+	-rm -f ./$(DEPDIR)/dynamics-actions.Po
+	-rm -f ./$(DEPDIR)/dynamics-editor-actions.Po
+	-rm -f ./$(DEPDIR)/edit-actions.Po
+	-rm -f ./$(DEPDIR)/edit-commands.Po
+	-rm -f ./$(DEPDIR)/error-console-actions.Po
+	-rm -f ./$(DEPDIR)/error-console-commands.Po
+	-rm -f ./$(DEPDIR)/file-actions.Po
+	-rm -f ./$(DEPDIR)/file-commands.Po
+	-rm -f ./$(DEPDIR)/filters-actions.Po
+	-rm -f ./$(DEPDIR)/filters-commands.Po
+	-rm -f ./$(DEPDIR)/fonts-actions.Po
+	-rm -f ./$(DEPDIR)/gimpgeglprocedure.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-actions.Po
+	-rm -f ./$(DEPDIR)/gradient-editor-commands.Po
+	-rm -f ./$(DEPDIR)/gradients-actions.Po
+	-rm -f ./$(DEPDIR)/gradients-commands.Po
+	-rm -f ./$(DEPDIR)/help-actions.Po
+	-rm -f ./$(DEPDIR)/help-commands.Po
+	-rm -f ./$(DEPDIR)/image-actions.Po
+	-rm -f ./$(DEPDIR)/image-commands.Po
+	-rm -f ./$(DEPDIR)/images-actions.Po
+	-rm -f ./$(DEPDIR)/images-commands.Po
+	-rm -f ./$(DEPDIR)/items-actions.Po
+	-rm -f ./$(DEPDIR)/items-commands.Po
+	-rm -f ./$(DEPDIR)/layers-actions.Po
+	-rm -f ./$(DEPDIR)/layers-commands.Po
+	-rm -f ./$(DEPDIR)/mypaint-brushes-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-actions.Po
+	-rm -f ./$(DEPDIR)/palette-editor-commands.Po
+	-rm -f ./$(DEPDIR)/palettes-actions.Po
+	-rm -f ./$(DEPDIR)/palettes-commands.Po
+	-rm -f ./$(DEPDIR)/patterns-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-actions.Po
+	-rm -f ./$(DEPDIR)/plug-in-commands.Po
+	-rm -f ./$(DEPDIR)/procedure-commands.Po
+	-rm -f ./$(DEPDIR)/quick-mask-actions.Po
+	-rm -f ./$(DEPDIR)/quick-mask-commands.Po
+	-rm -f ./$(DEPDIR)/sample-points-actions.Po
+	-rm -f ./$(DEPDIR)/sample-points-commands.Po
+	-rm -f ./$(DEPDIR)/select-actions.Po
+	-rm -f ./$(DEPDIR)/select-commands.Po
+	-rm -f ./$(DEPDIR)/templates-actions.Po
+	-rm -f ./$(DEPDIR)/templates-commands.Po
+	-rm -f ./$(DEPDIR)/text-editor-actions.Po
+	-rm -f ./$(DEPDIR)/text-editor-commands.Po
+	-rm -f ./$(DEPDIR)/text-tool-actions.Po
+	-rm -f ./$(DEPDIR)/text-tool-commands.Po
+	-rm -f ./$(DEPDIR)/tool-options-actions.Po
+	-rm -f ./$(DEPDIR)/tool-options-commands.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-actions.Po
+	-rm -f ./$(DEPDIR)/tool-preset-editor-commands.Po
+	-rm -f ./$(DEPDIR)/tool-presets-actions.Po
+	-rm -f ./$(DEPDIR)/tool-presets-commands.Po
+	-rm -f ./$(DEPDIR)/tools-actions.Po
+	-rm -f ./$(DEPDIR)/tools-commands.Po
+	-rm -f ./$(DEPDIR)/vectors-actions.Po
+	-rm -f ./$(DEPDIR)/vectors-commands.Po
+	-rm -f ./$(DEPDIR)/view-actions.Po
+	-rm -f ./$(DEPDIR)/view-commands.Po
+	-rm -f ./$(DEPDIR)/window-actions.Po
+	-rm -f ./$(DEPDIR)/window-commands.Po
+	-rm -f ./$(DEPDIR)/windows-actions.Po
+	-rm -f ./$(DEPDIR)/windows-commands.Po
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic

@ -1206,16 +1461,16 @@ uninstall-am:

 .MAKE: install-am install-strip

-.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLIBRARIES cscopelist-am ctags \
-	ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-noinstLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am
--- a/app/actions/actions-types.h
+++ b/app/actions/actions-types.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __ACTIONS_TYPES_H__
--- a/app/actions/actions.c
+++ b/app/actions/actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/actions.h
+++ b/app/actions/actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __ACTIONS_H__
--- a/app/actions/brush-editor-actions.c
+++ b/app/actions/brush-editor-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/brush-editor-actions.h
+++ b/app/actions/brush-editor-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __BRUSH_EDITOR_ACTIONS_H__
--- a/app/actions/brushes-actions.c
+++ b/app/actions/brushes-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/brushes-actions.h
+++ b/app/actions/brushes-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __BRUSHES_ACTIONS_H__
--- a/app/actions/buffers-actions.c
+++ b/app/actions/buffers-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/buffers-actions.h
+++ b/app/actions/buffers-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __BUFFERS_ACTIONS_H__
--- a/app/actions/buffers-commands.c
+++ b/app/actions/buffers-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/buffers-commands.h
+++ b/app/actions/buffers-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __BUFFERS_COMMANDS_H__
--- a/app/actions/channels-actions.c
+++ b/app/actions/channels-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/channels-actions.h
+++ b/app/actions/channels-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __CHANNELS_ACTIONS_H__
--- a/app/actions/channels-commands.c
+++ b/app/actions/channels-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/channels-commands.h
+++ b/app/actions/channels-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __CHANNELS_COMMANDS_H__
--- a/app/actions/colormap-actions.c
+++ b/app/actions/colormap-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/colormap-actions.h
+++ b/app/actions/colormap-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __COLORMAP_ACTIONS_H__
--- a/app/actions/colormap-commands.c
+++ b/app/actions/colormap-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
@ -20,9 +20,6 @@
 #include <gegl.h>
 #include <gtk/gtk.h>

-#include "libgimpcolor/gimpcolor.h"
-#include "libgimpwidgets/gimpwidgets.h"
-
 #include "actions-types.h"

 #include "core/gimpchannel-select.h"
@ -30,23 +27,11 @@
 #include "core/gimpimage.h"
 #include "core/gimpimage-colormap.h"

-#include "widgets/gimpcolordialog.h"
 #include "widgets/gimpcolormapeditor.h"
-#include "widgets/gimpdialogfactory.h"

 #include "actions.h"
 #include "colormap-commands.h"

-#include "gimp-intl.h"
-
-
-/*  local function prototypes  */
-
-static void   colormap_edit_color_update (GimpColorDialog      *dialog,
-                                          const GimpRGB        *color,
-                                          GimpColorDialogState  state,
-                                          GimpColormapEditor   *editor);
-

 /*  public functions  */

@ -54,60 +39,9 @@ void
 colormap_edit_color_cmd_callback (GtkAction *action,
                                  gpointer   data)
 {
-  GimpColormapEditor *editor;
-  GimpImage          *image;
-  const guchar       *colormap;
-  GimpRGB             color;
-  gchar              *desc;
-  return_if_no_image (image, data);
+  GimpColormapEditor *editor = GIMP_COLORMAP_EDITOR (data);

-  editor = GIMP_COLORMAP_EDITOR (data);
-
-  colormap = gimp_image_get_colormap (image);
-
-  gimp_rgba_set_uchar (&color,
-                       colormap[editor->col_index * 3],
-                       colormap[editor->col_index * 3 + 1],
-                       colormap[editor->col_index * 3 + 2],
-                       255);
-
-  desc = g_strdup_printf (_("Edit colormap entry #%d"), editor->col_index);
-
-  if (! editor->color_dialog)
-    {
-      editor->color_dialog =
-        gimp_color_dialog_new (GIMP_VIEWABLE (image),
-                               action_data_get_context (data),
-                               _("Edit Colormap Entry"),
-                               GIMP_ICON_COLORMAP,
-                               desc,
-                               GTK_WIDGET (editor),
-                               gimp_dialog_factory_get_singleton (),
-                               "gimp-colormap-editor-color-dialog",
-                               (const GimpRGB *) &color,
-                               FALSE, FALSE);
-
-      g_signal_connect (editor->color_dialog, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed),
-                        &editor->color_dialog);
-
-      g_signal_connect (editor->color_dialog, "update",
-                        G_CALLBACK (colormap_edit_color_update),
-                        editor);
-    }
-  else
-    {
-      gimp_viewable_dialog_set_viewable (GIMP_VIEWABLE_DIALOG (editor->color_dialog),
-                                         GIMP_VIEWABLE (image),
-                                         action_data_get_context (data));
-      g_object_set (editor->color_dialog, "description", desc, NULL);
-      gimp_color_dialog_set_color (GIMP_COLOR_DIALOG (editor->color_dialog),
-                                   &color);
-    }
-
-  g_free (desc);
-
-  gtk_window_present (GTK_WINDOW (editor->color_dialog));
+  gimp_colormap_editor_edit_color (editor);
 }

 void
@ -153,31 +87,6 @@ colormap_to_selection_cmd_callback (GtkAction *action,
                                editor->col_index,
                                op,
                                FALSE, 0.0, 0.0);
-}
-
-
-/*  private functions  */
-
-static void
-colormap_edit_color_update (GimpColorDialog      *dialog,
-                            const GimpRGB        *color,
-                            GimpColorDialogState  state,
-                            GimpColormapEditor   *editor)
-{
-  GimpImage *image = GIMP_IMAGE_EDITOR (editor)->image;
-
-  switch (state)
-    {
-    case GIMP_COLOR_DIALOG_UPDATE:
-      break;
-
-    case GIMP_COLOR_DIALOG_OK:
-      gimp_image_set_colormap_entry (image, editor->col_index, color, TRUE);
-      gimp_image_flush (image);
-      /* Fall through */
-
-    case GIMP_COLOR_DIALOG_CANCEL:
-      gtk_widget_hide (editor->color_dialog);
-      break;
-    }
+
+  gimp_image_flush (image);
 }
--- a/app/actions/colormap-commands.h
+++ b/app/actions/colormap-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __COLORMAP_COMMANDS_H__
--- a/app/actions/context-actions.c
+++ b/app/actions/context-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/context-actions.h
+++ b/app/actions/context-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __CONTEXT_ACTIONS_H__
--- a/app/actions/context-commands.c
+++ b/app/actions/context-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
@ -482,7 +482,7 @@ context_font_select_cmd_callback (GtkAction *action,
  return_if_no_context (context, data);

  context_select_object ((GimpActionSelectType) value,
-                         context, context->gimp->fonts);
+                         context, gimp_data_factory_get_container (context->gimp->font_factory));
 }

 void
--- a/app/actions/context-commands.h
+++ b/app/actions/context-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __CONTEXT_COMMANDS_H__
--- a/app/actions/cursor-info-actions.c
+++ b/app/actions/cursor-info-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/cursor-info-actions.h
+++ b/app/actions/cursor-info-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __CURSOR_INFO_ACIONS_H__
--- a/app/actions/cursor-info-commands.c
+++ b/app/actions/cursor-info-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/cursor-info-commands.h
+++ b/app/actions/cursor-info-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __CURSOR_INFO_COMMANDS_H__
--- a/app/actions/dashboard-actions.c
+++ b/app/actions/dashboard-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dashboard-actions.h
+++ b/app/actions/dashboard-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DASHBOARD_ACTIONS_H__
--- a/app/actions/dashboard-commands.c
+++ b/app/actions/dashboard-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dashboard-commands.h
+++ b/app/actions/dashboard-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DASHBOARD_COMMANDS_H__
--- a/app/actions/data-commands.c
+++ b/app/actions/data-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/data-commands.h
+++ b/app/actions/data-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DATA_COMMANDS_H__
--- a/app/actions/data-editor-commands.c
+++ b/app/actions/data-editor-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/data-editor-commands.h
+++ b/app/actions/data-editor-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DATA_EDITOR_COMMANDS_H__
--- a/app/actions/debug-actions.c
+++ b/app/actions/debug-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/debug-actions.h
+++ b/app/actions/debug-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DEBUG_ACTIONS_H__
--- a/app/actions/debug-commands.c
+++ b/app/actions/debug-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/debug-commands.h
+++ b/app/actions/debug-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DEBUG_COMMANDS_H__
--- a/app/actions/dialogs-actions.c
+++ b/app/actions/dialogs-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dialogs-actions.h
+++ b/app/actions/dialogs-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DIALOGS_ACTIONS_H__
--- a/app/actions/dialogs-commands.c
+++ b/app/actions/dialogs-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dialogs-commands.h
+++ b/app/actions/dialogs-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DIALOGS_COMMANDS_H__
--- a/app/actions/dock-actions.c
+++ b/app/actions/dock-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dock-actions.h
+++ b/app/actions/dock-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DOCK_ACTIONS_H__
--- a/app/actions/dock-commands.c
+++ b/app/actions/dock-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dock-commands.h
+++ b/app/actions/dock-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DOCK_COMMANDS_H__
--- a/app/actions/dockable-actions.c
+++ b/app/actions/dockable-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dockable-actions.h
+++ b/app/actions/dockable-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DOCKABLE_ACTIONS_H__
--- a/app/actions/dockable-commands.c
+++ b/app/actions/dockable-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dockable-commands.h
+++ b/app/actions/dockable-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DOCKABLE_COMMANDS_H__
--- a/app/actions/documents-actions.c
+++ b/app/actions/documents-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/documents-actions.h
+++ b/app/actions/documents-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DOCUMENTS_ACTIONS_H__
--- a/app/actions/documents-commands.c
+++ b/app/actions/documents-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/documents-commands.h
+++ b/app/actions/documents-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DOCUMENTS_COMMANDS_H__
--- a/app/actions/drawable-actions.c
+++ b/app/actions/drawable-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/drawable-actions.h
+++ b/app/actions/drawable-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DRAWABLE_ACTIONS_H__
--- a/app/actions/drawable-commands.c
+++ b/app/actions/drawable-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/drawable-commands.h
+++ b/app/actions/drawable-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DRAWABLE_COMMANDS_H__
--- a/app/actions/dynamics-actions.c
+++ b/app/actions/dynamics-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dynamics-actions.h
+++ b/app/actions/dynamics-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DYNAMICS_ACTIONS_H__
--- a/app/actions/dynamics-editor-actions.c
+++ b/app/actions/dynamics-editor-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/dynamics-editor-actions.h
+++ b/app/actions/dynamics-editor-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __DYNAMICS_EDITOR_ACTIONS_H__
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/edit-actions.h
+++ b/app/actions/edit-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __EDIT_ACTIONS_H__
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/edit-commands.h
+++ b/app/actions/edit-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __EDIT_COMMANDS_H__
--- a/app/actions/error-console-actions.c
+++ b/app/actions/error-console-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/error-console-actions.h
+++ b/app/actions/error-console-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __ERROR_CONSOLE_ACIONS_H__
--- a/app/actions/error-console-commands.c
+++ b/app/actions/error-console-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/error-console-commands.h
+++ b/app/actions/error-console-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __ERROR_CONSOLE_COMMANDS_H__
--- a/app/actions/file-actions.c
+++ b/app/actions/file-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/file-actions.h
+++ b/app/actions/file-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __FILE_ACTIONS_H__
--- a/app/actions/file-commands.c
+++ b/app/actions/file-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/file-commands.h
+++ b/app/actions/file-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __FILE_COMMANDS_H__
--- a/app/actions/filters-actions.c
+++ b/app/actions/filters-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
@ -413,6 +413,16 @@ static const GimpStringActionEntry filters_interactive_actions[] =
    "gimp:levels",
    GIMP_HELP_TOOL_LEVELS },

+  { "filters-little-planet", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Little Planet..."), NULL, NULL,
+    "gegl:stereographic-projection",
+    GIMP_HELP_FILTER_LITTLE_PLANET },
+
+  { "filters-long-shadow", GIMP_ICON_GEGL,
+    NC_("filters-action", "_Long Shadow..."), NULL, NULL,
+    "gegl:long-shadow",
+    GIMP_HELP_FILTER_LONG_SHADOW },
+
  { "filters-mantiuk-2006", GIMP_ICON_GEGL,
    NC_("filters-action", "_Mantiuk 2006..."), NULL, NULL,
    "gegl:mantiuk06",
@ -669,7 +679,7 @@ static const GimpStringActionEntry filters_interactive_actions[] =
    GIMP_HELP_FILTER_TILE_SEAMLESS },

  { "filters-unsharp-mask", GIMP_ICON_GEGL,
-    NC_("filters-action", "_Unsharp Mask..."), NULL, NULL,
+    NC_("filters-action", "Sharpen (_Unsharp Mask)..."), NULL, NULL,
    "gegl:unsharp-mask",
    GIMP_HELP_FILTER_UNSHARP_MASK },

@ -890,6 +900,8 @@ filters_actions_update (GimpActionGroup *group,
  SET_SENSITIVE ("filters-lens-distortion",         writable);
  SET_SENSITIVE ("filters-lens-flare",              writable);
  SET_SENSITIVE ("filters-levels",                  writable);
+  SET_SENSITIVE ("filters-little-planet",           writable);
+  SET_SENSITIVE ("filters-long-shadow",             writable && alpha);
  SET_SENSITIVE ("filters-mantiuk-2006",            writable);
  SET_SENSITIVE ("filters-maze",                    writable);
  SET_SENSITIVE ("filters-median-blur",             writable);
@ -957,7 +969,8 @@ filters_actions_update (GimpActionGroup *group,
    GimpProcedure *proc = gimp_filter_history_nth (group->gimp, 0);
    gint           i;

-    if (proc && gimp_procedure_get_sensitive (proc, GIMP_OBJECT (drawable)))
+    if (proc &&
+        gimp_procedure_get_sensitive (proc, GIMP_OBJECT (drawable), NULL))
      {
        gimp_action_group_set_action_sensitive (group, "filters-repeat", TRUE);
        gimp_action_group_set_action_sensitive (group, "filters-reshow", TRUE);
@ -975,7 +988,8 @@ filters_actions_update (GimpActionGroup *group,

        proc = gimp_filter_history_nth (group->gimp, i);

-        sensitive = gimp_procedure_get_sensitive (proc, GIMP_OBJECT (drawable));
+        sensitive = gimp_procedure_get_sensitive (proc, GIMP_OBJECT (drawable),
+                                                  NULL);

        gimp_action_group_set_action_sensitive (group, name, sensitive);

--- a/app/actions/filters-actions.h
+++ b/app/actions/filters-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __FILTERS_ACTIONS_H__
--- a/app/actions/filters-commands.c
+++ b/app/actions/filters-commands.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
--- a/app/actions/filters-commands.h
+++ b/app/actions/filters-commands.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __FILTERS_COMMANDS_H__
--- a/app/actions/fonts-actions.c
+++ b/app/actions/fonts-actions.c
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #include "config.h"
@ -32,8 +32,8 @@
 #include "widgets/gimphelp-ids.h"

 #include "actions.h"
+#include "data-commands.h"
 #include "fonts-actions.h"
-#include "fonts-commands.h"

 #include "gimp-intl.h"

@ -47,7 +47,7 @@ static const GimpActionEntry fonts_actions[] =
  { "fonts-refresh", GIMP_ICON_VIEW_REFRESH,
    NC_("fonts-action", "_Rescan Font List"), NULL,
    NC_("fonts-action", "Rescan the installed fonts"),
-    G_CALLBACK (fonts_refresh_cmd_callback),
+    G_CALLBACK (data_refresh_cmd_callback),
    GIMP_HELP_FONT_REFRESH }
 };

--- a/app/actions/fonts-actions.h
+++ b/app/actions/fonts-actions.h
@ -12,7 +12,7 @@
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

 #ifndef __FONTS_ACTIONS_H__
--- a/Show More
+++ b/Show More