[gimp/gimp-attributes-wip: 30/328] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip

[Hartmut Kuhse <hartmutkuhse src gnome org>]

commit 63a49a4def2f62180a9fad363cf3cfcc18f665ab
Merge: 910c385 93d1161
Author: Hartmut Kuhse <hk_priv gmx de>
Date:   Sat May 28 11:45:25 2016 +0200

    Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip

 INSTALL.in                             |    5 +
 app/actions/edit-actions.c             |    8 +
 app/core/gimpcontext.c                 |   56 -
 app/core/gimpcontext.h                 |   12 -
 app/dialogs/preferences-dialog.c       |    5 +-
 app/main.c                             |    1 +
 app/widgets/gimpaction.c               |    7 +
 app/widgets/gimpfgbgview.c             |   90 ++-
 app/widgets/gimpfgbgview.h             |    7 +-
 app/widgets/gimpviewrenderer.c         |  230 +++-
 app/widgets/gimpviewrenderer.h         |    5 +
 app/widgets/gimpviewrenderergradient.c |   11 +
 app/widgets/gimpviewrendererpalette.c  |   19 +-
 configure.ac                           |   55 +-
 libgimpcolor/gimpcolortransform.c      |    2 +-
 libgimpwidgets/gimpwidgetsutils.c      |  181 +++-
 modules/color-selector-water.c         |  175 ++-
 plug-ins/Makefile.am                   |    2 -
 plug-ins/common/mail.c                 |  405 ++++---
 plug-ins/win-snap/.gitignore           |    6 -
 plug-ins/win-snap/Makefile.am          |   48 -
 plug-ins/win-snap/resource.h           |   23 -
 plug-ins/win-snap/select.cur           |  Bin 326 -> 0 bytes
 plug-ins/win-snap/small.ico            |  Bin 318 -> 0 bytes
 plug-ins/win-snap/winsnap.c            | 1191 -----------------
 plug-ins/win-snap/winsnap.h            |   10 -
 plug-ins/win-snap/winsnap.ico          |  Bin 1590 -> 0 bytes
 plug-ins/win-snap/winsnap.rc           |  189 ---
 po-libgimp/oc.po                       | 1787 +++++++++++++++++--------
 po-plug-ins/POTFILES.in                |    1 -
 po-plug-ins/oc.po                      |   26 +-
 po-python/oc.po                        |   36 +-
 po-script-fu/oc.po                     | 2241 +++++++++++++++++++-------------
 po-tags/oc.po                          |    8 +-
 po-tips/oc.po                          |  173 ++--
 po/es.po                               |  116 +-
 po/oc.po                               |  320 +++---
 37 files changed, 3750 insertions(+), 3701 deletions(-)
---