[gimp/soc-2009-dynamics: 23/23] Merge resolution

[Alexia Death <alexiade src gnome org>]

commit 210a4b5044243ccdf6c9d6622a491e9bf1d80a2f
Merge: 4e018ea... 7ce6757...
Author: Alexia Death <alexiadeath gmail com>
Date:   Sat Oct 17 21:42:02 2009 +0300

    Merge resolution

 INSTALL                                   |    4 +-
 app/actions/gradient-editor-actions.c     |    2 +-
 app/actions/window-commands.c             |    4 +-
 app/dialogs/about-dialog.c                |   15 +-
 app/dialogs/dialogs.c                     |    2 +-
 app/dialogs/file-open-location-dialog.c   |    3 +-
 app/dialogs/module-dialog.c               |   18 +-
 app/dialogs/palette-import-dialog.c       |    8 +-
 app/dialogs/preferences-dialog.c          |    2 +
 app/dialogs/resolution-calibrate-dialog.c |    2 +
 app/display/gimpcanvas.c                  |   63 +-
 app/display/gimpdisplay-foreach.c         |    2 +-
 app/display/gimpdisplayshell-appearance.c |   52 +-
 app/display/gimpdisplayshell-callbacks.c  |   17 +-
 app/display/gimpdisplayshell-cursor.c     |    2 +-
 app/display/gimpdisplayshell.c            |   12 +-
 app/display/gimpimagewindow.c             |   83 +-
 app/display/gimpstatusbar.c               |   45 +-
 app/gimp.rc                               |    2 -
 app/gui/gui.c                             |    4 +-
 app/paint/gimpheal.c                      |   13 +-
 app/sanity.c                              |    2 +-
 app/tools/gimpcolorpickertool.c           |    4 +-
 app/tools/gimplevelstool.c                |   45 +-
 app/tools/gimpmeasuretool.c               |    4 +-
 app/widgets/gimpblobeditor.c              |   46 +-
 app/widgets/gimpcellrendererdashes.c      |   37 +-
 app/widgets/gimpcellrendererviewable.c    |   20 +-
 app/widgets/gimpcolorbar.c                |   23 +-
 app/widgets/gimpcolorframe.c              |   35 +-
 app/widgets/gimpcolormapeditor.c          |    2 +
 app/widgets/gimpcombotagentry.c           |   17 +-
 app/widgets/gimpcontainerbox.c            |    2 +-
 app/widgets/gimpcontainergridview.c       |   21 +-
 app/widgets/gimpcontainerpopup.c          |   39 +-
 app/widgets/gimpcontainertreeview-dnd.c   |    7 +-
 app/widgets/gimpcontainertreeview.c       |   24 +-
 app/widgets/gimpcontrollereditor.c        |    2 +-
 app/widgets/gimpcontrollerlist.c          |    4 +-
 app/widgets/gimpcursor.c                  |    2 +
 app/widgets/gimpcurveview.c               |    7 +-
 app/widgets/gimpdasheditor.c              |    2 +
 app/widgets/gimpdatafactoryview.c         |    3 +-
 app/widgets/gimpdevicestatus.c            |    8 +-
 app/widgets/gimpdialogfactory.c           |   28 +-
 app/widgets/gimpdockable.c                |   23 +-
 app/widgets/gimpdockbook.c                |    2 +
 app/widgets/gimpdockseparator.c           |    2 +
 app/widgets/gimpeditor.c                  |    7 +-
 app/widgets/gimpfgbgeditor.c              |    4 +-
 app/widgets/gimpfgbgview.c                |    6 +-
 app/widgets/gimpgradienteditor.c          |    2 +
 app/widgets/gimphandlebar.c               |    4 +-
 app/widgets/gimphistogrameditor.c         |    5 +-
 app/widgets/gimphistogramview.c           |    2 +
 app/widgets/gimpmenudock.c                |    5 +-
 app/widgets/gimpmessagebox.c              |    6 +-
 app/widgets/gimpnavigationview.c          |   11 +-
 app/widgets/gimppaletteeditor.c           |    4 +-
 app/widgets/gimppaletteview.c             |   10 +-
 app/widgets/gimpprogressbox.c             |   10 +-
 app/widgets/gimpscalebutton.c             |    4 +-
 app/widgets/gimpsessioninfo.c             |    2 +-
 app/widgets/gimpsettingsbox.c             |    4 +-
 app/widgets/gimpstrokeeditor.c            |    8 +-
 app/widgets/gimptagentry.c                |    2 +-
 app/widgets/gimptagpopup.c                |    2 +
 app/widgets/gimptoolbox.c                 |   30 +-
 app/widgets/gimptooloptionseditor.c       |    2 +-
 app/widgets/gimpuimanager.c               |    2 +
 app/widgets/gimpview-popup.c              |    4 +-
 app/widgets/gimpview.c                    |   16 +-
 app/widgets/gimpviewrenderer.c            |    2 +-
 app/widgets/gimpwidgets-utils.c           |   19 +-
 app/widgets/gtkhwrapbox.c                 |    2 +
 app/widgets/gtkvwrapbox.c                 |    2 +
 app/widgets/gtkwrapbox.c                  |    2 +
 configure.ac                              |    6 +-
 libgimp/gimpbrushselectbutton.c           |   15 +-
 libgimp/gimpgradientselectbutton.c        |    2 +-
 libgimp/gimpprogressbar.c                 |   16 +-
 libgimp/gimpui.c                          |    4 +-
 libgimp/gimpzoompreview.c                 |    2 +
 libgimpwidgets/gimpcellrenderercolor.c    |   35 +-
 libgimpwidgets/gimpcellrenderertoggle.c   |   33 +-
 libgimpwidgets/gimpchainbutton.c          |   25 +-
 libgimpwidgets/gimpcolorarea.c            |   16 +-
 libgimpwidgets/gimpcolorbutton.c          |    2 +-
 libgimpwidgets/gimpcolorscale.c           |   74 +-
 libgimpwidgets/gimpcolorscales.c          |   22 +-
 libgimpwidgets/gimpcolorselect.c          |   67 +-
 libgimpwidgets/gimpframe.c                |   30 +-
 libgimpwidgets/gimpoffsetarea.c           |    7 +-
 libgimpwidgets/gimpoldwidgets.c           |   27 +-
 libgimpwidgets/gimppixmap.c               |   12 +-
 libgimpwidgets/gimppreview.c              |    2 +
 libgimpwidgets/gimppreviewarea.c          |   18 +-
 libgimpwidgets/gimpruler.c                |   96 +-
 libgimpwidgets/gimpscrolledpreview.c      |   50 +-
 libgimpwidgets/gimpsizeentry.c            |   35 +-
 libgimpwidgets/gimpunitmenu.c             |    2 +
 modules/color-selector-water.c            |   50 +-
 modules/display-filter-lcms.c             |    2 +-
 plug-ins/common/animation-play.c          |    2 +
 plug-ins/common/curve-bend.c              |    2 +-
 plug-ins/common/file-gih.c                |    6 +-
 plug-ins/common/file-png.c                |    2 +-
 plug-ins/common/filter-pack.c             |   10 +-
 plug-ins/common/gee-zoom.c                |    2 +-
 plug-ins/common/gee.c                     |    2 +-
 plug-ins/common/iwarp.c                   |   17 +-
 plug-ins/file-ico/ico-dialog.c            |    5 +-
 plug-ins/flame/flame.c                    |    4 +-
 plug-ins/help-browser/dialog.c            |   14 +-
 plug-ins/ifs-compose/ifs-compose.c        |  276 +-
 plug-ins/imagemap/imap_edit_area_info.c   |   62 +-
 plug-ins/imagemap/imap_grid.c             |    9 +-
 plug-ins/imagemap/imap_preview.c          |    2 +-
 plug-ins/imagemap/imap_selection.c        |   13 +-
 plug-ins/imagemap/imap_settings.c         |    4 +-
 plug-ins/imagemap/imap_statusbar.c        |    4 +-
 plug-ins/print/print-preview.c            |   77 +-
 plug-ins/pygimp/gimpui.override           |    4 +-
 plug-ins/script-fu/script-fu-console.c    |    2 +
 plug-ins/script-fu/script-fu-interface.c  |    9 +-
 po-plug-ins/is.po                         |10471 ++++++++++++++++++++++++++---
 po-python/is.po                           |  243 +-
 po/is.po                                  | 6194 ++++++++++++++----
 128 files changed, 15737 insertions(+), 3294 deletions(-)
---