[gimp/soc-2010-cage-2: 42/43] Merge remote branch 'origin/master' into soc-2010-cage-2

[Alexia Death <alexiade src gnome org>]

commit dfd5470a2e83fc7363961f830a0b4353b6f5767a
Merge: 040c415 91ceae6
Author: Alexia Death <alexiadeath gmail com>
Date:   Thu Nov 4 20:00:36 2010 +0200

    Merge remote branch 'origin/master' into soc-2010-cage-2

 app/dialogs/convert-dialog.c           |    2 +-
 app/paint/gimppaintoptions.c           |    2 +-
 app/pdb/Makefile.am                    |    1 +
 app/pdb/context-cmds.c                 |    6 +-
 app/pdb/image-select-cmds.c            |  759 +++++++++
 app/pdb/internal-procs.c               |    3 +-
 app/pdb/internal-procs.h               |    1 +
 app/pdb/item-cmds.c                    |   65 -
 app/pdb/selection-cmds.c               |   18 +-
 app/tests/Makefile.am                  |    6 +
 app/tests/test-tools.c                 |   67 +-
 app/tools/gimp-tools.c                 |   16 +-
 app/tools/gimpairbrushtool.c           |   31 +-
 app/tools/gimpblendoptions.c           |   62 +-
 app/tools/gimpbucketfilloptions.c      |   21 +-
 app/tools/gimpclonetool.c              |    3 +-
 app/tools/gimpcoloroptions.c           |   25 +-
 app/tools/gimpconvolvetool.c           |   18 +-
 app/tools/gimpdodgeburntool.c          |   18 +-
 app/tools/gimpinkoptions-gui.c         |  111 +-
 app/tools/gimppaintoptions-gui.c       |  146 +-
 app/tools/gimppaintoptions-gui.h       |    3 -
 app/tools/gimpperspectiveclonetool.c   |    3 +-
 app/tools/gimprectangleoptions.c       |   17 +
 app/tools/gimprectangleoptions.h       |    5 +
 app/tools/gimprectangleselectoptions.c |   17 +-
 app/tools/gimpregionselectoptions.c    |   18 +-
 app/tools/gimpselectionoptions.c       |   17 +-
 app/tools/gimpsmudgetool.c             |   18 +-
 app/tools/gimptextoptions.c            |   14 +-
 app/tools/gimptooloptions-gui.c        |    2 +-
 app/tools/gimptransformoptions.c       |   66 +-
 app/widgets/Makefile.am                |    2 +
 app/widgets/gimpfilleditor.c           |    3 +-
 app/widgets/gimppropwidgets.c          |  327 ++++
 app/widgets/gimppropwidgets.h          |   10 +
 app/widgets/gimpspinscale.c            |  430 +++++
 app/widgets/gimpspinscale.h            |   54 +
 app/widgets/gimptooloptionseditor.c    |    6 +-
 app/widgets/gimpviewablebox.c          |  103 +-
 app/widgets/gimpviewablebox.h          |   12 +
 app/widgets/gimpwidgets-constructors.c |   34 +-
 app/widgets/gimpwidgets-utils.c        |   20 +
 app/widgets/gimpwidgets-utils.h        |    5 +-
 configure.ac                           |    8 +
 libgimp/Makefile.am                    |    2 +
 libgimp/gimp.def                       |    8 +-
 libgimp/gimp_pdb.h                     |    1 +
 libgimp/gimpcontext_pdb.c              |   19 +-
 libgimp/gimpimageselect_pdb.c          |  408 +++++
 libgimp/gimpimageselect_pdb.h          |   79 +
 libgimp/gimpitem_pdb.c                 |   37 -
 libgimp/gimpitem_pdb.h                 |   60 +-
 libgimp/gimpselection_pdb.c            |    6 +-
 libgimpbase/gimpbase.def               |    1 +
 libgimpbase/gimpunit.c                 |  138 ++
 libgimpbase/gimpunit.h                 |   61 +-
 libgimpwidgets/gimpscaleentry.c        |   31 +-
 libgimpwidgets/gimpunitmenu.c          |  179 +--
 libgimpwidgets/gimpunitstore.h         |   12 +-
 modules/color-selector-wheel.c         |   24 -
 plug-ins/common/.gitignore             |    2 +
 plug-ins/common/Makefile.am            |   22 +
 plug-ins/common/cml-explorer.c         |   76 +-
 plug-ins/common/file-pdf-load.c        |   15 +-
 plug-ins/common/gimprc.common          |    1 +
 plug-ins/common/lcms.c                 |    2 +-
 plug-ins/common/plugin-defs.pl         |    2 +-
 plug-ins/common/sphere-designer.c      |   54 +-
 plug-ins/file-xjt/xjt.c                |    3 +-
 plug-ins/lighting/lighting-image.c     |   13 +-
 plug-ins/lighting/lighting-image.h     |    7 +-
 plug-ins/lighting/lighting-preview.c   |  154 +-
 plug-ins/lighting/lighting-preview.h   |   10 -
 plug-ins/lighting/lighting-ui.c        |    6 +-
 plug-ins/lighting/lighting-ui.h        |    1 -
 plug-ins/pygimp/pygimp-vectors.c       |    2 +-
 po-plug-ins/POTFILES.in                |    1 +
 po-script-fu/br.po                     |  405 +++--
 po/POTFILES.in                         |    1 +
 po/ar.po                               | 2074 ++++++++++++-----------
 po/br.po                               | 2907 ++++++++++++++------------------
 po/ru.po                               | 1603 +++++++++---------
 tools/pdbgen/Makefile.am               |    1 +
 tools/pdbgen/groups.pl                 |    1 +
 tools/pdbgen/pdb/context.pdb           |   20 +-
 tools/pdbgen/pdb/image_select.pdb      |  433 +++++
 tools/pdbgen/pdb/item.pdb              |   43 +-
 tools/pdbgen/pdb/selection.pdb         |    6 +-
 89 files changed, 6931 insertions(+), 4575 deletions(-)
---