[gimp/soc-2011-gimpunitentry: 60/60] Merge git://git.gnome.org/gimp into soc-2011-gimpunitentry

[Enrico SchrÃder <eschroeder src gnome org>]

commit 273b8049d79b86ffdb5df19ecf4c1c376fd40d4e
Merge: f5758ba 50bf895
Author: Enrico SchroÌder <enni schroeder gmail com>
Date:   Tue Jul 12 23:46:22 2011 +0200

    Merge git://git.gnome.org/gimp into soc-2011-gimpunitentry

 NEWS                                               |    5 +
 app/actions/actions-types.h                        |    3 +-
 app/actions/dialogs-commands.c                     |   14 +-
 app/actions/dockable-commands.c                    |   31 +-
 app/actions/file-actions.c                         |   18 +-
 app/actions/file-commands.c                        |   22 +-
 app/actions/windows-commands.c                     |    1 -
 app/core/gimp-gui.c                                |   11 +
 app/core/gimp-gui.h                                |    2 +
 app/core/gimp-user-install.c                       |    1 +
 app/core/gimpimagefile.c                           |  112 +
 app/core/gimpimagefile.h                           |    1 +
 app/core/gimptagcache.c                            |    6 +-
 app/dialogs/dialogs.c                              |    1 -
 app/display/Makefile.am                            |    8 +-
 app/display/display-enums.c                        |   31 +
 app/display/display-enums.h                        |   12 +
 app/display/display-types.h                        |   29 +-
 app/display/gimpcanvaspath.c                       |   41 +-
 app/display/gimpcanvaspath.h                       |    2 +-
 app/display/gimpdisplayshell-dnd.c                 |   25 +-
 app/display/gimpdisplayshell-handlers.c            |    2 +-
 app/display/gimpdisplayshell-style.c               |   28 +
 app/display/gimpdisplayshell-style.h               |    5 +-
 app/display/gimpimagewindow.c                      |   53 +
 app/display/gimpimagewindow.h                      |   66 +-
 app/display/gimpmultiwindowstrategy.c              |   86 +
 app/display/gimpmultiwindowstrategy.h              |   54 +
 app/display/gimpnavigationeditor.c                 |   40 +-
 app/display/gimpnavigationeditor.h                 |    2 +
 app/display/gimpsinglewindowstrategy.c             |  119 +
 app/display/gimpsinglewindowstrategy.h             |   54 +
 app/display/gimpwindowstrategy.c                   |   91 +
 app/display/gimpwindowstrategy.h                   |   54 +
 app/gegl/gimpoperationcagecoefcalc.c               |    7 +-
 app/gegl/gimpoperationcagetransform.c              |   11 +-
 app/gui/gimpuiconfigurer.c                         |   10 +-
 app/gui/gui-vtable.c                               |   13 +
 app/tests.c                                        |   48 +-
 app/tests.h                                        |    6 +-
 app/tests/.gitignore                               |    1 +
 app/tests/Makefile.am                              |    3 +-
 app/tests/gimp-test-session-utils.c                |   14 +-
 app/tests/gimp-test-session-utils.h                |    3 +-
 app/tests/gimpdir/Makefile.am                      |   21 +-
 app/tests/gimpdir/gimprc-single-window             |   12 +
 .../{sessionrc-2-8 => sessionrc-2-8-multi-window}  |    0
 app/tests/gimpdir/sessionrc-2-8-single-window      |   60 +
 ...ssionrc-2-8 => sessionrc-expected-multi-window} |    0
 app/tests/gimpdir/sessionrc-expected-single-window |   60 +
 app/tests/test-session-2-6-compatibility.c         |    3 +-
 .../test-session-2-8-compatibility-multi-window.c  |    9 +-
 .../test-session-2-8-compatibility-single-window.c |   69 +
 app/tests/test-ui.c                                |    6 +
 app/tools/gimpbrushtool.c                          |    3 +-
 app/tools/gimpcagetool.c                           |    8 +-
 app/tools/gimpdrawtool.c                           |    2 +-
 app/tools/gimptransformtool.c                      |   42 +-
 app/tools/gimptransformtool.h                      |    3 -
 app/tools/tool_manager.c                           |  102 +-
 app/widgets/gimpdialogfactory.c                    |    1 -
 app/widgets/gimpdockbook.c                         |   46 +
 app/widgets/gimpdockbook.h                         |    3 +
 app/widgets/gimpdockcolumns.c                      |   55 +-
 app/widgets/gimpdockcolumns.h                      |    3 +
 app/widgets/gimpsessioninfo.c                      |  141 +-
 app/widgets/gimptooloptionseditor.c                |   10 +-
 app/widgets/gimptoolpreseteditor.c                 |   66 +-
 app/widgets/gimpviewrendererimagefile.c            |   36 +-
 configure.ac                                       |   32 +-
 devel-docs/tools/shooter.c                         |    5 +-
 libgimpwidgets/gimpenumstore.c                     |    2 +-
 libgimpwidgets/gimpintcombobox.c                   |    2 +-
 modules/Makefile.am                                |    6 +-
 modules/controller-dx-dinput.c                     |    3 +-
 modules/controller-linux-input.c                   |    8 +-
 ...icestore-hal.c => gimpinputdevicestore-gudev.c} |  271 +-
 plug-ins/common/file-svg.c                         |    1 +
 plug-ins/common/web-page.c                         |    1 +
 plug-ins/file-jpeg/jpeg-save.c                     |   48 +-
 plug-ins/file-jpeg/jpeg-settings.c                 |    8 +-
 plug-ins/file-jpeg/jpeg.c                          |    8 +-
 plug-ins/file-jpeg/jpeg.h                          |    8 +-
 plug-ins/file-uri/uri-backend-libcurl.c            |   53 +-
 plug-ins/file-uri/uri-backend-wget.c               |   61 +-
 plug-ins/gfig/gfig-dialog.c                        |   26 +-
 plug-ins/help-browser/dialog.c                     |    1 +
 plug-ins/pygimp/pygimp-item.c                      |    2 +-
 plug-ins/pygimp/pygimp-pdb.c                       |    2 +
 po-python/ca.po                                    |  203 +-
 po-python/ca valencia po                           |  101 +-
 po-tags/LINGUAS                                    |    1 +
 po-tags/el.po                                      |   29 +
 po-tips/LINGUAS                                    |    1 +
 po-tips/el.po                                      |  132 +
 po/POTFILES.in                                     |    2 +
 po/el.po                                           |10927 +++++++++-----------
 97 files changed, 7362 insertions(+), 6489 deletions(-)
---