[gimp/soc-2011-gimpunitentry: 30/30] Merge remote branch 'origin/master' into soc-2011-gimpunitentry

[Martin Nordholts <martinn src gnome org>]

commit 0aed474d605163f62bd661bff633980ea8be5c4e
Merge: 05770b2 bb39703
Author: Martin Nordholts <martinn src gnome org>
Date:   Mon Jun 6 16:52:25 2011 +0200

    Merge remote branch 'origin/master' into soc-2011-gimpunitentry

 NEWS                                       |   23 +-
 app/core/gimp-transform-resize.c           |    5 +-
 app/core/gimp-utils.h                      |    4 +
 app/dialogs/dialogs.c                      |   39 +-
 app/display/gimpcanvastransformpreview.c   |    4 +-
 app/display/gimpdisplayshell-grab.c        |    8 +-
 app/display/gimpdisplayshell-grab.h        |    8 +-
 app/display/gimpdisplayshell-tool-events.c |  102 +-
 app/display/gimpimagewindow.c              |  286 ++-
 app/gui/gui.c                              |    9 -
 app/paint/gimppaintoptions.c               |   59 +
 app/paint/gimppaintoptions.h               |    6 +
 app/paint/gimpperspectiveclone.c           |    5 +-
 app/tests/gimpdir/Makefile.am              |    1 +
 app/tests/gimpdir/sessionrc                |    3 +-
 app/tests/gimpdir/sessionrc-2-6            |    9 -
 app/tests/gimpdir/sessionrc-2-8            |    3 +-
 app/tests/gimpdir/sessionrc-expected       |    3 +-
 app/tests/gimpdir/sessionrc-expected-2-6   |   93 +
 app/tests/test-session-2-6-compatibility.c |    2 +-
 app/tools/gimpfreeselecttool.c             |   92 +-
 app/tools/gimprectangleselecttool.c        |   26 +-
 app/tools/gimpregionselecttool.c           |    9 +-
 app/tools/gimpselectiontool.c              |   12 +-
 app/tools/gimpselectiontool.h              |    1 +
 app/tools/gimptransformtool.c              |    3 +-
 app/tools/tool_manager.c                   |   41 +-
 app/widgets/Makefile.am                    |    2 +
 app/widgets/gimpdeviceinfo-coords.c        |    4 +-
 app/widgets/gimpdeviceinfo-coords.h        |    4 +-
 app/widgets/gimpdockable.c                 |   86 +-
 app/widgets/gimpdockable.h                 |    4 -
 app/widgets/gimpdockwindow.c               |  144 +-
 app/widgets/gimpdockwindow.h               |    3 -
 app/widgets/gimpoverlaychild.c             |    5 +-
 app/widgets/gimpsessioninfo-aux.c          |   26 +-
 app/widgets/gimpsessioninfo-aux.h          |    4 -
 app/widgets/gimpsessioninfo-book.c         |   20 +-
 app/widgets/gimpsessioninfo-dock.c         |   29 +-
 app/widgets/gimpsessioninfo-dock.h         |    3 +
 app/widgets/gimpsessioninfo-dockable.c     |    8 +-
 app/widgets/gimpsessioninfo.c              |   46 +-
 app/widgets/gimpsessioninfo.h              |    1 -
 app/widgets/gimpsessionmanaged.c           |  114 +
 app/widgets/gimpsessionmanaged.h           |   50 +
 app/widgets/gimptoolpreseteditor.c         |    2 +-
 app/widgets/gimpwidgets-utils.c            |   22 +
 app/widgets/gimpwidgets-utils.h            |    2 +
 app/widgets/widgets-types.h                |    1 +
 po-plug-ins/de.po                          | 5952 ++++++++++++++--------------
 po-python/de.po                            |  202 +-
 po-python/eo.po                            |  385 +-
 po-tags/LINGUAS                            |    1 +
 po-tags/de.po                              |   26 +
 po-tips/eo.po                              |  197 +-
 55 files changed, 4470 insertions(+), 3729 deletions(-)
---