[gimp/meson: 329/805] Merge branch 'meson' of github.com:Salamandar/gimp_mesonport into meson

[Félix Piédallu <fpiedallu src gnome org>]

commit f17ce7d9e6c895a4289d6e13d29c5d98464f287c
Merge: 111a846 45bbd42
Author: Félix Piédallu <felix piedallu me>
Date:   Fri Dec 22 17:52:13 2017 +0100

    Merge branch 'meson' of github.com:Salamandar/gimp_mesonport into meson

 NEWS                                         |   52 +-
 app/actions/brushes-actions.c                |    2 +-
 app/actions/buffers-actions.c                |   71 +-
 app/actions/buffers-commands.c               |  110 +--
 app/actions/buffers-commands.h               |    5 +-
 app/actions/channels-actions.c               |   65 +-
 app/actions/channels-commands.c              |   22 +
 app/actions/channels-commands.h              |    4 +
 app/actions/drawable-actions.c               |   10 +-
 app/actions/dynamics-actions.c               |    2 +-
 app/actions/edit-actions.c                   |   82 +-
 app/actions/edit-commands.c                  |   52 +-
 app/actions/edit-commands.h                  |    5 +-
 app/actions/error-console-actions.c          |   11 +-
 app/actions/error-console-commands.c         |   12 +-
 app/actions/filters-actions.c                |    5 +
 app/actions/layers-actions.c                 |   49 +-
 app/actions/mypaint-brushes-actions.c        |    2 +-
 app/actions/palettes-actions.c               |    2 +-
 app/actions/patterns-actions.c               |    2 +-
 app/actions/tool-presets-actions.c           |    2 +-
 app/actions/vectors-actions.c                |   28 +-
 app/actions/view-actions.c                   |    4 +-
 app/config/gimpguiconfig.c                   |   45 -
 app/config/gimpguiconfig.h                   |    1 -
 app/config/gimprc-blurbs.h                   |    9 -
 app/core/core-enums.c                        |    6 +
 app/core/core-enums.h                        |    5 +-
 app/core/gimp-edit.c                         |  321 ++++--
 app/core/gimp-edit.h                         |   10 -
 app/core/gimpbrushgenerated.c                |   35 +-
 app/core/gimpchannel.c                       |   10 +-
 app/core/gimpcurve.c                         |   28 +-
 app/core/gimpdata.c                          |   21 +-
 app/core/gimpdata.h                          |    3 +
 app/core/gimpdynamics.c                      |   18 +-
 app/core/gimpgradient.c                      |    8 +-
 app/core/gimpgrouplayer.c                    |   13 +-
 app/core/gimphistogram.c                     |   12 +-
 app/core/gimpimage.c                         |    4 +
 app/core/gimppalette.c                       |   32 +-
 app/core/gimppattern-load.c                  |   16 +-
 app/core/gimppattern.c                       |   19 +-
 app/display/gimpcanvastransformpreview.c     |   36 +-
 app/display/gimpcanvastransformpreview.h     |    3 +-
 app/display/gimpdisplayshell-filter-dialog.c |    3 +-
 app/display/gimpdisplayshell-filter.c        |   13 +-
 app/display/gimpdisplayshell-profile.c       |   54 +-
 app/display/gimpdisplayshell-render.c        |  131 ++-
 app/display/gimpdisplayshell-scale.c         |    4 +-
 app/display/gimpdisplayshell.c               |    2 +
 app/display/gimpdisplayshell.h               |   11 +-
 app/display/gimpscalecombobox.c              |   14 +-
 app/display/gimpstatusbar.c                  |  132 +++-
 app/display/gimpstatusbar.h                  |    3 +
 app/file/file-save.c                         |    2 -
 app/gegl/gimptilehandlervalidate.c           |   10 +-
 app/gegl/gimptilehandlervalidate.h           |    1 +
 app/gui/gui-message.c                        |   17 +-
 app/gui/session.c                            |   68 +--
 app/operations/gimpoperationhistogramsink.c  |    4 +-
 app/propgui/gimppropgui.c                    |    7 +-
 app/sanity.c                                 |    5 +-
 app/tests/test-ui.c                          |    2 +-
 app/tools/gimpblendtool-editor.c             |  139 ++-
 app/tools/gimpcolorpickeroptions.c           |   30 +-
 app/tools/gimpcolorpickeroptions.h           |    2 +
 app/tools/gimpcolorpickertool.c              |   13 +-
 app/tools/gimpdrawtool.c                     |    6 +-
 app/tools/gimpdrawtool.h                     |    3 +-
 app/tools/gimpgegltool.c                     |    1 +
 app/tools/gimphandletransformtool.c          |    3 +-
 app/tools/gimpperspectivetool.c              |    3 +-
 app/tools/gimptransformtool.c                |    3 +-
 app/tools/gimptransformtool.h                |    4 -
 app/tools/gimpunifiedtransformtool.c         |    3 +-
 app/widgets/gimpbufferview.c                 |   28 +-
 app/widgets/gimpcolordisplayeditor.c         |   23 +-
 app/widgets/gimpcolordisplayeditor.h         |    4 +-
 app/widgets/gimpcolorframe.c                 |    4 +-
 app/widgets/gimpcontainertreeview.c          |   54 +
 app/widgets/gimpcontainertreeview.h          |    5 +
 app/widgets/gimperrorconsole.c               |  102 ++-
 app/widgets/gimperrorconsole.h               |    2 +
 app/widgets/gimphelp-ids.h                   |   11 +
 app/widgets/gimpsearchpopup.c                |    4 +-
 app/widgets/gimpspinscale.c                  |  127 +++-
 app/widgets/gimptemplateview.c               |   65 +--
 app/widgets/gimpviewrendererimage.c          |    3 +-
 app/xcf/xcf-load.c                           |    5 +-
 autogen.sh                                   |   12 +-
 build/archlinux/PKGBUILD                     |    5 +-
 configure.ac                                 |    4 +-
 data/images/gimp-splash.png                  |  Bin 267154 -> 588365 bytes
 libgimp/gimptilebackendplugin.c              |   21 +-
 libgimpcolor/gimpcolorprofile.c              |    5 +-
 libgimpmath/gimpmath.h                       |   14 +
 menus/buffers-menu.xml                       |    3 +
 menus/image-menu.xml.in                      |    4 +
 meson.build                                  |    8 +-
 modules/Makefile.am                          |    5 +
 modules/display-filter-clip-warning.c        |  494 +++++++++
 modules/display-filter-color-blind.c         |  134 +--
 modules/display-filter-gamma.c               |   26 -
 modules/display-filter-high-contrast.c       |   28 +-
 modules/meson.build                          |    4 +
 plug-ins/file-psd/psd-layer-res-load.c       |   64 +-
 plug-ins/file-psd/psd-save.c                 |   28 +-
 plug-ins/file-psd/psd.h                      |    1 +
 plug-ins/file-raw/file-darktable.c           |   32 +-
 po-libgimp/POTFILES.in                       |    1 +
 po-libgimp/pl.po                             |  115 ++-
 po-libgimp/ru.po                             |  945 ++++++++++-------
 po-script-fu/ca.po                           |   27 +-
 po/ca.po                                     |    2 +-
 po/es.po                                     |  648 ++++++------
 po/pl.po                                     | 1466 ++++++++++++++------------
 tools/meson.build                            |    2 -
 tools/pdbgen/meson.build                     |  151 +++
 119 files changed, 4254 insertions(+), 2379 deletions(-)
---