[gimp-help-2: 3/3] Merge branch 'ulf'

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit 6924e96c310b9cf001a55e680df341d475f53d86
Merge: 72d38b8... b08a511...
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Sat May 9 13:13:41 2009 +0200

    Merge branch 'ulf'

 Makefile.am                            |   78 +-
 configure.ac                           |    1 +
 po/de/appendix.po                      |  311 +++---
 po/de/dialogs.po                       | 1823 +++++++++++++++++---------------
 src/appendix/bibliography.xml          |    7 +
 src/concepts/layer-modes.xml           |    9 +-
 src/dialogs/channel-dialog.xml         |   26 +-
 src/dialogs/color-dialog.xml           |   47 +-
 src/dialogs/document-dialog.xml        |   26 +-
 src/dialogs/edit-template-dialog.xml   |   44 +-
 src/dialogs/export-file-dialog.xml     |   40 +-
 src/dialogs/fonts-dialog.xml           |   23 +-
 src/dialogs/images-dialog.xml          |   28 +-
 src/dialogs/indexed-palette-dialog.xml |   62 +-
 src/dialogs/layer-dialog.xml           |   26 +-
 src/dialogs/palettes-dialog.xml        |  203 ++---
 src/dialogs/qmask.xml                  |   97 +-
 src/dialogs/templates-dialog.xml       |   34 +-
 18 files changed, 1474 insertions(+), 1411 deletions(-)