[gimp/gimp-attributes-wip: 133/148] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- From: Hartmut Kuhse <hartmutkuhse src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-attributes-wip: 133/148] Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
- Date: Sat, 7 Feb 2015 13:21:47 +0000 (UTC)
commit 7c51a381b396fc6c03b21cad4cff4f588a686c8a
Merge: e973b77 4ace9e5
Author: Hartmut Kuhse <hk_priv gmx de>
Date: Sun Jan 25 12:16:58 2015 +0100
Merge remote-tracking branch 'remotes/origin/master' into gimp-attributes-wip
Conflicts:
app/pdb/internal-procs.c
app/actions/filters-actions.c | 24 +
app/core/core-enums.c | 4 +-
app/display/gimpdisplay-foreach.c | 2 +-
app/display/gimpdisplayshell-tool-events.c | 6 +-
app/file/file-utils.c | 2 +-
app/gegl/gimp-gegl-config-proxy.c | 4 +-
app/paint/gimpclone.c | 34 +-
app/paint/gimpdodgeburn.c | 24 +-
app/paint/gimperaser.c | 20 +-
app/paint/gimpheal.c | 46 +-
app/paint/gimppaintbrush.c | 7 +-
app/paint/gimppaintoptions.c | 198 +-
app/paint/gimppaintoptions.h | 6 +
app/paint/gimpsmudge.c | 54 +-
app/pdb/internal-procs.c | 2 +-
app/pdb/plug-in-compat-cmds.c | 415 +-
app/sanity.c | 4 +
app/tests/gimpdir/sessionrc | 2 +-
app/tests/gimpdir/sessionrc-2-6 | 2 +-
app/tests/gimpdir/sessionrc-2-8-multi-window | 2 +-
app/tests/gimpdir/sessionrc-expected | 2 +-
app/tests/gimpdir/sessionrc-expected-2-6 | 2 +-
app/tests/gimpdir/sessionrc-expected-multi-window | 2 +-
app/tools/gimpcagetool.c | 7 +-
app/tools/gimpgegltool.c | 4 +
app/tools/gimpoperationtool.c | 71 +
app/tools/gimpoperationtool.h | 3 +
app/tools/gimppaintoptions-gui.c | 132 +-
app/tools/gimpregionselecttool.c | 2 +-
app/tools/gimptexttool.c | 6 +-
app/widgets/gimpactiongroup.c | 24 +
app/widgets/gimpactiongroup.h | 4 +
app/widgets/gimpcursor.c | 2 +-
app/widgets/gimpcurveview.c | 2 +-
app/widgets/gimpdialogfactory.c | 2 +-
app/widgets/gimplanguagestore-parser.c | 7 +-
app/widgets/gimpmenufactory.c | 13 +
app/widgets/gimppropgui-constructors.c | 102 +
app/widgets/gimppropgui-constructors.h | 7 +
app/widgets/gimppropgui.c | 2 +
app/widgets/gimpthumbbox.c | 2 +-
app/widgets/gimpviewablebox.c | 4 +-
autogen.sh | 3 +
build/windows/jhbuild/gimp.moduleset | 1 +
build/windows/jhbuild/glib.moduleset | 6 +-
build/windows/jhbuild/misclibs.moduleset | 10 +
etc/sessionrc | 102 +-
icons/16/gimp-tool-unified-transform.png | Bin 586 -> 607 bytes
icons/16/gimp-tool-unified-transform.xcf | Bin 0 -> 2375 bytes
icons/16/gimp-tool-warp.png | Bin 709 -> 771 bytes
icons/16/gimp-tool-warp.xcf | Bin 0 -> 2754 bytes
icons/22/gimp-tool-unified-transform.png | Bin 914 -> 636 bytes
icons/22/gimp-tool-unified-transform.xcf | Bin 3778 -> 3149 bytes
icons/22/gimp-tool-warp.png | Bin 906 -> 1192 bytes
icons/22/gimp-tool-warp.xcf | Bin 0 -> 4041 bytes
libgimp/gimp.def | 4 +-
libgimpwidgets/gimpdialog.c | 14 +-
libgimpwidgets/gimpruler.c | 40 +-
libgimpwidgets/gimpunitstore.c | 4 +-
menus/image-menu.xml.in | 4 +
plug-ins/common/.gitignore | 6 -
plug-ins/common/Makefile.am | 55 +-
plug-ins/common/crop-zealous.c | 197 +-
plug-ins/common/diffraction.c | 720 --
plug-ins/common/engrave.c | 586 -
plug-ins/common/file-compressor.c | 2 +-
plug-ins/common/file-pnm.c | 460 +-
plug-ins/common/file-tga.c | 42 +-
plug-ins/common/file-tiff-load.c | 3 +-
plug-ins/common/file-tiff-save.c | 6 +-
plug-ins/common/gimprc.common | 3 -
plug-ins/common/lens-flare.c | 933 --
plug-ins/common/plugin-defs.pl | 5 +-
plug-ins/file-jpeg/jpeg-load.c | 5 +-
po-libgimp/is.po | 2140 ++--
po-libgimp/tr.po | 383 +-
po-plug-ins/POTFILES.in | 3 -
po-plug-ins/is.po |12105 ++++++++++---------
po-plug-ins/sv.po |11996 ++++++++-----------
po-plug-ins/tr.po | 2288 ++--
po-python/is.po | 264 +-
po-python/tr.po | 253 +-
po-script-fu/is.po | 1596 +---
po-script-fu/tr.po | 2920 ++---
po-tags/LINGUAS | 1 +
po-tags/is.po | 30 +
po-tips/is.po | 402 +-
po/cs.po | 2 +-
po/is.po |13023 +++++++++------------
po/it.po | 713 +-
po/tr.po | 9685 ++++++++++------
tools/pdbgen/pdb/plug_in_compat.pdb | 234 +-
92 files changed, 30126 insertions(+), 32383 deletions(-)
---
diff --cc app/core/core-enums.c
index 5d97822,c6dcc62..a9a81d1
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@@ -959,14 -957,13 +959,14 @@@ gimp_undo_type_get_type (void
{ GIMP_UNDO_IMAGE_SIZE, NC_("undo-type", "Image size"), NULL },
{ GIMP_UNDO_IMAGE_RESOLUTION, NC_("undo-type", "Image resolution change"), NULL },
{ GIMP_UNDO_IMAGE_GRID, NC_("undo-type", "Grid"), NULL },
- { GIMP_UNDO_IMAGE_METADATA, NC_("undo-type", "Change metadata"), NULL },
{ GIMP_UNDO_IMAGE_COLORMAP, NC_("undo-type", "Change indexed palette"), NULL },
- { GIMP_UNDO_IMAGE_ATTRIBUTES, NC_("undo-type", "Changed attributes"), NULL },
++ { GIMP_UNDO_IMAGE_ATTRIBUTES, "GIMP_UNDO_IMAGE_ATTRIBUTES", NULL },
{ GIMP_UNDO_GUIDE, NC_("undo-type", "Guide"), NULL },
{ GIMP_UNDO_SAMPLE_POINT, NC_("undo-type", "Sample Point"), NULL },
{ GIMP_UNDO_DRAWABLE, NC_("undo-type", "Layer/Channel"), NULL },
{ GIMP_UNDO_DRAWABLE_MOD, NC_("undo-type", "Layer/Channel modification"), NULL },
{ GIMP_UNDO_MASK, NC_("undo-type", "Selection mask"), NULL },
- { GIMP_UNDO_ITEM_ATTRIBUTES, NC_("undo-type", "Changed attributes"), NULL },
++ { GIMP_UNDO_ITEM_ATTRIBUTES, "GIMP_UNDO_ITEM_ATTRIBUTES", NULL },
{ GIMP_UNDO_ITEM_REORDER, NC_("undo-type", "Reorder item"), NULL },
{ GIMP_UNDO_ITEM_RENAME, NC_("undo-type", "Rename item"), NULL },
{ GIMP_UNDO_ITEM_DISPLACE, NC_("undo-type", "Move item"), NULL },
diff --cc plug-ins/common/Makefile.am
index 4c2995c,a2d6e97..fc1568d
--- a/plug-ins/common/Makefile.am
+++ b/plug-ins/common/Makefile.am
@@@ -120,12 -117,11 +118,11 @@@ libexec_PROGRAMS =
grid \
guillotine \
hot \
+ iptc \
jigsaw \
lcms \
- lens-flare \
$(MAIL) \
max-rgb \
- metadata \
newsprint \
nl-filter \
oilify \
diff --cc plug-ins/common/gimprc.common
index fb30d1c,d0d8278..1311a53
--- a/plug-ins/common/gimprc.common
+++ b/plug-ins/common/gimprc.common
@@@ -74,12 -71,11 +72,11 @@@ gradient_map_RC = gradient-map.rc.
grid_RC = grid.rc.o
guillotine_RC = guillotine.rc.o
hot_RC = hot.rc.o
+iptc_RC = iptc.rc.o
jigsaw_RC = jigsaw.rc.o
lcms_RC = lcms.rc.o
- lens_flare_RC = lens-flare.rc.o
mail_RC = mail.rc.o
max_rgb_RC = max-rgb.rc.o
-metadata_RC = metadata.rc.o
newsprint_RC = newsprint.rc.o
nl_filter_RC = nl-filter.rc.o
oilify_RC = oilify.rc.o
diff --cc plug-ins/common/plugin-defs.pl
index 419b1f8,6a480f6..7ac6fd2
--- a/plug-ins/common/plugin-defs.pl
+++ b/plug-ins/common/plugin-defs.pl
@@@ -75,12 -72,11 +73,11 @@@
'grid' => { ui => 1 },
'guillotine' => {},
'hot' => { ui => 1 },
+ 'iptc' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'jigsaw' => { ui => 1 },
'lcms' => { ui => 1, gegl => 1, libs => 'LCMS_LIBS', cflags => 'LCMS_CFLAGS' },
- 'lens-flare' => { ui => 1 },
'mail' => { ui => 1, optional => 1 },
'max-rgb' => { ui => 1 },
- 'metadata' => { ui => 1, libs => 'GEXIV2_LIBS', cflags => 'GEXIV2_CFLAGS' },
'newsprint' => { ui => 1 },
'nl-filter' => { ui => 1 },
'oilify' => { ui => 1 },
diff --cc po-plug-ins/POTFILES.in
index ea39761,013d64b..cffeb8a
--- a/po-plug-ins/POTFILES.in
+++ b/po-plug-ins/POTFILES.in
@@@ -81,9 -78,9 +79,8 @@@ plug-ins/common/guillotine.
plug-ins/common/hot.c
plug-ins/common/jigsaw.c
plug-ins/common/lcms.c
- plug-ins/common/lens-flare.c
plug-ins/common/mail.c
plug-ins/common/max-rgb.c
-plug-ins/common/metadata.c
plug-ins/common/newsprint.c
plug-ins/common/nl-filter.c
plug-ins/common/oilify.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
