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

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

commit 21dc7b9b99dc584e3d5cd986b3a7a6bdb4f124ed
Merge: 57090a5... df8ea32...
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Tue May 26 19:19:13 2009 +0200

    Merge branch 'ulf'
    
    * ulf:
      Fix help-id for "Canvas Size" (bug #583840)
      Update de po files (minor changes)
      Re-format some src files
      Update de translations (preferences)
    
    Conflicts:
    
    	src/menus/colors/info/borderaverage.xml
    	src/menus/colors/info/ccanalyse.xml
    	src/menus/colors/info/smooth_palette.xml

 po/de/concepts.po                                 |   65 ++--
 po/de/menus/colors.po                             |  158 +---------
 po/de/menus/colors/map.po                         |  370 ++++++++++-----------
 po/de/menus/image.po                              |  118 ++++----
 po/de/using/preferences.po                        |  157 ++++++----
 src/menus/colors/info/borderaverage.xml           |   25 +-
 src/menus/colors/info/ccanalyse.xml               |   30 +-
 src/menus/colors/info/histogram.xml               |   17 +-
 src/menus/colors/info/smooth_palette.xml          |   15 +-
 src/menus/colors/map/alienmap2.xml                |   60 ++--
 src/menus/colors/map/exchange.xml                 |   59 ++--
 src/menus/colors/map/gradientmap.xml              |   44 +--
 src/menus/colors/map/palettemap.xml               |   19 +-
 src/menus/colors/map/rearrange-colormap.xml       |   21 +-
 src/menus/colors/map/rotate-colormap.xml          |   71 ++--
 src/menus/colors/map/sample-colorize.xml          |    9 +-
 src/menus/image/canvas-size.xml                   |   69 +++--
 src/using/preferences/prefs-window-management.xml |    7 +-
 18 files changed, 568 insertions(+), 746 deletions(-)