[gimp/soc-2009-dynamics: 93/93] Merge branch 'master' into soc-2009-dynamics

[Alexia Death <alexiade src gnome org>]

commit 7cbf10b886f13e7e3b385d00549539634a831ed2
Merge: daa3544... cabcc59...
Author: Alexia Death <alexiadeath gmail com>
Date:   Tue Jul 21 21:17:37 2009 +0300

    Merge branch 'master' into soc-2009-dynamics

 app/actions/palettes-commands.c          |    4 +-
 app/config/gimpguiconfig.c               |   23 ++++-----
 app/config/gimpguiconfig.h               |    1 -
 app/config/gimprc-blurbs.h               |    9 ---
 app/core/gimp-transform-resize.c         |    6 ++
 app/core/gimpcurve.c                     |    4 +-
 app/core/gimpdrawable-curves.c           |    4 +-
 app/core/gimpdrawable.c                  |   12 +---
 app/core/gimpgradient-load.c             |    8 ++-
 app/core/gimpimagemap.c                  |    6 --
 app/core/gimplayer.c                     |    4 +-
 app/core/gimpparamspecs-duplicate.c      |    4 +-
 app/core/gimpparamspecs.c                |    4 +-
 app/dialogs/preferences-dialog.c         |    7 ---
 app/dialogs/quit-dialog.c                |    4 +-
 app/display/gimpdisplayshell-progress.c  |    9 +--
 app/display/gimpdisplayshell-title.c     |    6 +--
 app/display/gimpdisplayshell.c           |   17 ++++++-
 app/gegl/gimpdesaturateconfig.c          |    4 +-
 app/gimp-log.c                           |    3 +-
 app/gimp-log.h                           |    4 +-
 app/widgets/gimpcolormapeditor.c         |    4 +-
 app/widgets/gimpdialogfactory.c          |   12 +++-
 app/widgets/gimpimagedock.c              |   41 +--------------
 app/widgets/gimpselectioneditor.c        |    4 +-
 app/widgets/gimptoolbox.c                |    4 +-
 app/widgets/gimpuimanager.c              |    4 +-
 data/tags/gimp-tags-default.xml.in       |   38 +++++++-------
 docs/gimprc.5.in                         |   14 -----
 etc/gimprc                               |   12 ----
 libgimp/gimpexport.c                     |   75 +++++++++++++++++++++++++++
 libgimp/gimpexport.h                     |   12 +++--
 libgimp/gimpui.def                       |    2 +
 libgimpconfig/gimpscanner.c              |    4 ++
 libgimpwidgets/gimpoldwidgets.c          |    1 +
 plug-ins/common/file-aa.c                |   20 +------
 plug-ins/common/file-cel.c               |    2 +-
 plug-ins/common/file-csource.c           |   20 +------
 plug-ins/common/file-dicom.c             |    2 +-
 plug-ins/common/file-gbr.c               |   20 +------
 plug-ins/common/file-gif-save.c          |   20 +------
 plug-ins/common/file-gih.c               |   20 +------
 plug-ins/common/file-header.c            |    2 +-
 plug-ins/common/file-html-table.c        |   18 +------
 plug-ins/common/file-mng.c               |   81 ++++++++++++++++++-----------
 plug-ins/common/file-pat.c               |   20 +------
 plug-ins/common/file-pcx.c               |    2 +-
 plug-ins/common/file-pix.c               |    2 +-
 plug-ins/common/file-png.c               |   20 +------
 plug-ins/common/file-pnm.c               |   26 ++-------
 plug-ins/common/file-ps.c                |   21 +-------
 plug-ins/common/file-psp.c               |   20 +------
 plug-ins/common/file-raw.c               |   18 +------
 plug-ins/common/file-sunras.c            |   20 +------
 plug-ins/common/file-svg.c               |   13 +++++
 plug-ins/common/file-tga.c               |   20 +------
 plug-ins/common/file-tiff-save.c         |   20 +------
 plug-ins/common/file-wmf.c               |   12 ++++
 plug-ins/common/file-xbm.c               |   20 +------
 plug-ins/common/file-xmc.c               |   21 +-------
 plug-ins/common/file-xpm.c               |   20 +------
 plug-ins/common/file-xwd.c               |    2 +-
 plug-ins/common/gradient-map.c           |    4 +-
 plug-ins/common/lcms.c                   |    8 +++
 plug-ins/common/mail.c                   |    4 ++
 plug-ins/common/sphere-designer.c        |   18 ++++--
 plug-ins/file-bmp/bmp-write.c            |   18 +------
 plug-ins/file-bmp/bmp.c                  |    3 +-
 plug-ins/file-fits/fits.c                |    2 +-
 plug-ins/file-fli/fli-gimp.c             |   20 +------
 plug-ins/file-ico/ico-dialog.c           |   20 ++------
 plug-ins/file-jpeg/jpeg-exif.c           |    4 ++
 plug-ins/file-jpeg/jpeg-save.c           |   19 +------
 plug-ins/file-jpeg/jpeg.c                |    2 +-
 plug-ins/file-psd/psd-save.c             |    2 +-
 plug-ins/file-psd/psd.c                  |    2 +-
 plug-ins/file-sgi/sgi.c                  |   20 +------
 plug-ins/file-xjt/xjt.c                  |   22 +-------
 plug-ins/flame/flame.c                   |    4 +-
 plug-ins/flame/libifs.c                  |   37 --------------
 plug-ins/flame/libifs.h                  |    1 -
 plug-ins/gradient-flare/gradient-flare.c |    4 +-
 plug-ins/metadata/xmp-parse.c            |    5 ++
 po-tags/sv.po                            |   15 +++--
 po/POTFILES.in                           |    1 +
 85 files changed, 388 insertions(+), 699 deletions(-)
---