[gimp/gimp-attributes-wip: 129/129] periodically merge with master to be up to date
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 129/129] periodically merge with master to be up to date
- Date: Sat, 30 May 2015 15:23:03 +0000 (UTC)
commit 8f2ffb24b4d651fa32ff45623aa107057a11e26a
Merge: 21b7f53 b9773ef
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sat May 30 17:22:07 2015 +0200
periodically merge with master to be up to date
app/actions/buffers-commands.c | 3 +-
app/actions/gradient-editor-commands.c | 14 +-
app/actions/images-commands.c | 3 +-
app/actions/view-actions.c | 57 +-
app/actions/view-commands.c | 31 +-
app/actions/view-commands.h | 5 +-
app/core/gimpbrushclipboard.c | 6 +-
app/core/gimpchannel.c | 10 +-
app/core/gimpdrawable-blend.c | 2 +
app/core/gimpdrawable-combine.c | 2 +
app/core/gimpdrawable-filter.c | 3 +
app/core/gimpdrawable-offset.c | 8 +-
app/core/gimpdrawable-transform.c | 4 +-
app/core/gimpdrawable.c | 10 +-
app/core/gimpimage-convert-precision.c | 1 +
app/core/gimpimage-duplicate.c | 2 +-
app/core/gimpimage-profile.c | 30 +-
app/core/gimpimage-profile.h | 2 +-
app/core/gimpimage.c | 26 +-
app/core/gimplayer.c | 14 +-
app/core/gimplayermask.c | 2 +-
app/core/gimpmaskundo.c | 3 +
app/core/gimppattern.c | 1 +
app/core/gimpselection.c | 5 +-
app/dialogs/preferences-dialog.c | 57 +-
app/display/Makefile.am | 2 +
app/display/gimpdisplayshell-filter.c | 3 +
app/display/gimpdisplayshell-handlers.c | 24 +
app/display/gimpdisplayshell-profile.c | 171 +
app/display/gimpdisplayshell-profile.h | 32 +
app/display/gimpdisplayshell-title.c | 11 +-
app/display/gimpdisplayshell.c | 35 +-
app/display/gimpdisplayshell.h | 24 +-
app/errors.c | 11 +-
app/gegl/gimp-gegl-apply-operation.c | 2 +-
app/paint/gimpclone.c | 1 +
app/paint/gimpconvolve.c | 1 +
app/paint/gimpheal.c | 4 +-
app/paint/gimpmybrush.c | 2 +
app/paint/gimppaintcore.c | 2 +
app/paint/gimpsmudge.c | 2 +
app/pdb/Makefile.am | 8 +-
app/pdb/{convert-cmds.c => image-convert-cmds.c} | 2 +-
app/pdb/{grid-cmds.c => image-grid-cmds.c} | 2 +-
app/pdb/{guides-cmds.c => image-guides-cmds.c} | 2 +-
app/pdb/{undo-cmds.c => image-undo-cmds.c} | 2 +-
app/pdb/internal-procs.c | 8 +-
app/pdb/internal-procs.h | 8 +-
app/text/gimptextlayer.c | 2 +-
app/tools/gimpforegroundselecttool.c | 3 +
app/widgets/gimphelp-ids.h | 2 +
app/widgets/gimpimageprofileview.c | 18 +-
app/widgets/gimpviewrenderer.c | 2 +
build/windows/installer/lang/ca.setup.isl | 113 +
build/windows/installer/lang/pl.setup.isl | 113 +
devel-docs/app/Makefile.am | 8 +-
libgimp/Makefile.am | 16 +-
libgimp/gimp.c | 34 +-
libgimp/gimp_pdb_headers.h | 8 +-
.../{gimpconvert_pdb.c => gimpimageconvert_pdb.c} | 6 +-
.../{gimpconvert_pdb.h => gimpimageconvert_pdb.h} | 8 +-
libgimp/{gimpgrid_pdb.c => gimpimagegrid_pdb.c} | 6 +-
libgimp/{gimpgrid_pdb.h => gimpimagegrid_pdb.h} | 8 +-
.../{gimpguides_pdb.c => gimpimageguides_pdb.c} | 10 +-
.../{gimpguides_pdb.h => gimpimageguides_pdb.h} | 8 +-
libgimp/{gimpundo_pdb.c => gimpimageundo_pdb.c} | 10 +-
libgimp/{gimpundo_pdb.h => gimpimageundo_pdb.h} | 8 +-
libgimp/gimplayer.c | 3 +-
libgimpcolor/gimpcolor.def | 2 +
libgimpcolor/gimpcolormanaged.c | 30 +-
libgimpcolor/gimpcolormanaged.h | 19 +-
libgimpcolor/gimplcms.c | 74 +
libgimpcolor/gimplcms.h | 1 +
libgimpconfig/gimpcolorconfig.c | 220 +-
libgimpwidgets/gimpcolorprofilechooserdialog.c | 37 +-
libgimpwidgets/gimpwidgetsutils.c | 70 +-
libgimpwidgets/gimpwidgetsutils.h | 38 +-
menus/image-menu.xml.in | 2 +
modules/display-filter-lcms.c | 63 +-
plug-ins/common/compose.c | 4 +-
plug-ins/common/crop-zealous.c | 2 +
plug-ins/common/decompose.c | 4 +-
plug-ins/common/file-gegl.c | 2 +-
plug-ins/common/file-pdf-save.c | 2 +-
plug-ins/common/lcms.c | 26 +-
plug-ins/file-ico/ico-dialog.c | 4 +-
plug-ins/file-ico/ico-save.c | 2 +-
po-libgimp/el.po | 138 +-
po-libgimp/it.po | 50 +-
po-libgimp/oc.po |15965 +++++++++++++-
po-plug-ins/oc.po |21985 ++++++++++++--------
po-python/oc.po |15809 ++++++++++++++-
po-script-fu/ca.po | 2670 +--
po-script-fu/sv.po | 2200 +--
po-tags/LINGUAS | 1 +
po-tags/oc.po | 30 +
po-tips/sv.po | 344 +-
po/POTFILES.in | 6 +-
po/ca.po |10383 ++++++----
po/el.po | 1789 +-
po/it.po | 1524 +-
po/oc.po |11431 +++++------
po/sk.po |10482 ++++++----
tools/pdbgen/Makefile.am | 8 +-
tools/pdbgen/groups.pl | 8 +-
.../pdbgen/pdb/{convert.pdb => image_convert.pdb} | 4 +-
tools/pdbgen/pdb/{grid.pdb => image_grid.pdb} | 2 +-
tools/pdbgen/pdb/{guides.pdb => image_guides.pdb} | 8 +-
tools/pdbgen/pdb/{undo.pdb => image_undo.pdb} | 8 +-
109 files changed, 66352 insertions(+), 30141 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]