From d302c2222cc99d56873bbd5d0621f357a4470581 Mon Sep 17 00:00:00 2001 From: Ari Pollak Date: Wed, 11 Aug 2010 01:27:39 -0400 Subject: [PATCH] Imported Upstream version 2.6.8 --- ChangeLog | 704 + Makefile.in | 287 +- NEWS | 45 +- aclocal.m4 | 384 +- app/Makefile.in | 232 +- app/actions/Makefile.in | 74 +- app/base/Makefile.in | 74 +- app/composite/Makefile.in | 114 +- app/config/Makefile.in | 98 +- app/core/Makefile.in | 74 +- app/core/gimplayer.c | 11 +- app/dialogs/Makefile.in | 74 +- app/display/Makefile.in | 74 +- app/display/gimpdisplayshell-selection.c | 3 +- app/file/Makefile.in | 74 +- app/gegl/Makefile.in | 74 +- app/gui/Makefile.in | 74 +- app/menus/Makefile.in | 74 +- app/paint-funcs/Makefile.in | 74 +- app/paint/Makefile.in | 74 +- app/paint/gimpheal.c | 13 +- app/pdb/Makefile.in | 74 +- app/plug-in/Makefile.in | 74 +- app/text/Makefile.in | 74 +- app/tools/Makefile.in | 74 +- app/tools/gimpaligntool.c | 2 +- app/tools/gimpfreeselecttool.c | 5 +- app/vectors/Makefile.in | 74 +- app/widgets/Makefile.in | 74 +- app/widgets/gimphelp-ids.h | 1 + app/widgets/gimpimagedock.c | 14 + app/widgets/gimplayertreeview.c | 3 +- app/xcf/Makefile.in | 74 +- compile | 17 +- configure | 735 +- configure.in | 4 +- cursors/Makefile.in | 44 +- data/Makefile.in | 132 +- data/brushes/Makefile.in | 83 +- data/environ/Makefile.in | 83 +- data/gradients/Makefile.in | 83 +- data/images/Makefile.in | 83 +- data/interpreters/Makefile.in | 83 +- data/palettes/Makefile.in | 83 +- data/patterns/Makefile.in | 83 +- data/tips/Makefile.in | 83 +- data/tips/gimp-tips.xml | 4 +- depcomp | 87 +- desktop/Makefile.in | 238 +- devel-docs/Makefile.in | 132 +- devel-docs/app/Makefile.in | 44 +- devel-docs/libgimp/Makefile.in | 44 +- devel-docs/libgimpbase/Makefile.in | 44 +- devel-docs/libgimpbase/html/index.html | 2 +- .../html/libgimpbase-gimpbasetypes.html | 24 +- .../libgimpbase/html/libgimpbase-gimpenv.html | 24 +- .../html/libgimpbase-gimplimits.html | 4 +- .../html/libgimpbase-gimpmemsize.html | 12 +- .../html/libgimpbase-gimprectangle.html | 22 +- .../html/libgimpbase-gimpunit.html | 14 +- .../html/libgimpbase-gimputils.html | 76 +- .../html/libgimpbase-gimpversion.html | 4 +- devel-docs/libgimpbase/xml/gimpversion.xml | 4 +- devel-docs/libgimpcolor/Makefile.in | 44 +- devel-docs/libgimpconfig/Makefile.in | 44 +- devel-docs/libgimpmath/Makefile.in | 44 +- devel-docs/libgimpmodule/Makefile.in | 44 +- devel-docs/libgimpthumb/Makefile.in | 44 +- devel-docs/libgimpwidgets/Makefile.in | 44 +- devel-docs/tools/Makefile.in | 86 +- docs/Makefile.in | 225 +- etc/Makefile.in | 83 +- install-sh | 5 +- libgimp/Makefile.in | 136 +- libgimpbase/Makefile.in | 160 +- libgimpbase/gimpversion.h | 4 +- libgimpcolor/Makefile.in | 160 +- libgimpconfig/Makefile.in | 136 +- libgimpmath/Makefile.in | 136 +- libgimpmodule/Makefile.in | 136 +- libgimpthumb/Makefile.in | 148 +- libgimpwidgets/Makefile.in | 136 +- m4macros/Makefile.in | 83 +- menus/Makefile.in | 83 +- missing | 49 +- modules/Makefile.in | 156 +- modules/color-selector-cmyk-lcms.c | 25 +- plug-ins/Makefile.in | 132 +- plug-ins/color-rotate/Makefile.in | 195 +- plug-ins/color-rotate/images/Makefile.in | 44 +- plug-ins/common/Makefile.in | 158 +- plug-ins/common/file-gbr.c | 17 +- plug-ins/common/file-pat.c | 15 + plug-ins/common/file-pcx.c | 15 +- plug-ins/common/grid.c | 68 +- plug-ins/file-bmp/Makefile.in | 130 +- plug-ins/file-bmp/bmp-read.c | 36 +- plug-ins/file-faxg3/Makefile.in | 130 +- plug-ins/file-fits/Makefile.in | 130 +- plug-ins/file-fli/Makefile.in | 130 +- plug-ins/file-ico/Makefile.in | 146 +- plug-ins/file-jpeg/Makefile.in | 142 +- plug-ins/file-psd/Makefile.in | 130 +- plug-ins/file-psd/psd-load.c | 97 +- plug-ins/file-psd/psd.h | 24 +- plug-ins/file-sgi/Makefile.in | 130 +- plug-ins/file-sgi/sgi-lib.c | 4 +- plug-ins/file-sgi/sgi.c | 50 +- plug-ins/file-uri/Makefile.in | 130 +- plug-ins/file-xjt/Makefile.in | 130 +- plug-ins/flame/Makefile.in | 130 +- plug-ins/fractal-explorer/Makefile.in | 195 +- .../fractal-explorer/examples/Makefile.in | 83 +- plug-ins/gfig/Makefile.in | 195 +- plug-ins/gfig/gfig-examples/Makefile.in | 83 +- plug-ins/gfig/images/Makefile.in | 44 +- plug-ins/gimpressionist/Brushes/Makefile.in | 83 +- plug-ins/gimpressionist/Makefile.in | 195 +- plug-ins/gimpressionist/Paper/Makefile.in | 83 +- plug-ins/gimpressionist/Presets/Makefile.in | 83 +- plug-ins/gradient-flare/Makefile.in | 195 +- plug-ins/gradient-flare/flares/Makefile.in | 83 +- plug-ins/help-browser/Makefile.in | 130 +- plug-ins/help/Makefile.in | 142 +- plug-ins/ifs-compose/Makefile.in | 130 +- plug-ins/imagemap/Makefile.in | 195 +- plug-ins/imagemap/images/Makefile.in | 44 +- plug-ins/lighting/Makefile.in | 195 +- plug-ins/lighting/images/Makefile.in | 44 +- plug-ins/map-object/Makefile.in | 130 +- plug-ins/map-object/map-object-shade.c | 2 +- plug-ins/maze/Makefile.in | 130 +- plug-ins/metadata/Makefile.in | 166 +- plug-ins/pagecurl/Makefile.in | 130 +- plug-ins/print/Makefile.in | 130 +- plug-ins/print/print-settings.c | 6 + plug-ins/pygimp/Makefile.in | 232 +- plug-ins/pygimp/plug-ins/Makefile.in | 133 +- plug-ins/pygimp/pygimp-drawable.c | 3 +- plug-ins/pygimp/pygimp-pdb.c | 10 +- plug-ins/script-fu/Makefile.in | 195 +- plug-ins/script-fu/ftx/Makefile.in | 74 +- plug-ins/script-fu/scripts/Makefile.in | 171 +- plug-ins/script-fu/scripts/images/Makefile.in | 83 +- plug-ins/script-fu/tinyscheme/Makefile.in | 74 +- plug-ins/selection-to-path/Makefile.in | 130 +- plug-ins/twain/Makefile.in | 169 +- plug-ins/win-snap/Makefile.in | 130 +- po-libgimp/cs.po | 102 +- po-libgimp/el.po | 2031 +- po-libgimp/en_GB.po | 515 +- po-libgimp/eu.po | 8 +- po-libgimp/it.po | 204 +- po-libgimp/ja.po | 31 +- po-libgimp/nn.po | 673 +- po-libgimp/ro.po | 16 +- po-libgimp/zh_CN.po | 5 +- po-plug-ins/cs.po | 1325 +- po-plug-ins/en_GB.po | 12330 ++++++------ po-plug-ins/fr.po | 427 +- po-plug-ins/it.po | 208 +- po-plug-ins/ja.po | 3283 +++- po-plug-ins/nn.po | 15630 ++++++++-------- po-plug-ins/ro.po | 1899 +- po-plug-ins/zh_CN.po | 25 +- po-python/cs.po | 150 +- po-python/el.po | 338 +- po-python/en_GB.po | 140 +- po-python/ja.po | 49 +- po-python/nn.po | 90 +- po-python/ro.po | 11 +- po-script-fu/cs.po | 208 +- po-script-fu/el.po | 3579 ++-- po-script-fu/en_GB.po | 389 +- po-script-fu/fr.po | 30 +- po-script-fu/ja.po | 41 +- po-script-fu/nn.po | 600 +- po-script-fu/ro.po | 385 +- po-script-fu/zh_CN.po | 8 +- po-tips/en_GB.po | 213 +- po-tips/ja.po | 17 +- po-tips/ro.po | 313 +- po/ChangeLog | 4 + po/cs.po | 700 +- po/en_GB.po | 4171 +++-- po/fr.po | 85 +- po/it.po | 56 +- po/ja.po | 628 +- po/nn.po | 5806 +++--- po/pl.po | 2251 +-- po/ro.po | 140 +- po/ru.po | 1658 +- po/zh_CN.po | 46 +- py-compile | 36 +- themes/Default/Makefile.in | 171 +- themes/Default/images/Makefile.in | 171 +- themes/Default/images/preferences/Makefile.in | 83 +- themes/Makefile.in | 132 +- themes/Small/Makefile.in | 83 +- tools/Makefile.in | 208 +- tools/gimptool.c | 2 +- tools/pdbgen/Makefile.in | 44 +- 202 files changed, 42745 insertions(+), 33450 deletions(-) diff --git a/ChangeLog b/ChangeLog index fc6e4fcc69..5c14fee6ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,707 @@ +commit 31b47c749ac4097be3c496bb860889fbece92b23 +Author: Sven Neumann +Date: Thu Dec 10 22:15:56 2009 +0100 + + correct gimp_interface_age + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit c54b53da5589a0eadf5fd2c8d95bf9d01ad77d34 +Author: Nils Philippsen +Date: Wed Dec 9 17:11:21 2009 +0100 + + SGI: allocate memory more consistently + + Allocate memory for both pixels and rows in the same way to make the + code easier understandable. + (cherry picked from commit b7ae59e9a470fa6e7cfdade1613729c94c3e3a5e) + + plug-ins/file-sgi/sgi.c | 24 +++++++++++------------- + 1 files changed, 11 insertions(+), 13 deletions(-) + +commit b428adfa9f24eceba2066f656f495b68480f6101 +Author: Simon Budig +Date: Wed Dec 9 16:05:05 2009 +0100 + + SGI: fix out of bounds writes + + The functions read_rle8() and read_rle16() didn't check if the + addresses + to which they wrote are in bounds when expanding runlength encoded + data. + (cherry picked from commit 4d9724f2f67bca4005ca50c22afccd7bf30cc2e8) + + plug-ins/file-sgi/sgi-lib.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +commit 88dfad9dc8bd9a20b46b1c3824634c969ef43986 +Author: Nils Philippsen +Date: Mon Dec 7 16:21:44 2009 +0100 + + SGI: cast allocation calculations + + In order to avoid overflows when calculating needed memory, cast the + first variable used into a large enough type so the whole calculation + is + done in that type. + (cherry picked from commit 838be627be38d3ff25fddf7af16f0c98ddf4cc04) + + plug-ins/file-sgi/sgi.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 611bad86d2c05743c67c5066fb3eb5bb89b12b50 +Author: Nils Philippsen +Date: Wed Dec 9 15:43:28 2009 +0100 + + SGI: sanitize input data + + Refuse nonsensical xsize, ysize, zsize values. + (cherry picked from commit daaf1d2b97c74271d9f8cc517f16b53d0089e094) + + plug-ins/file-sgi/sgi.c | 22 ++++++++++++++++++++++ + 1 files changed, 22 insertions(+), 0 deletions(-) + +commit aee2bc35febf336d6b9ddba0c0a9d2883be8fd21 +Author: Nils Philippsen +Date: Tue Dec 8 17:44:54 2009 +0100 + + PAT: sanitize input data + + Guard against bogus values of ph.width, ph.height and document + why there + are no allocation overflows. + (cherry picked from commit 5aa82f3b6d55280012efc6973c799a46b2ad5d75) + + plug-ins/common/file-pat.c | 15 +++++++++++++++ + 1 files changed, 15 insertions(+), 0 deletions(-) + +commit aecccbc62cdb0e0a287502fbf34b98e2371b69b4 +Author: Nils Philippsen +Date: Tue Dec 8 16:36:10 2009 +0100 + + GBR: more input data sanitation + + Guard against bh.width or bh.height > GIMP_MAX_IMAGE_SIZE, only allow + valid values of bh.bytes. + (cherry picked from commit b053021a2938d5967edfc966470bfac9257fc03a) + + plug-ins/common/file-gbr.c | 5 ++++- + 1 files changed, 4 insertions(+), 1 deletions(-) + +commit 343651e87f8a4227b02a34fbff4188b519417de5 +Author: Nils Philippsen +Date: Fri Dec 4 11:17:21 2009 +0100 + + GBR: sanitize input data + + Guard against bogus zero width, height, bytes and allocation + overflows. + (cherry picked from commit 869dcd7be1c1ec991256ba079f670574f1e57b90) + + plug-ins/common/file-gbr.c | 14 +++++++++++++- + 1 files changed, 13 insertions(+), 1 deletions(-) + +commit aaf0dfe5306f8a6bf66c927fa6c5148d9ce53c36 +Author: Nils Philippsen +Date: Wed Dec 2 15:12:17 2009 +0100 + + PCX: Avoid allocation overflows. + + Multiplying gint values may overflow unless cast into a larger type. + (cherry picked from commit a9671395f6573e90316a9d748588c5435216f6ce) + + plug-ins/common/file-pcx.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 5bc9aaf753eae6999fb1497e6dd19e586016e193 +Author: Nils Philippsen +Date: Tue Dec 1 15:31:52 2009 +0100 + + PCX: sanitize input data + + Harden PCX plugin against bad width, height. + (cherry picked from commit ed7f48be05d233607460ce331a5c07ebfa5830fa) + + plug-ins/common/file-pcx.c | 7 +++++++ + 1 files changed, 7 insertions(+), 0 deletions(-) + +commit 864d7cbc655fbbaa6e98780c7b3aa6fbc6f96289 +Author: Simon Budig +Date: Wed Dec 9 23:01:21 2009 +0100 + + further NEWS updates + + NEWS | 22 ++++++++++++++++++++++ + 1 files changed, 22 insertions(+), 0 deletions(-) + +commit c2da042234d89caa5689d1d8a97b3c11b1eb0ad9 +Author: Simon Budig +Date: Wed Dec 9 22:49:34 2009 +0100 + + Start collecting release info in NEWS + + NEWS | 20 ++++++++++++++++++++ + 1 files changed, 20 insertions(+), 0 deletions(-) + +commit 46c91ebc2fead486b2b8849bacb7d91085c5aad6 +Author: Martin Nordholts +Date: Tue Dec 8 22:27:32 2009 +0100 + + Bug 604078 - Crash when pressing Backspace with Free Select Tool + + Make sure we never call gimp_free_select_tool_remove_last_segment() + with priv->n_segment_indices being negative, and increase robustness + of the code in general. + + Note that we always halt the tool when backspace is pressed and there + are no vertices left. This is to minimize the risk of ending up in an + invalid tool state. + (cherry picked from commit c7a5195bdf42aa194fed640943ada8d2114c4218) + + app/tools/gimpfreeselecttool.c | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +commit df956417c42747f9512089e8faa084e74b6d0fa4 +Author: Alexandre Prokoudine +Date: Wed Dec 2 05:07:47 2009 +0300 + + Updated Russian translation for 2.6 + + po/ru.po | 1658 + +++++++++++++++++++++++++++++++++++++++++++++++--------------- + 1 files changed, 1276 insertions(+), 382 deletions(-) + +commit ba14f4d7b5679b2835046f0e572557497cb0af33 +Author: Marco Ciampa +Date: Mon Nov 30 12:20:59 2009 +0100 + + Small fix in italian translation + + po/it.po | 56 ++++++++++++++++++++++++++++---------------------------- + 1 files changed, 28 insertions(+), 28 deletions(-) + +commit 0403a4c33b16dad25568d50603d3487879d90e00 +Author: Marco Ciampa +Date: Thu Aug 20 23:03:01 2009 +0200 + + Small fix in italian translation + + po-plug-ins/it.po | 208 + ++++++++++++++++++++++++++-------------------------- + 1 files changed, 104 insertions(+), 104 deletions(-) + +commit acc37a4e5d08c0f97920cd1b6bd757f126cafb45 +Author: Michael Natterer +Date: Tue Nov 24 14:49:17 2009 +0100 + + Bug 602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing + and Horizontal/Vertical Offset are reversed + + Revert commits bc099a98f306c3246a3ca2fd950d6f1af056e4c4 and + c77781de8927bac39817424ae5c732ad3b7fe343 from Jul 27 2006; + also changed refval boundaries of the "width" size entries + in the spirit of the original fix, only reversed. + + Rationale: the "horizontal" parameters all have to affect the + horizontal *lines*, so have an effect in *vertical* direction. + + Will commit a label change on top to clarify this. + (cherry picked from commit 028b66beba66dd6b1fe0a9a6b825034d3b971b5a) + + plug-ins/common/grid.c | 68 + ++++++++++++++++++++++++------------------------ + 1 files changed, 34 insertions(+), 34 deletions(-) + +commit 88eccea84aa375197cc04a2a0e2e29debb56bfa5 +Author: Simon Budig +Date: Tue Nov 17 00:41:39 2009 +0100 + + Harden the PSD plugin against integer overflows. + + Issues discovered by Stefan Cornelius, Secunia Research, advisory + SA37232 + and CVE identifier CVE-2009-3909. Fixes bug #600741. + (cherry picked from commit 9cc8d78ff33b7a36852b74e64b427489cad44d0e) + + plug-ins/file-psd/psd-load.c | 65 + ++++++++++++++++++++++++++++++++++++++++-- + 1 files changed, 62 insertions(+), 3 deletions(-) + +commit 687ec47914ec08d6e460918cb641c196d80140a3 +Author: Simon Budig +Date: Tue Nov 17 01:12:19 2009 +0100 + + Fix the PSD structs to use signed ints for bounding box coordinates. + (cherry picked from commit 0e440cb6d4d6ee029667363d244aff61b154c33c) + + plug-ins/file-psd/psd-load.c | 32 ++++++++++++++++---------------- + plug-ins/file-psd/psd.h | 24 ++++++++++++------------ + 2 files changed, 28 insertions(+), 28 deletions(-) + +commit 153ae579f7e7508d7a5b95bd569e91890f6b666e +Author: Nils Philippsen +Date: Mon Nov 16 18:16:38 2009 +0100 + + Ensure valid bit depths when reading BMP files. + (cherry picked from commit 16e6a37687bb4b9748c5a5d166d90f5d5bd2e9f3) + + plug-ins/file-bmp/bmp-read.c | 19 ++++++++++++++++++- + 1 files changed, 18 insertions(+), 1 deletions(-) + +commit 6e8ff603a2ee6a0940373723d1f075930dfd3ce0 +Author: Nils Philippsen +Date: Mon Nov 16 17:16:09 2009 +0100 + + Use more defensive coding in plausibility check. + + Use an equivalent division instead of multiplying values and + checking if + they are more than G_MAXINT32, because divisions cannot overflow. + (cherry picked from commit f63ba36dd9cc01ca6da83fa05ddd12419ad8953e) + + plug-ins/file-bmp/bmp-read.c | 6 +++--- + 1 files changed, 3 insertions(+), 3 deletions(-) + +commit 0214e1ff271a5310731de81d00450a92d9bf0fcd +Author: Nils Philippsen +Date: Mon Nov 16 17:15:32 2009 +0100 + + Make plausibility check easier to understand. + + Explicitly check that Bitmap_Head.biHeight is not G_MININT32 + instead of relying on ABS(G_MININT32) being negative. + (cherry picked from commit 43d57c666346320436a0b668de5525387952784e) + + plug-ins/file-bmp/bmp-read.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +commit f05ea433536399963fb493c30f27c928259a21d8 +Author: Sven Neumann +Date: Sat Nov 14 16:50:42 2009 +0100 + + Bug 601891 - gimp_image_get_selection returns None + + The code used to make the assumption that the selection mask was + a layer. Actually it is a channel and changing the code accordingly + fixes the reported problem. + (cherry picked from commit 474b5fdff3b0bb39f252e67f7ead6357e6f69007) + + plug-ins/pygimp/pygimp-pdb.c | 10 +++++++--- + 1 files changed, 7 insertions(+), 3 deletions(-) + +commit df2b0aca2e7cdb95ebfd3454c65aaba0a83e9bbe +Author: Simon Budig +Date: Tue Nov 10 00:08:59 2009 +0100 + + Harden the BMP plugin against integer overflows. + + Issues discovered by Stefan Cornelius, Secunia Research, advisory + SA37232 + and CVE identifier CVE-2009-1570. Fixes bug #600484. + + plug-ins/file-bmp/bmp-read.c | 15 ++++++++++++++- + 1 files changed, 14 insertions(+), 1 deletions(-) + +commit b8c28ab2b4b96c57f25bba0489de7655f685a012 +Author: Michael Natterer +Date: Sun Nov 8 14:22:26 2009 +0100 + + Bug 593848 - FG color changed to black when FG-BG Editor tab created + + When a color gets set on the module via + GimpColorSelector::set_color(), + make sure that the result of its transformation to CMYK doesn't + get set back on GIMP. Also, when the color profile changes, make + sure we only re-transform the RGB value to CMYK and don't set that + result back on GIMP either. + (cherry picked from commit 659cf3743e3c48e18a08ba41c83c7ef77c841410) + + modules/color-selector-cmyk-lcms.c | 25 ++++++++++++++++++++----- + 1 files changed, 20 insertions(+), 5 deletions(-) + +commit e22c3aaf4cd5aafbaee1cb2ef4988a8fc6a16f14 +Author: Petr Kovar +Date: Wed Nov 4 21:28:29 2009 +0100 + + Updated Czech translation by Marek Cernocky + + po-plug-ins/cs.po | 482 + +++++++++++++++++++++++++++-------------------------- + 1 files changed, 243 insertions(+), 239 deletions(-) + +commit 177a6f376dd6935f080fc2e3d218d4a4f7550cc8 +Author: Marek Černocký +Date: Sat Oct 31 16:58:26 2009 +0100 + + Update Czech translation + + po-python/cs.po | 150 + ++++++++++++++++++++++++++++-------------------------- + 1 files changed, 78 insertions(+), 72 deletions(-) + +commit 4dfe94ace60acdfc88d6c36c398b0b0152d8f206 +Author: Michael Natterer +Date: Tue Oct 27 18:52:47 2009 +0100 + + Bug 599765 - F1 key on gimp-tool-align in menu have wrong link and + it open gimp-tool-move + + Add help ID "gimp-tool-align" and use it for the align tool. + (cherry picked from commit 398607ee94c11acad4676a7003d8914804d24156) + + app/tools/gimpaligntool.c | 2 +- + app/widgets/gimphelp-ids.h | 1 + + 2 files changed, 2 insertions(+), 1 deletions(-) + +commit 3b985d2c2ba8e1eaa7714788e1f8386629d1de66 +Author: Tournaris Pavlos +Date: Tue Oct 20 14:41:36 2009 +0300 + + Updated Greek po-python translation + + po-python/el.po | 338 + ++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 files changed, 323 insertions(+), 15 deletions(-) + +commit 295a32bcc0de96e4837814bfa540795a6579d0ab +Author: Vasilis Kontogiannis +Date: Tue Oct 20 14:37:52 2009 +0300 + + Updated Greek libgimp translation + + po-libgimp/el.po | 1957 + +++++++++++++++++++++++++++++++++++++----------------- + 1 files changed, 1360 insertions(+), 597 deletions(-) + +commit d37ad2af45e0feba58c12ea9ed041d02fcb4df18 +Author: Vasilis Kontogiannis +Date: Tue Oct 20 14:36:10 2009 +0300 + + Updated Greek script-fu translation + + po-script-fu/el.po | 3297 + ++++++++++++++++++++++++++++++---------------------- + 1 files changed, 1886 insertions(+), 1411 deletions(-) + +commit 36549276aecff97c0124efd5e8462aaccf51c009 +Author: Bruce Cowan +Date: Sat Oct 17 23:09:00 2009 +0100 + + Updated British English translation + + po-libgimp/en_GB.po | 515 ++- + po-plug-ins/en_GB.po |11906 + +++++++++++++++++++++++++------------------------ + po-python/en_GB.po | 140 +- + po-script-fu/en_GB.po | 379 +- + po-tips/en_GB.po | 117 +- + po/en_GB.po | 4171 ++++++++++-------- + 6 files changed, 9003 insertions(+), 8225 deletions(-) + +commit 0799d78db2d13ca9d22152e37bd972d9c9a8653e +Author: Sven Neumann +Date: Fri Oct 16 22:06:34 2009 +0200 + + Fix a width/height confusion in the healing tool algorithm + + As pointed out by Massimo Valentini in bug #519503, the code used + height where width should have been used. Correct. + (cherry picked from commit f7ff0903ff9e87caadd70df6dece0bf2b9d88fdb) + + app/paint/gimpheal.c | 13 +++++++------ + 1 files changed, 7 insertions(+), 6 deletions(-) + +commit 35873d22b26e794125718c2ac189289aeee6b4ea +Author: Funda Wang +Date: Fri Oct 16 08:52:25 2009 +0800 + + Updated zh_CN translation. + + po/ChangeLog | 4 ++++ + po/zh_CN.po | 29 +++++++++++++++-------------- + 2 files changed, 19 insertions(+), 14 deletions(-) + +commit 2acf42dfe7f720c1909bdf9953e75d79bf338557 +Author: Kolbjørn Stuestøl +Date: Mon Oct 12 21:50:43 2009 +0200 + + Updated Norwegian Nynorsk translation + + po-libgimp/nn.po | 673 ++-- + po-plug-ins/nn.po |14524 + ++++++++++++++++++++++++++-------------------------- + po-python/nn.po | 90 +- + po-script-fu/nn.po | 592 +-- + po/nn.po | 5802 +++++++++++---------- + 5 files changed, 10926 insertions(+), 10755 deletions(-) + +commit d67177d74438ff5883e97150f2764af5e7b5af1d +Author: Massimo Valentini +Date: Mon Oct 12 20:26:42 2009 +0200 + + Bug 470698 - MapObject cannot modify highlight + + plug-ins/map-object/map-object-shade.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 5270f707014701df968a4342acf16a2d1d240a4b +Author: Tor Lillqvist +Date: Wed Oct 7 22:31:55 2009 +0300 + + Add missing NULL to g_strconcat() call + + tools/gimptool.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 507521fc23d56709fd758145da654c0fd3b0ed42 +Author: Nishibori Kiyotaka +Date: Sat Oct 3 21:48:11 2009 +0900 + + Updated Japanese translation + + po-libgimp/ja.po | 31 +- + po-plug-ins/ja.po | 3283 + +++++++++++++++++++++++++++++++++++++--------------- + po-python/ja.po | 49 +- + po-script-fu/ja.po | 41 +- + po-tips/ja.po | 17 +- + po/ja.po | 628 +++++----- + 6 files changed, 2738 insertions(+), 1311 deletions(-) + +commit a2e48eeda198d6a485669efbdd6d663c2bed70b8 +Author: Cristian Secară +Date: Mon Sep 28 23:10:53 2009 +0300 + + Updated Romanian translation + + po-libgimp/ro.po | 16 +- + po-plug-ins/ro.po | 1895 + ++++++++++++++++++++-------------------------------- + po-python/ro.po | 11 +- + po-script-fu/ro.po | 385 ++++------- + po-tips/ro.po | 313 ++------- + po/ro.po | 140 ++-- + 6 files changed, 1021 insertions(+), 1739 deletions(-) + +commit 2d08956cebd37457b6f230c0617f654e640d868d +Author: Sven Neumann +Date: Wed Sep 23 21:21:07 2009 +0200 + + app: fix compilation + + The fix for bug #594998 introduced a reference to + gimp_dock_get_context(). + This function does not exist in the gimp-2-6 branch. + + app/widgets/gimpimagedock.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit e2afa0e23fec5b07cc1924909606af181ddc1c80 +Author: Michael Natterer +Date: Mon Sep 21 10:43:26 2009 +0200 + + Make sure the layer preview's border is correct after removing a mask + + (gimp_layer_tree_view_mask_update): call + gimp_layer_tree_view_update_borders() unconditionally; not only when a + mask has been added, but also when it has been removed. + (cherry picked from commit 098a0e4491795a57a5c5a151ab32e132e9455b1d) + + app/widgets/gimplayertreeview.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit cd9d331b6e650dcf56e15d9eb70e47fd57c1d65c +Author: Martin Nordholts +Date: Sat Sep 12 14:57:46 2009 +0200 + + Bug 594998 - Keyboard shortcuts does not work for first image when + dock is focused + + The dock needs to listen to image changes in the context and not only + display changes since the introduction of the empty-image-window does + not cause any display changes when creating the first image. + + app/widgets/gimpimagedock.c | 14 ++++++++++++++ + 1 files changed, 14 insertions(+), 0 deletions(-) + +commit 1eaa17430c1625c0a23470240287845e328dd36a +Author: Julien Hardelin +Date: Sat Sep 12 09:48:04 2009 +0200 + + Improved French translation + + po/fr.po | 85 + +++++++++++++++++++++++++++++++------------------------------ + 1 files changed, 43 insertions(+), 42 deletions(-) + +commit b3fdf6141bae20b3c63217bd22abf1f725d58079 +Author: Manish Singh +Date: Fri Sep 11 12:55:25 2009 -0700 + + Bug 594651 - layer.scale() raises RuntimeError + + Add "interpolation" to kwlist for pygimp layer.scale() + (cherry picked from commit 2182dec09bee12db007b28f0797dc111ea6a1ec2) + + plug-ins/pygimp/pygimp-drawable.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit eb4273227c0760fcef761492ad3be35016392449 +Author: Martin Nordholts +Date: Sun Jun 28 11:02:26 2009 +0200 + + Check for automake-1.11 + + (Cherry picked from commit 66cc3e5f22c61115d0c3057b4475f1a6a7508ea9) + + autogen.sh | 3 +++ + 1 files changed, 3 insertions(+), 0 deletions(-) + +commit 2872f1d4277aa2aa5d7f0c384db0c122823c8a1a +Author: Michael Natterer +Date: Tue Sep 8 20:54:51 2009 +0200 + + gimp_layer_transform_color(): don't assume the dest region has alpha + + Don't blindly fill the dest region's alpha channel even if it has + none. Fixes longstanding bug that made things without alpha dropped + to indexed images to arrive broken. + (cherry picked from commit 0c57e8c68e256b81cda1de7b8aca66cdfd4afe04) + + app/core/gimplayer.c | 11 ++++++----- + 1 files changed, 6 insertions(+), 5 deletions(-) + +commit 36dc72aa34e6178157a65010ff624d8b66e02b4a +Author: Inaki Larranaga +Date: Mon Sep 7 12:44:35 2009 +0200 + + Updated Basque translation + + po-libgimp/eu.po | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +commit 4fba8e413fee914230558cadf9055d67405b89fb +Author: Aron Xu +Date: Mon Sep 7 16:26:42 2009 +0800 + + Updated Simplified Chinese translations. + + po-libgimp/zh_CN.po | 5 ++--- + po-plug-ins/zh_CN.po | 25 ++++++++++++------------- + po-script-fu/zh_CN.po | 8 +++----- + po/zh_CN.po | 25 +++++++++++++------------ + 4 files changed, 30 insertions(+), 33 deletions(-) + +commit 12ad3b4822d39d9abff9e770a0ba02c13f2ad0eb +Author: Petr Kovar +Date: Sun Sep 6 00:55:56 2009 +0200 + + Updated Czech translation by Jaroslav Krejci + + Reviewed by: Petr Kovar + + po-libgimp/cs.po | 102 ++----- + po-plug-ins/cs.po | 867 + ++++++++++++++++++++++------------------------------ + po-script-fu/cs.po | 208 +++---------- + po/cs.po | 700 +++++++++++------------------------------- + 4 files changed, 624 insertions(+), 1253 deletions(-) + +commit 4a68e70eef5e84496dc8738338b125b8f7afe112 +Author: Julien Hardelin +Date: Sat Sep 5 23:26:20 2009 +0200 + + Fix po-script-fu French translation + + po-script-fu/fr.po | 30 +++++++++++++++--------------- + 1 files changed, 15 insertions(+), 15 deletions(-) + +commit 227a68fde2adfc4ebb09008af50db04ff1e22c21 +Author: Julien Hardelin +Date: Sat Sep 5 22:44:17 2009 +0200 + + Fix po-plug-ins French translation + + po-plug-ins/fr.po | 427 + ++++++++++++++++++++++++++--------------------------- + 1 files changed, 213 insertions(+), 214 deletions(-) + +commit 9aa0f9ab79b483d3dbfdbd77d72c112f14efc9d3 +Author: Michael Natterer +Date: Mon Aug 31 19:25:25 2009 +0200 + + Bug 563770 - Layer border visibility don't work with masks + + (gimp_display_shell_selection_control): don't draw the layer boundary + if it is hidden. + (cherry picked from commit 064448cb50185c581646d918e70eff477ababd4c) + + app/display/gimpdisplayshell-selection.c | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +commit de42f754cbdfe4e7e0fce57a3ade5e264bcc28eb +Author: Sven Neumann +Date: Tue Aug 18 22:18:59 2009 +0200 + + print: don't store image specific settings globally + + It doesn't make sense to store image-specific settings such as + resolution + and offsets in the global print-settings file. Only store them in the + image parasite, but remove them before saving the print-settings file. + (cherry picked from commit 9464d303a999aea805370234ef5814df6062fb75) + + plug-ins/print/print-settings.c | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +commit 07fa4c3d3ec1ae35304e1be9f85d4e591e4918bc +Author: Tomasz Dominikowski +Date: Tue Aug 18 16:09:36 2009 +0200 + + Updated Polish translation + + po/pl.po | 2253 + +++++++++++++++++++++++++++----------------------------------- + 1 files changed, 990 insertions(+), 1263 deletions(-) + +commit 16f66f8c8d723a0053c3896417757d81a460ea3c +Author: Marco Ciampa +Date: Mon Aug 17 17:01:14 2009 +0200 + + Updated italian translation. + + po-libgimp/it.po | 204 + +++++++++++++++++++++++++++++++++--------------------- + 1 files changed, 124 insertions(+), 80 deletions(-) + +commit ae341cc8b79ffe6165c2ea9bf38c03e362005e30 +Author: Sven Neumann +Date: Sun Aug 16 12:16:46 2009 +0200 + + remove duplicate line in NEWS file + + NEWS | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +commit 3dc0a93e5ae513f840286de9a276e74fb2174cc2 +Author: Sven Neumann +Date: Fri Aug 14 21:51:42 2009 +0200 + + bumped version to 2.6.8 + + configure.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +commit 1a21ea58dd33aabf31cf084d5a965e3d2dc0f78b +Author: Nils Philippsen +Date: Fri Aug 14 11:56:50 2009 +0200 + + fix typo in NEWS file + + NEWS | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + commit 11d217410575cfb9d55b8d50d0996ed6a0e7ebf4 Author: Sven Neumann Date: Thu Aug 13 22:17:12 2009 +0200 diff --git a/Makefile.in b/Makefile.in index 1c50171e61..04f4c32464 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,8 +18,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -57,8 +59,29 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = gimp-zip gimp-2.0.pc gimpthumb-2.0.pc \ gimpui-2.0.pc +CONFIG_CLEAN_VPATH_FILES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)" -binSCRIPT_INSTALL = $(INSTALL_SCRIPT) SCRIPTS = $(bin_SCRIPTS) SOURCES = DIST_SOURCES = @@ -69,16 +92,12 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ install-pdf-recursive install-ps-recursive install-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \ ps-recursive uninstall-recursive -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; -pkgconfigDATA_INSTALL = $(INSTALL_DATA) DATA = $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir dist dist-all distcheck ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -86,9 +105,34 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d $(distdir) \ - || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr $(distdir); }; } + { test ! -d "$(distdir)" \ + || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr "$(distdir)"; }; } +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 GZIP_ENV = --best distuninstallcheck_listfiles = find . -type f -print @@ -466,15 +510,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi @for dep in $?; do \ case '$(am__configure_deps)' in \ *$$dep*) \ - echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \ - cd $(srcdir) && $(AUTOMAKE) --gnu \ + echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \ + $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \ && exit 0; \ exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -490,9 +534,10 @@ $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENC $(SHELL) ./config.status --recheck $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(srcdir) && $(AUTOCONF) + $(am__cd) $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) + $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +$(am__aclocal_m4_deps): config.h: stamp-h1 @if test ! -f $@; then \ @@ -504,7 +549,7 @@ stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 cd $(top_builddir) && $(SHELL) ./config.status config.h $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_srcdir) && $(AUTOHEADER) + ($(am__cd) $(top_srcdir) && $(AUTOHEADER)) rm -f stamp-h1 touch $@ @@ -521,22 +566,37 @@ gimpui-2.0.pc: $(top_builddir)/config.status $(srcdir)/gimpui.pc.in install-binSCRIPTS: $(bin_SCRIPTS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_SCRIPTS)'; for p in $$list; do \ + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - if test -f $$d$$p; then \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \ - else :; fi; \ - done + if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n' \ + -e 'h;s|.*|.|' \ + -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) { files[d] = files[d] " " $$1; \ + if (++n[d] == $(am__install_max)) { \ + print "f", d, files[d]; n[d] = 0; files[d] = "" } } \ + else { print "f", d "/" $$4, $$1 } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done uninstall-binSCRIPTS: @$(NORMAL_UNINSTALL) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done + @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 's,.*/,,;$(transform)'`; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files mostlyclean-libtool: -rm -f *.lo @@ -549,20 +609,23 @@ distclean-libtool: install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" - @list='$(pkgconfig_DATA)'; for p in $$list; do \ + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgconfigdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgconfigdir)" || exit $$?; \ done uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) - @list='$(pkgconfig_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ - rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ - done + @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. @@ -588,7 +651,7 @@ $(RECURSIVE_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -622,16 +685,16 @@ $(RECURSIVE_CLEAN_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -646,7 +709,7 @@ tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -658,7 +721,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ @@ -667,36 +730,41 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) $(am__remove_distdir) - test -d $(distdir) || mkdir $(distdir) + test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -712,29 +780,44 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -742,11 +825,12 @@ distdir: $(DISTFILES) $(MAKE) $(AM_MAKEFLAGS) \ top_distdir="$(top_distdir)" distdir="$(distdir)" \ dist-hook - -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + -test -n "$(am__skip_mode_fix)" \ + || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ - || chmod -R a+r $(distdir) + || chmod -R a+r "$(distdir)" dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz $(am__remove_distdir) @@ -758,6 +842,10 @@ dist-lzma: distdir tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma $(am__remove_distdir) +dist-xz: distdir + tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz + $(am__remove_distdir) + dist-tarZ: distdir tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__remove_distdir) @@ -787,6 +875,8 @@ distcheck: dist bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.xz*) \ + xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ @@ -798,9 +888,11 @@ distcheck: dist mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir) + test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ - && cd $(distdir)/_build \ + && am__cwd=`pwd` \ + && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ @@ -822,13 +914,15 @@ distcheck: dist && rm -rf "$$dc_destdir" \ && $(MAKE) $(AM_MAKEFLAGS) dist \ && rm -rf $(DIST_ARCHIVES) \ - && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ + && cd "$$am__cwd" \ + || exit 1 $(am__remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @cd $(distuninstallcheck_dir) \ + @$(am__cd) '$(distuninstallcheck_dir)' \ && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ @@ -873,6 +967,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -893,6 +988,8 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: @@ -901,18 +998,28 @@ install-data-am: install-pkgconfigDATA install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-binSCRIPTS install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -935,26 +1042,27 @@ ps-am: uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ + ctags-recursive install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am all-local am--refresh check check-am clean \ clean-generic clean-libtool ctags ctags-recursive dist \ dist-all dist-bzip2 dist-gzip dist-hook dist-lzma dist-shar \ - dist-tarZ dist-zip distcheck distclean distclean-generic \ - distclean-hdr distclean-libtool distclean-tags distcleancheck \ - distdir distuninstallcheck dvi dvi-am html html-am info \ - info-am install install-am install-binSCRIPTS install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-pdf install-pdf-am \ - install-pkgconfigDATA install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs installdirs-am \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am \ - uninstall-binSCRIPTS uninstall-pkgconfigDATA + dist-tarZ dist-xz dist-zip distcheck distclean \ + distclean-generic distclean-hdr distclean-libtool \ + distclean-tags distcleancheck distdir distuninstallcheck dvi \ + dvi-am html html-am info info-am install install-am \ + install-binSCRIPTS install-data install-data-am install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-pdf install-pdf-am install-pkgconfigDATA install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-binSCRIPTS \ + uninstall-pkgconfigDATA AUTHORS: authors.xml authors.xsl @@ -993,6 +1101,7 @@ $(srcdir)/ChangeLog: fi .PHONY: $(srcdir)/ChangeLog + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/NEWS b/NEWS index 266ed30899..a9c4294b16 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,48 @@ This is the stable branch of GIMP. No new features are being added here, just bug-fixes. +Overview of Changes from GIMP 2.6.7 to GIMP 2.6.8 +================================================= + +* Bugs fixed: + + 470698 - MapObject cannot modify highlight + 593848 - FG color changed to black when FG-BG Editor tab created + 594651 - layer.scale() raises RuntimeError + 594998 - Keyboard shortcuts does not work for first image when dock + is focused + 599765 - F1 key on gimp-tool-align in menu have wrong link and it + open gimp-tool-move + 600484 - Gimp BMP Integer Overflow Vulnerability + 600741 - "read_channel_data()" Integer Overflow Vulnerability + 601891 - gimp_image_get_selection returns None + 602761 - plug-in-grid: Parameters Horizontal/Vertical Spacing and + Horizontal/Vertical Offset are reversed. + 603995 - PCX plugin doesn't sanitize input to avoid allocation overflows. + 603998 - PCX: Calculating amount of memory to allocate may overflow. + 604000 - SGI: sanitize input + 604001 - SGI: Calculating amount of memory to allocate may overflow. + 604002 - SGI: RLE encoded input data may write beyond allocated buffers + 604004 - SGI: allocate memory consistently + 604008 - GBR, PAT: sanitize input data + 604078 - Crash when pressing Backspace with Free Select Tool + +* Updated and new translations: + + Basque (eu) + British English (en_GB) + Czech (cs) + French (fr) + Greek (el) + Italian (it) + Japanese (ja) + Norwegian Nynorsk (nn) + Polish (pl) + Romanian (ro) + Russian (ru) + Simplified Chinese (zh_CN) + + Overview of Changes from GIMP 2.6.6 to GIMP 2.6.7 ================================================= @@ -19,7 +61,6 @@ Overview of Changes from GIMP 2.6.6 to GIMP 2.6.7 590638 – Changing palettes from list to grid view loses "locked to dock" status 589674 – "Send by Email" does not update "Filename" - 589674 – "Send by Email" does not update "Filename" 586851 – Transparent BMP files fail to load 589205 – help-browser uses deprecated (and sometimes broken) webkit call 582821 – 'Sphere Designer' does not reset correctly... @@ -62,7 +103,7 @@ Overview of Changes from GIMP 2.6.6 to GIMP 2.6.7 Hungarian (hu) Italian (it) Gujarati (gu) - Japaness (ja) + Japanese (ja) Kannada (kn) Marathi (mr) Norwegian bokmål (nb) diff --git a/aclocal.m4 b/aclocal.m4 index 8229f50f80..8a96e4b203 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.10.2 -*- Autoconf -*- +# generated automatically by aclocal 1.11 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -13,8 +13,8 @@ m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.64],, -[m4_warning([this file was generated for autoconf 2.64. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, +[m4_warning([this file was generated for autoconf 2.65. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically `autoreconf'.])]) @@ -9223,10 +9223,10 @@ fi[]dnl # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.10' +[am__api_version='1.11' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.10.2], [], +m4_if([$1], [1.11], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -9242,7 +9242,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.10.2])dnl +[AM_AUTOMAKE_VERSION([1.11])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -9324,14 +9324,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 8 +# serial 9 # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- @@ -9344,6 +9344,7 @@ AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl _AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl if $2; then $1_TRUE= $1_FALSE='#' @@ -9357,14 +9358,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 +# serial 10 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, @@ -9421,6 +9422,16 @@ AC_CACHE_CHECK([dependency style of $depcc], if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -9438,7 +9449,17 @@ AC_CACHE_CHECK([dependency style of $depcc], done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -9448,19 +9469,23 @@ AC_CACHE_CHECK([dependency style of $depcc], break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -9524,59 +9549,61 @@ _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 4 +#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[# Autoconf 2.62 quotes --file arguments for eval, but not when files -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -9608,13 +9635,13 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # Do all the work for Automake. -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008 Free Software Foundation, Inc. +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 13 +# serial 16 # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. @@ -9631,7 +9658,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.60])dnl +[AC_PREREQ([2.62])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -9682,8 +9709,8 @@ AM_MISSING_PROG(AUTOCONF, autoconf) AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) AM_MISSING_PROG(AUTOHEADER, autoheader) AM_MISSING_PROG(MAKEINFO, makeinfo) -AM_PROG_INSTALL_SH -AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl AC_REQUIRE([AM_PROG_MKDIR_P])dnl # We need awk for the "check" target. The system "awk" is bad on # some platforms. @@ -9691,24 +9718,37 @@ AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl ]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header @@ -9731,7 +9771,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -9742,7 +9782,14 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi AC_SUBST(install_sh)]) # Copyright (C) 2003, 2005 Free Software Foundation, Inc. @@ -9769,27 +9816,38 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. AC_DEFUN([AM_MAINTAINER_MODE], -[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) - dnl maintainer-mode is disabled by default - AC_ARG_ENABLE(maintainer-mode, -[ --enable-maintainer-mode enable make rules and dependencies not useful +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful (and sometimes confusing) to the casual installer], - USE_MAINTAINER_MODE=$enableval, - USE_MAINTAINER_MODE=no) + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST(MAINT)dnl + AC_SUBST([MAINT])dnl ] ) @@ -9797,13 +9855,13 @@ AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 3 +# serial 4 # AM_MAKE_INCLUDE() # ----------------- @@ -9812,7 +9870,7 @@ AC_DEFUN([AM_MAKE_INCLUDE], [am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -9822,24 +9880,24 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi AC_SUBST([am__include]) AC_SUBST([am__quote]) @@ -9884,14 +9942,14 @@ m4_define([AC_PROG_CC], # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# serial 6 # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ @@ -9908,7 +9966,14 @@ AC_SUBST($1)]) AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -9977,7 +10042,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005 +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008, 2009 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -10008,13 +10073,11 @@ AC_DEFUN([_AM_IF_OPTION], # numbers and dots only. AC_DEFUN([AM_PATH_PYTHON], [ - dnl Find a Python interpreter. Python versions prior to 1.5 are not - dnl supported because the default installation locations changed from - dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages - dnl in 1.5. + dnl Find a Python interpreter. Python versions prior to 2.0 are not + dnl supported. (2.0 was released on October 16, 2000). m4_define_default([_AM_PYTHON_INTERPRETER_LIST], - [python python2 python2.5 python2.4 python2.3 python2.2 dnl -python2.1 python2.0 python1.6 python1.5]) + [python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 dnl +python2.1 python2.0]) m4_if([$1],[],[ dnl No version check is needed. @@ -10061,7 +10124,7 @@ python2.1 python2.0 python1.6 python1.5]) dnl library. AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version], - [am_cv_python_version=`$PYTHON -c "import sys; print sys.version[[:3]]"`]) + [am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`]) AC_SUBST([PYTHON_VERSION], [$am_cv_python_version]) dnl Use the values of $prefix and $exec_prefix for the corresponding @@ -10076,7 +10139,7 @@ python2.1 python2.0 python1.6 python1.5]) dnl to know which OS platform Python thinks this is. AC_CACHE_CHECK([for $am_display_PYTHON platform], [am_cv_python_platform], - [am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"`]) + [am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"`]) AC_SUBST([PYTHON_PLATFORM], [$am_cv_python_platform]) @@ -10091,8 +10154,21 @@ python2.1 python2.0 python1.6 python1.5]) dnl doesn't work. AC_CACHE_CHECK([for $am_display_PYTHON script directory], [am_cv_python_pythondir], - [am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || - echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"`]) + [if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || + echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + esac + ]) AC_SUBST([pythondir], [$am_cv_python_pythondir]) dnl pkgpythondir -- $PACKAGE directory under pythondir. Was @@ -10108,8 +10184,21 @@ python2.1 python2.0 python1.6 python1.5]) dnl doesn't work. AC_CACHE_CHECK([for $am_display_PYTHON extension module directory], [am_cv_python_pyexecdir], - [am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"`]) + [if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + esac + ]) AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir]) dnl pkgpyexecdir -- $(pyexecdir)/$(PACKAGE) @@ -10129,15 +10218,16 @@ python2.1 python2.0 python1.6 python1.5]) # Run ACTION-IF-FALSE otherwise. # This test uses sys.hexversion instead of the string equivalent (first # word of sys.version), in order to cope with versions such as 2.2c1. -# hexversion has been introduced in Python 1.5.2; it's probably not -# worth to support older versions (1.5.1 was released on October 31, 1998). +# This supports Python 2.0 or higher. (2.0 was released on October 16, 2000). AC_DEFUN([AM_PYTHON_CHECK_VERSION], - [prog="import sys, string + [prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. -minver = map(int, string.split('$2', '.')) + [[0, 0, 0]] +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '$2'.split('.'))) + [[0, 0, 0]] minverhex = 0 -for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[[i]] +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[[i]] sys.exit(sys.hexversion < minverhex)" AS_IF([AM_RUN_LOG([$1 -c "$prog"])], [$3], [$4])]) @@ -10160,14 +10250,14 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 +# serial 5 # AM_SANITY_CHECK # --------------- @@ -10176,16 +10266,29 @@ AC_DEFUN([AM_SANITY_CHECK], # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$[*]" != "X $srcdir/configure conftest.file" \ @@ -10238,18 +10341,25 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. +# serial 2 + # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. # This macro is traced by Automake. AC_DEFUN([_AM_SUBST_NOTMAKE]) +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + # Check how to create a tarball. -*- Autoconf -*- # Copyright (C) 2004, 2005 Free Software Foundation, Inc. diff --git a/app/Makefile.in b/app/Makefile.in index 6a0a63521b..99548f26bc 100644 --- a/app/Makefile.in +++ b/app/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -50,8 +52,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" -binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) am__objects_1 = app.$(OBJEXT) batch.$(OBJEXT) errors.$(OBJEXT) \ main.$(OBJEXT) sanity.$(OBJEXT) unique.$(OBJEXT) \ @@ -123,6 +125,7 @@ gimp_console_2_6_OBJECTS = $(am_gimp_console_2_6_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -144,10 +147,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -619,9 +650,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -639,34 +670,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - if test -f $$p \ - || test -f $$p1 \ - ; then \ - f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \ - else :; fi; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p || test -f $$p1; \ + then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done uninstall-binPROGRAMS: @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ - echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \ - rm -f "$(DESTDIR)$(bindir)/$$f"; \ - done + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f $$p $$f"; \ - rm -f $$p $$f ; \ - done + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list gimp-2.6$(EXEEXT): $(gimp_2_6_OBJECTS) $(gimp_2_6_DEPENDENCIES) @rm -f gimp-2.6$(EXEEXT) $(gimp_2_6_LINK) $(gimp_2_6_OBJECTS) $(gimp_2_6_LDADD) $(LIBS) @@ -701,147 +748,147 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< gimp_console_2_6-app.o: app.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-app.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-app.Tpo -c -o gimp_console_2_6-app.o `test -f 'app.c' || echo '$(srcdir)/'`app.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-app.Tpo $(DEPDIR)/gimp_console_2_6-app.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-app.Tpo $(DEPDIR)/gimp_console_2_6-app.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='app.c' object='gimp_console_2_6-app.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-app.o `test -f 'app.c' || echo '$(srcdir)/'`app.c gimp_console_2_6-app.obj: app.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-app.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-app.Tpo -c -o gimp_console_2_6-app.obj `if test -f 'app.c'; then $(CYGPATH_W) 'app.c'; else $(CYGPATH_W) '$(srcdir)/app.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-app.Tpo $(DEPDIR)/gimp_console_2_6-app.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-app.Tpo $(DEPDIR)/gimp_console_2_6-app.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='app.c' object='gimp_console_2_6-app.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-app.obj `if test -f 'app.c'; then $(CYGPATH_W) 'app.c'; else $(CYGPATH_W) '$(srcdir)/app.c'; fi` gimp_console_2_6-batch.o: batch.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-batch.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-batch.Tpo -c -o gimp_console_2_6-batch.o `test -f 'batch.c' || echo '$(srcdir)/'`batch.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-batch.Tpo $(DEPDIR)/gimp_console_2_6-batch.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-batch.Tpo $(DEPDIR)/gimp_console_2_6-batch.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='batch.c' object='gimp_console_2_6-batch.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-batch.o `test -f 'batch.c' || echo '$(srcdir)/'`batch.c gimp_console_2_6-batch.obj: batch.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-batch.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-batch.Tpo -c -o gimp_console_2_6-batch.obj `if test -f 'batch.c'; then $(CYGPATH_W) 'batch.c'; else $(CYGPATH_W) '$(srcdir)/batch.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-batch.Tpo $(DEPDIR)/gimp_console_2_6-batch.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-batch.Tpo $(DEPDIR)/gimp_console_2_6-batch.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='batch.c' object='gimp_console_2_6-batch.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-batch.obj `if test -f 'batch.c'; then $(CYGPATH_W) 'batch.c'; else $(CYGPATH_W) '$(srcdir)/batch.c'; fi` gimp_console_2_6-errors.o: errors.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-errors.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-errors.Tpo -c -o gimp_console_2_6-errors.o `test -f 'errors.c' || echo '$(srcdir)/'`errors.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-errors.Tpo $(DEPDIR)/gimp_console_2_6-errors.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-errors.Tpo $(DEPDIR)/gimp_console_2_6-errors.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='errors.c' object='gimp_console_2_6-errors.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-errors.o `test -f 'errors.c' || echo '$(srcdir)/'`errors.c gimp_console_2_6-errors.obj: errors.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-errors.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-errors.Tpo -c -o gimp_console_2_6-errors.obj `if test -f 'errors.c'; then $(CYGPATH_W) 'errors.c'; else $(CYGPATH_W) '$(srcdir)/errors.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-errors.Tpo $(DEPDIR)/gimp_console_2_6-errors.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-errors.Tpo $(DEPDIR)/gimp_console_2_6-errors.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='errors.c' object='gimp_console_2_6-errors.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-errors.obj `if test -f 'errors.c'; then $(CYGPATH_W) 'errors.c'; else $(CYGPATH_W) '$(srcdir)/errors.c'; fi` gimp_console_2_6-main.o: main.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-main.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-main.Tpo -c -o gimp_console_2_6-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-main.Tpo $(DEPDIR)/gimp_console_2_6-main.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-main.Tpo $(DEPDIR)/gimp_console_2_6-main.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='gimp_console_2_6-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c gimp_console_2_6-main.obj: main.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-main.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-main.Tpo -c -o gimp_console_2_6-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-main.Tpo $(DEPDIR)/gimp_console_2_6-main.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-main.Tpo $(DEPDIR)/gimp_console_2_6-main.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='gimp_console_2_6-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` gimp_console_2_6-sanity.o: sanity.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-sanity.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-sanity.Tpo -c -o gimp_console_2_6-sanity.o `test -f 'sanity.c' || echo '$(srcdir)/'`sanity.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-sanity.Tpo $(DEPDIR)/gimp_console_2_6-sanity.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-sanity.Tpo $(DEPDIR)/gimp_console_2_6-sanity.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sanity.c' object='gimp_console_2_6-sanity.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-sanity.o `test -f 'sanity.c' || echo '$(srcdir)/'`sanity.c gimp_console_2_6-sanity.obj: sanity.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-sanity.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-sanity.Tpo -c -o gimp_console_2_6-sanity.obj `if test -f 'sanity.c'; then $(CYGPATH_W) 'sanity.c'; else $(CYGPATH_W) '$(srcdir)/sanity.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-sanity.Tpo $(DEPDIR)/gimp_console_2_6-sanity.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-sanity.Tpo $(DEPDIR)/gimp_console_2_6-sanity.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sanity.c' object='gimp_console_2_6-sanity.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-sanity.obj `if test -f 'sanity.c'; then $(CYGPATH_W) 'sanity.c'; else $(CYGPATH_W) '$(srcdir)/sanity.c'; fi` gimp_console_2_6-unique.o: unique.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-unique.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-unique.Tpo -c -o gimp_console_2_6-unique.o `test -f 'unique.c' || echo '$(srcdir)/'`unique.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-unique.Tpo $(DEPDIR)/gimp_console_2_6-unique.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-unique.Tpo $(DEPDIR)/gimp_console_2_6-unique.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unique.c' object='gimp_console_2_6-unique.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-unique.o `test -f 'unique.c' || echo '$(srcdir)/'`unique.c gimp_console_2_6-unique.obj: unique.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-unique.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-unique.Tpo -c -o gimp_console_2_6-unique.obj `if test -f 'unique.c'; then $(CYGPATH_W) 'unique.c'; else $(CYGPATH_W) '$(srcdir)/unique.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-unique.Tpo $(DEPDIR)/gimp_console_2_6-unique.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-unique.Tpo $(DEPDIR)/gimp_console_2_6-unique.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='unique.c' object='gimp_console_2_6-unique.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-unique.obj `if test -f 'unique.c'; then $(CYGPATH_W) 'unique.c'; else $(CYGPATH_W) '$(srcdir)/unique.c'; fi` gimp_console_2_6-units.o: units.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-units.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-units.Tpo -c -o gimp_console_2_6-units.o `test -f 'units.c' || echo '$(srcdir)/'`units.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-units.Tpo $(DEPDIR)/gimp_console_2_6-units.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-units.Tpo $(DEPDIR)/gimp_console_2_6-units.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='units.c' object='gimp_console_2_6-units.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-units.o `test -f 'units.c' || echo '$(srcdir)/'`units.c gimp_console_2_6-units.obj: units.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-units.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-units.Tpo -c -o gimp_console_2_6-units.obj `if test -f 'units.c'; then $(CYGPATH_W) 'units.c'; else $(CYGPATH_W) '$(srcdir)/units.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-units.Tpo $(DEPDIR)/gimp_console_2_6-units.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-units.Tpo $(DEPDIR)/gimp_console_2_6-units.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='units.c' object='gimp_console_2_6-units.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-units.obj `if test -f 'units.c'; then $(CYGPATH_W) 'units.c'; else $(CYGPATH_W) '$(srcdir)/units.c'; fi` gimp_console_2_6-version.o: version.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-version.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-version.Tpo -c -o gimp_console_2_6-version.o `test -f 'version.c' || echo '$(srcdir)/'`version.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-version.Tpo $(DEPDIR)/gimp_console_2_6-version.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-version.Tpo $(DEPDIR)/gimp_console_2_6-version.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='version.c' object='gimp_console_2_6-version.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-version.o `test -f 'version.c' || echo '$(srcdir)/'`version.c gimp_console_2_6-version.obj: version.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-version.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-version.Tpo -c -o gimp_console_2_6-version.obj `if test -f 'version.c'; then $(CYGPATH_W) 'version.c'; else $(CYGPATH_W) '$(srcdir)/version.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-version.Tpo $(DEPDIR)/gimp_console_2_6-version.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-version.Tpo $(DEPDIR)/gimp_console_2_6-version.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='version.c' object='gimp_console_2_6-version.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-version.obj `if test -f 'version.c'; then $(CYGPATH_W) 'version.c'; else $(CYGPATH_W) '$(srcdir)/version.c'; fi` gimp_console_2_6-gimp-log.o: gimp-log.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-gimp-log.o -MD -MP -MF $(DEPDIR)/gimp_console_2_6-gimp-log.Tpo -c -o gimp_console_2_6-gimp-log.o `test -f 'gimp-log.c' || echo '$(srcdir)/'`gimp-log.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-gimp-log.Tpo $(DEPDIR)/gimp_console_2_6-gimp-log.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-gimp-log.Tpo $(DEPDIR)/gimp_console_2_6-gimp-log.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-log.c' object='gimp_console_2_6-gimp-log.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-gimp-log.o `test -f 'gimp-log.c' || echo '$(srcdir)/'`gimp-log.c gimp_console_2_6-gimp-log.obj: gimp-log.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT gimp_console_2_6-gimp-log.obj -MD -MP -MF $(DEPDIR)/gimp_console_2_6-gimp-log.Tpo -c -o gimp_console_2_6-gimp-log.obj `if test -f 'gimp-log.c'; then $(CYGPATH_W) 'gimp-log.c'; else $(CYGPATH_W) '$(srcdir)/gimp-log.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/gimp_console_2_6-gimp-log.Tpo $(DEPDIR)/gimp_console_2_6-gimp-log.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/gimp_console_2_6-gimp-log.Tpo $(DEPDIR)/gimp_console_2_6-gimp-log.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-log.c' object='gimp_console_2_6-gimp-log.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(gimp_console_2_6_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o gimp_console_2_6-gimp-log.obj `if test -f 'gimp-log.c'; then $(CYGPATH_W) 'gimp-log.c'; else $(CYGPATH_W) '$(srcdir)/gimp-log.c'; fi` @@ -876,7 +923,7 @@ $(RECURSIVE_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -910,16 +957,16 @@ $(RECURSIVE_CLEAN_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -934,7 +981,7 @@ tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -946,7 +993,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -955,29 +1002,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -998,29 +1050,44 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -1056,6 +1123,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1076,6 +1144,8 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: @@ -1084,20 +1154,29 @@ install-data-am: install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-binPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook - install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -1120,8 +1199,8 @@ ps-am: uninstall-am: uninstall-binPROGRAMS uninstall-local -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-exec-am install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-exec-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-binPROGRAMS \ @@ -1180,6 +1259,7 @@ dist-hook: dist-check-gimp-console dist-dump-gimprc gimprc.o: $(WINDRES) gimp.rc gimprc.o + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/actions/Makefile.in b/app/actions/Makefile.in index b4e212c4f2..d003e6d2f0 100644 --- a/app/actions/Makefile.in +++ b/app/actions/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappactions_a_AR = $(AR) $(ARFLAGS) @@ -96,6 +99,7 @@ libappactions_a_OBJECTS = $(am_libappactions_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -593,9 +597,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/actions/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/actions/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/actions/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/actions/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -613,6 +617,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -708,21 +713,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -745,7 +750,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -753,29 +758,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -796,13 +806,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -830,6 +844,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -851,6 +866,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -859,18 +876,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -908,6 +935,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/base/Makefile.in b/app/base/Makefile.in index 1c5802360c..7fa2d41862 100644 --- a/app/base/Makefile.in +++ b/app/base/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappbase_a_AR = $(AR) $(ARFLAGS) @@ -67,6 +70,7 @@ libappbase_a_OBJECTS = $(am_libappbase_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -471,9 +475,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/base/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/base/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/base/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/base/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -491,6 +495,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -536,21 +541,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -573,7 +578,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -581,29 +586,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -624,13 +634,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -659,6 +673,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -680,6 +695,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -688,18 +705,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -751,6 +778,7 @@ base-enums.c: $(srcdir)/base-enums.h $(GIMP_MKENUMS) $(srcdir)/base-enums.h > xgen-bec \ && cp xgen-bec $(@F) \ && rm -f xgen-bec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/composite/Makefile.in b/app/composite/Makefile.in index 52bd403850..63f45809f5 100644 --- a/app/composite/Makefile.in +++ b/app/composite/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -54,6 +56,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libcomposite_a_AR = $(AR) $(ARFLAGS) @@ -140,6 +143,7 @@ gimp_composite_vis_test_OBJECTS = \ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -174,6 +178,8 @@ DIST_SOURCES = $(libcomposite_a_SOURCES) \ $(gimp_composite_vis_test_SOURCES) ETAGS = etags CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -646,9 +652,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/composite/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/composite/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/composite/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/composite/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -666,6 +672,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -751,77 +758,77 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< libcompositealtivec_a-gimp-composite-altivec.o: gimp-composite-altivec.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositealtivec_a_CFLAGS) $(CFLAGS) -MT libcompositealtivec_a-gimp-composite-altivec.o -MD -MP -MF $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Tpo -c -o libcompositealtivec_a-gimp-composite-altivec.o `test -f 'gimp-composite-altivec.c' || echo '$(srcdir)/'`gimp-composite-altivec.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Tpo $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Tpo $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-altivec.c' object='libcompositealtivec_a-gimp-composite-altivec.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositealtivec_a_CFLAGS) $(CFLAGS) -c -o libcompositealtivec_a-gimp-composite-altivec.o `test -f 'gimp-composite-altivec.c' || echo '$(srcdir)/'`gimp-composite-altivec.c libcompositealtivec_a-gimp-composite-altivec.obj: gimp-composite-altivec.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositealtivec_a_CFLAGS) $(CFLAGS) -MT libcompositealtivec_a-gimp-composite-altivec.obj -MD -MP -MF $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Tpo -c -o libcompositealtivec_a-gimp-composite-altivec.obj `if test -f 'gimp-composite-altivec.c'; then $(CYGPATH_W) 'gimp-composite-altivec.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-altivec.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Tpo $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Tpo $(DEPDIR)/libcompositealtivec_a-gimp-composite-altivec.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-altivec.c' object='libcompositealtivec_a-gimp-composite-altivec.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositealtivec_a_CFLAGS) $(CFLAGS) -c -o libcompositealtivec_a-gimp-composite-altivec.obj `if test -f 'gimp-composite-altivec.c'; then $(CYGPATH_W) 'gimp-composite-altivec.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-altivec.c'; fi` libcompositemmx_a-gimp-composite-mmx.o: gimp-composite-mmx.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositemmx_a_CFLAGS) $(CFLAGS) -MT libcompositemmx_a-gimp-composite-mmx.o -MD -MP -MF $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Tpo -c -o libcompositemmx_a-gimp-composite-mmx.o `test -f 'gimp-composite-mmx.c' || echo '$(srcdir)/'`gimp-composite-mmx.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Tpo $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Tpo $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-mmx.c' object='libcompositemmx_a-gimp-composite-mmx.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositemmx_a_CFLAGS) $(CFLAGS) -c -o libcompositemmx_a-gimp-composite-mmx.o `test -f 'gimp-composite-mmx.c' || echo '$(srcdir)/'`gimp-composite-mmx.c libcompositemmx_a-gimp-composite-mmx.obj: gimp-composite-mmx.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositemmx_a_CFLAGS) $(CFLAGS) -MT libcompositemmx_a-gimp-composite-mmx.obj -MD -MP -MF $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Tpo -c -o libcompositemmx_a-gimp-composite-mmx.obj `if test -f 'gimp-composite-mmx.c'; then $(CYGPATH_W) 'gimp-composite-mmx.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-mmx.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Tpo $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Tpo $(DEPDIR)/libcompositemmx_a-gimp-composite-mmx.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-mmx.c' object='libcompositemmx_a-gimp-composite-mmx.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositemmx_a_CFLAGS) $(CFLAGS) -c -o libcompositemmx_a-gimp-composite-mmx.obj `if test -f 'gimp-composite-mmx.c'; then $(CYGPATH_W) 'gimp-composite-mmx.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-mmx.c'; fi` libcompositesse_a-gimp-composite-sse.o: gimp-composite-sse.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse_a_CFLAGS) $(CFLAGS) -MT libcompositesse_a-gimp-composite-sse.o -MD -MP -MF $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Tpo -c -o libcompositesse_a-gimp-composite-sse.o `test -f 'gimp-composite-sse.c' || echo '$(srcdir)/'`gimp-composite-sse.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Tpo $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Tpo $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-sse.c' object='libcompositesse_a-gimp-composite-sse.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse_a_CFLAGS) $(CFLAGS) -c -o libcompositesse_a-gimp-composite-sse.o `test -f 'gimp-composite-sse.c' || echo '$(srcdir)/'`gimp-composite-sse.c libcompositesse_a-gimp-composite-sse.obj: gimp-composite-sse.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse_a_CFLAGS) $(CFLAGS) -MT libcompositesse_a-gimp-composite-sse.obj -MD -MP -MF $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Tpo -c -o libcompositesse_a-gimp-composite-sse.obj `if test -f 'gimp-composite-sse.c'; then $(CYGPATH_W) 'gimp-composite-sse.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-sse.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Tpo $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Tpo $(DEPDIR)/libcompositesse_a-gimp-composite-sse.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-sse.c' object='libcompositesse_a-gimp-composite-sse.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse_a_CFLAGS) $(CFLAGS) -c -o libcompositesse_a-gimp-composite-sse.obj `if test -f 'gimp-composite-sse.c'; then $(CYGPATH_W) 'gimp-composite-sse.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-sse.c'; fi` libcompositesse2_a-gimp-composite-sse2.o: gimp-composite-sse2.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse2_a_CFLAGS) $(CFLAGS) -MT libcompositesse2_a-gimp-composite-sse2.o -MD -MP -MF $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Tpo -c -o libcompositesse2_a-gimp-composite-sse2.o `test -f 'gimp-composite-sse2.c' || echo '$(srcdir)/'`gimp-composite-sse2.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Tpo $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Tpo $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-sse2.c' object='libcompositesse2_a-gimp-composite-sse2.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse2_a_CFLAGS) $(CFLAGS) -c -o libcompositesse2_a-gimp-composite-sse2.o `test -f 'gimp-composite-sse2.c' || echo '$(srcdir)/'`gimp-composite-sse2.c libcompositesse2_a-gimp-composite-sse2.obj: gimp-composite-sse2.c @am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse2_a_CFLAGS) $(CFLAGS) -MT libcompositesse2_a-gimp-composite-sse2.obj -MD -MP -MF $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Tpo -c -o libcompositesse2_a-gimp-composite-sse2.obj `if test -f 'gimp-composite-sse2.c'; then $(CYGPATH_W) 'gimp-composite-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-sse2.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Tpo $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Tpo $(DEPDIR)/libcompositesse2_a-gimp-composite-sse2.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gimp-composite-sse2.c' object='libcompositesse2_a-gimp-composite-sse2.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcompositesse2_a_CFLAGS) $(CFLAGS) -c -o libcompositesse2_a-gimp-composite-sse2.obj `if test -f 'gimp-composite-sse2.c'; then $(CYGPATH_W) 'gimp-composite-sse2.c'; else $(CYGPATH_W) '$(srcdir)/gimp-composite-sse2.c'; fi` @@ -844,7 +851,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -852,29 +859,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -883,6 +895,7 @@ check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ + $(am__tty_colors); \ if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ @@ -894,10 +907,10 @@ check-TESTS: $(TESTS) *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ + col=$$red; res=XPASS; \ ;; \ *) \ - echo "PASS: $$tst"; \ + col=$$grn; res=PASS; \ ;; \ esac; \ elif test $$? -ne 77; then \ @@ -905,17 +918,18 @@ check-TESTS: $(TESTS) case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ + col=$$lgn; res=XFAIL; \ ;; \ *) \ failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ + col=$$red; res=FAIL; \ ;; \ esac; \ else \ skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ + col=$$blu; res=SKIP; \ fi; \ + echo "$${col}$$res$${std}: $$tst"; \ done; \ if test "$$all" -eq 1; then \ tests="test"; \ @@ -957,11 +971,15 @@ check-TESTS: $(TESTS) dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ echo "$$banner"; \ test -z "$$skipped" || echo "$$skipped"; \ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ + echo "$$dashes$$std"; \ test "$$failed" -eq 0; \ else :; fi @@ -981,13 +999,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -1017,6 +1039,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1038,6 +1061,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -1046,18 +1071,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -1080,7 +1115,7 @@ ps-am: uninstall-am: -.MAKE: install-am install-strip +.MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am all-local check check-TESTS check-am \ clean clean-generic clean-libtool clean-noinstLIBRARIES ctags \ @@ -1118,6 +1153,7 @@ regenerate: gimp-composite-generic.o $(libcomposite3dnow_a_OBJECTS) $(libcomposi $(srcdir)/make-installer.py -f $(libcomposite3dnow_a_OBJECTS) -t -r 'defined(COMPILE_3DNOW_IS_OKAY)' -c 'X86_3DNOW' $(srcdir)/make-installer.py -f $(libcompositealtivec_a_OBJECTS) -t -r 'defined(COMPILE_ALTIVEC_IS_OKAY)' -c 'PPC_ALTIVEC' $(srcdir)/make-installer.py -f $(libcompositevis_a_OBJECTS) -t -r 'defined(COMPILE_VIS_IS_OKAY)' + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/config/Makefile.in b/app/config/Makefile.in index 34b51e4b48..bd799fd670 100644 --- a/app/config/Makefile.in +++ b/app/config/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -49,6 +51,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappconfig_a_AR = $(AR) $(ARFLAGS) @@ -70,6 +73,7 @@ test_config_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -83,6 +87,8 @@ SOURCES = $(libappconfig_a_SOURCES) test-config.c DIST_SOURCES = $(libappconfig_a_SOURCES) test-config.c ETAGS = etags CTAGS = ctags +am__tty_colors = \ +red=; grn=; lgn=; blu=; std= DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ @@ -484,9 +490,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/config/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/config/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/config/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/config/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -504,6 +510,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -538,21 +545,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -575,7 +582,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -583,29 +590,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -614,6 +626,7 @@ check-TESTS: $(TESTS) @failed=0; all=0; xfail=0; xpass=0; skip=0; \ srcdir=$(srcdir); export srcdir; \ list=' $(TESTS) '; \ + $(am__tty_colors); \ if test -n "$$list"; then \ for tst in $$list; do \ if test -f ./$$tst; then dir=./; \ @@ -625,10 +638,10 @@ check-TESTS: $(TESTS) *[\ \ ]$$tst[\ \ ]*) \ xpass=`expr $$xpass + 1`; \ failed=`expr $$failed + 1`; \ - echo "XPASS: $$tst"; \ + col=$$red; res=XPASS; \ ;; \ *) \ - echo "PASS: $$tst"; \ + col=$$grn; res=PASS; \ ;; \ esac; \ elif test $$? -ne 77; then \ @@ -636,17 +649,18 @@ check-TESTS: $(TESTS) case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ xfail=`expr $$xfail + 1`; \ - echo "XFAIL: $$tst"; \ + col=$$lgn; res=XFAIL; \ ;; \ *) \ failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ + col=$$red; res=FAIL; \ ;; \ esac; \ else \ skip=`expr $$skip + 1`; \ - echo "SKIP: $$tst"; \ + col=$$blu; res=SKIP; \ fi; \ + echo "$${col}$$res$${std}: $$tst"; \ done; \ if test "$$all" -eq 1; then \ tests="test"; \ @@ -688,11 +702,15 @@ check-TESTS: $(TESTS) dashes="$$report"; \ fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ - echo "$$dashes"; \ + if test "$$failed" -eq 0; then \ + echo "$$grn$$dashes"; \ + else \ + echo "$$red$$dashes"; \ + fi; \ echo "$$banner"; \ test -z "$$skipped" || echo "$$skipped"; \ test -z "$$report" || echo "$$report"; \ - echo "$$dashes"; \ + echo "$$dashes$$std"; \ test "$$failed" -eq 0; \ else :; fi @@ -712,13 +730,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -748,6 +770,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -769,6 +792,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -777,18 +802,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -811,7 +846,7 @@ ps-am: uninstall-am: -.MAKE: install-am install-strip +.MAKE: check-am install-am install-strip .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ clean-generic clean-libtool clean-noinstLIBRARIES ctags \ @@ -827,6 +862,7 @@ uninstall-am: mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/core/Makefile.in b/app/core/Makefile.in index b81916c456..dcdf496616 100644 --- a/app/core/Makefile.in +++ b/app/core/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappcore_a_AR = $(AR) $(ARFLAGS) @@ -140,6 +143,7 @@ libappcore_a_OBJECTS = $(am_libappcore_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -810,9 +814,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/core/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/core/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/core/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/core/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -830,6 +834,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -1001,21 +1006,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -1038,7 +1043,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -1046,29 +1051,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1089,13 +1099,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -1124,6 +1138,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1145,6 +1160,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -1153,18 +1170,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -1227,6 +1254,7 @@ core-enums.c: $(srcdir)/core-enums.h $(GIMP_MKENUMS) $(srcdir)/core-enums.h > xgen-cec \ && cp xgen-cec $(@F) \ && rm -f xgen-cec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c index b1d31f9c00..302a18c61a 100644 --- a/app/core/gimplayer.c +++ b/app/core/gimplayer.c @@ -913,8 +913,9 @@ gimp_layer_transform_color (GimpImage *image, PixelRegion *destPR, GimpImageType dest_type) { - GimpImageBaseType base_type = GIMP_IMAGE_TYPE_BASE_TYPE (src_type); - gboolean alpha = GIMP_IMAGE_TYPE_HAS_ALPHA (src_type); + GimpImageBaseType base_type = GIMP_IMAGE_TYPE_BASE_TYPE (src_type); + gboolean src_alpha = GIMP_IMAGE_TYPE_HAS_ALPHA (src_type); + gboolean dest_alpha = GIMP_IMAGE_TYPE_HAS_ALPHA (dest_type); gpointer pr; for (pr = pixel_regions_register (2, srcPR, destPR); @@ -935,9 +936,9 @@ gimp_layer_transform_color (GimpImage *image, { gimp_image_transform_color (image, dest_type, d, base_type, s); - /* alpha channel */ - d[destPR->bytes - 1] = (alpha ? - s[srcPR->bytes - 1] : OPAQUE_OPACITY); + if (dest_alpha) + d[destPR->bytes - 1] = (src_alpha ? + s[srcPR->bytes - 1] : OPAQUE_OPACITY); s += srcPR->bytes; d += destPR->bytes; diff --git a/app/dialogs/Makefile.in b/app/dialogs/Makefile.in index be6d08f645..c84123558f 100644 --- a/app/dialogs/Makefile.in +++ b/app/dialogs/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappdialogs_a_AR = $(AR) $(ARFLAGS) @@ -76,6 +79,7 @@ libappdialogs_a_OBJECTS = $(am_libappdialogs_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -493,9 +497,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/dialogs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/dialogs/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/dialogs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/dialogs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -513,6 +517,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -564,21 +569,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -601,7 +606,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -609,29 +614,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -652,13 +662,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -686,6 +700,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -707,6 +722,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -715,18 +732,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -770,6 +797,7 @@ $(srcdir)/about-dialog.c: authors.h authors.h: $(top_srcdir)/authors.xml $(srcdir)/authors.xsl @HAVE_XSLTPROC_TRUE@ $(XSLTPROC) $(srcdir)/authors.xsl $< > $(@) || rm -f $(@) @HAVE_XSLTPROC_FALSE@ @echo "*** xsltproc is required to regenerate $(@) ***"; exit 1; + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/display/Makefile.in b/app/display/Makefile.in index 95997be484..0752ae04b5 100644 --- a/app/display/Makefile.in +++ b/app/display/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappdisplay_a_AR = $(AR) $(ARFLAGS) @@ -83,6 +86,7 @@ libappdisplay_a_OBJECTS = $(am_libappdisplay_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -498,9 +502,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/display/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/display/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/display/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/display/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -518,6 +522,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -567,21 +572,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -604,7 +609,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -612,29 +617,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -655,13 +665,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -690,6 +704,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -711,6 +726,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -719,18 +736,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -782,6 +809,7 @@ display-enums.c: $(srcdir)/display-enums.h $(GIMP_MKENUMS) $(srcdir)/display-enums.h > xgen-dec \ && cp xgen-dec $(@F) \ && rm -f xgen-dec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/display/gimpdisplayshell-selection.c b/app/display/gimpdisplayshell-selection.c index 928d3b8504..3e20e07c32 100644 --- a/app/display/gimpdisplayshell-selection.c +++ b/app/display/gimpdisplayshell-selection.c @@ -181,7 +181,8 @@ gimp_display_shell_selection_control (GimpDisplayShell *shell, break; case GIMP_SELECTION_LAYER_ON: - selection_layer_draw (selection); + if (! selection->layer_hidden) + selection_layer_draw (selection); break; case GIMP_SELECTION_ON: diff --git a/app/file/Makefile.in b/app/file/Makefile.in index 6f5feddd5b..026bc46a58 100644 --- a/app/file/Makefile.in +++ b/app/file/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappfile_a_AR = $(AR) $(ARFLAGS) @@ -57,6 +60,7 @@ libappfile_a_OBJECTS = $(am_libappfile_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -403,9 +407,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/file/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/file/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/file/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/file/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -423,6 +427,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -444,21 +449,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -481,7 +486,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -489,29 +494,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -532,13 +542,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -566,6 +580,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -587,6 +602,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -595,18 +612,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -644,6 +671,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/gegl/Makefile.in b/app/gegl/Makefile.in index 1721a467b8..d5c76965ee 100644 --- a/app/gegl/Makefile.in +++ b/app/gegl/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappgegl_a_AR = $(AR) $(ARFLAGS) @@ -72,6 +75,7 @@ libappgegl_a_OBJECTS = $(am_libappgegl_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -457,9 +461,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gegl/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/gegl/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gegl/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/gegl/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -477,6 +481,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -516,21 +521,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -553,7 +558,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -561,29 +566,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -604,13 +614,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -638,6 +652,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -659,6 +674,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -667,18 +684,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -716,6 +743,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/gui/Makefile.in b/app/gui/Makefile.in index a069cacaa0..c54cba317b 100644 --- a/app/gui/Makefile.in +++ b/app/gui/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappgui_a_AR = $(AR) $(ARFLAGS) @@ -61,6 +64,7 @@ libappgui_a_OBJECTS = $(am_libappgui_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -434,9 +438,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gui/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/gui/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/gui/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/gui/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -454,6 +458,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -481,21 +486,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -518,7 +523,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -526,29 +531,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -569,13 +579,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -604,6 +618,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -625,6 +640,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -633,18 +650,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -687,6 +714,7 @@ $(srcdir)/gimpdbusservice.c: gimpdbusservice-glue.h gimpdbusservice-glue.h: $(srcdir)/dbus-service.xml $(DBUS_BINDING_TOOL) --mode=glib-server --prefix=gimp $< > $(@F) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/menus/Makefile.in b/app/menus/Makefile.in index 0c6a1a6ec8..77ff4ef222 100644 --- a/app/menus/Makefile.in +++ b/app/menus/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappmenus_a_AR = $(AR) $(ARFLAGS) @@ -59,6 +62,7 @@ libappmenus_a_OBJECTS = $(am_libappmenus_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -414,9 +418,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/menus/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/menus/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/menus/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/menus/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -434,6 +438,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -459,21 +464,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -496,7 +501,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -504,29 +509,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -547,13 +557,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -581,6 +595,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -602,6 +617,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -610,18 +627,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -659,6 +686,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/paint-funcs/Makefile.in b/app/paint-funcs/Makefile.in index b010b49b0e..02fc21f681 100644 --- a/app/paint-funcs/Makefile.in +++ b/app/paint-funcs/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libapppaint_funcs_a_AR = $(AR) $(ARFLAGS) @@ -58,6 +61,7 @@ libapppaint_funcs_a_OBJECTS = $(am_libapppaint_funcs_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -411,9 +415,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/paint-funcs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/paint-funcs/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/paint-funcs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/paint-funcs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -431,6 +435,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -452,21 +457,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -489,7 +494,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -497,29 +502,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -540,13 +550,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -574,6 +588,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -595,6 +610,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -603,18 +620,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -652,6 +679,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/paint/Makefile.in b/app/paint/Makefile.in index 6118ed277f..7c850d9433 100644 --- a/app/paint/Makefile.in +++ b/app/paint/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libapppaint_a_AR = $(AR) $(ARFLAGS) @@ -72,6 +75,7 @@ libapppaint_a_OBJECTS = $(am_libapppaint_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -482,9 +486,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/paint/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/paint/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/paint/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/paint/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -502,6 +506,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -550,21 +555,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -587,7 +592,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -595,29 +600,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -638,13 +648,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -673,6 +687,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -694,6 +709,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -702,18 +719,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -765,6 +792,7 @@ paint-enums.c: $(srcdir)/paint-enums.h $(GIMP_MKENUMS) $(srcdir)/paint-enums.h > xgen-pec \ && cp xgen-pec $(@F) \ && rm -f xgen-pec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/paint/gimpheal.c b/app/paint/gimpheal.c index a8635e015f..4224f3fe30 100644 --- a/app/paint/gimpheal.c +++ b/app/paint/gimpheal.c @@ -299,17 +299,18 @@ gimp_heal_laplace_iteration (gdouble *matrix, gdouble *solution, guchar *mask) { - gint rowstride = width * depth; - gint i, j, k; - gdouble tmp, diff; - gdouble err = 0.0; + const gint rowstride = width * depth; + gint i, j, k; + gdouble tmp, diff; + gdouble err = 0.0; for (i = 0; i < height; i++) { for (j = 0; j < width; j++) { - if ((0 == *mask) || (i == 0) || (i == (height - 1)) || - (j == 0) || (j == (height - 1))) + if ((0 == *mask) || + (i == 0) || (i == (height - 1)) || + (j == 0) || (j == (width - 1))) { /* do nothing at the boundary or outside mask */ for (k = 0; k < depth; k++) diff --git a/app/pdb/Makefile.in b/app/pdb/Makefile.in index 5d22423db1..050ad750ec 100644 --- a/app/pdb/Makefile.in +++ b/app/pdb/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappinternal_procs_a_AR = $(AR) $(ARFLAGS) @@ -85,6 +88,7 @@ libapppdb_a_OBJECTS = $(am_libapppdb_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -490,9 +494,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/pdb/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/pdb/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/pdb/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/pdb/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -510,6 +514,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -585,21 +590,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -622,7 +627,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -630,29 +635,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -673,13 +683,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -707,6 +721,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -728,6 +743,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -736,18 +753,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -785,6 +812,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/plug-in/Makefile.in b/app/plug-in/Makefile.in index 6608b31b9a..4d21907bb1 100644 --- a/app/plug-in/Makefile.in +++ b/app/plug-in/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappplug_in_a_AR = $(AR) $(ARFLAGS) @@ -74,6 +77,7 @@ libappplug_in_a_OBJECTS = $(am_libappplug_in_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -481,9 +485,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/plug-in/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/plug-in/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/plug-in/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/plug-in/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -501,6 +505,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -547,21 +552,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -584,7 +589,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -592,29 +597,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -635,13 +645,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -670,6 +684,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -691,6 +706,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -699,18 +716,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -762,6 +789,7 @@ plug-in-enums.c: $(srcdir)/plug-in-enums.h $(GIMP_MKENUMS) $(srcdir)/plug-in-enums.h > xgen-bec \ && cp xgen-bec $(@F) \ && rm -f xgen-bec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/text/Makefile.in b/app/text/Makefile.in index 0ddfc0b349..837d59adaf 100644 --- a/app/text/Makefile.in +++ b/app/text/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libapptext_a_AR = $(AR) $(ARFLAGS) @@ -65,6 +68,7 @@ libapptext_a_OBJECTS = $(am_libapptext_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -448,9 +452,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/text/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/text/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/text/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/text/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -468,6 +472,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -502,21 +507,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -539,7 +544,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -547,29 +552,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -590,13 +600,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -625,6 +639,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -646,6 +661,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -654,18 +671,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -717,6 +744,7 @@ text-enums.c: $(srcdir)/text-enums.h $(GIMP_MKENUMS) $(srcdir)/text-enums.h > xgen-tec \ && cp xgen-tec $(@F) \ && rm -f xgen-tec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/tools/Makefile.in b/app/tools/Makefile.in index ba05835000..bf5661db07 100644 --- a/app/tools/Makefile.in +++ b/app/tools/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libapptools_a_AR = $(AR) $(ARFLAGS) @@ -104,6 +107,7 @@ libapptools_a_OBJECTS = $(am_libapptools_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -627,9 +631,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tools/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/tools/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/tools/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/tools/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -647,6 +651,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -751,21 +756,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -788,7 +793,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -796,29 +801,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -839,13 +849,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -874,6 +888,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -895,6 +910,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -903,18 +920,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -966,6 +993,7 @@ tools-enums.c: $(srcdir)/tools-enums.h $(GIMP_MKENUMS) $(srcdir)/tools-enums.h > xgen-tec \ && cp xgen-tec $(@F) \ && rm -f xgen-tec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/tools/gimpaligntool.c b/app/tools/gimpaligntool.c index e1ce60e090..427586110f 100644 --- a/app/tools/gimpaligntool.c +++ b/app/tools/gimpaligntool.c @@ -134,7 +134,7 @@ gimp_align_tool_register (GimpToolRegisterCallback callback, _("Align"), _("Alignment Tool: Align or arrange layers and other objects"), N_("_Align"), "Q", - NULL, GIMP_HELP_TOOL_MOVE, + NULL, GIMP_HELP_TOOL_ALIGN, GIMP_STOCK_TOOL_ALIGN, data); } diff --git a/app/tools/gimpfreeselecttool.c b/app/tools/gimpfreeselecttool.c index 3549cafed2..60511001a4 100644 --- a/app/tools/gimpfreeselecttool.c +++ b/app/tools/gimpfreeselecttool.c @@ -484,9 +484,10 @@ gimp_free_select_tool_remove_last_segment (GimpFreeSelectTool *fst) gimp_draw_tool_pause (draw_tool); - priv->n_segment_indices--; + if (priv->n_segment_indices > 0) + priv->n_segment_indices--; - if (priv->n_segment_indices == 0) + if (priv->n_segment_indices <= 0) { gimp_free_select_tool_halt (fst); } diff --git a/app/vectors/Makefile.in b/app/vectors/Makefile.in index 2a3966c969..8ee628f39d 100644 --- a/app/vectors/Makefile.in +++ b/app/vectors/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappvectors_a_AR = $(AR) $(ARFLAGS) @@ -62,6 +65,7 @@ libappvectors_a_OBJECTS = $(am_libappvectors_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -429,9 +433,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/vectors/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/vectors/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/vectors/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/vectors/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -449,6 +453,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -479,21 +484,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -516,7 +521,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -524,29 +529,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -567,13 +577,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -601,6 +615,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -622,6 +637,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -630,18 +647,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -679,6 +706,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/widgets/Makefile.in b/app/widgets/Makefile.in index 10a054eb39..496d1e0717 100644 --- a/app/widgets/Makefile.in +++ b/app/widgets/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappwidgets_a_AR = $(AR) $(ARFLAGS) @@ -146,6 +149,7 @@ libappwidgets_a_OBJECTS = $(am_libappwidgets_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -828,9 +832,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/widgets/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/widgets/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/widgets/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/widgets/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -848,6 +852,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -1030,21 +1035,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -1067,7 +1072,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -1075,29 +1080,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1118,13 +1128,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -1153,6 +1167,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -1174,6 +1189,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -1182,18 +1199,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -1245,6 +1272,7 @@ widgets-enums.c: $(srcdir)/widgets-enums.h $(GIMP_MKENUMS) $(srcdir)/widgets-enums.h > xgen-wec \ && cp xgen-wec $(@F) \ && rm -f xgen-wec + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index 63e527c1f6..13780b21b5 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -237,6 +237,7 @@ #define GIMP_HELP_TOOLS_DIALOG "gimp-tools-dialog" #define GIMP_HELP_TOOL_AIRBRUSH "gimp-tool-airbrush" +#define GIMP_HELP_TOOL_ALIGN "gimp-tool-align" #define GIMP_HELP_TOOL_BLEND "gimp-tool-blend" #define GIMP_HELP_TOOL_BRIGHTNESS_CONTRAST "gimp-tool-brightness-contrast" #define GIMP_HELP_TOOL_BUCKET_FILL "gimp-tool-bucket-fill" diff --git a/app/widgets/gimpimagedock.c b/app/widgets/gimpimagedock.c index 11250fe257..323ab201eb 100644 --- a/app/widgets/gimpimagedock.c +++ b/app/widgets/gimpimagedock.c @@ -46,6 +46,9 @@ static void gimp_image_dock_destroy (GtkObject *object); static void gimp_image_dock_display_changed (GimpContext *context, GimpObject *display, GimpImageDock *dock); +static void gimp_image_dock_image_changed (GimpContext *context, + GimpImage *image, + GimpImageDock *dock); static void gimp_image_dock_image_flush (GimpImage *image, gboolean invalidate_preview, GimpImageDock *dock); @@ -115,6 +118,9 @@ gimp_image_dock_constructor (GType type, g_signal_connect_object (GIMP_DOCK (dock)->context, "display-changed", G_CALLBACK (gimp_image_dock_display_changed), dock, 0); + g_signal_connect_object (GIMP_DOCK (dock)->context, "image-changed", + G_CALLBACK (gimp_image_dock_image_changed), + dock, 0); g_signal_connect_object (GIMP_DOCK (dock)->context->gimp->config, "notify::transient-docks", @@ -166,6 +172,14 @@ gimp_image_dock_display_changed (GimpContext *context, } } +static void +gimp_image_dock_image_changed (GimpContext *context, + GimpImage *image, + GimpImageDock *dock) +{ + gimp_ui_manager_update (dock->ui_manager, gimp_context_get_display (context)); +} + static void gimp_image_dock_image_flush (GimpImage *image, gboolean invalidate_preview, diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index d5c586aa48..b6780b90d4 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -1168,9 +1168,10 @@ gimp_layer_tree_view_mask_update (GimpLayerTreeView *layer_view, layer_view->model_column_mask_visible, mask_visible, -1); + gimp_layer_tree_view_update_borders (layer_view, iter); + if (renderer) { - gimp_layer_tree_view_update_borders (layer_view, iter); gimp_view_renderer_remove_idle (renderer); g_object_unref (renderer); } diff --git a/app/xcf/Makefile.in b/app/xcf/Makefile.in index 7943559742..1b91e7a562 100644 --- a/app/xcf/Makefile.in +++ b/app/xcf/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru libappxcf_a_AR = $(AR) $(ARFLAGS) @@ -58,6 +61,7 @@ libappxcf_a_OBJECTS = $(am_libappxcf_a_OBJECTS) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles +am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ @@ -409,9 +413,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/xcf/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu app/xcf/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu app/xcf/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu app/xcf/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -429,6 +433,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) @@ -452,21 +457,21 @@ distclean-compile: .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c $< .c.obj: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` .c.lo: @am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< @@ -489,7 +494,7 @@ tags: TAGS TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ @@ -497,29 +502,34 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -540,13 +550,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -574,6 +588,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -595,6 +610,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -603,18 +620,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -652,6 +679,7 @@ uninstall-am: mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ pdf pdf-am ps ps-am tags uninstall uninstall-am + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/compile b/compile index 1b1d232169..ec64c62202 100755 --- a/compile +++ b/compile @@ -1,9 +1,10 @@ #! /bin/sh # Wrapper for compilers which do not understand `-c -o'. -scriptversion=2005-05-14.22 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software +# Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,8 +18,7 @@ scriptversion=2005-05-14.22 # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -103,13 +103,13 @@ if test -z "$ofile" || test -z "$cfile"; then fi # Name of file we expect compiler to create. -cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'` +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/.-]' here to ensure that we don't use the same name +# Note: use `[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. -lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d while true; do if mkdir "$lockdir" >/dev/null 2>&1; then break @@ -138,5 +138,6 @@ exit $ret # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/configure b/configure index 529d2679f5..a468400b91 100755 --- a/configure +++ b/configure @@ -1,12 +1,14 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.64 for GIMP 2.6.7. +# Generated by GNU Autoconf 2.65 for GIMP 2.6.8. # # Report bugs to . # +# # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -# Foundation, Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. +# # # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -677,7 +679,8 @@ fi -exec 7<&0 &1 +test -n "$DJDIR" || exec 7<&0 &1 # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, @@ -699,8 +702,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='GIMP' PACKAGE_TARNAME='gimp' -PACKAGE_VERSION='2.6.7' -PACKAGE_STRING='GIMP 2.6.7' +PACKAGE_VERSION='2.6.8' +PACKAGE_STRING='GIMP 2.6.8' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=GIMP' PACKAGE_URL='' @@ -741,7 +744,9 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='LTLIBOBJS +ac_subst_vars='am__EXEEXT_FALSE +am__EXEEXT_TRUE +LTLIBOBJS LIBOBJS GIMP_MODULES GIMP_PLUGINS @@ -1775,7 +1780,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures GIMP 2.6.7 to adapt to many kinds of systems. +\`configure' configures GIMP 2.6.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1849,7 +1854,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GIMP 2.6.7:";; + short | recursive ) echo "Configuration of GIMP 2.6.8:";; esac cat <<\_ACEOF @@ -1884,7 +1889,7 @@ Optional Features: --enable-gimp-remote build gimp-remote utility (default=no) --disable-alsatest Do not try to compile and run a test Alsa program --disable-python do not build the python extension - --enable-gtk-doc use gtk-doc to build documentation default=no + --enable-gtk-doc use gtk-doc to build documentation [default=no] --enable-gtk-doc-app build developer documentation for app (default=no) --enable-default-binary install this as the default gimp binary (default=yes) --enable-gimp-console build a console-only binary which does not link GTK+ @@ -1933,7 +1938,7 @@ Some influential environment variables: LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if + CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if you have headers in a nonstandard directory CPP C preprocessor CCAS assembler compiler command (defaults to CC) @@ -2065,8 +2070,8 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GIMP configure 2.6.7 -generated by GNU Autoconf 2.64 +GIMP configure 2.6.8 +generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation @@ -2113,7 +2118,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_compile @@ -2159,7 +2164,7 @@ fi # left behind by Apple's compiler. We do this before executing the actions. rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_link @@ -2227,7 +2232,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 ac_retval=1 fi eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_cpp @@ -2269,7 +2274,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 fi rm -rf conftest.dSYM conftest_ipa8_conftest.oo eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - return $ac_retval + as_fn_set_status $ac_retval } # ac_fn_c_try_run @@ -2490,8 +2495,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GIMP $as_me 2.6.7, which was -generated by GNU Autoconf 2.64. Invocation command line was +It was created by GIMP $as_me 2.6.8, which was +generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -2744,7 +2749,7 @@ fi for ac_site_file in "$ac_site_file1" "$ac_site_file2" do test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then + if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 @@ -2753,9 +2758,9 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special files + # actually), so we avoid doing that. DJGPP emulates it as a regular file. + if test /dev/null != "$cache_file" && test -f "$cache_file"; then { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 $as_echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in @@ -2840,7 +2845,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.10' +am__api_version='1.11' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2963,16 +2968,29 @@ $as_echo_n "checking whether build environment is sane... " >&6; } # Just in case sleep 1 echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[\\\"\#\$\&\'\`$am_lf]*) + as_fn_error "unsafe absolute working directory name" "$LINENO" 5;; +esac +case $srcdir in + *[\\\"\#\$\&\'\`$am_lf\ \ ]*) + as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; +esac + # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` if test "$*" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftest.file` + set X `ls -t "$srcdir/configure" conftest.file` fi rm -f conftest.file if test "$*" != "X $srcdir/configure conftest.file" \ @@ -3010,7 +3028,14 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` # expand $ac_aux_dir to an absolute path am_aux_dir=`cd $ac_aux_dir && pwd` -test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi # Use eval to expand $SHELL if eval "$MISSING --run true"; then am_missing_run="$MISSING --run " @@ -3020,6 +3045,115 @@ else $as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} fi +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; } if test -z "$MKDIR_P"; then @@ -3048,6 +3182,7 @@ IFS=$as_save_IFS fi + test -d ./--version && rmdir ./--version if test "${ac_cv_path_mkdir+set}" = set; then MKDIR_P="$ac_cv_path_mkdir -p" else @@ -3055,7 +3190,6 @@ fi # value for MKDIR_P within a source directory, because that will # break other packages using the cache if that directory is # removed, or if the value is a relative name. - test -d ./--version && rmdir ./--version MKDIR_P="$ac_install_sh -d" fi fi @@ -3172,7 +3306,7 @@ fi # Define the identity of the package. PACKAGE='gimp' - VERSION='2.6.7' + VERSION='2.6.8' # Some tools Automake needs. @@ -3191,108 +3325,6 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} -install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} - -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -if test "$cross_compiling" != no; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 -$as_echo "$STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_STRIP="strip" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done - done -IFS=$as_save_IFS - -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 -$as_echo "$ac_ct_STRIP" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - - if test "x$ac_ct_STRIP" = x; then - STRIP=":" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - STRIP=$ac_ct_STRIP - fi -else - STRIP="$ac_cv_prog_STRIP" -fi - -fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" - # We need awk for the "check" target. The system "awk" is bad on # some platforms. # Always define AMTAR for backward compatibility. @@ -3310,11 +3342,11 @@ ac_config_headers="$ac_config_headers config.h" GIMP_MAJOR_VERSION=2 GIMP_MINOR_VERSION=6 -GIMP_MICRO_VERSION=7 -GIMP_INTERFACE_AGE=7 -GIMP_BINARY_AGE=607 -GIMP_VERSION=2.6.7 -GIMP_REAL_VERSION=2.6.7 +GIMP_MICRO_VERSION=8 +GIMP_INTERFACE_AGE=8 +GIMP_BINARY_AGE=608 +GIMP_VERSION=2.6.8 +GIMP_REAL_VERSION=2.6.8 GIMP_API_VERSION=2.0 GIMP_APP_VERSION=2.6 GIMP_PLUGIN_VERSION=2.0 @@ -3372,7 +3404,7 @@ fi -LT_VERSION_INFO="600:7:600" +LT_VERSION_INFO="600:8:600" LT_CURRENT_MINUS_AGE=0 @@ -3710,32 +3742,30 @@ $as_echo "$ac_try_echo"; } >&5 ... rest of stderr output deleted ... 10q' conftest.err >conftest.er1 cat conftest.er1 >&5 - rm -f conftest.er1 conftest.err fi + rm -f conftest.er1 conftest.err $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; } done cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include + int main () { -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; ; return 0; } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out conftest.out" +ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 +$as_echo_n "checking whether the C compiler works... " >&6; } ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` # The possible output files: @@ -3797,10 +3827,10 @@ test "$ac_cv_exeext" = no && ac_cv_exeext= else ac_file='' fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } if test -z "$ac_file"; then : - $as_echo "$as_me: failed program was:" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +$as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 @@ -3808,51 +3838,18 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { as_fn_set_status 77 as_fn_error "C compiler cannot create executables See \`config.log' for more details." "$LINENO" 5; }; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 +$as_echo_n "checking for C compiler default output file name... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 +$as_echo "$ac_file" >&6; } ac_exeext=$ac_cv_exeext -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out conftest.out +rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 $as_echo_n "checking for suffix of executables... " >&6; } if { { ac_try="$ac_link" @@ -3885,13 +3882,72 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error "cannot compute suffix of executables: cannot compile and link See \`config.log' for more details." "$LINENO" 5; } fi -rm -f conftest$ac_cv_exeext +rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 $as_echo "$ac_cv_exeext" >&6; } rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include +int +main () +{ +FILE *f = fopen ("conftest.out", "w"); + return ferror (f) || fclose (f) != 0; + + ; + return 0; +} +_ACEOF +ac_clean_files="$ac_clean_files conftest.out" +# Check that the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 +$as_echo_n "checking whether we are cross compiling... " >&6; } +if test "$cross_compiling" != yes; then + { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } + if { ac_try='./conftest$ac_cv_exeext' + { { case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_try") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error "cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." "$LINENO" 5; } + fi + fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 +$as_echo "$cross_compiling" >&6; } + +rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out +ac_clean_files=$ac_clean_files_save { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 $as_echo_n "checking for suffix of object files... " >&6; } if test "${ac_cv_objext+set}" = set; then : @@ -4162,7 +4218,7 @@ ac_config_commands="$ac_config_commands depfiles" am_make=${MAKE-make} cat > confinc << 'END' am__doit: - @echo done + @echo this is the am__doit target .PHONY: am__doit END # If we don't find an include directive, just comment out the code. @@ -4173,24 +4229,24 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# We grep out `Entering directory' and `Leaving directory' -# messages which can occur if `w' ends up in MAKEFLAGS. -# In particular we don't look at `^make:' because GNU make might -# be invoked under some other name (usually "gmake"), in which -# case it prints its new name instead of `make'. -if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then - am__include=include - am__quote= - _am_result=GNU -fi +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac # Now try BSD make style include. if test "$am__include" = "#"; then echo '.include "confinc"' > confmf - if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then - am__include=.include - am__quote="\"" - _am_result=BSD - fi + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac fi @@ -4247,6 +4303,11 @@ else if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -4264,7 +4325,17 @@ else done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -4274,19 +4345,23 @@ else break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -5467,13 +5542,13 @@ if test "${lt_cv_nm_interface+set}" = set; then : else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:5470: $ac_compile\"" >&5) + (eval echo "\"\$as_me:5545: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:5473: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:5548: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:5476: output\"" >&5) + (eval echo "\"\$as_me:5551: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -6676,7 +6751,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6679 "configure"' > conftest.$ac_ext + echo '#line 6754 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8170,11 +8245,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8173: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8248: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8177: \$? = $ac_status" >&5 + echo "$as_me:8252: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8509,11 +8584,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8512: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8587: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8516: \$? = $ac_status" >&5 + echo "$as_me:8591: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8614,11 +8689,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8617: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8692: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8621: \$? = $ac_status" >&5 + echo "$as_me:8696: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8669,11 +8744,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8672: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8747: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8676: \$? = $ac_status" >&5 + echo "$as_me:8751: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -11052,7 +11127,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11055 "configure" +#line 11130 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11148,7 +11223,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11151 "configure" +#line 11226 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11413,6 +11488,9 @@ else if test "$am_compiler_list" = ""; then am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp` fi + am__universal=false + + for depmode in $am_compiler_list; do # Setup a source with many dependencies, because some compilers # like to wrap large dependency lists on column 80 (with \), and @@ -11430,7 +11508,17 @@ else done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; nosideeffect) # after this tag, mechanisms are not by side-effect, so they'll # only be used when explicitly requested @@ -11440,19 +11528,23 @@ else break fi ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; none) break ;; esac - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. if depmode=$depmode \ - source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \ + source=sub/conftest.c object=$am__obj \ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ >/dev/null 2>conftest.err && grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && ${MAKE-make} -s -f confmf > /dev/null 2>&1; then # icc doesn't choke on unknown options, it will just issue warnings # or remarks (even with -Werror). So we grep stderr for any message @@ -11493,6 +11585,7 @@ fi # Initialize maintainer mode + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -20297,12 +20390,14 @@ if test "x$enable_python" != xno; then # If the user set $PYTHON, use it and don't search something else. { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.5.0" >&5 $as_echo_n "checking whether $PYTHON version >= 2.5.0... " >&6; } - prog="import sys, string + prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. -minver = map(int, string.split('2.5.0', '.')) + [0, 0, 0] +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '2.5.0'.split('.'))) + [0, 0, 0] minverhex = 0 -for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] sys.exit(sys.hexversion < minverhex)" if { echo "$as_me:$LINENO: $PYTHON -c "$prog"" >&5 ($PYTHON -c "$prog") >&5 2>&5 @@ -20324,14 +20419,16 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then : $as_echo_n "(cached) " >&6 else - for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do + for am_cv_pathless_PYTHON in python python2 python3 python3.0 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 none; do test "$am_cv_pathless_PYTHON" = none && break - prog="import sys, string + prog="import sys # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. -minver = map(int, string.split('2.5.0', '.')) + [0, 0, 0] +# map returns an iterator in Python 3.0 and a list in 2.x +minver = list(map(int, '2.5.0'.split('.'))) + [0, 0, 0] minverhex = 0 -for i in xrange(0, 4): minverhex = (minverhex << 8) + minver[i] +# xrange is not present in Python 3.0 and range returns an iterator +for i in list(range(0, 4)): minverhex = (minverhex << 8) + minver[i] sys.exit(sys.hexversion < minverhex)" if { echo "$as_me:$LINENO: $am_cv_pathless_PYTHON -c "$prog"" >&5 ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 @@ -20407,7 +20504,7 @@ $as_echo_n "checking for $am_display_PYTHON version... " >&6; } if test "${am_cv_python_version+set}" = set; then : $as_echo_n "(cached) " >&6 else - am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` + am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"` fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 $as_echo "$am_cv_python_version" >&6; } @@ -20426,7 +20523,7 @@ $as_echo_n "checking for $am_display_PYTHON platform... " >&6; } if test "${am_cv_python_platform+set}" = set; then : $as_echo_n "(cached) " >&6 else - am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` + am_cv_python_platform=`$PYTHON -c "import sys; sys.stdout.write(sys.platform)"` fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 $as_echo "$am_cv_python_platform" >&6; } @@ -20440,8 +20537,21 @@ $as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } if test "${am_cv_python_pythondir+set}" = set; then : $as_echo_n "(cached) " >&6 else - am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || + if test "x$prefix" = xNONE + then + am_py_prefix=$ac_default_prefix + else + am_py_prefix=$prefix + fi + am_cv_python_pythondir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(0,0,prefix='$am_py_prefix'))" 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pythondir in + $am_py_prefix*) + am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'` + am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"` + ;; + esac + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 $as_echo "$am_cv_python_pythondir" >&6; } @@ -20457,8 +20567,21 @@ $as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; if test "${am_cv_python_pyexecdir+set}" = set; then : $as_echo_n "(cached) " >&6 else - am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || - echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` + if test "x$exec_prefix" = xNONE + then + am_py_exec_prefix=$am_py_prefix + else + am_py_exec_prefix=$exec_prefix + fi + am_cv_python_pyexecdir=`$PYTHON -c "import sys; from distutils import sysconfig; sys.stdout.write(sysconfig.get_python_lib(1,0,prefix='$am_py_exec_prefix'))" 2>/dev/null || + echo "$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages"` + case $am_cv_python_pyexecdir in + $am_py_exec_prefix*) + am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'` + am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"` + ;; + esac + fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 $as_echo "$am_cv_python_pyexecdir" >&6; } @@ -21320,6 +21443,14 @@ LIBOBJS=$ac_libobjs LTLIBOBJS=$ac_ltlibobjs + if test -n "$EXEEXT"; then + am__EXEEXT_TRUE= + am__EXEEXT_FALSE='#' +else + am__EXEEXT_TRUE='#' + am__EXEEXT_FALSE= +fi + if test -z "${GIMP_UNSTABLE_TRUE}" && test -z "${GIMP_UNSTABLE_FALSE}"; then as_fn_error "conditional \"GIMP_UNSTABLE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -21876,8 +22007,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GIMP $as_me 2.6.7, which was -generated by GNU Autoconf 2.64. Invocation command line was +This file was extended by GIMP $as_me 2.6.8, which was +generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21917,6 +22048,7 @@ Usage: $0 [OPTION]... [TAG]... -h, --help print this help, then exit -V, --version print version number and configuration settings, then exit + --config print configuration, then exit -q, --quiet, --silent do not print progress messages -d, --debug don't remove temporary files @@ -21939,10 +22071,11 @@ Report bugs to ." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GIMP config.status 2.6.7 -configured by $0, generated by GNU Autoconf 2.64, - with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" +GIMP config.status 2.6.8 +configured by $0, generated by GNU Autoconf 2.65, + with options \\"\$ac_cs_config\\" Copyright (C) 2009 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation @@ -21980,6 +22113,8 @@ do ac_cs_recheck=: ;; --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) $as_echo "$ac_cs_version"; exit ;; + --config | --confi | --conf | --con | --co | --c ) + $as_echo "$ac_cs_config"; exit ;; --debug | --debu | --deb | --de | --d | -d ) debug=: ;; --file | --fil | --fi | --f ) @@ -22312,8 +22447,8 @@ fi gimp_major_ver=2 gimp_minor_ver=6 - gimp_micro_ver=7 - gimp_ver=2.6.7 + gimp_micro_ver=8 + gimp_ver=2.6.8 gimp_api_ver=2.0 @@ -22571,7 +22706,7 @@ s/'"$ac_delim"'$// t delim :nl h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more1 s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ p @@ -22585,7 +22720,7 @@ s/.\{148\}// t nl :delim h -s/\(.\{148\}\).*/\1/ +s/\(.\{148\}\)..*/\1/ t more2 s/["\\]/\\&/g; s/^/"/; s/$/"/ p @@ -23052,27 +23187,28 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in - "depfiles":C) test x"$AMDEP_TRUE" != x"" || # Autoconf 2.62 quotes --file arguments for eval, but not when files -# are listed without --file. Let's play safe and only enable the eval -# if we detect the quoting. -case $CONFIG_FILES in -*\'*) eval set x "$CONFIG_FILES" ;; -*) set x $CONFIG_FILES ;; -esac -shift -for mf -do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`$as_dirname -- "$mf" || + "depfiles":C) test x"$AMDEP_TRUE" != x"" || { + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$mf" : 'X\(//\)[^/]' \| \ X"$mf" : 'X\(//\)$' \| \ @@ -23095,28 +23231,28 @@ $as_echo X"$mf" | q } s/.*/./; q'` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`$as_dirname -- "$file" || + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$file" : 'X\(//\)[^/]' \| \ X"$file" : 'X\(//\)$' \| \ @@ -23139,11 +23275,12 @@ $as_echo X"$file" | q } s/.*/./; q'` - as_dir=$dirpart/$fdir; as_fn_mkdir_p - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done -done +} ;; "libtool":C) diff --git a/configure.in b/configure.in index c0c726c157..e25b429fcc 100644 --- a/configure.in +++ b/configure.in @@ -8,11 +8,11 @@ AC_PREREQ(2.54) m4_define([gimp_major_version], [2]) m4_define([gimp_minor_version], [6]) -m4_define([gimp_micro_version], [7]) +m4_define([gimp_micro_version], [8]) m4_define([gimp_real_version], [gimp_major_version.gimp_minor_version.gimp_micro_version]) m4_define([gimp_version], [gimp_real_version]) -m4_define([gimp_interface_age], [7]) +m4_define([gimp_interface_age], [8]) m4_define([gimp_binary_age], [m4_eval(100 * gimp_minor_version + gimp_micro_version)]) diff --git a/cursors/Makefile.in b/cursors/Makefile.in index e839fdd3d9..5f7e4ea4c7 100644 --- a/cursors/Makefile.in +++ b/cursors/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DATA = $(noinst_DATA) @@ -568,9 +571,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cursors/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu cursors/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu cursors/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu cursors/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -588,6 +591,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -617,13 +621,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -652,6 +660,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -670,6 +679,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -678,18 +689,28 @@ install-data-am: install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -734,6 +755,7 @@ tool-cursors.list: $(CURSOR_IMAGES) Makefile.am $(srcdir)/gimp-tool-cursors.h: tool-cursors.list $(GDK_PIXBUF_CSOURCE) --raw --build-list `cat tool-cursors.list` > $(@F) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/Makefile.in b/data/Makefile.in index 064d03f7e7..4bbc9688cf 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -46,6 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -57,10 +60,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -380,9 +411,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -400,6 +431,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -431,7 +463,7 @@ $(RECURSIVE_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -465,16 +497,16 @@ $(RECURSIVE_CLEAN_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -489,7 +521,7 @@ tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -501,7 +533,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -510,29 +542,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -553,29 +590,44 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -605,6 +657,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -623,6 +676,8 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: @@ -631,18 +686,28 @@ install-data-am: install-data-local install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -663,8 +728,8 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -683,6 +748,7 @@ uninstall-am: install-data-local: $(mkinstalldirs) $(DESTDIR)$(fontdir) + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/brushes/Makefile.in b/data/brushes/Makefile.in index 5b66813176..260258de2c 100644 --- a/data/brushes/Makefile.in +++ b/data/brushes/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(brushdatadir)" -brushdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(brushdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -419,9 +436,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/brushes/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/brushes/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/brushes/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -439,6 +456,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -448,20 +466,23 @@ clean-libtool: install-brushdataDATA: $(brushdata_DATA) @$(NORMAL_INSTALL) test -z "$(brushdatadir)" || $(MKDIR_P) "$(DESTDIR)$(brushdatadir)" - @list='$(brushdata_DATA)'; for p in $$list; do \ + @list='$(brushdata_DATA)'; test -n "$(brushdatadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(brushdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(brushdatadir)/$$f'"; \ - $(brushdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(brushdatadir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(brushdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(brushdatadir)" || exit $$?; \ done uninstall-brushdataDATA: @$(NORMAL_UNINSTALL) - @list='$(brushdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(brushdatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(brushdatadir)/$$f"; \ - done + @list='$(brushdata_DATA)'; test -n "$(brushdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(brushdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(brushdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -485,13 +506,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -522,6 +547,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -540,6 +566,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -548,18 +576,28 @@ install-data-am: install-brushdataDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -594,6 +632,7 @@ uninstall-am: uninstall-brushdataDATA mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ uninstall uninstall-am uninstall-brushdataDATA + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/environ/Makefile.in b/data/environ/Makefile.in index d3d2e4ce84..c5b1a1c3bf 100644 --- a/data/environ/Makefile.in +++ b/data/environ/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(environdir)" -environDATA_INSTALL = $(INSTALL_DATA) DATA = $(environ_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -370,9 +387,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/environ/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/environ/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/environ/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/environ/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -390,6 +407,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -399,20 +417,23 @@ clean-libtool: install-environDATA: $(environ_DATA) @$(NORMAL_INSTALL) test -z "$(environdir)" || $(MKDIR_P) "$(DESTDIR)$(environdir)" - @list='$(environ_DATA)'; for p in $$list; do \ + @list='$(environ_DATA)'; test -n "$(environdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(environDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(environdir)/$$f'"; \ - $(environDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(environdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(environdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(environdir)" || exit $$?; \ done uninstall-environDATA: @$(NORMAL_UNINSTALL) - @list='$(environ_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(environdir)/$$f'"; \ - rm -f "$(DESTDIR)$(environdir)/$$f"; \ - done + @list='$(environ_DATA)'; test -n "$(environdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(environdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(environdir)" && rm -f $$files tags: TAGS TAGS: @@ -436,13 +457,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -473,6 +498,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -491,6 +517,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -499,18 +527,28 @@ install-data-am: install-environDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -545,6 +583,7 @@ uninstall-am: uninstall-environDATA mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ uninstall uninstall-am uninstall-environDATA + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/gradients/Makefile.in b/data/gradients/Makefile.in index 385835ede1..caad6d30c5 100644 --- a/data/gradients/Makefile.in +++ b/data/gradients/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(gradientdatadir)" -gradientdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(gradientdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -449,9 +466,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/gradients/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/gradients/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/gradients/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/gradients/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -469,6 +486,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -478,20 +496,23 @@ clean-libtool: install-gradientdataDATA: $(gradientdata_DATA) @$(NORMAL_INSTALL) test -z "$(gradientdatadir)" || $(MKDIR_P) "$(DESTDIR)$(gradientdatadir)" - @list='$(gradientdata_DATA)'; for p in $$list; do \ + @list='$(gradientdata_DATA)'; test -n "$(gradientdatadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(gradientdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gradientdatadir)/$$f'"; \ - $(gradientdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gradientdatadir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gradientdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(gradientdatadir)" || exit $$?; \ done uninstall-gradientdataDATA: @$(NORMAL_UNINSTALL) - @list='$(gradientdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(gradientdatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(gradientdatadir)/$$f"; \ - done + @list='$(gradientdata_DATA)'; test -n "$(gradientdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(gradientdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gradientdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -515,13 +536,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -552,6 +577,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -570,6 +596,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -578,18 +606,28 @@ install-data-am: install-gradientdataDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -624,6 +662,7 @@ uninstall-am: uninstall-gradientdataDATA mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am uninstall uninstall-am uninstall-gradientdataDATA + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/images/Makefile.in b/data/images/Makefile.in index febd8d593f..2ea39c73b4 100644 --- a/data/images/Makefile.in +++ b/data/images/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(imagedatadir)" -imagedataDATA_INSTALL = $(INSTALL_DATA) DATA = $(imagedata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -374,9 +391,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/images/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/images/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/images/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/images/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -394,6 +411,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -403,20 +421,23 @@ clean-libtool: install-imagedataDATA: $(imagedata_DATA) @$(NORMAL_INSTALL) test -z "$(imagedatadir)" || $(MKDIR_P) "$(DESTDIR)$(imagedatadir)" - @list='$(imagedata_DATA)'; for p in $$list; do \ + @list='$(imagedata_DATA)'; test -n "$(imagedatadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(imagedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagedatadir)/$$f'"; \ - $(imagedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagedatadir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagedatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(imagedatadir)" || exit $$?; \ done uninstall-imagedataDATA: @$(NORMAL_UNINSTALL) - @list='$(imagedata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(imagedatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(imagedatadir)/$$f"; \ - done + @list='$(imagedata_DATA)'; test -n "$(imagedatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(imagedatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(imagedatadir)" && rm -f $$files tags: TAGS TAGS: @@ -440,13 +461,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -477,6 +502,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -495,6 +521,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -503,18 +531,28 @@ install-data-am: install-imagedataDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -549,6 +587,7 @@ uninstall-am: uninstall-imagedataDATA mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ uninstall uninstall-am uninstall-imagedataDATA + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/interpreters/Makefile.in b/data/interpreters/Makefile.in index e0169c7432..28835fefde 100644 --- a/data/interpreters/Makefile.in +++ b/data/interpreters/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(interpretersdir)" -interpretersDATA_INSTALL = $(INSTALL_DATA) DATA = $(interpreters_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -370,9 +387,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/interpreters/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/interpreters/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/interpreters/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/interpreters/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -390,6 +407,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -399,20 +417,23 @@ clean-libtool: install-interpretersDATA: $(interpreters_DATA) @$(NORMAL_INSTALL) test -z "$(interpretersdir)" || $(MKDIR_P) "$(DESTDIR)$(interpretersdir)" - @list='$(interpreters_DATA)'; for p in $$list; do \ + @list='$(interpreters_DATA)'; test -n "$(interpretersdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(interpretersDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(interpretersdir)/$$f'"; \ - $(interpretersDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(interpretersdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(interpretersdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(interpretersdir)" || exit $$?; \ done uninstall-interpretersDATA: @$(NORMAL_UNINSTALL) - @list='$(interpreters_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(interpretersdir)/$$f'"; \ - rm -f "$(DESTDIR)$(interpretersdir)/$$f"; \ - done + @list='$(interpreters_DATA)'; test -n "$(interpretersdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(interpretersdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(interpretersdir)" && rm -f $$files tags: TAGS TAGS: @@ -436,13 +457,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -473,6 +498,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -491,6 +517,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -499,18 +527,28 @@ install-data-am: install-interpretersDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -545,6 +583,7 @@ uninstall-am: uninstall-interpretersDATA mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am uninstall uninstall-am uninstall-interpretersDATA + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/palettes/Makefile.in b/data/palettes/Makefile.in index e55b2e1431..2e8f31d92b 100644 --- a/data/palettes/Makefile.in +++ b/data/palettes/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(palettedatadir)" -palettedataDATA_INSTALL = $(INSTALL_DATA) DATA = $(palettedata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -411,9 +428,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/palettes/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/palettes/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/palettes/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/palettes/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -431,6 +448,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -440,20 +458,23 @@ clean-libtool: install-palettedataDATA: $(palettedata_DATA) @$(NORMAL_INSTALL) test -z "$(palettedatadir)" || $(MKDIR_P) "$(DESTDIR)$(palettedatadir)" - @list='$(palettedata_DATA)'; for p in $$list; do \ + @list='$(palettedata_DATA)'; test -n "$(palettedatadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(palettedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(palettedatadir)/$$f'"; \ - $(palettedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(palettedatadir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(palettedatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(palettedatadir)" || exit $$?; \ done uninstall-palettedataDATA: @$(NORMAL_UNINSTALL) - @list='$(palettedata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(palettedatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(palettedatadir)/$$f"; \ - done + @list='$(palettedata_DATA)'; test -n "$(palettedatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(palettedatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(palettedatadir)" && rm -f $$files tags: TAGS TAGS: @@ -477,13 +498,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -514,6 +539,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -532,6 +558,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -540,18 +568,28 @@ install-data-am: install-palettedataDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -586,6 +624,7 @@ uninstall-am: uninstall-palettedataDATA mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am uninstall uninstall-am uninstall-palettedataDATA + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/patterns/Makefile.in b/data/patterns/Makefile.in index 42b50d203f..65b48f972f 100644 --- a/data/patterns/Makefile.in +++ b/data/patterns/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(patterndatadir)" -patterndataDATA_INSTALL = $(INSTALL_DATA) DATA = $(patterndata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -429,9 +446,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/patterns/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/patterns/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/patterns/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/patterns/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -449,6 +466,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -458,20 +476,23 @@ clean-libtool: install-patterndataDATA: $(patterndata_DATA) @$(NORMAL_INSTALL) test -z "$(patterndatadir)" || $(MKDIR_P) "$(DESTDIR)$(patterndatadir)" - @list='$(patterndata_DATA)'; for p in $$list; do \ + @list='$(patterndata_DATA)'; test -n "$(patterndatadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(patterndataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(patterndatadir)/$$f'"; \ - $(patterndataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(patterndatadir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(patterndatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(patterndatadir)" || exit $$?; \ done uninstall-patterndataDATA: @$(NORMAL_UNINSTALL) - @list='$(patterndata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(patterndatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(patterndatadir)/$$f"; \ - done + @list='$(patterndata_DATA)'; test -n "$(patterndatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(patterndatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(patterndatadir)" && rm -f $$files tags: TAGS TAGS: @@ -495,13 +516,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -532,6 +557,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -550,6 +576,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -558,18 +586,28 @@ install-data-am: install-patterndataDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -604,6 +642,7 @@ uninstall-am: uninstall-patterndataDATA mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ ps ps-am uninstall uninstall-am uninstall-patterndataDATA + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/tips/Makefile.in b/data/tips/Makefile.in index 964906e1c9..035d8b6a26 100644 --- a/data/tips/Makefile.in +++ b/data/tips/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(tipsdatadir)" -tipsdataDATA_INSTALL = $(INSTALL_DATA) DATA = $(tipsdata_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) AA_LIBS = @AA_LIBS@ @@ -378,9 +395,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tips/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu data/tips/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu data/tips/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu data/tips/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -398,6 +415,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -407,20 +425,23 @@ clean-libtool: install-tipsdataDATA: $(tipsdata_DATA) @$(NORMAL_INSTALL) test -z "$(tipsdatadir)" || $(MKDIR_P) "$(DESTDIR)$(tipsdatadir)" - @list='$(tipsdata_DATA)'; for p in $$list; do \ + @list='$(tipsdata_DATA)'; test -n "$(tipsdatadir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(tipsdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(tipsdatadir)/$$f'"; \ - $(tipsdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(tipsdatadir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(tipsdatadir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(tipsdatadir)" || exit $$?; \ done uninstall-tipsdataDATA: @$(NORMAL_UNINSTALL) - @list='$(tipsdata_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(tipsdatadir)/$$f'"; \ - rm -f "$(DESTDIR)$(tipsdatadir)/$$f"; \ - done + @list='$(tipsdata_DATA)'; test -n "$(tipsdatadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(tipsdatadir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(tipsdatadir)" && rm -f $$files tags: TAGS TAGS: @@ -444,13 +465,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -484,6 +509,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -503,6 +529,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -511,18 +539,28 @@ install-data-am: install-tipsdataDATA install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -571,6 +609,7 @@ fortunes: gimp-tips.xml fortunes.xsl @HAVE_XSLTPROC_FALSE@ @echo "xsltproc is needed to build fortunes"; exit 1; dist-hook: validate + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/data/tips/gimp-tips.xml b/data/tips/gimp-tips.xml index 2413f8481f..e2a95c0888 100644 --- a/data/tips/gimp-tips.xml +++ b/data/tips/gimp-tips.xml @@ -29,7 +29,7 @@ A GIMP legtöbb funkciójáról környezetérzékeny segítség kérhető az F1 billentyű lenyomásával. Ez a menükön belül is működik. Hvenær sem er, getur þú fengið leiðbeiningar í réttu samhengi fyrir flest tól í GIMP með því að ýta á F1 lykilinn. Þetta virkar einnig í valmyndum. È possibile ottenere un aiuto sensibile al contesto per la maggior parte delle funzioni di GIMP premendo F1 in qualsiasi istante. Funziona anche all'interno dei menu. - F1 キーを押すと、いつでもその機能のヘルプを呼び出すことができるんだ。これはメニューの中でも使えるよ。（ヘルプは英語表示だけどね・・・） + F1 キーを押すと、いつでもその機能のヘルプを呼び出すことができるんだ。これはメニューの中でも使えるよ。 អ្នក​អាច​ទទួល​ជំនួយ​បរិបទ​សម្រាប់​លក្ខណៈ​សម្បត្តិ​ជា​ច្រើន​របស់ GIMP ដោយ​ចុច​គ្រាប់​ចុច F1 នៅ​ពេល​ណា​មួយ ។ វា​ក៏​ដំណើរការ​ខាង​ក្នុង​ម៉ឺនុយ​ផងដែរ ។ 언제라도 F1키를 누르면 GIMP의 대부분의 기능들에 대해서 문맥에 맞는 도움말을 볼 수 있습니다. 물론 메뉴 안에서도 됩니다. Daugumos GIMP funkcijų kontekstinį žinyną galite pamatyti bet kuriuo metu paspaudę klavišą F1. Tai taip pat veikia ir atidarius meniu. @@ -986,7 +986,7 @@ Nachdem Sie in den Einstellungen »Dynamische Tastenkombinationen« aktiviert haben, können Sie Tastenkombinationen einfach zuweisen oder verändern. Wählen Sie dazu mit dem Mauspfeil den entsprechenden Menüeintrag aus und drücken Sie anschließend die neue Tastenkombination. Wenn »Tastenkombinationen speichern« aktiviert ist, werden die von Ihnen definierten Tastenkürzel auch über das Beenden von GIMP hinaus gespeichert. Eventuell sollten Sie »Dynamische Tastenkombinationen« danach wieder ausschalten, um ein unbeabsichtigtes Ändern der Belegungen zu verhindern. དགའ་གདམ་ཌའི་ལོག་ནང་ ཁྱོད་ཀྱིས་"ནུས་ཅན་ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་" དེ་ ཤུགས་ཅན་བཟོ་ཚར་བའི་ཤུལ་ལས་ ཁྱོད་ཀྱིས་མགྱོགས་ཐབས་ལྡེ་མིག་ཚུ་འགན་སྤྲོད་འབད་ཚུགས། དེ་ཡང་ དཀར་ཆག་ཡར་འབག་འོང་སྟེ་འབད་ནི་དང་ དཀར་ཆག་གི་རྣམ་གྲངས་སེལ་འཐུ་འབད་བའི་ཐོག་ལས་དང་ རེ་འདུན་ཅན་གྱི་མཉམ་མཐུད་ལྡེ་སྒྲོམ་ཨེབ་པའི་ཐོག་ལས་འབད་དགོཔ་ཨིན། "ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་སྲུང་བཞག་འབད་ནི་"དེ་ལྕོགས་ཅན་བཟོ་ཚར་བ་ཅིན་ ཁྱོད་ཀྱིས་ཇི་ཨའི་ཨེམ་པི་དེ་ཕྱིར་ཐོན་འབད་བའི་སྐབས་ལུ་ ཀི་བཱའིན་ཌིང་ཚུ་ སྲུང་བཞག་འབདཝ་ཨིན། ཁྱོད་ཀྱིས་ ཤུལ་ལས་" ནུས་ཅན་ལྡེ་སྒྲོམ་མགྱོགས་ཐབས་" འདི་ལྕོགས་མེད་བཟོ་དགོ་ དེ་ཡང་ གློ་བུར་དུ་འགན་སྤྲོད་འབད་ནི་/ལོག་འགན་སྤྲོད་འབད་བའི་མགྱོགས་ཐབས་ཚུ་སྔོན་བཀག་འབད་ནི་ལུ་ཨིན། After you enabled "Dynamic Keyboard Shortcuts" in the Preferences dialogue, you can reassign shortcut keys. Do so by bringing up the menu, selecting a menu item, and pressing the desired key combination. If "Save Keyboard Shortcuts" is enabled, the key bindings are saved when you exit GIMP. You should probably disable "Dynamic Keyboard Shortcuts" afterwards, to prevent accidentally assigning/reassigning shortcuts. - After you enabled "Dynamic Keyboard Shortcuts" in the Preferences dialogue, you can reassign shortcut keys. Do so by bringing up the menu, selecting a menu item, and pressing the desired key combination. If "Save Keyboard Shortcuts" is enabled, the key bindings are saved when you exit GIMP. You should probably disable "Dynamic Keyboard Shortcuts" afterwards, to prevent accidentally assigning/reassigning shortcuts. + After you enabled "Dynamic Keyboard Shortcuts" in the Preferences dialogue, you can reassign shortcut keys. Do so by bringing up the menu, selecting a menu item and pressing the desired key combination. If "Save Keyboard Shortcuts" is enabled, the key bindings are saved when you exit GIMP. You should probably disable "Dynamic Keyboard Shortcuts" afterwards, to prevent accidentally assigning/reassigning shortcuts. Post aktivado de "Dinamikaj Klavarkurtvojoj" en AGORDOJ, vi povas reatribui klavarkurtvojojn. Estas sufice ke vi malfermu menuon, elektu eron, kaj premu celitan klavkombinon. Se la opcio "Konservu Klavarkurtvojojn Elire" estas ebligita, la klavkombino estos konservata elirante el GIMP. Vi devus malebligi "Dinamikaj Klavarkurtvojoj" por antaŭeviti hazardajn atribuojn/reatribuojn de klavarkurtvojoj. Después de activar las «Combinaciones de teclas dinámicas» en el diálogo de «Preferencias», puede reasignar combinaciones de teclas. Haga esto abriendo el menú, seleccionando un elemento del menú y pulsando la combinación de teclas deseada. Si está activado «Guardar las combinaciones de teclas» las combinaciones se guardarán al salir de GIMP. Porblablemente deba desactivar después «Combinaciones de teclas dinámicas» para evitar la asignación y reasignación accidental de combinaciones de teclas. Pärast "dünaamiliste kiirklahvide" lubamist seadistusdialoogis saad kiirklahve ümber määrata. Selleks ava menüü, vali element ja vajuta soovitud klahvikombinatsiooni. Kui "kiirklahvide salvestamine" on lubatud, salvestatakse need GIMP-i sulgemisel. Hiljem võiks "dünaamilised kiirklahvid" vast välja lülitada, et ennetada nende kogemata muutmist. diff --git a/depcomp b/depcomp index e5f9736c72..df8eea7e4c 100755 --- a/depcomp +++ b/depcomp @@ -1,10 +1,10 @@ #! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2007-03-29.01 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free +# Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -17,9 +17,7 @@ scriptversion=2007-03-29.01 # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -87,6 +85,15 @@ if test "$depmode" = dashXmstdout; then depmode=dashmstdout fi +cygpath_u="cygpath -u -f -" +if test "$depmode" = msvcmsys; then + # This is just like msvisualcpp but w/o cygpath translation. + # Just convert the backslash-escaped backslashes to single forward + # slashes to satisfy depend.m4 + cygpath_u="sed s,\\\\\\\\,/,g" + depmode=msvisualcpp +fi + case "$depmode" in gcc3) ## gcc 3 implements dependency tracking that does exactly what @@ -192,14 +199,14 @@ sgi) ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ tr ' -' ' ' >> $depfile - echo >> $depfile +' ' ' >> "$depfile" + echo >> "$depfile" # The second pass generates a dummy entry for each header file. tr ' ' ' ' < "$tmpdepfile" \ | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ - >> $depfile + >> "$depfile" else # The sourcefile does not contain any dependencies, so just # store a dummy comment line, to avoid errors with the Makefile @@ -328,7 +335,12 @@ hp2) if test -f "$tmpdepfile"; then sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" # Add `dependent.h:' lines. - sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile" + sed -ne '2,${ + s/^ *// + s/ \\*$// + s/$/:/ + p + }' "$tmpdepfile" >> "$depfile" else echo "#dummy" > "$depfile" fi @@ -404,7 +416,7 @@ dashmstdout) # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -455,32 +467,39 @@ makedepend) "$@" || exit $? # Remove any Libtool call if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift fi # X makedepend shift - cleared=no - for arg in "$@"; do + cleared=no eat=no + for arg + do case $cleared in no) set ""; shift cleared=yes ;; esac + if test $eat = yes; then + eat=no + continue + fi case "$arg" in -D*|-I*) set fnord "$@" "$arg"; shift ;; # Strip any option that makedepend may not understand. Remove # the object too, otherwise makedepend will parse it as a source file. + -arch) + eat=yes ;; -*|$object) ;; *) set fnord "$@" "$arg"; shift ;; esac done - obj_suffix="`echo $object | sed 's/^.*\././'`" + obj_suffix=`echo "$object" | sed 's/^.*\././'` touch "$tmpdepfile" ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@" rm -f "$depfile" @@ -500,7 +519,7 @@ cpp) # Remove the call to Libtool. if test "$libtool" = yes; then - while test $1 != '--mode=compile'; do + while test "X$1" != 'X--mode=compile'; do shift done shift @@ -538,13 +557,27 @@ cpp) msvisualcpp) # Important note: in order to support this mode, a compiler *must* - # always write the preprocessed file to stdout, regardless of -o, - # because we must use -o when running libtool. + # always write the preprocessed file to stdout. "$@" || exit $? + + # Remove the call to Libtool. + if test "$libtool" = yes; then + while test "X$1" != 'X--mode=compile'; do + shift + done + shift + fi + IFS=" " for arg do case "$arg" in + -o) + shift + ;; + $object) + shift + ;; "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") set fnord "$@" shift @@ -557,16 +590,23 @@ msvisualcpp) ;; esac done - "$@" -E | - sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile" + "$@" -E 2>/dev/null | + sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile" rm -f "$depfile" echo "$object : \\" > "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s:: \1 \\:p' >> "$depfile" echo " " >> "$depfile" - . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile" + sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile" rm -f "$tmpdepfile" ;; +msvcmsys) + # This case exists only to let depend.m4 do its work. It works by + # looking at the text of this script. This case will never be run, + # since it is checked for above. + exit 1 + ;; + none) exec "$@" ;; @@ -585,5 +625,6 @@ exit 0 # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: diff --git a/desktop/Makefile.in b/desktop/Makefile.in index 6a4abc7da9..0f67eb730c 100644 --- a/desktop/Makefile.in +++ b/desktop/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,8 +17,9 @@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -48,6 +50,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = gimp.desktop.in +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; @@ -55,20 +58,27 @@ am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ *) f=$$p;; \ esac; -am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; +am__install_max = 40 +am__nobase_strip_setup = \ + srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` +am__nobase_strip = \ + for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" +am__nobase_list = $(am__nobase_strip_setup); \ + for p in $$list; do echo "$$p $$p"; done | \ + sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ + $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ + if (++n[$$2] == $(am__install_max)) \ + { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ + END { for (dir in files) print dir, files[dir] }' +am__base_list = \ + sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ + sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' am__installdirs = "$(DESTDIR)$(applicationsdir)" \ "$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \ "$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons32dir)" \ "$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons64dir)" \ "$(DESTDIR)$(iconsscalabledir)" -applicationsDATA_INSTALL = $(INSTALL_DATA) -icons16DATA_INSTALL = $(INSTALL_DATA) -icons22DATA_INSTALL = $(INSTALL_DATA) -icons24DATA_INSTALL = $(INSTALL_DATA) -icons32DATA_INSTALL = $(INSTALL_DATA) -icons48DATA_INSTALL = $(INSTALL_DATA) -icons64DATA_INSTALL = $(INSTALL_DATA) -iconsscalableDATA_INSTALL = $(INSTALL_DATA) DATA = $(applications_DATA) $(icons16_DATA) $(icons22_DATA) \ $(icons24_DATA) $(icons32_DATA) $(icons48_DATA) \ $(icons64_DATA) $(iconsscalable_DATA) @@ -410,9 +420,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu desktop/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu desktop/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu desktop/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu desktop/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -430,6 +440,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): gimp.desktop.in: $(top_builddir)/config.status $(srcdir)/gimp.desktop.in.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -441,139 +452,163 @@ clean-libtool: install-applicationsDATA: $(applications_DATA) @$(NORMAL_INSTALL) test -z "$(applicationsdir)" || $(MKDIR_P) "$(DESTDIR)$(applicationsdir)" - @list='$(applications_DATA)'; for p in $$list; do \ + @list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(applicationsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(applicationsdir)/$$f'"; \ - $(applicationsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(applicationsdir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(applicationsdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(applicationsdir)" || exit $$?; \ done uninstall-applicationsDATA: @$(NORMAL_UNINSTALL) - @list='$(applications_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(applicationsdir)/$$f'"; \ - rm -f "$(DESTDIR)$(applicationsdir)/$$f"; \ - done + @list='$(applications_DATA)'; test -n "$(applicationsdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(applicationsdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(applicationsdir)" && rm -f $$files install-icons16DATA: $(icons16_DATA) @$(NORMAL_INSTALL) test -z "$(icons16dir)" || $(MKDIR_P) "$(DESTDIR)$(icons16dir)" - @list='$(icons16_DATA)'; for p in $$list; do \ + @list='$(icons16_DATA)'; test -n "$(icons16dir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(icons16DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icons16dir)/$$f'"; \ - $(icons16DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icons16dir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons16dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icons16dir)" || exit $$?; \ done uninstall-icons16DATA: @$(NORMAL_UNINSTALL) - @list='$(icons16_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(icons16dir)/$$f'"; \ - rm -f "$(DESTDIR)$(icons16dir)/$$f"; \ - done + @list='$(icons16_DATA)'; test -n "$(icons16dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(icons16dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(icons16dir)" && rm -f $$files install-icons22DATA: $(icons22_DATA) @$(NORMAL_INSTALL) test -z "$(icons22dir)" || $(MKDIR_P) "$(DESTDIR)$(icons22dir)" - @list='$(icons22_DATA)'; for p in $$list; do \ + @list='$(icons22_DATA)'; test -n "$(icons22dir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(icons22DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icons22dir)/$$f'"; \ - $(icons22DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icons22dir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons22dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icons22dir)" || exit $$?; \ done uninstall-icons22DATA: @$(NORMAL_UNINSTALL) - @list='$(icons22_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(icons22dir)/$$f'"; \ - rm -f "$(DESTDIR)$(icons22dir)/$$f"; \ - done + @list='$(icons22_DATA)'; test -n "$(icons22dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(icons22dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(icons22dir)" && rm -f $$files install-icons24DATA: $(icons24_DATA) @$(NORMAL_INSTALL) test -z "$(icons24dir)" || $(MKDIR_P) "$(DESTDIR)$(icons24dir)" - @list='$(icons24_DATA)'; for p in $$list; do \ + @list='$(icons24_DATA)'; test -n "$(icons24dir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(icons24DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icons24dir)/$$f'"; \ - $(icons24DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icons24dir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons24dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icons24dir)" || exit $$?; \ done uninstall-icons24DATA: @$(NORMAL_UNINSTALL) - @list='$(icons24_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(icons24dir)/$$f'"; \ - rm -f "$(DESTDIR)$(icons24dir)/$$f"; \ - done + @list='$(icons24_DATA)'; test -n "$(icons24dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(icons24dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(icons24dir)" && rm -f $$files install-icons32DATA: $(icons32_DATA) @$(NORMAL_INSTALL) test -z "$(icons32dir)" || $(MKDIR_P) "$(DESTDIR)$(icons32dir)" - @list='$(icons32_DATA)'; for p in $$list; do \ + @list='$(icons32_DATA)'; test -n "$(icons32dir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(icons32DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icons32dir)/$$f'"; \ - $(icons32DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icons32dir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons32dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icons32dir)" || exit $$?; \ done uninstall-icons32DATA: @$(NORMAL_UNINSTALL) - @list='$(icons32_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(icons32dir)/$$f'"; \ - rm -f "$(DESTDIR)$(icons32dir)/$$f"; \ - done + @list='$(icons32_DATA)'; test -n "$(icons32dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(icons32dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(icons32dir)" && rm -f $$files install-icons48DATA: $(icons48_DATA) @$(NORMAL_INSTALL) test -z "$(icons48dir)" || $(MKDIR_P) "$(DESTDIR)$(icons48dir)" - @list='$(icons48_DATA)'; for p in $$list; do \ + @list='$(icons48_DATA)'; test -n "$(icons48dir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(icons48DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icons48dir)/$$f'"; \ - $(icons48DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icons48dir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons48dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icons48dir)" || exit $$?; \ done uninstall-icons48DATA: @$(NORMAL_UNINSTALL) - @list='$(icons48_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(icons48dir)/$$f'"; \ - rm -f "$(DESTDIR)$(icons48dir)/$$f"; \ - done + @list='$(icons48_DATA)'; test -n "$(icons48dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(icons48dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(icons48dir)" && rm -f $$files install-icons64DATA: $(icons64_DATA) @$(NORMAL_INSTALL) test -z "$(icons64dir)" || $(MKDIR_P) "$(DESTDIR)$(icons64dir)" - @list='$(icons64_DATA)'; for p in $$list; do \ + @list='$(icons64_DATA)'; test -n "$(icons64dir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(icons64DATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icons64dir)/$$f'"; \ - $(icons64DATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icons64dir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(icons64dir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(icons64dir)" || exit $$?; \ done uninstall-icons64DATA: @$(NORMAL_UNINSTALL) - @list='$(icons64_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(icons64dir)/$$f'"; \ - rm -f "$(DESTDIR)$(icons64dir)/$$f"; \ - done + @list='$(icons64_DATA)'; test -n "$(icons64dir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(icons64dir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(icons64dir)" && rm -f $$files install-iconsscalableDATA: $(iconsscalable_DATA) @$(NORMAL_INSTALL) test -z "$(iconsscalabledir)" || $(MKDIR_P) "$(DESTDIR)$(iconsscalabledir)" - @list='$(iconsscalable_DATA)'; for p in $$list; do \ + @list='$(iconsscalable_DATA)'; test -n "$(iconsscalabledir)" || list=; \ + for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f=$(am__strip_dir) \ - echo " $(iconsscalableDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsscalabledir)/$$f'"; \ - $(iconsscalableDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsscalabledir)/$$f"; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(iconsscalabledir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(iconsscalabledir)" || exit $$?; \ done uninstall-iconsscalableDATA: @$(NORMAL_UNINSTALL) - @list='$(iconsscalable_DATA)'; for p in $$list; do \ - f=$(am__strip_dir) \ - echo " rm -f '$(DESTDIR)$(iconsscalabledir)/$$f'"; \ - rm -f "$(DESTDIR)$(iconsscalabledir)/$$f"; \ - done + @list='$(iconsscalable_DATA)'; test -n "$(iconsscalabledir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '$(DESTDIR)$(iconsscalabledir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(iconsscalabledir)" && rm -f $$files tags: TAGS TAGS: @@ -597,13 +632,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -637,6 +676,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) maintainer-clean-generic: @@ -657,6 +697,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -667,21 +709,30 @@ install-data-am: install-applicationsDATA install-icons16DATA \ install-iconsscalableDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -743,6 +794,7 @@ validate: gimp.desktop fi ) dist-hook: validate + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/devel-docs/Makefile.in b/devel-docs/Makefile.in index 60ed7b2558..0c541f9d07 100644 --- a/devel-docs/Makefile.in +++ b/devel-docs/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,8 +16,9 @@ @SET_MAKE@ VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ @@ -58,12 +61,40 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ ps-recursive uninstall-recursive RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive +AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ + $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ + distdir ETAGS = etags CTAGS = ctags DIST_SUBDIRS = tools libgimpbase libgimpcolor libgimpconfig \ libgimpmath libgimpmodule libgimpthumb libgimpwidgets libgimp \ app DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +am__relativize = \ + dir0=`pwd`; \ + sed_first='s,^\([^/]*\)/.*$$,\1,'; \ + sed_rest='s,^[^/]*/*,,'; \ + sed_last='s,^.*/\([^/]*\)$$,\1,'; \ + sed_butlast='s,/*[^/]*$$,,'; \ + while test -n "$$dir1"; do \ + first=`echo "$$dir1" | sed -e "$$sed_first"`; \ + if test "$$first" != "."; then \ + if test "$$first" = ".."; then \ + dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \ + dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \ + else \ + first2=`echo "$$dir2" | sed -e "$$sed_first"`; \ + if test "$$first2" = "$$first"; then \ + dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \ + else \ + dir2="../$$dir2"; \ + fi; \ + dir0="$$dir0"/"$$first"; \ + fi; \ + fi; \ + dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \ + done; \ + reldir="$$dir2" AA_LIBS = @AA_LIBS@ ACLOCAL = @ACLOCAL@ ALLOCA = @ALLOCA@ @@ -402,9 +433,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu devel-docs/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu devel-docs/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -422,6 +453,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): mostlyclean-libtool: -rm -f *.lo @@ -453,7 +485,7 @@ $(RECURSIVE_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done; \ if test "$$dot_seen" = "no"; then \ @@ -487,16 +519,16 @@ $(RECURSIVE_CLEAN_TARGETS): else \ local_target="$$target"; \ fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ || eval $$failcom; \ done && test -z "$$fail" tags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ done ctags-recursive: list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ done ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) @@ -511,7 +543,7 @@ tags: TAGS TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ + set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ include_option=--etags-include; \ @@ -523,7 +555,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ list='$(SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ @@ -532,29 +564,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + shift; \ + if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ + if test $$# -gt 0; then \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + "$$@" $$unique; \ + else \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$unique; \ + fi; \ fi ctags: CTAGS CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) - tags=; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$tags$$unique" \ + test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$tags $$unique + $$unique GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ - && cd $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) $$here + && $(am__cd) $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) "$$here" distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -575,29 +612,44 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done - list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ test -d "$(distdir)/$$subdir" \ || $(MKDIR_P) "$(distdir)/$$subdir" \ || exit 1; \ - distdir=`$(am__cd) $(distdir) && pwd`; \ - top_distdir=`$(am__cd) $(top_distdir) && pwd`; \ - (cd $$subdir && \ + fi; \ + done + @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ + $(am__relativize); \ + new_distdir=$$reldir; \ + dir1=$$subdir; dir2="$(top_distdir)"; \ + $(am__relativize); \ + new_top_distdir=$$reldir; \ + echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \ + echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \ + ($(am__cd) $$subdir && \ $(MAKE) $(AM_MAKEFLAGS) \ - top_distdir="$$top_distdir" \ - distdir="$$distdir/$$subdir" \ + top_distdir="$$new_top_distdir" \ + distdir="$$new_distdir" \ am__remove_distdir=: \ am__skip_length_check=: \ + am__skip_mode_fix=: \ distdir) \ || exit 1; \ fi; \ @@ -630,6 +682,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -648,6 +701,8 @@ dvi-am: html: html-recursive +html-am: + info: info-recursive info-am: @@ -656,18 +711,28 @@ install-data-am: install-dvi: install-dvi-recursive +install-dvi-am: + install-exec-am: install-html: install-html-recursive +install-html-am: + install-info: install-info-recursive +install-info-am: + install-man: install-pdf: install-pdf-recursive +install-pdf-am: + install-ps: install-ps-recursive +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-recursive @@ -688,8 +753,8 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \ - install-strip +.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ + install-am install-strip tags-recursive .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ all all-am check check-am clean clean-generic clean-libtool \ @@ -716,6 +781,7 @@ uninstall-am: @ENABLE_GTK_DOC_FALSE@ @false dist-hook: dist-check-gtk-doc + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/devel-docs/app/Makefile.in b/devel-docs/app/Makefile.in index 13e90ca0fd..f591a29bce 100644 --- a/devel-docs/app/Makefile.in +++ b/devel-docs/app/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,8 +22,9 @@ #################################### VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -517,9 +520,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/app/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu devel-docs/app/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/app/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu devel-docs/app/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -537,6 +540,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): version: $(top_builddir)/config.status $(srcdir)/version.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -569,13 +573,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -608,6 +616,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -631,6 +640,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -639,18 +650,28 @@ install-data-am: install-data-local install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -829,6 +850,7 @@ uninstall-am: uninstall-local @ENABLE_GTK_DOC_APP_TRUE@ gtkdoc-rebase --online --relative --html-dir=$(distdir)/html @ENABLE_GTK_DOC_APP_TRUE@.PHONY : dist-hook-local docs + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/devel-docs/libgimp/Makefile.in b/devel-docs/libgimp/Makefile.in index 22c3eca420..2bf44be703 100644 --- a/devel-docs/libgimp/Makefile.in +++ b/devel-docs/libgimp/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,8 +22,9 @@ #################################### VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -461,9 +464,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimp/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu devel-docs/libgimp/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimp/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu devel-docs/libgimp/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -481,6 +484,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): version: $(top_builddir)/config.status $(srcdir)/version.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -512,13 +516,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -550,6 +558,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -568,6 +577,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -576,18 +587,28 @@ install-data-am: install-data-local install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -766,6 +787,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/devel-docs/libgimpbase/Makefile.in b/devel-docs/libgimpbase/Makefile.in index 23f17f9e95..7db8182e6d 100644 --- a/devel-docs/libgimpbase/Makefile.in +++ b/devel-docs/libgimpbase/Makefile.in @@ -1,8 +1,9 @@ -# Makefile.in generated by automake 1.10.2 from Makefile.am. +# Makefile.in generated by automake 1.11 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, +# Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -21,8 +22,9 @@ #################################### VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkglibexecdir = $(libexecdir)/@PACKAGE@ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd install_sh_DATA = $(install_sh) -c -m 644 install_sh_PROGRAM = $(install_sh) -c @@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = version +CONFIG_CLEAN_VPATH_FILES = SOURCES = DIST_SOURCES = DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -448,9 +451,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir exit 1;; \ esac; \ done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpbase/Makefile'; \ - cd $(top_srcdir) && \ - $(AUTOMAKE) --gnu devel-docs/libgimpbase/Makefile + echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpbase/Makefile'; \ + $(am__cd) $(top_srcdir) && \ + $(AUTOMAKE) --gnu devel-docs/libgimpbase/Makefile .PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ @@ -468,6 +471,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh +$(am__aclocal_m4_deps): version: $(top_builddir)/config.status $(srcdir)/version.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ @@ -499,13 +503,17 @@ distdir: $(DISTFILES) if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ if test -d $$d/$$file; then \ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + if test -d "$(distdir)/$$file"; then \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ fi; \ - cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ + find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ + fi; \ + cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ else \ - test -f $(distdir)/$$file \ - || cp -p $$d/$$file $(distdir)/$$file \ + test -f "$(distdir)/$$file" \ + || cp -p $$d/$$file "$(distdir)/$$file" \ || exit 1; \ fi; \ done @@ -537,6 +545,7 @@ clean-generic: distclean-generic: -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) maintainer-clean-generic: @echo "This command is intended for maintainers to use" @@ -555,6 +564,8 @@ dvi-am: html: html-am +html-am: + info: info-am info-am: @@ -563,18 +574,28 @@ install-data-am: install-data-local install-dvi: install-dvi-am +install-dvi-am: + install-exec-am: install-html: install-html-am +install-html-am: + install-info: install-info-am +install-info-am: + install-man: install-pdf: install-pdf-am +install-pdf-am: + install-ps: install-ps-am +install-ps-am: + installcheck-am: maintainer-clean: maintainer-clean-am @@ -753,6 +774,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local gtkdoc-rebase --online --relative --html-dir=$(distdir)/html .PHONY : dist-hook-local docs + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/devel-docs/libgimpbase/html/index.html b/devel-docs/libgimpbase/html/index.html index 950b4d0dab..75062eae2d 100644 --- a/devel-docs/libgimpbase/html/index.html +++ b/devel-docs/libgimpbase/html/index.html @@ -21,7 +21,7 @@

- for GIMP 2.6.7 + for GIMP 2.6.8

diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html b/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html index a7e924a069..918b5716e6 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpbasetypes.html @@ -134,9 +134,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h

domain :

- a constant string that identifies a translation domain or NULL + a constant string that identifies a translation domain or NULL @@ -171,9 +169,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h

Returns :

the translation domain associated with type - or NULL if no domain was set + or NULL if no domain was set @@ -205,9 +201,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h

descriptions :

- a NULL terminated constant static array of GimpEnumDesc + a NULL terminated constant static array of GimpEnumDesc @@ -237,9 +231,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h

Returns :

- a NULL terminated constant array of GimpEnumDesc + a NULL terminated constant array of GimpEnumDesc @@ -270,9 +262,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h

Returns :

- a NULL terminated constant array of GimpFlagsDesc + a NULL terminated constant array of GimpFlagsDesc @@ -304,9 +294,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h

descriptions :

- a NULL terminated constant static array of GimpFlagsDesc + a NULL terminated constant static array of GimpFlagsDesc diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html b/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html index e236d95474..aa0037025f 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpenv.html @@ -118,7 +118,9 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolea >gboolean plug_in);

You don't need to care about this function. It is being called for -you automatically (by means of the MAIN() macro that every plug-in +you automatically (by means of the MAIN() macro that every plug-in runs). Calling it again will cause a fatal error.

@@ -126,9 +128,7 @@ runs). Calling it again will cause a fatal error.

plug_in :

- must be TRUE if this function is called from a plug-in + must be TRUE if this function is called from a plug-in @@ -317,9 +317,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Miscellaneous-Utility-Fu

Returns :

- The path to the specified user directory, or NULL if the + The path to the specified user directory, or NULL if the logical ID was not found. @@ -415,9 +413,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html

path :

- A list of directories separated by G_SEARCHPATH_SEPARATOR. + A list of directories separated by G_SEARCHPATH_SEPARATOR. @@ -427,9 +423,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#G-S

check :

- TRUE if you want the directories to be checked. + TRUE if you want the directories to be checked. @@ -472,9 +466,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Doubly-Linked-Lists.html

Returns :

- A searchpath string separated by G_SEARCHPATH_SEPARATOR. + A searchpath string separated by G_SEARCHPATH_SEPARATOR. diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html b/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html index b783c9cc4b..861bd5424f 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimplimits.html @@ -109,9 +109,7 @@ this value.

A large but arbitrary value that can be used when an upper limit for a -memory size (in bytes) is needed. It is smaller than G_MAXDOUBLE since +memory size (in bytes) is needed. It is smaller than G_MAXDOUBLE since the GimpMemsizeEntry doesn't handle larger values. diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html b/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html index cbc8cdd69d..a2d681a738 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpmemsize.html @@ -164,12 +164,8 @@ Parses a string representation of a memory size as returned by

Returns :

- TRUE if the string was successfully parsed and - memsize has been set, FALSE otherwise. + TRUE if the string was successfully parsed and + memsize has been set, FALSE otherwise. @@ -219,9 +215,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Miscellaneous-Utility-Fu

GIMP_TYPE_MEMSIZE is a GType derived from G_TYPE_UINT64. +>GType derived from G_TYPE_UINT64.

diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html b/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html index 53a5dc9499..cce3ab8bb1 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimprectangle.html @@ -180,39 +180,27 @@ Calculates the intersection of two rectangles.

dest_x :

- return location for origin of intersection (may be NULL) + return location for origin of intersection (may be NULL)

dest_y :

- return location for origin of intersection (may be NULL) + return location for origin of intersection (may be NULL)

dest_width :

- return location for width of intersection (may be NULL) + return location for width of intersection (may be NULL)

dest_height :

- return location for height of intersection (may be NULL) + return location for height of intersection (may be NULL)

Returns :

- TRUE if the intersection is non-empty, FALSE otherwise + TRUE if the intersection is non-empty, FALSE otherwise diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html b/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html index ddbf9d3dad..a49a95f5be 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpunit.html @@ -227,11 +227,7 @@ Returns the integer ID of the new TRUE. You will have to set it to FALSE with +set to TRUE. You will have to set it to FALSE with gimp_unit_set_deletion_flag() to make the unit definition persistent.

@@ -316,9 +312,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gboolea >gboolean deletion_flag);

Sets a GimpUnit's deletion_flag. If the deletion_flag of a unit is -TRUE when GIMP exits, this unit will not be saved in the users's +TRUE when GIMP exits, this unit will not be saved in the users's "unitrc" file.

@@ -557,9 +551,7 @@ NOTE: This string must not be changed or freed.

GIMP_TYPE_UNIT is a GType derived from G_TYPE_INT. +>GType derived from G_TYPE_INT.

diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimputils.html b/devel-docs/libgimpbase/html/libgimpbase-gimputils.html index 783d8a6c68..dfc4df77a6 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimputils.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimputils.html @@ -303,9 +303,7 @@ that the string was trimmed is indicated by appending an ellipsis.

str :

- an UTF-8 encoded string (or NULL) + an UTF-8 encoded string (or NULL) @@ -345,9 +343,7 @@ them to mnemonics.

str :

- Underline infested string (or NULL) + Underline infested string (or NULL) @@ -388,9 +384,7 @@ rid of the mnemonic (see bug 157561).

str :

- underline infested string (or NULL) + underline infested string (or NULL) @@ -453,9 +447,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Enumeration-and-Fl href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gint" >gint value);

-Retrieves GimpEnumDesc associated with the given value, or NULL.

+Retrieves GimpEnumDesc associated with the given value, or NULL.

@@ -510,9 +502,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar" Checks if value is valid for the enum registered as enum_type. If the value exists in that enum, its name, nick and its translated desc and help are returned (if value_name, value_nick, value_desc -and value_help are not NULL).

+and value_help are not NULL).

@@ -532,40 +522,28 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h - - - - - @@ -667,9 +645,7 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Enumeration-and-Fl href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#guint" >guint value);

-Retrieves the first GimpFlagsDesc that matches the given value, or NULL.

+Retrieves the first GimpFlagsDesc that matches the given value, or NULL.

value_name :

 return location for the value's name (or NULL) + return location for the value's name (or NULL)

value_nick :

 return location for the value's nick (or NULL) + return location for the value's nick (or NULL)

value_desc :

 return location for the value's translated desc (or NULL) + return location for the value's translated desc (or NULL)

value_help :

 return location for the value's translated help (or NULL) + return location for the value's translated help (or NULL)

Returns :

 TRUE if value is valid for the enum_type, - FALSE otherwise + TRUE if value is valid for the enum_type, + FALSE otherwise
@@ -724,9 +700,7 @@ href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gchar" Checks if value is valid for the flags registered as flags_type. If the value exists in that flags, its name, nick and its translated desc and help are returned (if value_name, value_nick, value_desc -and value_help are not NULL).

+and value_help are not NULL).

@@ -746,40 +720,28 @@ href="http://library.gnome.org/devel/gobject/unstable/gobject-Type-Information.h - - - - - diff --git a/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html b/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html index 3ffd81e943..87033236cf 100644 --- a/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html +++ b/devel-docs/libgimpbase/html/libgimpbase-gimpversion.html @@ -84,7 +84,7 @@ capabilities.

GIMP_MICRO_VERSION

-
#define GIMP_MICRO_VERSION                              (7)
+
#define GIMP_MICRO_VERSION                              (8)
 

 

 

@@ -92,7 +92,7 @@ capabilities.
 

 

 
GIMP_VERSION

-
#define GIMP_VERSION                                    "2.6.7"
+
#define GIMP_VERSION                                    "2.6.8"
 

 

 

diff --git a/devel-docs/libgimpbase/xml/gimpversion.xml b/devel-docs/libgimpbase/xml/gimpversion.xml
index c6079ab5f5..efd5823931 100644
--- a/devel-docs/libgimpbase/xml/gimpversion.xml
+++ b/devel-docs/libgimpbase/xml/gimpversion.xml
@@ -64,13 +64,13 @@ capabilities.
 
 
 GIMP_MICRO_VERSION
-GIMP_MICRO_VERSION#define GIMP_MICRO_VERSION                              (7)
+GIMP_MICRO_VERSION#define GIMP_MICRO_VERSION                              (8)
 
 
 
 
 GIMP_VERSION
-GIMP_VERSION#define GIMP_VERSION                                    "2.6.7"
+GIMP_VERSION#define GIMP_VERSION                                    "2.6.8"
 
 
 
diff --git a/devel-docs/libgimpcolor/Makefile.in b/devel-docs/libgimpcolor/Makefile.in
index b90fa91e24..80a4bc41dd 100644
--- a/devel-docs/libgimpcolor/Makefile.in
+++ b/devel-docs/libgimpcolor/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,8 +22,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -441,9 +444,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  devel-docs/libgimpcolor/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  devel-docs/libgimpcolor/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpcolor/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu devel-docs/libgimpcolor/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -461,6 +464,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version: $(top_builddir)/config.status $(srcdir)/version.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -492,13 +496,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -530,6 +538,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -548,6 +557,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -556,18 +567,28 @@ install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -746,6 +767,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/devel-docs/libgimpconfig/Makefile.in b/devel-docs/libgimpconfig/Makefile.in
index 1a3a6cf35c..7c08b1ee68 100644
--- a/devel-docs/libgimpconfig/Makefile.in
+++ b/devel-docs/libgimpconfig/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,8 +22,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -453,9 +456,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  devel-docs/libgimpconfig/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  devel-docs/libgimpconfig/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpconfig/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu devel-docs/libgimpconfig/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -473,6 +476,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version: $(top_builddir)/config.status $(srcdir)/version.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -504,13 +508,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -542,6 +550,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -560,6 +569,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -568,18 +579,28 @@ install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -759,6 +780,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/devel-docs/libgimpmath/Makefile.in b/devel-docs/libgimpmath/Makefile.in
index ec56f907ce..8ae4bd52ff 100644
--- a/devel-docs/libgimpmath/Makefile.in
+++ b/devel-docs/libgimpmath/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,8 +22,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -441,9 +444,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  devel-docs/libgimpmath/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  devel-docs/libgimpmath/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpmath/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu devel-docs/libgimpmath/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -461,6 +464,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version: $(top_builddir)/config.status $(srcdir)/version.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -492,13 +496,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -530,6 +538,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -548,6 +557,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -556,18 +567,28 @@ install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -746,6 +767,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/devel-docs/libgimpmodule/Makefile.in b/devel-docs/libgimpmodule/Makefile.in
index 60af1bff83..56224826c3 100644
--- a/devel-docs/libgimpmodule/Makefile.in
+++ b/devel-docs/libgimpmodule/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,8 +22,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -449,9 +452,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  devel-docs/libgimpmodule/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  devel-docs/libgimpmodule/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpmodule/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu devel-docs/libgimpmodule/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -469,6 +472,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version: $(top_builddir)/config.status $(srcdir)/version.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -500,13 +504,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -538,6 +546,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -556,6 +565,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -564,18 +575,28 @@ install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -754,6 +775,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/devel-docs/libgimpthumb/Makefile.in b/devel-docs/libgimpthumb/Makefile.in
index b58c21df5b..218173fb6d 100644
--- a/devel-docs/libgimpthumb/Makefile.in
+++ b/devel-docs/libgimpthumb/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,8 +22,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -450,9 +453,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  devel-docs/libgimpthumb/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  devel-docs/libgimpthumb/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpthumb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu devel-docs/libgimpthumb/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -470,6 +473,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version: $(top_builddir)/config.status $(srcdir)/version.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -501,13 +505,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -539,6 +547,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -557,6 +566,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -565,18 +576,28 @@ install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -755,6 +776,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/devel-docs/libgimpwidgets/Makefile.in b/devel-docs/libgimpwidgets/Makefile.in
index d49e06466a..8aa300c546 100644
--- a/devel-docs/libgimpwidgets/Makefile.in
+++ b/devel-docs/libgimpwidgets/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -21,8 +22,9 @@
 ####################################
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -53,6 +55,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = version
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -464,9 +467,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  devel-docs/libgimpwidgets/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  devel-docs/libgimpwidgets/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/libgimpwidgets/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu devel-docs/libgimpwidgets/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -484,6 +487,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 version: $(top_builddir)/config.status $(srcdir)/version.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
@@ -515,13 +519,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -553,6 +561,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -571,6 +580,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -579,18 +590,28 @@ install-data-am: install-data-local
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -769,6 +790,7 @@ dist-hook: dist-check-gtkdoc dist-hook-local
 	  gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
 
 .PHONY : dist-hook-local docs
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/devel-docs/tools/Makefile.in b/devel-docs/tools/Makefile.in
index f5bf7d689d..262fafb07d 100644
--- a/devel-docs/tools/Makefile.in
+++ b/devel-docs/tools/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,6 +50,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_doc_shooter_OBJECTS = shadow.$(OBJEXT) shooter.$(OBJEXT) \
 	units.$(OBJEXT) widgets.$(OBJEXT)
@@ -59,6 +62,7 @@ doc_shooter_DEPENDENCIES = $(libgimpwidgets) $(libgimpconfig) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -411,9 +415,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  devel-docs/tools/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  devel-docs/tools/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu devel-docs/tools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu devel-docs/tools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -431,13 +435,16 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 doc-shooter$(EXEEXT): $(doc_shooter_OBJECTS) $(doc_shooter_DEPENDENCIES) 
 	@rm -f doc-shooter$(EXEEXT)
 	$(LINK) $(doc_shooter_OBJECTS) $(doc_shooter_LDADD) $(LIBS)
@@ -455,21 +462,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -492,7 +499,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -500,29 +507,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -543,13 +555,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -577,6 +593,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -598,6 +615,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -606,18 +625,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -658,6 +687,7 @@ uninstall-am:
 
 clean-local:
 	rm -f *.png
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/docs/Makefile.in b/docs/Makefile.in
index 703fd39b81..5ccd429714 100644
--- a/docs/Makefile.in
+++ b/docs/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,8 +52,30 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = gimp-2.6.1 gimprc-2.6.5 gimptool-2.0.1 \
 	gimp-remote-2.6.1
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)"
 man5dir = $(mandir)/man5
@@ -382,9 +406,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  docs/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  docs/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu docs/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu docs/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -402,6 +426,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 gimp-2.6.1: $(top_builddir)/config.status $(srcdir)/gimp.1.in
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 gimprc-2.6.5: $(top_builddir)/config.status $(srcdir)/gimprc.5.in
@@ -416,96 +441,82 @@ mostlyclean-libtool:
 
 clean-libtool:
 	-rm -rf .libs _libs
-install-man1: $(man1_MANS) $(man_MANS)
+install-man1: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $$i; then file=$$i; \
-	  else file=$(srcdir)/$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man1:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.1*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    1*) ;; \
-	    *) ext='1' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man1dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man1dir)/$$inst"; \
-	done
-install-man5: $(man5_MANS) $(man_MANS)
+	@list=''; test -n "$(man1dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.1[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+install-man5: $(man_MANS)
 	@$(NORMAL_INSTALL)
 	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.5*) list="$$list $$i" ;; \
-	  esac; \
+	@list=''; test -n "$(man5dir)" || exit 0; \
+	{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.5[a-z]*$$/p'; \
+	} | while read p; do \
+	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; echo "$$p"; \
+	done | \
+	sed -e 'n;s,.*/,,;p;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' | \
+	sed 'N;N;s,\n, ,g' | { \
+	list=; while read file base inst; do \
+	  if test "$$base" = "$$inst"; then list="$$list $$file"; else \
+	    echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
+	    $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst" || exit $$?; \
+	  fi; \
 	done; \
-	for i in $$list; do \
-	  if test -f $$i; then file=$$i; \
-	  else file=$(srcdir)/$$i; fi; \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    5*) ;; \
-	    *) ext='5' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man5dir)/$$inst'"; \
-	  $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man5dir)/$$inst"; \
-	done
+	for i in $$list; do echo "$$i"; done | $(am__base_list) | \
+	while read files; do \
+	  test -z "$$files" || { \
+	    echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man5dir)'"; \
+	    $(INSTALL_DATA) $$files "$(DESTDIR)$(man5dir)" || exit $$?; }; \
+	done; }
+
 uninstall-man5:
 	@$(NORMAL_UNINSTALL)
-	@list='$(man5_MANS) $(dist_man5_MANS) $(nodist_man5_MANS)'; \
-	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
-	for i in $$l2; do \
-	  case "$$i" in \
-	    *.5*) list="$$list $$i" ;; \
-	  esac; \
-	done; \
-	for i in $$list; do \
-	  ext=`echo $$i | sed -e 's/^.*\\.//'`; \
-	  case "$$ext" in \
-	    5*) ;; \
-	    *) ext='5' ;; \
-	  esac; \
-	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
-	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
-	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
-	  echo " rm -f '$(DESTDIR)$(man5dir)/$$inst'"; \
-	  rm -f "$(DESTDIR)$(man5dir)/$$inst"; \
-	done
+	@list=''; test -n "$(man5dir)" || exit 0; \
+	files=`{ for i in $$list; do echo "$$i"; done; \
+	l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done | \
+	  sed -n '/\.5[a-z]*$$/p'; \
+	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
+	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
+	test -z "$$files" || { \
+	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
+	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
 tags: TAGS
 TAGS:
 
@@ -514,6 +525,19 @@ CTAGS:
 
 
 distdir: $(DISTFILES)
+	@list='$(MANS)'; if test -n "$$list"; then \
+	  list=`for p in $$list; do \
+	    if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
+	    if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
+	  if test -n "$$list" && \
+	    grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
+	    echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
+	    grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/         /' >&2; \
+	    echo "       to fix them, install help2man, remove and regenerate the man pages;" >&2; \
+	    echo "       typically \`make maintainer-clean' will remove them" >&2; \
+	    exit 1; \
+	  else :; fi; \
+	else :; fi
 	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
 	list='$(DISTFILES)'; \
@@ -529,13 +553,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -566,6 +594,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -584,6 +613,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -591,21 +622,30 @@ info-am:
 install-data-am: install-man
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man: install-man1 install-man5
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -671,6 +711,7 @@ uninstall-local:
 @DEFAULT_BINARY_TRUE@	  echo " rm -f $(DESTDIR)$(mandir)/man$$s/$$f"; \
 @DEFAULT_BINARY_TRUE@	  rm -f $(DESTDIR)$(mandir)/man$$s/$$f; \
 @DEFAULT_BINARY_TRUE@	done
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/etc/Makefile.in b/etc/Makefile.in
index 02ed824c69..2a6b14779b 100644
--- a/etc/Makefile.in
+++ b/etc/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(gimpsysconfdir)"
-gimpsysconfDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(gimpsysconf_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -380,9 +397,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  etc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  etc/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu etc/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu etc/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -400,6 +417,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -409,20 +427,23 @@ clean-libtool:
 install-gimpsysconfDATA: $(gimpsysconf_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(gimpsysconfdir)" || $(MKDIR_P) "$(DESTDIR)$(gimpsysconfdir)"
-	@list='$(gimpsysconf_DATA)'; for p in $$list; do \
+	@list='$(gimpsysconf_DATA)'; test -n "$(gimpsysconfdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(gimpsysconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gimpsysconfdir)/$$f'"; \
-	  $(gimpsysconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gimpsysconfdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gimpsysconfdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gimpsysconfdir)" || exit $$?; \
 	done
 
 uninstall-gimpsysconfDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(gimpsysconf_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(gimpsysconfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(gimpsysconfdir)/$$f"; \
-	done
+	@list='$(gimpsysconf_DATA)'; test -n "$(gimpsysconfdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gimpsysconfdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gimpsysconfdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -446,13 +467,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -483,6 +508,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -501,6 +527,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -509,18 +537,28 @@ install-data-am: install-gimpsysconfDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -555,6 +593,7 @@ uninstall-am: uninstall-gimpsysconfDATA
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am uninstall-gimpsysconfDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/install-sh b/install-sh
index a5897de6ea..6781b987bd 100755
--- a/install-sh
+++ b/install-sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2006-12-25.00
+scriptversion=2009-04-28.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -515,5 +515,6 @@ done
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/libgimp/Makefile.in b/libgimp/Makefile.in
index 20f389def8..8c13ae101d 100644
--- a/libgimp/Makefile.in
+++ b/libgimp/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,14 +52,29 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(gimpincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__objects_1 = gimpenums.lo
@@ -113,6 +130,7 @@ libgimpui_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -125,7 +143,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libgimp_2_0_la_SOURCES) $(libgimpui_2_0_la_SOURCES)
 DIST_SOURCES = $(libgimp_2_0_la_SOURCES) $(libgimpui_2_0_la_SOURCES)
 DATA = $(noinst_DATA)
-gimpincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(gimpinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -771,9 +788,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimp/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimp/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimp/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -791,23 +808,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -929,21 +951,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -956,20 +978,23 @@ clean-libtool:
 install-gimpincludeHEADERS: $(gimpinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(gimpincludedir)" || $(MKDIR_P) "$(DESTDIR)$(gimpincludedir)"
-	@list='$(gimpinclude_HEADERS)'; for p in $$list; do \
+	@list='$(gimpinclude_HEADERS)'; test -n "$(gimpincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(gimpincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(gimpincludedir)/$$f'"; \
-	  $(gimpincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(gimpincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(gimpincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(gimpincludedir)" || exit $$?; \
 	done
 
 uninstall-gimpincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(gimpinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(gimpincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(gimpincludedir)/$$f"; \
-	done
+	@list='$(gimpinclude_HEADERS)'; test -n "$(gimpincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gimpincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gimpincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -983,7 +1008,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -991,29 +1016,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -1034,13 +1064,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -1072,6 +1106,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1093,6 +1128,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -1101,18 +1138,28 @@ install-data-am: install-data-local install-gimpincludeHEADERS
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1215,6 +1262,7 @@ gimpuimarshal.c: gimpuimarshal.h
 	&& $(GLIB_GENMARSHAL) --prefix=_gimpui_marshal $(srcdir)/gimpuimarshal.list --body >> xgen-umc \
 	&& cp xgen-umc $(@F) \
 	&& rm -f xgen-umc xgen-umc~
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libgimpbase/Makefile.in b/libgimpbase/Makefile.in
index e37111c6c2..ddc2f230ae 100644
--- a/libgimpbase/Makefile.in
+++ b/libgimpbase/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -52,15 +54,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgimpbaseincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__objects_1 = gimpbasetypes.lo gimpbase-private.lo gimpchecks.lo \
@@ -79,6 +96,7 @@ test_cpu_accel_OBJECTS = $(am_test_cpu_accel_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -91,10 +109,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libgimpbase_2_0_la_SOURCES) $(test_cpu_accel_SOURCES)
 DIST_SOURCES = $(libgimpbase_2_0_la_SOURCES) $(test_cpu_accel_SOURCES)
 DATA = $(noinst_DATA)
-libgimpbaseincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgimpbaseinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
@@ -527,9 +546,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimpbase/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimpbase/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpbase/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimpbase/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -547,23 +566,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -607,21 +631,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -634,20 +658,23 @@ clean-libtool:
 install-libgimpbaseincludeHEADERS: $(libgimpbaseinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgimpbaseincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgimpbaseincludedir)"
-	@list='$(libgimpbaseinclude_HEADERS)'; for p in $$list; do \
+	@list='$(libgimpbaseinclude_HEADERS)'; test -n "$(libgimpbaseincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgimpbaseincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgimpbaseincludedir)/$$f'"; \
-	  $(libgimpbaseincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgimpbaseincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgimpbaseincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgimpbaseincludedir)" || exit $$?; \
 	done
 
 uninstall-libgimpbaseincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgimpbaseinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgimpbaseincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgimpbaseincludedir)/$$f"; \
-	done
+	@list='$(libgimpbaseinclude_HEADERS)'; test -n "$(libgimpbaseincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgimpbaseincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgimpbaseincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -661,7 +688,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -669,29 +696,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -700,6 +732,7 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
+	$(am__tty_colors); \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -711,10 +744,10 @@ check-TESTS: $(TESTS)
 	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
+		col=$$red; res=XPASS; \
 	      ;; \
 	      *) \
-		echo "PASS: $$tst"; \
+		col=$$grn; res=PASS; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
@@ -722,17 +755,18 @@ check-TESTS: $(TESTS)
 	      case " $(XFAIL_TESTS) " in \
 	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
+		col=$$lgn; res=XFAIL; \
 	      ;; \
 	      *) \
 		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
+		col=$$red; res=FAIL; \
 	      ;; \
 	      esac; \
 	    else \
 	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
+	      col=$$blu; res=SKIP; \
 	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
 	  if test "$$all" -eq 1; then \
 	    tests="test"; \
@@ -774,11 +808,15 @@ check-TESTS: $(TESTS)
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
 	  echo "$$banner"; \
 	  test -z "$$skipped" || echo "$$skipped"; \
 	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
+	  echo "$$dashes$$std"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -798,13 +836,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -837,6 +879,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -859,6 +902,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -867,18 +912,28 @@ install-data-am: install-data-local install-libgimpbaseincludeHEADERS
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -902,7 +957,7 @@ ps-am:
 uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libgimpbaseincludeHEADERS uninstall-local
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
@@ -965,6 +1020,7 @@ $(srcdir)/gimpbaseenums.c: $(srcdir)/gimpbaseenums.h $(GIMP_MKENUMS)
 		$(srcdir)/gimpbaseenums.h > xgen-bec \
 	&& cp xgen-bec $(@F) \
 	&& rm -f xgen-bec
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libgimpbase/gimpversion.h b/libgimpbase/gimpversion.h
index 0042a9a3ee..7644fa4416 100644
--- a/libgimpbase/gimpversion.h
+++ b/libgimpbase/gimpversion.h
@@ -11,8 +11,8 @@ G_BEGIN_DECLS
 
 #define GIMP_MAJOR_VERSION                              (2)
 #define GIMP_MINOR_VERSION                              (6)
-#define GIMP_MICRO_VERSION                              (7)
-#define GIMP_VERSION                                    "2.6.7"
+#define GIMP_MICRO_VERSION                              (8)
+#define GIMP_VERSION                                    "2.6.8"
 #define GIMP_API_VERSION                                "2.0"
 #define GIMP_CHECK_VERSION(major, minor, micro) \
     (GIMP_MAJOR_VERSION > (major) || \
diff --git a/libgimpcolor/Makefile.in b/libgimpcolor/Makefile.in
index f0e9109d1f..82ba646b45 100644
--- a/libgimpcolor/Makefile.in
+++ b/libgimpcolor/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -51,15 +53,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgimpcolorincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am_libgimpcolor_2_0_la_OBJECTS = gimpadaptivesupersample.lo \
@@ -75,6 +92,7 @@ test_color_parser_OBJECTS = test-color-parser.$(OBJEXT)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -87,10 +105,11 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libgimpcolor_2_0_la_SOURCES) test-color-parser.c
 DIST_SOURCES = $(libgimpcolor_2_0_la_SOURCES) test-color-parser.c
 DATA = $(noinst_DATA)
-libgimpcolorincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgimpcolorinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
@@ -474,9 +493,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimpcolor/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimpcolor/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpcolor/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimpcolor/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -494,23 +513,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -546,21 +570,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -573,20 +597,23 @@ clean-libtool:
 install-libgimpcolorincludeHEADERS: $(libgimpcolorinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgimpcolorincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgimpcolorincludedir)"
-	@list='$(libgimpcolorinclude_HEADERS)'; for p in $$list; do \
+	@list='$(libgimpcolorinclude_HEADERS)'; test -n "$(libgimpcolorincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgimpcolorincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgimpcolorincludedir)/$$f'"; \
-	  $(libgimpcolorincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgimpcolorincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgimpcolorincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgimpcolorincludedir)" || exit $$?; \
 	done
 
 uninstall-libgimpcolorincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgimpcolorinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgimpcolorincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgimpcolorincludedir)/$$f"; \
-	done
+	@list='$(libgimpcolorinclude_HEADERS)'; test -n "$(libgimpcolorincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgimpcolorincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgimpcolorincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -600,7 +627,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -608,29 +635,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -639,6 +671,7 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
+	$(am__tty_colors); \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -650,10 +683,10 @@ check-TESTS: $(TESTS)
 	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
+		col=$$red; res=XPASS; \
 	      ;; \
 	      *) \
-		echo "PASS: $$tst"; \
+		col=$$grn; res=PASS; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
@@ -661,17 +694,18 @@ check-TESTS: $(TESTS)
 	      case " $(XFAIL_TESTS) " in \
 	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
+		col=$$lgn; res=XFAIL; \
 	      ;; \
 	      *) \
 		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
+		col=$$red; res=FAIL; \
 	      ;; \
 	      esac; \
 	    else \
 	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
+	      col=$$blu; res=SKIP; \
 	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
 	  if test "$$all" -eq 1; then \
 	    tests="test"; \
@@ -713,11 +747,15 @@ check-TESTS: $(TESTS)
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
 	  echo "$$banner"; \
 	  test -z "$$skipped" || echo "$$skipped"; \
 	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
+	  echo "$$dashes$$std"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -737,13 +775,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -776,6 +818,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -797,6 +840,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -805,18 +850,28 @@ install-data-am: install-data-local install-libgimpcolorincludeHEADERS
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -840,7 +895,7 @@ ps-am:
 uninstall-am: uninstall-libLTLIBRARIES \
 	uninstall-libgimpcolorincludeHEADERS uninstall-local
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libLTLIBRARIES clean-libtool ctags \
@@ -884,6 +939,7 @@ uninstall-am: uninstall-libLTLIBRARIES \
 install-data-local: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libgimpconfig/Makefile.in b/libgimpconfig/Makefile.in
index 1e61bc6b39..5a679e01fc 100644
--- a/libgimpconfig/Makefile.in
+++ b/libgimpconfig/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,15 +52,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgimpconfigincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__objects_1 = gimpconfig-iface.lo gimpconfig-deserialize.lo \
@@ -74,6 +91,7 @@ libgimpconfig_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -86,7 +104,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libgimpconfig_2_0_la_SOURCES)
 DIST_SOURCES = $(libgimpconfig_2_0_la_SOURCES)
 DATA = $(noinst_DATA)
-libgimpconfigincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgimpconfiginclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -484,9 +501,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimpconfig/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimpconfig/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpconfig/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimpconfig/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -504,23 +521,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -553,21 +575,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -580,20 +602,23 @@ clean-libtool:
 install-libgimpconfigincludeHEADERS: $(libgimpconfiginclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgimpconfigincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgimpconfigincludedir)"
-	@list='$(libgimpconfiginclude_HEADERS)'; for p in $$list; do \
+	@list='$(libgimpconfiginclude_HEADERS)'; test -n "$(libgimpconfigincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgimpconfigincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgimpconfigincludedir)/$$f'"; \
-	  $(libgimpconfigincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgimpconfigincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgimpconfigincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgimpconfigincludedir)" || exit $$?; \
 	done
 
 uninstall-libgimpconfigincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgimpconfiginclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgimpconfigincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgimpconfigincludedir)/$$f"; \
-	done
+	@list='$(libgimpconfiginclude_HEADERS)'; test -n "$(libgimpconfigincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgimpconfigincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgimpconfigincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -607,7 +632,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -615,29 +640,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -658,13 +688,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -696,6 +730,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -717,6 +752,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -726,18 +763,28 @@ install-data-am: install-data-local \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -819,6 +866,7 @@ $(srcdir)/gimpcolorconfig-enums.c: $(srcdir)/gimpcolorconfig-enums.h $(GIMP_MKEN
 		$(srcdir)/gimpcolorconfig-enums.h > xgen-cec \
 	&& cp xgen-cec $(@F) \
 	&& rm -f xgen-cec
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libgimpmath/Makefile.in b/libgimpmath/Makefile.in
index 42914d7aa8..17f3c18007 100644
--- a/libgimpmath/Makefile.in
+++ b/libgimpmath/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,15 +52,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgimpmathincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am_libgimpmath_2_0_la_OBJECTS = gimpmatrix.lo gimpmd5.lo gimpvector.lo
@@ -69,6 +86,7 @@ libgimpmath_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -81,7 +99,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libgimpmath_2_0_la_SOURCES)
 DIST_SOURCES = $(libgimpmath_2_0_la_SOURCES)
 DATA = $(noinst_DATA)
-libgimpmathincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgimpmathinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -439,9 +456,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimpmath/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimpmath/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpmath/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimpmath/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -459,23 +476,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -501,21 +523,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -528,20 +550,23 @@ clean-libtool:
 install-libgimpmathincludeHEADERS: $(libgimpmathinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgimpmathincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgimpmathincludedir)"
-	@list='$(libgimpmathinclude_HEADERS)'; for p in $$list; do \
+	@list='$(libgimpmathinclude_HEADERS)'; test -n "$(libgimpmathincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgimpmathincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgimpmathincludedir)/$$f'"; \
-	  $(libgimpmathincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgimpmathincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgimpmathincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgimpmathincludedir)" || exit $$?; \
 	done
 
 uninstall-libgimpmathincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgimpmathinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgimpmathincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgimpmathincludedir)/$$f"; \
-	done
+	@list='$(libgimpmathinclude_HEADERS)'; test -n "$(libgimpmathincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgimpmathincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgimpmathincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -555,7 +580,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -563,29 +588,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -606,13 +636,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -643,6 +677,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -664,6 +699,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -672,18 +709,28 @@ install-data-am: install-data-local install-libgimpmathincludeHEADERS
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -751,6 +798,7 @@ uninstall-am: uninstall-libLTLIBRARIES \
 install-data-local: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libgimpmodule/Makefile.in b/libgimpmodule/Makefile.in
index 0cdde401b6..44b99115f6 100644
--- a/libgimpmodule/Makefile.in
+++ b/libgimpmodule/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,15 +52,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgimpmoduleincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am_libgimpmodule_2_0_la_OBJECTS = gimpmodule.lo gimpmoduledb.lo
@@ -69,6 +86,7 @@ libgimpmodule_2_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -81,7 +99,6 @@ LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 SOURCES = $(libgimpmodule_2_0_la_SOURCES)
 DIST_SOURCES = $(libgimpmodule_2_0_la_SOURCES)
 DATA = $(noinst_DATA)
-libgimpmoduleincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgimpmoduleinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -438,9 +455,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimpmodule/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimpmodule/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpmodule/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimpmodule/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -458,23 +475,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -499,21 +521,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -526,20 +548,23 @@ clean-libtool:
 install-libgimpmoduleincludeHEADERS: $(libgimpmoduleinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgimpmoduleincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgimpmoduleincludedir)"
-	@list='$(libgimpmoduleinclude_HEADERS)'; for p in $$list; do \
+	@list='$(libgimpmoduleinclude_HEADERS)'; test -n "$(libgimpmoduleincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgimpmoduleincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgimpmoduleincludedir)/$$f'"; \
-	  $(libgimpmoduleincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgimpmoduleincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgimpmoduleincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgimpmoduleincludedir)" || exit $$?; \
 	done
 
 uninstall-libgimpmoduleincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgimpmoduleinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgimpmoduleincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgimpmoduleincludedir)/$$f"; \
-	done
+	@list='$(libgimpmoduleinclude_HEADERS)'; test -n "$(libgimpmoduleincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgimpmoduleincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgimpmoduleincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -553,7 +578,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -561,29 +586,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -604,13 +634,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -641,6 +675,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -662,6 +697,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -671,18 +708,28 @@ install-data-am: install-data-local \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -750,6 +797,7 @@ uninstall-am: uninstall-libLTLIBRARIES \
 install-data-local: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libgimpthumb/Makefile.in b/libgimpthumb/Makefile.in
index c032ea3521..961cc055cf 100644
--- a/libgimpthumb/Makefile.in
+++ b/libgimpthumb/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,8 +20,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -52,15 +54,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgimpthumbincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 libgimpthumb_2_0_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -79,6 +96,7 @@ gimp_thumbnail_list_DEPENDENCIES =  \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -93,7 +111,6 @@ SOURCES = $(libgimpthumb_2_0_la_SOURCES) \
 DIST_SOURCES = $(libgimpthumb_2_0_la_SOURCES) \
 	$(gimp_thumbnail_list_SOURCES)
 DATA = $(noinst_DATA)
-libgimpthumbincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgimpthumbinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -461,9 +478,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimpthumb/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimpthumb/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpthumb/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimpthumb/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -481,23 +498,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -512,11 +534,13 @@ libgimpthumb-2.0.la: $(libgimpthumb_2_0_la_OBJECTS) $(libgimpthumb_2_0_la_DEPEND
 	$(libgimpthumb_2_0_la_LINK) -rpath $(libdir) $(libgimpthumb_2_0_la_OBJECTS) $(libgimpthumb_2_0_la_LIBADD) $(LIBS)
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 gimp-thumbnail-list$(EXEEXT): $(gimp_thumbnail_list_OBJECTS) $(gimp_thumbnail_list_DEPENDENCIES) 
 	@rm -f gimp-thumbnail-list$(EXEEXT)
 	$(LINK) $(gimp_thumbnail_list_OBJECTS) $(gimp_thumbnail_list_LDADD) $(LIBS)
@@ -535,21 +559,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -562,20 +586,23 @@ clean-libtool:
 install-libgimpthumbincludeHEADERS: $(libgimpthumbinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgimpthumbincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgimpthumbincludedir)"
-	@list='$(libgimpthumbinclude_HEADERS)'; for p in $$list; do \
+	@list='$(libgimpthumbinclude_HEADERS)'; test -n "$(libgimpthumbincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgimpthumbincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgimpthumbincludedir)/$$f'"; \
-	  $(libgimpthumbincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgimpthumbincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgimpthumbincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgimpthumbincludedir)" || exit $$?; \
 	done
 
 uninstall-libgimpthumbincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgimpthumbinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgimpthumbincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgimpthumbincludedir)/$$f"; \
-	done
+	@list='$(libgimpthumbinclude_HEADERS)'; test -n "$(libgimpthumbincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgimpthumbincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgimpthumbincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -589,7 +616,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -597,29 +624,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -640,13 +672,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -678,6 +714,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -699,6 +736,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -707,18 +746,28 @@ install-data-am: install-data-local install-libgimpthumbincludeHEADERS
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -797,6 +846,7 @@ gimpthumb-enums.c: $(srcdir)/gimpthumb-enums.h $(GIMP_MKENUMS)
 		$(srcdir)/gimpthumb-enums.h > xgen-tec \
 	&& cp xgen-tec $(@F) \
 	&& rm -f xgen-tec
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/libgimpwidgets/Makefile.in b/libgimpwidgets/Makefile.in
index 134aa45449..e61fb3ce87 100644
--- a/libgimpwidgets/Makefile.in
+++ b/libgimpwidgets/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -51,15 +53,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)" \
 	"$(DESTDIR)$(libgimpwidgetsincludedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__objects_1 = gimpwidgetsenums.lo gimpwidgetsmarshal.lo
@@ -92,6 +109,7 @@ test_preview_area_OBJECTS = $(am_test_preview_area_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -106,7 +124,6 @@ SOURCES = $(libgimpwidgets_2_0_la_SOURCES) \
 DIST_SOURCES = $(libgimpwidgets_2_0_la_SOURCES) \
 	$(test_preview_area_SOURCES)
 DATA = $(noinst_DATA)
-libgimpwidgetsincludeHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(libgimpwidgetsinclude_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -663,9 +680,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  libgimpwidgets/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  libgimpwidgets/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu libgimpwidgets/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu libgimpwidgets/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -683,23 +700,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -781,21 +803,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -808,20 +830,23 @@ clean-libtool:
 install-libgimpwidgetsincludeHEADERS: $(libgimpwidgetsinclude_HEADERS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libgimpwidgetsincludedir)" || $(MKDIR_P) "$(DESTDIR)$(libgimpwidgetsincludedir)"
-	@list='$(libgimpwidgetsinclude_HEADERS)'; for p in $$list; do \
+	@list='$(libgimpwidgetsinclude_HEADERS)'; test -n "$(libgimpwidgetsincludedir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libgimpwidgetsincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libgimpwidgetsincludedir)/$$f'"; \
-	  $(libgimpwidgetsincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libgimpwidgetsincludedir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgimpwidgetsincludedir)'"; \
+	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgimpwidgetsincludedir)" || exit $$?; \
 	done
 
 uninstall-libgimpwidgetsincludeHEADERS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libgimpwidgetsinclude_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libgimpwidgetsincludedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libgimpwidgetsincludedir)/$$f"; \
-	done
+	@list='$(libgimpwidgetsinclude_HEADERS)'; test -n "$(libgimpwidgetsincludedir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libgimpwidgetsincludedir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libgimpwidgetsincludedir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -835,7 +860,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -843,29 +868,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -886,13 +916,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -924,6 +958,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -945,6 +980,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -954,18 +991,28 @@ install-data-am: install-data-local \
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -1063,6 +1110,7 @@ gimp-wilber-pixbufs.h: $(WILBER_IMAGES) Makefile.am
 install-data-local: install-ms-lib install-libtool-import-lib
 
 uninstall-local: uninstall-ms-lib uninstall-libtool-import-lib
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/m4macros/Makefile.in b/m4macros/Makefile.in
index f8bf1f9003..da54287836 100644
--- a/m4macros/Makefile.in
+++ b/m4macros/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,8 +19,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,6 +51,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -56,9 +59,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(m4datadir)"
-m4dataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(m4data_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -381,9 +398,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  m4macros/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  m4macros/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu m4macros/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu m4macros/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -401,6 +418,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -410,20 +428,23 @@ clean-libtool:
 install-m4dataDATA: $(m4data_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(m4datadir)" || $(MKDIR_P) "$(DESTDIR)$(m4datadir)"
-	@list='$(m4data_DATA)'; for p in $$list; do \
+	@list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(m4dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(m4datadir)/$$f'"; \
-	  $(m4dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(m4datadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(m4datadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(m4datadir)" || exit $$?; \
 	done
 
 uninstall-m4dataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(m4data_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(m4datadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(m4datadir)/$$f"; \
-	done
+	@list='$(m4data_DATA)'; test -n "$(m4datadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(m4datadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(m4datadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -447,13 +468,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -484,6 +509,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -502,6 +528,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -510,18 +538,28 @@ install-data-am: install-m4dataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -556,6 +594,7 @@ uninstall-am: uninstall-m4dataDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-m4dataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/menus/Makefile.in b/menus/Makefile.in
index be49201450..5167246848 100644
--- a/menus/Makefile.in
+++ b/menus/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(menudatadir)"
-menudataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(menudata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -411,9 +428,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  menus/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  menus/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu menus/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu menus/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -431,6 +448,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -440,20 +458,23 @@ clean-libtool:
 install-menudataDATA: $(menudata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(menudatadir)" || $(MKDIR_P) "$(DESTDIR)$(menudatadir)"
-	@list='$(menudata_DATA)'; for p in $$list; do \
+	@list='$(menudata_DATA)'; test -n "$(menudatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(menudataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(menudatadir)/$$f'"; \
-	  $(menudataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(menudatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(menudatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(menudatadir)" || exit $$?; \
 	done
 
 uninstall-menudataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(menudata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(menudatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(menudatadir)/$$f"; \
-	done
+	@list='$(menudata_DATA)'; test -n "$(menudatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(menudatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(menudatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -477,13 +498,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -517,6 +542,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -536,6 +562,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -544,18 +572,28 @@ install-data-am: install-menudataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -602,6 +640,7 @@ validate: $(menudata_DATA)
 @HAVE_XMLLINT_TRUE@	done
 
 dist-hook: validate
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/missing b/missing
index 1c8ff7049d..28055d2ae6 100755
--- a/missing
+++ b/missing
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2006-05-10.23
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
-#   Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard , 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -18,9 +18,7 @@ scriptversion=2006-05-10.23
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -89,6 +87,9 @@ Supported PROGRAM values:
   tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
 Send bug reports to ."
     exit $?
     ;;
@@ -106,15 +107,22 @@ Send bug reports to ."
 
 esac
 
+# normalize program name to check for.
+program=`echo "$1" | sed '
+  s/^gnu-//; t
+  s/^gnu//; t
+  s/^g//; t'`
+
 # Now exit if we have it, but it failed.  Also exit now if we
 # don't have it and --version was passed (most likely to detect
-# the program).
+# the program).  This is about non-GNU programs, so use $1 not
+# $program.
 case $1 in
-  lex|yacc)
+  lex*|yacc*)
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar)
+  tar*)
     if test -n "$run"; then
        echo 1>&2 "ERROR: \`tar' requires --run"
        exit 1
@@ -138,7 +146,7 @@ esac
 
 # If it does not exist, or fails to run (possibly an outdated version),
 # try to emulate it.
-case $1 in
+case $program in
   aclocal*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
@@ -148,7 +156,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch aclocal.m4
     ;;
 
-  autoconf)
+  autoconf*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`${configure_ac}'.  You might want to install the
@@ -157,7 +165,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch configure
     ;;
 
-  autoheader)
+  autoheader*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified \`acconfig.h' or \`${configure_ac}'.  You might want
@@ -187,7 +195,7 @@ WARNING: \`$1' is $msg.  You should only need it if
 	   while read f; do touch "$f"; done
     ;;
 
-  autom4te)
+  autom4te*)
     echo 1>&2 "\
 WARNING: \`$1' is needed, but is $msg.
          You might have modified some files without having the
@@ -210,7 +218,7 @@ WARNING: \`$1' is needed, but is $msg.
     fi
     ;;
 
-  bison|yacc)
+  bison*|yacc*)
     echo 1>&2 "\
 WARNING: \`$1' $msg.  You should only need it if
          you modified a \`.y' file.  You may need the \`Bison' package
@@ -240,7 +248,7 @@ WARNING: \`$1' $msg.  You should only need it if
     fi
     ;;
 
-  lex|flex)
+  lex*|flex*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.l' file.  You may need the \`Flex' package
@@ -263,7 +271,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     fi
     ;;
 
-  help2man)
+  help2man*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
 	 you modified a dependency of a manual page.  You may need the
@@ -277,11 +285,11 @@ WARNING: \`$1' is $msg.  You should only need it if
     else
 	test -z "$file" || exec >$file
 	echo ".ab help2man is required to generate this page"
-	exit 1
+	exit $?
     fi
     ;;
 
-  makeinfo)
+  makeinfo*)
     echo 1>&2 "\
 WARNING: \`$1' is $msg.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -310,7 +318,7 @@ WARNING: \`$1' is $msg.  You should only need it if
     touch $file
     ;;
 
-  tar)
+  tar*)
     shift
 
     # We have already tried tar in the generic part.
@@ -363,5 +371,6 @@ exit 0
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/modules/Makefile.in b/modules/Makefile.in
index 61f6e8bbbe..bd7606c842 100644
--- a/modules/Makefile.in
+++ b/modules/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,14 +50,29 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(lib_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 am__DEPENDENCIES_2 = $(libgimpmodule) $(libgimpwidgets) \
@@ -182,6 +199,7 @@ libdisplay_filter_proof_la_LINK = $(LIBTOOL) --tag=CC \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -615,9 +633,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  modules/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  modules/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu modules/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu modules/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -635,23 +653,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
 
 uninstall-libLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
 	done
 
 clean-libLTLIBRARIES:
@@ -708,73 +731,73 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 libcolor_selector_cmyk_la-color-selector-cmyk.lo: color-selector-cmyk.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -MT libcolor_selector_cmyk_la-color-selector-cmyk.lo -MD -MP -MF $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk.Tpo -c -o libcolor_selector_cmyk_la-color-selector-cmyk.lo `test -f 'color-selector-cmyk.c' || echo '$(srcdir)/'`color-selector-cmyk.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk.Tpo $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -MT libcolor_selector_cmyk_la-color-selector-cmyk.lo -MD -MP -MF $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk.Tpo -c -o libcolor_selector_cmyk_la-color-selector-cmyk.lo `test -f 'color-selector-cmyk.c' || echo '$(srcdir)/'`color-selector-cmyk.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk.Tpo $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='color-selector-cmyk.c' object='libcolor_selector_cmyk_la-color-selector-cmyk.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -c -o libcolor_selector_cmyk_la-color-selector-cmyk.lo `test -f 'color-selector-cmyk.c' || echo '$(srcdir)/'`color-selector-cmyk.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -c -o libcolor_selector_cmyk_la-color-selector-cmyk.lo `test -f 'color-selector-cmyk.c' || echo '$(srcdir)/'`color-selector-cmyk.c
 
 libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo: color-selector-cmyk-lcms.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -MT libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo -MD -MP -MF $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk-lcms.Tpo -c -o libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo `test -f 'color-selector-cmyk-lcms.c' || echo '$(srcdir)/'`color-selector-cmyk-lcms.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk-lcms.Tpo $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk-lcms.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -MT libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo -MD -MP -MF $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk-lcms.Tpo -c -o libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo `test -f 'color-selector-cmyk-lcms.c' || echo '$(srcdir)/'`color-selector-cmyk-lcms.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk-lcms.Tpo $(DEPDIR)/libcolor_selector_cmyk_la-color-selector-cmyk-lcms.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='color-selector-cmyk-lcms.c' object='libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -c -o libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo `test -f 'color-selector-cmyk-lcms.c' || echo '$(srcdir)/'`color-selector-cmyk-lcms.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcolor_selector_cmyk_la_CFLAGS) $(CFLAGS) -c -o libcolor_selector_cmyk_la-color-selector-cmyk-lcms.lo `test -f 'color-selector-cmyk-lcms.c' || echo '$(srcdir)/'`color-selector-cmyk-lcms.c
 
 libcontroller_linux_input_la-gimpinputdevicestore-hal.lo: gimpinputdevicestore-hal.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -MT libcontroller_linux_input_la-gimpinputdevicestore-hal.lo -MD -MP -MF $(DEPDIR)/libcontroller_linux_input_la-gimpinputdevicestore-hal.Tpo -c -o libcontroller_linux_input_la-gimpinputdevicestore-hal.lo `test -f 'gimpinputdevicestore-hal.c' || echo '$(srcdir)/'`gimpinputdevicestore-hal.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcontroller_linux_input_la-gimpinputdevicestore-hal.Tpo $(DEPDIR)/libcontroller_linux_input_la-gimpinputdevicestore-hal.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -MT libcontroller_linux_input_la-gimpinputdevicestore-hal.lo -MD -MP -MF $(DEPDIR)/libcontroller_linux_input_la-gimpinputdevicestore-hal.Tpo -c -o libcontroller_linux_input_la-gimpinputdevicestore-hal.lo `test -f 'gimpinputdevicestore-hal.c' || echo '$(srcdir)/'`gimpinputdevicestore-hal.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcontroller_linux_input_la-gimpinputdevicestore-hal.Tpo $(DEPDIR)/libcontroller_linux_input_la-gimpinputdevicestore-hal.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='gimpinputdevicestore-hal.c' object='libcontroller_linux_input_la-gimpinputdevicestore-hal.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -c -o libcontroller_linux_input_la-gimpinputdevicestore-hal.lo `test -f 'gimpinputdevicestore-hal.c' || echo '$(srcdir)/'`gimpinputdevicestore-hal.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -c -o libcontroller_linux_input_la-gimpinputdevicestore-hal.lo `test -f 'gimpinputdevicestore-hal.c' || echo '$(srcdir)/'`gimpinputdevicestore-hal.c
 
 libcontroller_linux_input_la-controller-linux-input.lo: controller-linux-input.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -MT libcontroller_linux_input_la-controller-linux-input.lo -MD -MP -MF $(DEPDIR)/libcontroller_linux_input_la-controller-linux-input.Tpo -c -o libcontroller_linux_input_la-controller-linux-input.lo `test -f 'controller-linux-input.c' || echo '$(srcdir)/'`controller-linux-input.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcontroller_linux_input_la-controller-linux-input.Tpo $(DEPDIR)/libcontroller_linux_input_la-controller-linux-input.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -MT libcontroller_linux_input_la-controller-linux-input.lo -MD -MP -MF $(DEPDIR)/libcontroller_linux_input_la-controller-linux-input.Tpo -c -o libcontroller_linux_input_la-controller-linux-input.lo `test -f 'controller-linux-input.c' || echo '$(srcdir)/'`controller-linux-input.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcontroller_linux_input_la-controller-linux-input.Tpo $(DEPDIR)/libcontroller_linux_input_la-controller-linux-input.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='controller-linux-input.c' object='libcontroller_linux_input_la-controller-linux-input.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -c -o libcontroller_linux_input_la-controller-linux-input.lo `test -f 'controller-linux-input.c' || echo '$(srcdir)/'`controller-linux-input.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_linux_input_la_CFLAGS) $(CFLAGS) -c -o libcontroller_linux_input_la-controller-linux-input.lo `test -f 'controller-linux-input.c' || echo '$(srcdir)/'`controller-linux-input.c
 
 libcontroller_midi_la-controller-midi.lo: controller-midi.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_midi_la_CFLAGS) $(CFLAGS) -MT libcontroller_midi_la-controller-midi.lo -MD -MP -MF $(DEPDIR)/libcontroller_midi_la-controller-midi.Tpo -c -o libcontroller_midi_la-controller-midi.lo `test -f 'controller-midi.c' || echo '$(srcdir)/'`controller-midi.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libcontroller_midi_la-controller-midi.Tpo $(DEPDIR)/libcontroller_midi_la-controller-midi.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_midi_la_CFLAGS) $(CFLAGS) -MT libcontroller_midi_la-controller-midi.lo -MD -MP -MF $(DEPDIR)/libcontroller_midi_la-controller-midi.Tpo -c -o libcontroller_midi_la-controller-midi.lo `test -f 'controller-midi.c' || echo '$(srcdir)/'`controller-midi.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libcontroller_midi_la-controller-midi.Tpo $(DEPDIR)/libcontroller_midi_la-controller-midi.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='controller-midi.c' object='libcontroller_midi_la-controller-midi.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_midi_la_CFLAGS) $(CFLAGS) -c -o libcontroller_midi_la-controller-midi.lo `test -f 'controller-midi.c' || echo '$(srcdir)/'`controller-midi.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libcontroller_midi_la_CFLAGS) $(CFLAGS) -c -o libcontroller_midi_la-controller-midi.lo `test -f 'controller-midi.c' || echo '$(srcdir)/'`controller-midi.c
 
 libdisplay_filter_lcms_la-display-filter-lcms.lo: display-filter-lcms.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_lcms_la_CFLAGS) $(CFLAGS) -MT libdisplay_filter_lcms_la-display-filter-lcms.lo -MD -MP -MF $(DEPDIR)/libdisplay_filter_lcms_la-display-filter-lcms.Tpo -c -o libdisplay_filter_lcms_la-display-filter-lcms.lo `test -f 'display-filter-lcms.c' || echo '$(srcdir)/'`display-filter-lcms.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libdisplay_filter_lcms_la-display-filter-lcms.Tpo $(DEPDIR)/libdisplay_filter_lcms_la-display-filter-lcms.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_lcms_la_CFLAGS) $(CFLAGS) -MT libdisplay_filter_lcms_la-display-filter-lcms.lo -MD -MP -MF $(DEPDIR)/libdisplay_filter_lcms_la-display-filter-lcms.Tpo -c -o libdisplay_filter_lcms_la-display-filter-lcms.lo `test -f 'display-filter-lcms.c' || echo '$(srcdir)/'`display-filter-lcms.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdisplay_filter_lcms_la-display-filter-lcms.Tpo $(DEPDIR)/libdisplay_filter_lcms_la-display-filter-lcms.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='display-filter-lcms.c' object='libdisplay_filter_lcms_la-display-filter-lcms.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_lcms_la_CFLAGS) $(CFLAGS) -c -o libdisplay_filter_lcms_la-display-filter-lcms.lo `test -f 'display-filter-lcms.c' || echo '$(srcdir)/'`display-filter-lcms.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_lcms_la_CFLAGS) $(CFLAGS) -c -o libdisplay_filter_lcms_la-display-filter-lcms.lo `test -f 'display-filter-lcms.c' || echo '$(srcdir)/'`display-filter-lcms.c
 
 libdisplay_filter_proof_la-display-filter-proof.lo: display-filter-proof.c
-@am__fastdepCC_TRUE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_proof_la_CFLAGS) $(CFLAGS) -MT libdisplay_filter_proof_la-display-filter-proof.lo -MD -MP -MF $(DEPDIR)/libdisplay_filter_proof_la-display-filter-proof.Tpo -c -o libdisplay_filter_proof_la-display-filter-proof.lo `test -f 'display-filter-proof.c' || echo '$(srcdir)/'`display-filter-proof.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/libdisplay_filter_proof_la-display-filter-proof.Tpo $(DEPDIR)/libdisplay_filter_proof_la-display-filter-proof.Plo
+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_proof_la_CFLAGS) $(CFLAGS) -MT libdisplay_filter_proof_la-display-filter-proof.lo -MD -MP -MF $(DEPDIR)/libdisplay_filter_proof_la-display-filter-proof.Tpo -c -o libdisplay_filter_proof_la-display-filter-proof.lo `test -f 'display-filter-proof.c' || echo '$(srcdir)/'`display-filter-proof.c
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/libdisplay_filter_proof_la-display-filter-proof.Tpo $(DEPDIR)/libdisplay_filter_proof_la-display-filter-proof.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='display-filter-proof.c' object='libdisplay_filter_proof_la-display-filter-proof.lo' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_proof_la_CFLAGS) $(CFLAGS) -c -o libdisplay_filter_proof_la-display-filter-proof.lo `test -f 'display-filter-proof.c' || echo '$(srcdir)/'`display-filter-proof.c
+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libdisplay_filter_proof_la_CFLAGS) $(CFLAGS) -c -o libdisplay_filter_proof_la-display-filter-proof.lo `test -f 'display-filter-proof.c' || echo '$(srcdir)/'`display-filter-proof.c
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -794,7 +817,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -802,29 +825,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -845,13 +873,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -882,6 +914,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -903,6 +936,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -911,18 +946,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -961,6 +1006,7 @@ uninstall-am: uninstall-libLTLIBRARIES
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libLTLIBRARIES
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/modules/color-selector-cmyk-lcms.c b/modules/color-selector-cmyk-lcms.c
index a49d553ffe..f0e3472f48 100644
--- a/modules/color-selector-cmyk-lcms.c
+++ b/modules/color-selector-cmyk-lcms.c
@@ -245,6 +245,8 @@ colorsel_cmyk_set_color (GimpColorSelector *selector,
                          const GimpHSV     *hsv)
 {
   ColorselCmyk *module = COLORSEL_CMYK (selector);
+  gdouble       values[4];
+  gint          i;
 
   if (module->rgb2cmyk)
     {
@@ -267,10 +269,23 @@ colorsel_cmyk_set_color (GimpColorSelector *selector,
       gimp_rgb_to_cmyk (rgb, 1.0, &module->cmyk);
     }
 
-  gtk_adjustment_set_value (module->adj[0], module->cmyk.c * 100.0);
-  gtk_adjustment_set_value (module->adj[1], module->cmyk.m * 100.0);
-  gtk_adjustment_set_value (module->adj[2], module->cmyk.y * 100.0);
-  gtk_adjustment_set_value (module->adj[3], module->cmyk.k * 100.0);
+  values[0] = module->cmyk.c * 100.0;
+  values[1] = module->cmyk.m * 100.0;
+  values[2] = module->cmyk.y * 100.0;
+  values[3] = module->cmyk.k * 100.0;
+
+  for (i = 0; i < 4; i++)
+    {
+      g_signal_handlers_block_by_func (module->adj[i],
+                                       colorsel_cmyk_adj_update,
+                                       module);
+
+      gtk_adjustment_set_value (module->adj[i], values[i]);
+
+      g_signal_handlers_unblock_by_func (module->adj[i],
+                                         colorsel_cmyk_adj_update,
+                                         module);
+    }
 }
 
 static void
@@ -440,5 +455,5 @@ colorsel_cmyk_config_changed (ColorselCmyk *module)
 
  out:
   if (! module->in_destruction)
-    gimp_color_selector_set_color (selector, &selector->rgb, &selector->hsv);
+    colorsel_cmyk_set_color (selector, &selector->rgb, &selector->hsv);
 }
diff --git a/plug-ins/Makefile.in b/plug-ins/Makefile.in
index 2a24a3dcff..166627d659 100644
--- a/plug-ins/Makefile.in
+++ b/plug-ins/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -46,6 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -57,6 +60,9 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = script-fu pygimp color-rotate file-bmp file-faxg3 \
@@ -66,6 +72,31 @@ DIST_SUBDIRS = script-fu pygimp color-rotate file-bmp file-faxg3 \
 	map-object maze metadata pagecurl print selection-to-path \
 	twain win-snap common
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -424,9 +455,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -444,6 +475,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -475,7 +507,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -509,16 +541,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -533,7 +565,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -545,7 +577,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -554,29 +586,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -597,29 +634,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -649,6 +701,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -667,6 +720,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -675,18 +730,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -707,8 +772,8 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -724,6 +789,7 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/color-rotate/Makefile.in b/plug-ins/color-rotate/Makefile.in
index 80f65f368e..82c485dbdd 100644
--- a/plug-ins/color-rotate/Makefile.in
+++ b/plug-ins/color-rotate/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_color_rotate_OBJECTS = color-rotate.$(OBJEXT) \
 	color-rotate-callbacks.$(OBJEXT) color-rotate-dialog.$(OBJEXT) \
@@ -65,6 +67,7 @@ color_rotate_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -85,10 +88,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -439,9 +470,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/color-rotate/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/color-rotate/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/color-rotate/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/color-rotate/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -459,34 +490,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 color-rotate$(EXEEXT): $(color_rotate_OBJECTS) $(color_rotate_DEPENDENCIES) 
 	@rm -f color-rotate$(EXEEXT)
 	$(LINK) $(color_rotate_OBJECTS) $(color_rotate_LDADD) $(LIBS)
@@ -506,21 +553,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -555,7 +602,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -589,16 +636,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -613,7 +660,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -625,7 +672,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -634,29 +681,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -677,29 +729,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -732,6 +799,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -753,6 +821,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -761,18 +831,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -795,8 +875,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -814,6 +894,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/color-rotate/images/Makefile.in b/plug-ins/color-rotate/images/Makefile.in
index 6253faed19..ef3c5e8e19 100644
--- a/plug-ins/color-rotate/images/Makefile.in
+++ b/plug-ins/color-rotate/images/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DATA = $(noinst_DATA)
@@ -368,9 +371,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/color-rotate/images/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/color-rotate/images/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/color-rotate/images/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/color-rotate/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -388,6 +391,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -417,13 +421,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -452,6 +460,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -470,6 +479,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -478,18 +489,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -534,6 +555,7 @@ stock-icons.list: $(STOCK_IMAGES) Makefile.am
 
 $(srcdir)/color-rotate-stock-pixbufs.h: stock-icons.list
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat stock-icons.list` > $(@F)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/common/Makefile.in b/plug-ins/common/Makefile.in
index 7add9d1943..572d75a928 100644
--- a/plug-ins/common/Makefile.in
+++ b/plug-ins/common/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -106,8 +108,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_alien_map_OBJECTS = alien-map.$(OBJEXT)
 alien_map_OBJECTS = $(am_alien_map_OBJECTS)
@@ -998,6 +1000,7 @@ wind_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) $(libgimpmodule) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -3723,9 +3726,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/common/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/common/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/common/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/common/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -3743,34 +3746,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 alien-map$(EXEEXT): $(alien_map_OBJECTS) $(alien_map_DEPENDENCIES) 
 	@rm -f alien-map$(EXEEXT)
 	$(LINK) $(alien_map_OBJECTS) $(alien_map_LDADD) $(LIBS)
@@ -4357,119 +4376,119 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 blur_gauss_selective-blur-gauss-selective.o: blur-gauss-selective.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(blur_gauss_selective_CFLAGS) $(CFLAGS) -MT blur_gauss_selective-blur-gauss-selective.o -MD -MP -MF $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Tpo -c -o blur_gauss_selective-blur-gauss-selective.o `test -f 'blur-gauss-selective.c' || echo '$(srcdir)/'`blur-gauss-selective.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Tpo $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Tpo $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='blur-gauss-selective.c' object='blur_gauss_selective-blur-gauss-selective.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(blur_gauss_selective_CFLAGS) $(CFLAGS) -c -o blur_gauss_selective-blur-gauss-selective.o `test -f 'blur-gauss-selective.c' || echo '$(srcdir)/'`blur-gauss-selective.c
 
 blur_gauss_selective-blur-gauss-selective.obj: blur-gauss-selective.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(blur_gauss_selective_CFLAGS) $(CFLAGS) -MT blur_gauss_selective-blur-gauss-selective.obj -MD -MP -MF $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Tpo -c -o blur_gauss_selective-blur-gauss-selective.obj `if test -f 'blur-gauss-selective.c'; then $(CYGPATH_W) 'blur-gauss-selective.c'; else $(CYGPATH_W) '$(srcdir)/blur-gauss-selective.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Tpo $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Tpo $(DEPDIR)/blur_gauss_selective-blur-gauss-selective.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='blur-gauss-selective.c' object='blur_gauss_selective-blur-gauss-selective.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(blur_gauss_selective_CFLAGS) $(CFLAGS) -c -o blur_gauss_selective-blur-gauss-selective.obj `if test -f 'blur-gauss-selective.c'; then $(CYGPATH_W) 'blur-gauss-selective.c'; else $(CYGPATH_W) '$(srcdir)/blur-gauss-selective.c'; fi`
 
 file_pdf-file-pdf.o: file-pdf.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_pdf_CFLAGS) $(CFLAGS) -MT file_pdf-file-pdf.o -MD -MP -MF $(DEPDIR)/file_pdf-file-pdf.Tpo -c -o file_pdf-file-pdf.o `test -f 'file-pdf.c' || echo '$(srcdir)/'`file-pdf.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_pdf-file-pdf.Tpo $(DEPDIR)/file_pdf-file-pdf.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_pdf-file-pdf.Tpo $(DEPDIR)/file_pdf-file-pdf.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-pdf.c' object='file_pdf-file-pdf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_pdf_CFLAGS) $(CFLAGS) -c -o file_pdf-file-pdf.o `test -f 'file-pdf.c' || echo '$(srcdir)/'`file-pdf.c
 
 file_pdf-file-pdf.obj: file-pdf.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_pdf_CFLAGS) $(CFLAGS) -MT file_pdf-file-pdf.obj -MD -MP -MF $(DEPDIR)/file_pdf-file-pdf.Tpo -c -o file_pdf-file-pdf.obj `if test -f 'file-pdf.c'; then $(CYGPATH_W) 'file-pdf.c'; else $(CYGPATH_W) '$(srcdir)/file-pdf.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_pdf-file-pdf.Tpo $(DEPDIR)/file_pdf-file-pdf.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_pdf-file-pdf.Tpo $(DEPDIR)/file_pdf-file-pdf.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-pdf.c' object='file_pdf-file-pdf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_pdf_CFLAGS) $(CFLAGS) -c -o file_pdf-file-pdf.obj `if test -f 'file-pdf.c'; then $(CYGPATH_W) 'file-pdf.c'; else $(CYGPATH_W) '$(srcdir)/file-pdf.c'; fi`
 
 file_png-file-png.o: file-png.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_png_CFLAGS) $(CFLAGS) -MT file_png-file-png.o -MD -MP -MF $(DEPDIR)/file_png-file-png.Tpo -c -o file_png-file-png.o `test -f 'file-png.c' || echo '$(srcdir)/'`file-png.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_png-file-png.Tpo $(DEPDIR)/file_png-file-png.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_png-file-png.Tpo $(DEPDIR)/file_png-file-png.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-png.c' object='file_png-file-png.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_png_CFLAGS) $(CFLAGS) -c -o file_png-file-png.o `test -f 'file-png.c' || echo '$(srcdir)/'`file-png.c
 
 file_png-file-png.obj: file-png.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_png_CFLAGS) $(CFLAGS) -MT file_png-file-png.obj -MD -MP -MF $(DEPDIR)/file_png-file-png.Tpo -c -o file_png-file-png.obj `if test -f 'file-png.c'; then $(CYGPATH_W) 'file-png.c'; else $(CYGPATH_W) '$(srcdir)/file-png.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_png-file-png.Tpo $(DEPDIR)/file_png-file-png.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_png-file-png.Tpo $(DEPDIR)/file_png-file-png.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-png.c' object='file_png-file-png.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_png_CFLAGS) $(CFLAGS) -c -o file_png-file-png.obj `if test -f 'file-png.c'; then $(CYGPATH_W) 'file-png.c'; else $(CYGPATH_W) '$(srcdir)/file-png.c'; fi`
 
 file_svg-file-svg.o: file-svg.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_svg_CFLAGS) $(CFLAGS) -MT file_svg-file-svg.o -MD -MP -MF $(DEPDIR)/file_svg-file-svg.Tpo -c -o file_svg-file-svg.o `test -f 'file-svg.c' || echo '$(srcdir)/'`file-svg.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_svg-file-svg.Tpo $(DEPDIR)/file_svg-file-svg.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_svg-file-svg.Tpo $(DEPDIR)/file_svg-file-svg.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-svg.c' object='file_svg-file-svg.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_svg_CFLAGS) $(CFLAGS) -c -o file_svg-file-svg.o `test -f 'file-svg.c' || echo '$(srcdir)/'`file-svg.c
 
 file_svg-file-svg.obj: file-svg.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_svg_CFLAGS) $(CFLAGS) -MT file_svg-file-svg.obj -MD -MP -MF $(DEPDIR)/file_svg-file-svg.Tpo -c -o file_svg-file-svg.obj `if test -f 'file-svg.c'; then $(CYGPATH_W) 'file-svg.c'; else $(CYGPATH_W) '$(srcdir)/file-svg.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_svg-file-svg.Tpo $(DEPDIR)/file_svg-file-svg.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_svg-file-svg.Tpo $(DEPDIR)/file_svg-file-svg.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-svg.c' object='file_svg-file-svg.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_svg_CFLAGS) $(CFLAGS) -c -o file_svg-file-svg.obj `if test -f 'file-svg.c'; then $(CYGPATH_W) 'file-svg.c'; else $(CYGPATH_W) '$(srcdir)/file-svg.c'; fi`
 
 file_wmf-file-wmf.o: file-wmf.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_wmf_CFLAGS) $(CFLAGS) -MT file_wmf-file-wmf.o -MD -MP -MF $(DEPDIR)/file_wmf-file-wmf.Tpo -c -o file_wmf-file-wmf.o `test -f 'file-wmf.c' || echo '$(srcdir)/'`file-wmf.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_wmf-file-wmf.Tpo $(DEPDIR)/file_wmf-file-wmf.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_wmf-file-wmf.Tpo $(DEPDIR)/file_wmf-file-wmf.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-wmf.c' object='file_wmf-file-wmf.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_wmf_CFLAGS) $(CFLAGS) -c -o file_wmf-file-wmf.o `test -f 'file-wmf.c' || echo '$(srcdir)/'`file-wmf.c
 
 file_wmf-file-wmf.obj: file-wmf.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_wmf_CFLAGS) $(CFLAGS) -MT file_wmf-file-wmf.obj -MD -MP -MF $(DEPDIR)/file_wmf-file-wmf.Tpo -c -o file_wmf-file-wmf.obj `if test -f 'file-wmf.c'; then $(CYGPATH_W) 'file-wmf.c'; else $(CYGPATH_W) '$(srcdir)/file-wmf.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_wmf-file-wmf.Tpo $(DEPDIR)/file_wmf-file-wmf.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_wmf-file-wmf.Tpo $(DEPDIR)/file_wmf-file-wmf.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='file-wmf.c' object='file_wmf-file-wmf.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_wmf_CFLAGS) $(CFLAGS) -c -o file_wmf-file-wmf.obj `if test -f 'file-wmf.c'; then $(CYGPATH_W) 'file-wmf.c'; else $(CYGPATH_W) '$(srcdir)/file-wmf.c'; fi`
 
 lcms-lcms.o: lcms.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lcms_CFLAGS) $(CFLAGS) -MT lcms-lcms.o -MD -MP -MF $(DEPDIR)/lcms-lcms.Tpo -c -o lcms-lcms.o `test -f 'lcms.c' || echo '$(srcdir)/'`lcms.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/lcms-lcms.Tpo $(DEPDIR)/lcms-lcms.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/lcms-lcms.Tpo $(DEPDIR)/lcms-lcms.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lcms.c' object='lcms-lcms.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lcms_CFLAGS) $(CFLAGS) -c -o lcms-lcms.o `test -f 'lcms.c' || echo '$(srcdir)/'`lcms.c
 
 lcms-lcms.obj: lcms.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lcms_CFLAGS) $(CFLAGS) -MT lcms-lcms.obj -MD -MP -MF $(DEPDIR)/lcms-lcms.Tpo -c -o lcms-lcms.obj `if test -f 'lcms.c'; then $(CYGPATH_W) 'lcms.c'; else $(CYGPATH_W) '$(srcdir)/lcms.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/lcms-lcms.Tpo $(DEPDIR)/lcms-lcms.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/lcms-lcms.Tpo $(DEPDIR)/lcms-lcms.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='lcms.c' object='lcms-lcms.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lcms_CFLAGS) $(CFLAGS) -c -o lcms-lcms.obj `if test -f 'lcms.c'; then $(CYGPATH_W) 'lcms.c'; else $(CYGPATH_W) '$(srcdir)/lcms.c'; fi`
 
 screenshot-screenshot.o: screenshot.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(screenshot_CFLAGS) $(CFLAGS) -MT screenshot-screenshot.o -MD -MP -MF $(DEPDIR)/screenshot-screenshot.Tpo -c -o screenshot-screenshot.o `test -f 'screenshot.c' || echo '$(srcdir)/'`screenshot.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/screenshot-screenshot.Tpo $(DEPDIR)/screenshot-screenshot.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/screenshot-screenshot.Tpo $(DEPDIR)/screenshot-screenshot.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='screenshot.c' object='screenshot-screenshot.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(screenshot_CFLAGS) $(CFLAGS) -c -o screenshot-screenshot.o `test -f 'screenshot.c' || echo '$(srcdir)/'`screenshot.c
 
 screenshot-screenshot.obj: screenshot.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(screenshot_CFLAGS) $(CFLAGS) -MT screenshot-screenshot.obj -MD -MP -MF $(DEPDIR)/screenshot-screenshot.Tpo -c -o screenshot-screenshot.obj `if test -f 'screenshot.c'; then $(CYGPATH_W) 'screenshot.c'; else $(CYGPATH_W) '$(srcdir)/screenshot.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/screenshot-screenshot.Tpo $(DEPDIR)/screenshot-screenshot.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/screenshot-screenshot.Tpo $(DEPDIR)/screenshot-screenshot.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='screenshot.c' object='screenshot-screenshot.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(screenshot_CFLAGS) $(CFLAGS) -c -o screenshot-screenshot.obj `if test -f 'screenshot.c'; then $(CYGPATH_W) 'screenshot.c'; else $(CYGPATH_W) '$(srcdir)/screenshot.c'; fi`
@@ -4492,7 +4511,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -4500,29 +4519,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -4543,13 +4567,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -4580,6 +4608,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -4601,6 +4630,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -4609,18 +4640,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -4671,6 +4712,7 @@ install-%: %
 	  echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f"; \
 	  $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(libexecPROGRAMS_INSTALL) $$p $(DESTDIR)$(libexecdir)/$$f || exit 1; \
 	else :; fi
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index 53f3397fc1..ceaaf6fe04 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -351,7 +351,7 @@ load_image (const gchar  *filename,
   gint               bn_size;
   GimpImageBaseType  base_type;
   GimpImageType      image_type;
-  gssize             size;
+  gsize              size;
 
   fd = g_open (filename, O_RDONLY | _O_BINARY, 0);
 
@@ -381,6 +381,21 @@ load_image (const gchar  *filename,
   bh.magic_number = g_ntohl (bh.magic_number);
   bh.spacing      = g_ntohl (bh.spacing);
 
+  /* Sanitize values */
+  if ((bh.width == 0) || (bh.width > GIMP_MAX_IMAGE_SIZE) ||
+      (bh.height == 0) || (bh.height > GIMP_MAX_IMAGE_SIZE) ||
+      ((bh.bytes != 1) && (bh.bytes != 2) && (bh.bytes != 4) &&
+       (bh.bytes != 18)) ||
+      (G_MAXSIZE / bh.width / bh.height / bh.bytes < 1))
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("Invalid header data in '%s': width=%lu, height=%lu, "
+                     "bytes=%lu"), gimp_filename_to_utf8 (filename),
+                   (unsigned long int)bh.width, (unsigned long int)bh.height,
+                   (unsigned long int)bh.bytes);
+      return -1;
+    }
+
   switch (bh.version)
     {
     case 1:
diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c
index 17c34e5642..2f13c62795 100644
--- a/plug-ins/common/file-pat.c
+++ b/plug-ins/common/file-pat.c
@@ -402,6 +402,19 @@ load_image (const gchar  *filename,
       return -1;
     }
 
+  /* Sanitize input dimensions and guard against overflows. */
+  if ((ph.width == 0) || (ph.width > GIMP_MAX_IMAGE_SIZE) ||
+      (ph.height == 0) || (ph.height > GIMP_MAX_IMAGE_SIZE) ||
+      (G_MAXSIZE / ph.width / ph.bytes < 1))
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("Invalid header data in '%s': width=%lu, height=%lu, "
+                     "bytes=%lu"), gimp_filename_to_utf8 (filename),
+                   (unsigned long int)ph.width, (unsigned long int)ph.height,
+                   (unsigned long int)ph.bytes);
+      return -1;
+    }
+
   image_ID = gimp_image_new (ph.width, ph.height, base_type);
   gimp_image_set_filename (image_ID, filename);
 
@@ -420,6 +433,7 @@ load_image (const gchar  *filename,
                        0, 0, drawable->width, drawable->height,
                        TRUE, FALSE);
 
+  /* this can't overflow because ph.width is <= GIMP_MAX_IMAGE_SIZE */
   buffer = g_malloc (ph.width * ph.bytes);
 
   for (line = 0; line < ph.height; line++)
@@ -490,6 +504,7 @@ save_image (const gchar  *filename,
       return FALSE;
     }
 
+  /* this can't overflow because drawable->width is <= GIMP_MAX_IMAGE_SIZE */
   buffer = g_malloc (drawable->width * drawable->bpp);
   if (buffer == NULL)
     {
diff --git a/plug-ins/common/file-pcx.c b/plug-ins/common/file-pcx.c
index ec1aa9298c..a65fb0d30a 100644
--- a/plug-ins/common/file-pcx.c
+++ b/plug-ins/common/file-pcx.c
@@ -406,6 +406,13 @@ load_image (const gchar  *filename,
       return -1;
     }
 
+  /* Shield against potential buffer overflows in load_*() functions. */
+  if (G_MAXSIZE / width / height < 3)
+    {
+      g_message (_("Image dimensions too large: width %d x height %d"), width, height);
+      return -1;
+    }
+
   if (pcx_header.planes == 3 && pcx_header.bpp == 8)
     {
       image= gimp_image_new (width, height, GIMP_RGB);
@@ -425,19 +432,19 @@ load_image (const gchar  *filename,
 
   if (pcx_header.planes == 1 && pcx_header.bpp == 1)
     {
-      dest = (guchar *) g_malloc (width * height);
+      dest = g_new (guchar, ((gsize) width) * height);
       load_1 (fd, width, height, dest, bytesperline);
       gimp_image_set_colormap (image, mono, 2);
     }
   else if (pcx_header.planes == 4 && pcx_header.bpp == 1)
     {
-      dest = (guchar *) g_malloc (width * height);
+      dest = g_new (guchar, ((gsize) width) * height);
       load_4 (fd, width, height, dest, bytesperline);
       gimp_image_set_colormap (image, pcx_header.colormap, 16);
     }
   else if (pcx_header.planes == 1 && pcx_header.bpp == 8)
     {
-      dest = (guchar *) g_malloc (width * height);
+      dest = g_new (guchar, ((gsize) width) * height);
       load_8 (fd, width, height, dest, bytesperline);
       fseek (fd, -768L, SEEK_END);
       fread (cmap, 768, 1, fd);
@@ -445,7 +452,7 @@ load_image (const gchar  *filename,
     }
   else if (pcx_header.planes == 3 && pcx_header.bpp == 8)
     {
-      dest = (guchar *) g_malloc (width * height * 3);
+      dest = g_new (guchar, ((gsize) width) * height * 3);
       load_24 (fd, width, height, dest, bytesperline);
     }
   else
diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c
index e1d40e4d59..d9d7350544 100644
--- a/plug-ins/common/grid.c
+++ b/plug-ins/common/grid.c
@@ -408,12 +408,12 @@ grid (gint32        image_ID,
     {
       gimp_pixel_rgn_get_row (&srcPR, dest, sx1, y, (sx2 - sx1));
 
-      y_offset = y - grid_cfg.voffset;
+      y_offset = y - grid_cfg.hoffset;
       while (y_offset < 0)
-        y_offset += grid_cfg.vspace;
+        y_offset += grid_cfg.hspace;
 
       if ((y_offset +
-           (grid_cfg.hwidth / 2)) % grid_cfg.vspace < grid_cfg.hwidth)
+           (grid_cfg.hwidth / 2)) % grid_cfg.hspace < grid_cfg.hwidth)
         {
           for (x = sx1; x < sx2; x++)
             {
@@ -424,29 +424,29 @@ grid (gint32        image_ID,
 
       for (x = sx1; x < sx2; x++)
         {
-          x_offset = grid_cfg.hspace + x - grid_cfg.hoffset;
+          x_offset = grid_cfg.vspace + x - grid_cfg.voffset;
           while (x_offset < 0)
-            x_offset += grid_cfg.hspace;
+            x_offset += grid_cfg.vspace;
 
           if ((x_offset +
-               (grid_cfg.vwidth / 2)) % grid_cfg.hspace < grid_cfg.vwidth)
+               (grid_cfg.vwidth / 2)) % grid_cfg.vspace < grid_cfg.vwidth)
             {
               pix_composite (&dest[(x-sx1) * bytes],
                              vcolor, bytes, blend, alpha);
             }
 
           if ((x_offset +
-               (grid_cfg.iwidth / 2)) % grid_cfg.hspace < grid_cfg.iwidth
+               (grid_cfg.iwidth / 2)) % grid_cfg.vspace < grid_cfg.iwidth
               &&
-              ((y_offset % grid_cfg.vspace >= grid_cfg.ispace
+              ((y_offset % grid_cfg.hspace >= grid_cfg.ispace
                 &&
-                y_offset % grid_cfg.vspace < grid_cfg.ioffset)
+                y_offset % grid_cfg.hspace < grid_cfg.ioffset)
                ||
-               (grid_cfg.vspace -
-                (y_offset % grid_cfg.vspace) >= grid_cfg.ispace
+               (grid_cfg.hspace -
+                (y_offset % grid_cfg.hspace) >= grid_cfg.ispace
                 &&
-                grid_cfg.vspace -
-                (y_offset % grid_cfg.vspace) < grid_cfg.ioffset)))
+                grid_cfg.hspace -
+                (y_offset % grid_cfg.hspace) < grid_cfg.ioffset)))
             {
               pix_composite (&dest[(x-sx1) * bytes],
                              icolor, bytes, blend, alpha);
@@ -454,23 +454,23 @@ grid (gint32        image_ID,
         }
 
       if ((y_offset +
-           (grid_cfg.iwidth / 2)) % grid_cfg.vspace < grid_cfg.iwidth)
+           (grid_cfg.iwidth / 2)) % grid_cfg.hspace < grid_cfg.iwidth)
         {
           for (x = sx1; x < sx2; x++)
             {
-              x_offset = grid_cfg.hspace + x - grid_cfg.hoffset;
+              x_offset = grid_cfg.vspace + x - grid_cfg.voffset;
               while (x_offset < 0)
-                x_offset += grid_cfg.hspace;
+                x_offset += grid_cfg.vspace;
 
-              if ((x_offset % grid_cfg.hspace >= grid_cfg.ispace
+              if ((x_offset % grid_cfg.vspace >= grid_cfg.ispace
                    &&
-                   x_offset % grid_cfg.hspace < grid_cfg.ioffset)
+                   x_offset % grid_cfg.vspace < grid_cfg.ioffset)
                   ||
-                  (grid_cfg.hspace -
-                   (x_offset % grid_cfg.hspace) >= grid_cfg.ispace
+                  (grid_cfg.vspace -
+                   (x_offset % grid_cfg.vspace) >= grid_cfg.ispace
                    &&
-                   grid_cfg.hspace -
-                   (x_offset % grid_cfg.hspace) < grid_cfg.ioffset))
+                   grid_cfg.vspace -
+                   (x_offset % grid_cfg.vspace) < grid_cfg.ioffset))
                 {
                   pix_composite (&dest[(x-sx1) * bytes],
                                  icolor, bytes, blend, alpha);
@@ -692,15 +692,15 @@ dialog (gint32        image_ID,
   gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (width), 2, xres, TRUE);
 
   /*  set the size (in pixels) that will be treated as 0% and 100%  */
-  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (width), 0, 0.0, drawable->width);
-  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (width), 1, 0.0, drawable->height);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (width), 0, 0.0, drawable->height);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (width), 1, 0.0, drawable->width);
   gimp_size_entry_set_size (GIMP_SIZE_ENTRY (width), 2, 0.0, drawable->width);
 
   /*  set upper and lower limits (in pixels)  */
   gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (width), 0, 0.0,
-                                         drawable->width);
-  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (width), 1, 0.0,
                                          drawable->height);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (width), 1, 0.0,
+                                         drawable->width);
   gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (width), 2, 0.0,
                                          MAX (drawable->width,
                                               drawable->height));
@@ -766,15 +766,15 @@ dialog (gint32        image_ID,
   gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (space), 2, xres, TRUE);
 
   /*  set the size (in pixels) that will be treated as 0% and 100%  */
-  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (space), 0, 0.0, drawable->width);
-  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (space), 1, 0.0, drawable->height);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (space), 0, 0.0, drawable->height);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (space), 1, 0.0, drawable->width);
   gimp_size_entry_set_size (GIMP_SIZE_ENTRY (space), 2, 0.0, drawable->width);
 
   /*  set upper and lower limits (in pixels)  */
   gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (space), 0, 1.0,
-                                         drawable->width);
-  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (space), 1, 1.0,
                                          drawable->height);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (space), 1, 1.0,
+                                         drawable->width);
   gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (space), 2, 0.0,
                                          MAX (drawable->width,
                                               drawable->height));
@@ -833,15 +833,15 @@ dialog (gint32        image_ID,
   gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (offset), 2, xres, TRUE);
 
   /*  set the size (in pixels) that will be treated as 0% and 100%  */
-  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (offset), 0, 0.0, drawable->width);
-  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (offset), 1, 0.0, drawable->height);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (offset), 0, 0.0, drawable->height);
+  gimp_size_entry_set_size (GIMP_SIZE_ENTRY (offset), 1, 0.0, drawable->width);
   gimp_size_entry_set_size (GIMP_SIZE_ENTRY (offset), 2, 0.0, drawable->width);
 
   /*  set upper and lower limits (in pixels)  */
   gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (offset), 0, 0.0,
-                                         drawable->width);
-  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (offset), 1, 0.0,
                                          drawable->height);
+  gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (offset), 1, 0.0,
+                                         drawable->width);
   gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (offset), 2, 0.0,
                                          MAX (drawable->width,
                                               drawable->height));
diff --git a/plug-ins/file-bmp/Makefile.in b/plug-ins/file-bmp/Makefile.in
index b43e18e089..b67525cd48 100644
--- a/plug-ins/file-bmp/Makefile.in
+++ b/plug-ins/file-bmp/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_bmp_OBJECTS = bmp.$(OBJEXT) bmp-read.$(OBJEXT) \
 	bmp-write.$(OBJEXT)
@@ -63,6 +65,7 @@ file_bmp_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -418,9 +421,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-bmp/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-bmp/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-bmp/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-bmp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -438,34 +441,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-bmp$(EXEEXT): $(file_bmp_OBJECTS) $(file_bmp_DEPENDENCIES) 
 	@rm -f file-bmp$(EXEEXT)
 	$(LINK) $(file_bmp_OBJECTS) $(file_bmp_LDADD) $(LIBS)
@@ -482,21 +501,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -519,7 +538,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -527,29 +546,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -570,13 +594,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -607,6 +635,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -628,6 +657,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -636,18 +667,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -686,6 +727,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-bmp/bmp-read.c b/plug-ins/file-bmp/bmp-read.c
index a1ebe47ff3..7ac4cc4a70 100644
--- a/plug-ins/file-bmp/bmp-read.c
+++ b/plug-ins/file-bmp/bmp-read.c
@@ -400,9 +400,26 @@ ReadBMP (const gchar  *name,
         }
     }
 
-  /* Valid bitpdepthis 1, 4, 8, 16, 24, 32 */
+  /* Valid bit depth is 1, 4, 8, 16, 24, 32 */
   /* 16 is awful, we should probably shoot whoever invented it */
 
+  switch (Bitmap_Head.biBitCnt)
+    {
+    case 1:
+    case 2:
+    case 4:
+    case 8:
+    case 16:
+    case 24:
+    case 32:
+      break;
+    default:
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("'%s' is not a valid BMP file"),
+                   gimp_filename_to_utf8 (filename));
+      return -1;
+    }
+
   /* There should be some colors used! */
 
   ColormapSize =
@@ -424,7 +441,10 @@ ReadBMP (const gchar  *name,
       return -1;
     }
 
-  if (Bitmap_Head.biWidth < 0)
+  /* biHeight may be negative, but G_MININT32 is dangerous because:
+     G_MININT32 == -(G_MININT32) */
+  if (Bitmap_Head.biWidth < 0 ||
+      Bitmap_Head.biHeight == G_MININT32)
     {
       g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
                    _("'%s' is not a valid BMP file"),
@@ -448,6 +468,18 @@ ReadBMP (const gchar  *name,
       return -1;
     }
 
+  /* protect against integer overflows caused by malicious BMPs */
+  /* use divisions in comparisons to avoid type overflows */
+
+  if (((guint64) Bitmap_Head.biWidth) > G_MAXINT32 / Bitmap_Head.biBitCnt ||
+      ((guint64) Bitmap_Head.biWidth) > (G_MAXINT32 / ABS (Bitmap_Head.biHeight)) / 4)
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("'%s' is not a valid BMP file"),
+                   gimp_filename_to_utf8 (filename));
+      return -1;
+    }
+
   /* Windows and OS/2 declare filler so that rows are a multiple of
    * word length (32 bits == 4 bytes)
    */
diff --git a/plug-ins/file-faxg3/Makefile.in b/plug-ins/file-faxg3/Makefile.in
index 2025c43210..af52a29fdc 100644
--- a/plug-ins/file-faxg3/Makefile.in
+++ b/plug-ins/file-faxg3/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_faxg3_OBJECTS = faxg3.$(OBJEXT) g3.$(OBJEXT)
 file_faxg3_OBJECTS = $(am_file_faxg3_OBJECTS)
@@ -61,6 +63,7 @@ file_faxg3_DEPENDENCIES = $(libgimp) $(libgimpconfig) $(libgimpcolor) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -413,9 +416,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-faxg3/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-faxg3/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-faxg3/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-faxg3/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -433,34 +436,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-faxg3$(EXEEXT): $(file_faxg3_OBJECTS) $(file_faxg3_DEPENDENCIES) 
 	@rm -f file-faxg3$(EXEEXT)
 	$(LINK) $(file_faxg3_OBJECTS) $(file_faxg3_LDADD) $(LIBS)
@@ -476,21 +495,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -513,7 +532,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -521,29 +540,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -564,13 +588,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -601,6 +629,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -622,6 +651,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -630,18 +661,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -680,6 +721,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-fits/Makefile.in b/plug-ins/file-fits/Makefile.in
index c7249a524f..3769d8fad2 100644
--- a/plug-ins/file-fits/Makefile.in
+++ b/plug-ins/file-fits/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_fits_OBJECTS = fits.$(OBJEXT) fits-io.$(OBJEXT)
 file_fits_OBJECTS = $(am_file_fits_OBJECTS)
@@ -62,6 +64,7 @@ file_fits_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -416,9 +419,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-fits/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-fits/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-fits/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-fits/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -436,34 +439,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-fits$(EXEEXT): $(file_fits_OBJECTS) $(file_fits_DEPENDENCIES) 
 	@rm -f file-fits$(EXEEXT)
 	$(LINK) $(file_fits_OBJECTS) $(file_fits_LDADD) $(LIBS)
@@ -479,21 +498,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -516,7 +535,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -524,29 +543,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -567,13 +591,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -604,6 +632,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -625,6 +654,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -633,18 +664,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -683,6 +724,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-fli/Makefile.in b/plug-ins/file-fli/Makefile.in
index a19aea6bcc..fc2b0fa558 100644
--- a/plug-ins/file-fli/Makefile.in
+++ b/plug-ins/file-fli/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_fli_OBJECTS = fli.$(OBJEXT) fli-gimp.$(OBJEXT)
 file_fli_OBJECTS = $(am_file_fli_OBJECTS)
@@ -62,6 +64,7 @@ file_fli_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -416,9 +419,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-fli/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-fli/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-fli/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-fli/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -436,34 +439,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-fli$(EXEEXT): $(file_fli_OBJECTS) $(file_fli_DEPENDENCIES) 
 	@rm -f file-fli$(EXEEXT)
 	$(LINK) $(file_fli_OBJECTS) $(file_fli_LDADD) $(LIBS)
@@ -479,21 +498,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -516,7 +535,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -524,29 +543,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -567,13 +591,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -604,6 +632,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -625,6 +654,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -633,18 +664,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -683,6 +724,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-ico/Makefile.in b/plug-ins/file-ico/Makefile.in
index cbf765ae46..eb7461afc1 100644
--- a/plug-ins/file-ico/Makefile.in
+++ b/plug-ins/file-ico/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_ico_OBJECTS = file_ico-ico.$(OBJEXT) \
 	file_ico-ico-dialog.$(OBJEXT) file_ico-ico-load.$(OBJEXT) \
@@ -67,6 +69,7 @@ file_ico_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -428,9 +431,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-ico/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-ico/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-ico/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-ico/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -448,34 +451,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-ico$(EXEEXT): $(file_ico_OBJECTS) $(file_ico_DEPENDENCIES) 
 	@rm -f file-ico$(EXEEXT)
 	$(file_ico_LINK) $(file_ico_OBJECTS) $(file_ico_LDADD) $(LIBS)
@@ -493,77 +512,77 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
 
 file_ico-ico.o: ico.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico.o -MD -MP -MF $(DEPDIR)/file_ico-ico.Tpo -c -o file_ico-ico.o `test -f 'ico.c' || echo '$(srcdir)/'`ico.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico.Tpo $(DEPDIR)/file_ico-ico.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico.Tpo $(DEPDIR)/file_ico-ico.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico.c' object='file_ico-ico.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico.o `test -f 'ico.c' || echo '$(srcdir)/'`ico.c
 
 file_ico-ico.obj: ico.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico.obj -MD -MP -MF $(DEPDIR)/file_ico-ico.Tpo -c -o file_ico-ico.obj `if test -f 'ico.c'; then $(CYGPATH_W) 'ico.c'; else $(CYGPATH_W) '$(srcdir)/ico.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico.Tpo $(DEPDIR)/file_ico-ico.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico.Tpo $(DEPDIR)/file_ico-ico.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico.c' object='file_ico-ico.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico.obj `if test -f 'ico.c'; then $(CYGPATH_W) 'ico.c'; else $(CYGPATH_W) '$(srcdir)/ico.c'; fi`
 
 file_ico-ico-dialog.o: ico-dialog.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico-dialog.o -MD -MP -MF $(DEPDIR)/file_ico-ico-dialog.Tpo -c -o file_ico-ico-dialog.o `test -f 'ico-dialog.c' || echo '$(srcdir)/'`ico-dialog.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico-dialog.Tpo $(DEPDIR)/file_ico-ico-dialog.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico-dialog.Tpo $(DEPDIR)/file_ico-ico-dialog.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico-dialog.c' object='file_ico-ico-dialog.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico-dialog.o `test -f 'ico-dialog.c' || echo '$(srcdir)/'`ico-dialog.c
 
 file_ico-ico-dialog.obj: ico-dialog.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico-dialog.obj -MD -MP -MF $(DEPDIR)/file_ico-ico-dialog.Tpo -c -o file_ico-ico-dialog.obj `if test -f 'ico-dialog.c'; then $(CYGPATH_W) 'ico-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ico-dialog.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico-dialog.Tpo $(DEPDIR)/file_ico-ico-dialog.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico-dialog.Tpo $(DEPDIR)/file_ico-ico-dialog.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico-dialog.c' object='file_ico-ico-dialog.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico-dialog.obj `if test -f 'ico-dialog.c'; then $(CYGPATH_W) 'ico-dialog.c'; else $(CYGPATH_W) '$(srcdir)/ico-dialog.c'; fi`
 
 file_ico-ico-load.o: ico-load.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico-load.o -MD -MP -MF $(DEPDIR)/file_ico-ico-load.Tpo -c -o file_ico-ico-load.o `test -f 'ico-load.c' || echo '$(srcdir)/'`ico-load.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico-load.Tpo $(DEPDIR)/file_ico-ico-load.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico-load.Tpo $(DEPDIR)/file_ico-ico-load.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico-load.c' object='file_ico-ico-load.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico-load.o `test -f 'ico-load.c' || echo '$(srcdir)/'`ico-load.c
 
 file_ico-ico-load.obj: ico-load.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico-load.obj -MD -MP -MF $(DEPDIR)/file_ico-ico-load.Tpo -c -o file_ico-ico-load.obj `if test -f 'ico-load.c'; then $(CYGPATH_W) 'ico-load.c'; else $(CYGPATH_W) '$(srcdir)/ico-load.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico-load.Tpo $(DEPDIR)/file_ico-ico-load.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico-load.Tpo $(DEPDIR)/file_ico-ico-load.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico-load.c' object='file_ico-ico-load.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico-load.obj `if test -f 'ico-load.c'; then $(CYGPATH_W) 'ico-load.c'; else $(CYGPATH_W) '$(srcdir)/ico-load.c'; fi`
 
 file_ico-ico-save.o: ico-save.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico-save.o -MD -MP -MF $(DEPDIR)/file_ico-ico-save.Tpo -c -o file_ico-ico-save.o `test -f 'ico-save.c' || echo '$(srcdir)/'`ico-save.c
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico-save.Tpo $(DEPDIR)/file_ico-ico-save.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico-save.Tpo $(DEPDIR)/file_ico-ico-save.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico-save.c' object='file_ico-ico-save.o' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico-save.o `test -f 'ico-save.c' || echo '$(srcdir)/'`ico-save.c
 
 file_ico-ico-save.obj: ico-save.c
 @am__fastdepCC_TRUE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -MT file_ico-ico-save.obj -MD -MP -MF $(DEPDIR)/file_ico-ico-save.Tpo -c -o file_ico-ico-save.obj `if test -f 'ico-save.c'; then $(CYGPATH_W) 'ico-save.c'; else $(CYGPATH_W) '$(srcdir)/ico-save.c'; fi`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/file_ico-ico-save.Tpo $(DEPDIR)/file_ico-ico-save.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/file_ico-ico-save.Tpo $(DEPDIR)/file_ico-ico-save.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='ico-save.c' object='file_ico-ico-save.obj' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(file_ico_CFLAGS) $(CFLAGS) -c -o file_ico-ico-save.obj `if test -f 'ico-save.c'; then $(CYGPATH_W) 'ico-save.c'; else $(CYGPATH_W) '$(srcdir)/ico-save.c'; fi`
@@ -586,7 +605,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -594,29 +613,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -637,13 +661,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -674,6 +702,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -695,6 +724,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -703,18 +734,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -753,6 +794,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-jpeg/Makefile.in b/plug-ins/file-jpeg/Makefile.in
index cff549747d..b66a8ed5cb 100644
--- a/plug-ins/file-jpeg/Makefile.in
+++ b/plug-ins/file-jpeg/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,8 +51,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am_file_jpeg_OBJECTS = jpeg.$(OBJEXT) jpeg-exif.$(OBJEXT) \
 	jpeg-icc.$(OBJEXT) jpeg-load.$(OBJEXT) jpeg-save.$(OBJEXT) \
@@ -70,6 +72,7 @@ jpegqual_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -452,9 +455,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-jpeg/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-jpeg/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-jpeg/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-jpeg/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -472,41 +475,59 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-jpeg$(EXEEXT): $(file_jpeg_OBJECTS) $(file_jpeg_DEPENDENCIES) 
 	@rm -f file-jpeg$(EXEEXT)
 	$(LINK) $(file_jpeg_OBJECTS) $(file_jpeg_LDADD) $(LIBS)
@@ -532,21 +553,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -569,7 +590,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -577,29 +598,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -620,13 +646,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -657,6 +687,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -678,6 +709,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -686,18 +719,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -737,6 +780,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	pdf pdf-am ps ps-am tags uninstall uninstall-am \
 	uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-psd/Makefile.in b/plug-ins/file-psd/Makefile.in
index 0bea3c01d0..ae4b838d30 100644
--- a/plug-ins/file-psd/Makefile.in
+++ b/plug-ins/file-psd/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_psd_load_OBJECTS = psd.$(OBJEXT) psd-util.$(OBJEXT) \
 	psd-load.$(OBJEXT) psd-thumb-load.$(OBJEXT) \
@@ -73,6 +75,7 @@ file_psd_save_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -446,9 +449,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-psd/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-psd/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-psd/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-psd/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -466,34 +469,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-psd-load$(EXEEXT): $(file_psd_load_OBJECTS) $(file_psd_load_DEPENDENCIES) 
 	@rm -f file-psd-load$(EXEEXT)
 	$(LINK) $(file_psd_load_OBJECTS) $(file_psd_load_LDADD) $(LIBS)
@@ -517,21 +536,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -554,7 +573,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -562,29 +581,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -605,13 +629,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -642,6 +670,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -663,6 +692,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -671,18 +702,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -721,6 +762,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-psd/psd-load.c b/plug-ins/file-psd/psd-load.c
index d0a8455bf5..1b4e9443f8 100644
--- a/plug-ins/file-psd/psd-load.c
+++ b/plug-ins/file-psd/psd-load.c
@@ -304,6 +304,15 @@ read_header_block (PSDimage  *img_a,
       return -1;
     }
 
+  /* img_a->rows is sanitized above, so a division by zero is avoided here */
+  if (img_a->columns > G_MAXINT32 / img_a->rows)
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("Unsupported or invalid image size: %dx%d"),
+                   img_a->columns, img_a->rows);
+      return -1;
+    }
+
   if (img_a->color_mode != PSD_BITMAP
       && img_a->color_mode != PSD_GRAYSCALE
       && img_a->color_mode != PSD_INDEXED
@@ -533,10 +542,10 @@ read_layer_block (PSDimage  *img_a,
                   psd_set_error (feof (f), errno, error);
                   return NULL;
                 }
-              lyr_a[lidx]->top = GUINT32_FROM_BE (lyr_a[lidx]->top);
-              lyr_a[lidx]->left = GUINT32_FROM_BE (lyr_a[lidx]->left);
-              lyr_a[lidx]->bottom = GUINT32_FROM_BE (lyr_a[lidx]->bottom);
-              lyr_a[lidx]->right = GUINT32_FROM_BE (lyr_a[lidx]->right);
+              lyr_a[lidx]->top = GINT32_FROM_BE (lyr_a[lidx]->top);
+              lyr_a[lidx]->left = GINT32_FROM_BE (lyr_a[lidx]->left);
+              lyr_a[lidx]->bottom = GINT32_FROM_BE (lyr_a[lidx]->bottom);
+              lyr_a[lidx]->right = GINT32_FROM_BE (lyr_a[lidx]->right);
               lyr_a[lidx]->num_channels = GUINT16_FROM_BE (lyr_a[lidx]->num_channels);
 
               if (lyr_a[lidx]->num_channels > MAX_CHANNELS)
@@ -546,14 +555,16 @@ read_layer_block (PSDimage  *img_a,
                               lyr_a[lidx]->num_channels);
                   return NULL;
                 }
-              if (lyr_a[lidx]->bottom - lyr_a[lidx]->top > GIMP_MAX_IMAGE_SIZE)
+              if (lyr_a[lidx]->bottom < lyr_a[lidx]->top ||
+                  lyr_a[lidx]->bottom - lyr_a[lidx]->top > GIMP_MAX_IMAGE_SIZE)
                 {
                   g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
                               _("Unsupported or invalid layer height: %d"),
                               lyr_a[lidx]->bottom - lyr_a[lidx]->top);
                   return NULL;
                 }
-              if (lyr_a[lidx]->right - lyr_a[lidx]->left > GIMP_MAX_IMAGE_SIZE)
+              if (lyr_a[lidx]->right < lyr_a[lidx]->left ||
+                  lyr_a[lidx]->right - lyr_a[lidx]->left > GIMP_MAX_IMAGE_SIZE)
                 {
                   g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
                               _("Unsupported or invalid layer width: %d"),
@@ -561,6 +572,16 @@ read_layer_block (PSDimage  *img_a,
                   return NULL;
                 }
 
+              if ((lyr_a[lidx]->right - lyr_a[lidx]->left) >
+                  G_MAXINT32 / MAX (lyr_a[lidx]->bottom - lyr_a[lidx]->top, 1))
+                {
+                  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Unsupported or invalid layer size: %dx%d"),
+                               lyr_a[lidx]->right - lyr_a[lidx]->left,
+                               lyr_a[lidx]->bottom - lyr_a[lidx]->top);
+                  return NULL;
+                }
+
               IFDBG(2) g_debug ("Layer %d, Coords %d %d %d %d, channels %d, ",
                                  lidx, lyr_a[lidx]->left, lyr_a[lidx]->top,
                                  lyr_a[lidx]->right, lyr_a[lidx]->bottom,
@@ -670,13 +691,13 @@ read_layer_block (PSDimage  *img_a,
                         return NULL;
                       }
                     lyr_a[lidx]->layer_mask.top =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
                     lyr_a[lidx]->layer_mask.left =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
                     lyr_a[lidx]->layer_mask.bottom =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
                     lyr_a[lidx]->layer_mask.right =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
                     lyr_a[lidx]->layer_mask.mask_flags.relative_pos =
                       lyr_a[lidx]->layer_mask.flags & 1 ? TRUE : FALSE;
                     lyr_a[lidx]->layer_mask.mask_flags.disabled =
@@ -702,21 +723,21 @@ read_layer_block (PSDimage  *img_a,
                         return NULL;
                       }
                     lyr_a[lidx]->layer_mask_extra.top =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.top);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.top);
                     lyr_a[lidx]->layer_mask_extra.left =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.left);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.left);
                     lyr_a[lidx]->layer_mask_extra.bottom =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.bottom);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.bottom);
                     lyr_a[lidx]->layer_mask_extra.right =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.right);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask_extra.right);
                     lyr_a[lidx]->layer_mask.top =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.top);
                     lyr_a[lidx]->layer_mask.left =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.left);
                     lyr_a[lidx]->layer_mask.bottom =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.bottom);
                     lyr_a[lidx]->layer_mask.right =
-                      GUINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
+                      GINT32_FROM_BE (lyr_a[lidx]->layer_mask.right);
                     lyr_a[lidx]->layer_mask.mask_flags.relative_pos =
                       lyr_a[lidx]->layer_mask.flags & 1 ? TRUE : FALSE;
                     lyr_a[lidx]->layer_mask.mask_flags.disabled =
@@ -734,6 +755,34 @@ read_layer_block (PSDimage  *img_a,
                       }
                 }
 
+              /* sanity checks */
+              if (lyr_a[lidx]->layer_mask.bottom < lyr_a[lidx]->layer_mask.top ||
+                  lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top > GIMP_MAX_IMAGE_SIZE)
+                {
+                  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Unsupported or invalid layer mask height: %d"),
+                               lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top);
+                  return NULL;
+                }
+              if (lyr_a[lidx]->layer_mask.right < lyr_a[lidx]->layer_mask.left ||
+                  lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left > GIMP_MAX_IMAGE_SIZE)
+                {
+                  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Unsupported or invalid layer mask width: %d"),
+                               lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left);
+                  return NULL;
+                }
+
+              if ((lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left) >
+                  G_MAXINT32 / MAX (lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top, 1))
+                {
+                  g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                               _("Unsupported or invalid layer mask size: %dx%d"),
+                               lyr_a[lidx]->layer_mask.right - lyr_a[lidx]->layer_mask.left,
+                               lyr_a[lidx]->layer_mask.bottom - lyr_a[lidx]->layer_mask.top);
+                  return NULL;
+                }
+
               IFDBG(2) g_debug ("Layer mask coords %d %d %d %d, Rel pos %d",
                                 lyr_a[lidx]->layer_mask.left,
                                 lyr_a[lidx]->layer_mask.top,
@@ -1135,7 +1184,7 @@ add_layers (const gint32  image_id,
                                 psd_set_error (feof (f), errno, error);
                                 return -1;
                               }
-                                rle_pack_len[rowi] = GUINT16_FROM_BE (rle_pack_len[rowi]);
+                            rle_pack_len[rowi] = GUINT16_FROM_BE (rle_pack_len[rowi]);
                           }
 
                         IFDBG(3) g_debug ("RLE decode - data");
@@ -1761,6 +1810,16 @@ read_channel_data (PSDchannel     *channel,
 
   IFDBG(3) g_debug ("raw data size %d x %d = %d", readline_len,
                     channel->rows, readline_len * channel->rows);
+
+  /* sanity check, int overflow check (avoid divisions by zero) */
+  if ((channel->rows == 0) || (channel->columns == 0) ||
+      (channel->rows > G_MAXINT32 / channel->columns / MAX (bps >> 3, 1)))
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+                   _("Unsupported or invalid channel size"));
+      return -1;
+    }
+
   raw_data = g_malloc (readline_len * channel->rows);
   switch (compression)
     {
diff --git a/plug-ins/file-psd/psd.h b/plug-ins/file-psd/psd.h
index 62927479a7..b0c28ffd56 100644
--- a/plug-ins/file-psd/psd.h
+++ b/plug-ins/file-psd/psd.h
@@ -447,10 +447,10 @@ typedef struct
 /* PSD Layer mask data (length 20) */
 typedef struct
 {
-  guint32               top;                    /* Layer top */
-  guint32               left;                   /* Layer left */
-  guint32               bottom;                 /* Layer bottom */
-  guint32               right;                  /* Layer right */
+  gint32                top;                    /* Layer top */
+  gint32                left;                   /* Layer left */
+  gint32                bottom;                 /* Layer bottom */
+  gint32                right;                  /* Layer right */
   guchar                def_color;              /* Default background colour */
   guchar                flags;                  /* Layer flags */
   guchar                extra_def_color;        /* Real default background colour */
@@ -461,20 +461,20 @@ typedef struct
 /* PSD Layer mask data (length 36) */
 typedef struct
 {
-  guint32               top;                    /* Layer top */
-  guint32               left;                   /* Layer left */
-  guint32               bottom;                 /* Layer bottom */
-  guint32               right;                  /* Layer right */
+  gint32                top;                    /* Layer top */
+  gint32                left;                   /* Layer left */
+  gint32                bottom;                 /* Layer bottom */
+  gint32                right;                  /* Layer right */
 } LayerMaskExtra;
 
 /* PSD Layer data structure */
 typedef struct
 {
   gboolean              drop;                   /* Do not add layer to GIMP image */
-  guint32               top;                    /* Layer top */
-  guint32               left;                   /* Layer left */
-  guint32               bottom;                 /* Layer bottom */
-  guint32               right;                  /* Layer right */
+  gint32                top;                    /* Layer top */
+  gint32                left;                   /* Layer left */
+  gint32                bottom;                 /* Layer bottom */
+  gint32                right;                  /* Layer right */
   guint16               num_channels;           /* Number of channels */
   ChannelLengthInfo    *chn_info;               /* Channel length info */
   gchar                 mode_key[4];            /* Blend mode key */
diff --git a/plug-ins/file-sgi/Makefile.in b/plug-ins/file-sgi/Makefile.in
index e48bd06e1c..062e1a9455 100644
--- a/plug-ins/file-sgi/Makefile.in
+++ b/plug-ins/file-sgi/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_sgi_OBJECTS = sgi.$(OBJEXT) sgi-lib.$(OBJEXT)
 file_sgi_OBJECTS = $(am_file_sgi_OBJECTS)
@@ -62,6 +64,7 @@ file_sgi_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -416,9 +419,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-sgi/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-sgi/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-sgi/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-sgi/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -436,34 +439,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-sgi$(EXEEXT): $(file_sgi_OBJECTS) $(file_sgi_DEPENDENCIES) 
 	@rm -f file-sgi$(EXEEXT)
 	$(LINK) $(file_sgi_OBJECTS) $(file_sgi_LDADD) $(LIBS)
@@ -479,21 +498,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -516,7 +535,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -524,29 +543,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -567,13 +591,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -604,6 +632,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -625,6 +654,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -633,18 +664,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -683,6 +724,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-sgi/sgi-lib.c b/plug-ins/file-sgi/sgi-lib.c
index 7975b09969..d926553ca4 100644
--- a/plug-ins/file-sgi/sgi-lib.c
+++ b/plug-ins/file-sgi/sgi-lib.c
@@ -681,7 +681,7 @@ read_rle8(sgi_t *sgip,		/* I - SGI image to read from */
       return (-1);
     length ++;
 
-    count = ch & 127;
+    count = MIN (ch & 127, xsize);
     if (count == 0)
       break;
 
@@ -726,7 +726,7 @@ read_rle16(sgi_t *sgip,		/* I - SGI image to read from */
       return (-1);
     length ++;
 
-    count = ch & 127;
+    count = MIN (ch & 127, xsize);
     if (count == 0)
       break;
 
diff --git a/plug-ins/file-sgi/sgi.c b/plug-ins/file-sgi/sgi.c
index 1186fb8ba5..d0627654b7 100644
--- a/plug-ins/file-sgi/sgi.c
+++ b/plug-ins/file-sgi/sgi.c
@@ -311,7 +311,6 @@ load_image (const gchar  *filename,
   GimpDrawable  *drawable;    /* Drawable for layer */
   GimpPixelRgn   pixel_rgn;   /* Pixel region for layer */
   guchar       **pixels,      /* Pixel rows */
-                *pixel,       /* Pixel data */
                 *pptr;        /* Current pixel */
   gushort      **rows;        /* SGI image data */
 
@@ -335,6 +334,28 @@ load_image (const gchar  *filename,
    * Get the image dimensions and create the image...
    */
 
+  /* Sanitize dimensions */
+  if (sgip->xsize == 0 || sgip->xsize > GIMP_MAX_IMAGE_SIZE)
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+              _("Invalid width: %hu"), sgip->xsize);
+      return -1;
+    }
+
+  if (sgip->ysize == 0 || sgip->ysize > GIMP_MAX_IMAGE_SIZE)
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+              _("Invalid height: %hu"), sgip->ysize);
+      return -1;
+    }
+
+  if (sgip->zsize == 0 || sgip->zsize > GIMP_MAX_IMAGE_SIZE)
+    {
+      g_set_error (error, G_FILE_ERROR, G_FILE_ERROR_FAILED,
+              _("Invalid number of channels: %hu"), sgip->zsize);
+      return -1;
+    }
+
   bytes = sgip->zsize;
 
   switch (sgip->zsize)
@@ -399,14 +420,14 @@ load_image (const gchar  *filename,
    */
 
   tile_height = gimp_tile_height ();
-  pixel       = g_new (guchar, tile_height * sgip->xsize * bytes);
   pixels      = g_new (guchar *, tile_height);
+  pixels[0]   = g_new (guchar, ((gsize) tile_height) * sgip->xsize * bytes);
 
-  for (i = 0; i < tile_height; i ++)
-    pixels[i] = pixel + sgip->xsize * bytes * i;
+  for (i = 1; i < tile_height; i ++)
+    pixels[i] = pixels[0] + sgip->xsize * bytes * i;
 
   rows    = g_new (unsigned short *, sgip->zsize);
-  rows[0] = g_new (unsigned short, sgip->xsize * sgip->zsize);
+  rows[0] = g_new (unsigned short, ((gsize) sgip->xsize) * sgip->zsize);
 
   for (i = 1; i < sgip->zsize; i ++)
     rows[i] = rows[0] + i * sgip->xsize;
@@ -421,7 +442,7 @@ load_image (const gchar  *filename,
     {
       if (count >= tile_height)
         {
-          gimp_pixel_rgn_set_rect (&pixel_rgn, pixel,
+          gimp_pixel_rgn_set_rect (&pixel_rgn, pixels[0],
                                    0, y - count, drawable->width, count);
           count = 0;
 
@@ -459,7 +480,7 @@ load_image (const gchar  *filename,
    * Do the last n rows (count always > 0)
    */
 
-  gimp_pixel_rgn_set_rect (&pixel_rgn, pixel, 0,
+  gimp_pixel_rgn_set_rect (&pixel_rgn, pixels[0], 0,
                            y - count, drawable->width, count);
 
   /*
@@ -468,7 +489,7 @@ load_image (const gchar  *filename,
 
   sgiClose (sgip);
 
-  g_free (pixel);
+  g_free (pixels[0]);
   g_free (pixels);
   g_free (rows[0]);
   g_free (rows);
@@ -504,7 +525,6 @@ save_image (const gchar  *filename,
   GimpDrawable  *drawable;    /* Drawable for layer */
   GimpPixelRgn   pixel_rgn;   /* Pixel region for layer */
   guchar    **pixels,      /* Pixel rows */
-             *pixel,       /* Pixel data */
              *pptr;        /* Current pixel */
   gushort   **rows;        /* SGI image data */
 
@@ -559,14 +579,14 @@ save_image (const gchar  *filename,
    */
 
   tile_height = gimp_tile_height ();
-  pixel       = g_new (guchar, tile_height * drawable->width * zsize);
   pixels      = g_new (guchar *, tile_height);
+  pixels[0]   = g_new (guchar, ((gsize) tile_height) * drawable->width * zsize);
 
-  for (i = 0; i < tile_height; i ++)
-    pixels[i]= pixel + drawable->width * zsize * i;
+  for (i = 1; i < tile_height; i ++)
+    pixels[i]= pixels[0] + drawable->width * zsize * i;
 
   rows    = g_new (gushort *, sgip->zsize);
-  rows[0] = g_new (gushort, sgip->xsize * sgip->zsize);
+  rows[0] = g_new (gushort, ((gsize) sgip->xsize) * sgip->zsize);
 
   for (i = 1; i < sgip->zsize; i ++)
     rows[i] = rows[0] + i * sgip->xsize;
@@ -586,7 +606,7 @@ save_image (const gchar  *filename,
       else
         count = tile_height;
 
-      gimp_pixel_rgn_get_rect (&pixel_rgn, pixel, 0, y, drawable->width, count);
+      gimp_pixel_rgn_get_rect (&pixel_rgn, pixels[0], 0, y, drawable->width, count);
 
       /*
        * Convert to shorts and write each color plane separately...
@@ -611,7 +631,7 @@ save_image (const gchar  *filename,
 
   sgiClose (sgip);
 
-  g_free (pixel);
+  g_free (pixels[0]);
   g_free (pixels);
   g_free (rows[0]);
   g_free (rows);
diff --git a/plug-ins/file-uri/Makefile.in b/plug-ins/file-uri/Makefile.in
index f7526df305..fcf03efcbf 100644
--- a/plug-ins/file-uri/Makefile.in
+++ b/plug-ins/file-uri/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am__file_uri_SOURCES_DIST = uri.c uri-backend.h uri-backend-wget.c \
 	uri-backend-libcurl.c uri-backend-gnomevfs.c \
@@ -74,6 +76,7 @@ file_uri_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -442,9 +445,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-uri/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-uri/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-uri/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-uri/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -462,34 +465,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-uri$(EXEEXT): $(file_uri_OBJECTS) $(file_uri_DEPENDENCIES) 
 	@rm -f file-uri$(EXEEXT)
 	$(LINK) $(file_uri_OBJECTS) $(file_uri_LDADD) $(LIBS)
@@ -509,21 +528,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -546,7 +565,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -554,29 +573,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -597,13 +621,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -634,6 +662,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -655,6 +684,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -663,18 +694,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -713,6 +754,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/file-xjt/Makefile.in b/plug-ins/file-xjt/Makefile.in
index 13b2d977b4..e0329080d0 100644
--- a/plug-ins/file-xjt/Makefile.in
+++ b/plug-ins/file-xjt/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_file_xjt_OBJECTS = xjt.$(OBJEXT) xjpeg.$(OBJEXT)
 file_xjt_OBJECTS = $(am_file_xjt_OBJECTS)
@@ -62,6 +64,7 @@ file_xjt_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -419,9 +422,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/file-xjt/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/file-xjt/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/file-xjt/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/file-xjt/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -439,34 +442,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 file-xjt$(EXEEXT): $(file_xjt_OBJECTS) $(file_xjt_DEPENDENCIES) 
 	@rm -f file-xjt$(EXEEXT)
 	$(LINK) $(file_xjt_OBJECTS) $(file_xjt_LDADD) $(LIBS)
@@ -482,21 +501,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -519,7 +538,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -527,29 +546,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -570,13 +594,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -607,6 +635,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -628,6 +657,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -636,18 +667,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -686,6 +727,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/flame/Makefile.in b/plug-ins/flame/Makefile.in
index 2e8393aac2..72ce00b8f7 100644
--- a/plug-ins/flame/Makefile.in
+++ b/plug-ins/flame/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_flame_OBJECTS = cmap.$(OBJEXT) flame.$(OBJEXT) libifs.$(OBJEXT) \
 	rect.$(OBJEXT)
@@ -63,6 +65,7 @@ flame_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) $(libgimpconfig) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -423,9 +426,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/flame/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/flame/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/flame/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/flame/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -443,34 +446,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 flame$(EXEEXT): $(flame_OBJECTS) $(flame_DEPENDENCIES) 
 	@rm -f flame$(EXEEXT)
 	$(LINK) $(flame_OBJECTS) $(flame_LDADD) $(LIBS)
@@ -488,21 +507,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -525,7 +544,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -533,29 +552,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -576,13 +600,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -613,6 +641,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -634,6 +663,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -642,18 +673,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -692,6 +733,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/fractal-explorer/Makefile.in b/plug-ins/fractal-explorer/Makefile.in
index 745d120285..d1a6a9f797 100644
--- a/plug-ins/fractal-explorer/Makefile.in
+++ b/plug-ins/fractal-explorer/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_fractal_explorer_OBJECTS = fractal-explorer-dialogs.$(OBJEXT) \
 	fractal-explorer.$(OBJEXT)
@@ -63,6 +65,7 @@ fractal_explorer_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -83,10 +86,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -429,9 +460,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/fractal-explorer/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/fractal-explorer/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/fractal-explorer/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/fractal-explorer/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -449,34 +480,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 fractal-explorer$(EXEEXT): $(fractal_explorer_OBJECTS) $(fractal_explorer_DEPENDENCIES) 
 	@rm -f fractal-explorer$(EXEEXT)
 	$(LINK) $(fractal_explorer_OBJECTS) $(fractal_explorer_LDADD) $(LIBS)
@@ -492,21 +539,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -541,7 +588,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -575,16 +622,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -599,7 +646,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -611,7 +658,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -620,29 +667,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -663,29 +715,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -718,6 +785,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -739,6 +807,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -747,18 +817,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -781,8 +861,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -800,6 +880,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/fractal-explorer/examples/Makefile.in b/plug-ins/fractal-explorer/examples/Makefile.in
index 3dd634410e..51dd4dd4d6 100644
--- a/plug-ins/fractal-explorer/examples/Makefile.in
+++ b/plug-ins/fractal-explorer/examples/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(fractalexplorerdatadir)"
-fractalexplorerdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(fractalexplorerdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -404,9 +421,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/fractal-explorer/examples/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/fractal-explorer/examples/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/fractal-explorer/examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/fractal-explorer/examples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -424,6 +441,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -433,20 +451,23 @@ clean-libtool:
 install-fractalexplorerdataDATA: $(fractalexplorerdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(fractalexplorerdatadir)" || $(MKDIR_P) "$(DESTDIR)$(fractalexplorerdatadir)"
-	@list='$(fractalexplorerdata_DATA)'; for p in $$list; do \
+	@list='$(fractalexplorerdata_DATA)'; test -n "$(fractalexplorerdatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(fractalexplorerdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(fractalexplorerdatadir)/$$f'"; \
-	  $(fractalexplorerdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(fractalexplorerdatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(fractalexplorerdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(fractalexplorerdatadir)" || exit $$?; \
 	done
 
 uninstall-fractalexplorerdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(fractalexplorerdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(fractalexplorerdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(fractalexplorerdatadir)/$$f"; \
-	done
+	@list='$(fractalexplorerdata_DATA)'; test -n "$(fractalexplorerdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(fractalexplorerdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(fractalexplorerdatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -470,13 +491,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -507,6 +532,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -525,6 +551,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -533,18 +561,28 @@ install-data-am: install-fractalexplorerdataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -580,6 +618,7 @@ uninstall-am: uninstall-fractalexplorerdataDATA
 	ps ps-am uninstall uninstall-am \
 	uninstall-fractalexplorerdataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gfig/Makefile.in b/plug-ins/gfig/Makefile.in
index 5818ecec4c..e699dbd8b6 100644
--- a/plug-ins/gfig/Makefile.in
+++ b/plug-ins/gfig/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_gfig_OBJECTS = gfig.$(OBJEXT) gfig-arc.$(OBJEXT) \
 	gfig-bezier.$(OBJEXT) gfig-circle.$(OBJEXT) \
@@ -68,6 +70,7 @@ gfig_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) $(libgimpconfig) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -88,10 +91,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -464,9 +495,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gfig/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gfig/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gfig/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gfig/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -484,34 +515,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 gfig$(EXEEXT): $(gfig_OBJECTS) $(gfig_DEPENDENCIES) 
 	@rm -f gfig$(EXEEXT)
 	$(LINK) $(gfig_OBJECTS) $(gfig_LDADD) $(LIBS)
@@ -541,21 +588,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -590,7 +637,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -624,16 +671,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -648,7 +695,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -660,7 +707,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -669,29 +716,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -712,29 +764,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -767,6 +834,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -788,6 +856,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -796,18 +866,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -830,8 +910,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -849,6 +929,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gfig/gfig-examples/Makefile.in b/plug-ins/gfig/gfig-examples/Makefile.in
index 62afa3a8b7..2034069043 100644
--- a/plug-ins/gfig/gfig-examples/Makefile.in
+++ b/plug-ins/gfig/gfig-examples/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(gfigdatadir)"
-gfigdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(gfigdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -381,9 +398,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gfig/gfig-examples/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gfig/gfig-examples/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gfig/gfig-examples/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gfig/gfig-examples/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -401,6 +418,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -410,20 +428,23 @@ clean-libtool:
 install-gfigdataDATA: $(gfigdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(gfigdatadir)" || $(MKDIR_P) "$(DESTDIR)$(gfigdatadir)"
-	@list='$(gfigdata_DATA)'; for p in $$list; do \
+	@list='$(gfigdata_DATA)'; test -n "$(gfigdatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(gfigdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(gfigdatadir)/$$f'"; \
-	  $(gfigdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(gfigdatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(gfigdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(gfigdatadir)" || exit $$?; \
 	done
 
 uninstall-gfigdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(gfigdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(gfigdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(gfigdatadir)/$$f"; \
-	done
+	@list='$(gfigdata_DATA)'; test -n "$(gfigdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(gfigdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gfigdatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -447,13 +468,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -484,6 +509,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -502,6 +528,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -510,18 +538,28 @@ install-data-am: install-gfigdataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -556,6 +594,7 @@ uninstall-am: uninstall-gfigdataDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-gfigdataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gfig/images/Makefile.in b/plug-ins/gfig/images/Makefile.in
index c4329d6053..8d497f002d 100644
--- a/plug-ins/gfig/images/Makefile.in
+++ b/plug-ins/gfig/images/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DATA = $(noinst_DATA)
@@ -380,9 +383,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gfig/images/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gfig/images/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gfig/images/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gfig/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -400,6 +403,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -429,13 +433,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -464,6 +472,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -482,6 +491,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -490,18 +501,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -546,6 +567,7 @@ stock-icons.list: $(STOCK_IMAGES) Makefile.am
 
 $(srcdir)/gfig-stock-pixbufs.h: stock-icons.list
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat stock-icons.list` > $(@F)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gimpressionist/Brushes/Makefile.in b/plug-ins/gimpressionist/Brushes/Makefile.in
index ca8da5fa10..5dc1ecd9e7 100644
--- a/plug-ins/gimpressionist/Brushes/Makefile.in
+++ b/plug-ins/gimpressionist/Brushes/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(brushdatadir)"
-brushdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(brushdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -431,9 +448,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Brushes/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Brushes/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Brushes/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gimpressionist/Brushes/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -451,6 +468,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -460,20 +478,23 @@ clean-libtool:
 install-brushdataDATA: $(brushdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(brushdatadir)" || $(MKDIR_P) "$(DESTDIR)$(brushdatadir)"
-	@list='$(brushdata_DATA)'; for p in $$list; do \
+	@list='$(brushdata_DATA)'; test -n "$(brushdatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(brushdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(brushdatadir)/$$f'"; \
-	  $(brushdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(brushdatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(brushdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(brushdatadir)" || exit $$?; \
 	done
 
 uninstall-brushdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(brushdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(brushdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(brushdatadir)/$$f"; \
-	done
+	@list='$(brushdata_DATA)'; test -n "$(brushdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(brushdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(brushdatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -497,13 +518,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -534,6 +559,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -552,6 +578,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -560,18 +588,28 @@ install-data-am: install-brushdataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -606,6 +644,7 @@ uninstall-am: uninstall-brushdataDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-brushdataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gimpressionist/Makefile.in b/plug-ins/gimpressionist/Makefile.in
index fd3a53968d..46f19a2e59 100644
--- a/plug-ins/gimpressionist/Makefile.in
+++ b/plug-ins/gimpressionist/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,8 +51,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_gimpressionist_OBJECTS = brush.$(OBJEXT) color.$(OBJEXT) \
 	general.$(OBJEXT) gimp.$(OBJEXT) gimpressionist.$(OBJEXT) \
@@ -69,6 +71,7 @@ gimpressionist_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -89,10 +92,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -467,9 +498,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gimpressionist/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -487,34 +518,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 gimpressionist$(EXEEXT): $(gimpressionist_OBJECTS) $(gimpressionist_DEPENDENCIES) 
 	@rm -f gimpressionist$(EXEEXT)
 	$(LINK) $(gimpressionist_OBJECTS) $(gimpressionist_LDADD) $(LIBS)
@@ -546,21 +593,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -595,7 +642,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -629,16 +676,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -653,7 +700,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -665,7 +712,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -674,29 +721,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -717,29 +769,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -772,6 +839,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -793,6 +861,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -801,18 +871,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -835,8 +915,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -854,6 +934,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gimpressionist/Paper/Makefile.in b/plug-ins/gimpressionist/Paper/Makefile.in
index 1b7e69b010..0912b0f934 100644
--- a/plug-ins/gimpressionist/Paper/Makefile.in
+++ b/plug-ins/gimpressionist/Paper/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(paperdatadir)"
-paperdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(paperdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -380,9 +397,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Paper/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Paper/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Paper/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gimpressionist/Paper/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -400,6 +417,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -409,20 +427,23 @@ clean-libtool:
 install-paperdataDATA: $(paperdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(paperdatadir)" || $(MKDIR_P) "$(DESTDIR)$(paperdatadir)"
-	@list='$(paperdata_DATA)'; for p in $$list; do \
+	@list='$(paperdata_DATA)'; test -n "$(paperdatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(paperdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(paperdatadir)/$$f'"; \
-	  $(paperdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(paperdatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(paperdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(paperdatadir)" || exit $$?; \
 	done
 
 uninstall-paperdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(paperdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(paperdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(paperdatadir)/$$f"; \
-	done
+	@list='$(paperdata_DATA)'; test -n "$(paperdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(paperdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(paperdatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -446,13 +467,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -483,6 +508,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -501,6 +527,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -509,18 +537,28 @@ install-data-am: install-paperdataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -555,6 +593,7 @@ uninstall-am: uninstall-paperdataDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-paperdataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gimpressionist/Presets/Makefile.in b/plug-ins/gimpressionist/Presets/Makefile.in
index 942d856d61..c5e505b0a7 100644
--- a/plug-ins/gimpressionist/Presets/Makefile.in
+++ b/plug-ins/gimpressionist/Presets/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(presetsdatadir)"
-presetsdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(presetsdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -396,9 +413,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Presets/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gimpressionist/Presets/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gimpressionist/Presets/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gimpressionist/Presets/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -416,6 +433,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -425,20 +443,23 @@ clean-libtool:
 install-presetsdataDATA: $(presetsdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(presetsdatadir)" || $(MKDIR_P) "$(DESTDIR)$(presetsdatadir)"
-	@list='$(presetsdata_DATA)'; for p in $$list; do \
+	@list='$(presetsdata_DATA)'; test -n "$(presetsdatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(presetsdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(presetsdatadir)/$$f'"; \
-	  $(presetsdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(presetsdatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(presetsdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(presetsdatadir)" || exit $$?; \
 	done
 
 uninstall-presetsdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(presetsdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(presetsdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(presetsdatadir)/$$f"; \
-	done
+	@list='$(presetsdata_DATA)'; test -n "$(presetsdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(presetsdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(presetsdatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -462,13 +483,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -499,6 +524,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -517,6 +543,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -525,18 +553,28 @@ install-data-am: install-presetsdataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -571,6 +609,7 @@ uninstall-am: uninstall-presetsdataDATA
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am uninstall-presetsdataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gradient-flare/Makefile.in b/plug-ins/gradient-flare/Makefile.in
index b4e80bbef5..e2bcce4214 100644
--- a/plug-ins/gradient-flare/Makefile.in
+++ b/plug-ins/gradient-flare/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_gradient_flare_OBJECTS = gradient-flare.$(OBJEXT)
 gradient_flare_OBJECTS = $(am_gradient_flare_OBJECTS)
@@ -62,6 +64,7 @@ gradient_flare_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -82,10 +85,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -423,9 +454,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gradient-flare/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gradient-flare/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gradient-flare/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gradient-flare/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -443,34 +474,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 gradient-flare$(EXEEXT): $(gradient_flare_OBJECTS) $(gradient_flare_DEPENDENCIES) 
 	@rm -f gradient-flare$(EXEEXT)
 	$(LINK) $(gradient_flare_OBJECTS) $(gradient_flare_LDADD) $(LIBS)
@@ -485,21 +532,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -534,7 +581,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -568,16 +615,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -592,7 +639,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -604,7 +651,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -613,29 +660,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -656,29 +708,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -711,6 +778,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -732,6 +800,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -740,18 +810,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -774,8 +854,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -793,6 +873,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/gradient-flare/flares/Makefile.in b/plug-ins/gradient-flare/flares/Makefile.in
index beefddcb84..7e194427ef 100644
--- a/plug-ins/gradient-flare/flares/Makefile.in
+++ b/plug-ins/gradient-flare/flares/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(flaredir)"
-flareDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(flare_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -378,9 +395,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/gradient-flare/flares/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/gradient-flare/flares/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/gradient-flare/flares/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/gradient-flare/flares/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -398,6 +415,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -407,20 +425,23 @@ clean-libtool:
 install-flareDATA: $(flare_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(flaredir)" || $(MKDIR_P) "$(DESTDIR)$(flaredir)"
-	@list='$(flare_DATA)'; for p in $$list; do \
+	@list='$(flare_DATA)'; test -n "$(flaredir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(flareDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(flaredir)/$$f'"; \
-	  $(flareDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(flaredir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(flaredir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(flaredir)" || exit $$?; \
 	done
 
 uninstall-flareDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(flare_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(flaredir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(flaredir)/$$f"; \
-	done
+	@list='$(flare_DATA)'; test -n "$(flaredir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(flaredir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(flaredir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -444,13 +465,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -481,6 +506,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -499,6 +525,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -507,18 +535,28 @@ install-data-am: install-flareDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -553,6 +591,7 @@ uninstall-am: uninstall-flareDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-flareDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/help-browser/Makefile.in b/plug-ins/help-browser/Makefile.in
index cb5485007f..699c562768 100644
--- a/plug-ins/help-browser/Makefile.in
+++ b/plug-ins/help-browser/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_help_browser_OBJECTS = gimpthrobber.$(OBJEXT) \
 	gimpthrobberaction.$(OBJEXT) help-browser.$(OBJEXT) \
@@ -65,6 +67,7 @@ help_browser_DEPENDENCIES = $(libgimphelp) $(libgimpui) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -428,9 +431,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/help-browser/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/help-browser/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/help-browser/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/help-browser/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -448,34 +451,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 help-browser$(EXEEXT): $(help_browser_OBJECTS) $(help_browser_DEPENDENCIES) 
 	@rm -f help-browser$(EXEEXT)
 	$(LINK) $(help_browser_OBJECTS) $(help_browser_LDADD) $(LIBS)
@@ -494,21 +513,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -531,7 +550,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -539,29 +558,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -582,13 +606,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -619,6 +647,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -640,6 +669,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -648,18 +679,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -698,6 +739,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/help/Makefile.in b/plug-ins/help/Makefile.in
index 2496324a26..d881fd0a04 100644
--- a/plug-ins/help/Makefile.in
+++ b/plug-ins/help/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,6 +52,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 libgimphelp_a_AR = $(AR) $(ARFLAGS)
@@ -59,7 +62,6 @@ am_libgimphelp_a_OBJECTS = gimphelp.$(OBJEXT) gimphelpdomain.$(OBJEXT) \
 	gimphelpprogress.$(OBJEXT)
 libgimphelp_a_OBJECTS = $(am_libgimphelp_a_OBJECTS)
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am_gimp_help_lookup_OBJECTS = gimp-help-lookup.$(OBJEXT)
 gimp_help_lookup_OBJECTS = $(am_gimp_help_lookup_OBJECTS)
@@ -76,6 +78,7 @@ help_DEPENDENCIES = $(libgimphelp) $(libgimp) $(libgimpconfig) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -448,9 +451,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/help/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/help/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/help/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/help/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -468,6 +471,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -478,38 +482,55 @@ libgimphelp.a: $(libgimphelp_a_OBJECTS) $(libgimphelp_a_DEPENDENCIES)
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 gimp-help-lookup$(EXEEXT): $(gimp_help_lookup_OBJECTS) $(gimp_help_lookup_DEPENDENCIES) 
 	@rm -f gimp-help-lookup$(EXEEXT)
 	$(LINK) $(gimp_help_lookup_OBJECTS) $(gimp_help_lookup_LDADD) $(LIBS)
@@ -533,21 +554,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -570,7 +591,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -578,29 +599,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -621,13 +647,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -658,6 +688,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -679,6 +710,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -687,18 +720,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -738,6 +781,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/ifs-compose/Makefile.in b/plug-ins/ifs-compose/Makefile.in
index a2864f4b6d..0170e18716 100644
--- a/plug-ins/ifs-compose/Makefile.in
+++ b/plug-ins/ifs-compose/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_ifs_compose_OBJECTS = ifs-compose.$(OBJEXT) \
 	ifs-compose-utils.$(OBJEXT) ifs-compose-storage.$(OBJEXT)
@@ -63,6 +65,7 @@ ifs_compose_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -419,9 +422,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/ifs-compose/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/ifs-compose/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/ifs-compose/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/ifs-compose/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -439,34 +442,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 ifs-compose$(EXEEXT): $(ifs_compose_OBJECTS) $(ifs_compose_DEPENDENCIES) 
 	@rm -f ifs-compose$(EXEEXT)
 	$(LINK) $(ifs_compose_OBJECTS) $(ifs_compose_LDADD) $(LIBS)
@@ -483,21 +502,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -520,7 +539,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -528,29 +547,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -571,13 +595,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -608,6 +636,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -629,6 +658,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -637,18 +668,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -687,6 +728,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/imagemap/Makefile.in b/plug-ins/imagemap/Makefile.in
index 89cfb7e709..9325b8f052 100644
--- a/plug-ins/imagemap/Makefile.in
+++ b/plug-ins/imagemap/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_imagemap_OBJECTS = imap_about.$(OBJEXT) imap_browse.$(OBJEXT) \
 	imap_cern_lex.$(OBJEXT) imap_cern_parse.$(OBJEXT) \
@@ -93,6 +95,7 @@ imagemap_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -113,10 +116,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -571,9 +602,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/imagemap/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/imagemap/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/imagemap/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/imagemap/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -591,34 +622,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 imagemap$(EXEEXT): $(imagemap_OBJECTS) $(imagemap_DEPENDENCIES) 
 	@rm -f imagemap$(EXEEXT)
 	$(LINK) $(imagemap_OBJECTS) $(imagemap_LDADD) $(LIBS)
@@ -695,21 +742,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -744,7 +791,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -778,16 +825,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -802,7 +849,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -814,7 +861,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -823,29 +870,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -866,29 +918,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -922,6 +989,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -943,6 +1011,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -951,18 +1021,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -985,8 +1065,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -1040,6 +1120,7 @@ imap_csim_parse.h.rebuild: imap_csim.y
 imap_ncsa_parse.h.rebuild: imap_ncsa.y
 	$(YACC) $(YFLAGS) -d -p ncsa_ $<
 	mv -f y.tab.h $@
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/imagemap/images/Makefile.in b/plug-ins/imagemap/images/Makefile.in
index 1af22b7bf3..02b666efab 100644
--- a/plug-ins/imagemap/images/Makefile.in
+++ b/plug-ins/imagemap/images/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DATA = $(noinst_DATA)
@@ -372,9 +375,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/imagemap/images/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/imagemap/images/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/imagemap/images/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/imagemap/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -392,6 +395,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -421,13 +425,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -456,6 +464,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -474,6 +483,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -482,18 +493,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -538,6 +559,7 @@ stock-icons.list: $(STOCK_IMAGES) Makefile.am
 
 $(srcdir)/imap-stock-pixbufs.h: stock-icons.list
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat stock-icons.list` > $(@F)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/lighting/Makefile.in b/plug-ins/lighting/Makefile.in
index 24d6407ff4..05431481b9 100644
--- a/plug-ins/lighting/Makefile.in
+++ b/plug-ins/lighting/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_lighting_OBJECTS = lighting-apply.$(OBJEXT) \
 	lighting-image.$(OBJEXT) lighting-main.$(OBJEXT) \
@@ -65,6 +67,7 @@ lighting_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -85,10 +88,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -441,9 +472,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/lighting/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/lighting/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/lighting/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/lighting/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -461,34 +492,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 lighting$(EXEEXT): $(lighting_OBJECTS) $(lighting_DEPENDENCIES) 
 	@rm -f lighting$(EXEEXT)
 	$(LINK) $(lighting_OBJECTS) $(lighting_LDADD) $(LIBS)
@@ -509,21 +556,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -558,7 +605,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -592,16 +639,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -616,7 +663,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -628,7 +675,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -637,29 +684,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -680,29 +732,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -735,6 +802,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -756,6 +824,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -764,18 +834,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -798,8 +878,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -817,6 +897,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/lighting/images/Makefile.in b/plug-ins/lighting/images/Makefile.in
index 2415afe45e..be31189c00 100644
--- a/plug-ins/lighting/images/Makefile.in
+++ b/plug-ins/lighting/images/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DATA = $(noinst_DATA)
@@ -374,9 +377,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/lighting/images/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/lighting/images/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/lighting/images/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/lighting/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -394,6 +397,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -423,13 +427,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -458,6 +466,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -476,6 +485,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -484,18 +495,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -540,6 +561,7 @@ stock-icons.list: $(STOCK_IMAGES) Makefile.am
 
 $(srcdir)/stock-pixbufs.h: stock-icons.list
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat stock-icons.list` > $(@F)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/map-object/Makefile.in b/plug-ins/map-object/Makefile.in
index f2bb2a8047..fef564c46f 100644
--- a/plug-ins/map-object/Makefile.in
+++ b/plug-ins/map-object/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_map_object_OBJECTS = arcball.$(OBJEXT) map-object-apply.$(OBJEXT) \
 	map-object-image.$(OBJEXT) map-object-main.$(OBJEXT) \
@@ -65,6 +67,7 @@ map_object_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -432,9 +435,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/map-object/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/map-object/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/map-object/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/map-object/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -452,34 +455,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 map-object$(EXEEXT): $(map_object_OBJECTS) $(map_object_DEPENDENCIES) 
 	@rm -f map-object$(EXEEXT)
 	$(LINK) $(map_object_OBJECTS) $(map_object_LDADD) $(LIBS)
@@ -501,21 +520,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -538,7 +557,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -546,29 +565,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -589,13 +613,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -626,6 +654,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -647,6 +676,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -655,18 +686,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -705,6 +746,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/map-object/map-object-shade.c b/plug-ins/map-object/map-object-shade.c
index 3e8b5adf62..2349849659 100644
--- a/plug-ins/map-object/map-object-shade.c
+++ b/plug-ins/map-object/map-object-shade.c
@@ -77,7 +77,7 @@ phong_shade (GimpVector3 *pos,
       gimp_vector3_mul (&N, NL);
       gimp_vector3_sub (&NN, &N, &L);
       RV = gimp_vector3_inner_product (&NN, &V);
-      RV = pow (RV, mapvals.material.highlight);
+      RV = 0.0 < RV ? pow (RV, mapvals.material.highlight) : 0.0;
 
       /* Compute diffuse and specular intensity contribution */
       /* =================================================== */
diff --git a/plug-ins/maze/Makefile.in b/plug-ins/maze/Makefile.in
index dd56ad93af..0894cc65bf 100644
--- a/plug-ins/maze/Makefile.in
+++ b/plug-ins/maze/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_maze_OBJECTS = maze.$(OBJEXT) maze-algorithms.$(OBJEXT) \
 	maze-dialog.$(OBJEXT) maze-utils.$(OBJEXT)
@@ -63,6 +65,7 @@ maze_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) $(libgimpconfig) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -422,9 +425,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/maze/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/maze/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/maze/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/maze/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -442,34 +445,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 maze$(EXEEXT): $(maze_OBJECTS) $(maze_DEPENDENCIES) 
 	@rm -f maze$(EXEEXT)
 	$(LINK) $(maze_OBJECTS) $(maze_LDADD) $(LIBS)
@@ -487,21 +506,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -524,7 +543,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -532,29 +551,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -575,13 +599,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -612,6 +640,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -633,6 +662,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -641,18 +672,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -691,6 +732,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/metadata/Makefile.in b/plug-ins/metadata/Makefile.in
index 9d989b2cd0..3d8876493a 100644
--- a/plug-ins/metadata/Makefile.in
+++ b/plug-ins/metadata/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,8 +52,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS) $(noinst_PROGRAMS)
 am_metadata_OBJECTS = metadata.$(OBJEXT) base64.$(OBJEXT) \
 	xmp-model.$(OBJEXT) xmp-parse.$(OBJEXT) xmp-encode.$(OBJEXT) \
@@ -78,6 +80,7 @@ xmpdump_DEPENDENCIES = $(libgimp) $(libgimpconfig) $(libgimpcolor) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -92,6 +95,8 @@ DIST_SOURCES = $(metadata_SOURCES) $(testbase64_SOURCES) \
 	$(xmpdump_SOURCES)
 ETAGS = etags
 CTAGS = ctags
+am__tty_colors = \
+red=; grn=; lgn=; blu=; std=
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
@@ -457,9 +462,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/metadata/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/metadata/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/metadata/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/metadata/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -477,41 +482,59 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 metadata$(EXEEXT): $(metadata_OBJECTS) $(metadata_DEPENDENCIES) 
 	@rm -f metadata$(EXEEXT)
 	$(LINK) $(metadata_OBJECTS) $(metadata_LDADD) $(LIBS)
@@ -539,21 +562,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -576,7 +599,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -584,29 +607,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -615,6 +643,7 @@ check-TESTS: $(TESTS)
 	@failed=0; all=0; xfail=0; xpass=0; skip=0; \
 	srcdir=$(srcdir); export srcdir; \
 	list=' $(TESTS) '; \
+	$(am__tty_colors); \
 	if test -n "$$list"; then \
 	  for tst in $$list; do \
 	    if test -f ./$$tst; then dir=./; \
@@ -626,10 +655,10 @@ check-TESTS: $(TESTS)
 	      *[\ \	]$$tst[\ \	]*) \
 		xpass=`expr $$xpass + 1`; \
 		failed=`expr $$failed + 1`; \
-		echo "XPASS: $$tst"; \
+		col=$$red; res=XPASS; \
 	      ;; \
 	      *) \
-		echo "PASS: $$tst"; \
+		col=$$grn; res=PASS; \
 	      ;; \
 	      esac; \
 	    elif test $$? -ne 77; then \
@@ -637,17 +666,18 @@ check-TESTS: $(TESTS)
 	      case " $(XFAIL_TESTS) " in \
 	      *[\ \	]$$tst[\ \	]*) \
 		xfail=`expr $$xfail + 1`; \
-		echo "XFAIL: $$tst"; \
+		col=$$lgn; res=XFAIL; \
 	      ;; \
 	      *) \
 		failed=`expr $$failed + 1`; \
-		echo "FAIL: $$tst"; \
+		col=$$red; res=FAIL; \
 	      ;; \
 	      esac; \
 	    else \
 	      skip=`expr $$skip + 1`; \
-	      echo "SKIP: $$tst"; \
+	      col=$$blu; res=SKIP; \
 	    fi; \
+	    echo "$${col}$$res$${std}: $$tst"; \
 	  done; \
 	  if test "$$all" -eq 1; then \
 	    tests="test"; \
@@ -689,11 +719,15 @@ check-TESTS: $(TESTS)
 	      dashes="$$report"; \
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
-	  echo "$$dashes"; \
+	  if test "$$failed" -eq 0; then \
+	    echo "$$grn$$dashes"; \
+	  else \
+	    echo "$$red$$dashes"; \
+	  fi; \
 	  echo "$$banner"; \
 	  test -z "$$skipped" || echo "$$skipped"; \
 	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes"; \
+	  echo "$$dashes$$std"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -713,13 +747,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -752,6 +790,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -773,6 +812,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -781,18 +822,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -815,7 +866,7 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: install-am install-strip
+.MAKE: check-am install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \
 	clean-generic clean-libexecPROGRAMS clean-libtool \
@@ -832,6 +883,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
 	uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/pagecurl/Makefile.in b/plug-ins/pagecurl/Makefile.in
index 7e2d677c23..00a9a5ddf9 100644
--- a/plug-ins/pagecurl/Makefile.in
+++ b/plug-ins/pagecurl/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am__objects_1 =
 am__objects_2 = pagecurl.$(OBJEXT)
@@ -64,6 +66,7 @@ pagecurl_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -430,9 +433,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/pagecurl/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/pagecurl/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/pagecurl/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/pagecurl/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -450,34 +453,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 pagecurl$(EXEEXT): $(pagecurl_OBJECTS) $(pagecurl_DEPENDENCIES) 
 	@rm -f pagecurl$(EXEEXT)
 	$(LINK) $(pagecurl_OBJECTS) $(pagecurl_LDADD) $(LIBS)
@@ -492,21 +511,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -529,7 +548,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -537,29 +556,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -580,13 +604,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -618,6 +646,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -639,6 +668,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -647,18 +678,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -709,6 +750,7 @@ pagecurl-icons.list: $(PAGECURL_IMAGES) Makefile.am
 
 $(srcdir)/pagecurl-icons.h: pagecurl-icons.list
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat pagecurl-icons.list` > $(@F)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/print/Makefile.in b/plug-ins/print/Makefile.in
index 9ac69125c8..b4754480c9 100644
--- a/plug-ins/print/Makefile.in
+++ b/plug-ins/print/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,8 +51,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_print_OBJECTS = print.$(OBJEXT) print-draw-page.$(OBJEXT) \
 	print-page-layout.$(OBJEXT) print-page-setup.$(OBJEXT) \
@@ -66,6 +68,7 @@ print_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) $(libgimpconfig) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -431,9 +434,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/print/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/print/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/print/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/print/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -451,34 +454,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 print$(EXEEXT): $(print_OBJECTS) $(print_DEPENDENCIES) 
 	@rm -f print$(EXEEXT)
 	$(LINK) $(print_OBJECTS) $(print_LDADD) $(LIBS)
@@ -499,21 +518,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -536,7 +555,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -544,29 +563,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -587,13 +611,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -624,6 +652,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -645,6 +674,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -653,18 +684,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -703,6 +744,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/print/print-settings.c b/plug-ins/print/print-settings.c
index 83c9af176d..6a3da0bf8b 100644
--- a/plug-ins/print/print-settings.c
+++ b/plug-ins/print/print-settings.c
@@ -105,6 +105,12 @@ print_settings_save (PrintData *data)
   /* some settings shouldn't be made persistent on a global level,
    * so they are only stored in the image, not in the rcfile
    */
+
+  g_key_file_remove_key (key_file, "image-setup", "x-resolution", NULL);
+  g_key_file_remove_key (key_file, "image-setup", "y-resolution", NULL);
+  g_key_file_remove_key (key_file, "image-setup", "x-offset", NULL);
+  g_key_file_remove_key (key_file, "image-setup", "y-offset", NULL);
+
   g_key_file_remove_key (key_file, PRINT_SETTINGS_NAME, "n-copies", NULL);
 
   print_utils_key_file_save_as_rcfile (key_file, PRINT_SETTINGS_NAME);
diff --git a/plug-ins/pygimp/Makefile.in b/plug-ins/pygimp/Makefile.in
index 4e5d5e284a..8bd6086242 100644
--- a/plug-ins/pygimp/Makefile.in
+++ b/plug-ins/pygimp/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,15 +51,30 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(pygimpdir)" "$(DESTDIR)$(pygimpdir)" \
 	"$(DESTDIR)$(pygimpdir)"
-pygimpLTLIBRARIES_INSTALL = $(INSTALL)
 LTLIBRARIES = $(pygimp_LTLIBRARIES)
 am__DEPENDENCIES_1 =
 _gimpenums_la_DEPENDENCIES = $(libgimp) $(libgimpcolor) $(libgimpbase) \
@@ -104,6 +121,7 @@ gimpthumb_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -126,16 +144,42 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
-pygimpPYTHON_INSTALL = $(INSTALL_DATA)
 py_compile = $(top_srcdir)/py-compile
-pygimpDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(pygimp_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -575,9 +619,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/pygimp/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/pygimp/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/pygimp/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/pygimp/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -595,23 +639,28 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-pygimpLTLIBRARIES: $(pygimp_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
 	test -z "$(pygimpdir)" || $(MKDIR_P) "$(DESTDIR)$(pygimpdir)"
-	@list='$(pygimp_LTLIBRARIES)'; for p in $$list; do \
+	@list='$(pygimp_LTLIBRARIES)'; test -n "$(pygimpdir)" || list=; \
+	list2=; for p in $$list; do \
 	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pygimpLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(pygimpdir)/$$f'"; \
-	    $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(pygimpLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(pygimpdir)/$$f"; \
+	    list2="$$list2 $$p"; \
 	  else :; fi; \
-	done
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pygimpdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pygimpdir)"; \
+	}
 
 uninstall-pygimpLTLIBRARIES:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pygimp_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pygimpdir)/$$p'"; \
-	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pygimpdir)/$$p"; \
+	@list='$(pygimp_LTLIBRARIES)'; test -n "$(pygimpdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pygimpdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pygimpdir)/$$f"; \
 	done
 
 clean-pygimpLTLIBRARIES:
@@ -657,21 +706,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -684,15 +733,20 @@ clean-libtool:
 install-pygimpPYTHON: $(pygimp_PYTHON)
 	@$(NORMAL_INSTALL)
 	test -z "$(pygimpdir)" || $(MKDIR_P) "$(DESTDIR)$(pygimpdir)"
-	@list='$(pygimp_PYTHON)'; dlist=''; for p in $$list; do\
+	@list='$(pygimp_PYTHON)'; dlist=; list2=; test -n "$(pygimpdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then b=; else b="$(srcdir)/"; fi; \
 	  if test -f $$b$$p; then \
-	    f=$(am__strip_dir) \
+	    $(am__strip_dir) \
 	    dlist="$$dlist $$f"; \
-	    echo " $(pygimpPYTHON_INSTALL) '$$b$$p' '$(DESTDIR)$(pygimpdir)/$$f'"; \
-	    $(pygimpPYTHON_INSTALL) "$$b$$p" "$(DESTDIR)$(pygimpdir)/$$f"; \
+	    list2="$$list2 $$b$$p"; \
 	  else :; fi; \
 	done; \
+	for file in $$list2; do echo $$file; done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pygimpdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pygimpdir)" || exit $$?; \
+	done || exit $$?; \
 	if test -n "$$dlist"; then \
 	  if test -z "$(DESTDIR)"; then \
 	    PYTHON=$(PYTHON) $(py_compile) --basedir "$(pygimpdir)" $$dlist; \
@@ -703,29 +757,37 @@ install-pygimpPYTHON: $(pygimp_PYTHON)
 
 uninstall-pygimpPYTHON:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pygimp_PYTHON)'; dlist=''; for p in $$list; do\
-	  f=$(am__strip_dir) \
-	  rm -f "$(DESTDIR)$(pygimpdir)/$$f"; \
-	  rm -f "$(DESTDIR)$(pygimpdir)/$${f}c"; \
-	  rm -f "$(DESTDIR)$(pygimpdir)/$${f}o"; \
-	done
+	@list='$(pygimp_PYTHON)'; test -n "$(pygimpdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	filesc=`echo "$$files" | sed 's|$$|c|'`; \
+	fileso=`echo "$$files" | sed 's|$$|o|'`; \
+	echo " ( cd '$(DESTDIR)$(pygimpdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pygimpdir)" && rm -f $$files || exit $$?; \
+	echo " ( cd '$(DESTDIR)$(pygimpdir)' && rm -f" $$filesc ")"; \
+	cd "$(DESTDIR)$(pygimpdir)" && rm -f $$filesc || exit $$?; \
+	echo " ( cd '$(DESTDIR)$(pygimpdir)' && rm -f" $$fileso ")"; \
+	cd "$(DESTDIR)$(pygimpdir)" && rm -f $$fileso
 install-pygimpDATA: $(pygimp_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pygimpdir)" || $(MKDIR_P) "$(DESTDIR)$(pygimpdir)"
-	@list='$(pygimp_DATA)'; for p in $$list; do \
+	@list='$(pygimp_DATA)'; test -n "$(pygimpdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pygimpDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pygimpdir)/$$f'"; \
-	  $(pygimpDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pygimpdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pygimpdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pygimpdir)" || exit $$?; \
 	done
 
 uninstall-pygimpDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pygimp_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pygimpdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pygimpdir)/$$f"; \
-	done
+	@list='$(pygimp_DATA)'; test -n "$(pygimpdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pygimpdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pygimpdir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -751,7 +813,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -785,16 +847,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -809,7 +871,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -821,7 +883,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -830,29 +892,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -873,29 +940,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -929,6 +1011,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -950,6 +1033,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -959,18 +1044,28 @@ install-data-am: install-data-local install-pygimpDATA \
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -994,8 +1089,8 @@ ps-am:
 uninstall-am: uninstall-local uninstall-pygimpDATA \
 	uninstall-pygimpLTLIBRARIES uninstall-pygimpPYTHON
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -1046,6 +1141,7 @@ gimpthumb.c: gimpthumb.defs gimpthumb.override
 	    --prefix $* $*.defs) > gen-$*.c \
 	 && cp gen-$*.c $*.c \
 	 && rm -f gen-$*.c
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/pygimp/plug-ins/Makefile.in b/plug-ins/pygimp/plug-ins/Makefile.in
index b70781d098..4edf136ded 100644
--- a/plug-ins/pygimp/plug-ins/Makefile.in
+++ b/plug-ins/pygimp/plug-ins/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,19 +50,33 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(pluginexecdir)" \
-	"$(DESTDIR)$(pluginexecdir)"
-pluginexecSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(pluginexec_SCRIPTS)
-SOURCES =
-DIST_SOURCES =
+CONFIG_CLEAN_VPATH_FILES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-pluginexecDATA_INSTALL = $(INSTALL_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__installdirs = "$(DESTDIR)$(pluginexecdir)" \
+	"$(DESTDIR)$(pluginexecdir)"
+SCRIPTS = $(pluginexec_SCRIPTS)
+SOURCES =
+DIST_SOURCES =
 DATA = $(pluginexec_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -392,9 +408,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/pygimp/plug-ins/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/pygimp/plug-ins/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/pygimp/plug-ins/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/pygimp/plug-ins/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -412,25 +428,41 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-pluginexecSCRIPTS: $(pluginexec_SCRIPTS)
 	@$(NORMAL_INSTALL)
 	test -z "$(pluginexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pluginexecdir)"
-	@list='$(pluginexec_SCRIPTS)'; for p in $$list; do \
+	@list='$(pluginexec_SCRIPTS)'; test -n "$(pluginexecdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(pluginexecSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(pluginexecdir)/$$f'"; \
-	    $(pluginexecSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(pluginexecdir)/$$f"; \
-	  else :; fi; \
-	done
+	  if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n' \
+	    -e 'h;s|.*|.|' \
+	    -e 'p;x;s,.*/,,;$(transform)' | sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1; } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) { files[d] = files[d] " " $$1; \
+	      if (++n[d] == $(am__install_max)) { \
+		print "f", d, files[d]; n[d] = 0; files[d] = "" } } \
+	    else { print "f", d "/" $$4, $$1 } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	     test -z "$$files" || { \
+	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(pluginexecdir)$$dir'"; \
+	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(pluginexecdir)$$dir" || exit $$?; \
+	     } \
+	; done
 
 uninstall-pluginexecSCRIPTS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pluginexec_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(pluginexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pluginexecdir)/$$f"; \
-	done
+	@list='$(pluginexec_SCRIPTS)'; test -n "$(pluginexecdir)" || exit 0; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	       sed -e 's,.*/,,;$(transform)'`; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pluginexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pluginexecdir)" && rm -f $$files
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -440,20 +472,23 @@ clean-libtool:
 install-pluginexecDATA: $(pluginexec_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(pluginexecdir)" || $(MKDIR_P) "$(DESTDIR)$(pluginexecdir)"
-	@list='$(pluginexec_DATA)'; for p in $$list; do \
+	@list='$(pluginexec_DATA)'; test -n "$(pluginexecdir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pluginexecDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pluginexecdir)/$$f'"; \
-	  $(pluginexecDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pluginexecdir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pluginexecdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(pluginexecdir)" || exit $$?; \
 	done
 
 uninstall-pluginexecDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(pluginexec_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pluginexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pluginexecdir)/$$f"; \
-	done
+	@list='$(pluginexec_DATA)'; test -n "$(pluginexecdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(pluginexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(pluginexecdir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -477,13 +512,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -514,6 +553,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -532,6 +572,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -540,18 +582,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-pluginexecDATA install-pluginexecSCRIPTS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -588,6 +640,7 @@ uninstall-am: uninstall-pluginexecDATA uninstall-pluginexecSCRIPTS
 	uninstall uninstall-am uninstall-pluginexecDATA \
 	uninstall-pluginexecSCRIPTS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/pygimp/pygimp-drawable.c b/plug-ins/pygimp/pygimp-drawable.c
index b2990b3574..ec14f1b52f 100644
--- a/plug-ins/pygimp/pygimp-drawable.c
+++ b/plug-ins/pygimp/pygimp-drawable.c
@@ -1405,7 +1405,8 @@ lay_scale(PyGimpLayer *self, PyObject *args, PyObject *kwargs)
     int interpolation = -1;
     gboolean local_origin = FALSE;
 
-    static char *kwlist[] = { "width", "height", "local_origin", NULL };
+    static char *kwlist[] = { "width", "height", "local_origin",
+                              "interpolation", NULL };
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "ii|ii:scale", kwlist,
 				     &new_width, &new_height,
diff --git a/plug-ins/pygimp/pygimp-pdb.c b/plug-ins/pygimp/pygimp-pdb.c
index 06852ad678..edcb697252 100644
--- a/plug-ins/pygimp/pygimp-pdb.c
+++ b/plug-ins/pygimp/pygimp-pdb.c
@@ -285,7 +285,7 @@ pygimp_param_to_tuple(int nparams, const GimpParam *params)
 	    value = pygimp_drawable_new(NULL, params[i].data.d_drawable);
 	    break;
 	case GIMP_PDB_SELECTION:
-	    value = pygimp_layer_new(params[i].data.d_selection);
+	    value = pygimp_channel_new(params[i].data.d_selection);
 	    break;
 	case GIMP_PDB_COLORARRAY:
 	    if (params[i].data.d_colorarray == NULL) {
@@ -539,8 +539,12 @@ pygimp_param_from_tuple(PyObject *args, const GimpParamDef *ptype, int nparams)
 	    ret[i].data.d_channel = ((PyGimpDrawable *)item)->ID;
 	    break;
 	case GIMP_PDB_SELECTION:
-	    check(!pygimp_layer_check(item));
-	    ret[i].data.d_selection = ((PyGimpLayer *)item)->ID;
+	    if (item == Py_None) {
+		ret[i].data.d_channel = -1;
+		break;
+	    }
+	    check(!pygimp_channel_check(item));
+	    ret[i].data.d_selection = ((PyGimpChannel *)item)->ID;
 	    break;
 	case GIMP_PDB_COLORARRAY:
 	    {
diff --git a/plug-ins/script-fu/Makefile.in b/plug-ins/script-fu/Makefile.in
index 64e96e7e2e..462bca30bc 100644
--- a/plug-ins/script-fu/Makefile.in
+++ b/plug-ins/script-fu/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_script_fu_OBJECTS = script-fu.$(OBJEXT) script-fu-console.$(OBJEXT) \
 	script-fu-eval.$(OBJEXT) script-fu-interface.$(OBJEXT) \
@@ -69,6 +71,7 @@ script_fu_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -89,10 +92,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -466,9 +497,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/script-fu/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/script-fu/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/script-fu/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -486,34 +517,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 script-fu$(EXEEXT): $(script_fu_OBJECTS) $(script_fu_DEPENDENCIES) 
 	@rm -f script-fu$(EXEEXT)
 	$(LINK) $(script_fu_OBJECTS) $(script_fu_LDADD) $(LIBS)
@@ -538,21 +585,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -587,7 +634,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -621,16 +668,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -645,7 +692,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -657,7 +704,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -666,29 +713,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -709,29 +761,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -764,6 +831,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -785,6 +853,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -793,18 +863,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -827,8 +907,8 @@ ps-am:
 
 uninstall-am: uninstall-libexecPROGRAMS
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic \
@@ -846,6 +926,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/script-fu/ftx/Makefile.in b/plug-ins/script-fu/ftx/Makefile.in
index 0a3a5a1854..c390b99147 100644
--- a/plug-ins/script-fu/ftx/Makefile.in
+++ b/plug-ins/script-fu/ftx/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 libftx_a_AR = $(AR) $(ARFLAGS)
@@ -56,6 +59,7 @@ libftx_a_OBJECTS = $(am_libftx_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -392,9 +396,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/script-fu/ftx/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/script-fu/ftx/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/ftx/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/script-fu/ftx/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -412,6 +416,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -430,21 +435,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -467,7 +472,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -475,29 +480,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -518,13 +528,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -552,6 +566,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -573,6 +588,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -581,18 +598,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -630,6 +657,7 @@ uninstall-am:
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/script-fu/scripts/Makefile.in b/plug-ins/script-fu/scripts/Makefile.in
index 62e228cc07..151cb3b4b2 100644
--- a/plug-ins/script-fu/scripts/Makefile.in
+++ b/plug-ins/script-fu/scripts/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -61,16 +64,58 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(scriptdatadir)"
-scriptdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(scriptdata_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -490,9 +535,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/script-fu/scripts/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/script-fu/scripts/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -510,6 +555,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -519,20 +565,23 @@ clean-libtool:
 install-scriptdataDATA: $(scriptdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(scriptdatadir)" || $(MKDIR_P) "$(DESTDIR)$(scriptdatadir)"
-	@list='$(scriptdata_DATA)'; for p in $$list; do \
+	@list='$(scriptdata_DATA)'; test -n "$(scriptdatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(scriptdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(scriptdatadir)/$$f'"; \
-	  $(scriptdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(scriptdatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(scriptdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(scriptdatadir)" || exit $$?; \
 	done
 
 uninstall-scriptdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(scriptdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(scriptdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(scriptdatadir)/$$f"; \
-	done
+	@list='$(scriptdata_DATA)'; test -n "$(scriptdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(scriptdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(scriptdatadir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -558,7 +607,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -592,16 +641,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -616,7 +665,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -628,7 +677,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -637,29 +686,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -680,29 +734,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -735,6 +804,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -753,6 +823,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -761,18 +833,28 @@ install-data-am: install-scriptdataDATA
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -793,8 +875,8 @@ ps-am:
 
 uninstall-am: uninstall-scriptdataDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -811,6 +893,7 @@ uninstall-am: uninstall-scriptdataDATA
 	tags tags-recursive uninstall uninstall-am \
 	uninstall-scriptdataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/script-fu/scripts/images/Makefile.in b/plug-ins/script-fu/scripts/images/Makefile.in
index fcc13e9510..94a98124d3 100644
--- a/plug-ins/script-fu/scripts/images/Makefile.in
+++ b/plug-ins/script-fu/scripts/images/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(imagesdatadir)"
-imagesdataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(imagesdata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -376,9 +393,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/script-fu/scripts/images/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/script-fu/scripts/images/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/images/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/script-fu/scripts/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -396,6 +413,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -405,20 +423,23 @@ clean-libtool:
 install-imagesdataDATA: $(imagesdata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(imagesdatadir)" || $(MKDIR_P) "$(DESTDIR)$(imagesdatadir)"
-	@list='$(imagesdata_DATA)'; for p in $$list; do \
+	@list='$(imagesdata_DATA)'; test -n "$(imagesdatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(imagesdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(imagesdatadir)/$$f'"; \
-	  $(imagesdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(imagesdatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(imagesdatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(imagesdatadir)" || exit $$?; \
 	done
 
 uninstall-imagesdataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(imagesdata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(imagesdatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(imagesdatadir)/$$f"; \
-	done
+	@list='$(imagesdata_DATA)'; test -n "$(imagesdatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(imagesdatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(imagesdatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -442,13 +463,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -479,6 +504,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -497,6 +523,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -505,18 +533,28 @@ install-data-am: install-imagesdataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -551,6 +589,7 @@ uninstall-am: uninstall-imagesdataDATA
 	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
 	ps ps-am uninstall uninstall-am uninstall-imagesdataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/script-fu/tinyscheme/Makefile.in b/plug-ins/script-fu/tinyscheme/Makefile.in
index f8415c5d5c..0359e85b45 100644
--- a/plug-ins/script-fu/tinyscheme/Makefile.in
+++ b/plug-ins/script-fu/tinyscheme/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,6 +50,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 LIBRARIES = $(noinst_LIBRARIES)
 ARFLAGS = cru
 libtinyscheme_a_AR = $(AR) $(ARFLAGS)
@@ -57,6 +60,7 @@ libtinyscheme_a_OBJECTS = $(am_libtinyscheme_a_OBJECTS)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -404,9 +408,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/script-fu/tinyscheme/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/script-fu/tinyscheme/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/script-fu/tinyscheme/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/script-fu/tinyscheme/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -424,6 +428,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
@@ -442,21 +447,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -479,7 +484,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -487,29 +492,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -530,13 +540,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -564,6 +578,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -585,6 +600,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -593,18 +610,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -642,6 +669,7 @@ uninstall-am:
 	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
 	pdf pdf-am ps ps-am tags uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/selection-to-path/Makefile.in b/plug-ins/selection-to-path/Makefile.in
index 7a421e00a9..0356716590 100644
--- a/plug-ins/selection-to-path/Makefile.in
+++ b/plug-ins/selection-to-path/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_selection_to_path_OBJECTS = curve.$(OBJEXT) edge.$(OBJEXT) \
 	fit.$(OBJEXT) math.$(OBJEXT) pxl-outline.$(OBJEXT) \
@@ -65,6 +67,7 @@ selection_to_path_DEPENDENCIES = $(libgimpui) $(libgimpwidgets) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -440,9 +443,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/selection-to-path/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/selection-to-path/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/selection-to-path/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/selection-to-path/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -460,34 +463,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 selection-to-path$(EXEEXT): $(selection_to_path_OBJECTS) $(selection_to_path_DEPENDENCIES) 
 	@rm -f selection-to-path$(EXEEXT)
 	$(LINK) $(selection_to_path_OBJECTS) $(selection_to_path_LDADD) $(LIBS)
@@ -510,21 +529,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -547,7 +566,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -555,29 +574,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -598,13 +622,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -635,6 +663,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -656,6 +685,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -664,18 +695,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -714,6 +755,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/twain/Makefile.in b/plug-ins/twain/Makefile.in
index 3d7b9cfff5..b01dd73733 100644
--- a/plug-ins/twain/Makefile.in
+++ b/plug-ins/twain/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,8 +18,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -49,9 +51,9 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)" \
 	"$(DESTDIR)$(twaindatadir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am__twain_SOURCES_DIST = tw_func.c tw_func.h tw_util.c tw_util.h \
 	twain.c twain.h tw_local.h tw_platform.h tw_mac.c tw_win.c
@@ -71,6 +73,7 @@ twain_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -87,8 +90,22 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-twaindataDATA_INSTALL = $(INSTALL_DATA)
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 DATA = $(twaindata_DATA)
 ETAGS = etags
 CTAGS = ctags
@@ -448,9 +465,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/twain/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/twain/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/twain/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/twain/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -468,34 +485,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 twain$(EXEEXT): $(twain_OBJECTS) $(twain_DEPENDENCIES) 
 	@rm -f twain$(EXEEXT)
 	$(twain_LINK) $(twain_OBJECTS) $(twain_LDADD) $(LIBS)
@@ -514,21 +547,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -541,20 +574,23 @@ clean-libtool:
 install-twaindataDATA: $(twaindata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(twaindatadir)" || $(MKDIR_P) "$(DESTDIR)$(twaindatadir)"
-	@list='$(twaindata_DATA)'; for p in $$list; do \
+	@list='$(twaindata_DATA)'; test -n "$(twaindatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(twaindataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(twaindatadir)/$$f'"; \
-	  $(twaindataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(twaindatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(twaindatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(twaindatadir)" || exit $$?; \
 	done
 
 uninstall-twaindataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(twaindata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(twaindatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(twaindatadir)/$$f"; \
-	done
+	@list='$(twaindata_DATA)'; test -n "$(twaindatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(twaindatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(twaindatadir)" && rm -f $$files
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -568,7 +604,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -576,29 +612,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -619,13 +660,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -656,6 +701,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -677,6 +723,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -685,18 +733,28 @@ install-data-am: install-twaindataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -736,6 +794,7 @@ uninstall-am: uninstall-libexecPROGRAMS uninstall-twaindataDATA
 	tags uninstall uninstall-am uninstall-libexecPROGRAMS \
 	uninstall-twaindataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/plug-ins/win-snap/Makefile.in b/plug-ins/win-snap/Makefile.in
index 1310e67b3f..61e114daf8 100644
--- a/plug-ins/win-snap/Makefile.in
+++ b/plug-ins/win-snap/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -48,8 +50,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
-libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
 am_win_snap_OBJECTS = winsnap.$(OBJEXT)
 win_snap_OBJECTS = $(am_win_snap_OBJECTS)
@@ -65,6 +67,7 @@ win_snap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -425,9 +428,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  plug-ins/win-snap/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  plug-ins/win-snap/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu plug-ins/win-snap/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plug-ins/win-snap/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -445,34 +448,50 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-libexecPROGRAMS: $(libexec_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(libexecdir)" || $(MKDIR_P) "$(DESTDIR)$(libexecdir)"
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(libexecdir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(libexecPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(libexecdir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-libexecPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(libexecdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libexecdir)/$$f"; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(libexecdir)" && rm -f $$files
 
 clean-libexecPROGRAMS:
-	@list='$(libexec_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 win-snap$(EXEEXT): $(win_snap_OBJECTS) $(win_snap_DEPENDENCIES) 
 	@rm -f win-snap$(EXEEXT)
 	$(win_snap_LINK) $(win_snap_OBJECTS) $(win_snap_LDADD) $(LIBS)
@@ -487,21 +506,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -524,7 +543,7 @@ tags: TAGS
 
 TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
@@ -532,29 +551,34 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -575,13 +599,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -612,6 +640,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -633,6 +662,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -641,18 +672,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am: install-libexecPROGRAMS
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -694,6 +735,7 @@ uninstall-am: uninstall-libexecPROGRAMS
 
 winsnap-win32res.o: winsnap.rc select.cur small.ico winsnap.ico
 	$(WINDRES) winsnap.rc winsnap-win32res.o
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/po-libgimp/cs.po b/po-libgimp/cs.po
index c96b1dc589..c3814347d3 100644
--- a/po-libgimp/cs.po
+++ b/po-libgimp/cs.po
@@ -1,45 +1,45 @@
 # Translation of gimp-libgimp to Czech.
-# Copyright (C) 2000, 2003, 2006, 2007, 2008 the author(s) of the GIMP.
+# Copyright (C) 2000, 2003, 2006, 2007, 2008, 2009 the author(s) of the GIMP.
 # Copyright (C) 2004, 2005 Miloslav Trmac .
 # This file is distributed under the same license as the gimp-libgimp package.
 # Stanislav Brabec , 2000.
 # Michal Bukovjan , 2002, 2003.
 # Miloslav Trmac , 2003 - 2005.
 # Jakub Friedl , 2006, 2007.
-#
+# Petr Kovar , 2009.
+# JardaK , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp-libgimp\n"
+"Project-Id-Version: cs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 23:24+0100\n"
-"PO-Revision-Date: 2008-10-27 23:28+0100\n"
+"POT-Creation-Date: 2009-09-06 00:41+0200\n"
+"PO-Revision-Date: 2009-09-06 00:40+0100\n"
 "Last-Translator: Petr Kovar \n"
 "Language-Team: Czech \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. procedure executed successfully
 #: ../libgimp/gimp.c:1045
 msgid "success"
-msgstr ""
+msgstr "úspěch"
 
 #. procedure execution failed
 #: ../libgimp/gimp.c:1049
 msgid "execution error"
-msgstr ""
+msgstr "chyba vykonání"
 
 #. procedure called incorrectly
 #: ../libgimp/gimp.c:1053
 msgid "calling error"
-msgstr ""
+msgstr "chyba volání"
 
 #. procedure execution cancelled
 #: ../libgimp/gimp.c:1057
 msgid "cancelled"
-msgstr ""
+msgstr "zrušeno"
 
 #: ../libgimp/gimpbrushselectbutton.c:170
 msgid "Brush Selection"
@@ -130,7 +130,8 @@ msgstr ""
 #: ../libgimp/gimpexport.c:308
 #, c-format
 msgid "%s plug-in can only handle bitmap (two color) indexed images"
-msgstr "Modul %s umí zpracovat pouze bitmapové (dvoubarevné) indexované obrázky"
+msgstr ""
+"Modul %s umí zpracovat pouze bitmapové (dvoubarevné) indexované obrázky"
 
 #: ../libgimp/gimpexport.c:309
 msgid ""
@@ -380,7 +381,7 @@ msgstr "Kopie vrstvy v _odstínech šedi"
 
 #: ../libgimpbase/gimpbaseenums.c:34
 msgid "C_hannel"
-msgstr "_Kanál:"
+msgstr "_Kanál"
 
 #: ../libgimpbase/gimpbaseenums.c:64
 msgid "FG to BG (RGB)"
@@ -728,28 +729,27 @@ msgstr "Dočasná procedura"
 
 #: ../libgimpbase/gimpbaseenums.c:1074
 msgid "From left to right"
-msgstr ""
+msgstr "Zleva doprava"
 
 #: ../libgimpbase/gimpbaseenums.c:1075
 msgid "From right to left"
-msgstr ""
+msgstr "Zprava doleva"
 
 #: ../libgimpbase/gimpbaseenums.c:1105
 msgid "Left justified"
-msgstr ""
+msgstr "Vyrovnané doleva"
 
 #: ../libgimpbase/gimpbaseenums.c:1106
 msgid "Right justified"
-msgstr ""
+msgstr "Vyrovnané doprava"
 
 #: ../libgimpbase/gimpbaseenums.c:1107
-#, fuzzy
 msgid "Centered"
-msgstr "_Střed"
+msgstr "Vystředěné"
 
 #: ../libgimpbase/gimpbaseenums.c:1108
 msgid "Filled"
-msgstr ""
+msgstr "Vyplněné"
 
 #: ../libgimpbase/gimputils.c:170 ../libgimpbase/gimputils.c:175
 #: ../modules/display-filter-lcms.c:183
@@ -880,7 +880,7 @@ msgid "Cannot expand ${%s}"
 msgstr "Nemohu expandovat ${%s}"
 
 #: ../libgimpconfig/gimpconfigwriter.c:78
-#: ../libgimpconfig/gimpconfigwriter.c:693
+#: ../libgimpconfig/gimpconfigwriter.c:718
 #, c-format
 msgid "Error writing to '%s': %s"
 msgstr "Chyba při zápisu '%s': %s"
@@ -895,7 +895,8 @@ msgstr "Nemohu vytvořit dočasný soubor pro '%s': %s"
 msgid "Could not open '%s' for writing: %s"
 msgstr "Nelze otevřít '%s' pro zápis: %s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:674
+#: ../libgimpconfig/gimpconfigwriter.c:679
+#: ../libgimpconfig/gimpconfigwriter.c:699
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -904,7 +905,7 @@ msgstr ""
 "Chyba při zápisu do dočasného souboru pro '%s': %s\n"
 "Původní soubor zůstal nedotčen."
 
-#: ../libgimpconfig/gimpconfigwriter.c:682
+#: ../libgimpconfig/gimpconfigwriter.c:707
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -913,7 +914,7 @@ msgstr ""
 "Chyba při zápisu do dočasného souboru pro '%s': %s\n"
 "Žádný soubor nebyl vytvořen."
 
-#: ../libgimpconfig/gimpconfigwriter.c:711
+#: ../libgimpconfig/gimpconfigwriter.c:731
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr "Nemohu odstranit '%s': %s"
@@ -1000,10 +1001,9 @@ msgid "Select color profile from disk..."
 msgstr "Vyberte barevný profil z disku..."
 
 #: ../libgimpwidgets/gimpcolorprofilestore.c:280
-#, fuzzy
 msgctxt "profile"
 msgid "None"
-msgstr "Nic"
+msgstr "Žádné"
 
 #: ../libgimpwidgets/gimpcolorscales.c:98
 msgid "Scales"
@@ -1031,7 +1031,7 @@ msgstr "_Notace HTML:"
 
 #: ../libgimpwidgets/gimphelpui.c:420
 msgid "Press F1 for more help"
-msgstr ""
+msgstr "Potřebujete-li další pomoc, stiskněte klávesu F1"
 
 #: ../libgimpwidgets/gimpfileentry.c:174
 msgid "Open a file selector to browse your folders"
@@ -1371,7 +1371,8 @@ msgstr "Správa barev"
 msgid ""
 "This filter takes its configuration from the Color Management section in the "
 "Preferences dialog."
-msgstr "Tento filtr bere své nastavení z oddílu Správa barev dialogu Předvolby."
+msgstr ""
+"Tento filtr bere své nastavení z oddílu Správa barev dialogu Předvolby."
 
 #: ../modules/display-filter-lcms.c:226
 msgid "Mode of operation:"
@@ -1509,11 +1510,11 @@ msgstr "Tlak"
 
 #: ../modules/color-selector-wheel.c:103
 msgid "HSV color wheel"
-msgstr ""
+msgstr "Barevný kotouč HSV"
 
 #: ../modules/color-selector-wheel.c:134
 msgid "Wheel"
-msgstr ""
+msgstr "Kolečko"
 
 #: ../modules/controller-linux-input.c:58
 msgid "Button 0"
@@ -1857,46 +1858,3 @@ msgstr "GIMP"
 #: ../modules/controller-midi.c:428
 msgid "GIMP MIDI Input Controller"
 msgstr "GIMP - ovladač vstupu MIDI"
-
-#~ msgid "%d Byte"
-#~ msgid_plural "%d Bytes"
-#~ msgstr[0] "%d bajt"
-#~ msgstr[1] "%d bajty"
-#~ msgstr[2] "%d bajtů"
-
-#~ msgid "%.2f KB"
-#~ msgstr "%.2f KB"
-
-#~ msgid "%.1f KB"
-#~ msgstr "%.1f KB"
-
-#~ msgid "%d KB"
-#~ msgstr "%d KB"
-
-#~ msgid "%.2f MB"
-#~ msgstr "%.2f MB"
-
-#~ msgid "%.1f MB"
-#~ msgstr "%.1f MB"
-
-#~ msgid "%d MB"
-#~ msgstr "%d MB"
-
-#~ msgid "%.2f GB"
-#~ msgstr "%.2f GB"
-
-#~ msgid "%.1f GB"
-#~ msgstr "%.1f GB"
-
-#~ msgid "%d GB"
-#~ msgstr "%d GB"
-
-#~ msgid "profile|None"
-#~ msgstr "Žádný"
-
-#~ msgid "Painter-style triangle color selector"
-#~ msgstr "Výběr barev z trojúhelníku na malířský způsob"
-
-#~ msgid "Triangle"
-#~ msgstr "Trojúhelník"
-
diff --git a/po-libgimp/el.po b/po-libgimp/el.po
index 504fd6a256..63beac44b4 100644
--- a/po-libgimp/el.po
+++ b/po-libgimp/el.po
@@ -10,655 +10,915 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-02-02 19:52+0100\n"
-"PO-Revision-Date: 2004-10-22 01:09+0300\n"
-"Last-Translator: Nikos Charonitakis \n"
-"Language-Team:  \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n"
+"POT-Creation-Date: 2009-04-17 09:06+0000\n"
+"PO-Revision-Date: 2009-09-03 11:52+0200\n"
+"Last-Translator: Βασίλης Κοντογιάνης \n"
+"Language-Team: greek \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Greek\n"
+"X-Poedit-Country: GREECE\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. procedure executed successfully
+#: ../libgimp/gimp.c:1045
+msgid "success"
+msgstr "επιτυχία"
+
+#. procedure execution failed
+#: ../libgimp/gimp.c:1049
+msgid "execution error"
+msgstr "σφάλμα εκτέλεσης"
+
+#. procedure called incorrectly
+#: ../libgimp/gimp.c:1053
+msgid "calling error"
+msgstr "σφάλμα κλήσης"
+
+#. procedure execution cancelled
+#: ../libgimp/gimp.c:1057
+msgid "cancelled"
+msgstr "ακυρώθηκε"
 
 #
-#: ../libgimp/gimpbrushmenu.c:129
+#: ../libgimp/gimpbrushselectbutton.c:170
 msgid "Brush Selection"
 msgstr "Επιλογή Πινέλου"
 
-#: ../libgimp/gimpbrushmenu.c:158 ../libgimp/gimppatternmenu.c:142
+#: ../libgimp/gimpbrushselectbutton.c:913
+#: ../libgimp/gimppatternselectbutton.c:714
 msgid "_Browse..."
 msgstr "_Περιήγηση..."
 
-#: ../libgimp/gimpexport.c:215 ../libgimp/gimpexport.c:251
-#, fuzzy, c-format
-msgid "%s can't handle layers"
-msgstr "Αδύνατη η Ανάγνωση Καταλόγου"
+#: ../libgimp/gimpexport.c:217
+#: ../libgimp/gimpexport.c:253
+#, c-format
+msgid "%s plug-in can't handle layers"
+msgstr "το %s πρόσθετο δεν μπορεί ναι χειριστεί στρώσεις"
 
-#: ../libgimp/gimpexport.c:216 ../libgimp/gimpexport.c:225
-#: ../libgimp/gimpexport.c:234
+#: ../libgimp/gimpexport.c:218
+#: ../libgimp/gimpexport.c:227
+#: ../libgimp/gimpexport.c:236
+#: ../libgimp/gimpexport.c:254
 msgid "Merge Visible Layers"
 msgstr "Συγχώνευση Ορατών Στρωμάτων"
 
-#: ../libgimp/gimpexport.c:224
+#: ../libgimp/gimpexport.c:226
 #, c-format
-msgid "%s can't handle layer offsets, size or opacity"
-msgstr ""
+msgid "%s plug-in can't handle layer offsets, size or opacity"
+msgstr "το %s πρόσθετο δεν μπορεί να χειριστεί  μετατόπισης στρώσης, μεγέθους ή αδιαφάνειας"
 
-#: ../libgimp/gimpexport.c:233 ../libgimp/gimpexport.c:242
+#: ../libgimp/gimpexport.c:235
+#: ../libgimp/gimpexport.c:244
 #, c-format
-msgid "%s can only handle layers as animation frames"
-msgstr ""
+msgid "%s plug-in can only handle layers as animation frames"
+msgstr "το %s πρόσθετο μπορεί να χειριστεί μόνο στρώσεις σαν πλαίσια σχεδιοκίνησης"
 
-#: ../libgimp/gimpexport.c:234 ../libgimp/gimpexport.c:243
-#, fuzzy
+#: ../libgimp/gimpexport.c:236
+#: ../libgimp/gimpexport.c:245
 msgid "Save as Animation"
-msgstr "Επιλογή κινούμενων σχεδίων"
+msgstr "Αποθήκευση ως Σχεδιοκίνηση"
 
-#: ../libgimp/gimpexport.c:243 ../libgimp/gimpexport.c:252
-#: ../libgimp/gimpexport.c:261
-#, fuzzy
+#: ../libgimp/gimpexport.c:245
+#: ../libgimp/gimpexport.c:254
+#: ../libgimp/gimpexport.c:263
 msgid "Flatten Image"
-msgstr "Νέα Εικόνα"
+msgstr "Ισοπέδωση εικόνας"
 
-#: ../libgimp/gimpexport.c:260
-#, fuzzy, c-format
-msgid "%s can't handle transparency"
-msgstr "Διαφάνεια Χροιάς"
-
-#: ../libgimp/gimpexport.c:269
-#, fuzzy, c-format
-msgid "%s can't handle layer masks"
-msgstr "Αδύνατη η Ανάγνωση Καταλόγου"
-
-#: ../libgimp/gimpexport.c:270
-msgid "Apply Layer Masks"
-msgstr ""
-
-#: ../libgimp/gimpexport.c:278
+#: ../libgimp/gimpexport.c:262
 #, c-format
-msgid "%s can only handle RGB images"
-msgstr ""
+msgid "%s plug-in can't handle transparency"
+msgstr "το %s πρόσθετο δεν μπορεί να χειριστεί διαφάνεια"
 
-#: ../libgimp/gimpexport.c:279 ../libgimp/gimpexport.c:317
-#: ../libgimp/gimpexport.c:326
+#: ../libgimp/gimpexport.c:271
+#, c-format
+msgid "%s plug-in can't handle layer masks"
+msgstr "το %s πρόσθετο δεν μπορεί να χειριστεί προσωπεία στρώσης"
+
+#: ../libgimp/gimpexport.c:272
+msgid "Apply Layer Masks"
+msgstr "Εφαρμογή Προσωπείων Στρώσης"
+
+#: ../libgimp/gimpexport.c:280
+#, c-format
+msgid "%s plug-in can only handle RGB images"
+msgstr "το %s πρόσθετο μπορεί μόνο να χειριστεί RGB εικόνες"
+
+#: ../libgimp/gimpexport.c:281
+#: ../libgimp/gimpexport.c:319
+#: ../libgimp/gimpexport.c:328
 msgid "Convert to RGB"
 msgstr "Μετατροπή σε RGB"
 
-#: ../libgimp/gimpexport.c:287
+#: ../libgimp/gimpexport.c:289
 #, c-format
-msgid "%s can only handle grayscale images"
-msgstr ""
+msgid "%s plug-in can only handle grayscale images"
+msgstr "το %s πρόσθετο μπορεί μόνο να χειριστεί εικόνες της φαιάς κλίμακας"
 
 #
-#: ../libgimp/gimpexport.c:288 ../libgimp/gimpexport.c:317
-#: ../libgimp/gimpexport.c:338
+#: ../libgimp/gimpexport.c:290
+#: ../libgimp/gimpexport.c:319
+#: ../libgimp/gimpexport.c:340
 msgid "Convert to Grayscale"
-msgstr "Μετατροπή σε Κλίμακα του Γκρι"
+msgstr "Μετατροπή σε Φαιά Κλίμακα"
 
-#: ../libgimp/gimpexport.c:296
+#: ../libgimp/gimpexport.c:298
 #, c-format
-msgid "%s can only handle indexed images"
-msgstr ""
+msgid "%s plug-in can only handle indexed images"
+msgstr "το %s πρόσθετο μπορεί μόνο να χειριστεί  εικόνες με ευρετήριο"
 
-#: ../libgimp/gimpexport.c:297 ../libgimp/gimpexport.c:326
-#: ../libgimp/gimpexport.c:336
+#: ../libgimp/gimpexport.c:299
+#: ../libgimp/gimpexport.c:328
+#: ../libgimp/gimpexport.c:338
 msgid ""
 "Convert to Indexed using default settings\n"
 "(Do it manually to tune the result)"
 msgstr ""
+"Μετατροπή σε Ευρετήριο με τη χρήση προεπιλεγμένων ρυθμίσεων\n"
+"(Κάντε το χειρονακτικά για να ρυθμίσετε το αποτέλεσμα)"
 
-#: ../libgimp/gimpexport.c:306
+#: ../libgimp/gimpexport.c:308
 #, c-format
-msgid "%s can only handle bitmap (two color) indexed images"
-msgstr ""
+msgid "%s plug-in can only handle bitmap (two color) indexed images"
+msgstr "το %s πρόσθετο μπορεί μόνο να χειριστεί χαρτογραφικές (δίχρωμη) εικόνες με ευρετήριο"
 
-#: ../libgimp/gimpexport.c:307
+#: ../libgimp/gimpexport.c:309
 msgid ""
 "Convert to Indexed using bitmap default settings\n"
 "(Do it manually to tune the result)"
 msgstr ""
+"Μετατροπή με ευρετήριο με τη χρήση προεπιλεγμένων ρυθμίσεων χαρτογραφικής\n"
+"(Κάντε το χειρονακτικά για να ρυθμίσετε το αποτέλεσμα)"
 
-#: ../libgimp/gimpexport.c:316
+#: ../libgimp/gimpexport.c:318
 #, c-format
-msgid "%s can only handle RGB or grayscale images"
-msgstr ""
+msgid "%s plug-in can only handle RGB or grayscale images"
+msgstr "το %s πρόσθετο μπορεί μόνο να χειριστεί RGB ή εικόνες της φαιάς κλίμακας"
 
-#: ../libgimp/gimpexport.c:325
+#: ../libgimp/gimpexport.c:327
 #, c-format
-msgid "%s can only handle RGB or indexed images"
-msgstr ""
+msgid "%s plug-in  can only handle RGB or indexed images"
+msgstr "το %s πρόσθετο μπορεί μόνο να χειριστεί RGB ή εικόνες με ευρετήριο"
 
-#: ../libgimp/gimpexport.c:335
+#: ../libgimp/gimpexport.c:337
 #, c-format
-msgid "%s can only handle grayscale or indexed images"
-msgstr ""
+msgid "%s plug-in can only handle grayscale or indexed images"
+msgstr "το %s πρόσθετο μπορεί μόνο να χειριστεί εικόνες φαιάς κλίμακας ή εικόνες με ευρετήριο"
 
-#: ../libgimp/gimpexport.c:346
-#, fuzzy, c-format
-msgid "%s needs an alpha channel"
-msgstr "απαιτεί κανάλι άλφα"
+#: ../libgimp/gimpexport.c:348
+#, c-format
+msgid "%s plug-in needs an alpha channel"
+msgstr "το %s πρόσθετο χρειάζεται ένα κανάλι άλφα"
 
-#: ../libgimp/gimpexport.c:347
-#, fuzzy
+#: ../libgimp/gimpexport.c:349
 msgid "Add Alpha Channel"
-msgstr "κανάλι άλφα"
+msgstr "Προσθήκη Καναλιού Άλφα"
 
 #
-#: ../libgimp/gimpexport.c:381
+#: ../libgimp/gimpexport.c:383
 msgid "Confirm Save"
 msgstr "Επιβεβαίωση Αποθήκευσης"
 
 #
-#: ../libgimp/gimpexport.c:387
+#: ../libgimp/gimpexport.c:389
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
-#: ../libgimp/gimpexport.c:454
+#: ../libgimp/gimpexport.c:464
 msgid "Export File"
 msgstr "Εξαγωγή Αρχείου"
 
-#: ../libgimp/gimpexport.c:458
+#: ../libgimp/gimpexport.c:468
 msgid "_Ignore"
 msgstr "_Παράβλεψη"
 
 #
-#: ../libgimp/gimpexport.c:460
+#: ../libgimp/gimpexport.c:470
 msgid "_Export"
 msgstr "_Εξαγωγή"
 
 #. the headline
-#: ../libgimp/gimpexport.c:482
+#: ../libgimp/gimpexport.c:499
 #, c-format
-msgid ""
-"Your image should be exported before it can be saved as %s for the following "
-"reasons:"
-msgstr ""
+msgid "Your image should be exported before it can be saved as %s for the following reasons:"
+msgstr "Η εικόνα σας πρέπει να εξαχθεί πριν αποθηκευτεί ως %s για τους παρακάτω λόγους:"
 
 #. the footline
-#: ../libgimp/gimpexport.c:553
+#: ../libgimp/gimpexport.c:573
 msgid "The export conversion won't modify your original image."
-msgstr ""
+msgstr "Η μετατροπή εξαγωγής δεν θα τροποποιήσει την πρωτότυπη εικόνα."
 
-#: ../libgimp/gimpexport.c:653
+#: ../libgimp/gimpexport.c:673
 #, c-format
 msgid ""
 "You are about to save a layer mask as %s.\n"
 "This will not save the visible layers."
 msgstr ""
+"Είσαστε έτοιμοι να αποθηκεύσετε ένα προσωπείο στρώσης ως %s.\n"
+"Αυτό δεν θα αποθηκεύσει τις ορατές στρώσεις."
 
-#: ../libgimp/gimpexport.c:659
+#: ../libgimp/gimpexport.c:679
 #, c-format
 msgid ""
 "You are about to save a channel (saved selection) as %s.\n"
 "This will not save the visible layers."
 msgstr ""
+"Είστε έτοιμοι να αποθηκεύσετε ένα κανάλι (αποθηκευμένη επιλογή) σαν %s.\n"
+"Αυτό δεν θα αποθηκεύσει τις ορατές στρώσεις."
 
 #
-#: ../libgimp/gimpfontmenu.c:89
+#: ../libgimp/gimpfontselectbutton.c:130
 msgid "Font Selection"
 msgstr "Επιλογή Γραμματοσειράς"
 
-#
-#: ../libgimp/gimpgradientmenu.c:104
-#, fuzzy
-msgid "Gradient Selection"
-msgstr "Επιλογή Γραμματοσειράς"
+#: ../libgimp/gimpfontselectbutton.c:145
+msgid "Sans"
+msgstr "Sans"
 
-#: ../libgimp/gimpmenu.c:406 ../libgimpwidgets/gimpintstore.c:181
+#
+#: ../libgimp/gimpgradientselectbutton.c:148
+msgid "Gradient Selection"
+msgstr "Επιλογή Διαβάθμισης"
+
+#: ../libgimp/gimpmenu.c:450
+#: ../libgimpwidgets/gimpintstore.c:239
 msgid "(Empty)"
 msgstr "(Άδειο)"
 
 #
-#: ../libgimp/gimppalettemenu.c:91
-#, fuzzy
+#: ../libgimp/gimppaletteselectbutton.c:130
 msgid "Palette Selection"
-msgstr "Επιλογή Σχεδίου"
+msgstr "Επιλογή Πυξίου"
 
 #
-#: ../libgimp/gimppatternmenu.c:113
+#: ../libgimp/gimppatternselectbutton.c:156
 msgid "Pattern Selection"
 msgstr "Επιλογή Σχεδίου"
 
+#: ../libgimp/gimpprocbrowserdialog.c:140
+msgid "by name"
+msgstr "κατά όνομα"
+
+#: ../libgimp/gimpprocbrowserdialog.c:141
+msgid "by description"
+msgstr "κατά περιγραφή"
+
+#: ../libgimp/gimpprocbrowserdialog.c:142
+msgid "by help"
+msgstr "κατά βοήθεια"
+
+#: ../libgimp/gimpprocbrowserdialog.c:143
+msgid "by author"
+msgstr "κατά συγγραφέα"
+
+#: ../libgimp/gimpprocbrowserdialog.c:144
+msgid "by copyright"
+msgstr "κατά πνευματικά δικαιώματα"
+
+#: ../libgimp/gimpprocbrowserdialog.c:145
+msgid "by date"
+msgstr "κατά ημερομηνία"
+
+#: ../libgimp/gimpprocbrowserdialog.c:146
+msgid "by type"
+msgstr "κατά τύπο"
+
+#: ../libgimp/gimpprocbrowserdialog.c:377
+msgid "Searching"
+msgstr "Αναζήτηση"
+
+#: ../libgimp/gimpprocbrowserdialog.c:388
+msgid "Searching by name"
+msgstr "Αναζήτηση κατά όνομα"
+
+#: ../libgimp/gimpprocbrowserdialog.c:409
+msgid "Searching by description"
+msgstr "Αναζήτηση κατά περιγραφή"
+
+#: ../libgimp/gimpprocbrowserdialog.c:416
+msgid "Searching by help"
+msgstr "Αναζήτηση κατά βοήθεια"
+
+#: ../libgimp/gimpprocbrowserdialog.c:423
+msgid "Searching by author"
+msgstr "Αναζήτηση κατά συγγραφέα"
+
+#: ../libgimp/gimpprocbrowserdialog.c:430
+msgid "Searching by copyright"
+msgstr "Αναζήτηση κατά πνευματικά δικαιώματα"
+
+#: ../libgimp/gimpprocbrowserdialog.c:437
+msgid "Searching by date"
+msgstr "Αναζήτηση κατά ημερομηνία"
+
+#: ../libgimp/gimpprocbrowserdialog.c:444
+msgid "Searching by type"
+msgstr "Αναζήτηση κατά τύπο"
+
+#: ../libgimp/gimpprocbrowserdialog.c:454
+#, c-format
+msgid "%d procedure"
+msgid_plural "%d procedures"
+msgstr[0] "%d διαδικασία"
+msgstr[1] "%d διαδικασίες"
+
+#: ../libgimp/gimpprocbrowserdialog.c:463
+msgid "No matches for your query"
+msgstr "Δεν βρέθηκε τίποτα για την ερώτηση σας"
+
+#: ../libgimp/gimpprocbrowserdialog.c:467
+#, c-format
+msgid "%d procedure matches your query"
+msgid_plural "%d procedures match your query"
+msgstr[0] "η %d διαδικασία ταιριάζει στην ερώτηση σας"
+msgstr[1] "οι %d διαδικασίες ταιριάζουν στην ερώτηση σας"
+
+#. count label
+#: ../libgimp/gimpprocbrowserdialog.c:516
+#: ../libgimpwidgets/gimpbrowser.c:114
+msgid "No matches"
+msgstr "Κανένα ταίριασμα"
+
+#: ../libgimp/gimpprocview.c:143
+msgid "Parameters"
+msgstr "Παράμετροι"
+
+#: ../libgimp/gimpprocview.c:156
+msgid "Return Values"
+msgstr "Τιμές Επιστροφής"
+
+#: ../libgimp/gimpprocview.c:169
+msgid "Additional Information"
+msgstr "Επιπρόσθετη Πληροφορία"
+
+#: ../libgimp/gimpprocview.c:209
+msgid "Author:"
+msgstr "Συγγραφέας:"
+
+#: ../libgimp/gimpprocview.c:221
+msgid "Date:"
+msgstr "Ημερομηνία:"
+
+#: ../libgimp/gimpprocview.c:233
+msgid "Copyright:"
+msgstr "Πνευματικά δικαιώματα:"
+
 #: ../libgimp/gimpunitcache.c:57
 msgid "percent"
 msgstr "ποσοστό"
 
 #
-#: ../libgimpbase/gimpbaseenums.c:26
-#, fuzzy
-msgid "_White (full opacity)"
-msgstr "_Λευκό (Πλήρης Αδιαφάνεια)"
-
-#: ../libgimpbase/gimpbaseenums.c:27
-#, fuzzy
-msgid "_Black (full transparency)"
-msgstr "_Μαύρο (Πλήρης Διαφάνεια)"
-
 #: ../libgimpbase/gimpbaseenums.c:28
-#, fuzzy
-msgid "Layer's _alpha channel"
-msgstr "Κανάλι _Άλφα Στρώματος"
+msgid "_White (full opacity)"
+msgstr "_Λευκό (πλήρης αδιαφάνεια)"
 
 #: ../libgimpbase/gimpbaseenums.c:29
-#, fuzzy
+msgid "_Black (full transparency)"
+msgstr "_Μαύρο (πλήρης διαφάνεια)"
+
+#: ../libgimpbase/gimpbaseenums.c:30
+msgid "Layer's _alpha channel"
+msgstr "Κανάλι _Άλφα της Στρώσης"
+
+#: ../libgimpbase/gimpbaseenums.c:31
 msgid "_Transfer layer's alpha channel"
-msgstr "Κανάλι _Άλφα Στρώματος"
+msgstr "_Μεταφορά καναλιού στρώσης άλφα"
 
 #
-#: ../libgimpbase/gimpbaseenums.c:30
+#: ../libgimpbase/gimpbaseenums.c:32
 msgid "_Selection"
 msgstr "_Επιλογή"
 
-#: ../libgimpbase/gimpbaseenums.c:31
+#: ../libgimpbase/gimpbaseenums.c:33
 msgid "_Grayscale copy of layer"
-msgstr ""
+msgstr "_Αντίγραφο φαιάς κλίμακας στρώσης"
 
-#: ../libgimpbase/gimpbaseenums.c:61
-msgid "FG to BG (RGB)"
-msgstr "FG σε BG (RGB)"
-
-#: ../libgimpbase/gimpbaseenums.c:62
-msgid "FG to BG (HSV)"
-msgstr "FG σε BG (HSV)"
-
-#: ../libgimpbase/gimpbaseenums.c:63
-#, fuzzy
-msgid "FG to transparent"
-msgstr "FG σε Διαφανές"
+#: ../libgimpbase/gimpbaseenums.c:34
+msgid "C_hannel"
+msgstr "Κ_ανάλι"
 
 #: ../libgimpbase/gimpbaseenums.c:64
-#, fuzzy
+msgid "FG to BG (RGB)"
+msgstr "Προσκήνιο σε Παρασκήνιο (RGB)"
+
+#: ../libgimpbase/gimpbaseenums.c:65
+msgid "FG to BG (HSV)"
+msgstr "Προσκήνιο σε Παρασκήνιο (HSV)"
+
+#: ../libgimpbase/gimpbaseenums.c:66
+msgid "FG to transparent"
+msgstr "Προσκήνιο σε διαφανές"
+
+#: ../libgimpbase/gimpbaseenums.c:67
 msgid "Custom gradient"
-msgstr "Προσαρμοσμένη Διαβάθμιση"
+msgstr "Προσαρμοσμένη διαβάθμιση"
 
-#: ../libgimpbase/gimpbaseenums.c:93
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:96
 msgid "FG color fill"
-msgstr "Γέμισμα Χρώματος FG"
+msgstr "Γέμισμα χρώματος Προσκηνίου"
 
-#: ../libgimpbase/gimpbaseenums.c:94
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:97
 msgid "BG color fill"
-msgstr "BG γέμισμα χρώματος"
+msgstr "Γέμισμα χρώματος Παρασκηνίου"
 
-#: ../libgimpbase/gimpbaseenums.c:95
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:98
 msgid "Pattern fill"
-msgstr "Γέμισμα με Σχέδιο"
-
-#: ../libgimpbase/gimpbaseenums.c:125
-#, fuzzy
-msgid "Add to the current selection"
-msgstr "Επιλογή Εικονιδίου"
-
-#: ../libgimpbase/gimpbaseenums.c:126
-#, fuzzy
-msgid "Subtract from the current selection"
-msgstr "Επιλογή Εικονιδίου"
-
-#
-#: ../libgimpbase/gimpbaseenums.c:127
-#, fuzzy
-msgid "Replace the current selection"
-msgstr "Κατασκευή πανομοιότυπης επιλογής"
+msgstr "Γέμισμα προπλάσματος"
 
 #: ../libgimpbase/gimpbaseenums.c:128
-#, fuzzy
-msgid "Intersect with the current selection"
-msgstr "Αντ_ιστρφή επιλογής"
+msgid "Add to the current selection"
+msgstr "Προσθήκη στη τρέχουσα επιλογή"
 
-#: ../libgimpbase/gimpbaseenums.c:160 ../libgimpwidgets/gimpcolorscales.c:168
-#: ../libgimpwidgets/gimpcolorselect.c:352
+#: ../libgimpbase/gimpbaseenums.c:129
+msgid "Subtract from the current selection"
+msgstr "Αφαίρεση από την τρέχουσα επιλογή"
+
+#
+#: ../libgimpbase/gimpbaseenums.c:130
+msgid "Replace the current selection"
+msgstr "Αντικατάσταση της τρέχουσας επιλογής"
+
+#: ../libgimpbase/gimpbaseenums.c:131
+msgid "Intersect with the current selection"
+msgstr "Διασταυρώνεται με την τρέχων επιλογή"
+
+#: ../libgimpbase/gimpbaseenums.c:163
+#: ../libgimpwidgets/gimpwidgetsenums.c:126
 msgid "Red"
 msgstr "Κόκκινο"
 
-#: ../libgimpbase/gimpbaseenums.c:161 ../libgimpwidgets/gimpcolorscales.c:169
-#: ../libgimpwidgets/gimpcolorselect.c:353
+#: ../libgimpbase/gimpbaseenums.c:164
+#: ../libgimpwidgets/gimpwidgetsenums.c:127
 msgid "Green"
 msgstr "Πράσινο"
 
-#: ../libgimpbase/gimpbaseenums.c:162 ../libgimpwidgets/gimpcolorscales.c:170
-#: ../libgimpwidgets/gimpcolorselect.c:354
+#: ../libgimpbase/gimpbaseenums.c:165
+#: ../libgimpwidgets/gimpwidgetsenums.c:128
 msgid "Blue"
-msgstr "Μπλε"
+msgstr "Κυανό"
 
-#: ../libgimpbase/gimpbaseenums.c:163
+#: ../libgimpbase/gimpbaseenums.c:166
 msgid "Gray"
-msgstr "Γκρι"
+msgstr "Φαιό"
 
-#: ../libgimpbase/gimpbaseenums.c:164 ../libgimpbase/gimpbaseenums.c:436
+#: ../libgimpbase/gimpbaseenums.c:167
+#: ../libgimpbase/gimpbaseenums.c:532
 msgid "Indexed"
 msgstr "Καταλόγου"
 
-#: ../libgimpbase/gimpbaseenums.c:165 ../libgimpwidgets/gimpcolorscales.c:171
-#: ../libgimpwidgets/gimpcolorselect.c:355
+#: ../libgimpbase/gimpbaseenums.c:168
+#: ../libgimpwidgets/gimpwidgetsenums.c:129
 msgid "Alpha"
 msgstr "Άλφα"
 
-#: ../libgimpbase/gimpbaseenums.c:194
+#: ../libgimpbase/gimpbaseenums.c:197
 msgid "Small"
 msgstr "Μικρό"
 
-#: ../libgimpbase/gimpbaseenums.c:195
+#: ../libgimpbase/gimpbaseenums.c:198
 msgid "Medium"
 msgstr "Μεσαίο"
 
-#: ../libgimpbase/gimpbaseenums.c:196
+#: ../libgimpbase/gimpbaseenums.c:199
 msgid "Large"
 msgstr "Μεγάλο"
 
-#: ../libgimpbase/gimpbaseenums.c:228
-msgid "Light Checks"
-msgstr ""
-
-#: ../libgimpbase/gimpbaseenums.c:229
-msgid "Mid-Tone Checks"
-msgstr ""
-
-#: ../libgimpbase/gimpbaseenums.c:230
-msgid "Dark Checks"
-msgstr ""
-
 #: ../libgimpbase/gimpbaseenums.c:231
-msgid "White Only"
-msgstr ""
+msgid "Light checks"
+msgstr "Έλεγχοι φωτισμού"
 
 #: ../libgimpbase/gimpbaseenums.c:232
-msgid "Gray Only"
-msgstr ""
+#| msgid "Midtones"
+msgid "Mid-tone checks"
+msgstr "έλεγχοι ενδιάμεσου τόνου"
 
 #: ../libgimpbase/gimpbaseenums.c:233
-#, fuzzy
-msgid "Black Only"
-msgstr "Μαύρο"
+msgid "Dark checks"
+msgstr "Έλεγχοι σκοταδιού"
 
-#
-#: ../libgimpbase/gimpbaseenums.c:261
-#, fuzzy
-msgid "Image source"
-msgstr "Πηγή Εικόνας"
+#: ../libgimpbase/gimpbaseenums.c:234
+msgid "White only"
+msgstr "Λευκό μόνο"
 
-#
-#: ../libgimpbase/gimpbaseenums.c:262
-#, fuzzy
-msgid "Pattern source"
-msgstr "Πηγή Σχεδίου"
+#: ../libgimpbase/gimpbaseenums.c:235
+#| msgid "Gray"
+msgid "Gray only"
+msgstr "Φαιά μόνο"
 
-#: ../libgimpbase/gimpbaseenums.c:290
+#: ../libgimpbase/gimpbaseenums.c:236
+msgid "Black only"
+msgstr "Μαύρο μόνο"
+
+#: ../libgimpbase/gimpbaseenums.c:264
+msgid "Image"
+msgstr "Εικόνα"
+
+#: ../libgimpbase/gimpbaseenums.c:265
+msgid "Pattern"
+msgstr "Πρόπλασμα"
+
+#: ../libgimpbase/gimpbaseenums.c:294
+msgid "Lightness"
+msgstr "Φωτεινότητα"
+
+#: ../libgimpbase/gimpbaseenums.c:295
+msgid "Luminosity"
+msgstr "Φωτοβολία"
+
+#: ../libgimpbase/gimpbaseenums.c:296
+msgid "Average"
+msgstr "Μέσος όρος"
+
+#: ../libgimpbase/gimpbaseenums.c:324
 msgid "Dodge"
 msgstr "Υπεκφυγή"
 
-#: ../libgimpbase/gimpbaseenums.c:291
+#: ../libgimpbase/gimpbaseenums.c:325
 msgid "Burn"
 msgstr "Κάψιμο"
 
-#: ../libgimpbase/gimpbaseenums.c:328 ../libgimpbase/gimpbaseenums.c:468
-msgid "Linear"
-msgstr "Γραμμικό"
+#: ../libgimpbase/gimpbaseenums.c:389
+msgid "gradient|Linear"
+msgstr "διαβάθμιση|Γραμμική"
 
-#: ../libgimpbase/gimpbaseenums.c:329
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:390
 msgid "Bi-linear"
-msgstr "Δι-Γραμμικό"
+msgstr "Δι-γραμμικό"
 
-#: ../libgimpbase/gimpbaseenums.c:330
+#: ../libgimpbase/gimpbaseenums.c:391
 msgid "Radial"
 msgstr "Ακτινωτό"
 
 #
-#: ../libgimpbase/gimpbaseenums.c:331
+#: ../libgimpbase/gimpbaseenums.c:392
+#: ../libgimpwidgets/gimpwidgetsenums.c:24
 msgid "Square"
 msgstr "Τετράγωνο"
 
-#: ../libgimpbase/gimpbaseenums.c:332
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:393
 msgid "Conical (sym)"
-msgstr "Κωνικός (συμμετρικά)"
+msgstr "Κωνικό (συμμετρικά)"
 
-#: ../libgimpbase/gimpbaseenums.c:333
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:394
 msgid "Conical (asym)"
-msgstr "Κωνικός (ασυμμετρικά)"
+msgstr "Κωνικό (ασυμμετρικά)"
 
-#: ../libgimpbase/gimpbaseenums.c:334
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:395
 msgid "Shaped (angular)"
-msgstr "Εκρηκτική διαμόρφωση (γωνιώδης)"
+msgstr "Σχηματισμένο (γωνιώδης)"
 
-#: ../libgimpbase/gimpbaseenums.c:335
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:396
 msgid "Shaped (spherical)"
-msgstr "Εκρηκτική διαμόρφωση (σφαιρική)"
+msgstr "Σχηματισμένο (σφαιρικό)"
 
-#: ../libgimpbase/gimpbaseenums.c:336
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:397
 msgid "Shaped (dimpled)"
-msgstr "Εκρηκτική διαμόρφωση (ρικνώδης)"
-
-#: ../libgimpbase/gimpbaseenums.c:337
-#, fuzzy
-msgid "Spiral (cw)"
-msgstr "Ελικοειδές (δεξιόστροφα)"
-
-#: ../libgimpbase/gimpbaseenums.c:338
-#, fuzzy
-msgid "Spiral (ccw)"
-msgstr "Ελικοειδές (δεξιόστροφα)"
-
-#: ../libgimpbase/gimpbaseenums.c:367
-msgid "Stock ID"
-msgstr ""
-
-#: ../libgimpbase/gimpbaseenums.c:368
-msgid "Inline pixbuf"
-msgstr ""
-
-#: ../libgimpbase/gimpbaseenums.c:369
-#, fuzzy
-msgid "Image file"
-msgstr "Μέγεθος Εικόνας"
+msgstr "Σχηματισμένο (ρικνώδης)"
 
 #: ../libgimpbase/gimpbaseenums.c:398
+msgid "Spiral (cw)"
+msgstr "Ελικοειδές (με τη φορά του ρολογιού)"
+
+#: ../libgimpbase/gimpbaseenums.c:399
+msgid "Spiral (ccw)"
+msgstr "Ελικοειδές (αντίθετα με τη φορά του ρολογιού)"
+
+#: ../libgimpbase/gimpbaseenums.c:430
+msgid "Intersections (dots)"
+msgstr "Διατομές (κουκίδες)"
+
+#: ../libgimpbase/gimpbaseenums.c:431
+msgid "Intersections (crosshairs)"
+msgstr "Διατομές (νηματοειδή)"
+
+#: ../libgimpbase/gimpbaseenums.c:432
+msgid "Dashed"
+msgstr "Διακεκομμένη"
+
+#: ../libgimpbase/gimpbaseenums.c:433
+msgid "Double dashed"
+msgstr "Διπλή διακεκομμένη"
+
+#: ../libgimpbase/gimpbaseenums.c:434
+msgid "Solid"
+msgstr "Συμπαγή"
+
+#: ../libgimpbase/gimpbaseenums.c:463
+msgid "Stock ID"
+msgstr "Αναγνωριστικό Αποθέματος"
+
+#: ../libgimpbase/gimpbaseenums.c:464
+msgid "Inline pixbuf"
+msgstr "Ενσωματωμένο pixbuf"
+
+#: ../libgimpbase/gimpbaseenums.c:465
+msgid "Image file"
+msgstr "Αρχείο εικόνας"
+
+#: ../libgimpbase/gimpbaseenums.c:494
 msgid "RGB color"
 msgstr "χρώμα RGB"
 
 #
-#: ../libgimpbase/gimpbaseenums.c:399 ../libgimpbase/gimpbaseenums.c:434
+#: ../libgimpbase/gimpbaseenums.c:495
+#: ../libgimpbase/gimpbaseenums.c:530
 msgid "Grayscale"
 msgstr "Κλίμακα του γκρι"
 
-#: ../libgimpbase/gimpbaseenums.c:400
+#: ../libgimpbase/gimpbaseenums.c:496
 msgid "Indexed color"
-msgstr ""
+msgstr "Χρώμα με ευρετήριο"
 
-#: ../libgimpbase/gimpbaseenums.c:432
+#: ../libgimpbase/gimpbaseenums.c:528
 msgid "RGB"
 msgstr "RGB"
 
-#: ../libgimpbase/gimpbaseenums.c:433
+#: ../libgimpbase/gimpbaseenums.c:529
 msgid "RGB-alpha"
-msgstr ""
+msgstr "RGB-άλφα"
 
-#: ../libgimpbase/gimpbaseenums.c:435
+#: ../libgimpbase/gimpbaseenums.c:531
 msgid "Grayscale-alpha"
-msgstr ""
+msgstr "Φαιά κλίμακα-άλφα"
 
-#: ../libgimpbase/gimpbaseenums.c:437
+#: ../libgimpbase/gimpbaseenums.c:533
 msgid "Indexed-alpha"
-msgstr ""
+msgstr "Με ευρετήριο - άλφα"
 
-#: ../libgimpbase/gimpbaseenums.c:467
-msgid "None (Fastest)"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:563
+msgid "interpolation|None"
+msgstr "παρεμβολή|Καμία"
 
-#: ../libgimpbase/gimpbaseenums.c:469
+#: ../libgimpbase/gimpbaseenums.c:564
+msgid "interpolation|Linear"
+msgstr "παρεμβολή|Γραμμική"
+
+#: ../libgimpbase/gimpbaseenums.c:565
 msgid "Cubic"
-msgstr ""
+msgstr "Κυβικό"
 
-#: ../libgimpbase/gimpbaseenums.c:470
-msgid "Lanczos (Best)"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:566
+msgid "Sinc (Lanczos3)"
+msgstr "Sinc (Lanczos3)"
 
-#: ../libgimpbase/gimpbaseenums.c:498
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:594
 msgid "Constant"
-msgstr "Αντίθεση:"
+msgstr "Σταθερά"
 
-#: ../libgimpbase/gimpbaseenums.c:499
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:595
 msgid "Incremental"
-msgstr "Ενόργανη μουσική"
+msgstr "Τμηματική"
 
-#: ../libgimpbase/gimpbaseenums.c:528
+#: ../libgimpbase/gimpbaseenums.c:624
+#: ../modules/display-filter-lcms.c:191
 msgid "None"
 msgstr "Κανένα"
 
-#: ../libgimpbase/gimpbaseenums.c:529
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:625
 msgid "Sawtooth wave"
-msgstr "Πριονωτό Κύμα"
+msgstr "Πριονωτό κύμα"
 
-#: ../libgimpbase/gimpbaseenums.c:530
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:626
 msgid "Triangular wave"
-msgstr "Τριγωνικό Κύμα"
+msgstr "Τριγωνικό κύμα"
+
+#: ../libgimpbase/gimpbaseenums.c:655
+msgid "Run interactively"
+msgstr "Εκτέλεση με αλληλεπίδραση"
+
+#: ../libgimpbase/gimpbaseenums.c:656
+msgid "Run non-interactively"
+msgstr "Εκτέλεση χωρίς αλληλεπίδραση"
+
+#: ../libgimpbase/gimpbaseenums.c:657
+msgid "Run with last used values"
+msgstr "Εκτέλεση με τιμές που χρησιμοποιήθηκαν τελευταία"
 
 #
-#: ../libgimpbase/gimpbaseenums.c:558
+#: ../libgimpbase/gimpbaseenums.c:685
 msgid "Pixels"
 msgstr "Εικονοστοιχεία"
 
-#: ../libgimpbase/gimpbaseenums.c:559
-#, fuzzy
+#: ../libgimpbase/gimpbaseenums.c:686
 msgid "Points"
-msgstr "στιγμές"
+msgstr "Στιγμές"
 
-#: ../libgimpbase/gimpbaseenums.c:588
+#: ../libgimpbase/gimpbaseenums.c:715
 msgid "Shadows"
 msgstr "Σκιές"
 
-#: ../libgimpbase/gimpbaseenums.c:589
+#: ../libgimpbase/gimpbaseenums.c:716
 msgid "Midtones"
 msgstr "Ημίτονοι"
 
-#: ../libgimpbase/gimpbaseenums.c:590
+#: ../libgimpbase/gimpbaseenums.c:717
 msgid "Highlights"
 msgstr "Υπερτόνιση"
 
-#: ../libgimpbase/gimpbaseenums.c:618
-#, fuzzy
-msgid "Forward (traditional)"
-msgstr "Εμπρός (Παραδοσιακό)"
+#: ../libgimpbase/gimpbaseenums.c:745
+msgid "Normal (Forward)"
+msgstr "Κανονικό (Εμπρόσθιο)"
 
-#: ../libgimpbase/gimpbaseenums.c:619
-#, fuzzy
-msgid "Backward (corrective)"
-msgstr "Πίσω (Διορθωτικό)"
+#: ../libgimpbase/gimpbaseenums.c:746
+msgid "Corrective (Backward)"
+msgstr "Διορθωτικό (Επιστρεφόμενο)"
 
-#: ../libgimpbase/gimpmemsize.c:177
-#, c-format
-msgid "%d Bytes"
-msgstr "%d Bytes"
+#: ../libgimpbase/gimpbaseenums.c:776
+msgid "Adjust"
+msgstr "Προσαρμογή"
 
-#: ../libgimpbase/gimpmemsize.c:182
-#, c-format
-msgid "%.2f KB"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:777
+msgid "Clip"
+msgstr "Απόκομμα"
 
-#: ../libgimpbase/gimpmemsize.c:186
-#, c-format
-msgid "%.1f KB"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:778
+msgid "Crop to result"
+msgstr "Περικοπή στο αποτέλεσμα"
 
-#: ../libgimpbase/gimpmemsize.c:190
-#, c-format
-msgid "%d KB"
-msgstr "%d KB"
+#: ../libgimpbase/gimpbaseenums.c:779
+msgid "Crop with aspect"
+msgstr "Περικοπή με αναλογία"
 
-#: ../libgimpbase/gimpmemsize.c:197
-#, c-format
-msgid "%.2f MB"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:909
+msgid "Internal GIMP procedure"
+msgstr "Εσωτερική διαδικασία GIMP"
 
-#: ../libgimpbase/gimpmemsize.c:201
-#, c-format
-msgid "%.1f MB"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:910
+msgid "GIMP Plug-In"
+msgstr "Πρόσθετο GIMP"
 
-#: ../libgimpbase/gimpmemsize.c:205
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
+#: ../libgimpbase/gimpbaseenums.c:911
+msgid "GIMP Extension"
+msgstr "Επέκταση GIMP"
 
-#: ../libgimpbase/gimpmemsize.c:212
-#, c-format
-msgid "%.2f GB"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:912
+msgid "Temporary Procedure"
+msgstr "Προσωρινή Διαδικασία"
 
-#: ../libgimpbase/gimpmemsize.c:216
-#, c-format
-msgid "%.1f GB"
-msgstr ""
+#: ../libgimpbase/gimpbaseenums.c:1074
+msgid "From left to right"
+msgstr "Από αριστερά στα δεξιά"
 
-#: ../libgimpbase/gimpmemsize.c:220
-#, c-format
-msgid "%d GB"
-msgstr "%d GB"
+#: ../libgimpbase/gimpbaseenums.c:1075
+msgid "From right to left"
+msgstr "Από δεξιά στα αριστερά"
 
-#: ../libgimpbase/gimputils.c:169 ../libgimpbase/gimputils.c:174
+#: ../libgimpbase/gimpbaseenums.c:1105
+msgid "Left justified"
+msgstr "Αριστερή πλήρη στοίχιση"
+
+#: ../libgimpbase/gimpbaseenums.c:1106
+msgid "Right justified"
+msgstr "Δεξιά πλήρη στοίχιση"
+
+#: ../libgimpbase/gimpbaseenums.c:1107
+msgid "Centered"
+msgstr "Κεντροποιημένο"
+
+#: ../libgimpbase/gimpbaseenums.c:1108
+msgid "Filled"
+msgstr "Γεμάτο"
+
+#: ../libgimpbase/gimputils.c:170
+#: ../libgimpbase/gimputils.c:175
+#: ../modules/display-filter-lcms.c:183
+#: ../modules/color-selector-cmyk-lcms.c:407
+#: ../modules/color-selector-cmyk-lcms.c:413
 msgid "(invalid UTF-8 string)"
-msgstr ""
+msgstr "(μη έγκυρη UTF-8 συμβολοσειρά)"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:95
+#: ../libgimpconfig/gimpcolorconfig.c:42
+msgid "Mode of operation for color management."
+msgstr "Κατάσταση λειτουργίας για διαχείριση χρώματος."
+
+#: ../libgimpconfig/gimpcolorconfig.c:44
+msgid "The color profile of your (primary) monitor."
+msgstr "Η κατατομή χρώματος της (πρωτεύων) σας οθόνης."
+
+#: ../libgimpconfig/gimpcolorconfig.c:46
+msgid "When enabled, GIMP will try to use the display color profile from the windowing system.  The configured monitor profile is then only used as a fallback."
+msgstr "Όταν είναι ενεργό, το GIMP θα προσπαθήσει να εμφανίσει κατατομή χρώματος από το παραθυρικό σύστημα. Η κατατομή της ρυθμισμένης οθόνης χρησιμοποιείται τότε μόνο ως επιστροφή."
+
+#: ../libgimpconfig/gimpcolorconfig.c:50
+msgid "The default RGB working space color profile."
+msgstr "Ο προεπιλεγμένος χώρος εργασίας RGB κατατομής χρώματος."
+
+#: ../libgimpconfig/gimpcolorconfig.c:52
+msgid "The CMYK color profile used to convert between RGB and CMYK."
+msgstr "Η κατατομή χρώματος CMYK χρησιμοποιήθηκε μεταξύ RGB και CMYK."
+
+#: ../libgimpconfig/gimpcolorconfig.c:54
+msgid "The color profile used for simulating a printed version (softproof)."
+msgstr "Η κατατομή χρώματος που χρησιμοποιήθηκε για την εξομοίωση μίας έντυπης έκδοσης (έντυπο δοκίμιο)."
+
+#: ../libgimpconfig/gimpcolorconfig.c:56
+msgid "Sets how colors are mapped for your display."
+msgstr "Θέτει πως τα χρώματα χαρτογραφούνται για την οθόνη σας."
+
+#: ../libgimpconfig/gimpcolorconfig.c:58
+msgid "Sets how colors are converted from RGB working space to the print simulation device."
+msgstr "Θέτει πως τα χρώματα μετατρέπονται από το χώρο εργασίας RGB στην συσκευή εξομοίωσης εκτύπωσης."
+
+#: ../libgimpconfig/gimpcolorconfig.c:61
+msgid "When enabled, the print simulation will mark colors which can not be represented in the target color space."
+msgstr "Όταν είναι ενεργό, ο εξομοιωτής εκτύπωσης θα σημειώσει χρώματα που δεν μπορούν να αναπαρασταθούν στο στόχο του χώρου χρώματος."
+
+#: ../libgimpconfig/gimpcolorconfig.c:64
+msgid "The color to use for marking colors which are out of gamut."
+msgstr "Το χρώμα προς χρήση για να σημειώνετε χρώματα που είναι έξω από τη χρωματική κλίμακα."
+
+#: ../libgimpconfig/gimpcolorconfig-enums.c:24
+msgid "No color management"
+msgstr "Καμία διαχείριση χρώματος"
+
+#: ../libgimpconfig/gimpcolorconfig-enums.c:25
+msgid "Color managed display"
+msgstr "Οθόνη διαχείρισης χρώματος"
+
+#: ../libgimpconfig/gimpcolorconfig-enums.c:26
+msgid "Print simulation"
+msgstr "Εξομοίωση εκτύπωσης"
+
+#: ../libgimpconfig/gimpcolorconfig-enums.c:56
+msgid "Perceptual"
+msgstr "Συγκεκριμένο"
+
+#: ../libgimpconfig/gimpcolorconfig-enums.c:57
+msgid "Relative colorimetric"
+msgstr "Σχετική μέτρηση χρώματος"
+
+#: ../libgimpconfig/gimpcolorconfig-enums.c:58
+#| msgid "Saturation"
+msgid "intent|Saturation"
+msgstr "στόχος|Κορεσμός"
+
+#: ../libgimpconfig/gimpcolorconfig-enums.c:59
+msgid "Absolute colorimetric"
+msgstr "Απόλυτη μέτρηση χρώματος"
+
+#: ../libgimpconfig/gimpconfig-deserialize.c:97
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "η τιμή για την παράμετρο %s δεν είναι έγκυρη συμβολοσειρά UTF-8"
 
 #. please don't translate 'yes' and 'no'
-#: ../libgimpconfig/gimpconfig-deserialize.c:423
+#: ../libgimpconfig/gimpconfig-deserialize.c:436
 #, c-format
 msgid "expected 'yes' or 'no' for boolean token %s, got '%s'"
 msgstr "ενώ αναμενόταν 'yes' ή 'no' για λογική παράμετρο %s, βρέθηκε '%s'"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:497
+#: ../libgimpconfig/gimpconfig-deserialize.c:510
 #, c-format
 msgid "invalid value '%s' for token %s"
 msgstr "άκυρη τιμή '%s' για την παράμετρο %s"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:512
+#: ../libgimpconfig/gimpconfig-deserialize.c:525
 #, c-format
 msgid "invalid value '%ld' for token %s"
 msgstr "άκυρη τιμή '%ld' για την παράμετρο %s"
 
-#: ../libgimpconfig/gimpconfig-deserialize.c:581
+#: ../libgimpconfig/gimpconfig-deserialize.c:594
 #, c-format
 msgid "while parsing token '%s': %s"
 msgstr "κατά την επεξεργασία της παραμέτρου '%s': %s"
 
-#: ../libgimpconfig/gimpconfig-iface.c:454
-#: ../libgimpconfig/gimpconfig-iface.c:467 ../libgimpconfig/gimpscanner.c:513
-#: ../libgimpconfig/gimpscanner.c:594
+#: ../libgimpconfig/gimpconfig-iface.c:474
+#: ../libgimpconfig/gimpconfig-iface.c:487
+#: ../libgimpconfig/gimpscanner.c:498
+#: ../libgimpconfig/gimpscanner.c:579
+#: ../libgimpwidgets/gimpcolorprofilestore.c:656
 msgid "fatal parse error"
 msgstr "μοιραίο συντακτικό σφάλμα"
 
-#: ../libgimpconfig/gimpconfig-path.c:349
+#: ../libgimpconfig/gimpconfig-path.c:377
 #, c-format
 msgid "Cannot expand ${%s}"
 msgstr "Αδυναμία ανάπτυξης του ${%s}"
 
-#: ../libgimpconfig/gimpconfigwriter.c:134
-#, fuzzy, c-format
+#: ../libgimpconfig/gimpconfigwriter.c:78
+#: ../libgimpconfig/gimpconfigwriter.c:718
+#, c-format
+msgid "Error writing to '%s': %s"
+msgstr "Σφάλμα κατά την εγγραφή στο '%s': %s"
+
+#: ../libgimpconfig/gimpconfigwriter.c:136
+#, c-format
 msgid "Could not create temporary file for '%s': %s"
 msgstr "Αδυναμία δημιουργίας του προσωρινού αρχείου για '%s': %s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:147
-#, fuzzy, c-format
+#: ../libgimpconfig/gimpconfigwriter.c:149
+#, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Αδυναμία ανοίγματος του '%s' για εγγραφή: %s"
 
 #
-#: ../libgimpconfig/gimpconfigwriter.c:666
-#, fuzzy, c-format
+#: ../libgimpconfig/gimpconfigwriter.c:679
+#: ../libgimpconfig/gimpconfigwriter.c:699
+#, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
 "The original file has not been touched."
@@ -667,7 +927,7 @@ msgstr ""
 "Το πρωτότυπο αρχείο δεν πειράχτηκε."
 
 #
-#: ../libgimpconfig/gimpconfigwriter.c:674
+#: ../libgimpconfig/gimpconfigwriter.c:707
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -676,478 +936,981 @@ msgstr ""
 "Σφάλμα κατά την εγγραφή στο προσωρινό αρχείο για το '%s': %s\n"
 "Δεν δημιουργήθηκε κανένα αρχείο."
 
-#: ../libgimpconfig/gimpconfigwriter.c:685
-#, c-format
-msgid "Error writing to '%s': %s"
-msgstr "Σφάλμα κατά την εγγραφή στο '%s': %s"
-
-#: ../libgimpconfig/gimpconfigwriter.c:703
+#: ../libgimpconfig/gimpconfigwriter.c:731
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr "Αδυναμία δημιουργίας του '%s': %s"
 
-#: ../libgimpconfig/gimpscanner.c:100
-#, c-format
-msgid "Could not open '%s' for reading: %s"
-msgstr "Αδυναμία ανοίγματος του '%s' για ανάγνωση: %s"
-
 #
-#: ../libgimpconfig/gimpscanner.c:270
+#: ../libgimpconfig/gimpscanner.c:255
+#, c-format
 msgid "invalid UTF-8 string"
 msgstr "μη αποδεκτή συμβολοσειρά UTF-8"
 
-#: ../libgimpconfig/gimpscanner.c:621
+#: ../libgimpconfig/gimpscanner.c:606
 #, c-format
 msgid "Error while parsing '%s' in line %d: %s"
 msgstr "Σφάλμα κατά την επεξεργασία του όρου '%s' στη γραμμή %d: %s"
 
-#: ../libgimpmodule/gimpmodule.c:177
-#, c-format
-msgid "Loading module: '%s'\n"
-msgstr ""
-
-#: ../libgimpmodule/gimpmodule.c:193 ../libgimpmodule/gimpmodule.c:212
-#: ../libgimpmodule/gimpmodule.c:326 ../libgimpmodule/gimpmodule.c:354
-#: ../libgimpmodule/gimpmodule.c:478
+#: ../libgimpmodule/gimpmodule.c:153
+#: ../libgimpmodule/gimpmodule.c:171
+#: ../libgimpmodule/gimpmodule.c:280
+#: ../libgimpmodule/gimpmodule.c:307
+#: ../libgimpmodule/gimpmodule.c:418
 #, c-format
 msgid "Module '%s' load error: %s"
-msgstr ""
+msgstr "Άρθρωμα '%s' σφάλμα φόρτωσης: %s"
 
-#: ../libgimpmodule/gimpmodule.c:282
-#, c-format
-msgid "Skipping module: '%s'\n"
-msgstr ""
-
-#: ../libgimpmodule/gimpmodule.c:422
+#: ../libgimpmodule/gimpmodule.c:375
 msgid "Module error"
-msgstr ""
+msgstr "Σφάλμα αρθρώματος"
 
-#: ../libgimpmodule/gimpmodule.c:423
+#: ../libgimpmodule/gimpmodule.c:376
 msgid "Loaded"
-msgstr ""
+msgstr "Φορτώθηκε"
 
-#: ../libgimpmodule/gimpmodule.c:424
+#: ../libgimpmodule/gimpmodule.c:377
 msgid "Load failed"
-msgstr ""
+msgstr "Αποτυχία φόρτωσης"
 
-#: ../libgimpmodule/gimpmodule.c:425
+#: ../libgimpmodule/gimpmodule.c:378
 msgid "Not loaded"
-msgstr ""
+msgstr "Δεν φορτώθηκε"
 
-#: ../libgimpthumb/gimpthumb-utils.c:227 ../libgimpthumb/gimpthumb-utils.c:295
+#: ../libgimpthumb/gimpthumb-utils.c:123
+#, c-format
+msgid ""
+"Cannot determine a valid home directory.\n"
+"Thumbnails will be stored in the folder for temporary files (%s) instead."
+msgstr ""
+"Δεν μπορεί να καθορίσει ένα έγκυρο αρχικό κατάλογο.\n"
+"Οι μικρογραφίες θα αποθηκευτούν στο φάκελο για προσωρινά αρχεία (%s) στη θέση του. "
+
+#: ../libgimpthumb/gimpthumb-utils.c:247
+#: ../libgimpthumb/gimpthumb-utils.c:315
 #, c-format
 msgid "Failed to create thumbnail folder '%s'."
-msgstr ""
+msgstr "Αποτυχία δημιουργίας φακέλου μικρογραφίας '%s'."
 
-#: ../libgimpthumb/gimpthumbnail.c:919
+#: ../libgimpthumb/gimpthumbnail.c:498
+#, c-format
+msgid "Thumbnail contains no Thumb::URI tag"
+msgstr "Η μικρογραφία δεν περιέχει πινακίδιο Thumb::URI"
+
+#: ../libgimpthumb/gimpthumbnail.c:898
 #, c-format
 msgid "Could not create thumbnail for %s: %s"
-msgstr ""
+msgstr "Δεν είναι δυνατή η δημιουργία μικρογραφίας για %s: %s"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:99
-#, fuzzy
+#: ../libgimpwidgets/gimpbrowser.c:98
+msgid "_Search:"
+msgstr "_Αναζήτηση:"
+
+#: ../libgimpwidgets/gimpcolorbutton.c:118
 msgid "_Foreground Color"
-msgstr "Καθορισμός χρώματος κειμένου"
+msgstr "_Χρώμα Προσκηνίου"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:103
-#, fuzzy
+#: ../libgimpwidgets/gimpcolorbutton.c:122
 msgid "_Background Color"
-msgstr "Καθορισμός χρώματος φόντου"
+msgstr "_Χρώμα Παρασκηνίου"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:107
-#, fuzzy
+#: ../libgimpwidgets/gimpcolorbutton.c:126
 msgid "Blac_k"
-msgstr "/_Μαύρο"
+msgstr "_Μαύρο"
 
-#: ../libgimpwidgets/gimpcolorbutton.c:111
-#, fuzzy
+#: ../libgimpwidgets/gimpcolorbutton.c:130
 msgid "_White"
-msgstr "/_Λευκό"
+msgstr "_Λευκό"
 
-#: ../libgimpwidgets/gimpcolorscales.c:133
+#: ../libgimpwidgets/gimpcolorprofilestore.c:144
+msgid "Select color profile from disk..."
+msgstr "Επιλέξτε κατατομή χρώματος από το δίσκο..."
+
+#: ../libgimpwidgets/gimpcolorprofilestore.c:280
+#| msgid "None"
+msgctxt "profile"
+msgid "None"
+msgstr "Κανένα"
+
+#: ../libgimpwidgets/gimpcolorscales.c:98
 msgid "Scales"
-msgstr ""
+msgstr "Κλίμακες"
 
-#: ../libgimpwidgets/gimpcolorscales.c:155
-#: ../libgimpwidgets/gimpcolorselect.c:345
-msgid "_H"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorscales.c:156
-#: ../libgimpwidgets/gimpcolorselect.c:345
-msgid "_S"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorscales.c:157
-#: ../libgimpwidgets/gimpcolorselect.c:345
-msgid "_V"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorscales.c:158
-#: ../libgimpwidgets/gimpcolorselect.c:345
-msgid "_R"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorscales.c:159
-#: ../libgimpwidgets/gimpcolorselect.c:345
-msgid "_G"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorscales.c:160
-#: ../libgimpwidgets/gimpcolorselect.c:345
-msgid "_B"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorscales.c:161
-msgid "_A"
-msgstr ""
-
-#
-#: ../libgimpwidgets/gimpcolorscales.c:165
-#: ../libgimpwidgets/gimpcolorselect.c:349
-msgid "Hue"
-msgstr "Απόχρωση"
-
-#: ../libgimpwidgets/gimpcolorscales.c:166
-#: ../libgimpwidgets/gimpcolorselect.c:350 ../modules/cdisplay_proof.c:59
-msgid "Saturation"
-msgstr "Κορεσμός"
-
-#: ../libgimpwidgets/gimpcolorscales.c:167
-#: ../libgimpwidgets/gimpcolorselect.c:351
-msgid "Value"
-msgstr "Τιμή"
-
-#: ../libgimpwidgets/gimpcolorscales.c:243
-msgid "Hexadecimal color notation as used in HTML and CSS"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorscales.c:248
-msgid "HTML _Notation:"
-msgstr ""
-
-#: ../libgimpwidgets/gimpcolorselection.c:203
+#: ../libgimpwidgets/gimpcolorselection.c:210
 msgid "Current:"
-msgstr ""
+msgstr "Τρέχων:"
 
-#: ../libgimpwidgets/gimpcolorselection.c:225
+#: ../libgimpwidgets/gimpcolorselection.c:232
 msgid "Old:"
-msgstr ""
+msgstr "Παλαιό:"
+
+#: ../libgimpwidgets/gimpcolorselection.c:286
+msgid "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts CSS color names."
+msgstr "Δεκαεξαδική σημείωση χρώματος όπως χρησιμοποιήθηκε σε HTML και CSS. Αυτή η εισαγωγή επίσης δέχεται CSS ονόματα χρώματος."
+
+#: ../libgimpwidgets/gimpcolorselection.c:292
+msgid "HTML _notation:"
+msgstr "_σημείωση HTML:"
+
+#: ../libgimpwidgets/gimphelpui.c:420
+msgid "Press F1 for more help"
+msgstr "Πατήστε F1 για περισσότερη βοήθεια"
+
+#: ../libgimpwidgets/gimpfileentry.c:174
+msgid "Open a file selector to browse your folders"
+msgstr "Ανοίξτε ένα επιλογέα αρχείου για να αναζητήσετε τους φακέλους σας"
+
+#: ../libgimpwidgets/gimpfileentry.c:175
+msgid "Open a file selector to browse your files"
+msgstr "Ανοίξτε ένα επιλογέα αρχείο για να αναζητήσετε τα αρχεία σας"
 
 #
-#: ../libgimpwidgets/gimpfileentry.c:351
+#: ../libgimpwidgets/gimpfileentry.c:335
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
 
 #
-#: ../libgimpwidgets/gimpfileentry.c:353
+#: ../libgimpwidgets/gimpfileentry.c:337
 msgid "Select File"
 msgstr "Επιλογή Αρχείου"
 
-#: ../libgimpwidgets/gimpmemsizeentry.c:232
-#, fuzzy
+#: ../libgimpwidgets/gimpmemsizeentry.c:204
 msgid "Kilobytes"
-msgstr "KiloBytes"
+msgstr "Kilobytes"
 
-#: ../libgimpwidgets/gimpmemsizeentry.c:233
-#, fuzzy
+#: ../libgimpwidgets/gimpmemsizeentry.c:205
 msgid "Megabytes"
-msgstr "MegaBytes"
+msgstr "Megabytes"
 
-#: ../libgimpwidgets/gimpmemsizeentry.c:234
-#, fuzzy
+#: ../libgimpwidgets/gimpmemsizeentry.c:206
 msgid "Gigabytes"
-msgstr "GigaBytes"
+msgstr "Gigabytes"
 
-#: ../libgimpwidgets/gimppatheditor.c:243
-#, fuzzy
-msgid "Writable"
-msgstr "Τρίγωνο"
+#. Count label
+#: ../libgimpwidgets/gimppageselector.c:269
+#: ../libgimpwidgets/gimppageselector.c:1166
+msgid "Nothing selected"
+msgstr "Καμία επιλογή"
 
 #
-#: ../libgimpwidgets/gimppatheditor.c:252
+#: ../libgimpwidgets/gimppageselector.c:287
+#| msgid "Select File"
+msgid "Select _All"
+msgstr "Επιλογή  _Όλων"
+
+#
+#: ../libgimpwidgets/gimppageselector.c:307
+#| msgid "Select File"
+msgid "Select _range:"
+msgstr "Επιλογή _εύρους:"
+
+#: ../libgimpwidgets/gimppageselector.c:319
+msgid "Open _pages as"
+msgstr "Άνοιγμα _σελίδας ως"
+
+#: ../libgimpwidgets/gimppageselector.c:420
+msgid "Page 000"
+msgstr "Σελίδα 000"
+
+#: ../libgimpwidgets/gimppageselector.c:508
+#: ../libgimpwidgets/gimppageselector.c:744
+#, c-format
+msgid "Page %d"
+msgstr "Σελίδα %d"
+
+#: ../libgimpwidgets/gimppageselector.c:1171
+msgid "One page selected"
+msgstr "Μία σελίδα επιλέχτηκε"
+
+#: ../libgimpwidgets/gimppageselector.c:1178
+#: ../libgimpwidgets/gimppageselector.c:1182
+#, c-format
+msgid "%d page selected"
+msgid_plural "All %d pages selected"
+msgstr[0] "%d επιλεγμένη σελίδα"
+msgstr[1] "Όλες οι %d σελίδες επιλέχτηκαν"
+
+#: ../libgimpwidgets/gimppatheditor.c:214
+msgid "Writable"
+msgstr "Εγγράψιμο"
+
+#
+#: ../libgimpwidgets/gimppatheditor.c:223
 msgid "Folder"
-msgstr "Φακέλος"
+msgstr "Φάκελος"
 
-#: ../libgimpwidgets/gimppickbutton.c:138
-msgid ""
-"Click the eyedropper, then click a color anywhere on your screen to select "
-"that color."
-msgstr ""
+#: ../libgimpwidgets/gimppickbutton.c:107
+msgid "Click the eyedropper, then click a color anywhere on your screen to select that color."
+msgstr "Κάντε κλικ στο σταγονόμετρο, μετά κάντε κλικ σε ένα χρώμα οπουδήποτε στην οθόνη σας για να επιλέξετε αυτό το χρώμα."
 
-#: ../libgimpwidgets/gimppreviewarea.c:126
+#: ../libgimpwidgets/gimppreviewarea.c:94
 msgid "Check Size"
-msgstr ""
+msgstr "Έλεγχος μεγέθους"
 
-#: ../libgimpwidgets/gimppreviewarea.c:133
+#: ../libgimpwidgets/gimppreviewarea.c:101
 msgid "Check Style"
-msgstr ""
+msgstr "Έλεγχος τεχνοτροπίας"
 
-#. toggle button to (des)activate the instant preview
-#: ../libgimpwidgets/gimppreview.c:240
+#. toggle button to (de)activate the instant preview
+#: ../libgimpwidgets/gimppreview.c:277
 msgid "_Preview"
 msgstr "_Προεπισκόπηση"
 
-#: ../libgimpwidgets/gimpstock.c:113
-#, fuzzy
+#: ../libgimpwidgets/gimppropwidgets.c:1860
+#, c-format
+msgid "This text input field is limited to %d character."
+msgid_plural "This text input field is limited to %d characters."
+msgstr[0] "Αυτό το πεδίο εισαγωγής κειμένου περιορίζεται σε %d χαρακτήρα. "
+msgstr[1] "Αυτό το πεδίο εισαγωγής κειμένου περιορίζεται σε %d χαρακτήρες. "
+
+#: ../libgimpwidgets/gimpstock.c:112
 msgid "Anchor"
-msgstr "ίντσα"
+msgstr "Άγκυρα"
+
+#: ../libgimpwidgets/gimpstock.c:113
+msgid "C_enter"
+msgstr "Κ_έντρο"
 
 #: ../libgimpwidgets/gimpstock.c:114
-msgid "C_enter"
-msgstr ""
-
-#: ../libgimpwidgets/gimpstock.c:115
 msgid "_Duplicate"
 msgstr "_Δημιουργία αντιγράφου"
 
-#: ../libgimpwidgets/gimpstock.c:116
+#: ../libgimpwidgets/gimpstock.c:115
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: ../libgimpwidgets/gimpstock.c:117
+#: ../libgimpwidgets/gimpstock.c:116
 msgid "Linked"
-msgstr ""
+msgstr "Συνδεμένο"
+
+#: ../libgimpwidgets/gimpstock.c:117
+msgid "Paste as New"
+msgstr "Επικόλληση σαν Νέο"
 
 #: ../libgimpwidgets/gimpstock.c:118
-msgid "Paste as New"
-msgstr ""
+msgid "Paste Into"
+msgstr "Επικόλληση Εντός"
 
 #: ../libgimpwidgets/gimpstock.c:119
-msgid "Paste Into"
-msgstr ""
+msgid "_Reset"
+msgstr "_Επαναφορά"
 
 #: ../libgimpwidgets/gimpstock.c:120
-msgid "_Reset"
-msgstr ""
-
-#: ../libgimpwidgets/gimpstock.c:121
 msgid "Visible"
 msgstr "Ορατό"
 
-#: ../libgimpwidgets/gimpstock.c:154 ../libgimpwidgets/gimpstock.c:158
+#: ../libgimpwidgets/gimpstock.c:156
+#: ../libgimpwidgets/gimpstock.c:160
 msgid "_Stroke"
-msgstr ""
+msgstr "_Μολυβιά"
 
-#: ../libgimpwidgets/gimpstock.c:170
+#: ../libgimpwidgets/gimpstock.c:172
 msgid "L_etter Spacing"
-msgstr ""
+msgstr "Απόσταση Γρα_μμάτων"
 
-#: ../libgimpwidgets/gimpstock.c:171
+#: ../libgimpwidgets/gimpstock.c:173
 msgid "L_ine Spacing"
-msgstr ""
+msgstr "Απόσταση Γραμμ_ής"
 
-#: ../libgimpwidgets/gimpstock.c:187
+#: ../libgimpwidgets/gimpstock.c:189
 msgid "_Resize"
-msgstr ""
+msgstr "_Μετασχηματισμός"
 
-#: ../libgimpwidgets/gimpstock.c:188 ../libgimpwidgets/gimpstock.c:292
+#: ../libgimpwidgets/gimpstock.c:190
+#: ../libgimpwidgets/gimpstock.c:320
 msgid "_Scale"
-msgstr ""
+msgstr "_Κλίμακα"
 
 #
-#: ../libgimpwidgets/gimpstock.c:271
-msgid "Crop"
-msgstr "Κόψιμο"
+#: ../libgimpwidgets/gimpstock.c:296
+#| msgid "Crop"
+msgid "Cr_op"
+msgstr "Κό_ψιμο"
 
-#: ../libgimpwidgets/gimpstock.c:288
+#: ../libgimpwidgets/gimpstock.c:315
 msgid "_Transform"
-msgstr ""
+msgstr "_Μεταμόρφωση"
 
-#: ../libgimpwidgets/gimpstock.c:291
+#: ../libgimpwidgets/gimpstock.c:319
 msgid "_Rotate"
-msgstr ""
+msgstr "_Περιστροφή"
 
-#: ../libgimpwidgets/gimpstock.c:293
+#: ../libgimpwidgets/gimpstock.c:321
 msgid "_Shear"
-msgstr ""
+msgstr "_Περικοπή"
 
 #
-#: ../libgimpwidgets/gimpunitmenu.c:302
+#: ../libgimpwidgets/gimpunitmenu.c:266
 msgid "More..."
 msgstr "Περισσότερα..."
 
 #
-#: ../libgimpwidgets/gimpunitmenu.c:612
-#, fuzzy
+#: ../libgimpwidgets/gimpunitmenu.c:581
 msgid "Unit Selection"
-msgstr "Επιλογή Γραμματοσειράς"
+msgstr "Επιλογή Μονάδας"
 
-#: ../libgimpwidgets/gimpunitmenu.c:655
+#: ../libgimpwidgets/gimpunitmenu.c:629
 msgid "Unit"
 msgstr "Μονάδα"
 
-#: ../libgimpwidgets/gimpunitmenu.c:659
+#: ../libgimpwidgets/gimpunitmenu.c:633
 msgid "Factor"
 msgstr "Συντελεστής"
 
-#: ../libgimpwidgets/gimpwidgets.c:1001
-msgid ""
-"Use this value for random number generator seed - this allows you to repeat "
-"a given \"random\" operation"
-msgstr ""
+#: ../libgimpwidgets/gimpwidgets.c:511
+msgid "Use this value for random number generator seed - this allows you to repeat a given \"random\" operation"
+msgstr "Χρησιμοποιήστε αυτή τη τιμή για τη δημιουργία τυχαίου αριθμού σπόρου -αυτό επιτρέπει να επαναλάβεται μία δοσμένη \"τυχαία\" λειτουργία"
 
-#: ../libgimpwidgets/gimpwidgets.c:1005
+#: ../libgimpwidgets/gimpwidgets.c:515
 msgid "_New Seed"
-msgstr ""
+msgstr "_Νέος σπόρος"
 
-#: ../libgimpwidgets/gimpwidgets.c:1018
+#: ../libgimpwidgets/gimpwidgets.c:528
 msgid "Seed random number generator with a generated random number"
-msgstr ""
+msgstr "Ο γεννήτορας τυχαίου αριθμού σπόρου με ένα δημιουργημένο τυχαίο αριθμό"
 
-#: ../libgimpwidgets/gimpwidgets.c:1022
+#: ../libgimpwidgets/gimpwidgets.c:532
 msgid "_Randomize"
-msgstr ""
+msgstr "_Τυχαία σειρά"
 
-#: ../modules/cdisplay_colorblind.c:68
-msgid "Protanopia (insensitivity to red"
-msgstr ""
+#: ../libgimpwidgets/gimpwidgetsenums.c:25
+#| msgid "Contrast"
+msgid "Portrait"
+msgstr "Κατακόρυφο"
 
-#: ../modules/cdisplay_colorblind.c:70
+#: ../libgimpwidgets/gimpwidgetsenums.c:26
+msgid "Landscape"
+msgstr "Οριζόντιο"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:123
+msgid "_H"
+msgstr "_H"
+
+#
+#: ../libgimpwidgets/gimpwidgetsenums.c:123
+msgid "Hue"
+msgstr "Απόχρωση"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:124
+msgid "_S"
+msgstr "_S"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:124
+msgid "Saturation"
+msgstr "Κορεσμός"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:125
+msgid "_V"
+msgstr "_V"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:125
+msgid "Value"
+msgstr "Τιμή"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:126
+msgid "_R"
+msgstr "_R"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:127
+msgid "_G"
+msgstr "_G"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:128
+msgid "_B"
+msgstr "_B"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:129
+msgid "_A"
+msgstr "_A"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:157
+msgid "Layers"
+msgstr "Στρώσεις"
+
+#
+#: ../libgimpwidgets/gimpwidgetsenums.c:158
+msgid "Images"
+msgstr "Εικόνες"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:217
+msgid "Zoom in"
+msgstr "Μεγέθυνση"
+
+#: ../libgimpwidgets/gimpwidgetsenums.c:218
+msgid "Zoom out"
+msgstr "Σμίκρυνση"
+
+#: ../modules/display-filter-color-blind.c:67
+msgid "Protanopia (insensitivity to red)"
+msgstr "Protanopia (ευαισθησία στο κόκκινο)"
+
+#: ../modules/display-filter-color-blind.c:69
 msgid "Deuteranopia (insensitivity to green)"
-msgstr ""
+msgstr "Deuteranopia (ευαισθησία στο πράσινο)"
 
-#: ../modules/cdisplay_colorblind.c:72
+#: ../modules/display-filter-color-blind.c:71
 msgid "Tritanopia (insensitivity to blue)"
-msgstr ""
+msgstr "Tritanopia (ευαισθησία στο κυανό)"
 
-#: ../modules/cdisplay_colorblind.c:163
+#: ../modules/display-filter-color-blind.c:198
 msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
-msgstr ""
+msgstr "Φίλτρο εξομοίωσης ελλείμματος χρώματος (Brettel-Vienot-Mollon αλγόριθμος)"
 
-#: ../modules/cdisplay_colorblind.c:256
+#: ../modules/display-filter-color-blind.c:261
 msgid "Color Deficient Vision"
-msgstr ""
+msgstr "Ατελή Όψη Χρώματος"
 
-#: ../modules/cdisplay_colorblind.c:554
-msgid "Color _Deficiency Type:"
-msgstr ""
+#: ../modules/display-filter-color-blind.c:483
+msgid "Color _deficiency type:"
+msgstr "Τύπος ανεπάρκειας χρώματος:"
 
-#: ../modules/cdisplay_gamma.c:105
+#: ../modules/display-filter-gamma.c:90
 msgid "Gamma color display filter"
-msgstr ""
+msgstr "Φίλτρο έγχρωμης οθόνης Γάμμα"
 
-#: ../modules/cdisplay_gamma.c:178
+#: ../modules/display-filter-gamma.c:129
 msgid "Gamma"
-msgstr ""
+msgstr "Γάμμα"
 
-#: ../modules/cdisplay_gamma.c:352
+#: ../modules/display-filter-gamma.c:232
 msgid "_Gamma:"
-msgstr ""
+msgstr "_Γάμμα:"
 
-#: ../modules/cdisplay_highcontrast.c:105
+#: ../modules/display-filter-high-contrast.c:90
 msgid "High Contrast color display filter"
-msgstr ""
+msgstr "Φίλτρο οθόνης χρώματος Υψηλής Αντίθεσης"
 
-#: ../modules/cdisplay_highcontrast.c:178
+#: ../modules/display-filter-high-contrast.c:129
 msgid "Contrast"
 msgstr "Αντίθεση"
 
-#: ../modules/cdisplay_highcontrast.c:352
-#, fuzzy
-msgid "Contrast C_ycles:"
-msgstr "Αντίθεση"
+#: ../modules/display-filter-high-contrast.c:232
+msgid "Contrast c_ycles:"
+msgstr "Σταθεροί κύ_κλοι:"
 
-#: ../modules/cdisplay_proof.c:57
-msgid "Perceptual"
-msgstr ""
+#: ../modules/display-filter-lcms.c:102
+msgid "Color management display filter using ICC color profiles"
+msgstr "Φίλτρο οθόνης διαχείρισης χρώματος με τη χρήση ICC κατατομών χρώματος"
 
-#: ../modules/cdisplay_proof.c:58
-msgid "Relative Colorimetric"
-msgstr ""
+#: ../modules/display-filter-lcms.c:134
+msgid "Color Management"
+msgstr "Διαχείριση χρώματος"
 
-#: ../modules/cdisplay_proof.c:60
-msgid "Absolute Colorimetric"
-msgstr ""
+#: ../modules/display-filter-lcms.c:212
+msgid "This filter takes its configuration from the Color Management section in the Preferences dialog."
+msgstr "Αυτό το φίλτρο παίρνει τη ρύθμιση του από το τμήμα Διαχείρισης Χρώματος στο διάλογο Προτιμήσεων."
 
-#: ../modules/cdisplay_proof.c:147
+#: ../modules/display-filter-lcms.c:226
+msgid "Mode of operation:"
+msgstr "Κατάσταση λειτουργίας:"
+
+#: ../modules/display-filter-lcms.c:233
+msgid "Image profile:"
+msgstr "Κατατομή εικόνας:"
+
+#: ../modules/display-filter-lcms.c:241
+msgid "Monitor profile:"
+msgstr "Κατατομή Εποπτείας:"
+
+#: ../modules/display-filter-lcms.c:249
+msgid "Print simulation profile:"
+msgstr "Εκτύπωση κατατομής εξομοίωσης:"
+
+#: ../modules/display-filter-proof.c:97
 msgid "Color proof filter using ICC color profile"
-msgstr ""
+msgstr "Χρωματοστεγή φίλτρο με τη χρήση κατατομής χρώματος ICC"
 
-#: ../modules/cdisplay_proof.c:251
+#: ../modules/display-filter-proof.c:145
 msgid "Color Proof"
-msgstr ""
+msgstr "χρωματοστεγή"
 
-#: ../modules/cdisplay_proof.c:462
-msgid "_Intent:"
-msgstr ""
-
-#: ../modules/cdisplay_proof.c:465
+#: ../modules/display-filter-proof.c:311
 msgid "Choose an ICC Color Profile"
-msgstr ""
+msgstr "Επιλέξτε μία κατατομή χρώματος ICC"
 
-#: ../modules/cdisplay_proof.c:468
+#: ../modules/display-filter-proof.c:338
+msgid "All files (*.*)"
+msgstr "Όλα τα αρχεία (*.*)"
+
+#: ../modules/display-filter-proof.c:343
+msgid "ICC color profile (*.icc, *.icm)"
+msgstr "κατατομή χρώματος ICC (*.icc, *.icm)"
+
+#: ../modules/display-filter-proof.c:401
 msgid "_Profile:"
-msgstr ""
+msgstr "_Κατατομή:"
 
-#: ../modules/cdisplay_proof.c:476
+#: ../modules/display-filter-proof.c:407
+msgid "_Intent:"
+msgstr "_Στόχος:"
+
+#: ../modules/display-filter-proof.c:412
 msgid "_Black Point Compensation"
-msgstr ""
+msgstr "_Αντιστάθμιση Μαύρου Σημείου"
 
-#: ../modules/colorsel_cmyk.c:73
+#: ../modules/color-selector-cmyk.c:71
 msgid "CMYK color selector"
-msgstr ""
+msgstr "επιλογέας χρώματος CMYK"
 
-#: ../modules/colorsel_cmyk.c:130
+#: ../modules/color-selector-cmyk.c:102
+#: ../modules/color-selector-cmyk-lcms.c:150
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ../modules/colorsel_cmyk.c:147
+#. Cyan
+#: ../modules/color-selector-cmyk.c:125
+#: ../modules/color-selector-cmyk-lcms.c:169
 msgid "_C"
-msgstr ""
+msgstr "_C"
 
-#: ../modules/colorsel_cmyk.c:148
+#. Magenta
+#: ../modules/color-selector-cmyk.c:127
+#: ../modules/color-selector-cmyk-lcms.c:171
 msgid "_M"
-msgstr ""
+msgstr "_M"
 
-#: ../modules/colorsel_cmyk.c:149
+#. Yellow
+#: ../modules/color-selector-cmyk.c:129
+#: ../modules/color-selector-cmyk-lcms.c:173
 msgid "_Y"
-msgstr ""
+msgstr "_Y"
 
-#: ../modules/colorsel_cmyk.c:150
+#. Key (Black)
+#: ../modules/color-selector-cmyk.c:131
+#: ../modules/color-selector-cmyk-lcms.c:175
 msgid "_K"
-msgstr ""
+msgstr "_K"
 
-#: ../modules/colorsel_cmyk.c:154
+#: ../modules/color-selector-cmyk.c:135
+#: ../modules/color-selector-cmyk-lcms.c:179
 msgid "Cyan"
 msgstr "Κυανό"
 
-#: ../modules/colorsel_cmyk.c:155
+#: ../modules/color-selector-cmyk.c:136
+#: ../modules/color-selector-cmyk-lcms.c:180
 msgid "Magenta"
 msgstr "Πορφυρό"
 
-#: ../modules/colorsel_cmyk.c:156
+#: ../modules/color-selector-cmyk.c:137
+#: ../modules/color-selector-cmyk-lcms.c:181
 msgid "Yellow"
 msgstr "Κίτρινο"
 
-#: ../modules/colorsel_cmyk.c:157
+#: ../modules/color-selector-cmyk.c:138
+#: ../modules/color-selector-cmyk-lcms.c:182
 msgid "Black"
 msgstr "Μαύρο"
 
-#: ../modules/colorsel_cmyk.c:191
-msgid "Black _Pullout:"
-msgstr ""
+#: ../modules/color-selector-cmyk.c:172
+msgid "Black _pullout:"
+msgstr "_Απόσπαση του Μαύρου:"
 
-#: ../modules/colorsel_cmyk.c:208
+#: ../modules/color-selector-cmyk.c:189
 msgid "The percentage of black to pull out of the colored inks."
-msgstr ""
+msgstr "Το ποσοστό μαύρου για να αποσπάσει τα χρωματιστά μελάνια."
 
-#: ../modules/colorsel_triangle.c:104
-msgid "Painter-style triangle color selector"
-msgstr ""
+#: ../modules/color-selector-cmyk-lcms.c:87
+msgid "CMYK color selector (using color profile)"
+msgstr "επιλογέας χρώματος CMYK (με τη χρήση κατατομής χρώματος)"
 
-#: ../modules/colorsel_triangle.c:170
-msgid "Triangle"
-msgstr "Τρίγωνο"
+#: ../modules/color-selector-cmyk-lcms.c:395
+msgid "Profile: (none)"
+msgstr "Κατατομή: (καμία)"
 
-#: ../modules/colorsel_water.c:88
+#: ../modules/color-selector-cmyk-lcms.c:416
+#, c-format
+msgid "Profile: %s"
+msgstr "Κατατομή: %s"
+
+#: ../modules/color-selector-water.c:82
 msgid "Watercolor style color selector"
-msgstr ""
+msgstr "επιλογέας χρώματος τεχνοτροπίας υδροχρώματος"
 
-#: ../modules/colorsel_water.c:154
+#: ../modules/color-selector-water.c:118
 msgid "Watercolor"
 msgstr "Νερομπογιά"
 
-#: ../modules/colorsel_water.c:220
+#: ../modules/color-selector-water.c:186
 msgid "Pressure"
 msgstr "Πίεση"
+
+#: ../modules/color-selector-wheel.c:103
+msgid "HSV color wheel"
+msgstr "τροχός χρώματος HSV"
+
+#: ../modules/color-selector-wheel.c:134
+msgid "Wheel"
+msgstr "Τροχός"
+
+#: ../modules/controller-linux-input.c:58
+msgid "Button 0"
+msgstr "Κουμπί 0"
+
+#: ../modules/controller-linux-input.c:59
+msgid "Button 1"
+msgstr "Κουμπί 1"
+
+#: ../modules/controller-linux-input.c:60
+msgid "Button 2"
+msgstr "Κουμπί 2"
+
+#: ../modules/controller-linux-input.c:61
+msgid "Button 3"
+msgstr "Κουμπί 3"
+
+#: ../modules/controller-linux-input.c:62
+msgid "Button 4"
+msgstr "Κουμπί 4"
+
+#: ../modules/controller-linux-input.c:63
+msgid "Button 5"
+msgstr "Κουμπί 5"
+
+#: ../modules/controller-linux-input.c:64
+msgid "Button 6"
+msgstr "Κουμπί 6"
+
+#: ../modules/controller-linux-input.c:65
+msgid "Button 7"
+msgstr "Κουμπί 7"
+
+#: ../modules/controller-linux-input.c:66
+msgid "Button 8"
+msgstr "Κουμπί 8"
+
+#: ../modules/controller-linux-input.c:67
+msgid "Button 9"
+msgstr "Κουμπί 9"
+
+#: ../modules/controller-linux-input.c:68
+msgid "Button Mouse"
+msgstr "Κουμπί Ποντικιού"
+
+#: ../modules/controller-linux-input.c:69
+msgid "Button Left"
+msgstr "Κουμπί Αριστερό"
+
+#: ../modules/controller-linux-input.c:70
+msgid "Button Right"
+msgstr "Κουμπί Δεξιό"
+
+#: ../modules/controller-linux-input.c:71
+msgid "Button Middle"
+msgstr "Κουμπί Μεσαίο"
+
+#: ../modules/controller-linux-input.c:72
+msgid "Button Side"
+msgstr "Κουμπί Πλευρικό"
+
+#: ../modules/controller-linux-input.c:73
+msgid "Button Extra"
+msgstr "Επιπλέον Κουμπί"
+
+#: ../modules/controller-linux-input.c:74
+msgid "Button Forward"
+msgstr "Κουμπί προς τα εμπρός"
+
+#: ../modules/controller-linux-input.c:75
+msgid "Button Back"
+msgstr "Κουμπί Πίσω"
+
+#: ../modules/controller-linux-input.c:76
+msgid "Button Task"
+msgstr "Κουμπί Εργασίας"
+
+#: ../modules/controller-linux-input.c:78
+msgid "Button Wheel"
+msgstr "Κουμπί Τροχού"
+
+#: ../modules/controller-linux-input.c:81
+msgid "Button Gear Down"
+msgstr "Κουμπί Αλλαγή Προς Τα Πάνω"
+
+#: ../modules/controller-linux-input.c:84
+msgid "Button Gear Up"
+msgstr "Κουμπί Αλλαγή Προς Τα Κάτω"
+
+#: ../modules/controller-linux-input.c:90
+#: ../modules/controller-dx-dinput.c:443
+msgid "X Move Left"
+msgstr "Χ Μετακίνηση Αριστερά"
+
+#: ../modules/controller-linux-input.c:91
+#: ../modules/controller-dx-dinput.c:446
+msgid "X Move Right"
+msgstr "Χ Μετακίνηση Δεξιά"
+
+#: ../modules/controller-linux-input.c:92
+msgid "Y Move Forward"
+msgstr "Υ Μετακίνηση Εμπρός"
+
+#: ../modules/controller-linux-input.c:93
+msgid "Y Move Back"
+msgstr "Υ Μετακίνηση Πίσω"
+
+#: ../modules/controller-linux-input.c:94
+#: ../modules/controller-dx-dinput.c:461
+msgid "Z Move Up"
+msgstr "Ζ Μετακίνηση Επάνω"
+
+#: ../modules/controller-linux-input.c:95
+#: ../modules/controller-dx-dinput.c:464
+msgid "Z Move Down"
+msgstr "Ζ Μετακίνηση Κάτω"
+
+#: ../modules/controller-linux-input.c:97
+msgid "X Axis Tilt Forward"
+msgstr "Χ Κλίση Άξονα Εμπρός"
+
+#: ../modules/controller-linux-input.c:98
+msgid "X Axis Tilt Back"
+msgstr "Χ Κλίση Άξονα Πίσω"
+
+#: ../modules/controller-linux-input.c:99
+#: ../modules/controller-dx-dinput.c:479
+msgid "Y Axis Tilt Right"
+msgstr "Υ Κλίση Άξονα Δεξιά"
+
+#: ../modules/controller-linux-input.c:100
+#: ../modules/controller-dx-dinput.c:482
+msgid "Y Axis Tilt Left"
+msgstr "Υ Κλίση Άξονα Αριστερά"
+
+#: ../modules/controller-linux-input.c:101
+#: ../modules/controller-dx-dinput.c:488
+msgid "Z Axis Turn Left"
+msgstr "Ζ Κλίση Άξονα Αριστερά"
+
+#: ../modules/controller-linux-input.c:102
+#: ../modules/controller-dx-dinput.c:491
+msgid "Z Axis Turn Right"
+msgstr "Ζ Κλίση Άξονα Δεξιά"
+
+#: ../modules/controller-linux-input.c:104
+msgid "Horiz. Wheel Turn Back"
+msgstr "Οριζόντιος Τροχός Στροφή Προς Τα Πίσω"
+
+#: ../modules/controller-linux-input.c:105
+msgid "Horiz. Wheel Turn Forward"
+msgstr "Οριζόντιος Τροχός Στροφή Προς Τα Εμπρός"
+
+#: ../modules/controller-linux-input.c:106
+msgid "Dial Turn Left"
+msgstr "Πίνακα Στροφή Αριστερά"
+
+#: ../modules/controller-linux-input.c:107
+msgid "Dial Turn Right"
+msgstr "Πίνακα Στροφή Δεξιά"
+
+#: ../modules/controller-linux-input.c:108
+msgid "Wheel Turn Left"
+msgstr "Τροχός Στροφή Αριστερά"
+
+#: ../modules/controller-linux-input.c:109
+msgid "Wheel Turn Right"
+msgstr "Τροχός Στροφή Δεξιά"
+
+#: ../modules/controller-linux-input.c:178
+msgid "Linux input event controller"
+msgstr "Ελεγκτής γεγονότος εισαγωγής Linux"
+
+#: ../modules/controller-linux-input.c:218
+#: ../modules/controller-dx-dinput.c:196
+#: ../modules/controller-midi.c:212
+msgid "Device:"
+msgstr "Συσκευή:"
+
+#: ../modules/controller-linux-input.c:219
+msgid "The name of the device to read Linux Input events from."
+msgstr "Το όνομα της συσκευής για ανάγνωση εισαγωγής γεγονότων Linux."
+
+#: ../modules/controller-linux-input.c:230
+msgid "Linux Input"
+msgstr "Εισαγωγή Linux"
+
+#: ../modules/controller-linux-input.c:513
+msgid "Linux Input Events"
+msgstr "Γεγονότα Εισαγωγής Linux"
+
+#: ../modules/controller-linux-input.c:525
+#: ../modules/controller-dx-dinput.c:1095
+#: ../modules/controller-midi.c:505
+msgid "No device configured"
+msgstr "Καμία συσκευή δεν έχει ρυθμιστεί"
+
+#: ../modules/controller-linux-input.c:551
+#: ../modules/controller-midi.c:454
+#: ../modules/controller-midi.c:480
+#, c-format
+msgid "Reading from %s"
+msgstr "Ανάγνωση από %s"
+
+#: ../modules/controller-linux-input.c:569
+#: ../modules/controller-linux-input.c:623
+#: ../modules/controller-midi.c:436
+#: ../modules/controller-midi.c:497
+#: ../modules/controller-midi.c:568
+#, c-format
+msgid "Device not available: %s"
+msgstr "Η συσκευή δεν είναι διαθέσιμη: %s"
+
+#: ../modules/controller-linux-input.c:588
+#: ../modules/controller-dx-dinput.c:1120
+msgid "Device not available"
+msgstr "Η συσκευή δεν είναι διαθέσιμη"
+
+#: ../modules/controller-linux-input.c:632
+#: ../modules/controller-midi.c:577
+msgid "End of file"
+msgstr "Τέλος αρχείου"
+
+#: ../modules/controller-dx-dinput.c:156
+msgid "DirectX DirectInput event controller"
+msgstr "ελεγκτής γεγονότος DirectX DirectInput"
+
+#: ../modules/controller-dx-dinput.c:197
+msgid "The device to read DirectInput events from."
+msgstr "Η συσκευή για ανάγνωση γεγονότων  DirectInput."
+
+#: ../modules/controller-dx-dinput.c:206
+msgid "DirectX DirectInput"
+msgstr "DirectX DirectInput"
+
+#: ../modules/controller-dx-dinput.c:420
+#, c-format
+msgid "Button %d"
+msgstr "Κουμπί %d"
+
+#: ../modules/controller-dx-dinput.c:423
+#, c-format
+msgid "Button %d Press"
+msgstr "Κουμπί %d Πατήστε"
+
+#: ../modules/controller-dx-dinput.c:426
+#, c-format
+msgid "Button %d Release"
+msgstr "Κουμπί %d Απελευθέρωση"
+
+#: ../modules/controller-dx-dinput.c:452
+msgid "Y Move Away"
+msgstr "Υ Μετακίνηση Μακριά"
+
+#: ../modules/controller-dx-dinput.c:455
+msgid "Y Move Near"
+msgstr "Υ Μετακίνηση Κοντά"
+
+#: ../modules/controller-dx-dinput.c:470
+msgid "X Axis Tilt Away"
+msgstr "Χ Κλίση Άξονα Μακριά"
+
+#: ../modules/controller-dx-dinput.c:473
+msgid "X Axis Tilt Near"
+msgstr "Χ Κλίση Άξονα Κοντά"
+
+#: ../modules/controller-dx-dinput.c:502
+#, c-format
+msgid "Slider %d Increase"
+msgstr "Ολισθητής %d Αύξηση"
+
+#: ../modules/controller-dx-dinput.c:505
+#, c-format
+msgid "Slider %d Decrease"
+msgstr "Ολισθητής %d Μείωση"
+
+#: ../modules/controller-dx-dinput.c:515
+#, c-format
+msgid "POV %d X View"
+msgstr "POV %d X Προβολή"
+
+#: ../modules/controller-dx-dinput.c:518
+#, c-format
+msgid "POV %d Y View"
+msgstr "POV %d Y Προβολή"
+
+#: ../modules/controller-dx-dinput.c:521
+#, c-format
+msgid "POV %d Return"
+msgstr "POV %d Επιστροφή"
+
+#: ../modules/controller-dx-dinput.c:1084
+msgid "DirectInput Events"
+msgstr "Γεγονότα DirectInput"
+
+#: ../modules/controller-midi.c:164
+msgid "MIDI event controller"
+msgstr "ελεγκτής γεγονότος MIDI"
+
+#: ../modules/controller-midi.c:203
+msgid "The name of the device to read MIDI events from."
+msgstr "Το όνομα της συσκευής για ανάγνωση γεγονότων MIDI."
+
+#: ../modules/controller-midi.c:206
+msgid "Enter 'alsa' to use the ALSA sequencer."
+msgstr "Εισάγετε 'alsa' για να χρησιμοποιήσετε τον ALSA ενορχηστρωτή"
+
+#: ../modules/controller-midi.c:221
+msgid "Channel:"
+msgstr "Κανάλι:"
+
+#: ../modules/controller-midi.c:222
+msgid "The MIDI channel to read events from. Set to -1 for reading from all MIDI channels."
+msgstr "Το κανάλι MIDI για την ανάγνωση γεγονότων. Θέστε το στο -1 για ανάγνωση από όλα τα κανάλια MIDI."
+
+#: ../modules/controller-midi.c:226
+msgid "MIDI"
+msgstr "MIDI"
+
+#: ../modules/controller-midi.c:355
+#, c-format
+msgid "Note %02x on"
+msgstr "Σημείωση %02x ανοιχτό"
+
+#: ../modules/controller-midi.c:358
+#, c-format
+msgid "Note %02x off"
+msgstr "Σημείωση %02x κλειστό"
+
+#: ../modules/controller-midi.c:361
+#, c-format
+msgid "Controller %03d"
+msgstr "Ελεγκτής %03d"
+
+#: ../modules/controller-midi.c:408
+msgid "MIDI Events"
+msgstr "Γεγονότα MIDI"
+
+#: ../modules/controller-midi.c:426
+msgid "GIMP"
+msgstr "GIMP"
+
+#: ../modules/controller-midi.c:428
+msgid "GIMP MIDI Input Controller"
+msgstr "Ελεγκτής εισαγωγής GIMP MIDI"
+
+#
+#, fuzzy
+#~ msgid "Pattern source"
+#~ msgstr "Πηγή Σχεδίου"
+#~ msgid "Linear"
+#~ msgstr "Γραμμικό"
+
+#, fuzzy
+#~ msgid "Forward (traditional)"
+#~ msgstr "Εμπρός (Παραδοσιακό)"
+
+#, fuzzy
+#~ msgid "Backward (corrective)"
+#~ msgstr "Πίσω (Διορθωτικό)"
+#~ msgid "%d Bytes"
+#~ msgstr "%d Bytes"
+#~ msgid "%d KB"
+#~ msgstr "%d KB"
+#~ msgid "%d MB"
+#~ msgstr "%d MB"
+#~ msgid "%d GB"
+#~ msgstr "%d GB"
+#~ msgid "Could not open '%s' for reading: %s"
+#~ msgstr "Αδυναμία ανοίγματος του '%s' για ανάγνωση: %s"
+#~ msgid "Triangle"
+#~ msgstr "Τρίγωνο"
+
diff --git a/po-libgimp/en_GB.po b/po-libgimp/en_GB.po
index 44b7b57b36..97fdf4143e 100644
--- a/po-libgimp/en_GB.po
+++ b/po-libgimp/en_GB.po
@@ -2,20 +2,40 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady  2000.
 # Gareth Owen , David Lodge , 2004.
-#
+# Bruce Cowan , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp CVS\n"
+"Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-09 19:12+0000\n"
-"PO-Revision-Date: 2007-05-16 08:08-0000\n"
-"Last-Translator: David Lodge \n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-10-17 22:57+0100\n"
+"PO-Revision-Date: 2009-10-17 22:57+0100\n"
+"Last-Translator: Bruce Cowan \n"
+"Language-Team: British English \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. procedure executed successfully
+#: ../libgimp/gimp.c:1045
+msgid "success"
+msgstr "success"
+
+#. procedure execution failed
+#: ../libgimp/gimp.c:1049
+msgid "execution error"
+msgstr "execution error"
+
+#. procedure called incorrectly
+#: ../libgimp/gimp.c:1053
+msgid "calling error"
+msgstr "calling error"
+
+#. procedure execution cancelled
+#: ../libgimp/gimp.c:1057
+msgid "cancelled"
+msgstr "cancelled"
+
 #: ../libgimp/gimpbrushselectbutton.c:170
 msgid "Brush Selection"
 msgstr "Brush Selection"
@@ -311,15 +331,15 @@ msgstr "Return Values"
 msgid "Additional Information"
 msgstr "Additional Information"
 
-#: ../libgimp/gimpprocview.c:210
+#: ../libgimp/gimpprocview.c:209
 msgid "Author:"
 msgstr "Author:"
 
-#: ../libgimp/gimpprocview.c:222
+#: ../libgimp/gimpprocview.c:221
 msgid "Date:"
 msgstr "Date:"
 
-#: ../libgimp/gimpprocview.c:234
+#: ../libgimp/gimpprocview.c:233
 msgid "Copyright:"
 msgstr "Copyright:"
 
@@ -615,7 +635,7 @@ msgstr "Constant"
 msgid "Incremental"
 msgstr "Incremental"
 
-#: ../libgimpbase/gimpbaseenums.c:624 ../modules/cdisplay_lcms.c:195
+#: ../libgimpbase/gimpbaseenums.c:624 ../modules/display-filter-lcms.c:191
 msgid "None"
 msgstr "None"
 
@@ -683,77 +703,50 @@ msgstr "Crop to result"
 msgid "Crop with aspect"
 msgstr "Crop with aspect"
 
-#: ../libgimpbase/gimpbaseenums.c:882
+#: ../libgimpbase/gimpbaseenums.c:909
 msgid "Internal GIMP procedure"
 msgstr "Internal GIMP procedure"
 
-#: ../libgimpbase/gimpbaseenums.c:883
+#: ../libgimpbase/gimpbaseenums.c:910
 msgid "GIMP Plug-In"
 msgstr "GIMP Plug-In"
 
-#: ../libgimpbase/gimpbaseenums.c:884
+#: ../libgimpbase/gimpbaseenums.c:911
 msgid "GIMP Extension"
 msgstr "GIMP Extension"
 
-#: ../libgimpbase/gimpbaseenums.c:885
+#: ../libgimpbase/gimpbaseenums.c:912
 msgid "Temporary Procedure"
 msgstr "Temporary Procedure"
 
-#: ../libgimpbase/gimpmemsize.c:180
-#, c-format
-msgid "%d Byte"
-msgid_plural "%d Bytes"
-msgstr[0] "%d Byte"
-msgstr[1] "%d Bytes"
+#: ../libgimpbase/gimpbaseenums.c:1074
+msgid "From left to right"
+msgstr "From left to right"
 
-#: ../libgimpbase/gimpmemsize.c:186
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: ../libgimpbase/gimpbaseenums.c:1075
+msgid "From right to left"
+msgstr "From right to left"
 
-#: ../libgimpbase/gimpmemsize.c:190
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
+#: ../libgimpbase/gimpbaseenums.c:1105
+msgid "Left justified"
+msgstr "Left justified"
 
-#: ../libgimpbase/gimpmemsize.c:194
-#, c-format
-msgid "%d KB"
-msgstr "%d KB"
+#: ../libgimpbase/gimpbaseenums.c:1106
+msgid "Right justified"
+msgstr "Right justified"
 
-#: ../libgimpbase/gimpmemsize.c:201
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: ../libgimpbase/gimpbaseenums.c:1107
+msgid "Centered"
+msgstr "Centred"
 
-#: ../libgimpbase/gimpmemsize.c:205
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../libgimpbase/gimpmemsize.c:209
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: ../libgimpbase/gimpmemsize.c:216
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
-
-#: ../libgimpbase/gimpmemsize.c:220
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../libgimpbase/gimpmemsize.c:224
-#, c-format
-msgid "%d GB"
-msgstr "%d GB"
+#: ../libgimpbase/gimpbaseenums.c:1108
+msgid "Filled"
+msgstr "Filled"
 
 #: ../libgimpbase/gimputils.c:170 ../libgimpbase/gimputils.c:175
-#: ../modules/cdisplay_lcms.c:187 ../modules/colorsel_cmyk_lcms.c:411
-#: ../modules/colorsel_cmyk_lcms.c:417
+#: ../modules/display-filter-lcms.c:183
+#: ../modules/color-selector-cmyk-lcms.c:407
+#: ../modules/color-selector-cmyk-lcms.c:413
 msgid "(invalid UTF-8 string)"
 msgstr "(invalid UTF-8 string)"
 
@@ -868,7 +861,7 @@ msgstr "while parsing token '%s': %s"
 #: ../libgimpconfig/gimpconfig-iface.c:474
 #: ../libgimpconfig/gimpconfig-iface.c:487 ../libgimpconfig/gimpscanner.c:498
 #: ../libgimpconfig/gimpscanner.c:579
-#: ../libgimpwidgets/gimpcolorprofilestore.c:654
+#: ../libgimpwidgets/gimpcolorprofilestore.c:656
 msgid "fatal parse error"
 msgstr "fatal parse error"
 
@@ -878,7 +871,7 @@ msgid "Cannot expand ${%s}"
 msgstr "Cannot expand ${%s}"
 
 #: ../libgimpconfig/gimpconfigwriter.c:78
-#: ../libgimpconfig/gimpconfigwriter.c:693
+#: ../libgimpconfig/gimpconfigwriter.c:718
 #, c-format
 msgid "Error writing to '%s': %s"
 msgstr "Error writing to '%s': %s"
@@ -893,7 +886,8 @@ msgstr "Could not create temporary file for '%s': %s"
 msgid "Could not open '%s' for writing: %s"
 msgstr "Could not open '%s' for writing: %s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:674
+#: ../libgimpconfig/gimpconfigwriter.c:679
+#: ../libgimpconfig/gimpconfigwriter.c:699
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -902,7 +896,7 @@ msgstr ""
 "Error writing to temporary file for '%s': %s\n"
 "The original file has not been touched."
 
-#: ../libgimpconfig/gimpconfigwriter.c:682
+#: ../libgimpconfig/gimpconfigwriter.c:707
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -911,7 +905,7 @@ msgstr ""
 "Error writing to temporary file for '%s': %s\n"
 "No file has been created."
 
-#: ../libgimpconfig/gimpconfigwriter.c:711
+#: ../libgimpconfig/gimpconfigwriter.c:731
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr "Could not create '%s': %s"
@@ -949,7 +943,7 @@ msgstr "Load failed"
 msgid "Not loaded"
 msgstr "Not loaded"
 
-#: ../libgimpthumb/gimpthumb-utils.c:125
+#: ../libgimpthumb/gimpthumb-utils.c:123
 #, c-format
 msgid ""
 "Cannot determine a valid home directory.\n"
@@ -958,7 +952,7 @@ msgstr ""
 "Cannot determine a valid home directory.\n"
 "Thumbnails will be stored in the folder for temporary files (%s) instead."
 
-#: ../libgimpthumb/gimpthumb-utils.c:249 ../libgimpthumb/gimpthumb-utils.c:317
+#: ../libgimpthumb/gimpthumb-utils.c:247 ../libgimpthumb/gimpthumb-utils.c:315
 #, c-format
 msgid "Failed to create thumbnail folder '%s'."
 msgstr "Failed to create thumbnail folder '%s'."
@@ -998,8 +992,9 @@ msgid "Select color profile from disk..."
 msgstr "Select colour profile from disk..."
 
 #: ../libgimpwidgets/gimpcolorprofilestore.c:280
-msgid "profile|None"
-msgstr "profile|None"
+msgctxt "profile"
+msgid "None"
+msgstr "None"
 
 #: ../libgimpwidgets/gimpcolorscales.c:98
 msgid "Scales"
@@ -1025,6 +1020,10 @@ msgstr ""
 msgid "HTML _notation:"
 msgstr "HTML _notation:"
 
+#: ../libgimpwidgets/gimphelpui.c:420
+msgid "Press F1 for more help"
+msgstr "Press F1 for more help"
+
 #: ../libgimpwidgets/gimpfileentry.c:174
 msgid "Open a file selector to browse your folders"
 msgstr "Open a file selector to browse your folders"
@@ -1122,66 +1121,66 @@ msgstr "Check Style"
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../libgimpwidgets/gimppropwidgets.c:1859
+#: ../libgimpwidgets/gimppropwidgets.c:1860
 #, c-format
 msgid "This text input field is limited to %d character."
 msgid_plural "This text input field is limited to %d characters."
 msgstr[0] "This text input field is limited to %d character."
 msgstr[1] "This text input field is limited to %d characters."
 
-#: ../libgimpwidgets/gimpstock.c:113
+#: ../libgimpwidgets/gimpstock.c:112
 msgid "Anchor"
 msgstr "Anchor"
 
-#: ../libgimpwidgets/gimpstock.c:114
+#: ../libgimpwidgets/gimpstock.c:113
 msgid "C_enter"
 msgstr "C_entre"
 
-#: ../libgimpwidgets/gimpstock.c:115
+#: ../libgimpwidgets/gimpstock.c:114
 msgid "_Duplicate"
 msgstr "_Duplicate"
 
-#: ../libgimpwidgets/gimpstock.c:116
+#: ../libgimpwidgets/gimpstock.c:115
 msgid "_Edit"
 msgstr "_Edit"
 
-#: ../libgimpwidgets/gimpstock.c:117
+#: ../libgimpwidgets/gimpstock.c:116
 msgid "Linked"
 msgstr "Linked"
 
-#: ../libgimpwidgets/gimpstock.c:118
+#: ../libgimpwidgets/gimpstock.c:117
 msgid "Paste as New"
 msgstr "Paste as New"
 
-#: ../libgimpwidgets/gimpstock.c:119
+#: ../libgimpwidgets/gimpstock.c:118
 msgid "Paste Into"
 msgstr "Paste Into"
 
-#: ../libgimpwidgets/gimpstock.c:120
+#: ../libgimpwidgets/gimpstock.c:119
 msgid "_Reset"
 msgstr "_Reset"
 
-#: ../libgimpwidgets/gimpstock.c:121
+#: ../libgimpwidgets/gimpstock.c:120
 msgid "Visible"
 msgstr "Visible"
 
-#: ../libgimpwidgets/gimpstock.c:157 ../libgimpwidgets/gimpstock.c:161
+#: ../libgimpwidgets/gimpstock.c:156 ../libgimpwidgets/gimpstock.c:160
 msgid "_Stroke"
 msgstr "_Stroke"
 
-#: ../libgimpwidgets/gimpstock.c:173
+#: ../libgimpwidgets/gimpstock.c:172
 msgid "L_etter Spacing"
 msgstr "L_etter Spacing"
 
-#: ../libgimpwidgets/gimpstock.c:174
+#: ../libgimpwidgets/gimpstock.c:173
 msgid "L_ine Spacing"
 msgstr "L_ine Spacing"
 
-#: ../libgimpwidgets/gimpstock.c:190
+#: ../libgimpwidgets/gimpstock.c:189
 msgid "_Resize"
 msgstr "_Resize"
 
-#: ../libgimpwidgets/gimpstock.c:191 ../libgimpwidgets/gimpstock.c:321
+#: ../libgimpwidgets/gimpstock.c:190 ../libgimpwidgets/gimpstock.c:320
 msgid "_Scale"
 msgstr "_Scale"
 
@@ -1193,11 +1192,11 @@ msgstr "Cr_op"
 msgid "_Transform"
 msgstr "_Transform"
 
-#: ../libgimpwidgets/gimpstock.c:320
+#: ../libgimpwidgets/gimpstock.c:319
 msgid "_Rotate"
 msgstr "_Rotate"
 
-#: ../libgimpwidgets/gimpstock.c:322
+#: ../libgimpwidgets/gimpstock.c:321
 msgid "_Shear"
 msgstr "_Shear"
 
@@ -1301,63 +1300,63 @@ msgstr "Zoom in"
 msgid "Zoom out"
 msgstr "Zoom out"
 
-#: ../modules/cdisplay_colorblind.c:67
+#: ../modules/display-filter-color-blind.c:67
 msgid "Protanopia (insensitivity to red)"
 msgstr "Protanopia (insensitivity to red)"
 
-#: ../modules/cdisplay_colorblind.c:69
+#: ../modules/display-filter-color-blind.c:69
 msgid "Deuteranopia (insensitivity to green)"
 msgstr "Deuteranopia (insensitivity to green)"
 
-#: ../modules/cdisplay_colorblind.c:71
+#: ../modules/display-filter-color-blind.c:71
 msgid "Tritanopia (insensitivity to blue)"
 msgstr "Tritanopia (insensitivity to blue)"
 
-#: ../modules/cdisplay_colorblind.c:198
+#: ../modules/display-filter-color-blind.c:198
 msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
 msgstr "Colour deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
 
-#: ../modules/cdisplay_colorblind.c:261
+#: ../modules/display-filter-color-blind.c:261
 msgid "Color Deficient Vision"
 msgstr "Colour Deficient Vision"
 
-#: ../modules/cdisplay_colorblind.c:483
+#: ../modules/display-filter-color-blind.c:483
 msgid "Color _deficiency type:"
 msgstr "Colour _deficiency type:"
 
-#: ../modules/cdisplay_gamma.c:90
+#: ../modules/display-filter-gamma.c:90
 msgid "Gamma color display filter"
 msgstr "Gamma colour display filter"
 
-#: ../modules/cdisplay_gamma.c:129
+#: ../modules/display-filter-gamma.c:129
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../modules/cdisplay_gamma.c:232
+#: ../modules/display-filter-gamma.c:232
 msgid "_Gamma:"
 msgstr "_Gamma:"
 
-#: ../modules/cdisplay_highcontrast.c:90
+#: ../modules/display-filter-high-contrast.c:90
 msgid "High Contrast color display filter"
 msgstr "High Contrast colour display filter"
 
-#: ../modules/cdisplay_highcontrast.c:129
+#: ../modules/display-filter-high-contrast.c:129
 msgid "Contrast"
 msgstr "Contrast"
 
-#: ../modules/cdisplay_highcontrast.c:232
+#: ../modules/display-filter-high-contrast.c:232
 msgid "Contrast c_ycles:"
 msgstr "Contrast c_ycles:"
 
-#: ../modules/cdisplay_lcms.c:106
+#: ../modules/display-filter-lcms.c:102
 msgid "Color management display filter using ICC color profiles"
 msgstr "Colour management display filter using ICC colour profiles"
 
-#: ../modules/cdisplay_lcms.c:138
+#: ../modules/display-filter-lcms.c:134
 msgid "Color Management"
 msgstr "Colour Management"
 
-#: ../modules/cdisplay_lcms.c:216
+#: ../modules/display-filter-lcms.c:212
 msgid ""
 "This filter takes its configuration from the Color Management section in the "
 "Preferences dialog."
@@ -1365,444 +1364,453 @@ msgstr ""
 "This filter takes its configuration from the Colour Management section in "
 "the Preferences dialogue."
 
-#: ../modules/cdisplay_lcms.c:230
+#: ../modules/display-filter-lcms.c:226
 msgid "Mode of operation:"
 msgstr "Mode of operation:"
 
-#: ../modules/cdisplay_lcms.c:237
+#: ../modules/display-filter-lcms.c:233
 msgid "Image profile:"
 msgstr "Image profile:"
 
-#: ../modules/cdisplay_lcms.c:245
+#: ../modules/display-filter-lcms.c:241
 msgid "Monitor profile:"
 msgstr "Monitor profile:"
 
-#: ../modules/cdisplay_lcms.c:253
+#: ../modules/display-filter-lcms.c:249
 msgid "Print simulation profile:"
 msgstr "Print simulation profile:"
 
-#: ../modules/cdisplay_proof.c:101
+#: ../modules/display-filter-proof.c:97
 msgid "Color proof filter using ICC color profile"
 msgstr "Colour proof filter using ICC colour profile"
 
-#: ../modules/cdisplay_proof.c:149
+#: ../modules/display-filter-proof.c:145
 msgid "Color Proof"
 msgstr "Colour Proof"
 
-#: ../modules/cdisplay_proof.c:315
+#: ../modules/display-filter-proof.c:311
 msgid "Choose an ICC Color Profile"
 msgstr "Choose an ICC Colour Profile"
 
-#: ../modules/cdisplay_proof.c:342
+#: ../modules/display-filter-proof.c:338
 msgid "All files (*.*)"
 msgstr "All files (*.*)"
 
-#: ../modules/cdisplay_proof.c:347
+#: ../modules/display-filter-proof.c:343
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC colour profile (*.icc, *.icm)"
 
-#: ../modules/cdisplay_proof.c:405
+#: ../modules/display-filter-proof.c:401
 msgid "_Profile:"
 msgstr "_Profile:"
 
-#: ../modules/cdisplay_proof.c:411
+#: ../modules/display-filter-proof.c:407
 msgid "_Intent:"
 msgstr "_Intent:"
 
-#: ../modules/cdisplay_proof.c:416
+#: ../modules/display-filter-proof.c:412
 msgid "_Black Point Compensation"
 msgstr "_Black Point Compensation"
 
-#: ../modules/colorsel_cmyk.c:71
+#: ../modules/color-selector-cmyk.c:71
 msgid "CMYK color selector"
 msgstr "CMYK colour selector"
 
-#: ../modules/colorsel_cmyk.c:102 ../modules/colorsel_cmyk_lcms.c:154
+#: ../modules/color-selector-cmyk.c:102
+#: ../modules/color-selector-cmyk-lcms.c:150
 msgid "CMYK"
 msgstr "CMYK"
 
 #. Cyan
-#: ../modules/colorsel_cmyk.c:125 ../modules/colorsel_cmyk_lcms.c:173
+#: ../modules/color-selector-cmyk.c:125
+#: ../modules/color-selector-cmyk-lcms.c:169
 msgid "_C"
 msgstr "_C"
 
 #. Magenta
-#: ../modules/colorsel_cmyk.c:127 ../modules/colorsel_cmyk_lcms.c:175
+#: ../modules/color-selector-cmyk.c:127
+#: ../modules/color-selector-cmyk-lcms.c:171
 msgid "_M"
 msgstr "_M"
 
 #. Yellow
-#: ../modules/colorsel_cmyk.c:129 ../modules/colorsel_cmyk_lcms.c:177
+#: ../modules/color-selector-cmyk.c:129
+#: ../modules/color-selector-cmyk-lcms.c:173
 msgid "_Y"
 msgstr "_Y"
 
 #. Key (Black)
-#: ../modules/colorsel_cmyk.c:131 ../modules/colorsel_cmyk_lcms.c:179
+#: ../modules/color-selector-cmyk.c:131
+#: ../modules/color-selector-cmyk-lcms.c:175
 msgid "_K"
 msgstr "_K"
 
-#: ../modules/colorsel_cmyk.c:135 ../modules/colorsel_cmyk_lcms.c:183
+#: ../modules/color-selector-cmyk.c:135
+#: ../modules/color-selector-cmyk-lcms.c:179
 msgid "Cyan"
 msgstr "Cyan"
 
-#: ../modules/colorsel_cmyk.c:136 ../modules/colorsel_cmyk_lcms.c:184
+#: ../modules/color-selector-cmyk.c:136
+#: ../modules/color-selector-cmyk-lcms.c:180
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ../modules/colorsel_cmyk.c:137 ../modules/colorsel_cmyk_lcms.c:185
+#: ../modules/color-selector-cmyk.c:137
+#: ../modules/color-selector-cmyk-lcms.c:181
 msgid "Yellow"
 msgstr "Yellow"
 
-#: ../modules/colorsel_cmyk.c:138 ../modules/colorsel_cmyk_lcms.c:186
+#: ../modules/color-selector-cmyk.c:138
+#: ../modules/color-selector-cmyk-lcms.c:182
 msgid "Black"
 msgstr "Black"
 
-#: ../modules/colorsel_cmyk.c:172
+#: ../modules/color-selector-cmyk.c:172
 msgid "Black _pullout:"
 msgstr "Black _pullout:"
 
-#: ../modules/colorsel_cmyk.c:189
+#: ../modules/color-selector-cmyk.c:189
 msgid "The percentage of black to pull out of the colored inks."
 msgstr "The percentage of black to pull out of the coloured inks."
 
-#: ../modules/colorsel_cmyk_lcms.c:91
+#: ../modules/color-selector-cmyk-lcms.c:87
 msgid "CMYK color selector (using color profile)"
 msgstr "CMYK colour selector (using colour profile)"
 
-#: ../modules/colorsel_cmyk_lcms.c:399
+#: ../modules/color-selector-cmyk-lcms.c:395
 msgid "Profile: (none)"
 msgstr "Profile: (none)"
 
-#: ../modules/colorsel_cmyk_lcms.c:420
+#: ../modules/color-selector-cmyk-lcms.c:416
 #, c-format
 msgid "Profile: %s"
 msgstr "Profile: %s"
 
-#: ../modules/colorsel_triangle.c:102
-msgid "Painter-style triangle color selector"
-msgstr "Painter-style triangle colour selector"
-
-#: ../modules/colorsel_triangle.c:138
-msgid "Triangle"
-msgstr "Triangle"
-
-#: ../modules/colorsel_water.c:82
+#: ../modules/color-selector-water.c:82
 msgid "Watercolor style color selector"
 msgstr "Watercolour style colour selector"
 
-#: ../modules/colorsel_water.c:118
+#: ../modules/color-selector-water.c:118
 msgid "Watercolor"
 msgstr "Watercolour"
 
-#: ../modules/colorsel_water.c:186
+#: ../modules/color-selector-water.c:186
 msgid "Pressure"
 msgstr "Pressure"
 
-#: ../modules/controller_linux_input.c:58
+#: ../modules/color-selector-wheel.c:103
+msgid "HSV color wheel"
+msgstr "HSV colour wheel"
+
+#: ../modules/color-selector-wheel.c:134
+msgid "Wheel"
+msgstr "Wheel"
+
+#: ../modules/controller-linux-input.c:58
 msgid "Button 0"
 msgstr "Button 0"
 
-#: ../modules/controller_linux_input.c:59
+#: ../modules/controller-linux-input.c:59
 msgid "Button 1"
 msgstr "Button 1"
 
-#: ../modules/controller_linux_input.c:60
+#: ../modules/controller-linux-input.c:60
 msgid "Button 2"
 msgstr "Button 2"
 
-#: ../modules/controller_linux_input.c:61
+#: ../modules/controller-linux-input.c:61
 msgid "Button 3"
 msgstr "Button 3"
 
-#: ../modules/controller_linux_input.c:62
+#: ../modules/controller-linux-input.c:62
 msgid "Button 4"
 msgstr "Button 4"
 
-#: ../modules/controller_linux_input.c:63
+#: ../modules/controller-linux-input.c:63
 msgid "Button 5"
 msgstr "Button 5"
 
-#: ../modules/controller_linux_input.c:64
+#: ../modules/controller-linux-input.c:64
 msgid "Button 6"
 msgstr "Button 6"
 
-#: ../modules/controller_linux_input.c:65
+#: ../modules/controller-linux-input.c:65
 msgid "Button 7"
 msgstr "Button 7"
 
-#: ../modules/controller_linux_input.c:66
+#: ../modules/controller-linux-input.c:66
 msgid "Button 8"
 msgstr "Button 8"
 
-#: ../modules/controller_linux_input.c:67
+#: ../modules/controller-linux-input.c:67
 msgid "Button 9"
 msgstr "Button 9"
 
-#: ../modules/controller_linux_input.c:68
+#: ../modules/controller-linux-input.c:68
 msgid "Button Mouse"
 msgstr "Button Mouse"
 
-#: ../modules/controller_linux_input.c:69
+#: ../modules/controller-linux-input.c:69
 msgid "Button Left"
 msgstr "Button Left"
 
-#: ../modules/controller_linux_input.c:70
+#: ../modules/controller-linux-input.c:70
 msgid "Button Right"
 msgstr "Button Right"
 
-#: ../modules/controller_linux_input.c:71
+#: ../modules/controller-linux-input.c:71
 msgid "Button Middle"
 msgstr "Button Middle"
 
-#: ../modules/controller_linux_input.c:72
+#: ../modules/controller-linux-input.c:72
 msgid "Button Side"
 msgstr "Button Side"
 
-#: ../modules/controller_linux_input.c:73
+#: ../modules/controller-linux-input.c:73
 msgid "Button Extra"
 msgstr "Button Extra"
 
-#: ../modules/controller_linux_input.c:74
+#: ../modules/controller-linux-input.c:74
 msgid "Button Forward"
 msgstr "Button Forward"
 
-#: ../modules/controller_linux_input.c:75
+#: ../modules/controller-linux-input.c:75
 msgid "Button Back"
 msgstr "Button Back"
 
-#: ../modules/controller_linux_input.c:76
+#: ../modules/controller-linux-input.c:76
 msgid "Button Task"
 msgstr "Button Task"
 
-#: ../modules/controller_linux_input.c:78
+#: ../modules/controller-linux-input.c:78
 msgid "Button Wheel"
 msgstr "Button Wheel"
 
-#: ../modules/controller_linux_input.c:81
+#: ../modules/controller-linux-input.c:81
 msgid "Button Gear Down"
 msgstr "Button Gear Down"
 
-#: ../modules/controller_linux_input.c:84
+#: ../modules/controller-linux-input.c:84
 msgid "Button Gear Up"
 msgstr "Button Gear Up"
 
-#: ../modules/controller_linux_input.c:90
-#: ../modules/controller_dx_dinput.c:443
+#: ../modules/controller-linux-input.c:90
+#: ../modules/controller-dx-dinput.c:443
 msgid "X Move Left"
 msgstr "X Move Left"
 
-#: ../modules/controller_linux_input.c:91
-#: ../modules/controller_dx_dinput.c:446
+#: ../modules/controller-linux-input.c:91
+#: ../modules/controller-dx-dinput.c:446
 msgid "X Move Right"
 msgstr "X Move Right"
 
-#: ../modules/controller_linux_input.c:92
+#: ../modules/controller-linux-input.c:92
 msgid "Y Move Forward"
 msgstr "Y Move Forward"
 
-#: ../modules/controller_linux_input.c:93
+#: ../modules/controller-linux-input.c:93
 msgid "Y Move Back"
 msgstr "Y Move Back"
 
-#: ../modules/controller_linux_input.c:94
-#: ../modules/controller_dx_dinput.c:461
+#: ../modules/controller-linux-input.c:94
+#: ../modules/controller-dx-dinput.c:461
 msgid "Z Move Up"
 msgstr "Z Move Up"
 
-#: ../modules/controller_linux_input.c:95
-#: ../modules/controller_dx_dinput.c:464
+#: ../modules/controller-linux-input.c:95
+#: ../modules/controller-dx-dinput.c:464
 msgid "Z Move Down"
 msgstr "Z Move Down"
 
-#: ../modules/controller_linux_input.c:97
+#: ../modules/controller-linux-input.c:97
 msgid "X Axis Tilt Forward"
 msgstr "X Axis Tilt Forward"
 
-#: ../modules/controller_linux_input.c:98
+#: ../modules/controller-linux-input.c:98
 msgid "X Axis Tilt Back"
 msgstr "X Axis Tilt Back"
 
-#: ../modules/controller_linux_input.c:99
-#: ../modules/controller_dx_dinput.c:479
+#: ../modules/controller-linux-input.c:99
+#: ../modules/controller-dx-dinput.c:479
 msgid "Y Axis Tilt Right"
 msgstr "Y Axis Tilt Right"
 
-#: ../modules/controller_linux_input.c:100
-#: ../modules/controller_dx_dinput.c:482
+#: ../modules/controller-linux-input.c:100
+#: ../modules/controller-dx-dinput.c:482
 msgid "Y Axis Tilt Left"
 msgstr "Y Axis Tilt Left"
 
-#: ../modules/controller_linux_input.c:101
-#: ../modules/controller_dx_dinput.c:488
+#: ../modules/controller-linux-input.c:101
+#: ../modules/controller-dx-dinput.c:488
 msgid "Z Axis Turn Left"
 msgstr "Z Axis Turn Left"
 
-#: ../modules/controller_linux_input.c:102
-#: ../modules/controller_dx_dinput.c:491
+#: ../modules/controller-linux-input.c:102
+#: ../modules/controller-dx-dinput.c:491
 msgid "Z Axis Turn Right"
 msgstr "Z Axis Turn Right"
 
-#: ../modules/controller_linux_input.c:104
+#: ../modules/controller-linux-input.c:104
 msgid "Horiz. Wheel Turn Back"
 msgstr "Horiz. Wheel Turn Back"
 
-#: ../modules/controller_linux_input.c:105
+#: ../modules/controller-linux-input.c:105
 msgid "Horiz. Wheel Turn Forward"
 msgstr "Horiz. Wheel Turn Forward"
 
-#: ../modules/controller_linux_input.c:106
+#: ../modules/controller-linux-input.c:106
 msgid "Dial Turn Left"
 msgstr "Dial Turn Left"
 
-#: ../modules/controller_linux_input.c:107
+#: ../modules/controller-linux-input.c:107
 msgid "Dial Turn Right"
 msgstr "Dial Turn Right"
 
-#: ../modules/controller_linux_input.c:108
+#: ../modules/controller-linux-input.c:108
 msgid "Wheel Turn Left"
 msgstr "Wheel Turn Left"
 
-#: ../modules/controller_linux_input.c:109
+#: ../modules/controller-linux-input.c:109
 msgid "Wheel Turn Right"
 msgstr "Wheel Turn Right"
 
-#: ../modules/controller_linux_input.c:178
+#: ../modules/controller-linux-input.c:178
 msgid "Linux input event controller"
 msgstr "Linux input event controller"
 
-#: ../modules/controller_linux_input.c:218
-#: ../modules/controller_dx_dinput.c:196 ../modules/controller_midi.c:212
+#: ../modules/controller-linux-input.c:218
+#: ../modules/controller-dx-dinput.c:196 ../modules/controller-midi.c:212
 msgid "Device:"
 msgstr "Device:"
 
-#: ../modules/controller_linux_input.c:219
+#: ../modules/controller-linux-input.c:219
 msgid "The name of the device to read Linux Input events from."
 msgstr "The name of the device to read Linux Input events from."
 
-#: ../modules/controller_linux_input.c:230
+#: ../modules/controller-linux-input.c:230
 msgid "Linux Input"
 msgstr "Linux Input"
 
-#: ../modules/controller_linux_input.c:513
+#: ../modules/controller-linux-input.c:513
 msgid "Linux Input Events"
 msgstr "Linux Input Events"
 
-#: ../modules/controller_linux_input.c:525
-#: ../modules/controller_dx_dinput.c:1095 ../modules/controller_midi.c:505
+#: ../modules/controller-linux-input.c:525
+#: ../modules/controller-dx-dinput.c:1095 ../modules/controller-midi.c:505
 msgid "No device configured"
 msgstr "No device configured"
 
-#: ../modules/controller_linux_input.c:551 ../modules/controller_midi.c:454
-#: ../modules/controller_midi.c:480
+#: ../modules/controller-linux-input.c:551 ../modules/controller-midi.c:454
+#: ../modules/controller-midi.c:480
 #, c-format
 msgid "Reading from %s"
 msgstr "Reading from %s"
 
-#: ../modules/controller_linux_input.c:569
-#: ../modules/controller_linux_input.c:623 ../modules/controller_midi.c:436
-#: ../modules/controller_midi.c:497 ../modules/controller_midi.c:568
+#: ../modules/controller-linux-input.c:569
+#: ../modules/controller-linux-input.c:623 ../modules/controller-midi.c:436
+#: ../modules/controller-midi.c:497 ../modules/controller-midi.c:568
 #, c-format
 msgid "Device not available: %s"
 msgstr "Device not available: %s"
 
-#: ../modules/controller_linux_input.c:588
-#: ../modules/controller_dx_dinput.c:1120
+#: ../modules/controller-linux-input.c:588
+#: ../modules/controller-dx-dinput.c:1120
 msgid "Device not available"
 msgstr "Device not available"
 
-#: ../modules/controller_linux_input.c:632 ../modules/controller_midi.c:577
+#: ../modules/controller-linux-input.c:632 ../modules/controller-midi.c:577
 msgid "End of file"
 msgstr "End of file"
 
-#: ../modules/controller_dx_dinput.c:156
+#: ../modules/controller-dx-dinput.c:156
 msgid "DirectX DirectInput event controller"
 msgstr "DirectX DirectInput event controller"
 
-#: ../modules/controller_dx_dinput.c:197
+#: ../modules/controller-dx-dinput.c:197
 msgid "The device to read DirectInput events from."
 msgstr "The device to read DirectInput events from."
 
-#: ../modules/controller_dx_dinput.c:206
+#: ../modules/controller-dx-dinput.c:206
 msgid "DirectX DirectInput"
 msgstr "DirectX DirectInput"
 
-#: ../modules/controller_dx_dinput.c:420
+#: ../modules/controller-dx-dinput.c:420
 #, c-format
 msgid "Button %d"
 msgstr "Button %d"
 
-#: ../modules/controller_dx_dinput.c:423
+#: ../modules/controller-dx-dinput.c:423
 #, c-format
 msgid "Button %d Press"
 msgstr "Button %d Press"
 
-#: ../modules/controller_dx_dinput.c:426
+#: ../modules/controller-dx-dinput.c:426
 #, c-format
 msgid "Button %d Release"
 msgstr "Button %d Release"
 
-#: ../modules/controller_dx_dinput.c:452
+#: ../modules/controller-dx-dinput.c:452
 msgid "Y Move Away"
 msgstr "Y Move Away"
 
-#: ../modules/controller_dx_dinput.c:455
+#: ../modules/controller-dx-dinput.c:455
 msgid "Y Move Near"
 msgstr "Y Move Near"
 
-#: ../modules/controller_dx_dinput.c:470
+#: ../modules/controller-dx-dinput.c:470
 msgid "X Axis Tilt Away"
 msgstr "X Axis Tilt Away"
 
-#: ../modules/controller_dx_dinput.c:473
+#: ../modules/controller-dx-dinput.c:473
 msgid "X Axis Tilt Near"
 msgstr "X Axis Tilt Near"
 
-#: ../modules/controller_dx_dinput.c:502
+#: ../modules/controller-dx-dinput.c:502
 #, c-format
 msgid "Slider %d Increase"
 msgstr "Slider %d Increase"
 
-#: ../modules/controller_dx_dinput.c:505
+#: ../modules/controller-dx-dinput.c:505
 #, c-format
 msgid "Slider %d Decrease"
 msgstr "Slider %d Decrease"
 
-#: ../modules/controller_dx_dinput.c:515
+#: ../modules/controller-dx-dinput.c:515
 #, c-format
 msgid "POV %d X View"
 msgstr "POV %d X View"
 
-#: ../modules/controller_dx_dinput.c:518
+#: ../modules/controller-dx-dinput.c:518
 #, c-format
 msgid "POV %d Y View"
 msgstr "POV %d Y View"
 
-#: ../modules/controller_dx_dinput.c:521
+#: ../modules/controller-dx-dinput.c:521
 #, c-format
 msgid "POV %d Return"
 msgstr "POV %d Return"
 
-#: ../modules/controller_dx_dinput.c:1084
+#: ../modules/controller-dx-dinput.c:1084
 msgid "DirectInput Events"
 msgstr "DirectInput Events"
 
-#: ../modules/controller_midi.c:164
+#: ../modules/controller-midi.c:164
 msgid "MIDI event controller"
 msgstr "MIDI event controller"
 
-#: ../modules/controller_midi.c:203
+#: ../modules/controller-midi.c:203
 msgid "The name of the device to read MIDI events from."
 msgstr "The name of the device to read MIDI events from."
 
-#: ../modules/controller_midi.c:206
+#: ../modules/controller-midi.c:206
 msgid "Enter 'alsa' to use the ALSA sequencer."
 msgstr "Enter 'alsa' to use the ALSA sequencer."
 
-#: ../modules/controller_midi.c:221
+#: ../modules/controller-midi.c:221
 msgid "Channel:"
 msgstr "Channel:"
 
-#: ../modules/controller_midi.c:222
+#: ../modules/controller-midi.c:222
 msgid ""
 "The MIDI channel to read events from. Set to -1 for reading from all MIDI "
 "channels."
@@ -1810,37 +1818,78 @@ msgstr ""
 "The MIDI channel to read events from. Set to -1 for reading from all MIDI "
 "channels."
 
-#: ../modules/controller_midi.c:226
+#: ../modules/controller-midi.c:226
 msgid "MIDI"
 msgstr "MIDI"
 
-#: ../modules/controller_midi.c:355
+#: ../modules/controller-midi.c:355
 #, c-format
 msgid "Note %02x on"
 msgstr "Note %02x on"
 
-#: ../modules/controller_midi.c:358
+#: ../modules/controller-midi.c:358
 #, c-format
 msgid "Note %02x off"
 msgstr "Note %02x off"
 
-#: ../modules/controller_midi.c:361
+#: ../modules/controller-midi.c:361
 #, c-format
 msgid "Controller %03d"
 msgstr "Controller %03d"
 
-#: ../modules/controller_midi.c:408
+#: ../modules/controller-midi.c:408
 msgid "MIDI Events"
 msgstr "MIDI Events"
 
-#: ../modules/controller_midi.c:426
+#: ../modules/controller-midi.c:426
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../modules/controller_midi.c:428
+#: ../modules/controller-midi.c:428
 msgid "GIMP MIDI Input Controller"
 msgstr "GIMP MIDI Input Controller"
 
+#~ msgid "%d Byte"
+#~ msgid_plural "%d Bytes"
+#~ msgstr[0] "%d Byte"
+#~ msgstr[1] "%d Bytes"
+
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f KB"
+
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+
+#~ msgid "%d KB"
+#~ msgstr "%d KB"
+
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f MB"
+
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+
+#~ msgid "%d MB"
+#~ msgstr "%d MB"
+
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f GB"
+
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+
+#~ msgid "%d GB"
+#~ msgstr "%d GB"
+
+#~ msgid "profile|None"
+#~ msgstr "profile|None"
+
+#~ msgid "Painter-style triangle color selector"
+#~ msgstr "Painter-style triangle colour selector"
+
+#~ msgid "Triangle"
+#~ msgstr "Triangle"
+
 #~ msgid "RGB working space profile:"
 #~ msgstr "RGB working space profile:"
 
diff --git a/po-libgimp/eu.po b/po-libgimp/eu.po
index 66645a0721..3a756d637f 100644
--- a/po-libgimp/eu.po
+++ b/po-libgimp/eu.po
@@ -3,21 +3,21 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
 #
 # Hizkuntza Politikarako Sailburuordetza , 2004.
-# Iñaki Larrañaga Murgoitio , 2004, 2006, 2008.
+# Iñaki Larrañaga Murgoitio , 2004, 2006, 2008, 2009.
 # Iñaki Larrañaga Murgoitio , 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-08-27 19:23+0200\n"
-"PO-Revision-Date: 2008-08-27 19:28+0200\n"
+"PO-Revision-Date: 2009-09-07 12:44+0200\n"
 "Last-Translator: Iñaki Larrañaga Murgoitio \n"
 "Language-Team: Basque \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "\n"
 
 #. procedure executed successfully
@@ -499,7 +499,7 @@ msgstr "Argitasuna"
 
 #: ../libgimpbase/gimpbaseenums.c:295
 msgid "Luminosity"
-msgstr "Argitasuna"
+msgstr "Klartasuna"
 
 #: ../libgimpbase/gimpbaseenums.c:296
 msgid "Average"
diff --git a/po-libgimp/it.po b/po-libgimp/it.po
index 1e1aa615c8..8263568298 100644
--- a/po-libgimp/it.po
+++ b/po-libgimp/it.po
@@ -1,17 +1,37 @@
 # This is the Italian catalog for The GIMP.
 # Copyright (C) 1999 Free Software Foundation, Inc.
-# Daniele Medri , 2000-2002
-# Marco Ciampa , 2003-2008
-# Luca Ferretti , 2006
+# Daniele Medri , 2000, 2001, 2002
+# Marco Ciampa , 2003, 2004, 2005, 2006, 2007, 2008, 2009
 # Alessandro Falappa , 2007
+# Luca Ferretti , 2006, 2009.
+#
+# Convenzioni adottate per Gimp:
+#
+#  brush = pennello
+#  brush pipe = pennello animato
+#  canvas = superficie (impreciso ma entrato nel gergo convenzionale grafico italiano)
+#  emboss = rilievo
+#  feather = sfumata
+#  gradients = gradiente
+#  layer = livello (errato ma entrato nel gergo convenzionale grafico italiano)
+#  map = mappa
+#  newsprint = effetto giornale
+#  ripple = increspatura
+#  pattern = motivo
+#  path = tracciato
+#  palette = tavolozza
+#  (to) render = render, disegnare
+#  stroke = delineare
+#  (to) shear = inclinare
+#  undo history = cronologia annullamenti
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp 2.3\n"
+"Project-Id-Version: gimp 2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-09-20 10:23+0200\n"
-"PO-Revision-Date: 2008-09-20 10:28+0200\n"
-"Last-Translator: Marco Ciampa \n"
-"Language-Team: gimp.linux.it\n"
+"POT-Creation-Date: 2009-08-17 17:00+0200\n"
+"PO-Revision-Date: 2009-08-17 17:00+0200\n"
+"Last-Translator: Luca Ferretti \n"
+"Language-Team: Italian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -45,7 +65,7 @@ msgstr "Selezione pennello"
 #: ../libgimp/gimpbrushselectbutton.c:913
 #: ../libgimp/gimppatternselectbutton.c:714
 msgid "_Browse..."
-msgstr "_Scorri..."
+msgstr "E_splora..."
 
 #: ../libgimp/gimpexport.c:217 ../libgimp/gimpexport.c:253
 #, c-format
@@ -61,7 +81,8 @@ msgstr "Unisci livelli visibili"
 #, c-format
 msgid "%s plug-in can't handle layer offsets, size or opacity"
 msgstr ""
-"Il plug-in %s non può gestire la posizione, dimensione o opacità dei livelli"
+"Il plug-in %s non può gestire la posizione, la dimensione o l'opacità dei "
+"livelli"
 
 #: ../libgimp/gimpexport.c:235 ../libgimp/gimpexport.c:244
 #, c-format
@@ -85,7 +106,7 @@ msgstr "Il plug-in %s non può gestire la trasparenza"
 #: ../libgimp/gimpexport.c:271
 #, c-format
 msgid "%s plug-in can't handle layer masks"
-msgstr "Il plug-in %s non può gestire maschere di livello"
+msgstr "Il plug-in %s non può gestire le maschere di livello"
 
 #: ../libgimp/gimpexport.c:272
 msgid "Apply Layer Masks"
@@ -94,17 +115,17 @@ msgstr "Applica maschere di livello"
 #: ../libgimp/gimpexport.c:280
 #, c-format
 msgid "%s plug-in can only handle RGB images"
-msgstr "Il plug-in %s può gestire solo immagini RGB"
+msgstr "Il plug-in %s può gestire solo le immagini RGB"
 
 #: ../libgimp/gimpexport.c:281 ../libgimp/gimpexport.c:319
 #: ../libgimp/gimpexport.c:328
 msgid "Convert to RGB"
-msgstr "Conversione a RGB"
+msgstr "Converti in RGB"
 
 #: ../libgimp/gimpexport.c:289
 #, c-format
 msgid "%s plug-in can only handle grayscale images"
-msgstr "Il plug-in %s può gestire solo immagini in scala di grigi"
+msgstr "Il plug-in %s può gestire solo le immagini in scala di grigi"
 
 #: ../libgimp/gimpexport.c:290 ../libgimp/gimpexport.c:319
 #: ../libgimp/gimpexport.c:340
@@ -114,7 +135,7 @@ msgstr "Converti in scala di grigi"
 #: ../libgimp/gimpexport.c:298
 #, c-format
 msgid "%s plug-in can only handle indexed images"
-msgstr "Il plug-in %s può gestire solo immagini indicizzate"
+msgstr "Il plug-in %s può gestire solo le immagini indicizzate"
 
 #: ../libgimp/gimpexport.c:299 ../libgimp/gimpexport.c:328
 #: ../libgimp/gimpexport.c:338
@@ -122,40 +143,38 @@ msgid ""
 "Convert to Indexed using default settings\n"
 "(Do it manually to tune the result)"
 msgstr ""
-"Converti in immagini indicizzate utilizzando \n"
-"le impostazioni predefinite (impostare manualmente\n"
-"per controllare il risultato)"
+"Converti in indicizzata usando le impostazioni predefinite\n"
+"(impostare manualmente per controllare il risultato)"
 
 #: ../libgimp/gimpexport.c:308
 #, c-format
 msgid "%s plug-in can only handle bitmap (two color) indexed images"
 msgstr ""
-"Il plug-in %s può gestire solo immagini bitmap (due colori) o indicizzate"
+"Il plug-in %s può gestire solo le immagini indicizzate bitmap (due colori)"
 
 #: ../libgimp/gimpexport.c:309
 msgid ""
 "Convert to Indexed using bitmap default settings\n"
 "(Do it manually to tune the result)"
 msgstr ""
-"Converti in immagini indicizzate utilizzando le\n"
-"impostazioni predefinite delle immagini bitmap\n"
-"(impostate manualmente per controllare il risultato)"
+"Converti in indicizzata usando le impostazioni predefinite per bitmap\n"
+"(impostare manualmente per controllare il risultato)"
 
 #: ../libgimp/gimpexport.c:318
 #, c-format
 msgid "%s plug-in can only handle RGB or grayscale images"
-msgstr "Il plug-in %s può gestire solo immagini RGB o in scala di grigi"
+msgstr "Il plug-in %s può gestire solo le immagini RGB o in scala di grigi"
 
 #: ../libgimp/gimpexport.c:327
 #, c-format
 msgid "%s plug-in  can only handle RGB or indexed images"
-msgstr "Il plug-in %s può gestire solo immagini RGB o indicizzate"
+msgstr "Il plug-in %s può gestire solo le immagini RGB o indicizzate"
 
 #: ../libgimp/gimpexport.c:337
 #, c-format
 msgid "%s plug-in can only handle grayscale or indexed images"
 msgstr ""
-"Il plug-in %s può gestire solo immagini in scala di grigi o indicizzate"
+"Il plug-in %s può gestire solo le immagini in scala di grigi o indicizzate"
 
 #: ../libgimp/gimpexport.c:348
 #, c-format
@@ -221,7 +240,7 @@ msgstr ""
 
 #: ../libgimp/gimpfontselectbutton.c:130
 msgid "Font Selection"
-msgstr "Selezione caratteri"
+msgstr "Selezione tipo di carattere"
 
 #: ../libgimp/gimpfontselectbutton.c:145
 msgid "Sans"
@@ -307,7 +326,7 @@ msgstr "Ricerca per tipo"
 #, c-format
 msgid "%d procedure"
 msgid_plural "%d procedures"
-msgstr[0] "%d procedure"
+msgstr[0] "%d procedura"
 msgstr[1] "%d procedure"
 
 #: ../libgimp/gimpprocbrowserdialog.c:463
@@ -350,9 +369,11 @@ msgstr "Data:"
 msgid "Copyright:"
 msgstr "Copyright:"
 
+# era percento, ma il dizionario dice che la
+# grafia separata è più frequente
 #: ../libgimp/gimpunitcache.c:57
 msgid "percent"
-msgstr "percento"
+msgstr "per cento"
 
 #: ../libgimpbase/gimpbaseenums.c:28
 msgid "_White (full opacity)"
@@ -410,13 +431,14 @@ msgstr "Riempi colore SF"
 msgid "Pattern fill"
 msgstr "Riempimento con motivo"
 
+# questo e i seguenti simili sono commenti
 #: ../libgimpbase/gimpbaseenums.c:128
 msgid "Add to the current selection"
-msgstr "Aggiungi alla selezione corrente"
+msgstr "Aggiunge alla selezione corrente"
 
 #: ../libgimpbase/gimpbaseenums.c:129
 msgid "Subtract from the current selection"
-msgstr "Sottrai dalla selezione corrente"
+msgstr "Sottrae dalla selezione corrente"
 
 #: ../libgimpbase/gimpbaseenums.c:130
 msgid "Replace the current selection"
@@ -442,6 +464,8 @@ msgstr "Blu"
 msgid "Gray"
 msgstr "Grigio"
 
+# o indicizzata? nel senso di immagine?
+# boh
 #: ../libgimpbase/gimpbaseenums.c:167 ../libgimpbase/gimpbaseenums.c:532
 msgid "Indexed"
 msgstr "Indicizzato"
@@ -538,17 +562,18 @@ msgstr "Conica (simm.)"
 msgid "Conical (asym)"
 msgstr "Conica (asimm.)"
 
+# era "Conformata", ma mi pare errato...
 #: ../libgimpbase/gimpbaseenums.c:395
 msgid "Shaped (angular)"
-msgstr "Conformata (angolare)"
+msgstr "Sagomata (angolare)"
 
 #: ../libgimpbase/gimpbaseenums.c:396
 msgid "Shaped (spherical)"
-msgstr "Conformata (sferica)"
+msgstr "Sagomata (sferica)"
 
 #: ../libgimpbase/gimpbaseenums.c:397
 msgid "Shaped (dimpled)"
-msgstr "Conformata (curvata)"
+msgstr "Sagomata (curvata)"
 
 #: ../libgimpbase/gimpbaseenums.c:398
 msgid "Spiral (cw)"
@@ -566,26 +591,32 @@ msgstr "Intersezioni (punti)"
 msgid "Intersections (crosshairs)"
 msgstr "Intersezioni (crocini)"
 
+# Tratteggiata? nel senso linea?
 #: ../libgimpbase/gimpbaseenums.c:432
 msgid "Dashed"
 msgstr "Tratteggio"
 
+# vedi sopra
 #: ../libgimpbase/gimpbaseenums.c:433
 msgid "Double dashed"
 msgstr "Doppio tratteggio"
 
+# vedi sopra
 #: ../libgimpbase/gimpbaseenums.c:434
 msgid "Solid"
 msgstr "Continuo"
 
+# enumer. per tipo di icona
 #: ../libgimpbase/gimpbaseenums.c:463
 msgid "Stock ID"
-msgstr "ID blocco"
+msgstr "ID di stock"
 
+# enumer. per tipo di icona
 #: ../libgimpbase/gimpbaseenums.c:464
 msgid "Inline pixbuf"
-msgstr "Pixbuf inlinea"
+msgstr "Pixbuf incorporata"
 
+# enumer. per tipo di icona
 #: ../libgimpbase/gimpbaseenums.c:465
 msgid "Image file"
 msgstr "File immagine"
@@ -634,22 +665,27 @@ msgstr "Cubica"
 msgid "Sinc (Lanczos3)"
 msgstr "Sinc (Lanczos3)"
 
+# paint-application-mode
 #: ../libgimpbase/gimpbaseenums.c:594
 msgid "Constant"
 msgstr "Costante"
 
+# paint-application-mode
 #: ../libgimpbase/gimpbaseenums.c:595
 msgid "Incremental"
 msgstr "Incrementale"
 
+# repeat-mode
 #: ../libgimpbase/gimpbaseenums.c:624 ../modules/display-filter-lcms.c:191
 msgid "None"
-msgstr "Nessuno"
+msgstr "Nessuna"
 
+# repeat-mode
 #: ../libgimpbase/gimpbaseenums.c:625
 msgid "Sawtooth wave"
 msgstr "Onda a dente di sega"
 
+# repeat-mode
 #: ../libgimpbase/gimpbaseenums.c:626
 msgid "Triangular wave"
 msgstr "Onda triangolare"
@@ -682,6 +718,7 @@ msgstr "Ombre"
 msgid "Midtones"
 msgstr "Mezzi toni"
 
+# zone di luce? punti luminosi? punti luce?
 #: ../libgimpbase/gimpbaseenums.c:717
 msgid "Highlights"
 msgstr "Alte luci"
@@ -698,6 +735,8 @@ msgstr "Correttiva (indietro)"
 msgid "Adjust"
 msgstr "Regola"
 
+# non mi convince molto anche perché taglia
+# è già Cut(ctrl+x).... 
 #: ../libgimpbase/gimpbaseenums.c:777
 msgid "Clip"
 msgstr "Taglia"
@@ -763,7 +802,7 @@ msgstr "Modalità di operazione per la gestione del colore."
 
 #: ../libgimpconfig/gimpcolorconfig.c:44
 msgid "The color profile of your (primary) monitor."
-msgstr "Profilo di colore per il monitor (principale)."
+msgstr "Il profilo di colore del monitor (principale)."
 
 #: ../libgimpconfig/gimpcolorconfig.c:46
 msgid ""
@@ -771,9 +810,9 @@ msgid ""
 "windowing system.  The configured monitor profile is then only used as a "
 "fallback."
 msgstr ""
-"Se attivata, GIMP tenterà di usare il profilo di colore dello schermo "
+"Se attivata, GIMP tenta di usare il profilo di colore dello schermo "
 "dall'ambiente grafico. Il profilo del monitor configurato verrà usato solo "
-"in caso di fallimento dell'operazione."
+"come ripiego."
 
 #: ../libgimpconfig/gimpcolorconfig.c:50
 msgid "The default RGB working space color profile."
@@ -791,14 +830,14 @@ msgstr ""
 
 #: ../libgimpconfig/gimpcolorconfig.c:56
 msgid "Sets how colors are mapped for your display."
-msgstr "Imposta come verranno mappati i colori per il display."
+msgstr "Imposta come sono mappati i colori per il display."
 
 #: ../libgimpconfig/gimpcolorconfig.c:58
 msgid ""
 "Sets how colors are converted from RGB working space to the print simulation "
 "device."
 msgstr ""
-"Imposta come i colori saranno convertiti dallo spazio di lavoro RGB al "
+"Imposta come i colori sono convertiti dallo spazio di lavoro RGB al "
 "dispositivo di simulazione di stampa."
 
 #: ../libgimpconfig/gimpcolorconfig.c:61
@@ -806,12 +845,12 @@ msgid ""
 "When enabled, the print simulation will mark colors which can not be "
 "represented in the target color space."
 msgstr ""
-"Se abilitata, la simulazione di stampa segnerà i colori che non potranno "
-"essere rappresentati nello spazio di colore del risultato."
+"Se abilitata, la simulazione di stampa contrassegna i colori che non "
+"potranno essere rappresentati nello spazio di colore di destinazione."
 
 #: ../libgimpconfig/gimpcolorconfig.c:64
 msgid "The color to use for marking colors which are out of gamut."
-msgstr "Il colore da usare per segnare i colori fuori gamma."
+msgstr "Il colore da usare per contrassegnare i colori fuori gamma."
 
 #: ../libgimpconfig/gimpcolorconfig-enums.c:24
 msgid "No color management"
@@ -850,8 +889,7 @@ msgstr "il valore per il token %s non è una stringa UTF-8 valida"
 #: ../libgimpconfig/gimpconfig-deserialize.c:436
 #, c-format
 msgid "expected 'yes' or 'no' for boolean token %s, got '%s'"
-msgstr ""
-"per un token booleano %s era previsto \"yes\" o \"no\" ma è arrivato \"%s\""
+msgstr "atteso \"yes\" o \"no\" per il token booleano %s, ottenuto \"%s\""
 
 #: ../libgimpconfig/gimpconfig-deserialize.c:510
 #, c-format
@@ -861,7 +899,7 @@ msgstr "valore \"%s\" non valido per il token %s"
 #: ../libgimpconfig/gimpconfig-deserialize.c:525
 #, c-format
 msgid "invalid value '%ld' for token %s"
-msgstr "valore non valido \"%ld\" per il token %s"
+msgstr "valore \"%ld\" non valido per il token %s"
 
 #: ../libgimpconfig/gimpconfig-deserialize.c:594
 #, c-format
@@ -873,18 +911,18 @@ msgstr "durante l'analisi del token \"%s\": %s"
 #: ../libgimpconfig/gimpscanner.c:579
 #: ../libgimpwidgets/gimpcolorprofilestore.c:656
 msgid "fatal parse error"
-msgstr "errore di analisi fatale"
+msgstr "errore di analisi irrimediabile"
 
 #: ../libgimpconfig/gimpconfig-path.c:377
 #, c-format
 msgid "Cannot expand ${%s}"
-msgstr "Impossibile espandere $(%s)"
+msgstr "Impossibile espandere ${%s}"
 
 #: ../libgimpconfig/gimpconfigwriter.c:78
-#: ../libgimpconfig/gimpconfigwriter.c:693
+#: ../libgimpconfig/gimpconfigwriter.c:718
 #, c-format
 msgid "Error writing to '%s': %s"
-msgstr "Errore nella scrittura su \"%s\": %s"
+msgstr "Errore nello scrivere su \"%s\": %s"
 
 #: ../libgimpconfig/gimpconfigwriter.c:136
 #, c-format
@@ -896,25 +934,26 @@ msgstr "Impossibile creare il file temporaneo per \"%s\": %s"
 msgid "Could not open '%s' for writing: %s"
 msgstr "Impossibile aprire \"%s\" in scrittura: %s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:674
+#: ../libgimpconfig/gimpconfigwriter.c:679
+#: ../libgimpconfig/gimpconfigwriter.c:699
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
 "The original file has not been touched."
 msgstr ""
-"Errore nella scrittura su file temporaneo per \"%s\": %s\n"
+"Errore nello scrivere sul file temporaneo per \"%s\": %s\n"
 "Il file originale non è stato toccato."
 
-#: ../libgimpconfig/gimpconfigwriter.c:682
+#: ../libgimpconfig/gimpconfigwriter.c:707
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
 "No file has been created."
 msgstr ""
-"Errore nella scrittura su file temporaneo per \"%s\": %s\n"
+"Errore nello scrivere sul file temporaneo per \"%s\": %s\n"
 "Non è stato creato alcun file."
 
-#: ../libgimpconfig/gimpconfigwriter.c:711
+#: ../libgimpconfig/gimpconfigwriter.c:731
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr "Impossibile creare \"%s\": %s"
@@ -927,7 +966,7 @@ msgstr "stringa UTF-8 non valida"
 #: ../libgimpconfig/gimpscanner.c:606
 #, c-format
 msgid "Error while parsing '%s' in line %d: %s"
-msgstr "Errore durante l'elaborazione di \"%s\" alla riga %d: %s"
+msgstr "Errore durante l'analisi di \"%s\" alla riga %d: %s"
 
 #: ../libgimpmodule/gimpmodule.c:153 ../libgimpmodule/gimpmodule.c:171
 #: ../libgimpmodule/gimpmodule.c:280 ../libgimpmodule/gimpmodule.c:307
@@ -946,7 +985,7 @@ msgstr "Caricato"
 
 #: ../libgimpmodule/gimpmodule.c:377
 msgid "Load failed"
-msgstr "Caricamento fallito"
+msgstr "Caricamento non riuscito"
 
 #: ../libgimpmodule/gimpmodule.c:378
 msgid "Not loaded"
@@ -965,12 +1004,12 @@ msgstr ""
 #: ../libgimpthumb/gimpthumb-utils.c:247 ../libgimpthumb/gimpthumb-utils.c:315
 #, c-format
 msgid "Failed to create thumbnail folder '%s'."
-msgstr "Fallita la creazione della cartella per le miniature \"%s\"."
+msgstr "Creazione della cartella \"%s\" per le miniature non riuscita."
 
 #: ../libgimpthumb/gimpthumbnail.c:498
 #, c-format
 msgid "Thumbnail contains no Thumb::URI tag"
-msgstr "La miniatura non contiene la tag Thumb::URI"
+msgstr "La miniatura non contiene il tag Thumb::URI"
 
 #: ../libgimpthumb/gimpthumbnail.c:898
 #, c-format
@@ -1023,8 +1062,8 @@ msgid ""
 "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
 "CSS color names."
 msgstr ""
-"Notazione colore esadecimale come si usa in HTML e nei CSS. Questa voce "
-"accetta anche i nomi di colore CSS."
+"Notazione colore esadecimale come si usa in HTML e CSS. Questa voce accetta "
+"anche i nomi di colore CSS."
 
 #: ../libgimpwidgets/gimpcolorselection.c:292
 msgid "HTML _notation:"
@@ -1066,11 +1105,12 @@ msgstr "Gigabyte"
 #: ../libgimpwidgets/gimppageselector.c:269
 #: ../libgimpwidgets/gimppageselector.c:1166
 msgid "Nothing selected"
-msgstr "Selezione nulla"
+msgstr "Nessuna selezione"
 
+# usato accelerato gtk+
 #: ../libgimpwidgets/gimppageselector.c:287
 msgid "Select _All"
-msgstr "Selezion_a tutto"
+msgstr "_Seleziona tutto"
 
 #: ../libgimpwidgets/gimppageselector.c:307
 msgid "Select _range:"
@@ -1092,15 +1132,15 @@ msgstr "Pagina %d"
 
 #: ../libgimpwidgets/gimppageselector.c:1171
 msgid "One page selected"
-msgstr "Una pagina selezionata"
+msgstr "Selezionata una pagina"
 
 #: ../libgimpwidgets/gimppageselector.c:1178
 #: ../libgimpwidgets/gimppageselector.c:1182
 #, c-format
 msgid "%d page selected"
 msgid_plural "All %d pages selected"
-msgstr[0] "%d pagina selezionata"
-msgstr[1] "%d pagine selezionate"
+msgstr[0] "Selezionata %d pagina"
+msgstr[1] "Selezionate tutte le pagine (%d)"
 
 #: ../libgimpwidgets/gimppatheditor.c:214
 msgid "Writable"
@@ -1170,10 +1210,9 @@ msgstr "Incolla come nuovo"
 msgid "Paste Into"
 msgstr "Incolla dentro"
 
-# Un'altra traduzione per reset potrebbe essere "Azzera" -Luca
 #: ../libgimpwidgets/gimpstock.c:119
 msgid "_Reset"
-msgstr "_Reimposta"
+msgstr "Azze_ra"
 
 #: ../libgimpwidgets/gimpstock.c:120
 msgid "Visible"
@@ -1217,7 +1256,7 @@ msgstr "_Inclina"
 
 #: ../libgimpwidgets/gimpunitmenu.c:266
 msgid "More..."
-msgstr "Altri..."
+msgstr "Altro..."
 
 #: ../libgimpwidgets/gimpunitmenu.c:581
 msgid "Unit Selection"
@@ -1237,8 +1276,7 @@ msgid ""
 "a given \"random\" operation"
 msgstr ""
 "Usare questo valore per la generazione del seme di casualità - questo "
-"permette \n"
-"di ripetere una data operazione \"casuale\""
+"permette di ripetere una data operazione \"casuale\""
 
 #: ../libgimpwidgets/gimpwidgets.c:515
 msgid "_New Seed"
@@ -1354,7 +1392,7 @@ msgstr "_Gamma:"
 
 #: ../modules/display-filter-high-contrast.c:90
 msgid "High Contrast color display filter"
-msgstr "Filtro di visualizzazione colore ad alto contrasto"
+msgstr "Filtro di visualizzazione colore a contrasto elevato"
 
 #: ../modules/display-filter-high-contrast.c:129
 msgid "Contrast"
@@ -1387,7 +1425,7 @@ msgstr "Modalità di operazione:"
 
 #: ../modules/display-filter-lcms.c:233
 msgid "Image profile:"
-msgstr "Profilo immagine:"
+msgstr "Profilo dell'immagine:"
 
 #: ../modules/display-filter-lcms.c:241
 msgid "Monitor profile:"
@@ -1399,7 +1437,7 @@ msgstr "Profilo di simulazione di stampa:"
 
 #: ../modules/display-filter-proof.c:97
 msgid "Color proof filter using ICC color profile"
-msgstr "Fitro a prova di colore usando i profili di colore ICC"
+msgstr "Filtro a prova di colore usando i profili di colore ICC"
 
 #: ../modules/display-filter-proof.c:145
 msgid "Color Proof"
@@ -1407,7 +1445,7 @@ msgstr "Prova di colore"
 
 #: ../modules/display-filter-proof.c:311
 msgid "Choose an ICC Color Profile"
-msgstr "Scegli un profilo di colore ICC"
+msgstr "Scegliere un profilo di colore ICC"
 
 #: ../modules/display-filter-proof.c:338
 msgid "All files (*.*)"
@@ -1515,11 +1553,11 @@ msgstr "Acquerelli"
 msgid "Pressure"
 msgstr "Pressione"
 
-#: ../modules/color-selector-wheel.c:98
+#: ../modules/color-selector-wheel.c:103
 msgid "HSV color wheel"
 msgstr "Ruota di colori HSV"
 
-#: ../modules/color-selector-wheel.c:129
+#: ../modules/color-selector-wheel.c:134
 msgid "Wheel"
 msgstr "Ruota"
 
@@ -1619,7 +1657,7 @@ msgstr "A sinistra spostamento X"
 #: ../modules/controller-linux-input.c:91
 #: ../modules/controller-dx-dinput.c:446
 msgid "X Move Right"
-msgstr "A destra Spostamento X"
+msgstr "A destra spostamento X"
 
 #: ../modules/controller-linux-input.c:92
 msgid "Y Move Forward"
@@ -1675,6 +1713,12 @@ msgstr "Marcia indietro rotella orizzontale"
 msgid "Horiz. Wheel Turn Forward"
 msgstr "Marcia avanti rotella orizzontale"
 
+#  { REL_DIAL,   "dial-turn-left",                N_("Dial Turn Left")
+#           },
+#   { REL_DIAL,   "dial-turn-right",               N_("Dial Turn Right")
+#           },
+#
+#  e trovando REL_DIAL nei sorgenti di un modulo del kernel Linux, credo che si riferisca ad apparecchi come  http://en.wikipedia.org/wiki/Griffin_PowerMate
 #: ../modules/controller-linux-input.c:106
 msgid "Dial Turn Left"
 msgstr "Tasto a sinistra"
@@ -1821,7 +1865,7 @@ msgstr "Il nome del dispositivo da cui leggere gli eventi MIDI."
 
 #: ../modules/controller-midi.c:206
 msgid "Enter 'alsa' to use the ALSA sequencer."
-msgstr "Immettere 'alsa' per usare il sequencer ALSA."
+msgstr "Inserire \"alsa\" per usare il sequencer ALSA."
 
 #: ../modules/controller-midi.c:221
 msgid "Channel:"
diff --git a/po-libgimp/ja.po b/po-libgimp/ja.po
index a4a0617d34..7f5be32dd4 100644
--- a/po-libgimp/ja.po
+++ b/po-libgimp/ja.po
@@ -1,23 +1,24 @@
 # Japanese message table for GIMP 2.0
-# Copyright (C) 1998-2005,2008 Free Software Foundation, Inc.
+# Copyright (C) 1998-2005,2008-2009 Free Software Foundation, Inc.
 # SHIRASAKI Yasuhiro , 1998-2001, 2004.
 # Ryoichi INAGAKI , 2003, 2004.
 # Tadashi Jokagi , 2005.
 # OKANO Takayoshi , 2005.
-# Nishibori Kiyotaka , 2008
+# Nishibori Kiyotaka , 2008-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-01 11:08+0900\n"
-"PO-Revision-Date: 2008-10-30 23:08+0900\n"
+"Project-Id-Version: gimp gimp-2-6\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=Internationalisation\n"
+"POT-Creation-Date: 2009-10-03 21:11+0900\n"
+"PO-Revision-Date: 2009-10-03 21:20+0900\n"
 "Last-Translator: Nishibori Kiyotaka \n"
-"Language-Team: Japanese \n"
+"Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #. procedure executed successfully
 #: ../libgimp/gimp.c:1045
@@ -304,7 +305,6 @@ msgstr "型で検索中"
 msgid "%d procedure"
 msgid_plural "%d procedures"
 msgstr[0] "%d 個のプロシージャ"
-msgstr[1] "%d 個のプロシージャ"
 
 #: ../libgimp/gimpprocbrowserdialog.c:463
 msgid "No matches for your query"
@@ -315,7 +315,6 @@ msgstr "条件に合致するものがありません"
 msgid "%d procedure matches your query"
 msgid_plural "%d procedures match your query"
 msgstr[0] "%d 個のプロシージャが合致しました"
-msgstr[1] "%d 個のプロシージャが合致しました"
 
 #. count label
 #: ../libgimp/gimpprocbrowserdialog.c:516 ../libgimpwidgets/gimpbrowser.c:114
@@ -876,7 +875,7 @@ msgid "Cannot expand ${%s}"
 msgstr "${%s} を展開できません"
 
 #: ../libgimpconfig/gimpconfigwriter.c:78
-#: ../libgimpconfig/gimpconfigwriter.c:693
+#: ../libgimpconfig/gimpconfigwriter.c:718
 #, c-format
 msgid "Error writing to '%s': %s"
 msgstr ""
@@ -900,7 +899,8 @@ msgstr ""
 "（詳細または原因は次のとおりです）\n"
 "  %s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:674
+#: ../libgimpconfig/gimpconfigwriter.c:679
+#: ../libgimpconfig/gimpconfigwriter.c:699
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -912,7 +912,7 @@ msgstr ""
 "\n"
 "元ファイルは変更されていません"
 
-#: ../libgimpconfig/gimpconfigwriter.c:682
+#: ../libgimpconfig/gimpconfigwriter.c:707
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -924,7 +924,7 @@ msgstr ""
 "\n"
 "ファイルは作成されませんでした"
 
-#: ../libgimpconfig/gimpconfigwriter.c:711
+#: ../libgimpconfig/gimpconfigwriter.c:731
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr ""
@@ -1123,7 +1123,6 @@ msgstr "1 ページを選択"
 msgid "%d page selected"
 msgid_plural "All %d pages selected"
 msgstr[0] "%d ページを選択"
-msgstr[1] "複数ページ(%dページ)を選択"
 
 #: ../libgimpwidgets/gimppatheditor.c:214
 msgid "Writable"
@@ -1159,7 +1158,6 @@ msgstr "プレビュー(_P)"
 msgid "This text input field is limited to %d character."
 msgid_plural "This text input field is limited to %d characters."
 msgstr[0] "この文字入力フィールドは %d 文字に制限されています。"
-msgstr[1] "この文字入力フィールドは %d 文字に制限されています。"
 
 #: ../libgimpwidgets/gimpstock.c:112
 msgid "Anchor"
@@ -1896,7 +1894,6 @@ msgstr "GIMP MIDI 入力コントローラ"
 #~ msgid "%d Byte"
 #~ msgid_plural "%d Bytes"
 #~ msgstr[0] "%d バイト"
-#~ msgstr[1] "%d バイト"
 
 #~ msgid "%.2f KB"
 #~ msgstr "%.2f KB"
diff --git a/po-libgimp/nn.po b/po-libgimp/nn.po
index e63519da01..e308bb1009 100644
--- a/po-libgimp/nn.po
+++ b/po-libgimp/nn.po
@@ -3,10 +3,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-12 15:26+0100\n"
-"PO-Revision-Date: 2008-03-05 21:54+0100\n"
-"Last-Translator: Kolbjørn Stuestøl \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n"
+"POT-Creation-Date: 2009-04-17 09:06+0000\n"
+"PO-Revision-Date: 2009-06-12 18:12+0100\n"
+"Last-Translator: Kolbjørn Stuestøl \n"
 "Language-Team: Kolbjørn Stuestøl \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -15,6 +15,26 @@ msgstr ""
 "X-Poedit-Country: NORWAY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. procedure executed successfully
+#: ../libgimp/gimp.c:1045
+msgid "success"
+msgstr "vellukka"
+
+#. procedure execution failed
+#: ../libgimp/gimp.c:1049
+msgid "execution error"
+msgstr "utføringsfeil"
+
+#. procedure called incorrectly
+#: ../libgimp/gimp.c:1053
+msgid "calling error"
+msgstr "oppkallsfeil"
+
+#. procedure execution cancelled
+#: ../libgimp/gimp.c:1057
+msgid "cancelled"
+msgstr "avbrote"
+
 #: ../libgimp/gimpbrushselectbutton.c:170
 msgid "Brush Selection"
 msgstr "Penselval"
@@ -24,32 +44,37 @@ msgstr "Penselval"
 msgid "_Browse..."
 msgstr "_Bla gjennom..."
 
-#: ../libgimp/gimpexport.c:217 ../libgimp/gimpexport.c:253
+#: ../libgimp/gimpexport.c:217
+#: ../libgimp/gimpexport.c:253
 #, c-format
 msgid "%s plug-in can't handle layers"
 msgstr "Programtillegget %s  kan ikkje handtere lag"
 
-#: ../libgimp/gimpexport.c:218 ../libgimp/gimpexport.c:227
-#: ../libgimp/gimpexport.c:236 ../libgimp/gimpexport.c:254
+#: ../libgimp/gimpexport.c:218
+#: ../libgimp/gimpexport.c:227
+#: ../libgimp/gimpexport.c:236
+#: ../libgimp/gimpexport.c:254
 msgid "Merge Visible Layers"
 msgstr "Flett saman synlege lag"
 
 #: ../libgimp/gimpexport.c:226
 #, c-format
 msgid "%s plug-in can't handle layer offsets, size or opacity"
-msgstr ""
-"Programtillegget %s kan ikkje handtere lagforskyving, storleik og dekkevne"
+msgstr "Programtillegget %s kan ikkje handtere lagforskyving, storleik og dekkevne"
 
-#: ../libgimp/gimpexport.c:235 ../libgimp/gimpexport.c:244
+#: ../libgimp/gimpexport.c:235
+#: ../libgimp/gimpexport.c:244
 #, c-format
 msgid "%s plug-in can only handle layers as animation frames"
 msgstr "Programtillegget %s kan bare handtere lag som animasjonsrammer"
 
-#: ../libgimp/gimpexport.c:236 ../libgimp/gimpexport.c:245
+#: ../libgimp/gimpexport.c:236
+#: ../libgimp/gimpexport.c:245
 msgid "Save as Animation"
 msgstr "Lagra som animasjon"
 
-#: ../libgimp/gimpexport.c:245 ../libgimp/gimpexport.c:254
+#: ../libgimp/gimpexport.c:245
+#: ../libgimp/gimpexport.c:254
 #: ../libgimp/gimpexport.c:263
 msgid "Flatten Image"
 msgstr "Flat ut biletet"
@@ -73,7 +98,8 @@ msgstr "Legg til lagmasker"
 msgid "%s plug-in can only handle RGB images"
 msgstr "Programtillegget %s kan bare handtere RGB-bilete"
 
-#: ../libgimp/gimpexport.c:281 ../libgimp/gimpexport.c:319
+#: ../libgimp/gimpexport.c:281
+#: ../libgimp/gimpexport.c:319
 #: ../libgimp/gimpexport.c:328
 msgid "Convert to RGB"
 msgstr "Konverter til RGB"
@@ -83,7 +109,8 @@ msgstr "Konverter til RGB"
 msgid "%s plug-in can only handle grayscale images"
 msgstr "Programtillegget %s kan bare handtere gråtonebilete"
 
-#: ../libgimp/gimpexport.c:290 ../libgimp/gimpexport.c:319
+#: ../libgimp/gimpexport.c:290
+#: ../libgimp/gimpexport.c:319
 #: ../libgimp/gimpexport.c:340
 msgid "Convert to Grayscale"
 msgstr "Konverter til gråtoner"
@@ -93,7 +120,8 @@ msgstr "Konverter til gråtoner"
 msgid "%s plug-in can only handle indexed images"
 msgstr "Programtillegget %s kan bare handtere indekserte bilete"
 
-#: ../libgimp/gimpexport.c:299 ../libgimp/gimpexport.c:328
+#: ../libgimp/gimpexport.c:299
+#: ../libgimp/gimpexport.c:328
 #: ../libgimp/gimpexport.c:338
 msgid ""
 "Convert to Indexed using default settings\n"
@@ -105,8 +133,7 @@ msgstr ""
 #: ../libgimp/gimpexport.c:308
 #, c-format
 msgid "%s plug-in can only handle bitmap (two color) indexed images"
-msgstr ""
-"Programtillegget %s kan bare handtere indekserte punktbilet (to fargar)"
+msgstr "Programtillegget %s kan bare handtere indekserte punktbilet (to fargar)"
 
 #: ../libgimp/gimpexport.c:309
 msgid ""
@@ -163,16 +190,13 @@ msgstr "_Eksporter"
 #. the headline
 #: ../libgimp/gimpexport.c:499
 #, c-format
-msgid ""
-"Your image should be exported before it can be saved as %s for the following "
-"reasons:"
+msgid "Your image should be exported before it can be saved as %s for the following reasons:"
 msgstr "Du bør eksportera biletet før du lagrar det som %s fordi:"
 
 #. the footline
 #: ../libgimp/gimpexport.c:573
 msgid "The export conversion won't modify your original image."
-msgstr ""
-"Endringane gjort for å eksportera biletet vil ikkje endra originalbiletet."
+msgstr "Endringane gjort for å eksportera biletet vil ikkje endra originalbiletet."
 
 #: ../libgimp/gimpexport.c:673
 #, c-format
@@ -204,7 +228,8 @@ msgstr "Sans"
 msgid "Gradient Selection"
 msgstr "Val av fargeovergang"
 
-#: ../libgimp/gimpmenu.c:450 ../libgimpwidgets/gimpintstore.c:239
+#: ../libgimp/gimpmenu.c:450
+#: ../libgimpwidgets/gimpintstore.c:239
 msgid "(Empty)"
 msgstr "(Tom)"
 
@@ -295,7 +320,8 @@ msgstr[0] "1 prosedyre passa til spørringa"
 msgstr[1] "%d prosedyrar passa til spørringa"
 
 #. count label
-#: ../libgimp/gimpprocbrowserdialog.c:516 ../libgimpwidgets/gimpbrowser.c:114
+#: ../libgimp/gimpprocbrowserdialog.c:516
+#: ../libgimpwidgets/gimpbrowser.c:114
 msgid "No matches"
 msgstr "Ingen treff"
 
@@ -311,15 +337,15 @@ msgstr "Returverdiar"
 msgid "Additional Information"
 msgstr "Tilleggsinformasjon"
 
-#: ../libgimp/gimpprocview.c:210
+#: ../libgimp/gimpprocview.c:209
 msgid "Author:"
 msgstr "Forfattar:"
 
-#: ../libgimp/gimpprocview.c:222
+#: ../libgimp/gimpprocview.c:221
 msgid "Date:"
 msgstr "Dato:"
 
-#: ../libgimp/gimpprocview.c:234
+#: ../libgimp/gimpprocview.c:233
 msgid "Copyright:"
 msgstr "Opphavsrett:"
 
@@ -399,15 +425,18 @@ msgstr "Erstatt det gjeldande utvalet"
 msgid "Intersect with the current selection"
 msgstr "Snitt med det gjeldande utvalet"
 
-#: ../libgimpbase/gimpbaseenums.c:163 ../libgimpwidgets/gimpwidgetsenums.c:126
+#: ../libgimpbase/gimpbaseenums.c:163
+#: ../libgimpwidgets/gimpwidgetsenums.c:126
 msgid "Red"
 msgstr "Raud"
 
-#: ../libgimpbase/gimpbaseenums.c:164 ../libgimpwidgets/gimpwidgetsenums.c:127
+#: ../libgimpbase/gimpbaseenums.c:164
+#: ../libgimpwidgets/gimpwidgetsenums.c:127
 msgid "Green"
 msgstr "Grøn"
 
-#: ../libgimpbase/gimpbaseenums.c:165 ../libgimpwidgets/gimpwidgetsenums.c:128
+#: ../libgimpbase/gimpbaseenums.c:165
+#: ../libgimpwidgets/gimpwidgetsenums.c:128
 msgid "Blue"
 msgstr "Blå"
 
@@ -415,11 +444,13 @@ msgstr "Blå"
 msgid "Gray"
 msgstr "Grå"
 
-#: ../libgimpbase/gimpbaseenums.c:167 ../libgimpbase/gimpbaseenums.c:532
+#: ../libgimpbase/gimpbaseenums.c:167
+#: ../libgimpbase/gimpbaseenums.c:532
 msgid "Indexed"
 msgstr "Indeksert"
 
-#: ../libgimpbase/gimpbaseenums.c:168 ../libgimpwidgets/gimpwidgetsenums.c:129
+#: ../libgimpbase/gimpbaseenums.c:168
+#: ../libgimpwidgets/gimpwidgetsenums.c:129
 msgid "Alpha"
 msgstr "Alfa"
 
@@ -499,7 +530,8 @@ msgstr "Bi-lineær"
 msgid "Radial"
 msgstr "Radial"
 
-#: ../libgimpbase/gimpbaseenums.c:392 ../libgimpwidgets/gimpwidgetsenums.c:24
+#: ../libgimpbase/gimpbaseenums.c:392
+#: ../libgimpwidgets/gimpwidgetsenums.c:24
 msgid "Square"
 msgstr "Firkanta"
 
@@ -568,7 +600,8 @@ msgstr "Biletfil"
 msgid "RGB color"
 msgstr "RGB-farge"
 
-#: ../libgimpbase/gimpbaseenums.c:495 ../libgimpbase/gimpbaseenums.c:530
+#: ../libgimpbase/gimpbaseenums.c:495
+#: ../libgimpbase/gimpbaseenums.c:530
 msgid "Grayscale"
 msgstr "Gråtoner"
 
@@ -616,7 +649,8 @@ msgstr "Konstant"
 msgid "Incremental"
 msgstr "Aukande"
 
-#: ../libgimpbase/gimpbaseenums.c:624 ../modules/cdisplay_lcms.c:195
+#: ../libgimpbase/gimpbaseenums.c:624
+#: ../modules/display-filter-lcms.c:191
 msgid "None"
 msgstr "Ingen"
 
@@ -684,77 +718,52 @@ msgstr "Beskjer til resultatet"
 msgid "Crop with aspect"
 msgstr "Beskjer med sideforhold"
 
-#: ../libgimpbase/gimpbaseenums.c:882
+#: ../libgimpbase/gimpbaseenums.c:909
 msgid "Internal GIMP procedure"
 msgstr "Intern GIMP-prosedyre"
 
-#: ../libgimpbase/gimpbaseenums.c:883
+#: ../libgimpbase/gimpbaseenums.c:910
 msgid "GIMP Plug-In"
 msgstr "Programtillegg for GIMP"
 
-#: ../libgimpbase/gimpbaseenums.c:884
+#: ../libgimpbase/gimpbaseenums.c:911
 msgid "GIMP Extension"
 msgstr "GIMP-utviding"
 
-#: ../libgimpbase/gimpbaseenums.c:885
+#: ../libgimpbase/gimpbaseenums.c:912
 msgid "Temporary Procedure"
 msgstr "Midlartidig prosedyre"
 
-#: ../libgimpbase/gimpmemsize.c:180
-#, c-format
-msgid "%d Byte"
-msgid_plural "%d Bytes"
-msgstr[0] "%d byte"
-msgstr[1] "%d byte"
+#: ../libgimpbase/gimpbaseenums.c:1074
+msgid "From left to right"
+msgstr "Får venstre til høgre"
 
-#: ../libgimpbase/gimpmemsize.c:186
-#, c-format
-msgid "%.2f KB"
-msgstr "%.2f KB"
+#: ../libgimpbase/gimpbaseenums.c:1075
+msgid "From right to left"
+msgstr "Frå høgre til venstre"
 
-#: ../libgimpbase/gimpmemsize.c:190
-#, c-format
-msgid "%.1f KB"
-msgstr "%.1f KB"
+#: ../libgimpbase/gimpbaseenums.c:1105
+msgid "Left justified"
+msgstr "Venstrejustert"
 
-#: ../libgimpbase/gimpmemsize.c:194
-#, c-format
-msgid "%d KB"
-msgstr "%d KB"
+#: ../libgimpbase/gimpbaseenums.c:1106
+msgid "Right justified"
+msgstr "Høgrejustert"
 
-#: ../libgimpbase/gimpmemsize.c:201
-#, c-format
-msgid "%.2f MB"
-msgstr "%.2f MB"
+#: ../libgimpbase/gimpbaseenums.c:1107
+#| msgid "C_enter"
+msgid "Centered"
+msgstr "Sentrert"
 
-#: ../libgimpbase/gimpmemsize.c:205
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
+#: ../libgimpbase/gimpbaseenums.c:1108
+msgid "Filled"
+msgstr "Fylt"
 
-#: ../libgimpbase/gimpmemsize.c:209
-#, c-format
-msgid "%d MB"
-msgstr "%d MB"
-
-#: ../libgimpbase/gimpmemsize.c:216
-#, c-format
-msgid "%.2f GB"
-msgstr "%.2f GB"
-
-#: ../libgimpbase/gimpmemsize.c:220
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../libgimpbase/gimpmemsize.c:224
-#, c-format
-msgid "%d GB"
-msgstr "%d GB"
-
-#: ../libgimpbase/gimputils.c:170 ../libgimpbase/gimputils.c:175
-#: ../modules/cdisplay_lcms.c:187 ../modules/colorsel_cmyk_lcms.c:411
-#: ../modules/colorsel_cmyk_lcms.c:417
+#: ../libgimpbase/gimputils.c:170
+#: ../libgimpbase/gimputils.c:175
+#: ../modules/display-filter-lcms.c:183
+#: ../modules/color-selector-cmyk-lcms.c:407
+#: ../modules/color-selector-cmyk-lcms.c:413
 msgid "(invalid UTF-8 string)"
 msgstr "(ugyldig «UTF-8»-streng)"
 
@@ -767,14 +776,8 @@ msgid "The color profile of your (primary) monitor."
 msgstr "Fargeprofilen for (primær)skjermen"
 
 #: ../libgimpconfig/gimpcolorconfig.c:46
-msgid ""
-"When enabled, GIMP will try to use the display color profile from the "
-"windowing system.  The configured monitor profile is then only used as a "
-"fallback."
-msgstr ""
-"Dersom denne er aktivisert, vil GIMP prøve å bruke fargevisingsprofilen frå "
-"vindaugesystemet. Skjermprofilen blir då bare brukt for å ha noe å falle "
-"tilbake på."
+msgid "When enabled, GIMP will try to use the display color profile from the windowing system.  The configured monitor profile is then only used as a fallback."
+msgstr "Dersom denne er aktivert, vil GIMP prøve å bruke fargevisingsprofilen frå vindaugesystemet. Skjermprofilen blir då bare brukt for å ha noe å falle tilbake på."
 
 #: ../libgimpconfig/gimpcolorconfig.c:50
 msgid "The default RGB working space color profile."
@@ -786,33 +789,23 @@ msgstr "Fargeprofilen CMYK blir brukt for å omforma mellom RGB og CMYK"
 
 #: ../libgimpconfig/gimpcolorconfig.c:54
 msgid "The color profile used for simulating a printed version (softproof)."
-msgstr ""
-"Fargeprofilen som blir brukt for å simulera ein utskriven versjon (softproof)"
+msgstr "Fargeprofilen som blir brukt for å simulera ein utskriven versjon (softproof)"
 
 #: ../libgimpconfig/gimpcolorconfig.c:56
 msgid "Sets how colors are mapped for your display."
 msgstr "Bestemmer korleis fargane blir vist på skjermen"
 
 #: ../libgimpconfig/gimpcolorconfig.c:58
-msgid ""
-"Sets how colors are converted from RGB working space to the print simulation "
-"device."
-msgstr ""
-"Bestemmer korleis fargane blir omforma frå RGB-arbeidsområdet til "
-"utskriftsimuleringsutstyret."
+msgid "Sets how colors are converted from RGB working space to the print simulation device."
+msgstr "Bestemmer korleis fargane blir omforma frå RGB-arbeidsområdet til utskriftsimuleringsutstyret."
 
 #: ../libgimpconfig/gimpcolorconfig.c:61
-msgid ""
-"When enabled, the print simulation will mark colors which can not be "
-"represented in the target color space."
-msgstr ""
-"Utskriftsimuleringa vil gi dei fargane som ikkje finst i fargeområdet for "
-"utskrifta den fargen du har vald i ruta til høgre.."
+msgid "When enabled, the print simulation will mark colors which can not be represented in the target color space."
+msgstr "Utskriftsimuleringa vil gi dei fargane som ikkje finst i fargeområdet for utskrifta den fargen du har vald i ruta til høgre.."
 
 #: ../libgimpconfig/gimpcolorconfig.c:64
 msgid "The color to use for marking colors which are out of gamut."
-msgstr ""
-"Fargen som skal brukast for å merke fargar som ikkje finst i fargeområdet."
+msgstr "Fargen som skal brukast for å merke fargar som ikkje finst i fargeområdet."
 
 #: ../libgimpconfig/gimpcolorconfig-enums.c:24
 msgid "No color management"
@@ -869,9 +862,10 @@ msgid "while parsing token '%s': %s"
 msgstr "under tolking av «%s»: %s"
 
 #: ../libgimpconfig/gimpconfig-iface.c:474
-#: ../libgimpconfig/gimpconfig-iface.c:487 ../libgimpconfig/gimpscanner.c:498
+#: ../libgimpconfig/gimpconfig-iface.c:487
+#: ../libgimpconfig/gimpscanner.c:498
 #: ../libgimpconfig/gimpscanner.c:579
-#: ../libgimpwidgets/gimpcolorprofilestore.c:654
+#: ../libgimpwidgets/gimpcolorprofilestore.c:656
 msgid "fatal parse error"
 msgstr "fatal tolkingsfeil"
 
@@ -881,7 +875,7 @@ msgid "Cannot expand ${%s}"
 msgstr "Kan ikkje utvida $(%s)"
 
 #: ../libgimpconfig/gimpconfigwriter.c:78
-#: ../libgimpconfig/gimpconfigwriter.c:693
+#: ../libgimpconfig/gimpconfigwriter.c:718
 #, c-format
 msgid "Error writing to '%s': %s"
 msgstr "Feil under skriving av «%s»: %s"
@@ -896,7 +890,8 @@ msgstr "Kunne ikkje oppretta ei mellombels fil for «%s»: %s"
 msgid "Could not open '%s' for writing: %s"
 msgstr "Kan ikkje opna «%s» for skriving: %s"
 
-#: ../libgimpconfig/gimpconfigwriter.c:674
+#: ../libgimpconfig/gimpconfigwriter.c:679
+#: ../libgimpconfig/gimpconfigwriter.c:699
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -905,7 +900,7 @@ msgstr ""
 "Feil ved skriving til mellombels fil for «%s»: %s\n"
 "Originalfila er uforandra."
 
-#: ../libgimpconfig/gimpconfigwriter.c:682
+#: ../libgimpconfig/gimpconfigwriter.c:707
 #, c-format
 msgid ""
 "Error writing to temporary file for '%s': %s\n"
@@ -914,7 +909,7 @@ msgstr ""
 "Feil under skriving til mellombels fil for «%s»: %s\n"
 "Det blei ikkje oppratta ny fil."
 
-#: ../libgimpconfig/gimpconfigwriter.c:711
+#: ../libgimpconfig/gimpconfigwriter.c:731
 #, c-format
 msgid "Could not create '%s': %s"
 msgstr "Kunne ikkje oppretta «%s»: %s"
@@ -931,8 +926,10 @@ msgstr ""
 "Feil ved tolking av «%s» i linje %d:\n"
 " %s"
 
-#: ../libgimpmodule/gimpmodule.c:153 ../libgimpmodule/gimpmodule.c:171
-#: ../libgimpmodule/gimpmodule.c:280 ../libgimpmodule/gimpmodule.c:307
+#: ../libgimpmodule/gimpmodule.c:153
+#: ../libgimpmodule/gimpmodule.c:171
+#: ../libgimpmodule/gimpmodule.c:280
+#: ../libgimpmodule/gimpmodule.c:307
 #: ../libgimpmodule/gimpmodule.c:418
 #, c-format
 msgid "Module '%s' load error: %s"
@@ -954,7 +951,7 @@ msgstr "Lastinga mislukka"
 msgid "Not loaded"
 msgstr "Ikkje lasta"
 
-#: ../libgimpthumb/gimpthumb-utils.c:125
+#: ../libgimpthumb/gimpthumb-utils.c:123
 #, c-format
 msgid ""
 "Cannot determine a valid home directory.\n"
@@ -963,7 +960,8 @@ msgstr ""
 "Fann ikkje ein gyldig heimekatalog.\n"
 "Miniatyrane blei lagra i mappa for temporære filer (%s) i staden."
 
-#: ../libgimpthumb/gimpthumb-utils.c:249 ../libgimpthumb/gimpthumb-utils.c:317
+#: ../libgimpthumb/gimpthumb-utils.c:247
+#: ../libgimpthumb/gimpthumb-utils.c:315
 #, c-format
 msgid "Failed to create thumbnail folder '%s'."
 msgstr "Kunne ikkje oppretta miniatyrbiletmappa «%s.»"
@@ -971,7 +969,7 @@ msgstr "Kunne ikkje oppretta miniatyrbiletmappa «%s.»"
 #: ../libgimpthumb/gimpthumbnail.c:498
 #, c-format
 msgid "Thumbnail contains no Thumb::URI tag"
-msgstr ""
+msgstr "Miniatyren inneheld ingen «Thumb::URI»-tag"
 
 #: ../libgimpthumb/gimpthumbnail.c:898
 #, c-format
@@ -1003,7 +1001,9 @@ msgid "Select color profile from disk..."
 msgstr "Vel fargeprofil frå disk..."
 
 #: ../libgimpwidgets/gimpcolorprofilestore.c:280
-msgid "profile|None"
+#| msgid "None"
+msgctxt "profile"
+msgid "None"
 msgstr "Ingen"
 
 #: ../libgimpwidgets/gimpcolorscales.c:98
@@ -1019,17 +1019,17 @@ msgid "Old:"
 msgstr "Gammal:"
 
 #: ../libgimpwidgets/gimpcolorselection.c:286
-msgid ""
-"Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
-"CSS color names."
-msgstr ""
-"Hexadesimal fargenotasjon slik som brukt i HTML og CSS. Du kan også bruke "
-"CSS fargenamn."
+msgid "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts CSS color names."
+msgstr "Hexadesimal fargenotasjon slik som brukt i HTML og CSS. Du kan også bruke CSS fargenamn."
 
 #: ../libgimpwidgets/gimpcolorselection.c:292
 msgid "HTML _notation:"
 msgstr "HTML-_notasjon:"
 
+#: ../libgimpwidgets/gimphelpui.c:420
+msgid "Press F1 for more help"
+msgstr "Trykk F1 for meir hjelp"
+
 #: ../libgimpwidgets/gimpfileentry.c:174
 msgid "Open a file selector to browse your folders"
 msgstr "Opnar ein filveljar slik at du kan sjå gjennom mappene dine."
@@ -1107,12 +1107,8 @@ msgid "Folder"
 msgstr "Mappe"
 
 #: ../libgimpwidgets/gimppickbutton.c:107
-msgid ""
-"Click the eyedropper, then click a color anywhere on your screen to select "
-"that color."
-msgstr ""
-"Klikk på fargeplukkaren. Deretter kan du klikka kvar som helst på skjermen "
-"for å velje farge."
+msgid "Click the eyedropper, then click a color anywhere on your screen to select that color."
+msgstr "Klikk på fargeplukkaren. Deretter kan du klikka kvar som helst på skjermen for å velje farge."
 
 #: ../libgimpwidgets/gimppreviewarea.c:94
 msgid "Check Size"
@@ -1127,66 +1123,68 @@ msgstr "Rutestil"
 msgid "_Preview"
 msgstr "_Førehandsvising"
 
-#: ../libgimpwidgets/gimppropwidgets.c:1859
+#: ../libgimpwidgets/gimppropwidgets.c:1860
 #, c-format
 msgid "This text input field is limited to %d character."
 msgid_plural "This text input field is limited to %d characters."
 msgstr[0] "Dette tekstfeltet er avgrensa til %d teikn."
 msgstr[1] "Dette tekstfeltet er avgrensa til %d teikn."
 
-#: ../libgimpwidgets/gimpstock.c:113
+#: ../libgimpwidgets/gimpstock.c:112
 msgid "Anchor"
 msgstr "Anker"
 
-#: ../libgimpwidgets/gimpstock.c:114
+#: ../libgimpwidgets/gimpstock.c:113
 msgid "C_enter"
 msgstr "S_enter"
 
-#: ../libgimpwidgets/gimpstock.c:115
+#: ../libgimpwidgets/gimpstock.c:114
 msgid "_Duplicate"
 msgstr "_Duplikat"
 
-#: ../libgimpwidgets/gimpstock.c:116
+#: ../libgimpwidgets/gimpstock.c:115
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../libgimpwidgets/gimpstock.c:117
+#: ../libgimpwidgets/gimpstock.c:116
 msgid "Linked"
 msgstr "Lenka"
 
-#: ../libgimpwidgets/gimpstock.c:118
+#: ../libgimpwidgets/gimpstock.c:117
 msgid "Paste as New"
 msgstr "Lim inn som nytt"
 
-#: ../libgimpwidgets/gimpstock.c:119
+#: ../libgimpwidgets/gimpstock.c:118
 msgid "Paste Into"
 msgstr "Lim inn i"
 
-#: ../libgimpwidgets/gimpstock.c:120
+#: ../libgimpwidgets/gimpstock.c:119
 msgid "_Reset"
 msgstr "_Tilbakestill"
 
-#: ../libgimpwidgets/gimpstock.c:121
+#: ../libgimpwidgets/gimpstock.c:120
 msgid "Visible"
 msgstr "Synleg"
 
-#: ../libgimpwidgets/gimpstock.c:157 ../libgimpwidgets/gimpstock.c:161
+#: ../libgimpwidgets/gimpstock.c:156
+#: ../libgimpwidgets/gimpstock.c:160
 msgid "_Stroke"
 msgstr "_Strek opp"
 
-#: ../libgimpwidgets/gimpstock.c:173
+#: ../libgimpwidgets/gimpstock.c:172
 msgid "L_etter Spacing"
 msgstr "_Bokstavmellomrom"
 
-#: ../libgimpwidgets/gimpstock.c:174
+#: ../libgimpwidgets/gimpstock.c:173
 msgid "L_ine Spacing"
 msgstr "_Linjeavstand"
 
-#: ../libgimpwidgets/gimpstock.c:190
+#: ../libgimpwidgets/gimpstock.c:189
 msgid "_Resize"
 msgstr "_Nytt format"
 
-#: ../libgimpwidgets/gimpstock.c:191 ../libgimpwidgets/gimpstock.c:321
+#: ../libgimpwidgets/gimpstock.c:190
+#: ../libgimpwidgets/gimpstock.c:320
 msgid "_Scale"
 msgstr "_Skaler"
 
@@ -1198,11 +1196,11 @@ msgstr "_Beskjer"
 msgid "_Transform"
 msgstr "_Transformer"
 
-#: ../libgimpwidgets/gimpstock.c:320
+#: ../libgimpwidgets/gimpstock.c:319
 msgid "_Rotate"
 msgstr "_Roter"
 
-#: ../libgimpwidgets/gimpstock.c:322
+#: ../libgimpwidgets/gimpstock.c:321
 msgid "_Shear"
 msgstr "_Forskyv"
 
@@ -1223,12 +1221,8 @@ msgid "Factor"
 msgstr "Faktor"
 
 #: ../libgimpwidgets/gimpwidgets.c:511
-msgid ""
-"Use this value for random number generator seed - this allows you to repeat "
-"a given \"random\" operation"
-msgstr ""
-"Bruk denne verdien som startverdi for generering av tilfeldige tal - dette "
-"lar deg gjenta ein bestemt «tilfeldig» operasjon"
+msgid "Use this value for random number generator seed - this allows you to repeat a given \"random\" operation"
+msgstr "Bruk denne verdien som startverdi for generering av tilfeldige tal - dette lar deg gjenta ein bestemt «tilfeldig» operasjon"
 
 #: ../libgimpwidgets/gimpwidgets.c:515
 msgid "_New Seed"
@@ -1236,8 +1230,7 @@ msgstr "_Nytt frø"
 
 #: ../libgimpwidgets/gimpwidgets.c:528
 msgid "Seed random number generator with a generated random number"
-msgstr ""
-"Gi generator for tilfeldige tal eit generert tilfeldig tall som startverdi"
+msgstr "Gi generator for tilfeldige tal eit generert tilfeldig tall som startverdi"
 
 #: ../libgimpwidgets/gimpwidgets.c:532
 msgid "_Randomize"
@@ -1307,543 +1300,579 @@ msgstr "Forstørr"
 msgid "Zoom out"
 msgstr "Forminsk"
 
-#: ../modules/cdisplay_colorblind.c:67
+#: ../modules/display-filter-color-blind.c:67
 msgid "Protanopia (insensitivity to red)"
 msgstr "Protanopi (raudblind)"
 
-#: ../modules/cdisplay_colorblind.c:69
+#: ../modules/display-filter-color-blind.c:69
 msgid "Deuteranopia (insensitivity to green)"
 msgstr "Deuteranopi (grønblind)"
 
-#: ../modules/cdisplay_colorblind.c:71
+#: ../modules/display-filter-color-blind.c:71
 msgid "Tritanopia (insensitivity to blue)"
 msgstr "Tritanopi (blåblind)"
 
-#: ../modules/cdisplay_colorblind.c:198
+#: ../modules/display-filter-color-blind.c:198
 msgid "Color deficit simulation filter (Brettel-Vienot-Mollon algorithm)"
-msgstr ""
-"Simuleringsfilter for avvikande fargesyn (Brettel-Vienot-Mollon-algoritmen)"
+msgstr "Simuleringsfilter for avvikande fargesyn (Brettel-Vienot-Mollon-algoritmen)"
 
-#: ../modules/cdisplay_colorblind.c:261
+#: ../modules/display-filter-color-blind.c:261
 msgid "Color Deficient Vision"
 msgstr "For fargesvakt syn"
 
-#: ../modules/cdisplay_colorblind.c:483
+#: ../modules/display-filter-color-blind.c:483
 msgid "Color _deficiency type:"
 msgstr "Type farge_synssvikt:"
 
-#: ../modules/cdisplay_gamma.c:90
+#: ../modules/display-filter-gamma.c:90
 msgid "Gamma color display filter"
 msgstr "Visingsfilter for gammafargar"
 
-#: ../modules/cdisplay_gamma.c:129
+#: ../modules/display-filter-gamma.c:129
 msgid "Gamma"
 msgstr "Gamma"
 
-#: ../modules/cdisplay_gamma.c:232
+#: ../modules/display-filter-gamma.c:232
 msgid "_Gamma:"
 msgstr "_Gamma:"
 
-#: ../modules/cdisplay_highcontrast.c:90
+#: ../modules/display-filter-high-contrast.c:90
 msgid "High Contrast color display filter"
 msgstr "Visingsfilter for høgkontrastfargar"
 
-#: ../modules/cdisplay_highcontrast.c:129
+#: ../modules/display-filter-high-contrast.c:129
 msgid "Contrast"
 msgstr "Kontrast"
 
-#: ../modules/cdisplay_highcontrast.c:232
+#: ../modules/display-filter-high-contrast.c:232
 msgid "Contrast c_ycles:"
 msgstr "_Kontrastsyklusar:"
 
-#: ../modules/cdisplay_lcms.c:106
+#: ../modules/display-filter-lcms.c:102
 msgid "Color management display filter using ICC color profiles"
 msgstr "Visingsfilter for fargestyring med ICC fargeprofilar"
 
-#: ../modules/cdisplay_lcms.c:138
+#: ../modules/display-filter-lcms.c:134
 msgid "Color Management"
 msgstr "Fargestyring"
 
-#: ../modules/cdisplay_lcms.c:216
-msgid ""
-"This filter takes its configuration from the Color Management section in the "
-"Preferences dialog."
-msgstr ""
-"Filteret hentar innstillingane sine frå seksjonen fargestyring i "
-"brukarinnstillingane."
+#: ../modules/display-filter-lcms.c:212
+msgid "This filter takes its configuration from the Color Management section in the Preferences dialog."
+msgstr "Filteret hentar innstillingane sine frå seksjonen fargestyring i brukarinnstillingane."
 
-#: ../modules/cdisplay_lcms.c:230
+#: ../modules/display-filter-lcms.c:226
 msgid "Mode of operation:"
 msgstr "Operasjonsmodus:"
 
-#: ../modules/cdisplay_lcms.c:237
+#: ../modules/display-filter-lcms.c:233
 msgid "Image profile:"
 msgstr "Biletprofil:"
 
-#: ../modules/cdisplay_lcms.c:245
+#: ../modules/display-filter-lcms.c:241
 msgid "Monitor profile:"
 msgstr "Skjermprofil"
 
-#: ../modules/cdisplay_lcms.c:253
+#: ../modules/display-filter-lcms.c:249
 msgid "Print simulation profile:"
 msgstr "Skriv ut simuleringsprofil:"
 
-#: ../modules/cdisplay_proof.c:101
+#: ../modules/display-filter-proof.c:97
 msgid "Color proof filter using ICC color profile"
 msgstr "Fargeprofilfilter for ICC fargeprofil"
 
-#: ../modules/cdisplay_proof.c:149
+#: ../modules/display-filter-proof.c:145
 msgid "Color Proof"
 msgstr "Fargeprøvetrykk"
 
-#: ../modules/cdisplay_proof.c:315
+#: ../modules/display-filter-proof.c:311
 msgid "Choose an ICC Color Profile"
 msgstr "Vel ein ICC-fargeprofil"
 
-#: ../modules/cdisplay_proof.c:342
+#: ../modules/display-filter-proof.c:338
 msgid "All files (*.*)"
 msgstr "Alle filer (*.*)"
 
-#: ../modules/cdisplay_proof.c:347
+#: ../modules/display-filter-proof.c:343
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC-fargeprofil (*.icc, *.icm)"
 
-#: ../modules/cdisplay_proof.c:405
+#: ../modules/display-filter-proof.c:401
 msgid "_Profile:"
 msgstr "_Profil:"
 
-#: ../modules/cdisplay_proof.c:411
+#: ../modules/display-filter-proof.c:407
 msgid "_Intent:"
 msgstr "_Føremål:"
 
-#: ../modules/cdisplay_proof.c:416
+#: ../modules/display-filter-proof.c:412
 msgid "_Black Point Compensation"
 msgstr "_Svartpunktkompensering"
 
-#: ../modules/colorsel_cmyk.c:71
+#: ../modules/color-selector-cmyk.c:71
 msgid "CMYK color selector"
 msgstr "CMYK fargeveljar"
 
-#: ../modules/colorsel_cmyk.c:102 ../modules/colorsel_cmyk_lcms.c:154
+#: ../modules/color-selector-cmyk.c:102
+#: ../modules/color-selector-cmyk-lcms.c:150
 msgid "CMYK"
 msgstr "CMYK"
 
 #. Cyan
-#: ../modules/colorsel_cmyk.c:125 ../modules/colorsel_cmyk_lcms.c:173
+#: ../modules/color-selector-cmyk.c:125
+#: ../modules/color-selector-cmyk-lcms.c:169
 msgid "_C"
 msgstr "_C"
 
 #. Magenta
-#: ../modules/colorsel_cmyk.c:127 ../modules/colorsel_cmyk_lcms.c:175
+#: ../modules/color-selector-cmyk.c:127
+#: ../modules/color-selector-cmyk-lcms.c:171
 msgid "_M"
 msgstr "_M"
 
 #. Yellow
-#: ../modules/colorsel_cmyk.c:129 ../modules/colorsel_cmyk_lcms.c:177
+#: ../modules/color-selector-cmyk.c:129
+#: ../modules/color-selector-cmyk-lcms.c:173
 msgid "_Y"
 msgstr "_Y"
 
 #. Key (Black)
-#: ../modules/colorsel_cmyk.c:131 ../modules/colorsel_cmyk_lcms.c:179
+#: ../modules/color-selector-cmyk.c:131
+#: ../modules/color-selector-cmyk-lcms.c:175
 msgid "_K"
 msgstr "_K"
 
-#: ../modules/colorsel_cmyk.c:135 ../modules/colorsel_cmyk_lcms.c:183
+#: ../modules/color-selector-cmyk.c:135
+#: ../modules/color-selector-cmyk-lcms.c:179
 msgid "Cyan"
 msgstr "Cyanblå"
 
-#: ../modules/colorsel_cmyk.c:136 ../modules/colorsel_cmyk_lcms.c:184
+#: ../modules/color-selector-cmyk.c:136
+#: ../modules/color-selector-cmyk-lcms.c:180
 msgid "Magenta"
 msgstr "Magentaraud"
 
-#: ../modules/colorsel_cmyk.c:137 ../modules/colorsel_cmyk_lcms.c:185
+#: ../modules/color-selector-cmyk.c:137
+#: ../modules/color-selector-cmyk-lcms.c:181
 msgid "Yellow"
 msgstr "Gul"
 
-#: ../modules/colorsel_cmyk.c:138 ../modules/colorsel_cmyk_lcms.c:186
+#: ../modules/color-selector-cmyk.c:138
+#: ../modules/color-selector-cmyk-lcms.c:182
 msgid "Black"
 msgstr "Svart"
 
-#: ../modules/colorsel_cmyk.c:172
+#: ../modules/color-selector-cmyk.c:172
 msgid "Black _pullout:"
 msgstr "Svart_mengde:"
 
-#: ../modules/colorsel_cmyk.c:189
+#: ../modules/color-selector-cmyk.c:189
 msgid "The percentage of black to pull out of the colored inks."
 msgstr "Prosentandelen av svart som skal lagast med fargeblekk."
 
-#: ../modules/colorsel_cmyk_lcms.c:91
+#: ../modules/color-selector-cmyk-lcms.c:87
 msgid "CMYK color selector (using color profile)"
 msgstr "CMYK fargeveljar (med fargeprofil)"
 
-#: ../modules/colorsel_cmyk_lcms.c:399
+#: ../modules/color-selector-cmyk-lcms.c:395
 msgid "Profile: (none)"
 msgstr "Profil: (ingen)"
 
-#: ../modules/colorsel_cmyk_lcms.c:420
+#: ../modules/color-selector-cmyk-lcms.c:416
 #, c-format
 msgid "Profile: %s"
 msgstr "Profil: %s"
 
-#: ../modules/colorsel_triangle.c:102
-msgid "Painter-style triangle color selector"
-msgstr "Triangulær fargevelgjar i målarstil"
-
-#: ../modules/colorsel_triangle.c:138
-msgid "Triangle"
-msgstr "Fargetrekant"
-
-#: ../modules/colorsel_water.c:82
+#: ../modules/color-selector-water.c:82
 msgid "Watercolor style color selector"
 msgstr "Fargeveljar i akvarellstil"
 
-#: ../modules/colorsel_water.c:118
+#: ../modules/color-selector-water.c:118
 msgid "Watercolor"
 msgstr "Akvarell"
 
-#: ../modules/colorsel_water.c:186
+#: ../modules/color-selector-water.c:186
 msgid "Pressure"
 msgstr "Trykk"
 
-#: ../modules/controller_linux_input.c:58
+#: ../modules/color-selector-wheel.c:103
+msgid "HSV color wheel"
+msgstr "HSV-fargehjul"
+
+#: ../modules/color-selector-wheel.c:134
+msgid "Wheel"
+msgstr "Hjul"
+
+#: ../modules/controller-linux-input.c:58
 msgid "Button 0"
 msgstr "Knapp 0"
 
-#: ../modules/controller_linux_input.c:59
+#: ../modules/controller-linux-input.c:59
 msgid "Button 1"
 msgstr "Knapp 1"
 
-#: ../modules/controller_linux_input.c:60
+#: ../modules/controller-linux-input.c:60
 msgid "Button 2"
 msgstr "Knapp 2"
 
-#: ../modules/controller_linux_input.c:61
+#: ../modules/controller-linux-input.c:61
 msgid "Button 3"
 msgstr "Knapp 3"
 
-#: ../modules/controller_linux_input.c:62
+#: ../modules/controller-linux-input.c:62
 msgid "Button 4"
 msgstr "Knapp 4"
 
-#: ../modules/controller_linux_input.c:63
+#: ../modules/controller-linux-input.c:63
 msgid "Button 5"
 msgstr "Knapp 5"
 
-#: ../modules/controller_linux_input.c:64
+#: ../modules/controller-linux-input.c:64
 msgid "Button 6"
 msgstr "Knapp 6"
 
-#: ../modules/controller_linux_input.c:65
+#: ../modules/controller-linux-input.c:65
 msgid "Button 7"
 msgstr "Knapp 7"
 
-#: ../modules/controller_linux_input.c:66
+#: ../modules/controller-linux-input.c:66
 msgid "Button 8"
 msgstr "Knapp 8"
 
-#: ../modules/controller_linux_input.c:67
+#: ../modules/controller-linux-input.c:67
 msgid "Button 9"
 msgstr "Knapp 9"
 
-#: ../modules/controller_linux_input.c:68
+#: ../modules/controller-linux-input.c:68
 msgid "Button Mouse"
 msgstr "Museknapp"
 
-#: ../modules/controller_linux_input.c:69
+#: ../modules/controller-linux-input.c:69
 msgid "Button Left"
 msgstr "Venstre knapp"
 
-#: ../modules/controller_linux_input.c:70
+#: ../modules/controller-linux-input.c:70
 msgid "Button Right"
 msgstr "Høgre knapp"
 
-#: ../modules/controller_linux_input.c:71
+#: ../modules/controller-linux-input.c:71
 msgid "Button Middle"
 msgstr "Midtknapp"
 
-#: ../modules/controller_linux_input.c:72
+#: ../modules/controller-linux-input.c:72
 msgid "Button Side"
 msgstr "Sideknapp"
 
-#: ../modules/controller_linux_input.c:73
+#: ../modules/controller-linux-input.c:73
 msgid "Button Extra"
 msgstr "Ekstraknapp"
 
-#: ../modules/controller_linux_input.c:74
+#: ../modules/controller-linux-input.c:74
 msgid "Button Forward"
 msgstr "Framoverknapp"
 
-#: ../modules/controller_linux_input.c:75
+#: ../modules/controller-linux-input.c:75
 msgid "Button Back"
 msgstr "Bakoverknapp"
 
-#: ../modules/controller_linux_input.c:76
+#: ../modules/controller-linux-input.c:76
 msgid "Button Task"
 msgstr "Oppgåveknapp"
 
-#: ../modules/controller_linux_input.c:78
+#: ../modules/controller-linux-input.c:78
 msgid "Button Wheel"
 msgstr "Musehjul"
 
-#: ../modules/controller_linux_input.c:81
+#: ../modules/controller-linux-input.c:81
 msgid "Button Gear Down"
 msgstr "Gir ned knapp"
 
-#: ../modules/controller_linux_input.c:84
+#: ../modules/controller-linux-input.c:84
 msgid "Button Gear Up"
 msgstr "Gir opp knapp"
 
-#: ../modules/controller_linux_input.c:90
-#: ../modules/controller_dx_dinput.c:443
+#: ../modules/controller-linux-input.c:90
+#: ../modules/controller-dx-dinput.c:443
 msgid "X Move Left"
 msgstr "X-flytt venstre"
 
-#: ../modules/controller_linux_input.c:91
-#: ../modules/controller_dx_dinput.c:446
+#: ../modules/controller-linux-input.c:91
+#: ../modules/controller-dx-dinput.c:446
 msgid "X Move Right"
 msgstr "X-flytt høgre"
 
-#: ../modules/controller_linux_input.c:92
+#: ../modules/controller-linux-input.c:92
 msgid "Y Move Forward"
 msgstr "Y-flytt framover"
 
-#: ../modules/controller_linux_input.c:93
+#: ../modules/controller-linux-input.c:93
 msgid "Y Move Back"
 msgstr "Y-flytt bakover"
 
-#: ../modules/controller_linux_input.c:94
-#: ../modules/controller_dx_dinput.c:461
+#: ../modules/controller-linux-input.c:94
+#: ../modules/controller-dx-dinput.c:461
 msgid "Z Move Up"
 msgstr "Z-flytt oppover"
 
-#: ../modules/controller_linux_input.c:95
-#: ../modules/controller_dx_dinput.c:464
+#: ../modules/controller-linux-input.c:95
+#: ../modules/controller-dx-dinput.c:464
 msgid "Z Move Down"
 msgstr "Z-flytt nedover"
 
-#: ../modules/controller_linux_input.c:97
+#: ../modules/controller-linux-input.c:97
 msgid "X Axis Tilt Forward"
 msgstr "X-akse hell framover"
 
-#: ../modules/controller_linux_input.c:98
+#: ../modules/controller-linux-input.c:98
 msgid "X Axis Tilt Back"
 msgstr "X-akse hell bakover"
 
-#: ../modules/controller_linux_input.c:99
-#: ../modules/controller_dx_dinput.c:479
+#: ../modules/controller-linux-input.c:99
+#: ../modules/controller-dx-dinput.c:479
 msgid "Y Axis Tilt Right"
 msgstr "X-akse hell mot høgre"
 
-#: ../modules/controller_linux_input.c:100
-#: ../modules/controller_dx_dinput.c:482
+#: ../modules/controller-linux-input.c:100
+#: ../modules/controller-dx-dinput.c:482
 msgid "Y Axis Tilt Left"
 msgstr "X-akse hell mot venstre"
 
-#: ../modules/controller_linux_input.c:101
-#: ../modules/controller_dx_dinput.c:488
+#: ../modules/controller-linux-input.c:101
+#: ../modules/controller-dx-dinput.c:488
 msgid "Z Axis Turn Left"
 msgstr "Z-akse vend mot venstre"
 
-#: ../modules/controller_linux_input.c:102
-#: ../modules/controller_dx_dinput.c:491
+#: ../modules/controller-linux-input.c:102
+#: ../modules/controller-dx-dinput.c:491
 msgid "Z Axis Turn Right"
 msgstr "Z-akse vend mot høgre"
 
-#: ../modules/controller_linux_input.c:104
+#: ../modules/controller-linux-input.c:104
 msgid "Horiz. Wheel Turn Back"
-msgstr ""
+msgstr "Vassrett hjul bakover"
 
-#: ../modules/controller_linux_input.c:105
+#: ../modules/controller-linux-input.c:105
 msgid "Horiz. Wheel Turn Forward"
-msgstr ""
+msgstr "Vassrett hjul forover"
 
-#: ../modules/controller_linux_input.c:106
+#: ../modules/controller-linux-input.c:106
 msgid "Dial Turn Left"
 msgstr "Snu til venstre"
 
-#: ../modules/controller_linux_input.c:107
+#: ../modules/controller-linux-input.c:107
 msgid "Dial Turn Right"
 msgstr "Snu til høgre"
 
-#: ../modules/controller_linux_input.c:108
+#: ../modules/controller-linux-input.c:108
 msgid "Wheel Turn Left"
 msgstr "Hjulrotasjon venstre"
 
-#: ../modules/controller_linux_input.c:109
+#: ../modules/controller-linux-input.c:109
 msgid "Wheel Turn Right"
 msgstr "Hjulrotasjon høgre"
 
-#: ../modules/controller_linux_input.c:178
+#: ../modules/controller-linux-input.c:178
 msgid "Linux input event controller"
 msgstr "Linux hendingskontrollar for inndata"
 
-#: ../modules/controller_linux_input.c:218
-#: ../modules/controller_dx_dinput.c:196 ../modules/controller_midi.c:212
+#: ../modules/controller-linux-input.c:218
+#: ../modules/controller-dx-dinput.c:196
+#: ../modules/controller-midi.c:212
 msgid "Device:"
 msgstr "_Eining:"
 
-#: ../modules/controller_linux_input.c:219
+#: ../modules/controller-linux-input.c:219
 msgid "The name of the device to read Linux Input events from."
 msgstr "Namnet på utstyret som inneheld Linux inndatahendingane"
 
-#: ../modules/controller_linux_input.c:230
+#: ../modules/controller-linux-input.c:230
 msgid "Linux Input"
 msgstr "Linux Input"
 
-#: ../modules/controller_linux_input.c:513
+#: ../modules/controller-linux-input.c:513
 msgid "Linux Input Events"
 msgstr "Linux Input Events"
 
-#: ../modules/controller_linux_input.c:525
-#: ../modules/controller_dx_dinput.c:1095 ../modules/controller_midi.c:505
+#: ../modules/controller-linux-input.c:525
+#: ../modules/controller-dx-dinput.c:1095
+#: ../modules/controller-midi.c:505
 msgid "No device configured"
 msgstr "Inga eining er konfigurert"
 
-#: ../modules/controller_linux_input.c:551 ../modules/controller_midi.c:454
-#: ../modules/controller_midi.c:480
+#: ../modules/controller-linux-input.c:551
+#: ../modules/controller-midi.c:454
+#: ../modules/controller-midi.c:480
 #, c-format
 msgid "Reading from %s"
 msgstr "Les frå %s"
 
-#: ../modules/controller_linux_input.c:569
-#: ../modules/controller_linux_input.c:623 ../modules/controller_midi.c:436
-#: ../modules/controller_midi.c:497 ../modules/controller_midi.c:568
+#: ../modules/controller-linux-input.c:569
+#: ../modules/controller-linux-input.c:623
+#: ../modules/controller-midi.c:436
+#: ../modules/controller-midi.c:497
+#: ../modules/controller-midi.c:568
 #, c-format
 msgid "Device not available: %s"
 msgstr "Eininga er ikkje tilgjengeleg: %s"
 
-#: ../modules/controller_linux_input.c:588
-#: ../modules/controller_dx_dinput.c:1120
+#: ../modules/controller-linux-input.c:588
+#: ../modules/controller-dx-dinput.c:1120
 msgid "Device not available"
 msgstr "Eininga er ikkje tilgjengeleg"
 
-#: ../modules/controller_linux_input.c:632 ../modules/controller_midi.c:577
+#: ../modules/controller-linux-input.c:632
+#: ../modules/controller-midi.c:577
 msgid "End of file"
 msgstr "Filslutt"
 
-#: ../modules/controller_dx_dinput.c:156
+#: ../modules/controller-dx-dinput.c:156
 msgid "DirectX DirectInput event controller"
 msgstr "DirectX hendingskontrollar for direkteinngang"
 
-#: ../modules/controller_dx_dinput.c:197
+#: ../modules/controller-dx-dinput.c:197
 msgid "The device to read DirectInput events from."
 msgstr "Einingar som det skal lesast direkteinngangshendingar from"
 
-#: ../modules/controller_dx_dinput.c:206
+#: ../modules/controller-dx-dinput.c:206
 msgid "DirectX DirectInput"
 msgstr "DirectX DirectInput"
 
-#: ../modules/controller_dx_dinput.c:420
+#: ../modules/controller-dx-dinput.c:420
 #, c-format
 msgid "Button %d"
 msgstr "Knapp %d"
 
-#: ../modules/controller_dx_dinput.c:423
+#: ../modules/controller-dx-dinput.c:423
 #, c-format
 msgid "Button %d Press"
 msgstr "Knapp %d trykt"
 
-#: ../modules/controller_dx_dinput.c:426
+#: ../modules/controller-dx-dinput.c:426
 #, c-format
 msgid "Button %d Release"
 msgstr "Knapp %d ikkje trykt"
 
-#: ../modules/controller_dx_dinput.c:452
+#: ../modules/controller-dx-dinput.c:452
 msgid "Y Move Away"
 msgstr "Flytt tilbake Y"
 
-#: ../modules/controller_dx_dinput.c:455
+#: ../modules/controller-dx-dinput.c:455
 msgid "Y Move Near"
 msgstr "Flytt nærare Y"
 
-#: ../modules/controller_dx_dinput.c:470
+#: ../modules/controller-dx-dinput.c:470
 msgid "X Axis Tilt Away"
 msgstr "X-akse hell tilbake"
 
-#: ../modules/controller_dx_dinput.c:473
+#: ../modules/controller-dx-dinput.c:473
 msgid "X Axis Tilt Near"
 msgstr "X-akse hell framover"
 
-#: ../modules/controller_dx_dinput.c:502
+#: ../modules/controller-dx-dinput.c:502
 #, c-format
 msgid "Slider %d Increase"
 msgstr "Glidebrytar %d minkar"
 
-#: ../modules/controller_dx_dinput.c:505
+#: ../modules/controller-dx-dinput.c:505
 #, c-format
 msgid "Slider %d Decrease"
 msgstr "Glidebrytar %d aukar"
 
-#: ../modules/controller_dx_dinput.c:515
+#: ../modules/controller-dx-dinput.c:515
 #, c-format
 msgid "POV %d X View"
 msgstr "POV %d x-vis"
 
-#: ../modules/controller_dx_dinput.c:518
+#: ../modules/controller-dx-dinput.c:518
 #, c-format
 msgid "POV %d Y View"
 msgstr "POV %d y-vis"
 
-#: ../modules/controller_dx_dinput.c:521
+#: ../modules/controller-dx-dinput.c:521
 #, c-format
 msgid "POV %d Return"
 msgstr "POV %d return"
 
-#: ../modules/controller_dx_dinput.c:1084
+#: ../modules/controller-dx-dinput.c:1084
 msgid "DirectInput Events"
 msgstr "DirectInput hendingar"
 
-#: ../modules/controller_midi.c:164
+#: ../modules/controller-midi.c:164
 msgid "MIDI event controller"
 msgstr "MIDI hendingskontrollar"
 
-#: ../modules/controller_midi.c:203
+#: ../modules/controller-midi.c:203
 msgid "The name of the device to read MIDI events from."
 msgstr "Namnet på utstyret som inneheld MIDI-hendingane"
 
-#: ../modules/controller_midi.c:206
+#: ../modules/controller-midi.c:206
 msgid "Enter 'alsa' to use the ALSA sequencer."
 msgstr "Skriv inn  «alsa» for å bruke ALSA-sekvenser."
 
-#: ../modules/controller_midi.c:221
+#: ../modules/controller-midi.c:221
 msgid "Channel:"
 msgstr "Kanal:"
 
-#: ../modules/controller_midi.c:222
-msgid ""
-"The MIDI channel to read events from. Set to -1 for reading from all MIDI "
-"channels."
-msgstr ""
-"Namnet på utstyret som inneheld MIDI-hendingane. Sett til -1 for å lesa frå "
-"alle MIDI-kanalane."
+#: ../modules/controller-midi.c:222
+msgid "The MIDI channel to read events from. Set to -1 for reading from all MIDI channels."
+msgstr "Namnet på utstyret som inneheld MIDI-hendingane. Sett til -1 for å lesa frå alle MIDI-kanalane."
 
-#: ../modules/controller_midi.c:226
+#: ../modules/controller-midi.c:226
 msgid "MIDI"
 msgstr "MIDI"
 
-#: ../modules/controller_midi.c:355
+#: ../modules/controller-midi.c:355
 #, c-format
 msgid "Note %02x on"
 msgstr "Note %02x på"
 
-#: ../modules/controller_midi.c:358
+#: ../modules/controller-midi.c:358
 #, c-format
 msgid "Note %02x off"
 msgstr "Note %02x av"
 
-#: ../modules/controller_midi.c:361
+#: ../modules/controller-midi.c:361
 #, c-format
 msgid "Controller %03d"
 msgstr "Kontrollar %03d"
 
-#: ../modules/controller_midi.c:408
+#: ../modules/controller-midi.c:408
 msgid "MIDI Events"
 msgstr "MIDI-hendingar"
 
-#: ../modules/controller_midi.c:426
+#: ../modules/controller-midi.c:426
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../modules/controller_midi.c:428
+#: ../modules/controller-midi.c:428
 msgid "GIMP MIDI Input Controller"
 msgstr "GIMP MIDI inndatakontrollar"
+
+#~ msgid "%d Byte"
+#~ msgid_plural "%d Bytes"
+#~ msgstr[0] "%d byte"
+#~ msgstr[1] "%d byte"
+#~ msgid "%.2f KB"
+#~ msgstr "%.2f KB"
+#~ msgid "%.1f KB"
+#~ msgstr "%.1f KB"
+#~ msgid "%d KB"
+#~ msgstr "%d KB"
+#~ msgid "%.2f MB"
+#~ msgstr "%.2f MB"
+#~ msgid "%.1f MB"
+#~ msgstr "%.1f MB"
+#~ msgid "%d MB"
+#~ msgstr "%d MB"
+#~ msgid "%.2f GB"
+#~ msgstr "%.2f GB"
+#~ msgid "%.1f GB"
+#~ msgstr "%.1f GB"
+#~ msgid "%d GB"
+#~ msgstr "%d GB"
+#~ msgid "profile|None"
+#~ msgstr "Ingen"
+#~ msgid "Painter-style triangle color selector"
+#~ msgstr "Triangulær fargevelgjar i målarstil"
+#~ msgid "Triangle"
+#~ msgstr "Fargetrekant"
+
diff --git a/po-libgimp/ro.po b/po-libgimp/ro.po
index 32177ad754..4c752b1463 100644
--- a/po-libgimp/ro.po
+++ b/po-libgimp/ro.po
@@ -1,16 +1,16 @@
-# gimp ro translation
+# Romanian GIMP translation
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Robert Claudiu Gheorghe , 2001.
-# Cristian Secară , 2008.
+# Cristian Secară , 2008-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-libgimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-18 23:34+0200\n"
-"PO-Revision-Date: 2009-02-25 22:19+0200\n"
+"POT-Creation-Date: 2009-09-28 23:09+0300\n"
+"PO-Revision-Date: 2009-07-07 23:16+0200\n"
 "Last-Translator: Cristian Secară \n"
-"Language-Team: Română \n"
+"Language-Team: Română \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -650,7 +650,7 @@ msgstr "Incremental"
 # la color display filter, dacă unele poziții nu au niciun profil specificat
 #: ../libgimpbase/gimpbaseenums.c:624 ../modules/display-filter-lcms.c:191
 msgid "None"
-msgstr "Nimic"
+msgstr "Fără"
 
 #: ../libgimpbase/gimpbaseenums.c:625
 msgid "Sawtooth wave"
@@ -835,7 +835,7 @@ msgstr "Simulare de tipărire"
 
 #: ../libgimpconfig/gimpcolorconfig-enums.c:56
 msgid "Perceptual"
-msgstr "Perceptual"
+msgstr "Perceptiv"
 
 #: ../libgimpconfig/gimpcolorconfig-enums.c:57
 msgid "Relative colorimetric"
@@ -1170,7 +1170,7 @@ msgstr "_Duplică"
 
 #: ../libgimpwidgets/gimpstock.c:115
 msgid "_Edit"
-msgstr "_Editare"
+msgstr "_Editează"
 
 # hm ?
 #: ../libgimpwidgets/gimpstock.c:116
diff --git a/po-libgimp/zh_CN.po b/po-libgimp/zh_CN.po
index 8635c83722..837f8bf90d 100644
--- a/po-libgimp/zh_CN.po
+++ b/po-libgimp/zh_CN.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-libgimp\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=gimp&component=general\n"
-"POT-Creation-Date: 2009-07-26 19:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-09-07 16:14+0800\n"
 "PO-Revision-Date: 2009-07-27 22:15+0800\n"
 "Last-Translator: Aron Xu \n"
 "Language-Team: zh_CN \n"
diff --git a/po-plug-ins/cs.po b/po-plug-ins/cs.po
index 262d79e884..80b3700856 100644
--- a/po-plug-ins/cs.po
+++ b/po-plug-ins/cs.po
@@ -1,25 +1,28 @@
 # Czech translation of GIMP plugins.
-# Copyright (C) 2001, 2003, 2006, 2007, 2008 the author(s) of the GIMP.
+# Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009 the author(s) of the GIMP.
 # Copyright (C) 2003, 2004 Miloslav Trmac .
 # This file is distributed under the same license as the gimp-plugins package.
 # Stanislav Brabec , 1999-2001.
 # Michal Bukovjan , 2002, 2003.
 # Miloslav Trmac , 2003, 2004.
 # Jakub Friedl , 2006, 2007.
+# JardaK , 2009.
+# Marek Černocký , 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 23:31+0100\n"
-"PO-Revision-Date: 2008-10-27 23:51+0100\n"
-"Last-Translator: Petr Kovar \n"
+"POT-Creation-Date: 2009-11-04 21:27+0100\n"
+"PO-Revision-Date: 2009-11-04 20:16+0100\n"
+"Last-Translator: Marek Černocký \n"
 "Language-Team: Czech \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Czech\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:119
 msgid "Original"
@@ -156,11 +159,11 @@ msgstr "Nahradit rozsah barev jiným rozsahem"
 
 #: ../plug-ins/color-rotate/color-rotate.c:106
 msgid "_Rotate Colors..."
-msgstr "_Rotovat barvy..."
+msgstr "_Otočit barvy…"
 
 #: ../plug-ins/color-rotate/color-rotate.c:140
 msgid "Rotating the colors"
-msgstr "Rotují se barvy"
+msgstr "Otáčejí se barvy"
 
 #: ../plug-ins/common/alien-map.c:140
 msgid "_Modify red channel"
@@ -240,7 +243,7 @@ msgstr "Upravit barvy rozličnými psychedelickými způsoby"
 
 #: ../plug-ins/common/alien-map.c:188
 msgid "_Alien Map..."
-msgstr "_Mimozemské mapování..."
+msgstr "_Mimozemské mapování…"
 
 #: ../plug-ins/common/alien-map.c:320
 msgid "Alien Map: Transforming"
@@ -280,7 +283,7 @@ msgstr "Zarovnání všech viditelných vrstev obrázku"
 
 #: ../plug-ins/common/align-layers.c:133
 msgid "Align Visi_ble Layers..."
-msgstr "Zarovnat _viditelné vrstvy..."
+msgstr "Zarovnat _viditelné vrstvy…"
 
 #: ../plug-ins/common/align-layers.c:173
 msgid "There are not enough layers to align."
@@ -430,7 +433,7 @@ msgstr "Náhled GIMP animace založené na vrstvách"
 
 #: ../plug-ins/common/animation-play.c:168
 msgid "_Playback..."
-msgstr "_Přehrávání..."
+msgstr "_Přehrávání…"
 
 #: ../plug-ins/common/animation-play.c:447
 msgid "_Step"
@@ -512,7 +515,7 @@ msgstr "_Vyhlazování"
 
 #: ../plug-ins/common/antialias.c:147
 msgid "Antialiasing..."
-msgstr "Vyhlazování..."
+msgstr "Vyhlazování…"
 
 #: ../plug-ins/common/apply-canvas.c:1140
 msgid "Add a canvas texture to the image"
@@ -520,7 +523,7 @@ msgstr "Přidat do obrázku texturu plátna"
 
 #: ../plug-ins/common/apply-canvas.c:1145
 msgid "_Apply Canvas..."
-msgstr "_Použít plátno..."
+msgstr "_Použít plátno…"
 
 #: ../plug-ins/common/apply-canvas.c:1226
 msgid "Applying canvas"
@@ -566,7 +569,7 @@ msgstr "Simulovat obrázek na okenních žaluziích"
 
 #: ../plug-ins/common/blinds.c:121
 msgid "_Blinds..."
-msgstr "_Pruhy..."
+msgstr "_Pruhy…"
 
 #: ../plug-ins/common/blinds.c:188
 msgid "Adding blinds"
@@ -599,14 +602,14 @@ msgstr "_Svisle"
 #: ../plug-ins/common/file-cel.c:365 ../plug-ins/common/file-dicom.c:557
 #: ../plug-ins/common/file-gif-load.c:911 ../plug-ins/common/file-pcx.c:412
 #: ../plug-ins/common/file-pcx.c:418 ../plug-ins/common/file-pix.c:382
-#: ../plug-ins/common/file-png.c:852 ../plug-ins/common/file-pnm.c:584
+#: ../plug-ins/common/file-png.c:852 ../plug-ins/common/file-pnm.c:585
 #: ../plug-ins/common/file-raw.c:712 ../plug-ins/common/file-sunras.c:975
 #: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997
 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:746
 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:267
-#: ../plug-ins/file-bmp/bmp-read.c:590 ../plug-ins/file-faxg3/faxg3.c:478
-#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:249
-#: ../plug-ins/file-jpeg/jpeg-load.c:758
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:617
+#: ../plug-ins/file-faxg3/faxg3.c:478 ../plug-ins/file-fits/fits.c:530
+#: ../plug-ins/file-jpeg/jpeg-load.c:249 ../plug-ins/file-jpeg/jpeg-load.c:761
 #: ../plug-ins/file-psd/psd-image-res-load.c:995
 #: ../plug-ins/file-psd/psd-load.c:1526 ../plug-ins/file-sgi/sgi.c:384
 #: ../plug-ins/gfig/gfig-dialog.c:1284
@@ -634,7 +637,7 @@ msgstr "Rozostřit sousední pixely, ale pouze v oblastech nízkého kontrastu"
 
 #: ../plug-ins/common/blur-gauss-selective.c:115
 msgid "_Selective Gaussian Blur..."
-msgstr "_Selektivní Gaussovské rozostření..."
+msgstr "_Selektivní Gaussovské rozostření…"
 
 #: ../plug-ins/common/blur-gauss-selective.c:195
 #: ../plug-ins/common/blur-gauss-selective.c:232
@@ -665,7 +668,7 @@ msgstr "Nejjednodušší, nejčastěji používaný způsob rozostřování"
 
 #: ../plug-ins/common/blur-gauss.c:172
 msgid "_Gaussian Blur..."
-msgstr "_Gaussovské rozostření..."
+msgstr "_Gaussovské rozostření…"
 
 #: ../plug-ins/common/blur-gauss.c:179 ../plug-ins/common/blur-gauss.c:199
 #: ../plug-ins/common/blur-gauss.c:219 ../plug-ins/common/blur-gauss.c:239
@@ -682,12 +685,12 @@ msgid "Blur Radius"
 msgstr "Poloměr rozostření"
 
 #: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457
-#: ../plug-ins/common/noise-spread.c:384
+#: ../plug-ins/common/noise-spread.c:386
 msgid "_Horizontal:"
-msgstr "_Vodorovně"
+msgstr "_Vodorovně:"
 
 #: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474
-#: ../plug-ins/common/noise-spread.c:388
+#: ../plug-ins/common/noise-spread.c:390
 msgid "_Vertical:"
 msgstr "_Svisle:"
 
@@ -709,7 +712,7 @@ msgstr "Simulovat pohyb směrovým rozostřením"
 
 #: ../plug-ins/common/blur-motion.c:164 ../plug-ins/common/blur-motion.c:177
 msgid "_Motion Blur..."
-msgstr "_Rozmáznutí pohybem..."
+msgstr "_Rozmáznutí pohybem…"
 
 #: ../plug-ins/common/blur-motion.c:910
 msgid "Motion blurring"
@@ -724,19 +727,16 @@ msgid "Blur Type"
 msgstr "Typ rozmáznutí"
 
 #: ../plug-ins/common/blur-motion.c:1049
-#, fuzzy
 msgctxt "blur-type"
 msgid "_Linear"
 msgstr "_Lineární"
 
 #: ../plug-ins/common/blur-motion.c:1050
-#, fuzzy
 msgctxt "blur-type"
 msgid "_Radial"
 msgstr "_Radiální"
 
 #: ../plug-ins/common/blur-motion.c:1051
-#, fuzzy
 msgctxt "blur-type"
 msgid "_Zoom"
 msgstr "_Přiblížení"
@@ -796,7 +796,7 @@ msgstr "Nastavit popředí na průměrnou barvu okraje obrázku"
 
 #: ../plug-ins/common/border-average.c:104
 msgid "_Border Average..."
-msgstr "_Průměr okraje..."
+msgstr "_Průměr okraje…"
 
 #: ../plug-ins/common/border-average.c:171
 msgid "Border Average"
@@ -830,7 +830,7 @@ msgstr "Vytvořit efekt reliéfu pomocí mapy nerovností"
 
 #: ../plug-ins/common/bump-map.c:267
 msgid "_Bump Map..."
-msgstr "Ma_pa vyvýšení..."
+msgstr "Ma_pa vyvýšení…"
 
 #: ../plug-ins/common/bump-map.c:415
 msgid "Bump-mapping"
@@ -895,7 +895,8 @@ msgstr "Posun _X:"
 msgid ""
 "The offset can be adjusted by dragging the preview using the middle mouse "
 "button."
-msgstr "Posun může být upraven přetažením náhledu pomocí prostředního tlačítka myši."
+msgstr ""
+"Posun může být upraven přetažením náhledu pomocí prostředního tlačítka myši."
 
 #: ../plug-ins/common/bump-map.c:944 ../plug-ins/common/file-ps.c:3407
 msgid "_Y offset:"
@@ -915,7 +916,7 @@ msgstr "Simulovat komiksovou kresbu zesílením hran"
 
 #: ../plug-ins/common/cartoon.c:147
 msgid "Ca_rtoon..."
-msgstr "_Komiks..."
+msgstr "_Komiks…"
 
 #: ../plug-ins/common/cartoon.c:811
 msgid "Cartoon"
@@ -935,7 +936,7 @@ msgstr "Upravit barvy mísením RGB kanálů"
 
 #: ../plug-ins/common/channel-mixer.c:180
 msgid "Channel Mi_xer..."
-msgstr "_Mixér kanálů..."
+msgstr "_Mixér kanálů…"
 
 #. printf("Channel Mixer:: Mode:%d  r %f  g %f  b %f\n ",
 #. param[3].data.d_int32, mix.black.red_gain,
@@ -1010,21 +1011,21 @@ msgstr "Načíst nastavení mixéru kanálů"
 #: ../plug-ins/common/file-compressor.c:666
 #: ../plug-ins/common/file-dicom.c:325 ../plug-ins/common/file-gbr.c:361
 #: ../plug-ins/common/file-gif-load.c:340 ../plug-ins/common/file-gih.c:662
-#: ../plug-ins/common/file-mng.c:1073 ../plug-ins/common/file-pat.c:330
+#: ../plug-ins/common/file-mng.c:1108 ../plug-ins/common/file-pat.c:330
 #: ../plug-ins/common/file-pcx.c:361 ../plug-ins/common/file-pdf.c:541
 #: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:721
-#: ../plug-ins/common/file-pnm.c:493 ../plug-ins/common/file-ps.c:1036
+#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1036
 #: ../plug-ins/common/file-ps.c:3048 ../plug-ins/common/file-psp.c:1751
 #: ../plug-ins/common/file-raw.c:249 ../plug-ins/common/file-raw.c:666
 #: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333
-#: ../plug-ins/common/file-svg.c:718 ../plug-ins/common/file-tga.c:442
+#: ../plug-ins/common/file-svg.c:731 ../plug-ins/common/file-tga.c:442
 #: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
 #: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2002
-#: ../plug-ins/file-bmp/bmp-read.c:154 ../plug-ins/file-faxg3/faxg3.c:233
+#: ../plug-ins/file-bmp/bmp-read.c:156 ../plug-ins/file-faxg3/faxg3.c:233
 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:460
 #: ../plug-ins/file-fli/fli-gimp.c:497 ../plug-ins/file-ico/ico-load.c:653
 #: ../plug-ins/file-ico/ico-load.c:732 ../plug-ins/file-jpeg/jpeg-load.c:109
-#: ../plug-ins/file-jpeg/jpeg-load.c:828 ../plug-ins/file-psd/psd-load.c:131
+#: ../plug-ins/file-jpeg/jpeg-load.c:831 ../plug-ins/file-psd/psd-load.c:131
 #: ../plug-ins/file-psd/psd-thumb-load.c:80
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:272
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:190
@@ -1037,7 +1038,7 @@ msgstr "Načíst nastavení mixéru kanálů"
 #: ../plug-ins/lighting/lighting-ui.c:1354
 #, c-format
 msgid "Could not open '%s' for reading: %s"
-msgstr "Nemohu otevřít '%s' pro čtení: %s"
+msgstr "Nemohu otevřít „%s“ pro čtení: %s"
 
 #: ../plug-ins/common/channel-mixer.c:1005
 msgid "Save Channel Mixer Settings"
@@ -1052,14 +1053,14 @@ msgstr "Uložit nastavení mixéru kanálů"
 #: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:801
 #: ../plug-ins/common/file-gbr.c:632 ../plug-ins/common/file-gif-save.c:761
 #: ../plug-ins/common/file-gih.c:1275 ../plug-ins/common/file-html-table.c:236
-#: ../plug-ins/common/file-mng.c:575 ../plug-ins/common/file-mng.c:909
+#: ../plug-ins/common/file-mng.c:610 ../plug-ins/common/file-mng.c:944
 #: ../plug-ins/common/file-pat.c:462 ../plug-ins/common/file-pcx.c:666
 #: ../plug-ins/common/file-pix.c:524 ../plug-ins/common/file-png.c:1270
-#: ../plug-ins/common/file-pnm.c:973 ../plug-ins/common/file-ps.c:1213
+#: ../plug-ins/common/file-pnm.c:977 ../plug-ins/common/file-ps.c:1213
 #: ../plug-ins/common/file-raw.c:546 ../plug-ins/common/file-raw.c:574
 #: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1170
 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
-#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2112
+#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2111
 #: ../plug-ins/file-bmp/bmp-write.c:296 ../plug-ins/file-fits/fits.c:476
 #: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1008
 #: ../plug-ins/file-jpeg/jpeg-save.c:325 ../plug-ins/file-psd/psd-save.c:1635
@@ -1072,13 +1073,13 @@ msgstr "Uložit nastavení mixéru kanálů"
 #: ../plug-ins/lighting/lighting-ui.c:1211
 #, c-format
 msgid "Could not open '%s' for writing: %s"
-msgstr "Nemohu otevřít '%s' pro zápis: %s"
+msgstr "Nemohu otevřít „%s“ pro zápis: %s"
 
 #: ../plug-ins/common/channel-mixer.c:1068
 #: ../plug-ins/common/cml-explorer.c:2060
 #, c-format
 msgid "Parameters were saved to '%s'"
-msgstr "Parametry byly uloženy do '%s'"
+msgstr "Parametry byly uloženy do „%s“"
 
 #: ../plug-ins/common/checkerboard.c:89
 msgid "Create a checkerboard pattern"
@@ -1086,7 +1087,7 @@ msgstr "Vytvořit vzorek šachovnice"
 
 #: ../plug-ins/common/checkerboard.c:94
 msgid "_Checkerboard..."
-msgstr "Ša_chovnice..."
+msgstr "Ša_chovnice…"
 
 #: ../plug-ins/common/checkerboard.c:161
 msgid "Adding checkerboard"
@@ -1322,7 +1323,7 @@ msgstr "Tvorba abstraktních CML vzorů"
 
 #: ../plug-ins/common/cml-explorer.c:466
 msgid "CML _Explorer..."
-msgstr "CML _badatel..."
+msgstr "CML _badatel…"
 
 #: ../plug-ins/common/cml-explorer.c:756
 msgid "CML Explorer: evoluting"
@@ -1355,7 +1356,7 @@ msgstr "S_ytost"
 
 #: ../plug-ins/common/cml-explorer.c:1296 ../plug-ins/common/filter-pack.c:708
 msgid "_Value"
-msgstr "_Jas:"
+msgstr "_Hodnota"
 
 #: ../plug-ins/common/cml-explorer.c:1300
 msgid "_Advanced"
@@ -1379,7 +1380,7 @@ msgstr "Počáteční posun:"
 
 #: ../plug-ins/common/cml-explorer.c:1361
 msgid "Seed of Random (only for \"From Seed\" Modes)"
-msgstr "Hnízdo náhodných čísel (pouze pro režimy \"z hnízda\")"
+msgstr "Hnízdo náhodných čísel (pouze pro režimy „z hnízda“)"
 
 #: ../plug-ins/common/cml-explorer.c:1372 ../plug-ins/maze/maze-dialog.c:261
 msgid "Seed:"
@@ -1387,7 +1388,7 @@ msgstr "Hnízdo:"
 
 #: ../plug-ins/common/cml-explorer.c:1385
 msgid "Switch to \"From seed\" With the Last Seed"
-msgstr "Přepnout do režimu \"z hnízda\" s posledním hnízdem"
+msgstr "Přepnout do režimu „z hnízda“ s posledním hnízdem"
 
 #: ../plug-ins/common/cml-explorer.c:1397
 msgid ""
@@ -1396,7 +1397,7 @@ msgid ""
 "(this is the reason why image on drawable is different from preview), and "
 "(2) all mutation rates equal to zero."
 msgstr ""
-"Tlačítko \"Upravit hnízdo\" je přezdívka.\n"
+"Tlačítko „Upravit hnízdo“ je přezdívka.\n"
 "Stejné hnízdo vytváří stejný obrázek, pokud (1) šířky obrázků jsou stejné "
 "(to je důvod, proč jsou obrázky v obrazovce odlišné od náhledu) a (2) "
 "všechny míry mutace se rovnají nule."
@@ -1468,7 +1469,7 @@ msgstr "Počet podrozsahů:"
 
 #: ../plug-ins/common/cml-explorer.c:1637
 msgid "P(ower factor):"
-msgstr "P (Faktor mocniny)"
+msgstr "P (faktor mocniny):"
 
 #: ../plug-ins/common/cml-explorer.c:1646
 msgid "Parameter k:"
@@ -1521,12 +1522,12 @@ msgstr "Chyba: nejedná se o CML soubor s parametry."
 #: ../plug-ins/common/cml-explorer.c:2207
 #, c-format
 msgid "Warning: '%s' is an old format file."
-msgstr "Varování: '%s' je soubor ve starém formátu."
+msgstr "Varování: „%s“ je soubor ve starém formátu."
 
 #: ../plug-ins/common/cml-explorer.c:2211
 #, c-format
 msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
-msgstr "Varování: '%s' je soubor parametrů pro novější verzi CML badatele."
+msgstr "Varování: „%s“ je soubor parametrů pro novější verzi CML badatele."
 
 #: ../plug-ins/common/cml-explorer.c:2274
 msgid "Error: failed to load parameters"
@@ -1538,7 +1539,7 @@ msgstr "Analyzovat barvy v obrázku"
 
 #: ../plug-ins/common/color-cube-analyze.c:112
 msgid "Colorcube A_nalysis..."
-msgstr "_Analýza barevné krychle..."
+msgstr "_Analýza barevné krychle…"
 
 #: ../plug-ins/common/color-cube-analyze.c:200
 #: ../plug-ins/common/color-cube-analyze.c:356
@@ -1583,7 +1584,7 @@ msgstr "Nahradit barvu jinou barvou"
 
 #: ../plug-ins/common/color-exchange.c:128
 msgid "_Color Exchange..."
-msgstr "_Zaměnit barvy..."
+msgstr "_Zaměnit barvy…"
 
 #: ../plug-ins/common/color-exchange.c:213
 #: ../plug-ins/common/color-exchange.c:287
@@ -1592,7 +1593,7 @@ msgstr "Záměna barev"
 
 #: ../plug-ins/common/color-exchange.c:309
 msgid "Middle-Click Inside Preview to Pick \"From Color\""
-msgstr "Pro výběr \"Z barvy\" klikněte prostředním tlačítkem myši do náhledu"
+msgstr "Pro výběr „Z barvy“ klikněte prostředním tlačítkem myši do náhledu"
 
 #: ../plug-ins/common/color-exchange.c:347
 msgid "To Color"
@@ -1632,7 +1633,7 @@ msgstr "Převést zvolenou barvu na průhlednost"
 
 #: ../plug-ins/common/color-to-alpha.c:101
 msgid "Color to _Alpha..."
-msgstr "Barva do _alfy..."
+msgstr "Barva do _alfy…"
 
 #: ../plug-ins/common/color-to-alpha.c:184
 msgid "Removing color"
@@ -1656,7 +1657,7 @@ msgstr "Nahradit všechny barvy odstíny zadané barvy"
 
 #: ../plug-ins/common/colorify.c:108
 msgid "Colorif_y..."
-msgstr "_Kolorovat..."
+msgstr "_Kolorovat…"
 
 #: ../plug-ins/common/colorify.c:169
 msgid "Colorifying"
@@ -1680,7 +1681,7 @@ msgstr "Přerovnat barevnou mapu"
 
 #: ../plug-ins/common/colormap-remap.c:104
 msgid "R_earrange Colormap..."
-msgstr "_Přerovnat barevnou mapu..."
+msgstr "_Přerovnat barevnou mapu…"
 
 #: ../plug-ins/common/colormap-remap.c:116
 msgid "Swap two colors in the colormap"
@@ -1762,7 +1763,7 @@ msgstr "_Sytost:"
 
 #: ../plug-ins/common/compose.c:214 ../plug-ins/common/noise-hsv.c:433
 msgid "_Value:"
-msgstr "_Jas:"
+msgstr "_Hodnota:"
 
 #: ../plug-ins/common/compose.c:219 ../plug-ins/common/decompose.c:193
 msgid "HSL"
@@ -1856,7 +1857,7 @@ msgstr ""
 
 #: ../plug-ins/common/compose.c:410
 msgid "C_ompose..."
-msgstr "_Komponovat..."
+msgstr "_Komponovat…"
 
 #: ../plug-ins/common/compose.c:434
 msgid "Recompose an image that was previously decomposed"
@@ -1871,12 +1872,13 @@ msgid ""
 "You can only run 'Recompose' if the active image was originally produced by "
 "'Decompose'."
 msgstr ""
-"'Rekomponovat' můžete spustit, jen pokud byl aktivní obrázek původně "
-"vytvořen pomocí 'Dekomponovat'."
+"„Rekomponovat“ můžete spustit, jen pokud byl aktivní obrázek původně "
+"vytvořen pomocí „Dekomponovat“."
 
 #: ../plug-ins/common/compose.c:512
 msgid "Error scanning 'decompose-data' parasite: too few layers found"
-msgstr "Chyba při skenování parazita 'decompose-data': nalezeno příliš málo vrstev"
+msgstr ""
+"Chyba při skenování parazita „decompose-data“: nalezeno příliš málo vrstev"
 
 #: ../plug-ins/common/compose.c:545
 #, c-format
@@ -1958,7 +1960,7 @@ msgstr "Vylepšit kontrast metodou Retinex"
 
 #: ../plug-ins/common/contrast-retinex.c:166
 msgid "Retine_x..."
-msgstr "Retine_x..."
+msgstr "Retine_x…"
 
 #: ../plug-ins/common/contrast-retinex.c:250
 msgid "Retinex"
@@ -2014,7 +2016,7 @@ msgstr "Automatické roztahování HSV"
 
 #: ../plug-ins/common/contrast-stretch-hsv.c:192
 msgid "autostretch_hsv: cmap was NULL!  Quitting...\n"
-msgstr "autostretch_hsv: cmap bylo NULL!  Končím...\n"
+msgstr "autostretch_hsv: cmap bylo NULL!  Končím…\n"
 
 #: ../plug-ins/common/contrast-stretch.c:68
 msgid "Stretch contrast to cover the maximum possible range"
@@ -2030,7 +2032,7 @@ msgstr "Automatické roztahování kontrastu"
 
 #: ../plug-ins/common/contrast-stretch.c:152
 msgid "c_astretch: cmap was NULL!  Quitting...\n"
-msgstr "c_astretch: cmap bylo NULL!  Končím...\n"
+msgstr "c_astretch: cmap bylo NULL!  Končím…\n"
 
 #: ../plug-ins/common/convolution-matrix.c:64
 msgid "Gr_ey"
@@ -2043,16 +2045,16 @@ msgstr "Čer_vená"
 #: ../plug-ins/common/convolution-matrix.c:66
 #: ../plug-ins/common/newsprint.c:353
 msgid "_Green"
-msgstr "_Zelená:"
+msgstr "_Zelená"
 
 #: ../plug-ins/common/convolution-matrix.c:67
 #: ../plug-ins/common/newsprint.c:361
 msgid "_Blue"
-msgstr "_Modrá:"
+msgstr "_Modrá"
 
 #: ../plug-ins/common/convolution-matrix.c:68
 msgid "_Alpha"
-msgstr "_Alfa:"
+msgstr "_Alfa"
 
 #: ../plug-ins/common/convolution-matrix.c:73
 msgid "E_xtend"
@@ -2074,7 +2076,7 @@ msgstr "Aplikovat obecnou konvoluční matici 5x5"
 
 #: ../plug-ins/common/convolution-matrix.c:206
 msgid "_Convolution Matrix..."
-msgstr "_Konvoluční matice..."
+msgstr "_Konvoluční matice…"
 
 #: ../plug-ins/common/convolution-matrix.c:241
 msgid "Convolution does not work on layers smaller than 3x3 pixels."
@@ -2159,7 +2161,7 @@ msgstr "Převést obrázek do náhodně otočených barevných skvrn"
 
 #: ../plug-ins/common/cubism.c:155
 msgid "_Cubism..."
-msgstr "_Kubismus..."
+msgstr "_Kubismus…"
 
 #: ../plug-ins/common/cubism.c:268
 msgid "Cubism"
@@ -2187,7 +2189,7 @@ msgstr "Ohnout obrázek pomocí dvou kontrolních křivek"
 
 #: ../plug-ins/common/curve-bend.c:541
 msgid "_Curve Bend..."
-msgstr "_Zkřivit..."
+msgstr "_Zkřivit…"
 
 #: ../plug-ins/common/curve-bend.c:677 ../plug-ins/common/edge-dog.c:176
 msgid "Can operate on layers only (but was called on channel or mask)."
@@ -2495,7 +2497,7 @@ msgstr "Rozložit obrázek do oddělených barevných komponent"
 
 #: ../plug-ins/common/decompose.c:318 ../plug-ins/common/decompose.c:336
 msgid "_Decompose..."
-msgstr "_Dekomponovat..."
+msgstr "_Dekomponovat…"
 
 #: ../plug-ins/common/decompose.c:429
 msgid "Decomposing"
@@ -2531,7 +2533,7 @@ msgstr "Opravit obrázky, ve kterých chybí každý druhý řádek"
 
 #: ../plug-ins/common/deinterlace.c:100
 msgid "_Deinterlace..."
-msgstr "_Odstranit prokládání..."
+msgstr "_Odstranit prokládání…"
 
 #: ../plug-ins/common/deinterlace.c:157 ../plug-ins/common/deinterlace.c:325
 msgid "Deinterlace"
@@ -2551,7 +2553,7 @@ msgstr "Kombinovat dva obrázky pomocí map hloubky (z-bufferů)"
 
 #: ../plug-ins/common/depth-merge.c:193
 msgid "_Depth Merge..."
-msgstr "_Sloučit hloubku..."
+msgstr "_Sloučit hloubku…"
 
 #: ../plug-ins/common/depth-merge.c:387
 msgid "Depth-merging"
@@ -2591,7 +2593,7 @@ msgstr "Odstranit šum z obrázku"
 
 #: ../plug-ins/common/despeckle.c:148
 msgid "Des_peckle..."
-msgstr "_Vyčistit..."
+msgstr "_Vyčistit…"
 
 #: ../plug-ins/common/despeckle.c:425 ../plug-ins/common/despeckle.c:645
 msgid "Despeckle"
@@ -2631,7 +2633,7 @@ msgstr "Odstranit artefakty v podobě svislých pruhů"
 
 #: ../plug-ins/common/destripe.c:109
 msgid "Des_tripe..."
-msgstr "Odstranit _pruhy..."
+msgstr "Odstranit _pruhy…"
 
 #: ../plug-ins/common/destripe.c:272
 msgid "Destriping"
@@ -2661,7 +2663,7 @@ msgstr "Generovat difrakční obrazce"
 
 #: ../plug-ins/common/diffraction.c:172
 msgid "_Diffraction Patterns..."
-msgstr "_Difrakční obrazce..."
+msgstr "_Difrakční obrazce…"
 
 #: ../plug-ins/common/diffraction.c:330
 msgid "Creating diffraction pattern"
@@ -2727,7 +2729,7 @@ msgstr "Posunout pixely podle mapy posunutí"
 
 #: ../plug-ins/common/displace.c:179
 msgid "_Displace..."
-msgstr "_Vytlačit..."
+msgstr "_Vytlačit…"
 
 #: ../plug-ins/common/displace.c:290
 msgid "Displacing"
@@ -2779,7 +2781,7 @@ msgstr "Detekce hran s ovládáním síly hran"
 
 #: ../plug-ins/common/edge-dog.c:140
 msgid "_Difference of Gaussians..."
-msgstr "_Rozdíl Gaussovských rozostření..."
+msgstr "_Rozdíl Gaussovských rozostření…"
 
 #: ../plug-ins/common/edge-dog.c:243 ../plug-ins/common/edge-dog.c:300
 msgid "DoG Edge Detect"
@@ -2823,7 +2825,7 @@ msgstr "Simulovat záři neonového světla"
 
 #: ../plug-ins/common/edge-neon.c:139
 msgid "_Neon..."
-msgstr "_Neon..."
+msgstr "_Neon…"
 
 #: ../plug-ins/common/edge-neon.c:211
 msgid "Neon"
@@ -2843,7 +2845,7 @@ msgstr "Specializovaná na směru závislá detekce hran"
 
 #: ../plug-ins/common/edge-sobel.c:121
 msgid "_Sobel..."
-msgstr "_Sobel..."
+msgstr "_Sobel…"
 
 #: ../plug-ins/common/edge-sobel.c:231
 msgid "Sobel Edge Detection"
@@ -2871,7 +2873,7 @@ msgstr "Několik jednoduchých metod detekce hran"
 
 #: ../plug-ins/common/edge.c:157
 msgid "_Edge..."
-msgstr "_Hrana..."
+msgstr "_Hrana…"
 
 #: ../plug-ins/common/edge.c:229
 msgid "Edge detection"
@@ -2886,9 +2888,8 @@ msgid "Sobel"
 msgstr "Sobelův"
 
 #: ../plug-ins/common/edge.c:669
-#, fuzzy
 msgid "Prewitt compass"
-msgstr "Prewittův"
+msgstr "Prewittův kompas"
 
 #: ../plug-ins/common/edge.c:670 ../plug-ins/common/sinus.c:904
 msgid "Gradient"
@@ -2903,14 +2904,12 @@ msgid "Differential"
 msgstr "Diferenciální"
 
 #: ../plug-ins/common/edge.c:682
-#, fuzzy
 msgid "_Algorithm:"
-msgstr "Algoritmus"
+msgstr "_Algoritmus:"
 
 #: ../plug-ins/common/edge.c:690
-#, fuzzy
 msgid "A_mount:"
-msgstr "Míra:"
+msgstr "_Míra:"
 
 #: ../plug-ins/common/emboss.c:124
 msgid "Simulate an image created by embossing"
@@ -2918,7 +2917,7 @@ msgstr "Simulovat reliéfní obrázek"
 
 #: ../plug-ins/common/emboss.c:130
 msgid "_Emboss..."
-msgstr "R_eliéf..."
+msgstr "R_eliéf…"
 
 #: ../plug-ins/common/emboss.c:384 ../plug-ins/common/emboss.c:446
 msgid "Emboss"
@@ -2946,7 +2945,7 @@ msgstr "Simulovat starou rytinu"
 
 #: ../plug-ins/common/engrave.c:106
 msgid "En_grave..."
-msgstr "Vy_rýt..."
+msgstr "Vy_rýt…"
 
 #: ../plug-ins/common/engrave.c:180
 msgid "Engraving"
@@ -3000,18 +2999,18 @@ msgstr "Načíst KISS paletu"
 #: ../plug-ins/common/file-gih.c:667 ../plug-ins/common/file-pat.c:335
 #: ../plug-ins/common/file-pcx.c:366 ../plug-ins/common/file-pdf.c:586
 #: ../plug-ins/common/file-pix.c:348 ../plug-ins/common/file-png.c:728
-#: ../plug-ins/common/file-pnm.c:498 ../plug-ins/common/file-ps.c:1042
+#: ../plug-ins/common/file-pnm.c:499 ../plug-ins/common/file-ps.c:1042
 #: ../plug-ins/common/file-raw.c:671 ../plug-ins/common/file-sunras.c:486
 #: ../plug-ins/common/file-tga.c:447 ../plug-ins/common/file-tiff-load.c:603
 #: ../plug-ins/common/file-wmf.c:994 ../plug-ins/common/file-xbm.c:741
 #: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:520
-#: ../plug-ins/file-bmp/bmp-read.c:159 ../plug-ins/file-faxg3/faxg3.c:217
+#: ../plug-ins/file-bmp/bmp-read.c:161 ../plug-ins/file-faxg3/faxg3.c:217
 #: ../plug-ins/file-fli/fli-gimp.c:502 ../plug-ins/file-ico/ico-load.c:646
 #: ../plug-ins/file-jpeg/jpeg-load.c:115 ../plug-ins/file-psd/psd-load.c:136
 #: ../plug-ins/file-sgi/sgi.c:331 ../plug-ins/file-xjt/xjt.c:3363
 #, c-format
 msgid "Opening '%s'"
-msgstr "Otvírá se '%s'"
+msgstr "Otvírá se „%s“"
 
 #: ../plug-ins/common/file-cel.c:354
 msgid "Can't create a new image"
@@ -3028,7 +3027,7 @@ msgstr "Nepodporovaná bitová hloubka (%d)!"
 #: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1280
 #: ../plug-ins/common/file-html-table.c:256 ../plug-ins/common/file-pat.c:467
 #: ../plug-ins/common/file-pcx.c:627 ../plug-ins/common/file-pix.c:529
-#: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:978
+#: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:982
 #: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:568
 #: ../plug-ins/common/file-tga.c:1175 ../plug-ins/common/file-tiff-save.c:693
 #: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xpm.c:637
@@ -3039,7 +3038,7 @@ msgstr "Nepodporovaná bitová hloubka (%d)!"
 #: ../plug-ins/file-xjt/xjt.c:1710
 #, c-format
 msgid "Saving '%s'"
-msgstr "Ukládá se '%s'"
+msgstr "Ukládá se „%s“"
 
 #: ../plug-ins/common/file-compressor.c:160
 msgid "gzip archive"
@@ -3114,7 +3113,7 @@ msgstr "Desktop odkaz"
 #: ../plug-ins/common/file-desktop-link.c:173
 #, c-format
 msgid "Error loading desktop file '%s': %s"
-msgstr "Chyba načítání desktop souboru '%s': %s"
+msgstr "Chyba načítání desktop souboru „%s“: %s"
 
 #: ../plug-ins/common/file-dicom.c:146
 msgid "DICOM image"
@@ -3127,10 +3126,10 @@ msgstr "Obrázek Digital Imaging and Communications in Medicine"
 #: ../plug-ins/common/file-dicom.c:352
 #, c-format
 msgid "'%s' is not a DICOM file."
-msgstr "'%s' není soubor DICOM."
+msgstr "„%s“ není soubor DICOM."
 
 #: ../plug-ins/common/file-dicom.c:769 ../plug-ins/common/file-pcx.c:659
-#: ../plug-ins/common/file-pnm.c:963
+#: ../plug-ins/common/file-pnm.c:967
 msgid "Cannot save images with alpha channel."
 msgstr "Nemohu uložit obrázky s alfa kanálem."
 
@@ -3151,12 +3150,12 @@ msgstr "Nepodporovaný formát stopy"
 #: ../plug-ins/common/file-gbr.c:425
 #, c-format
 msgid "Error in GIMP brush file '%s'"
-msgstr "Chyba v souboru stopy GIMPu '%s'"
+msgstr "Chyba v souboru stopy GIMPu „%s“"
 
 #: ../plug-ins/common/file-gbr.c:433
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
-msgstr "Neplatný řetězec UTF-8 v souboru stopy '%s'."
+msgstr "Neplatný řetězec UTF-8 v souboru stopy „%s“."
 
 #: ../plug-ins/common/file-gbr.c:439 ../plug-ins/common/file-gih.c:510
 #: ../plug-ins/common/file-gih.c:1173
@@ -3203,7 +3202,7 @@ msgstr "Pozadí (%d%s)"
 #: ../plug-ins/common/file-gif-load.c:936
 #, c-format
 msgid "Opening '%s' (frame %d)"
-msgstr "Otevírá se '%s' (políčko %d)"
+msgstr "Otevírá se „%s“ (políčko %d)"
 
 #: ../plug-ins/common/file-gif-load.c:965 ../plug-ins/common/iwarp.c:791
 #: ../plug-ins/common/iwarp.c:826
@@ -3230,13 +3229,13 @@ msgid "Couldn't simply reduce colors further. Saving as opaque."
 msgstr "Nemohu jednoduše dále snížit barvy. Ukládám jako neprůhledné."
 
 #: ../plug-ins/common/file-gif-save.c:562
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to save '%s'.  The GIF file format does not support images that are "
 "more than %d pixels wide or tall."
 msgstr ""
-"Nemohu uložit '%s'. Formát souborů psd nepodporuje obrázky, které jsou širší "
-"nebo vyšší než 30000 pixelů."
+"Nemohu uložit „%s“. Formát souborů GIF nepodporuje obrázky, které jsou širší "
+"nebo vyšší než %d pixelů."
 
 #: ../plug-ins/common/file-gif-save.c:673
 msgid ""
@@ -3247,14 +3246,16 @@ msgstr ""
 "nebyl uložen."
 
 #: ../plug-ins/common/file-gif-save.c:732
-msgid "Cannot save RGB color images. Convert to indexed color or grayscale first."
+msgid ""
+"Cannot save RGB color images. Convert to indexed color or grayscale first."
 msgstr ""
 "Nemohu ukládat barevné obrázky RGB. Nejdříve jej převeďte na indexovaný nebo "
 "do šedí."
 
 #: ../plug-ins/common/file-gif-save.c:910
 msgid "Delay inserted to prevent evil CPU-sucking animation."
-msgstr "Vloženo zpoždění, aby nevznikla zlá animace požírající procesorový čas"
+msgstr ""
+"Vloženo zpoždění, aby nevznikla zlá animace požírající procesorový čas."
 
 #: ../plug-ins/common/file-gif-save.c:950
 msgid ""
@@ -3302,7 +3303,7 @@ msgstr "_Opakovat donekonečna"
 msgid "_Delay between frames where unspecified:"
 msgstr "_Prodleva mezi políčky, není-li určena:"
 
-#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1474
+#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1507
 msgid "milliseconds"
 msgstr "milisekundy"
 
@@ -3544,105 +3545,106 @@ msgstr "Míra rozestupu buněk."
 #. * transparency & just use the full palette
 #: ../plug-ins/common/file-mng.c:498 ../plug-ins/common/file-png.c:1760
 msgid "Couldn't losslessly save transparency, saving opacity instead."
-msgstr "Nemohu uložit průhlednost beze ztrát, ukládám místo toho neprůhlednost."
+msgstr ""
+"Nemohu uložit průhlednost beze ztrát, ukládám místo toho neprůhlednost."
 
-#: ../plug-ins/common/file-mng.c:1254
+#: ../plug-ins/common/file-mng.c:1287
 msgid "Save as MNG"
 msgstr "Zapsat jako MNG"
 
-#: ../plug-ins/common/file-mng.c:1274
+#: ../plug-ins/common/file-mng.c:1307
 msgid "MNG Options"
 msgstr "Volby MNG"
 
-#: ../plug-ins/common/file-mng.c:1280
+#: ../plug-ins/common/file-mng.c:1313
 msgid "Interlace"
 msgstr "Prokládané řádkování"
 
-#: ../plug-ins/common/file-mng.c:1292
+#: ../plug-ins/common/file-mng.c:1325
 msgid "Save background color"
 msgstr "Uložit barvu pozadí"
 
-#: ../plug-ins/common/file-mng.c:1303
+#: ../plug-ins/common/file-mng.c:1336
 msgid "Save gamma"
 msgstr "Uložit gamu"
 
-#: ../plug-ins/common/file-mng.c:1313
+#: ../plug-ins/common/file-mng.c:1346
 msgid "Save resolution"
 msgstr "Uložit rozlišení"
 
-#: ../plug-ins/common/file-mng.c:1324
+#: ../plug-ins/common/file-mng.c:1357
 msgid "Save creation time"
 msgstr "Uložit čas vytvoření"
 
-#: ../plug-ins/common/file-mng.c:1343
+#: ../plug-ins/common/file-mng.c:1376
 msgid "PNG"
 msgstr "PNG"
 
-#: ../plug-ins/common/file-mng.c:1344
+#: ../plug-ins/common/file-mng.c:1377
 msgid "JNG"
 msgstr "JNG"
 
-#: ../plug-ins/common/file-mng.c:1347
+#: ../plug-ins/common/file-mng.c:1380
 msgid "PNG + delta PNG"
 msgstr "PNG + Delta PNG"
 
-#: ../plug-ins/common/file-mng.c:1348
+#: ../plug-ins/common/file-mng.c:1381
 msgid "JNG + delta PNG"
 msgstr "JNG + Delta PNG"
 
-#: ../plug-ins/common/file-mng.c:1349
+#: ../plug-ins/common/file-mng.c:1382
 msgid "All PNG"
 msgstr "Vše PNG"
 
-#: ../plug-ins/common/file-mng.c:1350
+#: ../plug-ins/common/file-mng.c:1383
 msgid "All JNG"
 msgstr "Vše JNG"
 
-#: ../plug-ins/common/file-mng.c:1362
+#: ../plug-ins/common/file-mng.c:1395
 msgid "Default chunks type:"
-msgstr "Implicitní typ úseku:"
+msgstr "Výchozí typ úseku:"
 
-#: ../plug-ins/common/file-mng.c:1365
+#: ../plug-ins/common/file-mng.c:1398
 msgid "Combine"
 msgstr "Zkombinovat"
 
-#: ../plug-ins/common/file-mng.c:1366
+#: ../plug-ins/common/file-mng.c:1399
 msgid "Replace"
 msgstr "Přepsat"
 
-#: ../plug-ins/common/file-mng.c:1377
+#: ../plug-ins/common/file-mng.c:1410
 msgid "Default frame disposal:"
-msgstr "Implicitní dispozice políčka:"
+msgstr "Výchozí dispozice políčka:"
 
-#: ../plug-ins/common/file-mng.c:1389
+#: ../plug-ins/common/file-mng.c:1422
 msgid "PNG compression level:"
 msgstr "Úroveň komprese PNG:"
 
-#: ../plug-ins/common/file-mng.c:1397 ../plug-ins/common/file-png.c:1908
+#: ../plug-ins/common/file-mng.c:1430 ../plug-ins/common/file-png.c:1908
 msgid "Choose a high compression level for small file size"
 msgstr "Zvolte vysokou úroveň komprese pro malou velikost souboru"
 
-#: ../plug-ins/common/file-mng.c:1411
+#: ../plug-ins/common/file-mng.c:1444
 msgid "JPEG compression quality:"
 msgstr "Kvalita komprese JPEG:"
 
-#: ../plug-ins/common/file-mng.c:1428
+#: ../plug-ins/common/file-mng.c:1461
 msgid "JPEG smoothing factor:"
 msgstr "Faktor vyhlazování JPEG:"
 
-#: ../plug-ins/common/file-mng.c:1438
+#: ../plug-ins/common/file-mng.c:1471
 msgid "Animated MNG Options"
 msgstr "Volby animovaného MNG"
 
-#: ../plug-ins/common/file-mng.c:1444
+#: ../plug-ins/common/file-mng.c:1477
 msgid "Loop"
 msgstr "Smyčka"
 
-#: ../plug-ins/common/file-mng.c:1458
+#: ../plug-ins/common/file-mng.c:1491
 msgid "Default frame delay:"
-msgstr "Implicitní zpoždění políčka:"
+msgstr "Výchozí zpoždění políčka:"
 
-#: ../plug-ins/common/file-mng.c:1531
+#: ../plug-ins/common/file-mng.c:1564
 msgid "MNG animation"
 msgstr "Animace MNG"
 
@@ -3653,7 +3655,7 @@ msgstr "Vzorek GIMPu"
 #: ../plug-ins/common/file-pat.c:371
 #, c-format
 msgid "Invalid UTF-8 string in pattern file '%s'."
-msgstr "Neplatný řetězec UTF-8 v souboru vzorku '%s'."
+msgstr "Neplatný řetězec UTF-8 v souboru vzorku „%s“."
 
 #: ../plug-ins/common/file-pat.c:528
 msgid "Save as Pattern"
@@ -3666,20 +3668,20 @@ msgstr "Obrázek ZSoft PCX"
 #: ../plug-ins/common/file-pcx.c:372
 #, c-format
 msgid "Could not read header from '%s'"
-msgstr "Nemohu číst hlavičku z '%s'"
+msgstr "Nemohu číst hlavičku z „%s“"
 
 #: ../plug-ins/common/file-pcx.c:382
 #, c-format
 msgid "'%s' is not a PCX file"
-msgstr "'%s' není soubor PCX"
+msgstr "„%s“ není soubor PCX"
 
-#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:579
+#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:606
 #: ../plug-ins/file-psd/psd-load.c:302
 #, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr "Nepodporovaná nebo neplatná šířka obrázku: %d"
 
-#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:585
+#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:612
 #: ../plug-ins/file-psd/psd-load.c:294
 #, c-format
 msgid "Unsupported or invalid image height: %d"
@@ -3716,7 +3718,7 @@ msgstr "Spodní okraj mimo rozsah (musí být < %d): %d"
 #: ../plug-ins/common/file-pcx.c:752
 #, c-format
 msgid "Writing to file '%s' failed: %s"
-msgstr "Zápis do souboru '%s' selhal: %s"
+msgstr "Zápis do souboru „%s“ selhal: %s"
 
 #: ../plug-ins/common/file-pdf.c:288
 msgid "Portable Document Format"
@@ -3775,12 +3777,12 @@ msgstr "Chyba čtení PNG souboru: %s"
 #: ../plug-ins/common/file-png.c:703
 #, c-format
 msgid "Error while reading '%s'. File corrupted?"
-msgstr "Chyba při čtení '%s'. Poškozený soubor?"
+msgstr "Chyba při čtení „%s“. Poškozený soubor?"
 
 #: ../plug-ins/common/file-png.c:834
 #, c-format
 msgid "Unknown color model in PNG file '%s'."
-msgstr "Neznámý model barev v souboru PNG '%s'."
+msgstr "Neznámý model barev v souboru PNG „%s“."
 
 #: ../plug-ins/common/file-png.c:889
 msgid ""
@@ -3793,7 +3795,7 @@ msgstr ""
 #: ../plug-ins/common/file-png.c:1254
 #, c-format
 msgid "Error while saving '%s'. Could not save image."
-msgstr "Chyba při ukládání '%s'. Nemohu uložit obrázek."
+msgstr "Chyba při ukládání „%s“. Nemohu uložit obrázek."
 
 #: ../plug-ins/common/file-png.c:1785
 msgid "Save as PNG"
@@ -3835,87 +3837,86 @@ msgstr "Uložit _hodnoty barvy průhledných pixelů"
 msgid "Co_mpression level:"
 msgstr "Úroveň ko_mprese:"
 
-#: ../plug-ins/common/file-png.c:1922 ../plug-ins/file-jpeg/jpeg-save.c:1185
+#: ../plug-ins/common/file-png.c:1922 ../plug-ins/file-jpeg/jpeg-save.c:1186
 msgid "_Load Defaults"
-msgstr "_Načíst implicitní nastavení"
+msgstr "_Načíst výchozí nastavení"
 
 #: ../plug-ins/common/file-png.c:1930
 msgid "S_ave Defaults"
-msgstr "_Uložit implicitní nastavení"
+msgstr "_Uložit výchozí nastavení"
 
-#: ../plug-ins/common/file-pnm.c:247
+#: ../plug-ins/common/file-pnm.c:248
 msgid "PNM Image"
 msgstr "Obrázek PNM"
 
-#: ../plug-ins/common/file-pnm.c:267
+#: ../plug-ins/common/file-pnm.c:268
 msgid "PNM image"
 msgstr "Obrázek PNM"
 
-#: ../plug-ins/common/file-pnm.c:279
+#: ../plug-ins/common/file-pnm.c:280
 msgid "PBM image"
 msgstr "Obrázek PBM"
 
-#: ../plug-ins/common/file-pnm.c:291
+#: ../plug-ins/common/file-pnm.c:292
 msgid "PGM image"
 msgstr "Obrázek PGM"
 
-#: ../plug-ins/common/file-pnm.c:303
+#: ../plug-ins/common/file-pnm.c:304
 msgid "PPM image"
 msgstr "Obrázek PPM"
 
-#: ../plug-ins/common/file-pnm.c:527 ../plug-ins/common/file-pnm.c:549
-#: ../plug-ins/common/file-pnm.c:558 ../plug-ins/common/file-pnm.c:569
-#: ../plug-ins/common/file-pnm.c:657 ../plug-ins/common/file-pnm.c:727
+#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550
+#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570
+#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:728
 msgid "Premature end of file."
 msgstr "Předčasný konec souboru."
 
-#: ../plug-ins/common/file-pnm.c:529
+#: ../plug-ins/common/file-pnm.c:530
 msgid "Invalid file."
 msgstr "Neplatný soubor."
 
-#: ../plug-ins/common/file-pnm.c:543
+#: ../plug-ins/common/file-pnm.c:544
 msgid "File not in a supported format."
 msgstr "Soubor není v podporovaném formátu."
 
-#: ../plug-ins/common/file-pnm.c:552
+#: ../plug-ins/common/file-pnm.c:553
 msgid "Invalid X resolution."
 msgstr "Neplatné rozlišení X."
 
-#: ../plug-ins/common/file-pnm.c:554
+#: ../plug-ins/common/file-pnm.c:555
 msgid "Image width is larger than GIMP can handle."
 msgstr "Šířka obrázku je větší, než GIMP dokáže zpracovat."
 
-#: ../plug-ins/common/file-pnm.c:561
+#: ../plug-ins/common/file-pnm.c:562
 msgid "Invalid Y resolution."
 msgstr "Neplatné rozlišení Y."
 
-#: ../plug-ins/common/file-pnm.c:563
+#: ../plug-ins/common/file-pnm.c:564
 msgid "Image height is larger than GIMP can handle."
 msgstr "Výška obrázku je větší, než GIMP dokáže zpracovat."
 
-#: ../plug-ins/common/file-pnm.c:575
-#, fuzzy
+#: ../plug-ins/common/file-pnm.c:576
 msgid "Unsupported maximum value."
 msgstr "Neplatná maximální hodnota."
 
-#: ../plug-ins/common/file-pnm.c:780
+#: ../plug-ins/common/file-pnm.c:781
 msgid "Error reading file."
 msgstr "Chyba při čtení souboru."
 
-#: ../plug-ins/common/file-pnm.c:1148
+#: ../plug-ins/common/file-pnm.c:1185
 msgid "Save as PNM"
 msgstr "Zapsat jako PNM"
 
 #. file save type
-#: ../plug-ins/common/file-pnm.c:1165
+#: ../plug-ins/common/file-pnm.c:1202
 msgid "Data formatting"
 msgstr "Formátování dat"
 
-#: ../plug-ins/common/file-pnm.c:1169
+#: ../plug-ins/common/file-pnm.c:1206
 msgid "Raw"
 msgstr "Binární"
 
-#: ../plug-ins/common/file-pnm.c:1170
+#: ../plug-ins/common/file-pnm.c:1207
 msgid "Ascii"
 msgstr "ASCII"
 
@@ -3932,9 +3933,9 @@ msgid "PDF document"
 msgstr "Dokument PDF"
 
 #: ../plug-ins/common/file-ps.c:1050
-#, fuzzy, c-format
+#, c-format
 msgid "Could not interpret Postscript file '%s'"
-msgstr "Nemohu interpretovat '%s'"
+msgstr "Nemohu interpretovat Postscriptový soubor „%s“"
 
 #: ../plug-ins/common/file-ps.c:1192
 #, c-format
@@ -3976,7 +3977,7 @@ msgid "Rendering"
 msgstr "Vyobrazení"
 
 #. Resolution
-#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:916
+#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:929
 #: ../plug-ins/common/file-wmf.c:692
 msgid "Resolution:"
 msgstr "Rozlišení:"
@@ -4210,7 +4211,7 @@ msgstr "Obrázek SUN Rasterfile"
 #: ../plug-ins/common/file-sunras.c:402
 #, c-format
 msgid "Could not open '%s' as SUN-raster-file"
-msgstr "Nemohu otevřít soubor '%s' jako SUN-raster-soubor"
+msgstr "Nemohu otevřít soubor „%s“ jako SUN-raster-soubor"
 
 #: ../plug-ins/common/file-sunras.c:412
 msgid "The type of this SUN-rasterfile is not supported"
@@ -4219,7 +4220,7 @@ msgstr "Tento typ SUN-raster souboru není podporován"
 #: ../plug-ins/common/file-sunras.c:441
 #, c-format
 msgid "Could not read color entries from '%s'"
-msgstr "Nemohu číst barevné položky z '%s'"
+msgstr "Nemohu číst barevné položky z „%s“"
 
 #: ../plug-ins/common/file-sunras.c:449
 msgid "Type of colormap not supported"
@@ -4232,7 +4233,7 @@ msgid ""
 "'%s':\n"
 "No image width specified"
 msgstr ""
-"'%s':\n"
+"„%s“:\n"
 "Nebyla zadána šířka obrázku"
 
 #: ../plug-ins/common/file-sunras.c:464 ../plug-ins/common/file-xbm.c:833
@@ -4242,7 +4243,7 @@ msgid ""
 "'%s':\n"
 "Image width is larger than GIMP can handle"
 msgstr ""
-"'%s':\n"
+"„%s“:\n"
 "Šířka obrázku je větší, než GIMP dokáže zpracovat"
 
 #: ../plug-ins/common/file-sunras.c:472 ../plug-ins/common/file-xbm.c:840
@@ -4252,7 +4253,7 @@ msgid ""
 "'%s':\n"
 "No image height specified"
 msgstr ""
-"'%s':\n"
+"„%s“:\n"
 "Nebyla zadána výška obrázku"
 
 #: ../plug-ins/common/file-sunras.c:480 ../plug-ins/common/file-xbm.c:847
@@ -4262,7 +4263,7 @@ msgid ""
 "'%s':\n"
 "Image height is larger than GIMP can handle"
 msgstr ""
-"'%s':\n"
+"„%s“:\n"
 "Výška obrázku je větší, než GIMP dokáže  zpracovat"
 
 #: ../plug-ins/common/file-sunras.c:518
@@ -4303,7 +4304,7 @@ msgstr "Kódované RunLength"
 msgid "SVG image"
 msgstr "SVG obrázek"
 
-#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:720
+#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:733
 msgid "Unknown reason"
 msgstr "Neznámý důvod"
 
@@ -4329,50 +4330,51 @@ msgstr ""
 "velikost!"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/file-svg.c:729
+#: ../plug-ins/common/file-svg.c:742
 msgid "Render Scalable Vector Graphics"
 msgstr "Vykreslit Scalable Vector Graphics"
 
 #. Width and Height
-#: ../plug-ins/common/file-svg.c:795 ../plug-ins/common/file-wmf.c:571
+#: ../plug-ins/common/file-svg.c:808 ../plug-ins/common/file-wmf.c:571
 #: ../plug-ins/common/grid.c:724
 msgid "Width:"
 msgstr "Šířka:"
 
-#: ../plug-ins/common/file-svg.c:801 ../plug-ins/common/file-wmf.c:577
+#: ../plug-ins/common/file-svg.c:814 ../plug-ins/common/file-wmf.c:577
 msgid "Height:"
 msgstr "Výška:"
 
-#: ../plug-ins/common/file-svg.c:875 ../plug-ins/common/file-wmf.c:651
+#: ../plug-ins/common/file-svg.c:888 ../plug-ins/common/file-wmf.c:651
 msgid "_X ratio:"
 msgstr "Poměr _X:"
 
-#: ../plug-ins/common/file-svg.c:897 ../plug-ins/common/file-wmf.c:673
+#: ../plug-ins/common/file-svg.c:910 ../plug-ins/common/file-wmf.c:673
 msgid "_Y ratio:"
 msgstr "Poměr _Y:"
 
-#: ../plug-ins/common/file-svg.c:911 ../plug-ins/common/file-wmf.c:687
+#: ../plug-ins/common/file-svg.c:924 ../plug-ins/common/file-wmf.c:687
 msgid "Constrain aspect ratio"
-msgstr "Omezit poměr stran:"
+msgstr "Omezit poměr stran"
 
-#: ../plug-ins/common/file-svg.c:922 ../plug-ins/common/file-wmf.c:698
+#: ../plug-ins/common/file-svg.c:935 ../plug-ins/common/file-wmf.c:698
 #: ../plug-ins/print/print-page-layout.c:273
 #, c-format
 msgid "pixels/%a"
 msgstr "pixely/%a"
 
 #. Path Import
-#: ../plug-ins/common/file-svg.c:942
+#: ../plug-ins/common/file-svg.c:955
 msgid "Import _paths"
 msgstr "Importovat _cesty"
 
-#: ../plug-ins/common/file-svg.c:948
-msgid "Import path elements of the SVG so they can be used with the GIMP path tool"
+#: ../plug-ins/common/file-svg.c:961
+msgid ""
+"Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr ""
 "Importovat elementy cesty z SVG, aby mohly být použity s nástrojem GIMPu pro "
 "cesty"
 
-#: ../plug-ins/common/file-svg.c:961
+#: ../plug-ins/common/file-svg.c:974
 msgid "Merge imported paths"
 msgstr "Sloučit importované cesty"
 
@@ -4383,17 +4385,17 @@ msgstr "Obrázek TarGA"
 #: ../plug-ins/common/file-tga.c:455
 #, c-format
 msgid "Cannot read footer from '%s'"
-msgstr "Nemohu číst patičku z '%s'"
+msgstr "Nemohu číst patičku z „%s“"
 
 #: ../plug-ins/common/file-tga.c:473
 #, c-format
 msgid "Cannot read extension from '%s'"
-msgstr "Nemohu číst rozšíření z '%s'"
+msgstr "Nemohu číst rozšíření z „%s“"
 
 #: ../plug-ins/common/file-tga.c:485
-#, fuzzy, c-format
+#, c-format
 msgid "Cannot read header from '%s'"
-msgstr "Nemohu číst hlavičku z '%s'"
+msgstr "Nemohu číst hlavičku z „%s“"
 
 #: ../plug-ins/common/file-tga.c:1368
 msgid "Save as TGA"
@@ -4405,19 +4407,16 @@ msgid "_RLE compression"
 msgstr "Komprese _RLE"
 
 #: ../plug-ins/common/file-tga.c:1405
-#, fuzzy
 msgid "Or_igin:"
-msgstr "Původní:"
+msgstr "_Původní:"
 
 #: ../plug-ins/common/file-tga.c:1409
-#, fuzzy
 msgid "Bottom left"
-msgstr "Dolů _doleva"
+msgstr "Dolů doleva"
 
 #: ../plug-ins/common/file-tga.c:1410
-#, fuzzy
 msgid "Top left"
-msgstr "Do_leva"
+msgstr "Nahoru doleva"
 
 #: ../plug-ins/common/file-tiff-load.c:240
 #: ../plug-ins/common/file-tiff-save.c:182
@@ -4428,16 +4427,16 @@ msgstr "Obrázek TIFF"
 #: ../plug-ins/common/file-tiff-load.c:310
 #, c-format
 msgid "TIFF '%s' does not contain any directories"
-msgstr "TIFF '%s' neobsahuje žádné adresáře"
+msgstr "TIFF „%s“ neobsahuje žádné adresáře"
 
 #: ../plug-ins/common/file-tiff-load.c:478
 msgid "Import from TIFF"
 msgstr "Importovat z TIFF"
 
 #: ../plug-ins/common/file-tiff-load.c:780
-#, fuzzy, c-format
+#, c-format
 msgid "%s-%d-of-%d-pages"
-msgstr "%s-strany"
+msgstr "%s-%d-z-%d-stran"
 
 #: ../plug-ins/common/file-tiff-load.c:1015
 msgid "TIFF Channel"
@@ -4527,7 +4526,7 @@ msgstr "Vykreslit Windows Metafile"
 #: ../plug-ins/common/file-wmf.c:963
 #, c-format
 msgid "Could not open '%s' for reading"
-msgstr "Nelze otevřít '%s' pro čtení"
+msgstr "Nelze otevřít „%s“ pro čtení"
 
 #: ../plug-ins/common/file-wmf.c:1003
 msgid "Rendered WMF"
@@ -4543,7 +4542,7 @@ msgid ""
 "'%s':\n"
 "Could not read header (ftell == %ld)"
 msgstr ""
-"'%s':\n"
+"„%s“:\n"
 "Nemohu číst hlavičku (ftell == %ld)"
 
 #: ../plug-ins/common/file-xbm.c:854
@@ -4552,7 +4551,7 @@ msgid ""
 "'%s':\n"
 "No image data type specified"
 msgstr ""
-"'%s':\n"
+"„%s“:\n"
 "Nebyl zadán typ dat obrázku"
 
 #. The image is not black-and-white.
@@ -4627,7 +4626,7 @@ msgstr "Obrázek X PixMap"
 #: ../plug-ins/common/file-xpm.c:363 ../plug-ins/common/file-xpm.c:773
 #, c-format
 msgid "Error opening file '%s'"
-msgstr "Chyba při otevírání souboru '%s'"
+msgstr "Chyba při otevírání souboru „%s“"
 
 #: ../plug-ins/common/file-xpm.c:369 ../plug-ins/common/file-xpm.c:779
 msgid "XPM file invalid"
@@ -4648,7 +4647,7 @@ msgstr "X window dump"
 #: ../plug-ins/common/file-xwd.c:442
 #, c-format
 msgid "Could not read XWD header from '%s'"
-msgstr "Nemohu číst hlavičku XWD z '%s'"
+msgstr "Nemohu číst hlavičku XWD z „%s“"
 
 #: ../plug-ins/common/file-xwd.c:480
 msgid "Can't read color entries"
@@ -4681,14 +4680,14 @@ msgstr "Vytvořit z několika obrázků filmový pás"
 
 #: ../plug-ins/common/film.c:222
 msgid "_Filmstrip..."
-msgstr "_Film..."
+msgstr "_Film…"
 
 #: ../plug-ins/common/film.c:307
 msgid "Composing images"
 msgstr "Spojuji obrázky"
 
 #: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:216
-#: ../plug-ins/help-browser/dialog.c:1133
+#: ../plug-ins/help-browser/dialog.c:1120
 msgid "Untitled"
 msgstr "Bez názvu"
 
@@ -4843,7 +4842,7 @@ msgstr "Interaktivně upravit barvy obrázku"
 
 #: ../plug-ins/common/filter-pack.c:322
 msgid "_Filter Pack..."
-msgstr "_Sada filtrů..."
+msgstr "_Sada filtrů…"
 
 #: ../plug-ins/common/filter-pack.c:372
 msgid "FP can only be used on RGB images."
@@ -4891,7 +4890,7 @@ msgstr "Okna"
 
 #: ../plug-ins/common/filter-pack.c:704 ../plug-ins/common/van-gogh-lic.c:672
 msgid "_Saturation"
-msgstr "_Sytost:"
+msgstr "_Sytost"
 
 #: ../plug-ins/common/filter-pack.c:712
 msgid "A_dvanced"
@@ -4911,7 +4910,7 @@ msgstr "Kritérium volby pixelů"
 
 #: ../plug-ins/common/filter-pack.c:835
 msgid "H_ue"
-msgstr "O_dstín:"
+msgstr "O_dstín"
 
 #: ../plug-ins/common/filter-pack.c:836
 msgid "Satu_ration"
@@ -4968,7 +4967,7 @@ msgstr "Transformovat obrázek pomocí Mandelbrotova fraktálu"
 
 #: ../plug-ins/common/fractal-trace.c:121
 msgid "_Fractal Trace..."
-msgstr "_Fraktální trasování..."
+msgstr "_Fraktální trasování…"
 
 #: ../plug-ins/common/fractal-trace.c:460
 #: ../plug-ins/common/fractal-trace.c:691
@@ -5060,7 +5059,7 @@ msgstr "Vykreslit do obrázku mřížku"
 
 #: ../plug-ins/common/grid.c:148
 msgid "_Grid..."
-msgstr "_Mřížka..."
+msgstr "_Mřížka…"
 
 #: ../plug-ins/common/grid.c:241
 msgid "Drawing grid"
@@ -5120,7 +5119,7 @@ msgstr "Hledat a opravit pixely, které jsou příliš jasné"
 
 #: ../plug-ins/common/hot.c:217
 msgid "_Hot..."
-msgstr "_Videosnímek..."
+msgstr "_Videosnímek…"
 
 #: ../plug-ins/common/hot.c:387 ../plug-ins/common/hot.c:586
 msgid "Hot"
@@ -5152,7 +5151,7 @@ msgstr "Položit na sebe mnoho pozměněných kopií obrázku"
 
 #: ../plug-ins/common/illusion.c:96
 msgid "_Illusion..."
-msgstr "_Iluze..."
+msgstr "_Iluze…"
 
 #: ../plug-ins/common/illusion.c:168 ../plug-ins/common/illusion.c:350
 msgid "Illusion"
@@ -5176,7 +5175,7 @@ msgstr "Oblasti obrázku deformujte pomocí myši"
 
 #: ../plug-ins/common/iwarp.c:267
 msgid "_IWarp..."
-msgstr "_Interaktivní deformace..."
+msgstr "_Interaktivní deformace…"
 
 #: ../plug-ins/common/iwarp.c:697
 msgid "Warping"
@@ -5276,7 +5275,8 @@ msgstr "Interaktivní deformace"
 msgid ""
 "Click and drag in the preview to define the distortions to apply to the "
 "image."
-msgstr "Kliknutím a táhnutím myši v náhledů definujte požadovanou deformaci obrázku."
+msgstr ""
+"Kliknutím a táhnutím myši v náhledů definujte požadovanou deformaci obrázku."
 
 #: ../plug-ins/common/jigsaw.c:356
 msgid "Add a jigsaw-puzzle pattern to the image"
@@ -5284,7 +5284,7 @@ msgstr "Přidat do obrázku vzorek puzzle"
 
 #: ../plug-ins/common/jigsaw.c:361
 msgid "_Jigsaw..."
-msgstr "_Skládačka..."
+msgstr "_Skládačka…"
 
 #: ../plug-ins/common/jigsaw.c:414
 msgid "Assembling jigsaw"
@@ -5353,7 +5353,7 @@ msgstr "Nastavit profil barev obrázku"
 
 #: ../plug-ins/common/lcms.c:225
 msgid "_Assign Color Profile..."
-msgstr "_Přiřadit profil barev..."
+msgstr "_Přiřadit profil barev…"
 
 #: ../plug-ins/common/lcms.c:241
 msgid "Assign default RGB Profile"
@@ -5365,7 +5365,7 @@ msgstr "Aplikovat na obrázek profil barev"
 
 #: ../plug-ins/common/lcms.c:258
 msgid "_Convert to Color Profile..."
-msgstr "_Převést do profilu barev..."
+msgstr "_Převést do profilu barev…"
 
 #: ../plug-ins/common/lcms.c:276
 msgid "Convert to default RGB Profile"
@@ -5379,111 +5379,112 @@ msgstr "Informace o profilu barev obrázku"
 msgid "Color Profile Information"
 msgstr "Informace o profilu barev"
 
-#: ../plug-ins/common/lcms.c:570
+#: ../plug-ins/common/lcms.c:572
 #, c-format
 msgid "Color profile '%s' is not for RGB color space."
-msgstr "Barevný profil '%s' není určen pro prostor RGB."
+msgstr "Barevný profil „%s“ není určen pro prostor RGB."
 
-#: ../plug-ins/common/lcms.c:677
+#: ../plug-ins/common/lcms.c:679
 msgid "Default RGB working space"
 msgstr "Výchozí pracovní prostor RGB"
 
-#: ../plug-ins/common/lcms.c:773
-msgid "Data attached as 'icc-profile' does not appear to be an ICC color profile"
-msgstr "Data připojená jako 'icc-profile' zřejmě nejsou barevným profilem ICC"
+#: ../plug-ins/common/lcms.c:775
+msgid ""
+"Data attached as 'icc-profile' does not appear to be an ICC color profile"
+msgstr "Data připojená jako „icc-profile“ zřejmě nejsou barevným profilem ICC"
 
-#: ../plug-ins/common/lcms.c:823
+#: ../plug-ins/common/lcms.c:825
 #, c-format
 msgid "'%s' does not appear to be an ICC color profile"
-msgstr "'%s' zřejmě není barevným profilem ICC"
+msgstr "„%s“ zřejmě není barevným profilem ICC"
 
 #. ICC color profile conversion
-#: ../plug-ins/common/lcms.c:883
+#: ../plug-ins/common/lcms.c:885
 #, c-format
 msgid "Converting from '%s' to '%s'"
-msgstr "Konvertuji z '%s' do '%s'"
+msgstr "Konvertuji z „%s“ do „%s“"
 
-#: ../plug-ins/common/lcms.c:1127
+#: ../plug-ins/common/lcms.c:1129
 #, c-format
 msgid "Could not load ICC profile from '%s'"
-msgstr "Nelze načíst ICC profil z '%s'"
+msgstr "Nelze načíst ICC profil z „%s“"
 
-#: ../plug-ins/common/lcms.c:1149
+#: ../plug-ins/common/lcms.c:1151
 #, c-format
 msgid "The image '%s' has an embedded color profile:"
-msgstr "Obrázek '%s' obsahuje vložený barevný profil:"
+msgstr "Obrázek „%s“ obsahuje vložený barevný profil:"
 
-#: ../plug-ins/common/lcms.c:1193
+#: ../plug-ins/common/lcms.c:1195
 #, c-format
 msgid "Convert the image to the RGB working space (%s)?"
 msgstr "Převést obrázek do pracovního prostoru RGB (%s)?"
 
-#: ../plug-ins/common/lcms.c:1224
+#: ../plug-ins/common/lcms.c:1226
 msgid "Convert to RGB working space?"
 msgstr "Konvertovat do pracovního prostoru RGB?"
 
-#: ../plug-ins/common/lcms.c:1229
+#: ../plug-ins/common/lcms.c:1231
 msgid "_Keep"
 msgstr "_Ponechat"
 
-#: ../plug-ins/common/lcms.c:1234
+#: ../plug-ins/common/lcms.c:1236
 msgid "_Convert"
 msgstr "_Konvertovat"
 
-#: ../plug-ins/common/lcms.c:1261 ../plug-ins/file-jpeg/jpeg-exif.c:377
+#: ../plug-ins/common/lcms.c:1263 ../plug-ins/file-jpeg/jpeg-exif.c:377
 msgid "_Don't ask me again"
 msgstr "_Neptat se znovu"
 
-#: ../plug-ins/common/lcms.c:1325
+#: ../plug-ins/common/lcms.c:1327
 msgid "Select destination profile"
 msgstr "Zvolte cílový profil"
 
-#: ../plug-ins/common/lcms.c:1352
+#: ../plug-ins/common/lcms.c:1354
 msgid "All files (*.*)"
 msgstr "Všechny soubory (*.*)"
 
-#: ../plug-ins/common/lcms.c:1357
+#: ../plug-ins/common/lcms.c:1359
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC profil barev (*.icc, *.icm)"
 
-#: ../plug-ins/common/lcms.c:1400
+#: ../plug-ins/common/lcms.c:1402
 #, c-format
 msgid "RGB workspace (%s)"
 msgstr "Pracovní prostor RGB (%s)"
 
-#: ../plug-ins/common/lcms.c:1450
+#: ../plug-ins/common/lcms.c:1452
 msgid "Convert to ICC Color Profile"
 msgstr "Převést do ICC profilu barev"
 
-#: ../plug-ins/common/lcms.c:1451
+#: ../plug-ins/common/lcms.c:1453
 msgid "Assign ICC Color Profile"
 msgstr "Přiřadit ICC profil barev"
 
-#: ../plug-ins/common/lcms.c:1459
+#: ../plug-ins/common/lcms.c:1461
 msgid "_Assign"
 msgstr "_Přiřadit"
 
-#: ../plug-ins/common/lcms.c:1476
+#: ../plug-ins/common/lcms.c:1478
 msgid "Current Color Profile"
 msgstr "Aktuální profil barev"
 
-#: ../plug-ins/common/lcms.c:1491
+#: ../plug-ins/common/lcms.c:1493
 msgid "Convert to"
 msgstr "Převést do"
 
-#: ../plug-ins/common/lcms.c:1491
+#: ../plug-ins/common/lcms.c:1493
 msgid "Assign"
 msgstr "Přiřadit"
 
-#: ../plug-ins/common/lcms.c:1515
+#: ../plug-ins/common/lcms.c:1517
 msgid "_Rendering Intent:"
 msgstr "_Záměr vykreslování:"
 
-#: ../plug-ins/common/lcms.c:1531
+#: ../plug-ins/common/lcms.c:1533
 msgid "_Black Point Compensation"
 msgstr "_Kompenzace černého bodu"
 
-#: ../plug-ins/common/lcms.c:1573
+#: ../plug-ins/common/lcms.c:1575
 msgid "Destination profile is not for RGB color space."
 msgstr "Cílový profil není určen pro prostor RGB."
 
@@ -5493,7 +5494,7 @@ msgstr "Simulovat eliptickou čočku nad obrázkem"
 
 #: ../plug-ins/common/lens-apply.c:114
 msgid "Apply _Lens..."
-msgstr "P_oužít čočku..."
+msgstr "P_oužít čočku…"
 
 #: ../plug-ins/common/lens-apply.c:181
 msgid "Applying lens"
@@ -5529,7 +5530,7 @@ msgstr "Opravit zkreslení objektivu"
 
 #: ../plug-ins/common/lens-distortion.c:120
 msgid "Lens Distortion..."
-msgstr "Zkreslení objektivu..."
+msgstr "Zkreslení objektivu…"
 
 #: ../plug-ins/common/lens-distortion.c:383
 msgid "Lens distortion"
@@ -5569,7 +5570,7 @@ msgstr "Přidat odlesk objektivu"
 
 #: ../plug-ins/common/lens-flare.c:195
 msgid "Lens _Flare..."
-msgstr "_Odlesk objektivu..."
+msgstr "_Odlesk objektivu…"
 
 #: ../plug-ins/common/lens-flare.c:270
 msgid "Render lens flare"
@@ -5589,45 +5590,41 @@ msgstr "Zobrazit _polohu"
 
 #: ../plug-ins/common/mail.c:188
 msgid "Send the image by email"
-msgstr ""
+msgstr "Odeslat obrázek pomocí e-mailu"
 
 #: ../plug-ins/common/mail.c:194
-#, fuzzy
 msgid "Send by E_mail..."
-msgstr "Poslat jako poštu"
+msgstr "Odeslat pomocí e-_mailu…"
 
-#: ../plug-ins/common/mail.c:408
-#, fuzzy
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
-msgstr "Poslat jako poštu"
+msgstr "Odeslat pomocí e-mailu"
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "_Odeslat"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "_Název souboru:"
 
-#: ../plug-ins/common/mail.c:457
-#, fuzzy
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
-msgstr "Na_hoře:"
+msgstr "_Komu:"
 
-#: ../plug-ins/common/mail.c:471
-#, fuzzy
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
-msgstr "Z:"
+msgstr "_Od:"
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "_Předmět:"
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "nějaký druh chyby přípony souboru nebo její nepřítomnost"
 
-#: ../plug-ins/common/mail.c:726
+#: ../plug-ins/common/mail.c:725
 #, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "Nemohu spustit sendmail (%s)"
@@ -5638,7 +5635,7 @@ msgstr "Redukovat obrázek na čistou červenou, zelenou a modrou"
 
 #: ../plug-ins/common/max-rgb.c:95
 msgid "Maxim_um RGB..."
-msgstr "_Nejvyšší RGB..."
+msgstr "_Nejvyšší RGB…"
 
 #: ../plug-ins/common/max-rgb.c:134 ../plug-ins/common/noise-hsv.c:158
 msgid "Can only operate on RGB drawables."
@@ -5666,7 +5663,7 @@ msgstr "Převést obrázek do nepravidelných dlaždic"
 
 #: ../plug-ins/common/mosaic.c:364
 msgid "_Mosaic..."
-msgstr "_Mozaika..."
+msgstr "_Mozaika…"
 
 #. progress bar for gradient finding
 #: ../plug-ins/common/mosaic.c:502
@@ -5700,7 +5697,7 @@ msgstr "Trojúhelníky"
 
 #: ../plug-ins/common/mosaic.c:640
 msgid "_Tiling primitives:"
-msgstr "_Základní dlaždice"
+msgstr "_Základní dlaždice:"
 
 #: ../plug-ins/common/mosaic.c:648
 msgid "Tile _size:"
@@ -5792,7 +5789,7 @@ msgstr "Simulovat efekt novinového tisku"
 
 #: ../plug-ins/common/newsprint.c:526
 msgid "Newsprin_t..."
-msgstr "_Novinový tisk..."
+msgstr "_Novinový tisk…"
 
 #: ../plug-ins/common/newsprint.c:627 ../plug-ins/common/newsprint.c:1188
 msgid "Newsprint"
@@ -5868,7 +5865,7 @@ msgstr "Nelineární filtr typu švýcarského armádního nože"
 
 #: ../plug-ins/common/nl-filter.c:124
 msgid "_NL Filter..."
-msgstr "_NL Filtr..."
+msgstr "_NL Filtr…"
 
 #: ../plug-ins/common/nl-filter.c:952 ../plug-ins/common/nl-filter.c:1015
 msgid "NL Filter"
@@ -5900,7 +5897,7 @@ msgstr "Nezávisle randomizovat odstín/sytost/hodnotu"
 
 #: ../plug-ins/common/noise-hsv.c:108
 msgid "HSV Noise..."
-msgstr "HSV šum..."
+msgstr "HSV šum…"
 
 #: ../plug-ins/common/noise-hsv.c:215 ../plug-ins/common/noise-hsv.c:361
 msgid "HSV Noise"
@@ -5940,15 +5937,15 @@ msgstr "Náhodně posunout některé pixely dolů (podobné tání)"
 
 #: ../plug-ins/common/noise-randomize.c:233
 msgid "_Hurl..."
-msgstr "_Výpadky..."
+msgstr "_Výpadky…"
 
 #: ../plug-ins/common/noise-randomize.c:245
 msgid "_Pick..."
-msgstr "_Vybrat..."
+msgstr "_Vybrat…"
 
 #: ../plug-ins/common/noise-randomize.c:257
 msgid "_Slur..."
-msgstr "_Roztřepení..."
+msgstr "_Roztřepení…"
 
 #: ../plug-ins/common/noise-randomize.c:771
 #: ../plug-ins/common/noise-solid.c:602
@@ -5977,7 +5974,7 @@ msgstr "Zkreslit barvy náhodnou měrou"
 
 #: ../plug-ins/common/noise-rgb.c:154
 msgid "_RGB Noise..."
-msgstr "_RGB šum..."
+msgstr "_RGB šum…"
 
 #: ../plug-ins/common/noise-rgb.c:282
 msgid "Adding noise"
@@ -6010,7 +6007,7 @@ msgstr "Vytvořit náhodnou mrakovitou texturu"
 
 #: ../plug-ins/common/noise-solid.c:182
 msgid "_Solid Noise..."
-msgstr "_Pevný šum..."
+msgstr "_Pevný šum…"
 
 #. Dialog initialization
 #: ../plug-ins/common/noise-solid.c:315 ../plug-ins/common/noise-solid.c:563
@@ -6045,17 +6042,17 @@ msgstr "Přesunout náhodně pixely"
 
 #: ../plug-ins/common/noise-spread.c:98
 msgid "Sp_read..."
-msgstr "_Rozprostřít..."
+msgstr "_Rozprostřít…"
 
 #: ../plug-ins/common/noise-spread.c:181
 msgid "Spreading"
 msgstr "Rozprostírám"
 
-#: ../plug-ins/common/noise-spread.c:344
+#: ../plug-ins/common/noise-spread.c:346
 msgid "Spread"
 msgstr "Rozprostření"
 
-#: ../plug-ins/common/noise-spread.c:369
+#: ../plug-ins/common/noise-spread.c:371
 msgid "Spread Amount"
 msgstr "Míra rozprostření"
 
@@ -6065,7 +6062,7 @@ msgstr "Vykreslit do obrázku efekt výbuchu hvězdy"
 
 #: ../plug-ins/common/nova.c:177
 msgid "Super_nova..."
-msgstr "Super_nova..."
+msgstr "Super_nova…"
 
 #: ../plug-ins/common/nova.c:261
 msgid "Rendering supernova"
@@ -6097,7 +6094,7 @@ msgstr "Rozmazat barvy k simulaci olejomalby"
 
 #: ../plug-ins/common/oilify.c:125
 msgid "Oili_fy..."
-msgstr "_Olejomalba..."
+msgstr "_Olejomalba…"
 
 #: ../plug-ins/common/oilify.c:247
 msgid "Oil painting"
@@ -6142,7 +6139,7 @@ msgstr "Simulovat barevné zkreslení kopírky"
 
 #: ../plug-ins/common/photocopy.c:158
 msgid "_Photocopy..."
-msgstr "_Fotokopie..."
+msgstr "_Fotokopie…"
 
 #: ../plug-ins/common/photocopy.c:839
 msgid "Photocopy"
@@ -6167,7 +6164,7 @@ msgstr "Zjednodušit obrázek na pole jednobarevných čtverců"
 
 #: ../plug-ins/common/pixelize.c:171
 msgid "_Pixelize..."
-msgstr "_Pixelizovat..."
+msgstr "_Pixelizovat…"
 
 #: ../plug-ins/common/pixelize.c:273
 msgid "Pixelizing"
@@ -6191,7 +6188,7 @@ msgstr "Vytvořit náhodnou plazmatickou texturu"
 
 #: ../plug-ins/common/plasma.c:181
 msgid "_Plasma..."
-msgstr "_Plazma..."
+msgstr "_Plazma…"
 
 #: ../plug-ins/common/plasma.c:263 ../plug-ins/common/plasma.c:300
 msgid "Plasma"
@@ -6278,7 +6275,7 @@ msgstr "Převést obrázek do nebo z polárních souřadnic"
 
 #: ../plug-ins/common/polar-coords.c:163
 msgid "P_olar Coordinates..."
-msgstr "_Polární souřadnice..."
+msgstr "_Polární souřadnice…"
 
 #: ../plug-ins/common/polar-coords.c:360
 msgid "Polar coordinates"
@@ -6348,7 +6345,7 @@ msgstr "Generovat mnoho různých abstraktních vzorků"
 
 #: ../plug-ins/common/qbist.c:410
 msgid "_Qbist..."
-msgstr "_Qbist..."
+msgstr "_Qbist…"
 
 #: ../plug-ins/common/qbist.c:511
 msgid "Qbist"
@@ -6372,7 +6369,7 @@ msgstr "Odstranit efekt červených očí způsobený fotografickým bleskem"
 
 #: ../plug-ins/common/red-eye-removal.c:116
 msgid "_Red Eye Removal..."
-msgstr "Odstranit červené _oči..."
+msgstr "Odstranit červené _oči…"
 
 #: ../plug-ins/common/red-eye-removal.c:142
 msgid "Red Eye Removal"
@@ -6403,7 +6400,7 @@ msgstr "Přesunout pixely dle vlnitého vzoru"
 
 #: ../plug-ins/common/ripple.c:136
 msgid "_Ripple..."
-msgstr "_Rozvlnit..."
+msgstr "_Rozvlnit…"
 
 #: ../plug-ins/common/ripple.c:226
 msgid "Rippling"
@@ -6448,9 +6445,8 @@ msgid "A_mplitude:"
 msgstr "_Amplituda:"
 
 #: ../plug-ins/common/ripple.c:642
-#, fuzzy
 msgid "Phase _shift:"
-msgstr "_Posun fáze červené:"
+msgstr "_Posun fáze:"
 
 #: ../plug-ins/common/rotate.c:413
 msgid "You can not rotate the whole image if there's a selection."
@@ -6474,7 +6470,7 @@ msgstr "Kolorizovat obrázek podle vzorového obrázku"
 
 #: ../plug-ins/common/sample-colorize.c:303
 msgid "_Sample Colorize..."
-msgstr "_Vzor vybarvení..."
+msgstr "_Vzor vybarvení…"
 
 #: ../plug-ins/common/sample-colorize.c:1318
 msgid "Sample Colorize"
@@ -6556,7 +6552,7 @@ msgstr "Vytvořit obrázek z oblasti obrazovky"
 
 #: ../plug-ins/common/screenshot.c:253
 msgid "_Screenshot..."
-msgstr "_Snímek obrazovky..."
+msgstr "_Snímek obrazovky…"
 
 #: ../plug-ins/common/screenshot.c:417
 msgid "Error selecting the window"
@@ -6591,12 +6587,15 @@ msgid "After the delay, the screenshot is taken."
 msgstr "Po prodlevě je vytvořen snímek obrazovky."
 
 #: ../plug-ins/common/screenshot.c:1101
-msgid "After the delay, drag your mouse to select the region for the screenshot."
-msgstr "Po uplynutí časové prodlevy vyberte oblast snímku obrazovky táhnutím myší."
+msgid ""
+"After the delay, drag your mouse to select the region for the screenshot."
+msgstr ""
+"Po uplynutí časové prodlevy vyberte oblast snímku obrazovky táhnutím myší."
 
 #: ../plug-ins/common/screenshot.c:1104
 msgid "At the end of the delay, click in a window to snap it."
-msgstr "Po uplynutí časové prodlevy klikněte do okna, jehož snímek chcete vytvořit."
+msgstr ""
+"Po uplynutí časové prodlevy klikněte do okna, jehož snímek chcete vytvořit."
 
 #. Area
 #: ../plug-ins/common/screenshot.c:1110
@@ -6651,7 +6650,7 @@ msgstr "Zostřit obrázek (méně účinné než Maskovat rozostření)"
 
 #: ../plug-ins/common/sharpen.c:120
 msgid "_Sharpen..."
-msgstr "_Doostřit..."
+msgstr "_Doostřit…"
 
 #.
 #. * Let the user know what we're doing...
@@ -6670,7 +6669,7 @@ msgstr "Posunout každý řádek pixelů o náhodnou hodnotu"
 
 #: ../plug-ins/common/shift.c:108
 msgid "_Shift..."
-msgstr "_Posunout..."
+msgstr "_Posunout…"
 
 #: ../plug-ins/common/shift.c:189
 msgid "Shifting"
@@ -6698,7 +6697,7 @@ msgstr "Generovat komplexní sinusoidní textury"
 
 #: ../plug-ins/common/sinus.c:191
 msgid "_Sinus..."
-msgstr "_Sinus..."
+msgstr "_Sinus…"
 
 #: ../plug-ins/common/sinus.c:284
 msgid "Sinus: rendering"
@@ -6823,7 +6822,7 @@ msgstr "Odvodit z obrázku plynulou barevnou paletu"
 
 #: ../plug-ins/common/smooth-palette.c:88
 msgid "Smoo_th Palette..."
-msgstr "_Plynulá paleta..."
+msgstr "_Plynulá paleta…"
 
 #: ../plug-ins/common/smooth-palette.c:179
 msgid "Deriving smooth palette"
@@ -6843,7 +6842,7 @@ msgstr "Simulovat záři zintenzivněním a rozmlžením světel"
 
 #: ../plug-ins/common/softglow.c:139
 msgid "_Softglow..."
-msgstr "_Jemná záře..."
+msgstr "_Jemná záře…"
 
 #: ../plug-ins/common/softglow.c:632
 msgid "Softglow"
@@ -6859,7 +6858,7 @@ msgstr "Vytvořit ze světlých bodů třpytící se jiskry"
 
 #: ../plug-ins/common/sparkle.c:186
 msgid "_Sparkle..."
-msgstr "_Jiskřit..."
+msgstr "_Jiskřit…"
 
 #: ../plug-ins/common/sparkle.c:223
 msgid "Region selected for filter is empty"
@@ -7047,13 +7046,13 @@ msgstr "Světlo"
 #: ../plug-ins/common/sphere-designer.c:2009
 #, c-format
 msgid "File '%s' is not a valid save file."
-msgstr "Soubor '%s' není platný uložený soubor."
+msgstr "Soubor „%s“ není platný uložený soubor."
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Open File"
 msgstr "Otevřít soubor"
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Save File"
 msgstr "Zapsat soubor"
 
@@ -7158,9 +7157,9 @@ msgstr "Vytvořit obrázek koule s texturou"
 
 #: ../plug-ins/common/sphere-designer.c:3020
 msgid "Sphere _Designer..."
-msgstr "_Návrhář koulí..."
+msgstr "_Návrhář koulí…"
 
-#: ../plug-ins/common/sphere-designer.c:3074
+#: ../plug-ins/common/sphere-designer.c:3080
 msgid "Region selected for plug-in is empty"
 msgstr "Oblast vybraná pro zásuvný modul je prázdná"
 
@@ -7170,7 +7169,7 @@ msgstr "Vytvořit průhlednost typu vše nebo nic"
 
 #: ../plug-ins/common/threshold-alpha.c:90
 msgid "_Threshold Alpha..."
-msgstr "_Práh alfy..."
+msgstr "_Práh alfy…"
 
 #: ../plug-ins/common/threshold-alpha.c:131
 msgid "The layer has its alpha channel locked."
@@ -7198,7 +7197,7 @@ msgstr "Simulovat zkreslení způsobené čtvercovými skleněnými dlaždicemi"
 
 #: ../plug-ins/common/tile-glass.c:130
 msgid "_Glass Tile..."
-msgstr "_Skleněné dlaždicování..."
+msgstr "_Skleněné dlaždicování…"
 
 #: ../plug-ins/common/tile-glass.c:210 ../plug-ins/common/tile-glass.c:250
 msgid "Glass Tile"
@@ -7286,7 +7285,7 @@ msgstr "31. září 1999"
 
 #: ../plug-ins/common/tile-paper.c:852
 msgid "_Paper Tile..."
-msgstr "_Papírová dlaždice..."
+msgstr "_Papírová dlaždice…"
 
 #: ../plug-ins/common/tile-seamless.c:67
 msgid "Alters edges to make the image seamlessly tileable"
@@ -7306,7 +7305,7 @@ msgstr "Poskládat obrázek ze zmenšených kopií sama sebe"
 
 #: ../plug-ins/common/tile-small.c:220
 msgid "_Small Tiles..."
-msgstr "_Malé dlaždice..."
+msgstr "_Malé dlaždice…"
 
 #: ../plug-ins/common/tile-small.c:263
 msgid "Region selected for filter is empty."
@@ -7364,7 +7363,7 @@ msgstr "Vytvořit pole kopií obrázku"
 
 #: ../plug-ins/common/tile.c:111
 msgid "_Tile..."
-msgstr "_Dlaždicovat..."
+msgstr "_Dlaždicovat…"
 
 #: ../plug-ins/common/tile.c:401
 msgid "Tile"
@@ -7395,7 +7394,8 @@ msgid "ID"
 msgstr "ID"
 
 #: ../plug-ins/common/unit-editor.c:96
-msgid "This string will be used to identify a unit in GIMP's configuration files."
+msgid ""
+"This string will be used to identify a unit in GIMP's configuration files."
 msgstr ""
 "Tento řetězec bude použit pouze k identifikaci jednotky v konfiguračním "
 "souboru GIMPu."
@@ -7420,7 +7420,7 @@ msgid ""
 msgstr ""
 "Toto pole je pomůcka pro numerická vstupní pole. Určuje, kolik desetinných "
 "číslic vstupního pole dává přibližně stejnou přesnost jako vstupní pole "
-"\"palec\" se dvěma desetinnými místy."
+"„palec“ se dvěma desetinnými místy."
 
 #: ../plug-ins/common/unit-editor.c:104
 msgid "Symbol"
@@ -7431,7 +7431,7 @@ msgid ""
 "The unit's symbol if it has one (e.g. \"'\" for inches). The unit's "
 "abbreviation is used if doesn't have a symbol."
 msgstr ""
-"Symbol jednotky, má-li nějaký (např. \"'\" pro palce). Nemá-li jednotka "
+"Symbol jednotky, má-li nějaký (např. „'“ pro palce). Nemá-li jednotka "
 "symbol, bude použita její zkratka."
 
 #: ../plug-ins/common/unit-editor.c:107
@@ -7440,7 +7440,7 @@ msgstr "Zkratka"
 
 #: ../plug-ins/common/unit-editor.c:107
 msgid "The unit's abbreviation (e.g. \"cm\" for centimeters)."
-msgstr "Zkratka jednotky (např. \"cm\" pro centimetry)."
+msgstr "Zkratka jednotky (např. „cm“ pro centimetry)."
 
 #: ../plug-ins/common/unit-editor.c:109
 msgid "Singular"
@@ -7524,7 +7524,7 @@ msgstr "Obvykle nejvhodnější způsob zaostření obrázku"
 
 #: ../plug-ins/common/unsharp-mask.c:138
 msgid "_Unsharp Mask..."
-msgstr "_Maskovat rozostření..."
+msgstr "_Maskovat rozostření…"
 
 #: ../plug-ins/common/unsharp-mask.c:475
 msgid "Merging"
@@ -7584,21 +7584,19 @@ msgstr "Rozšířit určité barvy na sousední pixely"
 
 #: ../plug-ins/common/value-propagate.c:238
 msgid "_Value Propagate..."
-msgstr "_Rozšířit hodnotu..."
+msgstr "_Rozšířit hodnotu…"
 
 #: ../plug-ins/common/value-propagate.c:245
-#, fuzzy
 msgid "Shrink lighter areas of the image"
-msgstr "Zmenšit tmavé oblasti obrázku"
+msgstr "Zmenšit světlejší oblasti obrázku"
 
 #: ../plug-ins/common/value-propagate.c:250
 msgid "E_rode"
 msgstr "_Erodovat"
 
 #: ../plug-ins/common/value-propagate.c:257
-#, fuzzy
 msgid "Grow lighter areas of the image"
-msgstr "Zvětšit tmavé oblasti obrázku"
+msgstr "Zvětšit světlejší oblasti obrázku"
 
 #: ../plug-ins/common/value-propagate.c:262
 msgid "_Dilate"
@@ -7716,7 +7714,7 @@ msgstr "Zvláštní efekty, které nikdo nechápe"
 
 #: ../plug-ins/common/van-gogh-lic.c:814
 msgid "_Van Gogh (LIC)..."
-msgstr "_Van Gogh (LIC)..."
+msgstr "_Van Gogh (LIC)…"
 
 #: ../plug-ins/common/video.c:42
 msgid "_Staggered"
@@ -7756,11 +7754,12 @@ msgstr "_Body"
 
 #: ../plug-ins/common/video.c:1807
 msgid "Simulate distortion produced by a fuzzy or low-res monitor"
-msgstr "Simulovat zkreslení rozostřeného monitoru či monitoru s nízkým rozlišením"
+msgstr ""
+"Simulovat zkreslení rozostřeného monitoru či monitoru s nízkým rozlišením"
 
 #: ../plug-ins/common/video.c:1814
 msgid "Vi_deo..."
-msgstr "_Video..."
+msgstr "_Video…"
 
 #: ../plug-ins/common/video.c:1886 ../plug-ins/common/video.c:2017
 msgid "Video"
@@ -7785,7 +7784,7 @@ msgstr "Zkroutit či rozmazat obrázek různými způsoby"
 
 #: ../plug-ins/common/warp.c:241
 msgid "_Warp..."
-msgstr "_Ohnout..."
+msgstr "_Ohnout…"
 
 #: ../plug-ins/common/warp.c:376
 msgid "Warp"
@@ -7912,7 +7911,7 @@ msgstr "Deformovat obrázek vlnami"
 
 #: ../plug-ins/common/waves.c:125
 msgid "_Waves..."
-msgstr "_Vlny..."
+msgstr "_Vlny…"
 
 #: ../plug-ins/common/waves.c:248 ../plug-ins/flame/flame.c:763
 msgid "Waves"
@@ -7939,33 +7938,36 @@ msgid "Waving"
 msgstr "Vlnění"
 
 #: ../plug-ins/common/web-browser.c:206
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Web browser not specified.\n"
 "Please specify a web browser using the Preferences dialog."
 msgstr ""
-"Není určen WWW prohlížeč.\n"
-"Určete prosím WWW prohlížeč pomocí dialogu Předvolby."
+"Není vybrán webový prohlížeč.\n"
+"Vyberte prosím webový prohlížeč pomocí dialogu Předvolby."
 
 #: ../plug-ins/common/web-browser.c:228
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not parse the web browser command specified in the Preferences "
 "dialog:\n"
 "\n"
 "%s"
 msgstr ""
-"Nemohu zpracovat určený příkaz WWW prohlížeče:\n"
+"Nemohu zpracovat příkaz ve webovém prohlížeči, který byl vybrán v dialogu "
+"Předvolby:\n"
+"\n"
 "%s"
 
 #: ../plug-ins/common/web-browser.c:246
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Could not execute the web browser specified in the Preferences dialog:\n"
 "\n"
 "%s"
 msgstr ""
-"Nemohu spustit určený WWW prohlížeč:\n"
+"Nemohu spustit webový prohlížeč, který byl vybrán v dialogu Předvolby:\n"
+"\n"
 "%s"
 
 #: ../plug-ins/common/whirl-pinch.c:138
@@ -7974,7 +7976,7 @@ msgstr "Zkreslit obrázek vířením a zaškrcováním"
 
 #: ../plug-ins/common/whirl-pinch.c:149
 msgid "W_hirl and Pinch..."
-msgstr "_Vír a zaškrcení..."
+msgstr "_Vír a zaškrcení…"
 
 #: ../plug-ins/common/whirl-pinch.c:193
 msgid "Region affected by plug-in is empty"
@@ -8002,7 +8004,7 @@ msgstr "Rozmazat obrázek pro vytvoření efektu větru"
 
 #: ../plug-ins/common/wind.c:180
 msgid "Wi_nd..."
-msgstr "_Vítr..."
+msgstr "_Vítr…"
 
 #: ../plug-ins/common/wind.c:315
 msgid "Rendering blast"
@@ -8070,36 +8072,36 @@ msgstr "Pevno_st:"
 msgid "Higher values increase the magnitude of the effect"
 msgstr "Vyšší hodnota znamená zesiluje efekt"
 
-#: ../plug-ins/file-bmp/bmp-read.c:86
+#: ../plug-ins/file-bmp/bmp-read.c:88
 msgid "Bad colormap"
 msgstr "Špatná barevná mapa"
 
-#: ../plug-ins/file-bmp/bmp-read.c:170 ../plug-ins/file-bmp/bmp-read.c:180
-#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196
-#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:395
-#: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:411
-#: ../plug-ins/file-bmp/bmp-read.c:419
+#: ../plug-ins/file-bmp/bmp-read.c:172 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:422
+#: ../plug-ins/file-bmp/bmp-read.c:430 ../plug-ins/file-bmp/bmp-read.c:438
+#: ../plug-ins/file-bmp/bmp-read.c:446
 #, c-format
 msgid "'%s' is not a valid BMP file"
-msgstr "'%s' není platný soubor BMP"
+msgstr "„%s“ není platný soubor BMP"
 
-#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252
-#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345
-#: ../plug-ins/file-bmp/bmp-read.c:371
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
 #, c-format
 msgid "Error reading BMP file header from '%s'"
-msgstr "Chyba při čtení hlavičky souboru BMP z '%s'"
+msgstr "Chyba při čtení hlavičky souboru BMP z „%s“"
 
-#: ../plug-ins/file-bmp/bmp-read.c:531
+#: ../plug-ins/file-bmp/bmp-read.c:558
 msgid "Unrecognized or invalid BMP compression format."
 msgstr "Neznámý nebo neplatný formát komprese BMP."
 
-#: ../plug-ins/file-bmp/bmp-read.c:573
+#: ../plug-ins/file-bmp/bmp-read.c:600
 msgid "Unsupported or invalid bitdepth."
 msgstr "Nepodporovaná nebo neplatná bitová hloubka."
 
-#: ../plug-ins/file-bmp/bmp-read.c:761 ../plug-ins/file-bmp/bmp-read.c:802
-#: ../plug-ins/file-bmp/bmp-read.c:852
+#: ../plug-ins/file-bmp/bmp-read.c:788 ../plug-ins/file-bmp/bmp-read.c:829
+#: ../plug-ins/file-bmp/bmp-read.c:879
 msgid "The bitmap ends unexpectedly."
 msgstr "Bitmapa neočekávaně končí."
 
@@ -8119,7 +8121,7 @@ msgstr "Zapsat jako BMP"
 msgid "_Run-Length Encoded"
 msgstr "Kódované _RunLength"
 
-#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:899
+#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:900
 msgid "_Advanced Options"
 msgstr "_Pokročilá nastavení"
 
@@ -8223,23 +8225,23 @@ msgstr ""
 
 #: ../plug-ins/file-ico/ico-dialog.c:178
 msgid "1 bpp, 1-bit alpha, 2-slot palette"
-msgstr "1 bpp, jednobitová alfa, dvouprvková paleta"
+msgstr "1 bpp, 1bitový alfa kanál, 2místná paleta"
 
 #: ../plug-ins/file-ico/ico-dialog.c:179
 msgid "4 bpp, 1-bit alpha, 16-slot palette"
-msgstr "4 bpp, jednobitová alfa, šestnáctiprvková paleta"
+msgstr "4 bpp, 1bitový alfa kanál, 16místná paleta"
 
 #: ../plug-ins/file-ico/ico-dialog.c:180
 msgid "8 bpp, 1-bit alpha, 256-slot palette"
-msgstr "8 bpp, jednobitová alfa, dvěstěpadesátišestiprvková paleta"
+msgstr "8 bpp, 1bitový alfa kanál, 256místná paleta"
 
 #: ../plug-ins/file-ico/ico-dialog.c:181
 msgid "24 bpp, 1-bit alpha, no palette"
-msgstr "32 bpp, 1bitová alfa, bez palety"
+msgstr "24 bpp, 1bitový alfa kanál, bez palety"
 
 #: ../plug-ins/file-ico/ico-dialog.c:182
 msgid "32 bpp, 8-bit alpha, no palette"
-msgstr "32 bpp, osmibitová alpha, bez palety"
+msgstr "32 bpp, 8bitový alfa kanál, bez palety"
 
 #: ../plug-ins/file-ico/ico-dialog.c:196
 msgid "Compressed (PNG)"
@@ -8251,11 +8253,11 @@ msgstr "Komprimováno (PNG)"
 msgid "Icon #%i"
 msgstr "Ikona č. %i"
 
-#: ../plug-ins/file-ico/ico-load.c:725 ../plug-ins/file-jpeg/jpeg-load.c:630
+#: ../plug-ins/file-ico/ico-load.c:725 ../plug-ins/file-jpeg/jpeg-load.c:633
 #: ../plug-ins/file-psd/psd-thumb-load.c:85
 #, c-format
 msgid "Opening thumbnail for '%s'"
-msgstr "Otevírá se miniatura '%s'"
+msgstr "Otevírá se miniatura „%s“"
 
 #: ../plug-ins/file-ico/ico.c:103 ../plug-ins/file-ico/ico.c:137
 msgid "Microsoft Windows icon"
@@ -8288,78 +8290,69 @@ msgstr "Velikost souboru: %02.01f kB"
 
 #: ../plug-ins/file-jpeg/jpeg-save.c:682
 msgid "Calculating file size..."
-msgstr "Počítá se velikost souboru..."
+msgstr "Počítá se velikost souboru…"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:773 ../plug-ins/file-jpeg/jpeg-save.c:875
+#: ../plug-ins/file-jpeg/jpeg-save.c:774 ../plug-ins/file-jpeg/jpeg-save.c:876
 msgid "File size: unknown"
 msgstr "Velikost souboru: neznámá"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:826
+#: ../plug-ins/file-jpeg/jpeg-save.c:827
 msgid "Save as JPEG"
 msgstr "Zapsat jako JPEG"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:861
+#: ../plug-ins/file-jpeg/jpeg-save.c:862
 msgid "_Quality:"
 msgstr "_Kvalita:"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:865
+#: ../plug-ins/file-jpeg/jpeg-save.c:866
 msgid "JPEG quality parameter"
 msgstr "Parametr kvality JPEG"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:884
+#: ../plug-ins/file-jpeg/jpeg-save.c:885
 msgid "Enable preview to obtain the file size."
 msgstr "Povolit náhled pro zjištění velikosti souboru."
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:887
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:888
 msgid "Sho_w preview in image window"
 msgstr "Zobrazit _náhled v okně obrázku"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:928
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:929
 msgid "S_moothing:"
-msgstr "Vyhlazování:"
+msgstr "Vy_hlazování:"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:941
+#: ../plug-ins/file-jpeg/jpeg-save.c:942
 msgid "Frequency (rows):"
 msgstr "Frekvence (řádky):"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:957
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:958
 msgid "Use _restart markers"
-msgstr "Používat restartovací značky"
+msgstr "Používat _restartovací značky"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:973
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:974
 msgid "_Optimize"
-msgstr "Optimalizovat"
+msgstr "_Optimalizovat"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:987
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:988
 msgid "_Progressive"
-msgstr "Progresivní"
+msgstr "_Progresivní"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1003
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:1004
 msgid "Save _EXIF data"
-msgstr "Uložit data EXIF"
+msgstr "Uložit data _EXIF"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1020
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:1021
 msgid "Save _thumbnail"
-msgstr "Uložit miniaturu"
+msgstr "Uložit _miniaturu"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1037
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:1038
 msgid "Save _XMP data"
-msgstr "Uložit data XMP"
+msgstr "Uložit data _XMP"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1052
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:1053
 msgid "_Use quality settings from original image"
-msgstr "Použít nastavení kvality z původního obrázku"
+msgstr "_Použít nastavení kvality z původního obrázku"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1058
+#: ../plug-ins/file-jpeg/jpeg-save.c:1059
 msgid ""
 "If the original image was loaded from a JPEG file using non-standard quality "
 "settings (quantization tables), enable this option to get almost the same "
@@ -8370,53 +8363,50 @@ msgstr ""
 "stejné kvality a velikosti souboru."
 
 #. Subsampling
-#: ../plug-ins/file-jpeg/jpeg-save.c:1082
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:1083
 msgid "Su_bsampling:"
-msgstr "Podvzorkování:"
+msgstr "Po_dvzorkování:"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1089
+#: ../plug-ins/file-jpeg/jpeg-save.c:1090
 msgid "1x1,1x1,1x1 (best quality)"
 msgstr "1x1,1x1,1x1 (nejlepší kvalita)"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1091
+#: ../plug-ins/file-jpeg/jpeg-save.c:1092
 msgid "2x1,1x1,1x1 (4:2:2)"
 msgstr "2x1,1x1,1x1 (4:2:2)"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1093
+#: ../plug-ins/file-jpeg/jpeg-save.c:1094
 msgid "1x2,1x1,1x1"
 msgstr "1x2,1x1,1x1"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1095
+#: ../plug-ins/file-jpeg/jpeg-save.c:1096
 msgid "2x2,1x1,1x1 (smallest file)"
 msgstr "2x2,1x1,1x1 (nejmenší soubor)"
 
 #. DCT method
-#: ../plug-ins/file-jpeg/jpeg-save.c:1125
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:1126
 msgid "_DCT method:"
-msgstr "Metoda DCT:"
+msgstr "Metoda _DCT:"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1131
+#: ../plug-ins/file-jpeg/jpeg-save.c:1132
 msgid "Fast Integer"
 msgstr "Rychlé celočíselné"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1132
+#: ../plug-ins/file-jpeg/jpeg-save.c:1133
 msgid "Integer"
 msgstr "Celočíselné"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1133
+#: ../plug-ins/file-jpeg/jpeg-save.c:1134
 msgid "Floating-Point"
 msgstr "V plovoucí řádové čárce"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1149
+#: ../plug-ins/file-jpeg/jpeg-save.c:1150
 msgid "Comment"
 msgstr "Komentář"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1194
-#, fuzzy
+#: ../plug-ins/file-jpeg/jpeg-save.c:1195
 msgid "Sa_ve Defaults"
-msgstr "_Uložit implicitní nastavení"
+msgstr "_Uložit výchozí nastavení"
 
 #: ../plug-ins/file-jpeg/jpeg.c:137 ../plug-ins/file-jpeg/jpeg.c:175
 msgid "JPEG image"
@@ -8428,64 +8418,64 @@ msgstr "Náhled exportu"
 
 #: ../plug-ins/file-psd/psd-load.c:215
 #: ../plug-ins/file-psd/psd-thumb-load.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "Error loading PSD file: %s"
-msgstr "Chyba čtení PNG souboru: %s"
+msgstr "Chyba čtení PSD souboru: %s"
 
 #: ../plug-ins/file-psd/psd-load.c:270
 #, c-format
 msgid "Not a valid photoshop document file"
-msgstr ""
+msgstr "Soubor není platným formátem Photoshopu"
 
 #: ../plug-ins/file-psd/psd-load.c:277
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported file format version: %d"
-msgstr "Nepodporovaná nebo neplatná výška obrázku: %d"
+msgstr "Nepodporovaná verze souborového typu: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "Too many channels in file: %d"
-msgstr "Zdrojový kanál v souboru:"
+msgstr "Příliš mnoho kanálů v souboru: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:314
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported color mode: %s"
-msgstr "Nepodporovaná bitová hloubka (%d)!"
+msgstr "Nepodporovaný barevný mód: %s"
 
 #: ../plug-ins/file-psd/psd-load.c:341
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported bit depth: %d"
-msgstr "Nepodporovaná bitová hloubka (%d)!"
+msgstr "Nepodporovaná bitová hloubka: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:375 ../plug-ins/file-psd/psd-load.c:385
 #: ../plug-ins/file-psd/psd-load.c:604 ../plug-ins/file-psd/psd-load.c:785
 #, c-format
 msgid "The file is corrupt!"
-msgstr ""
+msgstr "Soubor je porušen!"
 
 #: ../plug-ins/file-psd/psd-load.c:545
-#, fuzzy, c-format
+#, c-format
 msgid "Too many channels in layer: %d"
-msgstr "Zdrojový kanál v souboru:"
+msgstr "Příliš mnoho kanálů ve vrstvě: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:552
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported or invalid layer height: %d"
-msgstr "Nepodporovaná nebo neplatná výška obrázku: %d"
+msgstr "Nepodporovaná nebo neplatná výška vrstvy: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:559
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported or invalid layer width: %d"
-msgstr "Nepodporovaná nebo neplatná šířka obrázku: %d"
+msgstr "Nepodporovaná nebo neplatná šířka vrstvy: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:1153 ../plug-ins/file-psd/psd-load.c:1502
-#, fuzzy, c-format
+#, c-format
 msgid "Unsupported compression mode: %d"
-msgstr "Nepodporovaná nebo neplatná šířka obrázku: %d"
+msgstr "Nepodporovaný kompresní mód: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:1595
 msgid "Extra"
-msgstr ""
+msgstr "Extra"
 
 #: ../plug-ins/file-psd/psd-save.c:228 ../plug-ins/file-psd/psd.c:114
 #: ../plug-ins/file-psd/psd.c:153
@@ -8498,7 +8488,7 @@ msgid ""
 "Unable to save layer with mode '%s'.  Either the PSD file format or the save "
 "plug-in does not support that, using normal mode instead."
 msgstr ""
-"Nelze uložit vrstvu v režimu '%s'. Formát souborů PSD nebo zásuvný modul pro "
+"Nelze uložit vrstvu v režimu „%s“. Formát souborů PSD nebo zásuvný modul pro "
 "ukládání režim nepodporuje, používám tedy normální režim."
 
 #: ../plug-ins/file-psd/psd-save.c:631
@@ -8506,27 +8496,26 @@ msgid "Error: Can't convert GIMP base imagetype to PSD mode"
 msgstr "Chyba: nelze převést základní obrazový typ GIMPu do PSD režimu"
 
 #: ../plug-ins/file-psd/psd-save.c:1605
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to save '%s'.  The PSD file format does not support images that are "
 "more than 30,000 pixels wide or tall."
 msgstr ""
-"Nemohu uložit '%s'. Formát souborů psd nepodporuje obrázky, které jsou širší "
+"Nemohu uložit „%s“. Formát souborů PSD nepodporuje obrázky, které jsou širší "
 "nebo vyšší než 30000 pixelů."
 
 #: ../plug-ins/file-psd/psd-save.c:1620
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Unable to save '%s'.  The PSD file format does not support images with "
 "layers that are more than 30,000 pixels wide or tall."
 msgstr ""
-"Nemohu uložit '%s'. Formát souborů psd nepodporuje obrázky s vrstvami, které "
+"Nemohu uložit „%s“. Formát souborů PSD nepodporuje obrázky s vrstvami, které "
 "jsou širší nebo vyšší než 30000 pixelů."
 
 #: ../plug-ins/file-psd/psd-util.c:51
-#, fuzzy
 msgid "Unexpected end of file"
-msgstr "Předčasný konec souboru."
+msgstr "Předčasný konec souboru"
 
 #: ../plug-ins/file-sgi/sgi.c:121 ../plug-ins/file-sgi/sgi.c:141
 msgid "Silicon Graphics IRIS image"
@@ -8535,12 +8524,12 @@ msgstr "Obrázek Silicon Graphics IRIS"
 #: ../plug-ins/file-sgi/sgi.c:326
 #, c-format
 msgid "Could not open '%s' for reading."
-msgstr "Nemohu otevřít '%s' pro čtení."
+msgstr "Nemohu otevřít „%s“ pro čtení."
 
 #: ../plug-ins/file-sgi/sgi.c:549
 #, c-format
 msgid "Could not open '%s' for writing."
-msgstr "Nemohu otevřít '%s' pro zápis."
+msgstr "Nemohu otevřít „%s“ pro zápis."
 
 #: ../plug-ins/file-sgi/sgi.c:629
 msgid "Save as SGI"
@@ -8567,45 +8556,40 @@ msgstr ""
 "(nepodporovaná SGI)"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:448
-#, fuzzy
 msgid "Co_nnect"
-msgstr "Shrnout"
+msgstr "Při_pojit"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:492
 msgid "Connect _anonymously"
-msgstr ""
+msgstr "Připojit _anonymně"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:501
-#, fuzzy
 msgid "Connect as u_ser:"
-msgstr "Připojování k serveru"
+msgstr "Připojit se jako u_živatel:"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:538
-#, fuzzy
 msgid "_Username:"
-msgstr "_Název souboru:"
+msgstr "_Uživatelské jméno:"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:542
-#, fuzzy
 msgid "_Domain:"
-msgstr "_Hlavní:"
+msgstr "_Doména:"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:547
 msgid "_Password:"
-msgstr ""
+msgstr "_Heslo:"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:562
 msgid "_Forget password immediately"
-msgstr ""
+msgstr "Okamžitě _zapomenout heslo"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:570
 msgid "_Remember password until you logout"
-msgstr ""
+msgstr "Za_pamatovat si heslo do odhlášení"
 
 #: ../plug-ins/file-uri/gimpmountoperation.c:578
-#, fuzzy
 msgid "_Remember forever"
-msgstr "_Opakovat donekonečna"
+msgstr "Za_pamatovat si natrvalo"
 
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:163
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:129
@@ -8623,9 +8607,9 @@ msgid "Downloaded %s of image data"
 msgstr "Staženo %s dat obrázku"
 
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:182
-#, fuzzy, c-format
+#, c-format
 msgid "Uploading %s of image data"
-msgstr "Odesílám %s dat obrázku..."
+msgstr "Odesílám %s dat obrázku"
 
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:183
 #: ../plug-ins/file-uri/uri-backend-gvfs.c:230
@@ -8643,22 +8627,22 @@ msgstr "Připojování k serveru"
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:312
 #, c-format
 msgid "Failed to read %s from '%s': %s"
-msgstr "Nemohu číst %s z '%s': %s"
+msgstr "Nemohu číst %s z „%s“: %s"
 
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:361
 #, c-format
 msgid "Failed to write %s to '%s': %s"
-msgstr "Nemohu zapsat %s do '%s': %s"
+msgstr "Nemohu zapsat %s do „%s“: %s"
 
 #: ../plug-ins/file-uri/uri-backend-gvfs.c:200
-#, fuzzy, c-format
+#, c-format
 msgid "Downloading image (%s of %s)"
-msgstr "Stahuje se %s obrazových dat"
+msgstr "Stahuje se obrázek (%s z %s)"
 
 #: ../plug-ins/file-uri/uri-backend-gvfs.c:204
 #, c-format
 msgid "Uploading image (%s of %s)"
-msgstr ""
+msgstr "Nahrávání obrázku (%s z %s)"
 
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:60
 msgid "Could not initialize libcurl"
@@ -8667,7 +8651,7 @@ msgstr "Nelze inicializovat libcurl"
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:202
 #, c-format
 msgid "Opening '%s' for reading resulted in HTTP response code: %d"
-msgstr "Otevírání '%s' ke čtení vedlo k návratovému kódu HTTP: %d"
+msgstr "Otevírání „%s“ ke čtení vedlo k návratovému kódu HTTP: %d"
 
 #: ../plug-ins/file-uri/uri-backend-wget.c:162
 #: ../plug-ins/file-uri/uri-backend-wget.c:182
@@ -8676,7 +8660,7 @@ msgstr "Otevírání '%s' ke čtení vedlo k návratovému kódu HTTP: %d"
 #: ../plug-ins/file-uri/uri-backend-wget.c:253
 #, c-format
 msgid "wget exited abnormally on URI '%s'"
-msgstr "wget skončil nenormálně na URI '%s'"
+msgstr "wget skončil nenormálně na URI „%s“"
 
 #. The third line is "Connecting to..."
 #: ../plug-ins/file-uri/uri-backend-wget.c:190
@@ -8763,17 +8747,17 @@ msgstr "Vyhlazování:"
 #: ../plug-ins/file-xjt/xjt.c:1719 ../plug-ins/file-xjt/xjt.c:3373
 #, c-format
 msgid "Could not create working folder '%s': %s"
-msgstr "Nemohu vytvořit pracovní adresář '%s': %s"
+msgstr "Nemohu vytvořit pracovní adresář „%s“: %s"
 
 #: ../plug-ins/file-xjt/xjt.c:3239
 #, c-format
 msgid "Error: Could not read XJT property file '%s'."
-msgstr "Chyba: Nemohu načíst soubor XJT vlastností '%s'."
+msgstr "Chyba: Nemohu načíst soubor XJT vlastností „%s“."
 
 #: ../plug-ins/file-xjt/xjt.c:3246
 #, c-format
 msgid "Error: XJT property file '%s' is empty."
-msgstr "Chyba: Soubor XJT vlastností '%s' je prázdný."
+msgstr "Chyba: Soubor XJT vlastností „%s“ je prázdný."
 
 #: ../plug-ins/flame/flame.c:129
 msgid "Create cosmic recursive fractal flames"
@@ -8781,7 +8765,7 @@ msgstr "Vytvořit rekurzivní fraktální plameny"
 
 #: ../plug-ins/flame/flame.c:134
 msgid "_Flame..."
-msgstr "_Plamen..."
+msgstr "_Plamen…"
 
 #: ../plug-ins/flame/flame.c:227
 msgid "Drawing flame"
@@ -8794,7 +8778,7 @@ msgstr "Plamen pracuje pouze s RGB obrazovkami."
 #: ../plug-ins/flame/flame.c:402
 #, c-format
 msgid "'%s' is not a regular file"
-msgstr "'%s' není běžný soubor"
+msgstr "„%s“ není běžný soubor"
 
 #: ../plug-ins/flame/flame.c:646
 msgid "Edit Flame"
@@ -8843,25 +8827,23 @@ msgstr "Louka"
 
 #: ../plug-ins/flame/flame.c:755
 msgid "Handkerchief"
-msgstr ""
+msgstr "Kapesník"
 
 #: ../plug-ins/flame/flame.c:756
-#, fuzzy
 msgid "Heart"
-msgstr "Šmouha"
+msgstr "Srdce"
 
 #: ../plug-ins/flame/flame.c:757
-#, fuzzy
 msgid "Disc"
-msgstr "Vytlačení"
+msgstr "Disk"
 
 #: ../plug-ins/flame/flame.c:759
 msgid "Hyperbolic"
-msgstr ""
+msgstr "Hyperbolický"
 
 #: ../plug-ins/flame/flame.c:761
 msgid "Ex"
-msgstr ""
+msgstr "Odbytý"
 
 #: ../plug-ins/flame/flame.c:762
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:844
@@ -8870,21 +8852,19 @@ msgstr "Julia"
 
 #: ../plug-ins/flame/flame.c:764
 msgid "Fisheye"
-msgstr ""
+msgstr "Rybí oko"
 
 #: ../plug-ins/flame/flame.c:765
 msgid "Popcorn"
-msgstr ""
+msgstr "Popkorn"
 
 #: ../plug-ins/flame/flame.c:766
-#, fuzzy
 msgid "Exponential"
-msgstr "_Exponent:"
+msgstr "Exponenciální"
 
 #: ../plug-ins/flame/flame.c:767
-#, fuzzy
 msgid "Power"
-msgstr "Pomaleji"
+msgstr "Síla"
 
 #: ../plug-ins/flame/flame.c:768
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:997
@@ -8894,36 +8874,32 @@ msgid "Cosine"
 msgstr "Kosinus"
 
 #: ../plug-ins/flame/flame.c:769
-#, fuzzy
 msgid "Rings"
-msgstr "Radiány"
+msgstr "Prsteny"
 
 #: ../plug-ins/flame/flame.c:770
 msgid "Fan"
-msgstr ""
+msgstr "Ventilátor"
 
 #: ../plug-ins/flame/flame.c:771
 msgid "Eyefish"
-msgstr ""
+msgstr "Okatá ryba"
 
 #: ../plug-ins/flame/flame.c:772
-#, fuzzy
 msgid "Bubble"
-msgstr "Modrá"
+msgstr "Bublina"
 
 #: ../plug-ins/flame/flame.c:773 ../plug-ins/map-object/map-object-ui.c:491
 msgid "Cylinder"
 msgstr "Válec"
 
 #: ../plug-ins/flame/flame.c:775
-#, fuzzy
 msgid "Blur"
-msgstr "_Rozostřit"
+msgstr "Rozostřit"
 
 #: ../plug-ins/flame/flame.c:776
-#, fuzzy
 msgid "Gaussian"
-msgstr "Gaussovské rozostření"
+msgstr "Gaussovské"
 
 #: ../plug-ins/flame/flame.c:789
 msgid "_Variation:"
@@ -8990,7 +8966,7 @@ msgstr ""
 "V gimprc chybí %1$s:\n"
 "Do svého souboru %4$s musíte\n"
 "přidat položku tvaru\n"
-"(%2$s \"%3$s\")."
+"(%2$s „%3$s“)."
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:638
 msgid "Realtime preview"
@@ -9046,7 +9022,8 @@ msgid "Bottom:"
 msgstr "Dole:"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:773
-msgid "The higher the number of iterations, the more details will be calculated"
+msgid ""
+"The higher the number of iterations, the more details will be calculated"
 msgstr "Čím více iterací, tím více detailů v obraze."
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:781
@@ -9068,7 +9045,7 @@ msgstr "Načíst fraktál ze souboru"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:817
 msgid "Reset parameters to default values"
-msgstr "Nastaví parametry na implicitní hodnoty"
+msgstr "Nastaví parametry na výchozí hodnoty"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:826
 msgid "Save active fractal to file"
@@ -9125,7 +9102,7 @@ msgstr "Použít spojité vyhlazení"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:937
 msgid "Use log log smoothing to eliminate \"banding\" in the result"
-msgstr "Užití spojitého vyhlazení zabrání \"pruhování\" výsledku"
+msgstr "Užití spojitého vyhlazení zabrání „pruhování“ výsledku"
 
 #. Color Density frame
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:941
@@ -9189,7 +9166,8 @@ msgstr "Inverze"
 msgid ""
 "If you enable this option higher color values will be swapped with lower "
 "ones and vice versa"
-msgstr "Povolením této volby budou vyšší barevné hodnoty prohozeny za nižší a naopak"
+msgstr ""
+"Povolením této volby budou vyšší barevné hodnoty prohozeny za nižší a naopak"
 
 #. Colormode toggle box
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1114
@@ -9227,7 +9205,7 @@ msgstr "_Fraktály"
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1560
 #, c-format
 msgid "Could not write '%s': %s"
-msgstr "Nemohu zapsat '%s': %s"
+msgstr "Nemohu zapsat „%s“: %s"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1635
 msgid "Load Fractal Parameters"
@@ -9240,12 +9218,12 @@ msgstr "Zapsat parametry fraktálu"
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1871
 #, c-format
 msgid "'%s' is not a FractalExplorer file"
-msgstr "'%s' není soubor badatele fraktálů"
+msgstr "„%s“ není soubor badatele fraktálů"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1877
 #, c-format
 msgid "'%s' is corrupt. Line %d Option section incorrect"
-msgstr "'%s' je poškozen. Řádek %d Nesprávná sekce voleb"
+msgstr "„%s“ je poškozen. Řádek %d Nesprávná sekce voleb"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:239
 msgid "Render fractal art"
@@ -9253,7 +9231,7 @@ msgstr "Vykreslit fraktální obrazec"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:244
 msgid "_Fractal Explorer..."
-msgstr "Badatel _fraktálů..."
+msgstr "Badatel _fraktálů…"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:374
 msgid "Rendering fractal"
@@ -9263,7 +9241,7 @@ msgstr "Počítá se fraktál"
 #: ../plug-ins/gradient-flare/gradient-flare.c:3200
 #, c-format
 msgid "Are you sure you want to delete \"%s\" from the list and from disk?"
-msgstr "Opravdu chcete odstranit \"%s\" ze seznamu a z disku?"
+msgstr "Opravdu chcete odstranit „%s“ ze seznamu a z disku?"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:760
 msgid "Delete Fractal"
@@ -9272,7 +9250,7 @@ msgstr "Odstranit fraktál"
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:950
 #, c-format
 msgid "File '%s' is not a FractalExplorer file"
-msgstr "Soubor '%s' není souborem pro badatele fraktálů"
+msgstr "Soubor „%s“ není souborem pro badatele fraktálů"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:959
 #, c-format
@@ -9280,7 +9258,7 @@ msgid ""
 "File '%s' is corrupt.\n"
 "Line %d Option section incorrect"
 msgstr ""
-"Soubor '%s' je poškozený.\n"
+"Soubor „%s“ je poškozený.\n"
 "Řádek %d Nesprávná sekce voleb"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:1003
@@ -9373,10 +9351,9 @@ msgstr "Zobrazit obrázek"
 
 #. "snap to grid" checkbutton at bottom of style frame
 #: ../plug-ins/gfig/gfig-dialog.c:493
-#, fuzzy
 msgctxt "checkbutton"
 msgid "Snap to grid"
-msgstr "Chytat k mřížce"
+msgstr "Přichytit k mřížce"
 
 #. "show grid" checkbutton at bottom of style frame
 #: ../plug-ins/gfig/gfig-dialog.c:502
@@ -9529,7 +9506,8 @@ msgstr "Kopírovat"
 msgid ""
 "Layer background type. Copy causes the previous layer to be copied before "
 "the draw is performed."
-msgstr "Typ pozadí vrstvy. Kopie způsobí zkopírování předchozí vrstvy před kreslením."
+msgstr ""
+"Typ pozadí vrstvy. Kopie způsobí zkopírování předchozí vrstvy před kreslením."
 
 #: ../plug-ins/gfig/gfig-dialog.c:1302
 msgid "Background:"
@@ -9652,10 +9630,11 @@ msgstr "Vytvořit geometrické tvary"
 
 #: ../plug-ins/gfig/gfig.c:135
 msgid "_Gfig..."
-msgstr "_Gfig..."
+msgstr "_Gfig…"
 
 #: ../plug-ins/gfig/gfig.c:731
-msgid "Error trying to save figure as a parasite: can't attach parasite to drawable."
+msgid ""
+"Error trying to save figure as a parasite: can't attach parasite to drawable."
 msgstr ""
 "Chyba při pokusu uložit obrázek jako parazita: nemohu připojit parazita k "
 "drawable."
@@ -9663,7 +9642,7 @@ msgstr ""
 #: ../plug-ins/gfig/gfig.c:758
 #, c-format
 msgid "Error trying to open temporary file '%s' for parasite loading: %s"
-msgstr "Chyba při pokusu otevřít dočasný soubor '%s' pro načtení parazita: %s"
+msgstr "Chyba při pokusu otevřít dočasný soubor „%s“ pro načtení parazita: %s"
 
 #: ../plug-ins/gimpressionist/brush.c:247
 msgid "Can only save drawables!"
@@ -9810,7 +9789,8 @@ msgid "Shadow depth:"
 msgstr "Hloubka stínu:"
 
 #: ../plug-ins/gimpressionist/general.c:262
-msgid "The depth of the drop shadow, i.e. how far apart from the object it should be"
+msgid ""
+"The depth of the drop shadow, i.e. how far apart from the object it should be"
 msgstr "Hloubka vrženého stínu, tj. jak daleko od objektu budou"
 
 #: ../plug-ins/gimpressionist/general.c:267
@@ -9835,7 +9815,7 @@ msgstr "Provádí různé umělecké operace"
 
 #: ../plug-ins/gimpressionist/gimp.c:95
 msgid "_GIMPressionist..."
-msgstr "_GIMPresionista..."
+msgstr "_GIMPresionista…"
 
 #: ../plug-ins/gimpressionist/gimp.c:371
 msgid "Painting"
@@ -9911,7 +9891,7 @@ msgstr "Uvolněný"
 #: ../plug-ins/gimpressionist/orientation.c:177
 #: ../plug-ins/gimpressionist/size.c:180
 msgid "The strokes follow a \"flowing\" pattern"
-msgstr "Tahy sledují \"uvolněný\" vzorek"
+msgstr "Tahy sledují „uvolněný“ vzorek"
 
 #: ../plug-ins/gimpressionist/orientation.c:181
 msgid "The hue of the region determines the direction of the stroke"
@@ -10113,7 +10093,7 @@ msgstr "Poměrná hustota stop štětce"
 #: ../plug-ins/gimpressionist/ppmtool.c:650
 #, c-format
 msgid "Failed to save PPM file '%s': %s"
-msgstr "Nemohu uložit soubor PPM '%s': %s"
+msgstr "Nemohu uložit soubor PPM „%s“: %s"
 
 #: ../plug-ins/gimpressionist/presets.c:640
 msgid "Save Current"
@@ -10121,7 +10101,7 @@ msgstr "Uložit aktuální"
 
 #: ../plug-ins/gimpressionist/presets.c:894
 msgid "Gimpressionist Defaults"
-msgstr "Implicitní nastavení GIMPresionisty"
+msgstr "Výchozí nastavení GIMPresionisty"
 
 #: ../plug-ins/gimpressionist/presets.c:1015
 msgid "_Presets"
@@ -10129,7 +10109,7 @@ msgstr "_Předvolby"
 
 #: ../plug-ins/gimpressionist/presets.c:1030
 msgid "Save Current..."
-msgstr "Uložit aktuální..."
+msgstr "Uložit aktuální…"
 
 #: ../plug-ins/gimpressionist/presets.c:1038
 msgid "Save the current settings to the specified file"
@@ -10195,11 +10175,13 @@ msgid "Size:"
 msgstr "Velikost:"
 
 #: ../plug-ins/gimpressionist/size.c:160
-msgid "Let the value (brightness) of the region determine the size of the stroke"
+msgid ""
+"Let the value (brightness) of the region determine the size of the stroke"
 msgstr "Nechť hodnota (jas) oblasti určí velikost tahu"
 
 #: ../plug-ins/gimpressionist/size.c:164
-msgid "The distance from the center of the image determines the size of the stroke"
+msgid ""
+"The distance from the center of the image determines the size of the stroke"
 msgstr "Vzdálenost od středu obrázku určí velikost tahu"
 
 #: ../plug-ins/gimpressionist/size.c:168
@@ -10294,7 +10276,7 @@ msgstr "Vytvořit odlesku objektivu pomocí přechodů"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:812
 msgid "_Gradient Flare..."
-msgstr "_Záře z přechodu..."
+msgstr "_Záře z přechodu…"
 
 #.
 #. *    Dialog Shell
@@ -10307,12 +10289,12 @@ msgstr "Záře z přechodu"
 #: ../plug-ins/gradient-flare/gradient-flare.c:1264
 #, c-format
 msgid "Failed to open GFlare file '%s': %s"
-msgstr "Nemohu otevřít soubor P-záře '%s': %s"
+msgstr "Nemohu otevřít soubor P-záře „%s“: %s"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:1272
 #, c-format
 msgid "'%s' is not a valid GFlare file."
-msgstr "'%s' není platný soubor P-záře."
+msgstr "„%s“ není platný soubor P-záře."
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:1326
 #, c-format
@@ -10326,15 +10308,15 @@ msgid ""
 "(gflare-path \"%s\")\n"
 "and make a folder '%s', then you can save your own GFlares into that folder."
 msgstr ""
-"P-záře `%s' není uložena. Pokud přidáte novou položku do '%s', např.:\n"
-"(gflare-path \"%s\")\n"
-"a vytvoříte adresář '%s', můžete uložit svou vlastní P-záři do tohoto "
+"P-záře „%s“ není uložena. Pokud přidáte novou položku do „%s“, např.:\n"
+"(gflare-path „%s“)\n"
+"a vytvoříte adresář „%s“, můžete uložit svou vlastní P-záři do tohoto "
 "adresáře."
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:1484
 #, c-format
 msgid "Failed to write GFlare file '%s': %s"
-msgstr "Nemohu zapsat soubor P-záře '%s': %s"
+msgstr "Nemohu zapsat soubor P-záře „%s“: %s"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:2414
 msgid "A_uto update preview"
@@ -10342,11 +10324,11 @@ msgstr "A_utomaticky aktualizovat náhled"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:2465
 msgid "`Default' is created."
-msgstr "Byl vytvořen ,Implicitní'."
+msgstr "Byl vytvořen „výchozí“."
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:2466
 msgid "Default"
-msgstr "Implicitní"
+msgstr "Výchozí"
 
 #.
 #. *  Scales
@@ -10387,7 +10369,7 @@ msgstr "_Maximální hloubka:"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:2857
 msgid "_Threshold"
-msgstr "_Práh:"
+msgstr "_Práh"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:2995
 msgid "S_elector"
@@ -10404,7 +10386,7 @@ msgstr "Zadejte název pro nové P-záře"
 #: ../plug-ins/gradient-flare/gradient-flare.c:3082
 #, c-format
 msgid "The name '%s' is used already!"
-msgstr "Jméno '%s' je již použito!"
+msgstr "Jméno „%s“ je již použito!"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3138
 msgid "Copy Gradient Flare"
@@ -10417,7 +10399,7 @@ msgstr "Zadejte název zkopírované P-záře"
 #: ../plug-ins/gradient-flare/gradient-flare.c:3163
 #, c-format
 msgid "The name `%s' is used already!"
-msgstr "Jméno ,%s' je již použito!"
+msgstr "Jméno „%s“ je již použito!"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3194
 msgid "Cannot delete!! There must be at least one GFlare."
@@ -10560,97 +10542,88 @@ msgid "_Second Flares"
 msgstr "_Druhá záře"
 
 #: ../plug-ins/help-browser/dialog.c:186
-#: ../plug-ins/help-browser/dialog.c:1134
+#: ../plug-ins/help-browser/dialog.c:1121
 msgid "GIMP Help Browser"
 msgstr "Prohlížeč nápovědy GIMPu"
 
-#: ../plug-ins/help-browser/dialog.c:566
+#: ../plug-ins/help-browser/dialog.c:564
 msgid "Go back one page"
 msgstr "Jít o jednu stranu zpět"
 
-#: ../plug-ins/help-browser/dialog.c:571
+#: ../plug-ins/help-browser/dialog.c:569
 msgid "Go forward one page"
 msgstr "Jít o jednu stranu vpřed"
 
-#: ../plug-ins/help-browser/dialog.c:576
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "_Reload"
-msgstr "Če_rvená:"
+msgstr "_Znovu načíst"
 
-#: ../plug-ins/help-browser/dialog.c:576
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "Reload current page"
-msgstr ""
+msgstr "Znovu načíst aktuální stránku"
 
-#: ../plug-ins/help-browser/dialog.c:581
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "_Stop"
-msgstr "_Krok"
+msgstr "_Zastavit"
 
-#: ../plug-ins/help-browser/dialog.c:581
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "Stop loading this page"
-msgstr ""
+msgstr "Zastaví nahrávání aktuální stránky"
 
-#: ../plug-ins/help-browser/dialog.c:586
+#: ../plug-ins/help-browser/dialog.c:584
 msgid "Go to the index page"
 msgstr "Jít na stranu rejstříku"
 
-#: ../plug-ins/help-browser/dialog.c:591
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:589
 msgid "C_opy location"
-msgstr "Místo zkroucení"
+msgstr "K_opírovat umístění"
 
-#: ../plug-ins/help-browser/dialog.c:592
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:590
 msgid "Copy the location of this page to the clipboard"
-msgstr "Kopírovat aktivní křivku na druhou hranici"
+msgstr "Kopírovat umístění této stránky do schránky"
 
-#: ../plug-ins/help-browser/dialog.c:612
+#: ../plug-ins/help-browser/dialog.c:610
 msgid "Find text in current page"
-msgstr ""
+msgstr "Najít text na aktuální stránce"
 
-#: ../plug-ins/help-browser/dialog.c:617
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:615
 msgid "Find _Again"
-msgstr "Hledá se XY přechod"
+msgstr "_Znovu najít"
 
-#: ../plug-ins/help-browser/dialog.c:636
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:634
 msgid "S_how Index"
-msgstr "Zobrazovat mřížku"
+msgstr "_Zobrazit rejstřík"
 
-#: ../plug-ins/help-browser/dialog.c:637
+#: ../plug-ins/help-browser/dialog.c:635
 msgid "Toggle the visibility of the sidebar"
-msgstr ""
+msgstr "Zapnout/vypnout postranní lištu"
 
-#: ../plug-ins/help-browser/dialog.c:658
+#: ../plug-ins/help-browser/dialog.c:656
 msgid "Visit the GIMP documentation website"
 msgstr "Navštívit WWW server dokumentace GIMPu"
 
-#: ../plug-ins/help-browser/dialog.c:1175
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:1162
 msgid "Find:"
-msgstr "Vítr"
+msgstr "Najít:"
 
-#: ../plug-ins/help-browser/dialog.c:1192
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:1179
 msgctxt "search"
 msgid "_Previous"
-msgstr "_Náhled"
+msgstr "_Předchozí"
 
-#: ../plug-ins/help-browser/dialog.c:1204
-#, fuzzy
+#: ../plug-ins/help-browser/dialog.c:1191
 msgctxt "search"
 msgid "_Next"
-msgstr "Šestiú_helníky"
+msgstr "_Následující"
 
 #: ../plug-ins/help/gimphelpdomain.c:181
 #, c-format
 msgid "The help pages for '%s' are not available."
-msgstr ""
+msgstr "Stránky nápovědy pro „%s“ jsou nedostupné."
 
 #: ../plug-ins/help/gimphelpdomain.c:187
 msgid "The GIMP user manual is not available."
-msgstr ""
+msgstr "Uživatelská přiručka GIMPu je nedostupná."
 
 #: ../plug-ins/help/gimphelpdomain.c:188
 msgid ""
@@ -10662,17 +10635,17 @@ msgstr ""
 
 #: ../plug-ins/help/gimphelpdomain.c:197
 msgid "Perhaps you are missing GIO backends and need to install GVFS?"
-msgstr ""
+msgstr "Možná vám chybí GIO backend a potřebujete nainstalovat GVFS?"
 
 #: ../plug-ins/help/gimphelpdomain.c:216
 #, c-format
 msgid "Help ID '%s' unknown"
-msgstr "ID nápovědy '%s' není známo"
+msgstr "ID nápovědy „%s“ není známo"
 
 #: ../plug-ins/help/gimphelplocale.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "Loading index from '%s'"
-msgstr "Chyba při čtení hlavičky souboru BMP z '%s'"
+msgstr "Nahrávání seznamu z „%s“"
 
 #: ../plug-ins/help/gimphelplocale.c:267
 #, c-format
@@ -10680,7 +10653,7 @@ msgid ""
 "Parse error in '%s':\n"
 "%s"
 msgstr ""
-"Chyba při zpracovávání '%s':\n"
+"Chyba při zpracovávání „%s“:\n"
 "%s"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:334
@@ -10689,7 +10662,7 @@ msgstr "Vytvořit IFS fraktál"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:346
 msgid "_IFS Fractal..."
-msgstr "_IFS fraktál..."
+msgstr "_IFS fraktál…"
 
 #. X
 #: ../plug-ins/ifs-compose/ifs-compose.c:526
@@ -10849,7 +10822,7 @@ msgstr "Otevření selhalo"
 #: ../plug-ins/ifs-compose/ifs-compose.c:2468
 #, c-format
 msgid "File '%s' doesn't seem to be an IFS Fractal file."
-msgstr "Soubor '%s' zřejmě není soubor IFS fraktálu."
+msgstr "Soubor „%s“ zřejmě není soubor IFS fraktálu."
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2508
 msgid "Save as IFS Fractal file"
@@ -10983,7 +10956,7 @@ msgid ""
 msgstr ""
 "Vodítka jsou předdefinované obdélníky pokrývající obrázek. Definujete je "
 "jejich šířkou, výškou a rozestupem od ostatních. To vám umožňuje rychle "
-"vytvořit nejběžnější typy obrázkových map - soubor \"miniatur\", vhodný pro "
+"vytvořit nejběžnější typy obrázkových map - soubor „miniatur“, vhodný pro "
 "navigační proužky."
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:170
@@ -11235,7 +11208,7 @@ msgstr "Vytvořit klikatelnou obrazovou mapu"
 
 #: ../plug-ins/imagemap/imap_main.c:127
 msgid "_Image Map..."
-msgstr "_Obrázková mapa..."
+msgstr "_Obrázková mapa…"
 
 #: ../plug-ins/imagemap/imap_main.c:517
 #: ../plug-ins/imagemap/imap_settings.c:171
@@ -11253,7 +11226,7 @@ msgstr "Opravdu chcete přijít o tyto změny?"
 #: ../plug-ins/imagemap/imap_main.c:873
 #, c-format
 msgid "File \"%s\" saved."
-msgstr "Soubor \"%s\" zapsán."
+msgstr "Soubor „%s“ zapsán."
 
 #: ../plug-ins/imagemap/imap_main.c:877
 msgid "Couldn't save file:"
@@ -11292,7 +11265,7 @@ msgstr "_Soubor"
 
 #: ../plug-ins/imagemap/imap_menu.c:147
 msgid "_Open..."
-msgstr "_Otevřít..."
+msgstr "_Otevřít…"
 
 #: ../plug-ins/imagemap/imap_menu.c:147
 msgid "Open"
@@ -11300,7 +11273,7 @@ msgstr "Otevřít"
 
 #: ../plug-ins/imagemap/imap_menu.c:149
 msgid "_Save..."
-msgstr "_Uložit..."
+msgstr "_Uložit…"
 
 #: ../plug-ins/imagemap/imap_menu.c:149
 msgid "Save"
@@ -11308,7 +11281,7 @@ msgstr "Uložit"
 
 #: ../plug-ins/imagemap/imap_menu.c:151
 msgid "Save _As..."
-msgstr "Uložit j_ako..."
+msgstr "Uložit j_ako…"
 
 #: ../plug-ins/imagemap/imap_menu.c:156
 msgid "_Edit"
@@ -11328,7 +11301,7 @@ msgstr "_Odvybrat vše"
 
 #: ../plug-ins/imagemap/imap_menu.c:166
 msgid "Edit Area _Info..."
-msgstr "Upravit _informace o oblasti..."
+msgstr "Upravit _informace o oblasti…"
 
 #: ../plug-ins/imagemap/imap_menu.c:167
 msgid "Edit selected area info"
@@ -11356,7 +11329,7 @@ msgstr "_Pohled"
 
 #: ../plug-ins/imagemap/imap_menu.c:182
 msgid "Source..."
-msgstr "Zdroj..."
+msgstr "Zdroj…"
 
 #: ../plug-ins/imagemap/imap_menu.c:183
 msgid "Zoom in"
@@ -11376,7 +11349,7 @@ msgstr "_Mapování"
 
 #: ../plug-ins/imagemap/imap_menu.c:188
 msgid "Edit Map Info..."
-msgstr "Úpravy informace o mapování..."
+msgstr "Úpravy informace o mapování…"
 
 #: ../plug-ins/imagemap/imap_menu.c:189
 msgid "Edit Map Info"
@@ -11388,15 +11361,15 @@ msgstr "_Nástroje"
 
 #: ../plug-ins/imagemap/imap_menu.c:192
 msgid "Grid Settings..."
-msgstr "Nastavení mřížky..."
+msgstr "Nastavení mřížky…"
 
 #: ../plug-ins/imagemap/imap_menu.c:194
 msgid "Use GIMP Guides..."
-msgstr "Použít vodítka GIMPu..."
+msgstr "Použít vodítka GIMPu…"
 
 #: ../plug-ins/imagemap/imap_menu.c:196
 msgid "Create Guides..."
-msgstr "Vytvořit vodítka..."
+msgstr "Vytvořit vodítka…"
 
 #: ../plug-ins/imagemap/imap_menu.c:199
 msgid "_Help"
@@ -11468,7 +11441,7 @@ msgstr "Obecné"
 
 #: ../plug-ins/imagemap/imap_preferences.c:354
 msgid "Default Map Type"
-msgstr "Implicitní druh mapy"
+msgstr "Výchozí druh mapy"
 
 #: ../plug-ins/imagemap/imap_preferences.c:373
 msgid "_Prompt for area info"
@@ -11476,7 +11449,7 @@ msgstr "_Výzva k informaci o oblasti"
 
 #: ../plug-ins/imagemap/imap_preferences.c:375
 msgid "_Require default URL"
-msgstr "Vyžaduje _implicitní URL"
+msgstr "Vyžaduje _výchozí URL"
 
 #: ../plug-ins/imagemap/imap_preferences.c:377
 msgid "Show area _handles"
@@ -11584,7 +11557,7 @@ msgstr "_Autor:"
 
 #: ../plug-ins/imagemap/imap_settings.c:106
 msgid "Default _URL:"
-msgstr "Implicitní _URL:"
+msgstr "Výchozí _URL:"
 
 #: ../plug-ins/imagemap/imap_settings.c:108
 msgid "_Description:"
@@ -11609,7 +11582,7 @@ msgstr "Aplikovat různé světelné efekty"
 
 #: ../plug-ins/lighting/lighting-main.c:197
 msgid "_Lighting Effects..."
-msgstr "_Světelné efekty..."
+msgstr "_Světelné efekty…"
 
 #. General options
 #: ../plug-ins/lighting/lighting-ui.c:295
@@ -11623,7 +11596,8 @@ msgstr "P_růhledné pozadí"
 
 #: ../plug-ins/lighting/lighting-ui.c:313
 msgid "Make destination image transparent where bump height is zero"
-msgstr "Vytvoření průhledného cílového obrázku v místech, kde je vyvýšení nulové"
+msgstr ""
+"Vytvoření průhledného cílového obrázku v místech, kde je vyvýšení nulové"
 
 #: ../plug-ins/lighting/lighting-ui.c:316
 msgid "Cre_ate new image"
@@ -11792,7 +11766,7 @@ msgstr "Intenzita původní barvy, je-li ozářena zdrojem světla"
 
 #: ../plug-ins/lighting/lighting-ui.c:705
 msgid "_Shiny:"
-msgstr "_Lesknoucí se"
+msgstr "_Lesknoucí se:"
 
 #: ../plug-ins/lighting/lighting-ui.c:724
 #: ../plug-ins/map-object/map-object-ui.c:925
@@ -11922,7 +11896,7 @@ msgstr "Mapovat obrázek na objekt (plochu, kouli, kvádr nebo válec)"
 
 #: ../plug-ins/map-object/map-object-main.c:198
 msgid "Map _Object..."
-msgstr "Mapovat _objekt..."
+msgstr "Mapovat _objekt…"
 
 #: ../plug-ins/map-object/map-object-ui.c:248
 #: ../plug-ins/map-object/map-object-ui.c:1305
@@ -12195,7 +12169,7 @@ msgstr "Nakreslit bludiště"
 
 #: ../plug-ins/maze/maze.c:130
 msgid "_Maze..."
-msgstr "_Bludiště..."
+msgstr "_Bludiště…"
 
 #: ../plug-ins/maze/maze.c:426
 msgid "Drawing maze"
@@ -12229,7 +12203,7 @@ msgstr "Neznámý element <%s>"
 #: ../plug-ins/metadata/xmp-parse.c:325
 #, c-format
 msgid "Unknown attribute \"%s\"=\"%s\" in element <%s>"
-msgstr "Neznámý atribut \"%s\"=\"%s\" v elementu <%s>"
+msgstr "Neznámý atribut „%s“=„%s“ v elementu <%s>"
 
 #: ../plug-ins/metadata/xmp-parse.c:655
 #, c-format
@@ -12241,25 +12215,25 @@ msgstr "Vyžadovaný atribut rdf:about v <%s> chybí"
 msgid "Nested elements (<%s>) are not allowed in this context"
 msgstr "Vnořené elementy (<%s>) v tomto kontextu nejsou povoleny"
 
-#: ../plug-ins/metadata/xmp-parse.c:1005
+#: ../plug-ins/metadata/xmp-parse.c:1010
 #, c-format
 msgid "End of element <%s> not expected in this context"
 msgstr "Konec elementu <%s> neočekáván v tomto kontextu"
 
-#: ../plug-ins/metadata/xmp-parse.c:1107
+#: ../plug-ins/metadata/xmp-parse.c:1112
 #, c-format
 msgid "The current element (<%s>) cannot contain text"
 msgstr "Aktuální element (<%s>) nemůže obsahovat text"
 
-#: ../plug-ins/metadata/xmp-parse.c:1132
+#: ../plug-ins/metadata/xmp-parse.c:1137
 msgid "XMP packets must start with "
-msgstr "Pakety XMP musí začínat "
+msgstr "Pakety XMP musí začínat "
 
-#: ../plug-ins/metadata/xmp-parse.c:1146
+#: ../plug-ins/metadata/xmp-parse.c:1151
 msgid "XMP packets must end with "
-msgstr "Pakety XMP musí končit "
+msgstr "Pakety XMP musí končit "
 
-#: ../plug-ins/metadata/xmp-parse.c:1159
+#: ../plug-ins/metadata/xmp-parse.c:1164
 msgid "XMP cannot contain XML comments or processing instructions"
 msgstr "XMP nemůže obsahovat poznámky XML nebo instrukce pro zpracovávání"
 
@@ -12269,7 +12243,7 @@ msgstr "Zkroutit jeden z rohů obrázku"
 
 #: ../plug-ins/pagecurl/pagecurl.c:221
 msgid "_Pagecurl..."
-msgstr "_Zkroucení stránky..."
+msgstr "_Zkroucení stránky…"
 
 #: ../plug-ins/pagecurl/pagecurl.c:440
 msgid "Pagecurl Effect"
@@ -12369,17 +12343,15 @@ msgstr "Vytisknout obrázek"
 
 #: ../plug-ins/print/print.c:107
 msgid "_Print..."
-msgstr "_Tisk..."
+msgstr "_Tisk…"
 
 #: ../plug-ins/print/print.c:118
-#, fuzzy
 msgid "Adjust page size and orientation for printing"
-msgstr "_Upravit velikost stránky a orientaci"
+msgstr "Upravit velikost a orientaci stránky k tisku"
 
 #: ../plug-ins/print/print.c:124
-#, fuzzy
 msgid "Page Set_up"
-msgstr "Zkroucení stránky"
+msgstr "_Vzhled stránky"
 
 #: ../plug-ins/print/print.c:265
 msgid "Image Settings"
@@ -12412,7 +12384,7 @@ msgstr "Získat obrázek ze TWAIN zdroje dat"
 
 #: ../plug-ins/twain/twain.c:352
 msgid "_Scanner/Camera..."
-msgstr "_Skener/Fotoaparát..."
+msgstr "_Skener/Fotoaparát…"
 
 #. Initialize our progress dialog
 #: ../plug-ins/twain/twain.c:486
@@ -12449,115 +12421,8 @@ msgstr "Zachytit obraz okna či pracovní plochy"
 
 #: ../plug-ins/win-snap/winsnap.c:994
 msgid "_Screen Shot..."
-msgstr "_Snímek obrazovky..."
+msgstr "_Snímek obrazovky…"
 
 #: ../plug-ins/win-snap/winsnap.c:1142
 msgid "No data captured"
 msgstr "Žádná data nebyla získána"
-
-#~ msgid "_Method:"
-#~ msgstr "_Metoda:"
-
-#~ msgid "Email the image"
-#~ msgstr "Odeslat obrázek poštou"
-
-#~ msgid "_Mail Image..."
-#~ msgstr "_Poslat obrázek..."
-
-#~ msgid "Encapsulation:"
-#~ msgstr "Zapouzdření dat:"
-
-#~ msgid "_MIME"
-#~ msgstr "_MIME"
-
-#~ msgid "_Uuencode"
-#~ msgstr "_UU-kódování"
-
-#~ msgid "_Recipient:"
-#~ msgstr "Pří_jemce:"
-
-#~ msgid "_Sender:"
-#~ msgstr "_Odesílatel:"
-
-#~ msgid "Comm_ent:"
-#~ msgstr "_Komentář:"
-
-#~ msgid "Unable to add additional point.\n"
-#~ msgstr "Nepodařilo se přidat další bod.\n"
-
-#~ msgid "Invalid UTF-8 string in PSD file"
-#~ msgstr "Neplatný řetězec UTF-8 v souboru PSD"
-
-#~ msgid "Cannot handle bitmap PSD files"
-#~ msgstr "Nelze zpracovat bitmapové PSD soubory"
-
-#~ msgid "Cannot handle PSD files in CMYK color"
-#~ msgstr "Nelze zpracovat PSD soubory v barevném režimu CMYK"
-
-#~ msgid "Cannot handle PSD files in Multichannel color"
-#~ msgstr "Nelze zpracovat PSD soubory ve vícekanálovém režimu"
-
-#~ msgid "Cannot handle PSD files in Duotone color"
-#~ msgstr "Nelze zpracovat PSD soubory v duplex režimu"
-
-#~ msgid "Cannot handle PSD files in Lab color"
-#~ msgstr "Nezle zpracovat PSD soubory v barvách Lab"
-
-#~ msgid "Cannot handle the color mode %d of the PSD file"
-#~ msgstr "Nelze zpracovat barevný režim %d tohoto PSD souboru"
-
-#~ msgid "Cannot handle PSD file with more than %d channels"
-#~ msgstr "Nelze zpracovat PSD soubor s více než %d kanály"
-
-#~ msgid "Cannot handle PSD files in CMYK color with more than 5 channels"
-#~ msgstr ""
-#~ "Nelze zpracovat PSD soubory v barevném prostoru CMYK s více než 5 kanály"
-
-#~ msgid "Cannot handle image mode %d (%s)"
-#~ msgstr "Nelze zpracovat obrazový režim %d (%s)"
-
-#~ msgid "Cannot handle %d bits per channel PSD files"
-#~ msgstr "Nelze zpracovat PSD soubory s %d bity na kanál"
-
-#~ msgid "This is not an Adobe Photoshop PSD file"
-#~ msgstr "Toto není soubor Adobe Photoshop PSD"
-
-#~ msgid "The PSD file has bad version number '%d', not 1"
-#~ msgstr "PSD soubor má špatné číslo verze '%d', nikoliv 1"
-
-#~ msgid "Or_igin at bottom left"
-#~ msgstr "Počátek dol_e vlevo"
-
-#~ msgid "checkbutton|Snap to grid"
-#~ msgstr "Chytat k mřížce"
-
-#~ msgid "The GIMP help files are not found."
-#~ msgstr "Soubory nápovědy GIMPu nebyly nalezeny."
-
-#~ msgid "There is a problem with the GIMP help files."
-#~ msgstr "Se soubory nápovědy GIMPu je problém."
-
-#~ msgid "Please check your installation."
-#~ msgstr "Zkontrolujte prosím svou instalaci."
-
-#~ msgid "Drag and drop this icon to a web browser"
-#~ msgstr "Přetáhněte tuto ikonu do prohlížeče WWW"
-
-#~ msgid "Document not found"
-#~ msgstr "Dokument nenalezen"
-
-#~ msgid "The requested URL could not be loaded:"
-#~ msgstr "Požadované URL nelze načíst:"
-
-#~ msgid "_Smoothing:"
-#~ msgstr "_Vyhlazování:"
-
-#~ msgid "Printable area:"
-#~ msgstr "Tisknutelná oblast:"
-
-#~ msgid "Downloading %s of image data..."
-#~ msgstr "Stahuji %s dat obrázku..."
-
-#~ msgid "Could not open output file for writing"
-#~ msgstr "Nelze otevřít výstupní soubor pro zápis."
-
diff --git a/po-plug-ins/en_GB.po b/po-plug-ins/en_GB.po
index f3f112c084..94889ee1d2 100644
--- a/po-plug-ins/en_GB.po
+++ b/po-plug-ins/en_GB.po
@@ -2,2067 +2,501 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady , 2000.
 # Gareth Owen , David Lodge , 2004.
-# 
-# 
+# Bruce Cowan , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp CVS\n"
+"Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-09 19:20+0000\n"
-"PO-Revision-Date: 2008-03-09 19:16+0000\n"
-"Last-Translator: David Lodge \n"
-"Language-Team:  \n"
+"POT-Creation-Date: 2009-10-17 22:57+0100\n"
+"PO-Revision-Date: 2009-10-17 23:03+0100\n"
+"Last-Translator: Bruce Cowan \n"
+"Language-Team: British English \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plug-ins/FractalExplorer/Dialogs.c:547
-#: ../plug-ins/gfig/gfig-dialog.c:274 ../plug-ins/gflare/gflare.c:883
-#: ../plug-ins/gimpressionist/utils.c:143
-#, c-format
-msgid ""
-"No %s in gimprc:\n"
-"You need to add an entry like\n"
-"(%s \"%s\")\n"
-"to your %s file."
-msgstr ""
-"No %s in gimprc:\n"
-"You need to add an entry like\n"
-"(%s \"%s\")\n"
-"to your %s file."
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:638
-msgid "Realtime preview"
-msgstr "Realtime preview"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:646
-msgid "If enabled the preview will be redrawn automatically"
-msgstr "If enabled the preview will be redrawn automatically"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:649
-msgid "R_edraw preview"
-msgstr "R_edraw preview"
-
-#. Zoom Options
-#: ../plug-ins/FractalExplorer/Dialogs.c:657
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:693
-msgid "Undo last zoom change"
-msgstr "Undo last zoom change"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:703
-msgid "Redo last zoom change"
-msgstr "Redo last zoom change"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:718
-msgid "_Parameters"
-msgstr "_Parameters"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:721
-msgid "Fractal Parameters"
-msgstr "Fractal Parameters"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:734
-#: ../plug-ins/MapObject/mapobject_ui.c:1099
-msgid "Left:"
-msgstr "Left:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:743
-#: ../plug-ins/MapObject/mapobject_ui.c:1099
-msgid "Right:"
-msgstr "Right:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:752
-#: ../plug-ins/MapObject/mapobject_ui.c:1098
-msgid "Top:"
-msgstr "Top:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:761
-#: ../plug-ins/MapObject/mapobject_ui.c:1098
-msgid "Bottom:"
-msgstr "Bottom:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:770 ../plug-ins/common/warp.c:433
-#: ../plug-ins/ifscompose/ifscompose.c:1210
-msgid "Iterations:"
-msgstr "Iterations:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:773
-msgid ""
-"The higher the number of iterations, the more details will be calculated"
-msgstr ""
-"The higher the number of iterations, the more details will be calculated"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:781
-msgid "CX:"
-msgstr "CX:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:784
-#: ../plug-ins/FractalExplorer/Dialogs.c:794
-msgid "Changes aspect of fractal"
-msgstr "Changes aspect of fractal"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:791
-msgid "CY:"
-msgstr "CY:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:809
-msgid "Load a fractal from file"
-msgstr "Load a fractal from file"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:817
-msgid "Reset parameters to default values"
-msgstr "Reset parameters to default values"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:826
-msgid "Save active fractal to file"
-msgstr "Save active fractal to file"
-
-#. Fractal type toggle box
-#: ../plug-ins/FractalExplorer/Dialogs.c:829
-msgid "Fractal Type"
-msgstr "Fractal Type"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:842
-msgid "Mandelbrot"
-msgstr "Mandelbrot"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:844
-msgid "Julia"
-msgstr "Julia"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:846
-msgid "Barnsley 1"
-msgstr "Barnsley 1"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:848
-msgid "Barnsley 2"
-msgstr "Barnsley 2"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:850
-msgid "Barnsley 3"
-msgstr "Barnsley 3"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:852
-msgid "Spider"
-msgstr "Spider"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:854
-msgid "Man'o'war"
-msgstr "Man'o'war"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:856
-msgid "Lambda"
-msgstr "Lambda"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:858
-msgid "Sierpinski"
-msgstr "Sierpinski"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:904 ../plug-ins/common/sinus.c:886
-msgid "Co_lors"
-msgstr "Co_lours"
-
-#. Number of Colors frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:908
-#: ../plug-ins/common/borderaverage.c:415
-msgid "Number of Colors"
-msgstr "Number of Colours"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:920
-msgid "Number of colors:"
-msgstr "Number of colours:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:923
-msgid "Change the number of colors in the mapping"
-msgstr "Change the number of colours in the mapping"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:930
-msgid "Use loglog smoothing"
-msgstr "Use loglog smoothing"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:937
-msgid "Use log log smoothing to eliminate \"banding\" in the result"
-msgstr "Use log log smoothing to eliminate \"banding\" in the result"
-
-#. Color Density frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:941
-msgid "Color Density"
-msgstr "Colour Density"
-
-#. These values are translated for the GUI but also used internally
-#. to figure out which button the user pushed, etc.
-#. Not my design, please don't blame me -- njl
-#: ../plug-ins/FractalExplorer/Dialogs.c:953 ../plug-ins/common/fp.c:220
-msgid "Red:"
-msgstr "Red:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:956
-msgid "Change the intensity of the red channel"
-msgstr "Change the intensity of the red channel"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:963 ../plug-ins/common/fp.c:221
-msgid "Green:"
-msgstr "Green:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:966
-msgid "Change the intensity of the green channel"
-msgstr "Change the intensity of the green channel"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:973 ../plug-ins/common/fp.c:222
-msgid "Blue:"
-msgstr "Blue:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:976
-msgid "Change the intensity of the blue channel"
-msgstr "Change the intensity of the blue channel"
-
-#. Color Function frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:982
-msgid "Color Function"
-msgstr "Colour Function"
-
-#. Redmode radio frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:991
-#: ../plug-ins/common/channel_mixer.c:537 ../plug-ins/common/decompose.c:174
-msgid "Red"
-msgstr "Red"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:995
-#: ../plug-ins/FractalExplorer/Dialogs.c:1036
-#: ../plug-ins/FractalExplorer/Dialogs.c:1077
-msgid "Sine"
-msgstr "Sine"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:997
-#: ../plug-ins/FractalExplorer/Dialogs.c:1038
-#: ../plug-ins/FractalExplorer/Dialogs.c:1079
-msgid "Cosine"
-msgstr "Cosine"
-
-#. if and how to center the image on the page
-#: ../plug-ins/FractalExplorer/Dialogs.c:999
-#: ../plug-ins/FractalExplorer/Dialogs.c:1040
-#: ../plug-ins/FractalExplorer/Dialogs.c:1081
-#: ../plug-ins/Lighting/lighting_ui.c:415
-#: ../plug-ins/common/CML_explorer.c:166 ../plug-ins/common/align_layers.c:422
-#: ../plug-ins/common/align_layers.c:453 ../plug-ins/common/postscript.c:3230
-#: ../plug-ins/common/postscript.c:3242 ../plug-ins/common/psp.c:418
-#: ../plug-ins/fits/fits.c:1026 ../plug-ins/print/print-page-layout.c:449
-msgid "None"
-msgstr "None"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1004
-#: ../plug-ins/FractalExplorer/Dialogs.c:1045
-#: ../plug-ins/FractalExplorer/Dialogs.c:1086
-msgid "Use sine-function for this color component"
-msgstr "Use sine-function for this colour component"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1007
-#: ../plug-ins/FractalExplorer/Dialogs.c:1048
-#: ../plug-ins/FractalExplorer/Dialogs.c:1089
-msgid "Use cosine-function for this color component"
-msgstr "Use cosine-function for this colour component"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1010
-#: ../plug-ins/FractalExplorer/Dialogs.c:1051
-#: ../plug-ins/FractalExplorer/Dialogs.c:1092
-msgid ""
-"Use linear mapping instead of any trigonometrical function for this color "
-"channel"
-msgstr ""
-"Use linear mapping instead of any trigonometrical function for this colour "
-"channel"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1019
-#: ../plug-ins/FractalExplorer/Dialogs.c:1060
-#: ../plug-ins/FractalExplorer/Dialogs.c:1101
-msgid "Inversion"
-msgstr "Inversion"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1027
-#: ../plug-ins/FractalExplorer/Dialogs.c:1068
-#: ../plug-ins/FractalExplorer/Dialogs.c:1109
-msgid ""
-"If you enable this option higher color values will be swapped with lower "
-"ones and vice versa"
-msgstr ""
-"If you enable this option higher colour values will be swapped with lower "
-"ones and vice versa"
-
-#. Greenmode radio frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:1032
-#: ../plug-ins/common/channel_mixer.c:542 ../plug-ins/common/decompose.c:175
-msgid "Green"
-msgstr "Green"
-
-#. Bluemode radio frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:1073
-#: ../plug-ins/common/channel_mixer.c:547 ../plug-ins/common/decompose.c:176
-msgid "Blue"
-msgstr "Blue"
-
-#. Colormode toggle box
-#: ../plug-ins/FractalExplorer/Dialogs.c:1114
-msgid "Color Mode"
-msgstr "Colour Mode"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1123
-msgid "As specified above"
-msgstr "As specified above"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1135
-msgid ""
-"Create a color-map with the options you specified above (color density/"
-"function). The result is visible in the preview image"
-msgstr ""
-"Create a colour-map with the options you specified above (colour density/"
-"function). The result is visible in the preview image"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1145
-msgid "Apply active gradient to final image"
-msgstr "Apply active gradient to final image"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1157
-msgid "Create a color-map using a gradient from the gradient editor"
-msgstr "Create a colour-map using a gradient from the gradient editor"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1168
-msgid "FractalExplorer Gradient"
-msgstr "FractalExplorer Gradient"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1198
-msgid "_Fractals"
-msgstr "_Fractals"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1546
-#: ../plug-ins/Lighting/lighting_ui.c:1210 ../plug-ins/bmp/bmpwrite.c:294
-#: ../plug-ins/common/CEL.c:568 ../plug-ins/common/CML_explorer.c:2004
-#: ../plug-ins/common/channel_mixer.c:1059 ../plug-ins/common/compressor.c:410
-#: ../plug-ins/common/compressor.c:473 ../plug-ins/common/compressor.c:563
-#: ../plug-ins/common/compressor.c:632 ../plug-ins/common/curve_bend.c:817
-#: ../plug-ins/common/dicom.c:708 ../plug-ins/common/gbr.c:616
-#: ../plug-ins/common/gif-save.c:986 ../plug-ins/common/gih.c:1258
-#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/mng.c:561
-#: ../plug-ins/common/mng.c:950 ../plug-ins/common/pat.c:447
-#: ../plug-ins/common/pcx.c:645 ../plug-ins/common/pix.c:508
-#: ../plug-ins/common/png.c:1244 ../plug-ins/common/pnm.c:958
-#: ../plug-ins/common/postscript.c:1196 ../plug-ins/common/psd-save.c:1557
-#: ../plug-ins/common/raw.c:528 ../plug-ins/common/raw.c:555
-#: ../plug-ins/common/spheredesigner.c:2120 ../plug-ins/common/sunras.c:544
-#: ../plug-ins/common/tga.c:1133 ../plug-ins/common/tiff-save.c:671
-#: ../plug-ins/common/xbm.c:1016 ../plug-ins/common/xwd.c:598
-#: ../plug-ins/fits/fits.c:457 ../plug-ins/flame/flame.c:442
-#: ../plug-ins/gfig/gfig.c:794 ../plug-ins/gfli/gfli.c:715
-#: ../plug-ins/ifscompose/ifscompose.c:2376 ../plug-ins/jpeg/jpeg-save.c:325
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:282
-#: ../plug-ins/winicon/icosave.c:1020 ../plug-ins/xjt/xjt.c:1280
-#: ../plug-ins/xjt/xjt.c:1714
-#, c-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "Could not open '%s' for writing: %s"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1560
-#, c-format
-msgid "Could not write '%s': %s"
-msgstr "Could not write '%s': %s"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1635
-msgid "Load Fractal Parameters"
-msgstr "Load Fractal Parameters"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1673
-msgid "Save Fractal Parameters"
-msgstr "Save Fractal Parameters"
-
-#. Do not rely on librsvg setting GError on failure!
-#. stat error (file does not exist)
-#: ../plug-ins/FractalExplorer/Dialogs.c:1863
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:933
-#: ../plug-ins/Lighting/lighting_ui.c:1353 ../plug-ins/bmp/bmpread.c:149
-#: ../plug-ins/common/CEL.c:299 ../plug-ins/common/CML_explorer.c:2177
-#: ../plug-ins/common/channel_mixer.c:981 ../plug-ins/common/compressor.c:464
-#: ../plug-ins/common/compressor.c:622 ../plug-ins/common/curve_bend.c:869
-#: ../plug-ins/common/dicom.c:296 ../plug-ins/common/gbr.c:348
-#: ../plug-ins/common/gif-load.c:309 ../plug-ins/common/gih.c:649
-#: ../plug-ins/common/mng.c:1121 ../plug-ins/common/pat.c:317
-#: ../plug-ins/common/pcx.c:344 ../plug-ins/common/pix.c:329
-#: ../plug-ins/common/png.c:703 ../plug-ins/common/pnm.c:480
-#: ../plug-ins/common/poppler.c:527 ../plug-ins/common/postscript.c:1023
-#: ../plug-ins/common/postscript.c:3031 ../plug-ins/common/psp.c:1432
-#: ../plug-ins/common/raw.c:243 ../plug-ins/common/raw.c:645
-#: ../plug-ins/common/spheredesigner.c:2010 ../plug-ins/common/sunras.c:378
-#: ../plug-ins/common/svg.c:321 ../plug-ins/common/svg.c:702
-#: ../plug-ins/common/tga.c:423 ../plug-ins/common/tiff-load.c:288
-#: ../plug-ins/common/xbm.c:720 ../plug-ins/common/xwd.c:420
-#: ../plug-ins/faxg3/faxg3.c:219 ../plug-ins/fits/fits.c:345
-#: ../plug-ins/flame/flame.c:411 ../plug-ins/gfig/gfig.c:434
-#: ../plug-ins/gfli/gfli.c:429 ../plug-ins/gfli/gfli.c:464
-#: ../plug-ins/help/gimphelplocale.c:193 ../plug-ins/jpeg/jpeg-load.c:111
-#: ../plug-ins/jpeg/jpeg-load.c:821 ../plug-ins/psd/psd-load.c:125
-#: ../plug-ins/psd/psd-thumb-load.c:78
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:271
-#: ../plug-ins/uri/uri-backend-libcurl.c:186 ../plug-ins/winicon/icoload.c:651
-#: ../plug-ins/winicon/icoload.c:728 ../plug-ins/xjt/xjt.c:2545
-#: ../plug-ins/xjt/xjt.c:2553
-#, c-format
-msgid "Could not open '%s' for reading: %s"
-msgstr "Could not open '%s' for reading: %s"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1871
-#, c-format
-msgid "'%s' is not a FractalExplorer file"
-msgstr "'%s' is not a FractalExplorer file"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1877
-#, c-format
-msgid "'%s' is corrupt. Line %d Option section incorrect"
-msgstr "'%s' is corrupt. Line %d Option section incorrect"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:243
-msgid "Render fractal art"
-msgstr "Render fractal art"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:248
-msgid "_Fractal Explorer..."
-msgstr "_Fractal Explorer..."
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:378
-msgid "Rendering fractal"
-msgstr "Rendering fractal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:760
-#: ../plug-ins/gflare/gflare.c:3154
-#, c-format
-msgid "Are you sure you want to delete \"%s\" from the list and from disk?"
-msgstr "Are you sure you want to delete \"%s\" from the list and from disk?"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:764
-msgid "Delete Fractal"
-msgstr "Delete Fractal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:954
-#, c-format
-msgid "File '%s' is not a FractalExplorer file"
-msgstr "File '%s' is not a FractalExplorer file"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:963
-#, c-format
-msgid ""
-"File '%s' is corrupt.\n"
-"Line %d Option section incorrect"
-msgstr ""
-"File '%s' is corrupt.\n"
-"Line %d Option section incorrect"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1007
-msgid "My first fractal"
-msgstr "My first fractal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1071
-msgid "Select folder and rescan collection"
-msgstr "Select folder and rescan collection"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1083
-msgid "Apply currently selected fractal"
-msgstr "Apply currently selected fractal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1095
-msgid "Delete currently selected fractal"
-msgstr "Delete currently selected fractal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1118
-msgid "Rescan for Fractals"
-msgstr "Rescan for Fractals"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1137
-msgid "Add FractalExplorer Path"
-msgstr "Add FractalExplorer Path"
-
-#: ../plug-ins/Lighting/lighting_apply.c:104
-#: ../plug-ins/Lighting/lighting_ui.c:1018
-msgid "Lighting Effects"
-msgstr "Lighting Effects"
-
-#: ../plug-ins/Lighting/lighting_main.c:195
-msgid "Apply various lighting effects to an image"
-msgstr "Apply various lighting effects to an image"
-
-#: ../plug-ins/Lighting/lighting_main.c:200
-msgid "_Lighting Effects..."
-msgstr "_Lighting Effects..."
-
-#. General options
-#: ../plug-ins/Lighting/lighting_ui.c:294
-#: ../plug-ins/MapObject/mapobject_ui.c:472
-msgid "General Options"
-msgstr "General Options"
-
-#: ../plug-ins/Lighting/lighting_ui.c:302
-msgid "T_ransparent background"
-msgstr "T_ransparent background"
-
-#: ../plug-ins/Lighting/lighting_ui.c:312
-msgid "Make destination image transparent where bump height is zero"
-msgstr "Make destination image transparent where bump height is zero"
-
-#: ../plug-ins/Lighting/lighting_ui.c:315
-msgid "Cre_ate new image"
-msgstr "Cre_ate new image"
-
-#: ../plug-ins/Lighting/lighting_ui.c:325
-#: ../plug-ins/MapObject/mapobject_ui.c:541
-msgid "Create a new image when applying filter"
-msgstr "Create a new image when applying filter"
-
-#: ../plug-ins/Lighting/lighting_ui.c:327
-msgid "High _quality preview"
-msgstr "High _quality preview"
-
-#: ../plug-ins/Lighting/lighting_ui.c:337
-msgid "Enable/disable high quality preview"
-msgstr "Enable/disable high quality preview"
-
-#: ../plug-ins/Lighting/lighting_ui.c:344
-msgid "Distance:"
-msgstr "Distance:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:377
-#: ../plug-ins/MapObject/mapobject_ui.c:619
-msgid "Light Settings"
-msgstr "Light Settings"
-
-#: ../plug-ins/Lighting/lighting_ui.c:390
-msgid "Light 1"
-msgstr "Light 1"
-
-#: ../plug-ins/Lighting/lighting_ui.c:391
-msgid "Light 2"
-msgstr "Light 2"
-
-#: ../plug-ins/Lighting/lighting_ui.c:392
-msgid "Light 3"
-msgstr "Light 3"
-
-#: ../plug-ins/Lighting/lighting_ui.c:393
-msgid "Light 4"
-msgstr "Light 4"
-
-#: ../plug-ins/Lighting/lighting_ui.c:394
-msgid "Light 5"
-msgstr "Light 5"
-
-#: ../plug-ins/Lighting/lighting_ui.c:395
-msgid "Light 6"
-msgstr "Light 6"
-
-#. row labels
-#: ../plug-ins/Lighting/lighting_ui.c:404
-#: ../plug-ins/common/spheredesigner.c:2706
-msgid "Type:"
-msgstr "Type:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:409
-msgid "Color:"
-msgstr "Colour:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:416
-msgid "Directional"
-msgstr "Directional"
-
-#: ../plug-ins/Lighting/lighting_ui.c:417
-msgid "Point"
-msgstr "Point"
-
-#: ../plug-ins/Lighting/lighting_ui.c:431
-#: ../plug-ins/MapObject/mapobject_ui.c:642
-msgid "Type of light source to apply"
-msgstr "Type of light source to apply"
-
-#: ../plug-ins/Lighting/lighting_ui.c:433
-#: ../plug-ins/MapObject/mapobject_ui.c:644
-msgid "Select lightsource color"
-msgstr "Select lightsource colour"
-
-#: ../plug-ins/Lighting/lighting_ui.c:447
-#: ../plug-ins/MapObject/mapobject_ui.c:657
-msgid "Set light source color"
-msgstr "Set light source colour"
-
-#: ../plug-ins/Lighting/lighting_ui.c:455
-msgid "_Intensity:"
-msgstr "_Intensity:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:463
-msgid "Light intensity"
-msgstr "Light intensity"
-
-#: ../plug-ins/Lighting/lighting_ui.c:466
-#: ../plug-ins/MapObject/mapobject_ui.c:659
-#: ../plug-ins/MapObject/mapobject_ui.c:986
-#: ../plug-ins/print/print-page-layout.c:343
-msgid "Position"
-msgstr "Position"
-
-#: ../plug-ins/Lighting/lighting_ui.c:476 ../plug-ins/common/flarefx.c:772
-#: ../plug-ins/common/mblur.c:1094 ../plug-ins/common/nova.c:463
-#: ../plug-ins/common/papertile.c:282 ../plug-ins/flame/flame.c:1227
-#: ../plug-ins/gflare/gflare.c:2679
-msgid "_X:"
-msgstr "_X:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:484
-#: ../plug-ins/MapObject/mapobject_ui.c:683
-msgid "Light source X position in XYZ space"
-msgstr "Light source X position in XYZ space"
-
-#: ../plug-ins/Lighting/lighting_ui.c:491 ../plug-ins/common/flarefx.c:777
-#: ../plug-ins/common/mblur.c:1099 ../plug-ins/common/nova.c:468
-#: ../plug-ins/common/papertile.c:291 ../plug-ins/flame/flame.c:1241
-#: ../plug-ins/gflare/gflare.c:2683
-msgid "_Y:"
-msgstr "_Y:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:499
-#: ../plug-ins/MapObject/mapobject_ui.c:697
-msgid "Light source Y position in XYZ space"
-msgstr "Light source Y position in XYZ space"
-
-#: ../plug-ins/Lighting/lighting_ui.c:506
-msgid "_Z:"
-msgstr "_Z:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:514
-#: ../plug-ins/MapObject/mapobject_ui.c:711
-msgid "Light source Z position in XYZ space"
-msgstr "Light source Z position in XYZ space"
-
-#. *****************************************************
-#. radio buttons for choosing LEFT or RIGHT
-#. *************************************************
-#: ../plug-ins/Lighting/lighting_ui.c:517 ../plug-ins/common/struc.c:1292
-#: ../plug-ins/common/wind.c:943
-msgid "Direction"
-msgstr "Direction"
-
-#. X
-#: ../plug-ins/Lighting/lighting_ui.c:526
-#: ../plug-ins/MapObject/mapobject_ui.c:675
-#: ../plug-ins/MapObject/mapobject_ui.c:729
-#: ../plug-ins/MapObject/mapobject_ui.c:997
-#: ../plug-ins/MapObject/mapobject_ui.c:1046
-#: ../plug-ins/ifscompose/ifscompose.c:525
-msgid "X:"
-msgstr "X:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:534
-#: ../plug-ins/MapObject/mapobject_ui.c:737
-msgid "Light source X direction in XYZ space"
-msgstr "Light source X direction in XYZ space"
-
-#. Y
-#: ../plug-ins/Lighting/lighting_ui.c:540
-#: ../plug-ins/MapObject/mapobject_ui.c:689
-#: ../plug-ins/MapObject/mapobject_ui.c:742
-#: ../plug-ins/MapObject/mapobject_ui.c:1010
-#: ../plug-ins/MapObject/mapobject_ui.c:1057
-#: ../plug-ins/MapObject/mapobject_ui.c:1155
-#: ../plug-ins/ifscompose/ifscompose.c:539
-msgid "Y:"
-msgstr "Y:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:548
-#: ../plug-ins/MapObject/mapobject_ui.c:750
-msgid "Light source Y direction in XYZ space"
-msgstr "Light source Y direction in XYZ space"
-
-#: ../plug-ins/Lighting/lighting_ui.c:554
-#: ../plug-ins/MapObject/mapobject_ui.c:703
-#: ../plug-ins/MapObject/mapobject_ui.c:755
-#: ../plug-ins/MapObject/mapobject_ui.c:1023
-#: ../plug-ins/MapObject/mapobject_ui.c:1068
-#: ../plug-ins/MapObject/mapobject_ui.c:1167
-msgid "Z:"
-msgstr "Z:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:562
-#: ../plug-ins/MapObject/mapobject_ui.c:763
-msgid "Light source Z direction in XYZ space"
-msgstr "Light source Z direction in XYZ space"
-
-#: ../plug-ins/Lighting/lighting_ui.c:565
-msgid "I_solate"
-msgstr "I_solate"
-
-#: ../plug-ins/Lighting/lighting_ui.c:574
-msgid "Lighting preset:"
-msgstr "Lighting preset:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:620
-msgid "Material Properties"
-msgstr "Material Properties"
-
-#: ../plug-ins/Lighting/lighting_ui.c:638
-msgid "_Glowing:"
-msgstr "_Glowing:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:657
-#: ../plug-ins/MapObject/mapobject_ui.c:824
-msgid "Amount of original color to show where no direct light falls"
-msgstr "Amount of original colour to show where no direct light falls"
-
-#: ../plug-ins/Lighting/lighting_ui.c:671
-msgid "_Bright:"
-msgstr "_Bright:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:690
-#: ../plug-ins/MapObject/mapobject_ui.c:853
-msgid "Intensity of original color when lit by a light source"
-msgstr "Intensity of original colour when lit by a light source"
-
-#: ../plug-ins/Lighting/lighting_ui.c:704
-msgid "_Shiny:"
-msgstr "_Shiny:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:723
-#: ../plug-ins/MapObject/mapobject_ui.c:925
-msgid "Controls how intense the highlights will be"
-msgstr "Controls how intense the highlights will be"
-
-#: ../plug-ins/Lighting/lighting_ui.c:736
-msgid "_Polished:"
-msgstr "_Polished:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:755
-#: ../plug-ins/MapObject/mapobject_ui.c:954
-msgid "Higher values makes the highlights more focused"
-msgstr "Higher values makes the highlights more focused"
-
-#. Metallic
-#: ../plug-ins/Lighting/lighting_ui.c:765
-msgid "_Metallic"
-msgstr "_Metallic"
-
-#: ../plug-ins/Lighting/lighting_ui.c:802
-msgid "E_nable bump mapping"
-msgstr "E_nable bump mapping"
-
-#: ../plug-ins/Lighting/lighting_ui.c:816
-msgid "Enable/disable bump-mapping (image depth)"
-msgstr "Enable/disable bump-mapping (image depth)"
-
-#: ../plug-ins/Lighting/lighting_ui.c:838
-msgid "Bumpm_ap image:"
-msgstr "Bumpm_ap image:"
-
-#. Map type menu
-#: ../plug-ins/Lighting/lighting_ui.c:841 ../plug-ins/common/bumpmap.c:835
-#: ../plug-ins/flame/flame.c:746
-msgid "Linear"
-msgstr "Linear"
-
-#: ../plug-ins/Lighting/lighting_ui.c:842
-msgid "Logarithmic"
-msgstr "Logarithmic"
-
-#: ../plug-ins/Lighting/lighting_ui.c:843 ../plug-ins/common/bumpmap.c:837
-#: ../plug-ins/flame/flame.c:747
-msgid "Sinusoidal"
-msgstr "Sinusoidal"
-
-#: ../plug-ins/Lighting/lighting_ui.c:844 ../plug-ins/common/bumpmap.c:836
-#: ../plug-ins/flame/flame.c:748
-msgid "Spherical"
-msgstr "Spherical"
-
-#: ../plug-ins/Lighting/lighting_ui.c:854
-msgid "Cu_rve:"
-msgstr "Cu_rve:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:859
-msgid "Ma_ximum height:"
-msgstr "Ma_ximum height:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:869
-msgid "Maximum height for bumps"
-msgstr "Maximum height for bumps"
-
-#: ../plug-ins/Lighting/lighting_ui.c:893
-msgid "E_nable environment mapping"
-msgstr "E_nable environment mapping"
-
-#: ../plug-ins/Lighting/lighting_ui.c:907
-msgid "Enable/disable environment-mapping (reflection)"
-msgstr "Enable/disable environment-mapping (reflection)"
-
-#: ../plug-ins/Lighting/lighting_ui.c:924
-msgid "En_vironment image:"
-msgstr "En_vironment image:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:927
-msgid "Environment image to use"
-msgstr "Environment image to use"
-
-#: ../plug-ins/Lighting/lighting_ui.c:949
-msgid "Op_tions"
-msgstr "Op_tions"
-
-#: ../plug-ins/Lighting/lighting_ui.c:953
-#: ../plug-ins/MapObject/mapobject_ui.c:1291
-msgid "_Light"
-msgstr "_Light"
-
-#: ../plug-ins/Lighting/lighting_ui.c:957
-#: ../plug-ins/MapObject/mapobject_ui.c:1295
-msgid "_Material"
-msgstr "_Material"
-
-#: ../plug-ins/Lighting/lighting_ui.c:961
-msgid "_Bump Map"
-msgstr "_Bump Map"
-
-#: ../plug-ins/Lighting/lighting_ui.c:965
-msgid "_Environment Map"
-msgstr "_Environment Map"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1074
-#: ../plug-ins/gimpressionist/preview.c:174
-#: ../plug-ins/gimpressionist/repaint.c:1184
-#: ../plug-ins/imagemap/imap_polygon.c:515
-msgid "_Update"
-msgstr "_Update"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1081
-#: ../plug-ins/MapObject/mapobject_ui.c:1397
-msgid "Recompute preview image"
-msgstr "Recompute preview image"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1083
-msgid "I_nteractive"
-msgstr "I_nteractive"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1097
-msgid "Enable/disable real time preview of changes"
-msgstr "Enable/disable real time preview of changes"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1136
-msgid "Save Lighting Preset"
-msgstr "Save Lighting Preset"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1280
-msgid "Load Lighting Preset"
-msgstr "Load Lighting Preset"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:275
-msgid "Map to plane"
-msgstr "Map to plane"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:278
-msgid "Map to sphere"
-msgstr "Map to sphere"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:281
-msgid "Map to box"
-msgstr "Map to box"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:284
-msgid "Map to cylinder"
-msgstr "Map to cylinder"
-
-#: ../plug-ins/MapObject/mapobject_main.c:196
-msgid "Map the image to an object (plane, sphere, box or cylinder)"
-msgstr "Map the image to an object (plane, sphere, box or cylinder)"
-
-#: ../plug-ins/MapObject/mapobject_main.c:201
-msgid "Map _Object..."
-msgstr "Map _Object..."
-
-#: ../plug-ins/MapObject/mapobject_ui.c:248
-#: ../plug-ins/MapObject/mapobject_ui.c:1305
-msgid "_Box"
-msgstr "_Box"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:266
-#: ../plug-ins/MapObject/mapobject_ui.c:1311
-msgid "C_ylinder"
-msgstr "C_ylinder"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:484
-msgid "Map to:"
-msgstr "Map to:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:488
-msgid "Plane"
-msgstr "Plane"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:489
-msgid "Sphere"
-msgstr "Sphere"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:490
-msgid "Box"
-msgstr "Box"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:491
-msgid "Cylinder"
-msgstr "Cylinder"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:501
-msgid "Type of object to map to"
-msgstr "Type of object to map to"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:503
-msgid "Transparent background"
-msgstr "Transparent background"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:514
-msgid "Make image transparent outside object"
-msgstr "Make image transparent outside object"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:516
-msgid "Tile source image"
-msgstr "Tile source image"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:527
-msgid "Tile source image: useful for infinite planes"
-msgstr "Tile source image: useful for infinite planes"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:530
-msgid "Create new image"
-msgstr "Create new image"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:549
-msgid "Enable _antialiasing"
-msgstr "Enable _antialiasing"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:560
-msgid "Enable/disable jagged edges removal (antialiasing)"
-msgstr "Enable/disable jagged edges removal (antialiasing)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:573 ../plug-ins/common/bumpmap.c:916
-#: ../plug-ins/common/emboss.c:523 ../plug-ins/common/fractaltrace.c:796
-#: ../plug-ins/common/struc.c:1324
-msgid "_Depth:"
-msgstr "_Depth:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:576
-msgid "Antialiasing quality. Higher is better, but slower"
-msgstr "Antialiasing quality. Higher is better, but slower"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:585 ../plug-ins/common/redeye.c:173
-#: ../plug-ins/common/unsharp.c:704 ../plug-ins/common/wind.c:1006
-#: ../plug-ins/imagemap/imap_preferences.c:441
-msgid "_Threshold:"
-msgstr "_Threshold:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:593
-msgid "Stop when pixel differences are smaller than this value"
-msgstr "Stop when pixel differences are smaller than this value"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:628
-msgid "Point light"
-msgstr "Point light"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:629
-msgid "Directional light"
-msgstr "Directional light"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:630
-msgid "No light"
-msgstr "No light"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:635
-msgid "Lightsource type:"
-msgstr "Lightsource type:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:649
-msgid "Lightsource color:"
-msgstr "Lightsource colour:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:714
-msgid "Direction Vector"
-msgstr "Direction Vector"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:790
-msgid "Intensity Levels"
-msgstr "Intensity Levels"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:809
-msgid "Ambient:"
-msgstr "Ambient:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:838
-#: ../plug-ins/MapObject/mapobject_ui.c:881
-msgid "Diffuse:"
-msgstr "Diffuse:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:862
-msgid "Reflectivity"
-msgstr "Reflectivity"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:896
-msgid "Higher values makes the object reflect more light (appear lighter)"
-msgstr "Higher values makes the object reflect more light (appear lighter)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:910
-msgid "Specular:"
-msgstr "Specular:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:939
-msgid "Highlight:"
-msgstr "Highlight:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1000
-msgid "Object X position in XYZ space"
-msgstr "Object X position in XYZ space"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1013
-msgid "Object Y position in XYZ space"
-msgstr "Object Y position in XYZ space"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1026
-msgid "Object Z position in XYZ space"
-msgstr "Object Z position in XYZ space"
-
-#. Rotation
-#: ../plug-ins/MapObject/mapobject_ui.c:1035
-#: ../plug-ins/common/postscript.c:3428
-msgid "Rotation"
-msgstr "Rotation"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1049
-msgid "Rotation angle about X axis"
-msgstr "Rotation angle about X axis"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1060
-msgid "Rotation angle about Y axis"
-msgstr "Rotation angle about Y axis"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1071
-msgid "Rotation angle about Z axis"
-msgstr "Rotation angle about Z axis"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1097
-msgid "Front:"
-msgstr "Front:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1097
-msgid "Back:"
-msgstr "Back:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1105
-msgid "Map Images to Box Faces"
-msgstr "Map Images to Box Faces"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1143
-#: ../plug-ins/common/spheredesigner.c:2800
-msgid "Scale X:"
-msgstr "Scale X:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1146
-msgid "X scale (size)"
-msgstr "X scale (size)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1158
-msgid "Y scale (size)"
-msgstr "Y scale (size)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1170
-msgid "Z scale (size)"
-msgstr "Z scale (size)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1193
-#: ../plug-ins/print/print-page-layout.c:402
-msgid "_Top:"
-msgstr "_Top:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1193
-#: ../plug-ins/print/print-page-layout.c:421
-msgid "_Bottom:"
-msgstr "_Bottom:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1198
-msgid "Images for the Cap Faces"
-msgstr "Images for the Cap Faces"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1227
-#: ../plug-ins/print/print-page-layout.c:219
-msgid "Size"
-msgstr "Size"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1238
-msgid "R_adius:"
-msgstr "R_adius:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1242
-msgid "Cylinder radius"
-msgstr "Cylinder radius"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1252 ../plug-ins/common/mblur.c:1125
-msgid "L_ength:"
-msgstr "L_ength:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1256
-msgid "Cylinder length"
-msgstr "Cylinder length"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1287
-msgid "O_ptions"
-msgstr "O_ptions"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1299
-msgid "O_rientation"
-msgstr "O_rientation"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1335
-msgid "Map to Object"
-msgstr "Map to Object"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1388
-#: ../plug-ins/common/diffraction.c:477
-msgid "_Preview!"
-msgstr "_Preview!"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1415
-msgid "Show preview _wireframe"
-msgstr "Show preview _wireframe"
-
-#: ../plug-ins/bmp/bmp.c:124 ../plug-ins/bmp/bmp.c:143
-msgid "Windows BMP image"
-msgstr "Windows BMP image"
-
-#: ../plug-ins/bmp/bmpread.c:85
-msgid "Bad colormap"
-msgstr "Bad colourmap"
-
-#. max. rows allocated
-#. column, highest column ever used
-#. -1  assume fsel is not available (and not attached to any drawable)
-#. -1  assume there is no floating selection
-#: ../plug-ins/bmp/bmpread.c:154 ../plug-ins/common/CEL.c:304
-#: ../plug-ins/common/dicom.c:301 ../plug-ins/common/gbr.c:353
-#: ../plug-ins/common/gif-load.c:314 ../plug-ins/common/gih.c:654
-#: ../plug-ins/common/pat.c:322 ../plug-ins/common/pcx.c:349
-#: ../plug-ins/common/pix.c:334 ../plug-ins/common/png.c:710
-#: ../plug-ins/common/pnm.c:485 ../plug-ins/common/poppler.c:572
-#: ../plug-ins/common/postscript.c:1029 ../plug-ins/common/raw.c:650
-#: ../plug-ins/common/sunras.c:470 ../plug-ins/common/tga.c:428
-#: ../plug-ins/common/tiff-load.c:569 ../plug-ins/common/wmf.c:992
-#: ../plug-ins/common/xbm.c:725 ../plug-ins/common/xpm.c:343
-#: ../plug-ins/common/xwd.c:506 ../plug-ins/faxg3/faxg3.c:204
-#: ../plug-ins/gfli/gfli.c:469 ../plug-ins/jpeg/jpeg-load.c:117
-#: ../plug-ins/psd/psd-load.c:130 ../plug-ins/sgi/sgi.c:318
-#: ../plug-ins/winicon/icoload.c:645 ../plug-ins/xjt/xjt.c:3344
-#, c-format
-msgid "Opening '%s'"
-msgstr "Opening '%s'"
-
-#: ../plug-ins/bmp/bmpread.c:164 ../plug-ins/bmp/bmpread.c:173
-#: ../plug-ins/bmp/bmpread.c:179 ../plug-ins/bmp/bmpread.c:187
-#: ../plug-ins/bmp/bmpread.c:201 ../plug-ins/bmp/bmpread.c:382
-#, c-format
-msgid "'%s' is not a valid BMP file"
-msgstr "'%s' is not a valid BMP file"
-
-#: ../plug-ins/bmp/bmpread.c:214 ../plug-ins/bmp/bmpread.c:240
-#: ../plug-ins/bmp/bmpread.c:266 ../plug-ins/bmp/bmpread.c:329
-#: ../plug-ins/bmp/bmpread.c:353 ../plug-ins/bmp/bmpread.c:375
-#: ../plug-ins/bmp/bmpread.c:388 ../plug-ins/bmp/bmpread.c:394
-#, c-format
-msgid "Error reading BMP file header from '%s'"
-msgstr "Error reading BMP file header from '%s'"
-
-#: ../plug-ins/bmp/bmpread.c:502
-msgid "Unrecognized or invalid BMP compression format."
-msgstr "Unrecognised or invalid BMP compression format."
-
-#: ../plug-ins/bmp/bmpread.c:544
-msgid "Unsupported or invalid bitdepth."
-msgstr "Unsupported or invalid bitdepth."
-
-#: ../plug-ins/bmp/bmpread.c:550 ../plug-ins/common/pcx.c:376
-#: ../plug-ins/psd/psd-load.c:295
-#, c-format
-msgid "Unsupported or invalid image width: %d"
-msgstr "Unsupported or invalid image width: %d"
-
-#: ../plug-ins/bmp/bmpread.c:555 ../plug-ins/common/pcx.c:381
-#: ../plug-ins/psd/psd-load.c:287
-#, c-format
-msgid "Unsupported or invalid image height: %d"
-msgstr "Unsupported or invalid image height: %d"
-
-#.
-#. * Create the "background" layer to hold the image...
-#.
-#: ../plug-ins/bmp/bmpread.c:559 ../plug-ins/common/CEL.c:349
-#: ../plug-ins/common/CEL.c:352 ../plug-ins/common/blinds.c:277
-#: ../plug-ins/common/compose.c:931 ../plug-ins/common/decompose.c:723
-#: ../plug-ins/common/dicom.c:503 ../plug-ins/common/film.c:746
-#: ../plug-ins/common/gif-load.c:879 ../plug-ins/common/pcx.c:393
-#: ../plug-ins/common/pcx.c:399 ../plug-ins/common/pix.c:368
-#: ../plug-ins/common/png.c:831 ../plug-ins/common/pnm.c:571
-#: ../plug-ins/common/raw.c:691 ../plug-ins/common/smooth_palette.c:257
-#: ../plug-ins/common/sunras.c:956 ../plug-ins/common/tga.c:1029
-#: ../plug-ins/common/tiff-load.c:952 ../plug-ins/common/tile.c:267
-#: ../plug-ins/common/xbm.c:880 ../plug-ins/faxg3/faxg3.c:464
-#: ../plug-ins/fits/fits.c:511 ../plug-ins/gfig/gfig-dialog.c:1284
-#: ../plug-ins/gimpressionist/general.c:140 ../plug-ins/jpeg/jpeg-load.c:249
-#: ../plug-ins/jpeg/jpeg-load.c:752 ../plug-ins/psd/psd-image-res-load.c:995
-#: ../plug-ins/psd/psd-load.c:1510 ../plug-ins/sgi/sgi.c:369
-#: ../plug-ins/twain/twain.c:571 ../plug-ins/winsnap/winsnap.c:1155
-msgid "Background"
-msgstr "Background"
-
-#: ../plug-ins/bmp/bmpread.c:730 ../plug-ins/bmp/bmpread.c:771
-#: ../plug-ins/bmp/bmpread.c:821
-msgid "The bitmap ends unexpectedly."
-msgstr "The bitmap ends unexpectedly."
-
-#: ../plug-ins/bmp/bmpwrite.c:187 ../plug-ins/bmp/bmpwrite.c:209
-msgid "Cannot save indexed image with transparency in BMP file format."
-msgstr "Cannot save indexed image with transparency in BMP file format."
-
-#: ../plug-ins/bmp/bmpwrite.c:189 ../plug-ins/bmp/bmpwrite.c:211
-msgid "Alpha channel will be ignored."
-msgstr "Alpha channel will be ignored."
-
-#. And let's begin the progress
-#. init the progress meter
-#: ../plug-ins/bmp/bmpwrite.c:305 ../plug-ins/common/CEL.c:573
-#: ../plug-ins/common/gbr.c:621 ../plug-ins/common/gif-save.c:993
-#: ../plug-ins/common/gih.c:1263 ../plug-ins/common/gtm.c:245
-#: ../plug-ins/common/pat.c:452 ../plug-ins/common/pcx.c:607
-#: ../plug-ins/common/pix.c:513 ../plug-ins/common/png.c:1251
-#: ../plug-ins/common/pnm.c:963 ../plug-ins/common/postscript.c:1201
-#: ../plug-ins/common/psd-save.c:1562 ../plug-ins/common/sunras.c:549
-#: ../plug-ins/common/tga.c:1138 ../plug-ins/common/tiff-save.c:681
-#: ../plug-ins/common/xbm.c:1021 ../plug-ins/common/xpm.c:623
-#: ../plug-ins/common/xwd.c:603 ../plug-ins/fits/fits.c:462
-#: ../plug-ins/gfli/gfli.c:684 ../plug-ins/jpeg/jpeg-save.c:283
-#: ../plug-ins/sgi/sgi.c:537 ../plug-ins/winicon/icosave.c:1015
-#: ../plug-ins/xjt/xjt.c:1697
-#, c-format
-msgid "Saving '%s'"
-msgstr "Saving '%s'"
-
-#: ../plug-ins/bmp/bmpwrite.c:791
-msgid "Save as BMP"
-msgstr "Save as BMP"
-
-#: ../plug-ins/bmp/bmpwrite.c:814
-msgid "_Run-Length Encoded"
-msgstr "_Run-Length Encoded"
-
-#: ../plug-ins/bmp/bmpwrite.c:826 ../plug-ins/jpeg/jpeg-save.c:892
-msgid "_Advanced Options"
-msgstr "_Advanced Options"
-
-#: ../plug-ins/bmp/bmpwrite.c:841
-msgid "16 bits"
-msgstr "16 bits"
-
-#: ../plug-ins/bmp/bmpwrite.c:877
-msgid "24 bits"
-msgstr "24 bits"
-
-#: ../plug-ins/bmp/bmpwrite.c:894
-msgid "32 bits"
-msgstr "32 bits"
-
-#: ../plug-ins/common/AlienMap2.c:140
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:119
+msgid "Original"
+msgstr "Original"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:137
+msgid "Rotated"
+msgstr "Rotated"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:155
+msgid "Continuous update"
+msgstr "Continuous update"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:168
+msgid "Area:"
+msgstr "Area:"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:172
+msgid "Entire Layer"
+msgstr "Entire Layer"
+
+#. Create selection
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:173
+#: ../plug-ins/common/film.c:966 ../plug-ins/imagemap/imap_selection.c:367
+#: ../plug-ins/selection-to-path/selection-to-path.c:433
+msgid "Selection"
+msgstr "Selection"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:174
+msgid "Context"
+msgstr "Context"
+
+#. spinbutton 1
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:299
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:377
+#: ../plug-ins/common/color-to-alpha.c:410 ../plug-ins/file-fli/fli-gimp.c:875
+#: ../plug-ins/file-fli/fli-gimp.c:945
+msgid "From:"
+msgstr "From:"
+
+#. spinbutton 2
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:325
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:378
+#: ../plug-ins/file-fli/fli-gimp.c:884 ../plug-ins/file-fli/fli-gimp.c:954
+msgid "To:"
+msgstr "To:"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:419
+#: ../plug-ins/common/file-ps.c:3231 ../plug-ins/imagemap/imap_menu.c:214
+msgid "Gray"
+msgstr "Grey"
+
+#. Gray: Circle: Spinbutton 1
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:467
+msgid "Hue:"
+msgstr "Hue:"
+
+#. Gray: Circle: Spinbutton 2
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:494
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:556
+msgid "Saturation:"
+msgstr "Saturation:"
+
+#. * Gray: Operation-Mode *
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:514
+msgid "Gray Mode"
+msgstr "Grey Mode"
+
+#. Gray: Operation-Mode: two radio buttons
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:523
+msgid "Treat as this"
+msgstr "Treat as this"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:535
+msgid "Change to this"
+msgstr "Change to this"
+
+#. * Gray: What is gray? *
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:548
+msgid "Gray Threshold"
+msgstr "Grey Threshold"
+
+#. * Misc: Used unit selection *
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:588
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:698
+msgid "Units"
+msgstr "Units"
+
+#. Misc: Used unit selection: 3 radio buttons
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:597
+msgid "Radians"
+msgstr "Radians"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:609
+msgid "Radians/Pi"
+msgstr "Radians/Pi"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:621
+msgid "Degrees"
+msgstr "Degrees"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:652
+msgid "Rotate Colors"
+msgstr "Rotate Colours"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:692
+msgid "Main Options"
+msgstr "Main Options"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:695
+msgid "Gray Options"
+msgstr "Grey Options"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:35
+msgid "Switch to Clockwise"
+msgstr "Switch to Clockwise"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:37
+msgid "Switch to C/Clockwise"
+msgstr "Switch to Anticlockwise"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:39
+msgid "Change Order of Arrows"
+msgstr "Change Order of Arrows"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:41
+#: ../plug-ins/imagemap/imap_cmd_select_all.c:51
+msgid "Select All"
+msgstr "Select All"
+
+#: ../plug-ins/color-rotate/color-rotate.c:99
+msgid "Replace a range of colors with another"
+msgstr "Replace a range of colours with another"
+
+#: ../plug-ins/color-rotate/color-rotate.c:106
+msgid "_Rotate Colors..."
+msgstr "_Rotate Colours..."
+
+#: ../plug-ins/color-rotate/color-rotate.c:140
+msgid "Rotating the colors"
+msgstr "Rotating the colours"
+
+#: ../plug-ins/common/alien-map.c:140
 msgid "_Modify red channel"
 msgstr "_Modify red channel"
 
-#: ../plug-ins/common/AlienMap2.c:140
+#: ../plug-ins/common/alien-map.c:140
 msgid "_Modify hue channel"
 msgstr "_Modify hue channel"
 
-#: ../plug-ins/common/AlienMap2.c:141
+#: ../plug-ins/common/alien-map.c:141
 msgid "Mo_dify green channel"
 msgstr "Mo_dify green channel"
 
-#: ../plug-ins/common/AlienMap2.c:141
+#: ../plug-ins/common/alien-map.c:141
 msgid "Mo_dify saturation channel"
 msgstr "Mo_dify saturation channel"
 
-#: ../plug-ins/common/AlienMap2.c:142
+#: ../plug-ins/common/alien-map.c:142
 msgid "Mod_ify blue channel"
 msgstr "Mod_ify blue channel"
 
-#: ../plug-ins/common/AlienMap2.c:142
+#: ../plug-ins/common/alien-map.c:142
 msgid "Mod_ify luminosity channel"
 msgstr "Mod_ify luminosity channel"
 
-#: ../plug-ins/common/AlienMap2.c:147
+#: ../plug-ins/common/alien-map.c:147
 msgid "Red _frequency:"
 msgstr "Red _frequency:"
 
-#: ../plug-ins/common/AlienMap2.c:147
+#: ../plug-ins/common/alien-map.c:147
 msgid "Hue _frequency:"
 msgstr "Hue _frequency:"
 
-#: ../plug-ins/common/AlienMap2.c:148
+#: ../plug-ins/common/alien-map.c:148
 msgid "Green fr_equency:"
 msgstr "Green fr_equency:"
 
-#: ../plug-ins/common/AlienMap2.c:148
+#: ../plug-ins/common/alien-map.c:148
 msgid "Saturation fr_equency:"
 msgstr "Saturation fr_equency:"
 
-#: ../plug-ins/common/AlienMap2.c:149
+#: ../plug-ins/common/alien-map.c:149
 msgid "Blue freq_uency:"
 msgstr "Blue freq_uency:"
 
-#: ../plug-ins/common/AlienMap2.c:149
+#: ../plug-ins/common/alien-map.c:149
 msgid "Luminosity freq_uency:"
 msgstr "Luminosity freq_uency:"
 
-#: ../plug-ins/common/AlienMap2.c:151
+#: ../plug-ins/common/alien-map.c:151
 msgid "Red _phaseshift:"
 msgstr "Red _phaseshift:"
 
-#: ../plug-ins/common/AlienMap2.c:151
+#: ../plug-ins/common/alien-map.c:151
 msgid "Hue _phaseshift:"
 msgstr "Hue _phaseshift:"
 
-#: ../plug-ins/common/AlienMap2.c:152
+#: ../plug-ins/common/alien-map.c:152
 msgid "Green ph_aseshift:"
 msgstr "Green ph_aseshift:"
 
-#: ../plug-ins/common/AlienMap2.c:152
+#: ../plug-ins/common/alien-map.c:152
 msgid "Saturation ph_aseshift:"
 msgstr "Saturation ph_aseshift:"
 
-#: ../plug-ins/common/AlienMap2.c:153
+#: ../plug-ins/common/alien-map.c:153
 msgid "Blue pha_seshift:"
 msgstr "Blue pha_seshift:"
 
-#: ../plug-ins/common/AlienMap2.c:153
+#: ../plug-ins/common/alien-map.c:153
 msgid "Luminosity pha_seshift:"
 msgstr "Luminosity pha_seshift:"
 
-#: ../plug-ins/common/AlienMap2.c:183
+#: ../plug-ins/common/alien-map.c:183
 msgid "Alter colors in various psychedelic ways"
 msgstr "Alter colours in various psychedelic ways"
 
-#: ../plug-ins/common/AlienMap2.c:188
+#: ../plug-ins/common/alien-map.c:188
 msgid "_Alien Map..."
 msgstr "_Alien Map..."
 
-#: ../plug-ins/common/AlienMap2.c:320
+#: ../plug-ins/common/alien-map.c:320
 msgid "Alien Map: Transforming"
 msgstr "Alien Map: Transforming"
 
-#: ../plug-ins/common/AlienMap2.c:393
+#: ../plug-ins/common/alien-map.c:393
 msgid "Alien Map"
 msgstr "Alien Map"
 
-#: ../plug-ins/common/AlienMap2.c:440 ../plug-ins/common/AlienMap2.c:464
-#: ../plug-ins/common/AlienMap2.c:488
+#: ../plug-ins/common/alien-map.c:441 ../plug-ins/common/alien-map.c:465
+#: ../plug-ins/common/alien-map.c:489
 msgid "Number of cycles covering full value range"
 msgstr "Number of cycles covering full value range"
 
-#: ../plug-ins/common/AlienMap2.c:452 ../plug-ins/common/AlienMap2.c:476
-#: ../plug-ins/common/AlienMap2.c:500
+#: ../plug-ins/common/alien-map.c:453 ../plug-ins/common/alien-map.c:477
+#: ../plug-ins/common/alien-map.c:501
 msgid "Phase angle, range 0-360"
 msgstr "Phase angle, range 0-360"
 
 #. Propagate Mode
-#: ../plug-ins/common/AlienMap2.c:514 ../plug-ins/common/hot.c:595
-#: ../plug-ins/common/vpropagate.c:1096 ../plug-ins/common/waves.c:276
+#: ../plug-ins/common/alien-map.c:515 ../plug-ins/common/hot.c:611
+#: ../plug-ins/common/value-propagate.c:1120 ../plug-ins/common/waves.c:277
 msgid "Mode"
 msgstr "Mode"
 
-#: ../plug-ins/common/AlienMap2.c:518
+#: ../plug-ins/common/alien-map.c:519
 msgid "_RGB color model"
 msgstr "_RGB colour model"
 
-#: ../plug-ins/common/AlienMap2.c:519
+#: ../plug-ins/common/alien-map.c:520
 msgid "_HSL color model"
 msgstr "_HSL colour model"
 
-#: ../plug-ins/common/CEL.c:109 ../plug-ins/common/CEL.c:127
-msgid "KISS CEL"
-msgstr "KISS CEL"
-
-#: ../plug-ins/common/CEL.c:188
-msgid "Load KISS Palette"
-msgstr "Load KISS Palette"
-
-#: ../plug-ins/common/CEL.c:341
-msgid "Can't create a new image"
-msgstr "Can't create a new image"
-
-#: ../plug-ins/common/CEL.c:430
-#, c-format
-msgid "Unsupported bit depth (%d)!"
-msgstr "Unsupported bit depth (%d)!"
-
-#: ../plug-ins/common/CML_explorer.c:129
-msgid "Keep image's values"
-msgstr "Keep image's values"
-
-#: ../plug-ins/common/CML_explorer.c:130
-msgid "Keep the first value"
-msgstr "Keep the first value"
-
-#: ../plug-ins/common/CML_explorer.c:131
-msgid "Fill with parameter k"
-msgstr "Fill with parameter k"
-
-#: ../plug-ins/common/CML_explorer.c:132
-msgid "k{x(1-x)}^p"
-msgstr "k{x(1-x)}^p"
-
-#: ../plug-ins/common/CML_explorer.c:133
-msgid "k{x(1-x)}^p stepped"
-msgstr "k{x(1-x)}^p stepped"
-
-#: ../plug-ins/common/CML_explorer.c:134
-msgid "kx^p"
-msgstr "kx^p"
-
-#: ../plug-ins/common/CML_explorer.c:135
-msgid "kx^p stepped"
-msgstr "kx^p stepped"
-
-#: ../plug-ins/common/CML_explorer.c:136
-msgid "k(1-x^p)"
-msgstr "k(1-x^p)"
-
-#: ../plug-ins/common/CML_explorer.c:137
-msgid "k(1-x^p) stepped"
-msgstr "k(1-x^p) stepped"
-
-#: ../plug-ins/common/CML_explorer.c:138
-msgid "Delta function"
-msgstr "Delta function"
-
-#: ../plug-ins/common/CML_explorer.c:139
-msgid "Delta function stepped"
-msgstr "Delta function stepped"
-
-#: ../plug-ins/common/CML_explorer.c:140
-msgid "sin^p-based function"
-msgstr "sin^p-based function"
-
-#: ../plug-ins/common/CML_explorer.c:141
-msgid "sin^p, stepped"
-msgstr "sin^p, stepped"
-
-#: ../plug-ins/common/CML_explorer.c:167
-msgid "Max (x, -)"
-msgstr "Max (x, -)"
-
-#: ../plug-ins/common/CML_explorer.c:168
-msgid "Max (x+d, -)"
-msgstr "Max (x+d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:169
-msgid "Max (x-d, -)"
-msgstr "Max (x-d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:170
-msgid "Min (x, -)"
-msgstr "Min (x, -)"
-
-#: ../plug-ins/common/CML_explorer.c:171
-msgid "Min (x+d, -)"
-msgstr "Min (x+d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:172
-msgid "Min (x-d, -)"
-msgstr "Min (x-d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:173
-msgid "Max (x+d, -), (x < 0.5)"
-msgstr "Max (x+d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:174
-msgid "Max (x+d, -), (0.5 < x)"
-msgstr "Max (x+d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:175
-msgid "Max (x-d, -), (x < 0.5)"
-msgstr "Max (x-d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:176
-msgid "Max (x-d, -), (0.5 < x)"
-msgstr "Max (x-d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:177
-msgid "Min (x+d, -), (x < 0.5)"
-msgstr "Min (x+d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:178
-msgid "Min (x+d, -), (0.5 < x)"
-msgstr "Min (x+d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:179
-msgid "Min (x-d, -), (x < 0.5)"
-msgstr "Min (x-d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:180
-msgid "Min (x-d, -), (0.5 < x)"
-msgstr "Min (x-d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:200 ../plug-ins/common/sunras.c:1632
-msgid "Standard"
-msgstr "Standard"
-
-#: ../plug-ins/common/CML_explorer.c:201
-msgid "Use average value"
-msgstr "Use average value"
-
-#: ../plug-ins/common/CML_explorer.c:202
-msgid "Use reverse value"
-msgstr "Use reverse value"
-
-#: ../plug-ins/common/CML_explorer.c:203
-msgid "With random power (0,10)"
-msgstr "With random power (0,10)"
-
-#: ../plug-ins/common/CML_explorer.c:204
-msgid "With random power (0,1)"
-msgstr "With random power (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:205
-msgid "With gradient power (0,1)"
-msgstr "With gradient power (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:206
-msgid "Multiply rand. value (0,1)"
-msgstr "Multiply rand. value (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:207
-msgid "Multiply rand. value (0,2)"
-msgstr "Multiply rand. value (0,2)"
-
-#: ../plug-ins/common/CML_explorer.c:208
-msgid "Multiply gradient (0,1)"
-msgstr "Multiply gradient (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:209
-msgid "With p and random (0,1)"
-msgstr "With p and random (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:223
-msgid "All black"
-msgstr "All black"
-
-#: ../plug-ins/common/CML_explorer.c:224
-msgid "All gray"
-msgstr "All grey"
-
-#: ../plug-ins/common/CML_explorer.c:225
-msgid "All white"
-msgstr "All white"
-
-#: ../plug-ins/common/CML_explorer.c:226
-msgid "The first row of the image"
-msgstr "The first row of the image"
-
-#: ../plug-ins/common/CML_explorer.c:227
-msgid "Continuous gradient"
-msgstr "Continuous gradient"
-
-#: ../plug-ins/common/CML_explorer.c:228
-msgid "Continuous grad. w/o gap"
-msgstr "Continuous grad. w/o gap"
-
-#: ../plug-ins/common/CML_explorer.c:229
-msgid "Random, ch. independent"
-msgstr "Random, ch. independent"
-
-#: ../plug-ins/common/CML_explorer.c:230
-msgid "Random shared"
-msgstr "Random shared"
-
-#: ../plug-ins/common/CML_explorer.c:231
-msgid "Randoms from seed"
-msgstr "Randoms from seed"
-
-#: ../plug-ins/common/CML_explorer.c:232
-msgid "Randoms from seed (shared)"
-msgstr "Randoms from seed (shared)"
-
-#: ../plug-ins/common/CML_explorer.c:300 ../plug-ins/common/CML_explorer.c:308
-#: ../plug-ins/common/decompose.c:188
-#: ../plug-ins/gimpressionist/orientation.c:180
-#: ../plug-ins/gimpressionist/size.c:183
-msgid "Hue"
-msgstr "Hue"
-
-#: ../plug-ins/common/CML_explorer.c:301 ../plug-ins/common/CML_explorer.c:309
-#: ../plug-ins/common/decompose.c:189
-msgid "Saturation"
-msgstr "Saturation"
-
-#: ../plug-ins/common/CML_explorer.c:302 ../plug-ins/common/CML_explorer.c:310
-#: ../plug-ins/common/decompose.c:190
-#: ../plug-ins/gimpressionist/orientation.c:156
-#: ../plug-ins/gimpressionist/size.c:159
-msgid "Value"
-msgstr "Value"
-
-#: ../plug-ins/common/CML_explorer.c:307
-msgid "(None)"
-msgstr "(None)"
-
-#: ../plug-ins/common/CML_explorer.c:455
-msgid "Create abstract Coupled-Map Lattice patterns"
-msgstr "Create abstract Coupled-Map Lattice patterns"
-
-#: ../plug-ins/common/CML_explorer.c:466
-msgid "CML _Explorer..."
-msgstr "CML _Explorer..."
-
-#: ../plug-ins/common/CML_explorer.c:756
-msgid "CML Explorer: evoluting"
-msgstr "CML Explorer: evoluting"
-
-#: ../plug-ins/common/CML_explorer.c:1177
-msgid "Coupled-Map-Lattice Explorer"
-msgstr "Coupled-Map-Lattice Explorer"
-
-#: ../plug-ins/common/CML_explorer.c:1224
-msgid "New Seed"
-msgstr "New Seed"
-
-#: ../plug-ins/common/CML_explorer.c:1235
-msgid "Fix Seed"
-msgstr "Fix Seed"
-
-#: ../plug-ins/common/CML_explorer.c:1246
-msgid "Random Seed"
-msgstr "Random Seed"
-
-#: ../plug-ins/common/CML_explorer.c:1288 ../plug-ins/common/fp.c:700
-#: ../plug-ins/common/lic.c:671
-msgid "_Hue"
-msgstr "_Hue"
-
-#: ../plug-ins/common/CML_explorer.c:1292
-msgid "Sat_uration"
-msgstr "Sat_uration"
-
-#: ../plug-ins/common/CML_explorer.c:1296 ../plug-ins/common/fp.c:708
-msgid "_Value"
-msgstr "_Value"
-
-#: ../plug-ins/common/CML_explorer.c:1300
-msgid "_Advanced"
-msgstr "_Advanced"
-
-#: ../plug-ins/common/CML_explorer.c:1315
-msgid "Channel Independent Parameters"
-msgstr "Channel Independent Parameters"
-
-#: ../plug-ins/common/CML_explorer.c:1337
-msgid "Initial value:"
-msgstr "Initial value:"
-
-#: ../plug-ins/common/CML_explorer.c:1343
-msgid "Zoom scale:"
-msgstr "Zoom scale:"
-
-#: ../plug-ins/common/CML_explorer.c:1352
-msgid "Start offset:"
-msgstr "Start offset:"
-
-#: ../plug-ins/common/CML_explorer.c:1361
-msgid "Seed of Random (only for \"From Seed\" Modes)"
-msgstr "Seed of Random (only for \"From Seed\" Modes)"
-
-#: ../plug-ins/common/CML_explorer.c:1372 ../plug-ins/maze/maze_face.c:267
-msgid "Seed:"
-msgstr "Seed:"
-
-#: ../plug-ins/common/CML_explorer.c:1385
-msgid "Switch to \"From seed\" With the Last Seed"
-msgstr "Switch to \"From seed\" With the Last Seed"
-
-#: ../plug-ins/common/CML_explorer.c:1397
-msgid ""
-"\"Fix seed\" button is an alias of me.\n"
-"The same seed produces the same image, if (1) the widths of images are same "
-"(this is the reason why image on drawable is different from preview), and "
-"(2) all mutation rates equal to zero."
-msgstr ""
-"\"Fix seed\" button is an alias of me.\n"
-"The same seed produces the same image, if (1) the widths of images are same "
-"(this is the reason why image on drawable is different from preview), and "
-"(2) all mutation rates equal to zero."
-
-#: ../plug-ins/common/CML_explorer.c:1405
-msgid "O_thers"
-msgstr "O_thers"
-
-#: ../plug-ins/common/CML_explorer.c:1420
-msgid "Copy Settings"
-msgstr "Copy Settings"
-
-#: ../plug-ins/common/CML_explorer.c:1439
-msgid "Source channel:"
-msgstr "Source channel:"
-
-#: ../plug-ins/common/CML_explorer.c:1454
-#: ../plug-ins/common/CML_explorer.c:1502
-msgid "Destination channel:"
-msgstr "Destination channel:"
-
-#: ../plug-ins/common/CML_explorer.c:1458
-msgid "Copy Parameters"
-msgstr "Copy Parameters"
-
-#: ../plug-ins/common/CML_explorer.c:1467
-msgid "Selective Load Settings"
-msgstr "Selective Load Settings"
-
-#: ../plug-ins/common/CML_explorer.c:1487
-msgid "Source channel in file:"
-msgstr "Source channel in file:"
-
-#: ../plug-ins/common/CML_explorer.c:1508
-msgid "_Misc Ops."
-msgstr "_Misc Ops."
-
-#: ../plug-ins/common/CML_explorer.c:1557
-msgid "Function type:"
-msgstr "Function type:"
-
-#: ../plug-ins/common/CML_explorer.c:1573
-msgid "Composition:"
-msgstr "Composition:"
-
-#: ../plug-ins/common/CML_explorer.c:1587
-msgid "Misc arrange:"
-msgstr "Misc arrange:"
-
-#: ../plug-ins/common/CML_explorer.c:1591
-msgid "Use cyclic range"
-msgstr "Use cyclic range"
-
-#: ../plug-ins/common/CML_explorer.c:1601
-msgid "Mod. rate:"
-msgstr "Mod. rate:"
-
-#: ../plug-ins/common/CML_explorer.c:1610
-msgid "Env. sensitivity:"
-msgstr "Env. sensitivity:"
-
-#: ../plug-ins/common/CML_explorer.c:1619
-msgid "Diffusion dist.:"
-msgstr "Diffusion dist.:"
-
-#: ../plug-ins/common/CML_explorer.c:1628
-msgid "# of subranges:"
-msgstr "# of subranges:"
-
-#: ../plug-ins/common/CML_explorer.c:1637
-msgid "P(ower factor):"
-msgstr "P(ower factor):"
-
-#: ../plug-ins/common/CML_explorer.c:1646
-msgid "Parameter k:"
-msgstr "Parameter k:"
-
-#: ../plug-ins/common/CML_explorer.c:1655
-msgid "Range low:"
-msgstr "Range low:"
-
-#: ../plug-ins/common/CML_explorer.c:1664
-msgid "Range high:"
-msgstr "Range high:"
-
-#: ../plug-ins/common/CML_explorer.c:1676
-msgid "Plot a Graph of the Settings"
-msgstr "Plot a Graph of the Settings"
-
-#: ../plug-ins/common/CML_explorer.c:1721
-msgid "Ch. sensitivity:"
-msgstr "Ch. sensitivity:"
-
-#: ../plug-ins/common/CML_explorer.c:1731
-msgid "Mutation rate:"
-msgstr "Mutation rate:"
-
-#: ../plug-ins/common/CML_explorer.c:1741
-msgid "Mutation dist.:"
-msgstr "Mutation dist.:"
-
-#: ../plug-ins/common/CML_explorer.c:1818
-msgid "Graph of the Current Settings"
-msgstr "Graph of the Current Settings"
-
-#: ../plug-ins/common/CML_explorer.c:1889
-msgid "Warning: the source and the destination are the same channel."
-msgstr "Warning: the source and the destination are the same channel."
-
-#: ../plug-ins/common/CML_explorer.c:1948
-msgid "Save CML Explorer Parameters"
-msgstr "Save CML Explorer Parameters"
-
-#: ../plug-ins/common/CML_explorer.c:2059
-#: ../plug-ins/common/channel_mixer.c:1067
-#, c-format
-msgid "Parameters were saved to '%s'"
-msgstr "Parameters were saved to '%s'"
-
-#: ../plug-ins/common/CML_explorer.c:2081
-msgid "Load CML Explorer Parameters"
-msgstr "Load CML Explorer Parameters"
-
-#: ../plug-ins/common/CML_explorer.c:2199
-msgid "Error: it's not CML parameter file."
-msgstr "Error: it's not CML parameter file."
-
-#: ../plug-ins/common/CML_explorer.c:2206
-#, c-format
-msgid "Warning: '%s' is an old format file."
-msgstr "Warning: '%s' is an old format file."
-
-#: ../plug-ins/common/CML_explorer.c:2210
-#, c-format
-msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
-msgstr "Warning: '%s' is a parameter file for a newer version of CML Explorer."
-
-#: ../plug-ins/common/CML_explorer.c:2273
-msgid "Error: failed to load parameters"
-msgstr "Error: failed to load parameters"
-
-#: ../plug-ins/common/aa.c:98
-msgid "ASCII art"
-msgstr "ASCII art"
-
-#. Create the actual window.
-#: ../plug-ins/common/aa.c:349
-msgid "Save as Text"
-msgstr "Save as Text"
-
-#: ../plug-ins/common/aa.c:371
-msgid "_Format:"
-msgstr "_Format:"
-
-#: ../plug-ins/common/align_layers.c:128
+#: ../plug-ins/common/align-layers.c:128
 msgid "Align all visible layers of the image"
 msgstr "Align all visible layers of the image"
 
-#: ../plug-ins/common/align_layers.c:133
+#: ../plug-ins/common/align-layers.c:133
 msgid "Align Visi_ble Layers..."
 msgstr "Align Visi_ble Layers..."
 
-#: ../plug-ins/common/align_layers.c:171
+#: ../plug-ins/common/align-layers.c:173
 msgid "There are not enough layers to align."
 msgstr "There are not enough layers to align."
 
-#: ../plug-ins/common/align_layers.c:398
+#: ../plug-ins/common/align-layers.c:400
 msgid "Align Visible Layers"
 msgstr "Align Visible Layers"
 
-#: ../plug-ins/common/align_layers.c:423 ../plug-ins/common/align_layers.c:454
+#. if and how to center the image on the page
+#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455
+#: ../plug-ins/common/cml-explorer.c:166 ../plug-ins/common/file-ps.c:3247
+#: ../plug-ins/common/file-ps.c:3259 ../plug-ins/common/file-psp.c:661
+#: ../plug-ins/file-fits/fits.c:1045
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:999
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1040
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1081
+#: ../plug-ins/lighting/lighting-ui.c:416
+#: ../plug-ins/print/print-page-layout.c:449
+msgid "None"
+msgstr "None"
+
+#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456
 msgid "Collect"
 msgstr "Collect"
 
-#: ../plug-ins/common/align_layers.c:424
+#: ../plug-ins/common/align-layers.c:426
 msgid "Fill (left to right)"
 msgstr "Fill (left to right)"
 
-#: ../plug-ins/common/align_layers.c:425
+#: ../plug-ins/common/align-layers.c:427
 msgid "Fill (right to left)"
 msgstr "Fill (right to left)"
 
-#: ../plug-ins/common/align_layers.c:426 ../plug-ins/common/align_layers.c:457
+#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459
 msgid "Snap to grid"
 msgstr "Snap to grid"
 
-#: ../plug-ins/common/align_layers.c:435
+#: ../plug-ins/common/align-layers.c:437
 msgid "_Horizontal style:"
 msgstr "_Horizontal style:"
 
-#: ../plug-ins/common/align_layers.c:439
+#: ../plug-ins/common/align-layers.c:441
 msgid "Left edge"
 msgstr "Left edge"
 
-#: ../plug-ins/common/align_layers.c:440 ../plug-ins/common/align_layers.c:470
-#: ../plug-ins/gflare/gflare.c:2667
+#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472
+#: ../plug-ins/gradient-flare/gradient-flare.c:2713
 msgid "Center"
 msgstr "Centre"
 
-#: ../plug-ins/common/align_layers.c:441
+#: ../plug-ins/common/align-layers.c:443
 msgid "Right edge"
 msgstr "Right edge"
 
-#: ../plug-ins/common/align_layers.c:450
+#: ../plug-ins/common/align-layers.c:452
 msgid "Ho_rizontal base:"
 msgstr "Ho_rizontal base:"
 
-#: ../plug-ins/common/align_layers.c:455
+#: ../plug-ins/common/align-layers.c:457
 msgid "Fill (top to bottom)"
 msgstr "Fill (top to bottom)"
 
-#: ../plug-ins/common/align_layers.c:456
+#: ../plug-ins/common/align-layers.c:458
 msgid "Fill (bottom to top)"
 msgstr "Fill (bottom to top)"
 
-#: ../plug-ins/common/align_layers.c:466
+#: ../plug-ins/common/align-layers.c:468
 msgid "_Vertical style:"
 msgstr "_Vertical style:"
 
-#: ../plug-ins/common/align_layers.c:469
+#: ../plug-ins/common/align-layers.c:471
 msgid "Top edge"
 msgstr "Top edge"
 
-#: ../plug-ins/common/align_layers.c:471
+#: ../plug-ins/common/align-layers.c:473
 msgid "Bottom edge"
 msgstr "Bottom edge"
 
-#: ../plug-ins/common/align_layers.c:480
+#: ../plug-ins/common/align-layers.c:482
 msgid "Ver_tical base:"
 msgstr "Ver_tical base:"
 
-#: ../plug-ins/common/align_layers.c:484
+#: ../plug-ins/common/align-layers.c:486
 msgid "_Grid size:"
 msgstr "_Grid size:"
 
-#: ../plug-ins/common/align_layers.c:493
+#: ../plug-ins/common/align-layers.c:495
 msgid "_Ignore the bottom layer even if visible"
 msgstr "_Ignore the bottom layer even if visible"
 
-#: ../plug-ins/common/align_layers.c:503
+#: ../plug-ins/common/align-layers.c:505
 msgid "_Use the (invisible) bottom layer as the base"
 msgstr "_Use the (invisible) bottom layer as the base"
 
-#: ../plug-ins/common/animationplay.c:163
+#: ../plug-ins/common/animation-optimize.c:133
+msgid "Modify image to reduce size when saved as GIF animation"
+msgstr "Modify image to reduce size when saved as GIF animation"
+
+#: ../plug-ins/common/animation-optimize.c:145
+msgid "Optimize (for _GIF)"
+msgstr "Optimise (for _GIF)"
+
+#: ../plug-ins/common/animation-optimize.c:153
+msgid "Reduce file size where combining layers is possible"
+msgstr "Reduce file size where combining layers is possible"
+
+#: ../plug-ins/common/animation-optimize.c:163
+msgid "_Optimize (Difference)"
+msgstr "_Optimise (Difference)"
+
+#: ../plug-ins/common/animation-optimize.c:171
+msgid "Remove optimization to make editing easier"
+msgstr "Remove optimisation to make editing easier"
+
+#: ../plug-ins/common/animation-optimize.c:178
+msgid "_Unoptimize"
+msgstr "_Unoptimise"
+
+#: ../plug-ins/common/animation-optimize.c:198
+msgid "_Remove Backdrop"
+msgstr "_Remove Backdrop"
+
+#: ../plug-ins/common/animation-optimize.c:214
+msgid "_Find Backdrop"
+msgstr "_Find Backdrop"
+
+#: ../plug-ins/common/animation-optimize.c:427
+msgid "Unoptimizing animation"
+msgstr "Unoptimising animation"
+
+#: ../plug-ins/common/animation-optimize.c:430
+msgid "Removing animation background"
+msgstr "Removing animation background"
+
+#: ../plug-ins/common/animation-optimize.c:433
+msgid "Finding animation background"
+msgstr "Finding animation background"
+
+#: ../plug-ins/common/animation-optimize.c:437
+msgid "Optimizing animation"
+msgstr "Optimising animation"
+
+#: ../plug-ins/common/animation-play.c:163
 msgid "Preview a GIMP layer-based animation"
 msgstr "Preview a GIMP layer-based animation"
 
-#: ../plug-ins/common/animationplay.c:168
+#: ../plug-ins/common/animation-play.c:168
 msgid "_Playback..."
 msgstr "_Playback..."
 
-#: ../plug-ins/common/animationplay.c:443
+#: ../plug-ins/common/animation-play.c:447
 msgid "_Step"
 msgstr "_Step"
 
-#: ../plug-ins/common/animationplay.c:443
+#: ../plug-ins/common/animation-play.c:447
 msgid "Step to next frame"
 msgstr "Step to next frame"
 
-#: ../plug-ins/common/animationplay.c:447
+#: ../plug-ins/common/animation-play.c:451
 msgid "Rewind the animation"
 msgstr "Rewind the animation"
 
-#: ../plug-ins/common/animationplay.c:465
+#: ../plug-ins/common/animation-play.c:469
 msgid "Faster"
 msgstr "Faster"
 
-#: ../plug-ins/common/animationplay.c:465
+#: ../plug-ins/common/animation-play.c:469
 msgid "Increase the speed of the animation"
 msgstr "Increase the speed of the animation"
 
-#: ../plug-ins/common/animationplay.c:470
+#: ../plug-ins/common/animation-play.c:474
 msgid "Slower"
 msgstr "Slower"
 
-#: ../plug-ins/common/animationplay.c:470
+#: ../plug-ins/common/animation-play.c:474
 msgid "Decrease the speed of the animation"
 msgstr "Decrease the speed of the animation"
 
-#: ../plug-ins/common/animationplay.c:475
+#: ../plug-ins/common/animation-play.c:479
 msgid "Reset speed"
 msgstr "Reset speed"
 
-#: ../plug-ins/common/animationplay.c:475
+#: ../plug-ins/common/animation-play.c:479
 msgid "Reset the speed of the animation"
 msgstr "Reset the speed of the animation"
 
-#: ../plug-ins/common/animationplay.c:483
-#: ../plug-ins/common/animationplay.c:1440
+#: ../plug-ins/common/animation-play.c:487
+#: ../plug-ins/common/animation-play.c:1446
 msgid "Start playback"
 msgstr "Start playback"
 
-#: ../plug-ins/common/animationplay.c:487
+#: ../plug-ins/common/animation-play.c:491
 msgid "Detach"
 msgstr "Detach"
 
-#: ../plug-ins/common/animationplay.c:488
+#: ../plug-ins/common/animation-play.c:492
 msgid "Detach the animation from the dialog window"
 msgstr "Detach the animation from the dialogue window"
 
-#: ../plug-ins/common/animationplay.c:580
+#: ../plug-ins/common/animation-play.c:584
 msgid "Animation Playback:"
 msgstr "Animation Playback:"
 
-#: ../plug-ins/common/animationplay.c:659
+#: ../plug-ins/common/animation-play.c:663
 msgid "Playback speed"
 msgstr "Playback speed"
 
-#: ../plug-ins/common/animationplay.c:797
+#: ../plug-ins/common/animation-play.c:803
 msgid "Tried to display an invalid layer."
 msgstr "Tried to display an invalid layer."
 
-#: ../plug-ins/common/animationplay.c:1317
+#: ../plug-ins/common/animation-play.c:1323
 #, c-format
 msgid "Frame %d of %d"
 msgstr "Frame %d of %d"
 
-#: ../plug-ins/common/animationplay.c:1440
+#: ../plug-ins/common/animation-play.c:1446
 msgid "Stop playback"
 msgstr "Stop playback"
 
-#: ../plug-ins/common/animoptimize.c:133
-msgid "Modify image to reduce size when saved as GIF animation"
-msgstr "Modify image to reduce size when saved as GIF animation"
-
-#: ../plug-ins/common/animoptimize.c:145
-msgid "Optimize (for _GIF)"
-msgstr "Optimise (for _GIF)"
-
-#: ../plug-ins/common/animoptimize.c:153
-msgid "Reduce file size where combining layers is possible"
-msgstr "Reduce file size where combining layers is possible"
-
-#: ../plug-ins/common/animoptimize.c:163
-msgid "_Optimize (Difference)"
-msgstr "_Optimise (Difference)"
-
-#: ../plug-ins/common/animoptimize.c:171
-msgid "Remove optimization to make editing easier"
-msgstr "Remove optimisation to make editing easier"
-
-#: ../plug-ins/common/animoptimize.c:178
-msgid "_Unoptimize"
-msgstr "_Unoptimise"
-
-#: ../plug-ins/common/animoptimize.c:198
-msgid "_Remove Backdrop"
-msgstr "_Remove Backdrop"
-
-#: ../plug-ins/common/animoptimize.c:214
-msgid "_Find Backdrop"
-msgstr "_Find Backdrop"
-
-#: ../plug-ins/common/animoptimize.c:427
-msgid "Unoptimizing animation"
-msgstr "Unoptimising animation"
-
-#: ../plug-ins/common/animoptimize.c:430
-msgid "Removing animation background"
-msgstr "Removing animation background"
-
-#: ../plug-ins/common/animoptimize.c:433
-msgid "Finding animation background"
-msgstr "Finding animation background"
-
-#: ../plug-ins/common/animoptimize.c:437
-msgid "Optimizing animation"
-msgstr "Optimising animation"
-
 #: ../plug-ins/common/antialias.c:84
 msgid "Antialias using the Scale3X edge-extrapolation algorithm"
 msgstr "Antialias using the Scale3X edge-extrapolation algorithm"
@@ -2075,77 +509,51 @@ msgstr "_Antialias"
 msgid "Antialiasing..."
 msgstr "Antialiasing..."
 
-#: ../plug-ins/common/apply_lens.c:108
-msgid "Simulate an elliptical lens over the image"
-msgstr "Simulate an elliptical lens over the image"
+#: ../plug-ins/common/apply-canvas.c:1140
+msgid "Add a canvas texture to the image"
+msgstr "Add a canvas texture to the image"
 
-#: ../plug-ins/common/apply_lens.c:114
-msgid "Apply _Lens..."
-msgstr "Apply _Lens..."
+#: ../plug-ins/common/apply-canvas.c:1145
+msgid "_Apply Canvas..."
+msgstr "_Apply Canvas..."
 
-#: ../plug-ins/common/apply_lens.c:181
-msgid "Applying lens"
-msgstr "Applying lens"
+#: ../plug-ins/common/apply-canvas.c:1226
+msgid "Applying canvas"
+msgstr "Applying canvas"
 
-#: ../plug-ins/common/apply_lens.c:393
-msgid "Lens Effect"
-msgstr "Lens Effect"
+#: ../plug-ins/common/apply-canvas.c:1263
+msgid "Apply Canvas"
+msgstr "Apply Canvas"
 
-#: ../plug-ins/common/apply_lens.c:426
-msgid "_Keep original surroundings"
-msgstr "_Keep original surroundings"
+#. *****************************************************
+#. radio buttons for choosing LEFT or RIGHT
+#. *************************************************
+#: ../plug-ins/common/apply-canvas.c:1292 ../plug-ins/common/wind.c:945
+#: ../plug-ins/lighting/lighting-ui.c:518
+msgid "Direction"
+msgstr "Direction"
 
-#: ../plug-ins/common/apply_lens.c:441
-msgid "_Set surroundings to index 0"
-msgstr "_Set surroundings to index 0"
+#: ../plug-ins/common/apply-canvas.c:1296
+msgid "_Top-right"
+msgstr "_Top-right"
 
-#: ../plug-ins/common/apply_lens.c:442
-msgid "_Set surroundings to background color"
-msgstr "_Set surroundings to background colour"
+#: ../plug-ins/common/apply-canvas.c:1297
+msgid "Top-_left"
+msgstr "Top-_left"
 
-#: ../plug-ins/common/apply_lens.c:457
-msgid "_Make surroundings transparent"
-msgstr "_Make surroundings transparent"
+#: ../plug-ins/common/apply-canvas.c:1298
+msgid "_Bottom-left"
+msgstr "_Bottom-left"
 
-#: ../plug-ins/common/apply_lens.c:474
-msgid "_Lens refraction index:"
-msgstr "_Lens refraction index:"
+#: ../plug-ins/common/apply-canvas.c:1299
+msgid "Bottom-_right"
+msgstr "Bottom-_right"
 
-#: ../plug-ins/common/autocrop.c:85
-msgid "Remove empty borders from the image"
-msgstr "Remove empty borders from the image"
-
-#: ../plug-ins/common/autocrop.c:90
-msgid "Autocrop Imag_e"
-msgstr "Autocrop Imag_e"
-
-#: ../plug-ins/common/autocrop.c:99
-msgid "Remove empty borders from the layer"
-msgstr "Remove empty borders from the layer"
-
-#: ../plug-ins/common/autocrop.c:104
-msgid "Autocrop Lay_er"
-msgstr "Autocrop Lay_er"
-
-#: ../plug-ins/common/autocrop.c:151
-msgid "Cropping"
-msgstr "Cropping"
-
-#: ../plug-ins/common/autostretch_hsv.c:68
-msgid "Stretch image contrast to cover the maximum possible range"
-msgstr "Stretch image contrast to cover the maximum possible range"
-
-#: ../plug-ins/common/autostretch_hsv.c:81
-msgid "Stretch _HSV"
-msgstr "Stretch _HSV"
-
-#: ../plug-ins/common/autostretch_hsv.c:116
-msgid "Auto-Stretching HSV"
-msgstr "Auto-Stretching HSV"
-
-#: ../plug-ins/common/autostretch_hsv.c:192
-msgid "autostretch_hsv: cmap was NULL!  Quitting...\n"
-msgstr "autostretch_hsv: cmap was NULL!  Quitting...\n"
+#: ../plug-ins/common/apply-canvas.c:1324 ../plug-ins/common/bump-map.c:916
+#: ../plug-ins/common/emboss.c:523 ../plug-ins/common/fractal-trace.c:796
+#: ../plug-ins/map-object/map-object-ui.c:573
+msgid "_Depth:"
+msgstr "_Depth:"
 
 #: ../plug-ins/common/blinds.c:116
 msgid "Simulate an image painted on window blinds"
@@ -2164,33 +572,204 @@ msgid "Blinds"
 msgstr "Blinds"
 
 #. Orientation toggle box
-#: ../plug-ins/common/blinds.c:259 ../plug-ins/common/ripple.c:538
+#: ../plug-ins/common/blinds.c:260 ../plug-ins/common/ripple.c:539
 msgid "Orientation"
 msgstr "Orientation"
 
-#: ../plug-ins/common/blinds.c:263 ../plug-ins/common/ripple.c:542
-#: ../plug-ins/common/tileit.c:426 ../plug-ins/pagecurl/pagecurl.c:534
+#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:543
+#: ../plug-ins/common/tile-small.c:426 ../plug-ins/pagecurl/pagecurl.c:534
 msgid "_Horizontal"
 msgstr "_Horizontal"
 
-#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:543
-#: ../plug-ins/common/tileit.c:436 ../plug-ins/pagecurl/pagecurl.c:533
+#: ../plug-ins/common/blinds.c:265 ../plug-ins/common/ripple.c:544
+#: ../plug-ins/common/tile-small.c:436 ../plug-ins/pagecurl/pagecurl.c:533
 msgid "_Vertical"
 msgstr "_Vertical"
 
-#: ../plug-ins/common/blinds.c:281 ../plug-ins/common/fractaltrace.c:738
-#: ../plug-ins/common/papertile.c:384
+#.
+#. * Create the "background" layer to hold the image...
+#.
+#: ../plug-ins/common/blinds.c:278 ../plug-ins/common/compose.c:935
+#: ../plug-ins/common/decompose.c:723 ../plug-ins/common/file-cel.c:362
+#: ../plug-ins/common/file-cel.c:365 ../plug-ins/common/file-dicom.c:557
+#: ../plug-ins/common/file-gif-load.c:911 ../plug-ins/common/file-pcx.c:412
+#: ../plug-ins/common/file-pcx.c:418 ../plug-ins/common/file-pix.c:382
+#: ../plug-ins/common/file-png.c:852 ../plug-ins/common/file-pnm.c:585
+#: ../plug-ins/common/file-raw.c:712 ../plug-ins/common/file-sunras.c:975
+#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997
+#: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:746
+#: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:267
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:617
+#: ../plug-ins/file-faxg3/faxg3.c:478 ../plug-ins/file-fits/fits.c:530
+#: ../plug-ins/file-jpeg/jpeg-load.c:249 ../plug-ins/file-jpeg/jpeg-load.c:761
+#: ../plug-ins/file-psd/psd-image-res-load.c:995
+#: ../plug-ins/file-psd/psd-load.c:1526 ../plug-ins/file-sgi/sgi.c:384
+#: ../plug-ins/gfig/gfig-dialog.c:1284
+#: ../plug-ins/gimpressionist/general.c:140 ../plug-ins/twain/twain.c:568
+#: ../plug-ins/win-snap/winsnap.c:1155
+msgid "Background"
+msgstr "Background"
+
+#: ../plug-ins/common/blinds.c:282 ../plug-ins/common/fractal-trace.c:738
+#: ../plug-ins/common/tile-paper.c:384
 msgid "_Transparent"
 msgstr "_Transparent"
 
-#: ../plug-ins/common/blinds.c:307
+#: ../plug-ins/common/blinds.c:308
 msgid "_Displacement:"
 msgstr "_Displacement:"
 
-#: ../plug-ins/common/blinds.c:319
+#: ../plug-ins/common/blinds.c:320
 msgid "_Number of segments:"
 msgstr "_Number of segments:"
 
+#: ../plug-ins/common/blur-gauss-selective.c:104
+msgid "Blur neighboring pixels, but only in low-contrast areas"
+msgstr "Blur neighbouring pixels, but only in low-contrast areas"
+
+#: ../plug-ins/common/blur-gauss-selective.c:115
+msgid "_Selective Gaussian Blur..."
+msgstr "_Selective Gaussian Blur..."
+
+#: ../plug-ins/common/blur-gauss-selective.c:195
+#: ../plug-ins/common/blur-gauss-selective.c:232
+msgid "Selective Gaussian Blur"
+msgstr "Selective Gaussian Blur"
+
+#: ../plug-ins/common/blur-gauss-selective.c:211
+#: ../plug-ins/common/blur-gauss.c:448 ../plug-ins/common/cartoon.c:232
+#: ../plug-ins/common/edge-dog.c:267 ../plug-ins/common/edge-neon.c:228
+#: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244
+#: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224
+#: ../plug-ins/file-sgi/sgi.c:536 ../plug-ins/file-xjt/xjt.c:1701
+#: ../plug-ins/gradient-flare/gradient-flare.c:966
+msgid "Cannot operate on indexed color images."
+msgstr "Cannot operate on indexed colour images."
+
+#: ../plug-ins/common/blur-gauss-selective.c:271
+msgid "_Blur radius:"
+msgstr "_Blur radius:"
+
+#: ../plug-ins/common/blur-gauss-selective.c:281
+msgid "_Max. delta:"
+msgstr "_Max. delta:"
+
+#: ../plug-ins/common/blur-gauss.c:159
+msgid "Simplest, most commonly used way of blurring"
+msgstr "Simplest, most commonly used way of blurring"
+
+#: ../plug-ins/common/blur-gauss.c:172
+msgid "_Gaussian Blur..."
+msgstr "_Gaussian Blur..."
+
+#: ../plug-ins/common/blur-gauss.c:179 ../plug-ins/common/blur-gauss.c:199
+#: ../plug-ins/common/blur-gauss.c:219 ../plug-ins/common/blur-gauss.c:239
+msgid "Apply a gaussian blur"
+msgstr "Apply a gaussian blur"
+
+#: ../plug-ins/common/blur-gauss.c:428 ../plug-ins/common/blur-gauss.c:478
+msgid "Gaussian Blur"
+msgstr "Gaussian Blur"
+
+#. parameter settings
+#: ../plug-ins/common/blur-gauss.c:508
+msgid "Blur Radius"
+msgstr "Blur Radius"
+
+#: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457
+#: ../plug-ins/common/noise-spread.c:386
+msgid "_Horizontal:"
+msgstr "_Horizontal:"
+
+#: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474
+#: ../plug-ins/common/noise-spread.c:390
+msgid "_Vertical:"
+msgstr "_Vertical:"
+
+#: ../plug-ins/common/blur-gauss.c:549
+msgid "Blur Method"
+msgstr "Blur Method"
+
+#: ../plug-ins/common/blur-gauss.c:553
+msgid "_IIR"
+msgstr "_IIR"
+
+#: ../plug-ins/common/blur-gauss.c:554
+msgid "_RLE"
+msgstr "_RLE"
+
+#: ../plug-ins/common/blur-motion.c:157 ../plug-ins/common/blur-motion.c:171
+msgid "Simulate movement using directional blur"
+msgstr "Simulate movement using directional blur"
+
+#: ../plug-ins/common/blur-motion.c:164 ../plug-ins/common/blur-motion.c:177
+msgid "_Motion Blur..."
+msgstr "_Motion Blur..."
+
+#: ../plug-ins/common/blur-motion.c:910
+msgid "Motion blurring"
+msgstr "Motion blurring"
+
+#: ../plug-ins/common/blur-motion.c:1012
+msgid "Motion Blur"
+msgstr "Motion Blur"
+
+#: ../plug-ins/common/blur-motion.c:1045
+msgid "Blur Type"
+msgstr "Blur Type"
+
+#: ../plug-ins/common/blur-motion.c:1049
+msgctxt "blur-type"
+msgid "_Linear"
+msgstr "_Linear"
+
+#: ../plug-ins/common/blur-motion.c:1050
+msgctxt "blur-type"
+msgid "_Radial"
+msgstr "_Radial"
+
+#: ../plug-ins/common/blur-motion.c:1051
+msgctxt "blur-type"
+msgid "_Zoom"
+msgstr "_Zoom "
+
+#: ../plug-ins/common/blur-motion.c:1058
+msgid "Blur Center"
+msgstr "Blur Centre"
+
+#: ../plug-ins/common/blur-motion.c:1094 ../plug-ins/common/lens-flare.c:772
+#: ../plug-ins/common/nova.c:463 ../plug-ins/common/tile-paper.c:282
+#: ../plug-ins/flame/flame.c:1251
+#: ../plug-ins/gradient-flare/gradient-flare.c:2725
+#: ../plug-ins/lighting/lighting-ui.c:477
+msgid "_X:"
+msgstr "_X:"
+
+#: ../plug-ins/common/blur-motion.c:1099 ../plug-ins/common/lens-flare.c:777
+#: ../plug-ins/common/nova.c:468 ../plug-ins/common/tile-paper.c:291
+#: ../plug-ins/flame/flame.c:1265
+#: ../plug-ins/gradient-flare/gradient-flare.c:2729
+#: ../plug-ins/lighting/lighting-ui.c:492
+msgid "_Y:"
+msgstr "_Y:"
+
+#: ../plug-ins/common/blur-motion.c:1101
+msgid "Blur _outward"
+msgstr "Blur _outward"
+
+#: ../plug-ins/common/blur-motion.c:1114
+msgid "Blur Parameters"
+msgstr "Blur Parameters"
+
+#: ../plug-ins/common/blur-motion.c:1125
+#: ../plug-ins/map-object/map-object-ui.c:1252
+msgid "L_ength:"
+msgstr "L_ength:"
+
+#: ../plug-ins/common/blur-motion.c:1138 ../plug-ins/common/newsprint.c:1001
+msgid "_Angle:"
+msgstr "_Angle:"
+
 #: ../plug-ins/common/blur.c:125
 msgid "Simple blur, fast but not very strong"
 msgstr "Simple blur, fast but not very strong"
@@ -2199,90 +778,112 @@ msgstr "Simple blur, fast but not very strong"
 msgid "_Blur"
 msgstr "_Blur"
 
-#: ../plug-ins/common/blur.c:178 ../plug-ins/common/unsharp.c:439
+#: ../plug-ins/common/blur.c:178 ../plug-ins/common/unsharp-mask.c:439
 msgid "Blurring"
 msgstr "Blurring"
 
-#: ../plug-ins/common/borderaverage.c:99
+#: ../plug-ins/common/border-average.c:99
 msgid "Set foreground to the average color of the image border"
 msgstr "Set foreground to the average colour of the image border"
 
-#: ../plug-ins/common/borderaverage.c:104
+#: ../plug-ins/common/border-average.c:104
 msgid "_Border Average..."
 msgstr "_Border Average..."
 
-#: ../plug-ins/common/borderaverage.c:171
+#: ../plug-ins/common/border-average.c:171
 msgid "Border Average"
 msgstr "Border Average"
 
-#: ../plug-ins/common/borderaverage.c:351
+#: ../plug-ins/common/border-average.c:351
 msgid "Borderaverage"
 msgstr "Borderaverage"
 
-#: ../plug-ins/common/borderaverage.c:372
+#: ../plug-ins/common/border-average.c:372
 msgid "Border Size"
 msgstr "Border Size"
 
-#: ../plug-ins/common/borderaverage.c:380
+#: ../plug-ins/common/border-average.c:380
 msgid "_Thickness:"
 msgstr "_Thickness:"
 
-#: ../plug-ins/common/borderaverage.c:423
+#. Number of Colors frame
+#: ../plug-ins/common/border-average.c:415
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:908
+msgid "Number of Colors"
+msgstr "Number of Colours"
+
+#: ../plug-ins/common/border-average.c:423
 msgid "_Bucket size:"
 msgstr "_Bucket size:"
 
-#: ../plug-ins/common/bumpmap.c:257
+#: ../plug-ins/common/bump-map.c:257
 msgid "Create an embossing effect using a bump map"
 msgstr "Create an embossing effect using a bump map"
 
-#: ../plug-ins/common/bumpmap.c:267
+#: ../plug-ins/common/bump-map.c:267
 msgid "_Bump Map..."
 msgstr "_Bump Map..."
 
-#: ../plug-ins/common/bumpmap.c:415
+#: ../plug-ins/common/bump-map.c:415
 msgid "Bump-mapping"
 msgstr "Bump-mapping"
 
-#: ../plug-ins/common/bumpmap.c:766
+#: ../plug-ins/common/bump-map.c:766
 msgid "Bump Map"
 msgstr "Bump Map"
 
-#: ../plug-ins/common/bumpmap.c:832
+#: ../plug-ins/common/bump-map.c:832
 msgid "_Bump map:"
 msgstr "_Bump map:"
 
-#: ../plug-ins/common/bumpmap.c:844
+#. Map type menu
+#: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:748
+#: ../plug-ins/lighting/lighting-ui.c:842
+msgid "Linear"
+msgstr "Linear"
+
+#: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:750
+#: ../plug-ins/lighting/lighting-ui.c:845
+msgid "Spherical"
+msgstr "Spherical"
+
+#: ../plug-ins/common/bump-map.c:837 ../plug-ins/flame/flame.c:749
+#: ../plug-ins/lighting/lighting-ui.c:844
+msgid "Sinusoidal"
+msgstr "Sinusoidal"
+
+#: ../plug-ins/common/bump-map.c:844
 msgid "_Map type:"
 msgstr "_Map type:"
 
 #. Compensate darkening
-#: ../plug-ins/common/bumpmap.c:849
+#: ../plug-ins/common/bump-map.c:849
 msgid "Co_mpensate for darkening"
 msgstr "Co_mpensate for darkening"
 
 #. Invert bumpmap
-#: ../plug-ins/common/bumpmap.c:863
+#: ../plug-ins/common/bump-map.c:863
 msgid "I_nvert bumpmap"
 msgstr "I_nvert bumpmap"
 
 #. Tile bumpmap
-#: ../plug-ins/common/bumpmap.c:877
+#: ../plug-ins/common/bump-map.c:877
 msgid "_Tile bumpmap"
 msgstr "_Tile bumpmap"
 
-#: ../plug-ins/common/bumpmap.c:892 ../plug-ins/common/emboss.c:499
+#: ../plug-ins/common/bump-map.c:892 ../plug-ins/common/emboss.c:499
 msgid "_Azimuth:"
 msgstr "_Azimuth:"
 
-#: ../plug-ins/common/bumpmap.c:904
+#: ../plug-ins/common/bump-map.c:904
 msgid "_Elevation:"
 msgstr "_Elevation:"
 
-#: ../plug-ins/common/bumpmap.c:930 ../plug-ins/common/postscript.c:3381
+#: ../plug-ins/common/bump-map.c:930 ../plug-ins/common/file-ps.c:3398
 msgid "_X offset:"
 msgstr "_X offset:"
 
-#: ../plug-ins/common/bumpmap.c:933 ../plug-ins/common/bumpmap.c:947
+#: ../plug-ins/common/bump-map.c:933 ../plug-ins/common/bump-map.c:947
 msgid ""
 "The offset can be adjusted by dragging the preview using the middle mouse "
 "button."
@@ -2290,34 +891,18 @@ msgstr ""
 "The offset can be adjusted by dragging the preview using the middle mouse "
 "button."
 
-#: ../plug-ins/common/bumpmap.c:944 ../plug-ins/common/postscript.c:3390
+#: ../plug-ins/common/bump-map.c:944 ../plug-ins/common/file-ps.c:3407
 msgid "_Y offset:"
 msgstr "_Y offset:"
 
-#: ../plug-ins/common/bumpmap.c:958
+#: ../plug-ins/common/bump-map.c:958
 msgid "_Waterlevel:"
 msgstr "_Waterlevel:"
 
-#: ../plug-ins/common/bumpmap.c:970
+#: ../plug-ins/common/bump-map.c:970
 msgid "A_mbient:"
 msgstr "A_mbient:"
 
-#: ../plug-ins/common/c_astretch.c:68
-msgid "Stretch contrast to cover the maximum possible range"
-msgstr "Stretch contrast to cover the maximum possible range"
-
-#: ../plug-ins/common/c_astretch.c:79
-msgid "_Stretch Contrast"
-msgstr "_Stretch Contrast"
-
-#: ../plug-ins/common/c_astretch.c:113
-msgid "Auto-stretching contrast"
-msgstr "Auto-stretching contrast"
-
-#: ../plug-ins/common/c_astretch.c:152
-msgid "c_astretch: cmap was NULL!  Quitting...\n"
-msgstr "c_astretch: cmap was NULL!  Quitting...\n"
-
 #: ../plug-ins/common/cartoon.c:142
 msgid "Simulate a cartoon by enhancing edges"
 msgstr "Simulate a cartoon by enhancing edges"
@@ -2326,118 +911,169 @@ msgstr "Simulate a cartoon by enhancing edges"
 msgid "Ca_rtoon..."
 msgstr "Ca_rtoon..."
 
-#: ../plug-ins/common/cartoon.c:229 ../plug-ins/common/dog.c:251
-#: ../plug-ins/common/gauss.c:445 ../plug-ins/common/neon.c:225
-#: ../plug-ins/common/photocopy.c:241 ../plug-ins/common/sel_gauss.c:211
-#: ../plug-ins/common/softglow.c:221 ../plug-ins/gflare/gflare.c:965
-#: ../plug-ins/sgi/sgi.c:520 ../plug-ins/xjt/xjt.c:1688
-msgid "Cannot operate on indexed color images."
-msgstr "Cannot operate on indexed colour images."
-
-#: ../plug-ins/common/cartoon.c:809
+#: ../plug-ins/common/cartoon.c:811
 msgid "Cartoon"
 msgstr "Cartoon"
 
-#: ../plug-ins/common/cartoon.c:846 ../plug-ins/common/photocopy.c:874
+#: ../plug-ins/common/cartoon.c:848 ../plug-ins/common/photocopy.c:876
 msgid "_Mask radius:"
 msgstr "_Mask radius:"
 
-#: ../plug-ins/common/cartoon.c:860
+#: ../plug-ins/common/cartoon.c:862
 msgid "_Percent black:"
 msgstr "_Percent black:"
 
-#: ../plug-ins/common/ccanalyze.c:106
-msgid "Analyze the set of colors in the image"
-msgstr "Analyze the set of colours in the image"
-
-#: ../plug-ins/common/ccanalyze.c:112
-msgid "Colorcube A_nalysis..."
-msgstr "Colourcube A_nalysis..."
-
-#: ../plug-ins/common/ccanalyze.c:200 ../plug-ins/common/ccanalyze.c:356
-msgid "Colorcube Analysis"
-msgstr "Colourcube Analysis"
-
-#. output results
-#: ../plug-ins/common/ccanalyze.c:384
-#: ../plug-ins/imagemap/imap_cmd_guides.c:231
-#, c-format
-msgid "Image dimensions: %d × %d"
-msgstr "Image dimensions: %d × %d"
-
-#: ../plug-ins/common/ccanalyze.c:387
-msgid "No colors"
-msgstr "No colours"
-
-#: ../plug-ins/common/ccanalyze.c:389
-msgid "Only one unique color"
-msgstr "Only one unique colour"
-
-#: ../plug-ins/common/ccanalyze.c:391
-#, c-format
-msgid "Number of unique colors: %d"
-msgstr "Number of unique colours: %d"
-
-#: ../plug-ins/common/channel_mixer.c:175
+#: ../plug-ins/common/channel-mixer.c:175
 msgid "Alter colors by mixing RGB Channels"
 msgstr "Alter colours by mixing RGB Channels"
 
-#: ../plug-ins/common/channel_mixer.c:180
+#: ../plug-ins/common/channel-mixer.c:180
 msgid "Channel Mi_xer..."
 msgstr "Channel Mi_xer..."
 
 #. printf("Channel Mixer:: Mode:%d  r %f  g %f  b %f\n ",
 #. param[3].data.d_int32, mix.black.red_gain,
 #. mix.black.green_gain, mix.black.blue_gain);
-#: ../plug-ins/common/channel_mixer.c:271
-#: ../plug-ins/common/channel_mixer.c:492
+#: ../plug-ins/common/channel-mixer.c:271
+#: ../plug-ins/common/channel-mixer.c:492
 msgid "Channel Mixer"
 msgstr "Channel Mixer"
 
-#: ../plug-ins/common/channel_mixer.c:528
+#: ../plug-ins/common/channel-mixer.c:529
 msgid "O_utput channel:"
 msgstr "O_utput channel:"
 
-#: ../plug-ins/common/channel_mixer.c:582 ../plug-ins/common/compose.c:190
+#. Redmode radio frame
+#: ../plug-ins/common/channel-mixer.c:538 ../plug-ins/common/decompose.c:174
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:991
+msgid "Red"
+msgstr "Red"
+
+#. Greenmode radio frame
+#: ../plug-ins/common/channel-mixer.c:543 ../plug-ins/common/decompose.c:175
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1032
+msgid "Green"
+msgstr "Green"
+
+#. Bluemode radio frame
+#: ../plug-ins/common/channel-mixer.c:548 ../plug-ins/common/decompose.c:176
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1073
+msgid "Blue"
+msgstr "Blue"
+
+#: ../plug-ins/common/channel-mixer.c:583
+#: ../plug-ins/common/color-exchange.c:398 ../plug-ins/common/compose.c:190
 #: ../plug-ins/common/compose.c:201 ../plug-ins/common/diffraction.c:501
 #: ../plug-ins/common/diffraction.c:539 ../plug-ins/common/diffraction.c:577
-#: ../plug-ins/common/exchange.c:398 ../plug-ins/common/noisify.c:530
-#: ../plug-ins/common/noisify.c:537
+#: ../plug-ins/common/noise-rgb.c:530 ../plug-ins/common/noise-rgb.c:537
 msgid "_Red:"
 msgstr "_Red:"
 
-#: ../plug-ins/common/channel_mixer.c:600 ../plug-ins/common/compose.c:191
+#: ../plug-ins/common/channel-mixer.c:601
+#: ../plug-ins/common/color-exchange.c:458 ../plug-ins/common/compose.c:191
 #: ../plug-ins/common/compose.c:202 ../plug-ins/common/diffraction.c:510
 #: ../plug-ins/common/diffraction.c:548 ../plug-ins/common/diffraction.c:586
-#: ../plug-ins/common/exchange.c:458 ../plug-ins/common/noisify.c:531
-#: ../plug-ins/common/noisify.c:538
+#: ../plug-ins/common/noise-rgb.c:531 ../plug-ins/common/noise-rgb.c:538
 msgid "_Green:"
 msgstr "_Green:"
 
-#: ../plug-ins/common/channel_mixer.c:619 ../plug-ins/common/compose.c:192
+#: ../plug-ins/common/channel-mixer.c:620
+#: ../plug-ins/common/color-exchange.c:519 ../plug-ins/common/compose.c:192
 #: ../plug-ins/common/compose.c:203 ../plug-ins/common/diffraction.c:519
 #: ../plug-ins/common/diffraction.c:557 ../plug-ins/common/diffraction.c:595
-#: ../plug-ins/common/exchange.c:519 ../plug-ins/common/noisify.c:532
-#: ../plug-ins/common/noisify.c:539
+#: ../plug-ins/common/noise-rgb.c:532 ../plug-ins/common/noise-rgb.c:539
 msgid "_Blue:"
 msgstr "_Blue:"
 
-#: ../plug-ins/common/channel_mixer.c:635
+#: ../plug-ins/common/channel-mixer.c:636
 msgid "_Monochrome"
 msgstr "_Monochrome"
 
-#: ../plug-ins/common/channel_mixer.c:648
+#: ../plug-ins/common/channel-mixer.c:649
 msgid "Preserve _luminosity"
 msgstr "Preserve _luminosity"
 
-#: ../plug-ins/common/channel_mixer.c:877
+#: ../plug-ins/common/channel-mixer.c:878
 msgid "Load Channel Mixer Settings"
 msgstr "Load Channel Mixer Settings"
 
-#: ../plug-ins/common/channel_mixer.c:1004
+#. stat error (file does not exist)
+#: ../plug-ins/common/channel-mixer.c:982
+#: ../plug-ins/common/cml-explorer.c:2178 ../plug-ins/common/curve-bend.c:885
+#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-compressor.c:498
+#: ../plug-ins/common/file-compressor.c:666
+#: ../plug-ins/common/file-dicom.c:325 ../plug-ins/common/file-gbr.c:361
+#: ../plug-ins/common/file-gif-load.c:340 ../plug-ins/common/file-gih.c:662
+#: ../plug-ins/common/file-mng.c:1108 ../plug-ins/common/file-pat.c:330
+#: ../plug-ins/common/file-pcx.c:361 ../plug-ins/common/file-pdf.c:541
+#: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:721
+#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1036
+#: ../plug-ins/common/file-ps.c:3048 ../plug-ins/common/file-psp.c:1751
+#: ../plug-ins/common/file-raw.c:249 ../plug-ins/common/file-raw.c:666
+#: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333
+#: ../plug-ins/common/file-svg.c:731 ../plug-ins/common/file-tga.c:442
+#: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
+#: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2002
+#: ../plug-ins/file-bmp/bmp-read.c:156 ../plug-ins/file-faxg3/faxg3.c:233
+#: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:460
+#: ../plug-ins/file-fli/fli-gimp.c:497 ../plug-ins/file-ico/ico-load.c:653
+#: ../plug-ins/file-ico/ico-load.c:732 ../plug-ins/file-jpeg/jpeg-load.c:109
+#: ../plug-ins/file-jpeg/jpeg-load.c:831 ../plug-ins/file-psd/psd-load.c:131
+#: ../plug-ins/file-psd/psd-thumb-load.c:80
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:272
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:190
+#: ../plug-ins/file-xjt/xjt.c:2560 ../plug-ins/file-xjt/xjt.c:2568
+#: ../plug-ins/flame/flame.c:412
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1863
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:929
+#: ../plug-ins/gfig/gfig.c:434 ../plug-ins/help/gimphelplocale.c:223
+#: ../plug-ins/help/gimphelplocale.c:239
+#: ../plug-ins/lighting/lighting-ui.c:1354
+#, c-format
+msgid "Could not open '%s' for reading: %s"
+msgstr "Could not open '%s' for reading: %s"
+
+#: ../plug-ins/common/channel-mixer.c:1005
 msgid "Save Channel Mixer Settings"
 msgstr "Save Channel Mixer Settings"
 
+#: ../plug-ins/common/channel-mixer.c:1060
+#: ../plug-ins/common/cml-explorer.c:2005 ../plug-ins/common/curve-bend.c:833
+#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-compressor.c:426
+#: ../plug-ins/common/file-compressor.c:508
+#: ../plug-ins/common/file-compressor.c:590
+#: ../plug-ins/common/file-compressor.c:677
+#: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:801
+#: ../plug-ins/common/file-gbr.c:632 ../plug-ins/common/file-gif-save.c:761
+#: ../plug-ins/common/file-gih.c:1275 ../plug-ins/common/file-html-table.c:236
+#: ../plug-ins/common/file-mng.c:610 ../plug-ins/common/file-mng.c:944
+#: ../plug-ins/common/file-pat.c:462 ../plug-ins/common/file-pcx.c:666
+#: ../plug-ins/common/file-pix.c:524 ../plug-ins/common/file-png.c:1270
+#: ../plug-ins/common/file-pnm.c:977 ../plug-ins/common/file-ps.c:1213
+#: ../plug-ins/common/file-raw.c:546 ../plug-ins/common/file-raw.c:574
+#: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1170
+#: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
+#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2111
+#: ../plug-ins/file-bmp/bmp-write.c:296 ../plug-ins/file-fits/fits.c:476
+#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1008
+#: ../plug-ins/file-jpeg/jpeg-save.c:325 ../plug-ins/file-psd/psd-save.c:1635
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:283
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:163
+#: ../plug-ins/file-xjt/xjt.c:1292 ../plug-ins/file-xjt/xjt.c:1729
+#: ../plug-ins/flame/flame.c:443
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1546
+#: ../plug-ins/gfig/gfig.c:794 ../plug-ins/ifs-compose/ifs-compose.c:2374
+#: ../plug-ins/lighting/lighting-ui.c:1211
+#, c-format
+msgid "Could not open '%s' for writing: %s"
+msgstr "Could not open '%s' for writing: %s"
+
+#: ../plug-ins/common/channel-mixer.c:1068
+#: ../plug-ins/common/cml-explorer.c:2060
+#, c-format
+msgid "Parameters were saved to '%s'"
+msgstr "Parameters were saved to '%s'"
+
 #: ../plug-ins/common/checkerboard.c:89
 msgid "Create a checkerboard pattern"
 msgstr "Create a checkerboard pattern"
@@ -2463,18 +1099,551 @@ msgstr "_Size:"
 msgid "_Psychobilly"
 msgstr "_Psychobilly"
 
-#: ../plug-ins/common/color_enhance.c:69
+#: ../plug-ins/common/cml-explorer.c:129
+msgid "Keep image's values"
+msgstr "Keep image's values"
+
+#: ../plug-ins/common/cml-explorer.c:130
+msgid "Keep the first value"
+msgstr "Keep the first value"
+
+#: ../plug-ins/common/cml-explorer.c:131
+msgid "Fill with parameter k"
+msgstr "Fill with parameter k"
+
+#: ../plug-ins/common/cml-explorer.c:132
+msgid "k{x(1-x)}^p"
+msgstr "k{x(1-x)}^p"
+
+#: ../plug-ins/common/cml-explorer.c:133
+msgid "k{x(1-x)}^p stepped"
+msgstr "k{x(1-x)}^p stepped"
+
+#: ../plug-ins/common/cml-explorer.c:134
+msgid "kx^p"
+msgstr "kx^p"
+
+#: ../plug-ins/common/cml-explorer.c:135
+msgid "kx^p stepped"
+msgstr "kx^p stepped"
+
+#: ../plug-ins/common/cml-explorer.c:136
+msgid "k(1-x^p)"
+msgstr "k(1-x^p)"
+
+#: ../plug-ins/common/cml-explorer.c:137
+msgid "k(1-x^p) stepped"
+msgstr "k(1-x^p) stepped"
+
+#: ../plug-ins/common/cml-explorer.c:138
+msgid "Delta function"
+msgstr "Delta function"
+
+#: ../plug-ins/common/cml-explorer.c:139
+msgid "Delta function stepped"
+msgstr "Delta function stepped"
+
+#: ../plug-ins/common/cml-explorer.c:140
+msgid "sin^p-based function"
+msgstr "sin^p-based function"
+
+#: ../plug-ins/common/cml-explorer.c:141
+msgid "sin^p, stepped"
+msgstr "sin^p, stepped"
+
+#: ../plug-ins/common/cml-explorer.c:167
+msgid "Max (x, -)"
+msgstr "Max (x, -)"
+
+#: ../plug-ins/common/cml-explorer.c:168
+msgid "Max (x+d, -)"
+msgstr "Max (x+d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:169
+msgid "Max (x-d, -)"
+msgstr "Max (x-d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:170
+msgid "Min (x, -)"
+msgstr "Min (x, -)"
+
+#: ../plug-ins/common/cml-explorer.c:171
+msgid "Min (x+d, -)"
+msgstr "Min (x+d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:172
+msgid "Min (x-d, -)"
+msgstr "Min (x-d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:173
+msgid "Max (x+d, -), (x < 0.5)"
+msgstr "Max (x+d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:174
+msgid "Max (x+d, -), (0.5 < x)"
+msgstr "Max (x+d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:175
+msgid "Max (x-d, -), (x < 0.5)"
+msgstr "Max (x-d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:176
+msgid "Max (x-d, -), (0.5 < x)"
+msgstr "Max (x-d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:177
+msgid "Min (x+d, -), (x < 0.5)"
+msgstr "Min (x+d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:178
+msgid "Min (x+d, -), (0.5 < x)"
+msgstr "Min (x+d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:179
+msgid "Min (x-d, -), (x < 0.5)"
+msgstr "Min (x-d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:180
+msgid "Min (x-d, -), (0.5 < x)"
+msgstr "Min (x-d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1651
+msgid "Standard"
+msgstr "Standard"
+
+#: ../plug-ins/common/cml-explorer.c:201
+msgid "Use average value"
+msgstr "Use average value"
+
+#: ../plug-ins/common/cml-explorer.c:202
+msgid "Use reverse value"
+msgstr "Use reverse value"
+
+#: ../plug-ins/common/cml-explorer.c:203
+msgid "With random power (0,10)"
+msgstr "With random power (0,10)"
+
+#: ../plug-ins/common/cml-explorer.c:204
+msgid "With random power (0,1)"
+msgstr "With random power (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:205
+msgid "With gradient power (0,1)"
+msgstr "With gradient power (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:206
+msgid "Multiply rand. value (0,1)"
+msgstr "Multiply rand. value (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:207
+msgid "Multiply rand. value (0,2)"
+msgstr "Multiply rand. value (0,2)"
+
+#: ../plug-ins/common/cml-explorer.c:208
+msgid "Multiply gradient (0,1)"
+msgstr "Multiply gradient (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:209
+msgid "With p and random (0,1)"
+msgstr "With p and random (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:223
+msgid "All black"
+msgstr "All black"
+
+#: ../plug-ins/common/cml-explorer.c:224
+msgid "All gray"
+msgstr "All grey"
+
+#: ../plug-ins/common/cml-explorer.c:225
+msgid "All white"
+msgstr "All white"
+
+#: ../plug-ins/common/cml-explorer.c:226
+msgid "The first row of the image"
+msgstr "The first row of the image"
+
+#: ../plug-ins/common/cml-explorer.c:227
+msgid "Continuous gradient"
+msgstr "Continuous gradient"
+
+#: ../plug-ins/common/cml-explorer.c:228
+msgid "Continuous grad. w/o gap"
+msgstr "Continuous grad. w/o gap"
+
+#: ../plug-ins/common/cml-explorer.c:229
+msgid "Random, ch. independent"
+msgstr "Random, ch. independent"
+
+#: ../plug-ins/common/cml-explorer.c:230
+msgid "Random shared"
+msgstr "Random shared"
+
+#: ../plug-ins/common/cml-explorer.c:231
+msgid "Randoms from seed"
+msgstr "Randoms from seed"
+
+#: ../plug-ins/common/cml-explorer.c:232
+msgid "Randoms from seed (shared)"
+msgstr "Randoms from seed (shared)"
+
+#: ../plug-ins/common/cml-explorer.c:300 ../plug-ins/common/cml-explorer.c:308
+#: ../plug-ins/common/decompose.c:188
+#: ../plug-ins/gimpressionist/orientation.c:180
+#: ../plug-ins/gimpressionist/size.c:183
+msgid "Hue"
+msgstr "Hue"
+
+#: ../plug-ins/common/cml-explorer.c:301 ../plug-ins/common/cml-explorer.c:309
+#: ../plug-ins/common/decompose.c:189
+msgid "Saturation"
+msgstr "Saturation"
+
+#: ../plug-ins/common/cml-explorer.c:302 ../plug-ins/common/cml-explorer.c:310
+#: ../plug-ins/common/decompose.c:190
+#: ../plug-ins/gimpressionist/orientation.c:156
+#: ../plug-ins/gimpressionist/size.c:159
+msgid "Value"
+msgstr "Value"
+
+#: ../plug-ins/common/cml-explorer.c:307
+msgid "(None)"
+msgstr "(None)"
+
+#: ../plug-ins/common/cml-explorer.c:455
+msgid "Create abstract Coupled-Map Lattice patterns"
+msgstr "Create abstract Coupled-Map Lattice patterns"
+
+#: ../plug-ins/common/cml-explorer.c:466
+msgid "CML _Explorer..."
+msgstr "CML _Explorer..."
+
+#: ../plug-ins/common/cml-explorer.c:756
+msgid "CML Explorer: evoluting"
+msgstr "CML Explorer: evoluting"
+
+#: ../plug-ins/common/cml-explorer.c:1177
+msgid "Coupled-Map-Lattice Explorer"
+msgstr "Coupled-Map-Lattice Explorer"
+
+#: ../plug-ins/common/cml-explorer.c:1224
+msgid "New Seed"
+msgstr "New Seed"
+
+#: ../plug-ins/common/cml-explorer.c:1235
+msgid "Fix Seed"
+msgstr "Fix Seed"
+
+#: ../plug-ins/common/cml-explorer.c:1246
+msgid "Random Seed"
+msgstr "Random Seed"
+
+#: ../plug-ins/common/cml-explorer.c:1288 ../plug-ins/common/filter-pack.c:700
+#: ../plug-ins/common/van-gogh-lic.c:671
+msgid "_Hue"
+msgstr "_Hue"
+
+#: ../plug-ins/common/cml-explorer.c:1292
+msgid "Sat_uration"
+msgstr "Sat_uration"
+
+#: ../plug-ins/common/cml-explorer.c:1296 ../plug-ins/common/filter-pack.c:708
+msgid "_Value"
+msgstr "_Value"
+
+#: ../plug-ins/common/cml-explorer.c:1300
+msgid "_Advanced"
+msgstr "_Advanced"
+
+#: ../plug-ins/common/cml-explorer.c:1315
+msgid "Channel Independent Parameters"
+msgstr "Channel Independent Parameters"
+
+#: ../plug-ins/common/cml-explorer.c:1337
+msgid "Initial value:"
+msgstr "Initial value:"
+
+#: ../plug-ins/common/cml-explorer.c:1343
+msgid "Zoom scale:"
+msgstr "Zoom scale:"
+
+#: ../plug-ins/common/cml-explorer.c:1352
+msgid "Start offset:"
+msgstr "Start offset:"
+
+#: ../plug-ins/common/cml-explorer.c:1361
+msgid "Seed of Random (only for \"From Seed\" Modes)"
+msgstr "Seed of Random (only for \"From Seed\" Modes)"
+
+#: ../plug-ins/common/cml-explorer.c:1372 ../plug-ins/maze/maze-dialog.c:261
+msgid "Seed:"
+msgstr "Seed:"
+
+#: ../plug-ins/common/cml-explorer.c:1385
+msgid "Switch to \"From seed\" With the Last Seed"
+msgstr "Switch to \"From seed\" With the Last Seed"
+
+#: ../plug-ins/common/cml-explorer.c:1397
+msgid ""
+"\"Fix seed\" button is an alias of me.\n"
+"The same seed produces the same image, if (1) the widths of images are same "
+"(this is the reason why image on drawable is different from preview), and "
+"(2) all mutation rates equal to zero."
+msgstr ""
+"\"Fix seed\" button is an alias of me.\n"
+"The same seed produces the same image, if (1) the widths of images are same "
+"(this is the reason why image on drawable is different from preview), and "
+"(2) all mutation rates equal to zero."
+
+#: ../plug-ins/common/cml-explorer.c:1405
+msgid "O_thers"
+msgstr "O_thers"
+
+#: ../plug-ins/common/cml-explorer.c:1420
+msgid "Copy Settings"
+msgstr "Copy Settings"
+
+#: ../plug-ins/common/cml-explorer.c:1439
+msgid "Source channel:"
+msgstr "Source channel:"
+
+#: ../plug-ins/common/cml-explorer.c:1454
+#: ../plug-ins/common/cml-explorer.c:1502
+msgid "Destination channel:"
+msgstr "Destination channel:"
+
+#: ../plug-ins/common/cml-explorer.c:1458
+msgid "Copy Parameters"
+msgstr "Copy Parameters"
+
+#: ../plug-ins/common/cml-explorer.c:1467
+msgid "Selective Load Settings"
+msgstr "Selective Load Settings"
+
+#: ../plug-ins/common/cml-explorer.c:1487
+msgid "Source channel in file:"
+msgstr "Source channel in file:"
+
+#: ../plug-ins/common/cml-explorer.c:1508
+msgid "_Misc Ops."
+msgstr "_Misc Ops."
+
+#: ../plug-ins/common/cml-explorer.c:1557
+msgid "Function type:"
+msgstr "Function type:"
+
+#: ../plug-ins/common/cml-explorer.c:1573
+msgid "Composition:"
+msgstr "Composition:"
+
+#: ../plug-ins/common/cml-explorer.c:1587
+msgid "Misc arrange:"
+msgstr "Misc arrange:"
+
+#: ../plug-ins/common/cml-explorer.c:1591
+msgid "Use cyclic range"
+msgstr "Use cyclic range"
+
+#: ../plug-ins/common/cml-explorer.c:1601
+msgid "Mod. rate:"
+msgstr "Mod. rate:"
+
+#: ../plug-ins/common/cml-explorer.c:1610
+msgid "Env. sensitivity:"
+msgstr "Env. sensitivity:"
+
+#: ../plug-ins/common/cml-explorer.c:1619
+msgid "Diffusion dist.:"
+msgstr "Diffusion dist.:"
+
+#: ../plug-ins/common/cml-explorer.c:1628
+msgid "# of subranges:"
+msgstr "# of subranges:"
+
+#: ../plug-ins/common/cml-explorer.c:1637
+msgid "P(ower factor):"
+msgstr "P(ower factor):"
+
+#: ../plug-ins/common/cml-explorer.c:1646
+msgid "Parameter k:"
+msgstr "Parameter k:"
+
+#: ../plug-ins/common/cml-explorer.c:1655
+msgid "Range low:"
+msgstr "Range low:"
+
+#: ../plug-ins/common/cml-explorer.c:1664
+msgid "Range high:"
+msgstr "Range high:"
+
+#: ../plug-ins/common/cml-explorer.c:1676
+msgid "Plot a Graph of the Settings"
+msgstr "Plot a Graph of the Settings"
+
+#: ../plug-ins/common/cml-explorer.c:1721
+msgid "Ch. sensitivity:"
+msgstr "Ch. sensitivity:"
+
+#: ../plug-ins/common/cml-explorer.c:1731
+msgid "Mutation rate:"
+msgstr "Mutation rate:"
+
+#: ../plug-ins/common/cml-explorer.c:1741
+msgid "Mutation dist.:"
+msgstr "Mutation dist.:"
+
+#: ../plug-ins/common/cml-explorer.c:1819
+msgid "Graph of the Current Settings"
+msgstr "Graph of the Current Settings"
+
+#: ../plug-ins/common/cml-explorer.c:1890
+msgid "Warning: the source and the destination are the same channel."
+msgstr "Warning: the source and the destination are the same channel."
+
+#: ../plug-ins/common/cml-explorer.c:1949
+msgid "Save CML Explorer Parameters"
+msgstr "Save CML Explorer Parameters"
+
+#: ../plug-ins/common/cml-explorer.c:2082
+msgid "Load CML Explorer Parameters"
+msgstr "Load CML Explorer Parameters"
+
+#: ../plug-ins/common/cml-explorer.c:2200
+msgid "Error: it's not CML parameter file."
+msgstr "Error: it's not CML parameter file."
+
+#: ../plug-ins/common/cml-explorer.c:2207
+#, c-format
+msgid "Warning: '%s' is an old format file."
+msgstr "Warning: '%s' is an old format file."
+
+#: ../plug-ins/common/cml-explorer.c:2211
+#, c-format
+msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
+msgstr "Warning: '%s' is a parameter file for a newer version of CML Explorer."
+
+#: ../plug-ins/common/cml-explorer.c:2274
+msgid "Error: failed to load parameters"
+msgstr "Error: failed to load parameters"
+
+#: ../plug-ins/common/color-cube-analyze.c:106
+msgid "Analyze the set of colors in the image"
+msgstr "Analyze the set of colours in the image"
+
+#: ../plug-ins/common/color-cube-analyze.c:112
+msgid "Colorcube A_nalysis..."
+msgstr "Colourcube A_nalysis..."
+
+#: ../plug-ins/common/color-cube-analyze.c:200
+#: ../plug-ins/common/color-cube-analyze.c:356
+msgid "Colorcube Analysis"
+msgstr "Colourcube Analysis"
+
+#. output results
+#: ../plug-ins/common/color-cube-analyze.c:384
+#: ../plug-ins/imagemap/imap_cmd_guides.c:231
+#, c-format
+msgid "Image dimensions: %d × %d"
+msgstr "Image dimensions: %d × %d"
+
+#: ../plug-ins/common/color-cube-analyze.c:387
+msgid "No colors"
+msgstr "No colours"
+
+#: ../plug-ins/common/color-cube-analyze.c:389
+msgid "Only one unique color"
+msgstr "Only one unique colour"
+
+#: ../plug-ins/common/color-cube-analyze.c:391
+#, c-format
+msgid "Number of unique colors: %d"
+msgstr "Number of unique colours: %d"
+
+#: ../plug-ins/common/color-enhance.c:69
 msgid "Stretch color saturation to cover maximum possible range"
 msgstr "Stretch colour saturation to cover maximum possible range"
 
-#: ../plug-ins/common/color_enhance.c:81
+#: ../plug-ins/common/color-enhance.c:81
 msgid "_Color Enhance"
 msgstr "_Colour Enhance"
 
-#: ../plug-ins/common/color_enhance.c:115
+#: ../plug-ins/common/color-enhance.c:115
 msgid "Color Enhance"
 msgstr "Colour Enhance"
 
+#: ../plug-ins/common/color-exchange.c:122
+msgid "Swap one color with another"
+msgstr "Swap one colour with another"
+
+#: ../plug-ins/common/color-exchange.c:128
+msgid "_Color Exchange..."
+msgstr "_Colour Exchange..."
+
+#: ../plug-ins/common/color-exchange.c:213
+#: ../plug-ins/common/color-exchange.c:287
+msgid "Color Exchange"
+msgstr "Colour Exchange"
+
+#: ../plug-ins/common/color-exchange.c:309
+msgid "Middle-Click Inside Preview to Pick \"From Color\""
+msgstr "Middle-Click Inside Preview to Pick \"From Colour\""
+
+#: ../plug-ins/common/color-exchange.c:347
+msgid "To Color"
+msgstr "To Colour"
+
+#: ../plug-ins/common/color-exchange.c:347
+msgid "From Color"
+msgstr "From Colour"
+
+#: ../plug-ins/common/color-exchange.c:365
+msgid "Color Exchange: To Color"
+msgstr "Colour Exchange: To Colour"
+
+#: ../plug-ins/common/color-exchange.c:366
+msgid "Color Exchange: From Color"
+msgstr "Colour Exchange: From Colour"
+
+#: ../plug-ins/common/color-exchange.c:424
+msgid "R_ed threshold:"
+msgstr "R_ed threshold:"
+
+#: ../plug-ins/common/color-exchange.c:484
+msgid "G_reen threshold:"
+msgstr "G_reen threshold:"
+
+#: ../plug-ins/common/color-exchange.c:545
+msgid "B_lue threshold:"
+msgstr "B_lue threshold:"
+
+#: ../plug-ins/common/color-exchange.c:573
+msgid "Lock _thresholds"
+msgstr "Lock _thresholds"
+
+#: ../plug-ins/common/color-to-alpha.c:94
+msgid "Convert a specified color to transparency"
+msgstr "Convert a specified colour to transparency"
+
+#: ../plug-ins/common/color-to-alpha.c:101
+msgid "Color to _Alpha..."
+msgstr "Colour to _Alpha..."
+
+#: ../plug-ins/common/color-to-alpha.c:184
+msgid "Removing color"
+msgstr "Removing colour"
+
+#: ../plug-ins/common/color-to-alpha.c:377
+msgid "Color to Alpha"
+msgstr "Colour to Alpha"
+
+#: ../plug-ins/common/color-to-alpha.c:414
+msgid "Color to Alpha Color Picker"
+msgstr "Colour to Alpha Colour Picker"
+
+#: ../plug-ins/common/color-to-alpha.c:429
+msgid "to alpha"
+msgstr "to alpha"
+
 #: ../plug-ins/common/colorify.c:102
 msgid "Replace all colors with shades of a specified color"
 msgstr "Replace all colours with shades of a specified colour"
@@ -2557,39 +1726,8 @@ msgstr ""
 "Drag and drop colours to rearrange the colourmap.  The numbers shown are the "
 "original indices.  Right-click for a menu with sort options."
 
-#: ../plug-ins/common/colortoalpha.c:94
-msgid "Convert a specified color to transparency"
-msgstr "Convert a specified colour to transparency"
-
-#: ../plug-ins/common/colortoalpha.c:101
-msgid "Color to _Alpha..."
-msgstr "Colour to _Alpha..."
-
-#: ../plug-ins/common/colortoalpha.c:184
-msgid "Removing color"
-msgstr "Removing colour"
-
-#: ../plug-ins/common/colortoalpha.c:377
-msgid "Color to Alpha"
-msgstr "Colour to Alpha"
-
-#. spinbutton 1
-#: ../plug-ins/common/colortoalpha.c:409 ../plug-ins/gfli/gfli.c:840
-#: ../plug-ins/gfli/gfli.c:910 ../plug-ins/rcm/rcm_dialog.c:299
-#: ../plug-ins/rcm/rcm_dialog.c:377
-msgid "From:"
-msgstr "From:"
-
-#: ../plug-ins/common/colortoalpha.c:413
-msgid "Color to Alpha Color Picker"
-msgstr "Colour to Alpha Colour Picker"
-
-#: ../plug-ins/common/colortoalpha.c:428
-msgid "to alpha"
-msgstr "to alpha"
-
 #: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170
-#: ../plug-ins/common/raw.c:1002
+#: ../plug-ins/common/file-raw.c:1023
 msgid "RGB"
 msgstr "RGB"
 
@@ -2597,8 +1735,8 @@ msgstr "RGB"
 msgid "RGBA"
 msgstr "RGBA"
 
-#: ../plug-ins/common/compose.c:204 ../plug-ins/common/noisify.c:525
-#: ../plug-ins/common/noisify.c:540
+#: ../plug-ins/common/compose.c:204 ../plug-ins/common/noise-rgb.c:525
+#: ../plug-ins/common/noise-rgb.c:540
 msgid "_Alpha:"
 msgstr "_Alpha:"
 
@@ -2611,11 +1749,11 @@ msgid "_Hue:"
 msgstr "_Hue:"
 
 #: ../plug-ins/common/compose.c:213 ../plug-ins/common/compose.c:221
-#: ../plug-ins/common/scatter_hsv.c:421
+#: ../plug-ins/common/noise-hsv.c:421
 msgid "_Saturation:"
 msgstr "_Saturation:"
 
-#: ../plug-ins/common/compose.c:214 ../plug-ins/common/scatter_hsv.c:433
+#: ../plug-ins/common/compose.c:214 ../plug-ins/common/noise-hsv.c:433
 msgid "_Value:"
 msgstr "_Value:"
 
@@ -2740,206 +1878,271 @@ msgstr "Could not get layers for image %d"
 msgid "Composing"
 msgstr "Composing"
 
-#: ../plug-ins/common/compose.c:697 ../plug-ins/common/compose.c:1731
+#: ../plug-ins/common/compose.c:697 ../plug-ins/common/compose.c:1735
 msgid "At least one image is needed to compose"
 msgstr "At least one image is needed to compose"
 
-#: ../plug-ins/common/compose.c:708 ../plug-ins/common/compose.c:721
+#: ../plug-ins/common/compose.c:708 ../plug-ins/common/compose.c:722
 #, c-format
 msgid "Specified layer %d not found"
 msgstr "Specified layer %d not found"
 
-#: ../plug-ins/common/compose.c:728
+#: ../plug-ins/common/compose.c:730
 msgid "Drawables have different size"
 msgstr "Drawables have different size"
 
-#: ../plug-ins/common/compose.c:753
+#: ../plug-ins/common/compose.c:755
 msgid "Images have different size"
 msgstr "Images have different size"
 
-#: ../plug-ins/common/compose.c:770
+#: ../plug-ins/common/compose.c:773
 msgid "Error in getting layer IDs"
 msgstr "Error in getting layer IDs"
 
-#: ../plug-ins/common/compose.c:791
+#: ../plug-ins/common/compose.c:796
 #, c-format
 msgid "Image is not a gray image (bpp=%d)"
 msgstr "Image is not a grey image (bpp=%d)"
 
-#: ../plug-ins/common/compose.c:818
+#: ../plug-ins/common/compose.c:824
 msgid "Unable to recompose, source layer not found"
 msgstr "Unable to recompose, source layer not found"
 
-#: ../plug-ins/common/compose.c:1484
+#: ../plug-ins/common/compose.c:1488
 msgid "Compose"
 msgstr "Compose"
 
 #. Compose type combo
-#: ../plug-ins/common/compose.c:1511
+#: ../plug-ins/common/compose.c:1515
 msgid "Compose Channels"
 msgstr "Compose Channels"
 
-#: ../plug-ins/common/compose.c:1521 ../plug-ins/common/decompose.c:1515
+#: ../plug-ins/common/compose.c:1525 ../plug-ins/common/decompose.c:1515
 msgid "Color _model:"
 msgstr "Colour _model:"
 
 #. Channel representation table
-#: ../plug-ins/common/compose.c:1553
+#: ../plug-ins/common/compose.c:1557
 msgid "Channel Representations"
 msgstr "Channel Representations"
 
-#: ../plug-ins/common/compose.c:1616
+#: ../plug-ins/common/compose.c:1620
 msgid "Mask value"
 msgstr "Mask value"
 
-#: ../plug-ins/common/compressor.c:158
-msgid "gzip archive"
-msgstr "gzip archive"
+#: ../plug-ins/common/contrast-normalize.c:80
+msgid "Stretch brightness values to cover the full range"
+msgstr "Stretch brightness values to cover the full range"
 
-#: ../plug-ins/common/compressor.c:179
-msgid "bzip archive"
-msgstr "bzip archive"
+#: ../plug-ins/common/contrast-normalize.c:92
+#: ../plug-ins/common/edge-dog.c:359
+msgid "_Normalize"
+msgstr "_Normalize"
 
-#: ../plug-ins/common/compressor.c:373
-msgid "No sensible file extension, saving as compressed XCF."
-msgstr "No sensible file extension, saving as compressed XCF."
+#: ../plug-ins/common/contrast-normalize.c:126
+msgid "Normalizing"
+msgstr "Normalising"
 
-#: ../plug-ins/common/compressor.c:536
-msgid "No sensible file extension, attempting to load with file magic."
-msgstr "No sensible file extension, attempting to load with file magic."
+#: ../plug-ins/common/contrast-retinex.c:156
+msgid "Enhance contrast using the Retinex method"
+msgstr "Enhance contrast using the Retinex method"
 
-#: ../plug-ins/common/convmatrix.c:64
+#: ../plug-ins/common/contrast-retinex.c:166
+msgid "Retine_x..."
+msgstr "Retine_x..."
+
+#: ../plug-ins/common/contrast-retinex.c:250
+msgid "Retinex"
+msgstr "Retinex"
+
+#: ../plug-ins/common/contrast-retinex.c:286
+msgid "Retinex Image Enhancement"
+msgstr "Retinex Image Enhancement"
+
+#: ../plug-ins/common/contrast-retinex.c:321
+msgid "Uniform"
+msgstr "Uniform"
+
+#: ../plug-ins/common/contrast-retinex.c:322
+msgid "Low"
+msgstr "Low"
+
+#: ../plug-ins/common/contrast-retinex.c:323
+msgid "High"
+msgstr "High"
+
+#: ../plug-ins/common/contrast-retinex.c:334
+msgid "_Level:"
+msgstr "_Level:"
+
+#: ../plug-ins/common/contrast-retinex.c:339
+msgid "_Scale:"
+msgstr "_Scale:"
+
+#: ../plug-ins/common/contrast-retinex.c:354
+msgid "Scale _division:"
+msgstr "Scale _division:"
+
+#: ../plug-ins/common/contrast-retinex.c:369
+msgid "Dy_namic:"
+msgstr "Dy_namic:"
+
+#: ../plug-ins/common/contrast-retinex.c:642
+msgid "Retinex: filtering"
+msgstr "Retinex: filtering"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:68
+msgid "Stretch image contrast to cover the maximum possible range"
+msgstr "Stretch image contrast to cover the maximum possible range"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:81
+msgid "Stretch _HSV"
+msgstr "Stretch _HSV"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:116
+msgid "Auto-Stretching HSV"
+msgstr "Auto-Stretching HSV"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:192
+msgid "autostretch_hsv: cmap was NULL!  Quitting...\n"
+msgstr "autostretch_hsv: cmap was NULL!  Quitting...\n"
+
+#: ../plug-ins/common/contrast-stretch.c:68
+msgid "Stretch contrast to cover the maximum possible range"
+msgstr "Stretch contrast to cover the maximum possible range"
+
+#: ../plug-ins/common/contrast-stretch.c:79
+msgid "_Stretch Contrast"
+msgstr "_Stretch Contrast"
+
+#: ../plug-ins/common/contrast-stretch.c:113
+msgid "Auto-stretching contrast"
+msgstr "Auto-stretching contrast"
+
+#: ../plug-ins/common/contrast-stretch.c:152
+msgid "c_astretch: cmap was NULL!  Quitting...\n"
+msgstr "c_astretch: cmap was NULL!  Quitting...\n"
+
+#: ../plug-ins/common/convolution-matrix.c:64
 msgid "Gr_ey"
 msgstr "Gr_ey"
 
-#: ../plug-ins/common/convmatrix.c:65
+#: ../plug-ins/common/convolution-matrix.c:65
 msgid "Re_d"
 msgstr "Re_d"
 
-#: ../plug-ins/common/convmatrix.c:66 ../plug-ins/common/newsprint.c:353
+#: ../plug-ins/common/convolution-matrix.c:66
+#: ../plug-ins/common/newsprint.c:353
 msgid "_Green"
 msgstr "_Green"
 
-#: ../plug-ins/common/convmatrix.c:67 ../plug-ins/common/newsprint.c:361
+#: ../plug-ins/common/convolution-matrix.c:67
+#: ../plug-ins/common/newsprint.c:361
 msgid "_Blue"
 msgstr "_Blue"
 
-#: ../plug-ins/common/convmatrix.c:68
+#: ../plug-ins/common/convolution-matrix.c:68
 msgid "_Alpha"
 msgstr "_Alpha"
 
-#: ../plug-ins/common/convmatrix.c:73
+#: ../plug-ins/common/convolution-matrix.c:73
 msgid "E_xtend"
 msgstr "E_xtend"
 
-#: ../plug-ins/common/convmatrix.c:74 ../plug-ins/common/displace.c:472
-#: ../plug-ins/common/edge.c:708 ../plug-ins/common/fractaltrace.c:736
-#: ../plug-ins/common/ripple.c:563
+#: ../plug-ins/common/convolution-matrix.c:74
+#: ../plug-ins/common/displace.c:472 ../plug-ins/common/edge.c:709
+#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:564
 msgid "_Wrap"
 msgstr "_Wrap"
 
-#: ../plug-ins/common/convmatrix.c:75
+#: ../plug-ins/common/convolution-matrix.c:75
 msgid "Cro_p"
 msgstr "Cro_p"
 
-#: ../plug-ins/common/convmatrix.c:201
+#: ../plug-ins/common/convolution-matrix.c:201
 msgid "Apply a generic 5x5 convolution matrix"
 msgstr "Apply a generic 5x5 convolution matrix"
 
-#: ../plug-ins/common/convmatrix.c:206
+#: ../plug-ins/common/convolution-matrix.c:206
 msgid "_Convolution Matrix..."
 msgstr "_Convolution Matrix..."
 
-#: ../plug-ins/common/convmatrix.c:241
+#: ../plug-ins/common/convolution-matrix.c:241
 msgid "Convolution does not work on layers smaller than 3x3 pixels."
 msgstr "Convolution does not work on layers smaller than 3x3 pixels."
 
-#: ../plug-ins/common/convmatrix.c:314
+#: ../plug-ins/common/convolution-matrix.c:314
 msgid "Applying convolution"
 msgstr "Applying convolution"
 
-#: ../plug-ins/common/convmatrix.c:906
+#: ../plug-ins/common/convolution-matrix.c:906
 msgid "Convolution Matrix"
 msgstr "Convolution Matrix"
 
-#: ../plug-ins/common/convmatrix.c:943
+#: ../plug-ins/common/convolution-matrix.c:944
 msgid "Matrix"
 msgstr "Matrix"
 
-#: ../plug-ins/common/convmatrix.c:981
+#: ../plug-ins/common/convolution-matrix.c:982
 msgid "D_ivisor:"
 msgstr "D_ivisor:"
 
-#: ../plug-ins/common/convmatrix.c:1007 ../plug-ins/common/depthmerge.c:767
-#: ../plug-ins/common/raw.c:1022
+#: ../plug-ins/common/convolution-matrix.c:1008
+#: ../plug-ins/common/depth-merge.c:768 ../plug-ins/common/file-raw.c:1043
 msgid "O_ffset:"
 msgstr "O_ffset:"
 
-#: ../plug-ins/common/convmatrix.c:1036
+#: ../plug-ins/common/convolution-matrix.c:1037
 msgid "N_ormalise"
 msgstr "N_ormalise"
 
-#: ../plug-ins/common/convmatrix.c:1048
+#: ../plug-ins/common/convolution-matrix.c:1049
 msgid "A_lpha-weighting"
 msgstr "A_lpha-weighting"
 
-#: ../plug-ins/common/convmatrix.c:1067
+#: ../plug-ins/common/convolution-matrix.c:1068
 msgid "Border"
 msgstr "Border"
 
-#: ../plug-ins/common/convmatrix.c:1094
+#: ../plug-ins/common/convolution-matrix.c:1095
 msgid "Channels"
 msgstr "Channels"
 
-#: ../plug-ins/common/csource.c:110
-msgid "C source code"
-msgstr "C source code"
+#: ../plug-ins/common/crop-auto.c:85
+msgid "Remove empty borders from the image"
+msgstr "Remove empty borders from the image"
 
-#: ../plug-ins/common/csource.c:637
-msgid "Save as C-Source"
-msgstr "Save as C-Source"
+#: ../plug-ins/common/crop-auto.c:90
+msgid "Autocrop Imag_e"
+msgstr "Autocrop Imag_e"
 
-#: ../plug-ins/common/csource.c:668
-msgid "_Prefixed name:"
-msgstr "_Prefixed name:"
+#: ../plug-ins/common/crop-auto.c:99
+msgid "Remove empty borders from the layer"
+msgstr "Remove empty borders from the layer"
 
-#: ../plug-ins/common/csource.c:677
-msgid "Co_mment:"
-msgstr "Co_mment:"
+#: ../plug-ins/common/crop-auto.c:104
+msgid "Autocrop Lay_er"
+msgstr "Autocrop Lay_er"
 
-#. Use Comment
-#.
-#: ../plug-ins/common/csource.c:684
-msgid "_Save comment to file"
-msgstr "_Save comment to file"
+#: ../plug-ins/common/crop-auto.c:151
+msgid "Cropping"
+msgstr "Cropping"
 
-#. GLib types
-#.
-#: ../plug-ins/common/csource.c:696
-msgid "_Use GLib types (guint8*)"
-msgstr "_Use GLib types (guint8*)"
+#: ../plug-ins/common/crop-zealous.c:85
+msgid "Autocrop unused space from edges and middle"
+msgstr "Autocrop unused space from edges and middle"
 
-#. Use Macros
-#.
-#: ../plug-ins/common/csource.c:708
-msgid "Us_e macros instead of struct"
-msgstr "Us_e macros instead of struct"
+#: ../plug-ins/common/crop-zealous.c:90
+msgid "_Zealous Crop"
+msgstr "_Zealous Crop"
 
-#. Use RLE
-#.
-#: ../plug-ins/common/csource.c:720
-msgid "Use _1 byte Run-Length-Encoding"
-msgstr "Use _1 byte Run-Length-Encoding"
+#: ../plug-ins/common/crop-zealous.c:138
+msgid "Zealous cropping"
+msgstr "Zealous cropping"
 
-#. Alpha
-#.
-#: ../plug-ins/common/csource.c:732
-msgid "Sa_ve alpha channel (RGBA/RGB)"
-msgstr "Sa_ve alpha channel (RGBA/RGB)"
-
-#: ../plug-ins/common/csource.c:750
-msgid "Op_acity:"
-msgstr "Op_acity:"
+#: ../plug-ins/common/crop-zealous.c:239
+msgid "Nothing to crop."
+msgstr "Nothing to crop."
 
 #: ../plug-ins/common/cubism.c:150
 msgid "Convert the image into randomly rotated square blobs"
@@ -2953,54 +2156,51 @@ msgstr "_Cubism..."
 msgid "Cubism"
 msgstr "Cubism"
 
-#: ../plug-ins/common/cubism.c:304
+#: ../plug-ins/common/cubism.c:305
 msgid "_Tile size:"
 msgstr "_Tile size:"
 
-#: ../plug-ins/common/cubism.c:317
+#: ../plug-ins/common/cubism.c:318
 msgid "T_ile saturation:"
 msgstr "T_ile saturation:"
 
-#: ../plug-ins/common/cubism.c:328
+#: ../plug-ins/common/cubism.c:329
 msgid "_Use background color"
 msgstr "_Use background colour"
 
-#: ../plug-ins/common/cubism.c:418
+#: ../plug-ins/common/cubism.c:419
 msgid "Cubistic transformation"
 msgstr "Cubistic transformation"
 
-#: ../plug-ins/common/curve_bend.c:520
+#: ../plug-ins/common/curve-bend.c:520
 msgid "Bend the image using two control curves"
 msgstr "Bend the image using two control curves"
 
-#: ../plug-ins/common/curve_bend.c:541
+#: ../plug-ins/common/curve-bend.c:541
 msgid "_Curve Bend..."
 msgstr "_Curve Bend..."
 
-#: ../plug-ins/common/curve_bend.c:675
+#: ../plug-ins/common/curve-bend.c:677 ../plug-ins/common/edge-dog.c:176
 msgid "Can operate on layers only (but was called on channel or mask)."
 msgstr "Can operate on layers only (but was called on channel or mask)."
 
-#: ../plug-ins/common/curve_bend.c:683
+#: ../plug-ins/common/curve-bend.c:687
 msgid "Cannot operate on layers with masks."
 msgstr "Cannot operate on layers with masks."
 
-#. could not float the selection because selection rectangle
-#. * is completely empty return GIMP_PDB_EXECUTION_ERROR
-#.
-#: ../plug-ins/common/curve_bend.c:694
+#: ../plug-ins/common/curve-bend.c:699
 msgid "Cannot operate on empty selections."
 msgstr "Cannot operate on empty selections."
 
 #. Possibly retrieve data from a previous run
 #. The shell and main vbox
-#: ../plug-ins/common/curve_bend.c:1195 ../plug-ins/common/curve_bend.c:2915
+#: ../plug-ins/common/curve-bend.c:1211 ../plug-ins/common/curve-bend.c:2932
 msgid "Curve Bend"
 msgstr "Curve Bend"
 
 #. Preview area, top of column
 #. preview
-#: ../plug-ins/common/curve_bend.c:1231
+#: ../plug-ins/common/curve-bend.c:1247
 #: ../plug-ins/gimpressionist/orientmap.c:592
 #: ../plug-ins/gimpressionist/sizemap.c:461
 #: ../plug-ins/print/print-page-layout.c:159
@@ -3008,116 +2208,116 @@ msgid "Preview"
 msgstr "Preview"
 
 #. The preview button
-#: ../plug-ins/common/curve_bend.c:1260
+#: ../plug-ins/common/curve-bend.c:1276
 msgid "_Preview Once"
 msgstr "_Preview Once"
 
 #. The preview toggle
-#: ../plug-ins/common/curve_bend.c:1269
+#: ../plug-ins/common/curve-bend.c:1285
 msgid "Automatic pre_view"
 msgstr "Automatic pre_view"
 
 #. Options area, bottom of column
 #. Options section
-#: ../plug-ins/common/curve_bend.c:1279 ../plug-ins/common/ripple.c:504
+#: ../plug-ins/common/curve-bend.c:1295 ../plug-ins/common/ripple.c:505
 #: ../plug-ins/gfig/gfig-dialog.c:1207
 msgid "Options"
 msgstr "Options"
 
 #. Rotate spinbutton
-#: ../plug-ins/common/curve_bend.c:1293
+#: ../plug-ins/common/curve-bend.c:1309
 msgid "Rotat_e:"
 msgstr "Rotat_e:"
 
 #. The smoothing toggle
-#: ../plug-ins/common/curve_bend.c:1312
+#: ../plug-ins/common/curve-bend.c:1328
 msgid "Smoo_thing"
 msgstr "Smoo_thing"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve_bend.c:1322 ../plug-ins/common/gqbist.c:853
-#: ../plug-ins/common/mosaic.c:728 ../plug-ins/common/ripple.c:513
+#: ../plug-ins/common/curve-bend.c:1338 ../plug-ins/common/mosaic.c:727
+#: ../plug-ins/common/qbist.c:853 ../plug-ins/common/ripple.c:514
 msgid "_Antialiasing"
 msgstr "_Antialiasing"
 
 #. The work_on_copy toggle
-#: ../plug-ins/common/curve_bend.c:1332
+#: ../plug-ins/common/curve-bend.c:1348
 msgid "Work on cop_y"
 msgstr "Work on cop_y"
 
 #. The curves graph
-#: ../plug-ins/common/curve_bend.c:1342
+#: ../plug-ins/common/curve-bend.c:1358
 msgid "Modify Curves"
 msgstr "Modify Curves"
 
-#: ../plug-ins/common/curve_bend.c:1370
+#: ../plug-ins/common/curve-bend.c:1386
 msgid "Curve for Border"
 msgstr "Curve for Border"
 
-#: ../plug-ins/common/curve_bend.c:1374
+#: ../plug-ins/common/curve-bend.c:1390
 msgid "_Upper"
 msgstr "_Upper"
 
-#: ../plug-ins/common/curve_bend.c:1375
+#: ../plug-ins/common/curve-bend.c:1391
 msgid "_Lower"
 msgstr "_Lower"
 
-#: ../plug-ins/common/curve_bend.c:1385
+#: ../plug-ins/common/curve-bend.c:1401
 msgid "Curve Type"
 msgstr "Curve Type"
 
-#: ../plug-ins/common/curve_bend.c:1389
+#: ../plug-ins/common/curve-bend.c:1405
 msgid "Smoot_h"
 msgstr "Smoot_h"
 
-#: ../plug-ins/common/curve_bend.c:1390
+#: ../plug-ins/common/curve-bend.c:1406
 msgid "_Free"
 msgstr "_Free"
 
 #. The Copy button
-#: ../plug-ins/common/curve_bend.c:1405
+#: ../plug-ins/common/curve-bend.c:1421
 msgid "_Copy"
 msgstr "_Copy"
 
-#: ../plug-ins/common/curve_bend.c:1410
+#: ../plug-ins/common/curve-bend.c:1426
 msgid "Copy the active curve to the other border"
 msgstr "Copy the active curve to the other border"
 
 #. The CopyInv button
-#: ../plug-ins/common/curve_bend.c:1417
+#: ../plug-ins/common/curve-bend.c:1433
 msgid "_Mirror"
 msgstr "_Mirror"
 
-#: ../plug-ins/common/curve_bend.c:1422
+#: ../plug-ins/common/curve-bend.c:1438
 msgid "Mirror the active curve to the other border"
 msgstr "Mirror the active curve to the other border"
 
 #. The Swap button
-#: ../plug-ins/common/curve_bend.c:1430
+#: ../plug-ins/common/curve-bend.c:1446
 msgid "S_wap"
 msgstr "S_wap"
 
-#: ../plug-ins/common/curve_bend.c:1435
+#: ../plug-ins/common/curve-bend.c:1451
 msgid "Swap the two curves"
 msgstr "Swap the two curves"
 
-#: ../plug-ins/common/curve_bend.c:1447
+#: ../plug-ins/common/curve-bend.c:1463
 msgid "Reset the active curve"
 msgstr "Reset the active curve"
 
-#: ../plug-ins/common/curve_bend.c:1464
+#: ../plug-ins/common/curve-bend.c:1480
 msgid "Load the curves from a file"
 msgstr "Load the curves from a file"
 
-#: ../plug-ins/common/curve_bend.c:1476
+#: ../plug-ins/common/curve-bend.c:1492
 msgid "Save the curves to a file"
 msgstr "Save the curves to a file"
 
-#: ../plug-ins/common/curve_bend.c:2013
+#: ../plug-ins/common/curve-bend.c:2030
 msgid "Load Curve Points from File"
 msgstr "Load Curve Points from File"
 
-#: ../plug-ins/common/curve_bend.c:2048
+#: ../plug-ins/common/curve-bend.c:2065
 msgid "Save Curve Points to File"
 msgstr "Save Curve Points to File"
 
@@ -3337,91 +2537,83 @@ msgstr "Keep o_dd fields"
 msgid "Keep _even fields"
 msgstr "Keep _even fields"
 
-#: ../plug-ins/common/depthmerge.c:183
+#: ../plug-ins/common/depth-merge.c:184
 msgid "Combine two images using depth maps (z-buffers)"
 msgstr "Combine two images using depth maps (z-buffers)"
 
-#: ../plug-ins/common/depthmerge.c:192
+#: ../plug-ins/common/depth-merge.c:193
 msgid "_Depth Merge..."
 msgstr "_Depth Merge..."
 
-#: ../plug-ins/common/depthmerge.c:386
+#: ../plug-ins/common/depth-merge.c:387
 msgid "Depth-merging"
 msgstr "Depth-merging"
 
-#: ../plug-ins/common/depthmerge.c:643
+#: ../plug-ins/common/depth-merge.c:644
 msgid "Depth Merge"
 msgstr "Depth Merge"
 
-#: ../plug-ins/common/depthmerge.c:695
+#: ../plug-ins/common/depth-merge.c:696
 msgid "Source 1:"
 msgstr "Source 1:"
 
-#: ../plug-ins/common/depthmerge.c:710 ../plug-ins/common/depthmerge.c:740
+#: ../plug-ins/common/depth-merge.c:711 ../plug-ins/common/depth-merge.c:741
 msgid "Depth map:"
 msgstr "Depth map:"
 
-#: ../plug-ins/common/depthmerge.c:725
+#: ../plug-ins/common/depth-merge.c:726
 msgid "Source 2:"
 msgstr "Source 2:"
 
-#: ../plug-ins/common/depthmerge.c:757
+#: ../plug-ins/common/depth-merge.c:758
 msgid "O_verlap:"
 msgstr "O_verlap:"
 
-#: ../plug-ins/common/depthmerge.c:777
+#: ../plug-ins/common/depth-merge.c:778
 msgid "Sc_ale 1:"
 msgstr "Sc_ale 1:"
 
-#: ../plug-ins/common/depthmerge.c:787
+#: ../plug-ins/common/depth-merge.c:788
 msgid "Sca_le 2:"
 msgstr "Sca_le 2:"
 
-#: ../plug-ins/common/desktop-link.c:82
-msgid "Desktop Link"
-msgstr "Desktop Link"
-
-#: ../plug-ins/common/desktop-link.c:163
-#, c-format
-msgid "Error loading desktop file '%s': %s"
-msgstr "Error loading desktop file '%s': %s"
-
-#: ../plug-ins/common/despeckle.c:147
+#: ../plug-ins/common/despeckle.c:142
 msgid "Remove speckle noise from the image"
 msgstr "Remove speckle noise from the image"
 
-#: ../plug-ins/common/despeckle.c:153
+#: ../plug-ins/common/despeckle.c:148
 msgid "Des_peckle..."
 msgstr "Des_peckle..."
 
-#: ../plug-ins/common/despeckle.c:394 ../plug-ins/common/despeckle.c:614
+#: ../plug-ins/common/despeckle.c:425 ../plug-ins/common/despeckle.c:645
 msgid "Despeckle"
 msgstr "Despeckle"
 
-#: ../plug-ins/common/despeckle.c:423
+#: ../plug-ins/common/despeckle.c:454
 msgid "Median"
 msgstr "Median"
 
-#: ../plug-ins/common/despeckle.c:431
+#: ../plug-ins/common/despeckle.c:462
 msgid "_Adaptive"
 msgstr "_Adaptive"
 
-#: ../plug-ins/common/despeckle.c:441
+#: ../plug-ins/common/despeckle.c:472
 msgid "R_ecursive"
 msgstr "R_ecursive"
 
-#: ../plug-ins/common/despeckle.c:462 ../plug-ins/common/neon.c:730
-#: ../plug-ins/common/nlfilt.c:1088 ../plug-ins/common/nova.c:366
-#: ../plug-ins/common/unsharp.c:678 ../plug-ins/common/whirlpinch.c:588
-#: ../plug-ins/gflare/gflare.c:2712 ../plug-ins/imagemap/imap_circle.c:278
+#: ../plug-ins/common/despeckle.c:493 ../plug-ins/common/edge-neon.c:732
+#: ../plug-ins/common/nl-filter.c:1089 ../plug-ins/common/nova.c:366
+#: ../plug-ins/common/unsharp-mask.c:680 ../plug-ins/common/whirl-pinch.c:589
+#: ../plug-ins/gradient-flare/gradient-flare.c:2758
+#: ../plug-ins/imagemap/imap_circle.c:278
 msgid "_Radius:"
 msgstr "_Radius:"
 
-#: ../plug-ins/common/despeckle.c:478
+#: ../plug-ins/common/despeckle.c:509
 msgid "_Black level:"
 msgstr "_Black level:"
 
-#: ../plug-ins/common/despeckle.c:494
+#: ../plug-ins/common/despeckle.c:525
 msgid "_White level:"
 msgstr "_White level:"
 
@@ -3441,44 +2633,20 @@ msgstr "Destriping"
 msgid "Destripe"
 msgstr "Destripe"
 
-#: ../plug-ins/common/destripe.c:472 ../plug-ins/common/gtm.c:584
-#: ../plug-ins/common/papertile.c:302 ../plug-ins/common/postscript.c:3154
-#: ../plug-ins/common/postscript.c:3363 ../plug-ins/common/raw.c:1035
-#: ../plug-ins/common/smooth_palette.c:436 ../plug-ins/common/tile.c:431
+#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:595
+#: ../plug-ins/common/file-ps.c:3171 ../plug-ins/common/file-ps.c:3380
+#: ../plug-ins/common/file-raw.c:1056 ../plug-ins/common/smooth-palette.c:436
+#: ../plug-ins/common/tile-paper.c:302 ../plug-ins/common/tile.c:431
 #: ../plug-ins/imagemap/imap_cmd_guides.c:165
 #: ../plug-ins/imagemap/imap_rectangle.c:403
 #: ../plug-ins/print/print-page-layout.c:252
 msgid "_Width:"
 msgstr "_Width:"
 
-#: ../plug-ins/common/destripe.c:483
+#: ../plug-ins/common/destripe.c:484
 msgid "Create _histogram"
 msgstr "Create _histogram"
 
-#: ../plug-ins/common/dicom.c:141
-msgid "DICOM image"
-msgstr "DICOM image"
-
-#: ../plug-ins/common/dicom.c:166
-msgid "Digital Imaging and Communications in Medicine image"
-msgstr "Digital Imaging and Communications in Medicine image"
-
-#: ../plug-ins/common/dicom.c:322
-#, c-format
-msgid "'%s' is not a DICOM file."
-msgstr "'%s' is not a DICOM file."
-
-#: ../plug-ins/common/dicom.c:678 ../plug-ins/common/pcx.c:639
-#: ../plug-ins/common/pnm.c:949
-msgid "Cannot save images with alpha channel."
-msgstr "Cannot save images with alpha channel."
-
-#: ../plug-ins/common/dicom.c:693 ../plug-ins/common/postscript.c:1187
-#: ../plug-ins/common/xwd.c:589 ../plug-ins/fits/fits.c:448
-#: ../plug-ins/xjt/xjt.c:1692
-msgid "Cannot operate on unknown image types."
-msgstr "Cannot operate on unknown image types."
-
 #: ../plug-ins/common/diffraction.c:167
 msgid "Generate diffraction patterns"
 msgstr "Generate diffraction patterns"
@@ -3495,6 +2663,11 @@ msgstr "Creating diffraction pattern"
 msgid "Diffraction Patterns"
 msgstr "Diffraction Patterns"
 
+#: ../plug-ins/common/diffraction.c:477
+#: ../plug-ins/map-object/map-object-ui.c:1388
+msgid "_Preview!"
+msgstr "_Preview!"
+
 #: ../plug-ins/common/diffraction.c:527
 msgid "Frequencies"
 msgstr "Frequencies"
@@ -3507,8 +2680,8 @@ msgstr "Contours"
 msgid "Sharp Edges"
 msgstr "Sharp Edges"
 
-#: ../plug-ins/common/diffraction.c:615 ../plug-ins/common/softglow.c:681
-#: ../plug-ins/flame/flame.c:1057
+#: ../plug-ins/common/diffraction.c:615 ../plug-ins/common/softglow.c:683
+#: ../plug-ins/flame/flame.c:1081
 msgid "_Brightness:"
 msgstr "_Brightness:"
 
@@ -3582,48 +2755,108 @@ msgstr "_Polar"
 msgid "Edge Behavior"
 msgstr "Edge Behaviour"
 
-#: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:721
-#: ../plug-ins/common/ripple.c:564 ../plug-ins/common/waves.c:280
+#: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:722
+#: ../plug-ins/common/ripple.c:565 ../plug-ins/common/waves.c:281
 msgid "_Smear"
 msgstr "_Smear"
 
-#: ../plug-ins/common/displace.c:476 ../plug-ins/common/edge.c:734
-#: ../plug-ins/common/fractaltrace.c:740 ../plug-ins/common/newsprint.c:398
+#: ../plug-ins/common/displace.c:476 ../plug-ins/common/edge.c:735
+#: ../plug-ins/common/fractal-trace.c:740 ../plug-ins/common/newsprint.c:398
 msgid "_Black"
 msgstr "_Black"
 
-#: ../plug-ins/common/dog.c:133
+#: ../plug-ins/common/edge-dog.c:133
 msgid "Edge detection with control of edge thickness"
 msgstr "Edge detection with control of edge thickness"
 
-#: ../plug-ins/common/dog.c:140
+#: ../plug-ins/common/edge-dog.c:140
 msgid "_Difference of Gaussians..."
 msgstr "_Difference of Gaussians..."
 
-#: ../plug-ins/common/dog.c:231 ../plug-ins/common/dog.c:278
+#: ../plug-ins/common/edge-dog.c:243 ../plug-ins/common/edge-dog.c:300
 msgid "DoG Edge Detect"
 msgstr "DoG Edge Detect"
 
-#: ../plug-ins/common/dog.c:306
+#: ../plug-ins/common/edge-dog.c:329
 msgid "Smoothing Parameters"
 msgstr "Smoothing Parameters"
 
-#: ../plug-ins/common/dog.c:320
+#: ../plug-ins/common/edge-dog.c:343
 msgid "_Radius 1:"
 msgstr "_Radius 1:"
 
-#: ../plug-ins/common/dog.c:324
+#: ../plug-ins/common/edge-dog.c:347
 msgid "R_adius 2:"
 msgstr "R_adius 2:"
 
-#: ../plug-ins/common/dog.c:336 ../plug-ins/common/normalize.c:92
-msgid "_Normalize"
-msgstr "_Normalize"
-
-#: ../plug-ins/common/dog.c:347 ../plug-ins/gimpressionist/paper.c:167
+#: ../plug-ins/common/edge-dog.c:370 ../plug-ins/gimpressionist/paper.c:167
 msgid "_Invert"
 msgstr "_Invert"
 
+#: ../plug-ins/common/edge-laplace.c:75
+msgid "High-resolution edge detection"
+msgstr "High-resolution edge detection"
+
+#: ../plug-ins/common/edge-laplace.c:85
+msgid "_Laplace"
+msgstr "_Laplace"
+
+#: ../plug-ins/common/edge-laplace.c:243 ../plug-ins/common/edge.c:673
+msgid "Laplace"
+msgstr "Laplace"
+
+#: ../plug-ins/common/edge-laplace.c:321
+msgid "Cleanup"
+msgstr "Cleanup"
+
+#: ../plug-ins/common/edge-neon.c:134
+msgid "Simulate the glowing boundary of a neon light"
+msgstr "Simulate the glowing boundary of a neon light"
+
+#: ../plug-ins/common/edge-neon.c:139
+msgid "_Neon..."
+msgstr "_Neon..."
+
+#: ../plug-ins/common/edge-neon.c:211
+msgid "Neon"
+msgstr "Neon"
+
+#: ../plug-ins/common/edge-neon.c:695
+msgid "Neon Detection"
+msgstr "Neon Detection"
+
+#: ../plug-ins/common/edge-neon.c:747 ../plug-ins/common/unsharp-mask.c:693
+msgid "_Amount:"
+msgstr "_Amount:"
+
+#: ../plug-ins/common/edge-sobel.c:108
+msgid "Specialized direction-dependent edge detection"
+msgstr "Specialized direction-dependent edge detection"
+
+#: ../plug-ins/common/edge-sobel.c:121
+msgid "_Sobel..."
+msgstr "_Sobel..."
+
+#: ../plug-ins/common/edge-sobel.c:231
+msgid "Sobel Edge Detection"
+msgstr "Sobel Edge Detection"
+
+#: ../plug-ins/common/edge-sobel.c:260
+msgid "Sobel _horizontally"
+msgstr "Sobel _horizontally"
+
+#: ../plug-ins/common/edge-sobel.c:272
+msgid "Sobel _vertically"
+msgstr "Sobel _vertically"
+
+#: ../plug-ins/common/edge-sobel.c:284
+msgid "_Keep sign of result (one direction only)"
+msgstr "_Keep sign of result (one direction only)"
+
+#: ../plug-ins/common/edge-sobel.c:370
+msgid "Sobel edge detecting"
+msgstr "Sobel edge detecting"
+
 #: ../plug-ins/common/edge.c:152
 msgid "Several simple methods for detecting edges"
 msgstr "Several simple methods for detecting edges"
@@ -3640,35 +2873,31 @@ msgstr "Edge detection"
 msgid "Edge Detection"
 msgstr "Edge Detection"
 
-#: ../plug-ins/common/edge.c:667
+#: ../plug-ins/common/edge.c:668
 msgid "Sobel"
 msgstr "Sobel"
 
-#: ../plug-ins/common/edge.c:668
+#: ../plug-ins/common/edge.c:669
 msgid "Prewitt compass"
 msgstr "Prewitt compass"
 
-#: ../plug-ins/common/edge.c:669 ../plug-ins/common/sinus.c:904
+#: ../plug-ins/common/edge.c:670 ../plug-ins/common/sinus.c:904
 msgid "Gradient"
 msgstr "Gradient"
 
-#: ../plug-ins/common/edge.c:670
+#: ../plug-ins/common/edge.c:671
 msgid "Roberts"
 msgstr "Roberts"
 
-#: ../plug-ins/common/edge.c:671
+#: ../plug-ins/common/edge.c:672
 msgid "Differential"
 msgstr "Differential"
 
-#: ../plug-ins/common/edge.c:672 ../plug-ins/common/laplace.c:243
-msgid "Laplace"
-msgstr "Laplace"
-
-#: ../plug-ins/common/edge.c:681
+#: ../plug-ins/common/edge.c:682
 msgid "_Algorithm:"
 msgstr "_Algorithm:"
 
-#: ../plug-ins/common/edge.c:689
+#: ../plug-ins/common/edge.c:690
 msgid "A_mount:"
 msgstr "A_mount:"
 
@@ -3716,67 +2945,1721 @@ msgstr "Engraving"
 msgid "Engrave"
 msgstr "Engrave"
 
-#: ../plug-ins/common/engrave.c:243 ../plug-ins/common/film.c:1003
-#: ../plug-ins/common/gtm.c:600 ../plug-ins/common/papertile.c:313
-#: ../plug-ins/common/postscript.c:3164 ../plug-ins/common/postscript.c:3372
-#: ../plug-ins/common/raw.c:1048 ../plug-ins/common/smooth_palette.c:441
+#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:611
+#: ../plug-ins/common/file-ps.c:3181 ../plug-ins/common/file-ps.c:3389
+#: ../plug-ins/common/file-raw.c:1069 ../plug-ins/common/film.c:1003
+#: ../plug-ins/common/smooth-palette.c:441 ../plug-ins/common/tile-paper.c:313
 #: ../plug-ins/common/tile.c:435 ../plug-ins/imagemap/imap_cmd_guides.c:175
 #: ../plug-ins/imagemap/imap_rectangle.c:410
 #: ../plug-ins/print/print-page-layout.c:254
 msgid "_Height:"
 msgstr "_Height:"
 
-#: ../plug-ins/common/engrave.c:254
+#: ../plug-ins/common/engrave.c:255
 msgid "_Limit line width"
 msgstr "_Limit line width"
 
-#: ../plug-ins/common/exchange.c:122
-msgid "Swap one color with another"
-msgstr "Swap one colour with another"
+#: ../plug-ins/common/file-aa.c:98
+msgid "ASCII art"
+msgstr "ASCII art"
 
-#: ../plug-ins/common/exchange.c:128
-msgid "_Color Exchange..."
-msgstr "_Colour Exchange..."
+#. Create the actual window.
+#: ../plug-ins/common/file-aa.c:349
+msgid "Save as Text"
+msgstr "Save as Text"
 
-#: ../plug-ins/common/exchange.c:213 ../plug-ins/common/exchange.c:287
-msgid "Color Exchange"
-msgstr "Colour Exchange"
+#: ../plug-ins/common/file-aa.c:371
+msgid "_Format:"
+msgstr "_Format:"
 
-#: ../plug-ins/common/exchange.c:309
-msgid "Middle-Click Inside Preview to Pick \"From Color\""
-msgstr "Middle-Click Inside Preview to Pick \"From Colour\""
+#: ../plug-ins/common/file-cel.c:111 ../plug-ins/common/file-cel.c:129
+msgid "KISS CEL"
+msgstr "KISS CEL"
 
-#: ../plug-ins/common/exchange.c:347
-msgid "To Color"
-msgstr "To Colour"
+#: ../plug-ins/common/file-cel.c:191
+msgid "Load KISS Palette"
+msgstr "Load KISS Palette"
 
-#: ../plug-ins/common/exchange.c:347
-msgid "From Color"
-msgstr "From Colour"
+#. max. rows allocated
+#. column, highest column ever used
+#. -1  assume fsel is not available (and not attached to any drawable)
+#. -1  assume there is no floating selection
+#: ../plug-ins/common/file-cel.c:317 ../plug-ins/common/file-dicom.c:330
+#: ../plug-ins/common/file-gbr.c:366 ../plug-ins/common/file-gif-load.c:345
+#: ../plug-ins/common/file-gih.c:667 ../plug-ins/common/file-pat.c:335
+#: ../plug-ins/common/file-pcx.c:366 ../plug-ins/common/file-pdf.c:586
+#: ../plug-ins/common/file-pix.c:348 ../plug-ins/common/file-png.c:728
+#: ../plug-ins/common/file-pnm.c:499 ../plug-ins/common/file-ps.c:1042
+#: ../plug-ins/common/file-raw.c:671 ../plug-ins/common/file-sunras.c:486
+#: ../plug-ins/common/file-tga.c:447 ../plug-ins/common/file-tiff-load.c:603
+#: ../plug-ins/common/file-wmf.c:994 ../plug-ins/common/file-xbm.c:741
+#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:520
+#: ../plug-ins/file-bmp/bmp-read.c:161 ../plug-ins/file-faxg3/faxg3.c:217
+#: ../plug-ins/file-fli/fli-gimp.c:502 ../plug-ins/file-ico/ico-load.c:646
+#: ../plug-ins/file-jpeg/jpeg-load.c:115 ../plug-ins/file-psd/psd-load.c:136
+#: ../plug-ins/file-sgi/sgi.c:331 ../plug-ins/file-xjt/xjt.c:3363
+#, c-format
+msgid "Opening '%s'"
+msgstr "Opening '%s'"
 
-#: ../plug-ins/common/exchange.c:365
-msgid "Color Exchange: To Color"
-msgstr "Colour Exchange: To Colour"
+#: ../plug-ins/common/file-cel.c:354
+msgid "Can't create a new image"
+msgstr "Can't create a new image"
 
-#: ../plug-ins/common/exchange.c:366
-msgid "Color Exchange: From Color"
-msgstr "Colour Exchange: From Colour"
+#: ../plug-ins/common/file-cel.c:443
+#, c-format
+msgid "Unsupported bit depth (%d)!"
+msgstr "Unsupported bit depth (%d)!"
 
-#: ../plug-ins/common/exchange.c:424
-msgid "R_ed threshold:"
-msgstr "R_ed threshold:"
+#. init the progress meter
+#. And let's begin the progress
+#: ../plug-ins/common/file-cel.c:588 ../plug-ins/common/file-gbr.c:637
+#: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1280
+#: ../plug-ins/common/file-html-table.c:256 ../plug-ins/common/file-pat.c:467
+#: ../plug-ins/common/file-pcx.c:627 ../plug-ins/common/file-pix.c:529
+#: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:982
+#: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:568
+#: ../plug-ins/common/file-tga.c:1175 ../plug-ins/common/file-tiff-save.c:693
+#: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xpm.c:637
+#: ../plug-ins/common/file-xwd.c:619 ../plug-ins/file-bmp/bmp-write.c:307
+#: ../plug-ins/file-fits/fits.c:481 ../plug-ins/file-fli/fli-gimp.c:718
+#: ../plug-ins/file-ico/ico-save.c:1002 ../plug-ins/file-jpeg/jpeg-save.c:282
+#: ../plug-ins/file-psd/psd-save.c:1640 ../plug-ins/file-sgi/sgi.c:554
+#: ../plug-ins/file-xjt/xjt.c:1710
+#, c-format
+msgid "Saving '%s'"
+msgstr "Saving '%s'"
 
-#: ../plug-ins/common/exchange.c:484
-msgid "G_reen threshold:"
-msgstr "G_reen threshold:"
+#: ../plug-ins/common/file-compressor.c:160
+msgid "gzip archive"
+msgstr "gzip archive"
 
-#: ../plug-ins/common/exchange.c:545
-msgid "B_lue threshold:"
-msgstr "B_lue threshold:"
+#: ../plug-ins/common/file-compressor.c:181
+msgid "bzip archive"
+msgstr "bzip archive"
 
-#: ../plug-ins/common/exchange.c:573
-msgid "Lock _thresholds"
-msgstr "Lock _thresholds"
+#: ../plug-ins/common/file-compressor.c:390
+msgid "No sensible file extension, saving as compressed XCF."
+msgstr "No sensible file extension, saving as compressed XCF."
+
+#: ../plug-ins/common/file-compressor.c:572
+msgid "No sensible file extension, attempting to load with file magic."
+msgstr "No sensible file extension, attempting to load with file magic."
+
+#: ../plug-ins/common/file-csource.c:112
+msgid "C source code"
+msgstr "C source code"
+
+#: ../plug-ins/common/file-csource.c:660
+msgid "Save as C-Source"
+msgstr "Save as C-Source"
+
+#: ../plug-ins/common/file-csource.c:691
+msgid "_Prefixed name:"
+msgstr "_Prefixed name:"
+
+#: ../plug-ins/common/file-csource.c:700
+msgid "Co_mment:"
+msgstr "Co_mment:"
+
+#. Use Comment
+#.
+#: ../plug-ins/common/file-csource.c:707
+msgid "_Save comment to file"
+msgstr "_Save comment to file"
+
+#. GLib types
+#.
+#: ../plug-ins/common/file-csource.c:719
+msgid "_Use GLib types (guint8*)"
+msgstr "_Use GLib types (guint8*)"
+
+#. Use Macros
+#.
+#: ../plug-ins/common/file-csource.c:731
+msgid "Us_e macros instead of struct"
+msgstr "Us_e macros instead of struct"
+
+#. Use RLE
+#.
+#: ../plug-ins/common/file-csource.c:743
+msgid "Use _1 byte Run-Length-Encoding"
+msgstr "Use _1 byte Run-Length-Encoding"
+
+#. Alpha
+#.
+#: ../plug-ins/common/file-csource.c:755
+msgid "Sa_ve alpha channel (RGBA/RGB)"
+msgstr "Sa_ve alpha channel (RGBA/RGB)"
+
+#: ../plug-ins/common/file-csource.c:773
+msgid "Op_acity:"
+msgstr "Op_acity:"
+
+#: ../plug-ins/common/file-desktop-link.c:83
+msgid "Desktop Link"
+msgstr "Desktop Link"
+
+#: ../plug-ins/common/file-desktop-link.c:173
+#, c-format
+msgid "Error loading desktop file '%s': %s"
+msgstr "Error loading desktop file '%s': %s"
+
+#: ../plug-ins/common/file-dicom.c:146
+msgid "DICOM image"
+msgstr "DICOM image"
+
+#: ../plug-ins/common/file-dicom.c:171
+msgid "Digital Imaging and Communications in Medicine image"
+msgstr "Digital Imaging and Communications in Medicine image"
+
+#: ../plug-ins/common/file-dicom.c:352
+#, c-format
+msgid "'%s' is not a DICOM file."
+msgstr "'%s' is not a DICOM file."
+
+#: ../plug-ins/common/file-dicom.c:769 ../plug-ins/common/file-pcx.c:659
+#: ../plug-ins/common/file-pnm.c:967
+msgid "Cannot save images with alpha channel."
+msgstr "Cannot save images with alpha channel."
+
+#: ../plug-ins/common/file-dicom.c:784 ../plug-ins/common/file-ps.c:1203
+#: ../plug-ins/common/file-xwd.c:604 ../plug-ins/file-fits/fits.c:466
+#: ../plug-ins/file-xjt/xjt.c:1705
+msgid "Cannot operate on unknown image types."
+msgstr "Cannot operate on unknown image types."
+
+#: ../plug-ins/common/file-gbr.c:154 ../plug-ins/common/file-gbr.c:175
+msgid "GIMP brush"
+msgstr "GIMP brush"
+
+#: ../plug-ins/common/file-gbr.c:401 ../plug-ins/common/file-gbr.c:413
+msgid "Unsupported brush format"
+msgstr "Unsupported brush format"
+
+#: ../plug-ins/common/file-gbr.c:425
+#, c-format
+msgid "Error in GIMP brush file '%s'"
+msgstr "Error in GIMP brush file '%s'"
+
+#: ../plug-ins/common/file-gbr.c:433
+#, c-format
+msgid "Invalid UTF-8 string in brush file '%s'."
+msgstr "Invalid UTF-8 string in brush file '%s'."
+
+#: ../plug-ins/common/file-gbr.c:439 ../plug-ins/common/file-gih.c:510
+#: ../plug-ins/common/file-gih.c:1173
+#: ../plug-ins/gradient-flare/gradient-flare.c:3063
+msgid "Unnamed"
+msgstr "Unnamed"
+
+#: ../plug-ins/common/file-gbr.c:622
+msgid "GIMP brushes are either GRAYSCALE or RGBA"
+msgstr "GIMP brushes are either GREYSCALE or RGBA"
+
+#: ../plug-ins/common/file-gbr.c:720
+msgid "Save as Brush"
+msgstr "Save as Brush"
+
+#. attach labels
+#: ../plug-ins/common/file-gbr.c:747 ../plug-ins/common/grid.c:790
+msgid "Spacing:"
+msgstr "Spacing:"
+
+#: ../plug-ins/common/file-gbr.c:758 ../plug-ins/common/file-gih.c:925
+#: ../plug-ins/common/file-pat.c:556 ../plug-ins/gimpressionist/presets.c:666
+msgid "Description:"
+msgstr "Description:"
+
+#: ../plug-ins/common/file-gif-load.c:142
+#: ../plug-ins/common/file-gif-save.c:168
+msgid "GIF image"
+msgstr "GIF image"
+
+#: ../plug-ins/common/file-gif-load.c:357
+msgid "This is not a GIF file"
+msgstr "This is not a GIF file"
+
+#: ../plug-ins/common/file-gif-load.c:396
+msgid "Non-square pixels.  Image might look squashed."
+msgstr "Non-square pixels.  Image might look squashed."
+
+#: ../plug-ins/common/file-gif-load.c:913
+#, c-format
+msgid "Background (%d%s)"
+msgstr "Background (%d%s)"
+
+#: ../plug-ins/common/file-gif-load.c:936
+#, c-format
+msgid "Opening '%s' (frame %d)"
+msgstr "Opening '%s' (frame %d)"
+
+#: ../plug-ins/common/file-gif-load.c:965 ../plug-ins/common/iwarp.c:791
+#: ../plug-ins/common/iwarp.c:826
+#, c-format
+msgid "Frame %d"
+msgstr "Frame %d"
+
+#: ../plug-ins/common/file-gif-load.c:967
+#, c-format
+msgid "Frame %d (%d%s)"
+msgstr "Frame %d (%d%s)"
+
+#: ../plug-ins/common/file-gif-load.c:998
+#, c-format
+msgid ""
+"GIF: Undocumented GIF composite type %d is not handled.  Animation might not "
+"play or re-save perfectly."
+msgstr ""
+"GIF: Undocumented GIF composite type %d is not handled.  Animation might not "
+"play or re-save perfectly."
+
+#: ../plug-ins/common/file-gif-save.c:447
+msgid "Couldn't simply reduce colors further. Saving as opaque."
+msgstr "Couldn't simply reduce colours further. Saving as opaque."
+
+#: ../plug-ins/common/file-gif-save.c:562
+#, c-format
+msgid ""
+"Unable to save '%s'.  The GIF file format does not support images that are "
+"more than %d pixels wide or tall."
+msgstr ""
+"Unable to save '%s'.  The GIF file format does not support images that are "
+"more than %d pixels wide or tall."
+
+#: ../plug-ins/common/file-gif-save.c:673
+msgid ""
+"The GIF format only supports comments in 7bit ASCII encoding. No comment is "
+"saved."
+msgstr ""
+"The GIF format only supports comments in 7bit ASCII encoding. No comment is "
+"saved."
+
+#: ../plug-ins/common/file-gif-save.c:732
+msgid ""
+"Cannot save RGB color images. Convert to indexed color or grayscale first."
+msgstr ""
+"Cannot save RGB colour images. Convert to indexed colour or greyscale first."
+
+#: ../plug-ins/common/file-gif-save.c:910
+msgid "Delay inserted to prevent evil CPU-sucking animation."
+msgstr "Delay inserted to prevent evil CPU-sucking animation."
+
+#: ../plug-ins/common/file-gif-save.c:950
+msgid ""
+"The image you are trying to save as a GIF contains layers which extend "
+"beyond the actual borders of the image."
+msgstr ""
+"The image you are trying to save as a GIF contains layers which extend "
+"beyond the actual borders of the image."
+
+#: ../plug-ins/common/file-gif-save.c:967
+msgid ""
+"The GIF file format does not allow this.  You may choose whether to crop all "
+"of the layers to the image borders, or cancel this save."
+msgstr ""
+"The GIF file format does not allow this.  You may choose whether to crop all "
+"of the layers to the image borders, or cancel this save."
+
+#: ../plug-ins/common/file-gif-save.c:1008
+msgid "Save as GIF"
+msgstr "Save as GIF"
+
+#. regular gif parameter settings
+#: ../plug-ins/common/file-gif-save.c:1030
+msgid "GIF Options"
+msgstr "GIF Options"
+
+#: ../plug-ins/common/file-gif-save.c:1036
+msgid "I_nterlace"
+msgstr "I_nterlace"
+
+#: ../plug-ins/common/file-gif-save.c:1052
+msgid "_GIF comment:"
+msgstr "_GIF comment:"
+
+#. additional animated gif parameter settings
+#: ../plug-ins/common/file-gif-save.c:1110
+msgid "Animated GIF Options"
+msgstr "Animated GIF Options"
+
+#: ../plug-ins/common/file-gif-save.c:1116
+msgid "_Loop forever"
+msgstr "_Loop forever"
+
+#: ../plug-ins/common/file-gif-save.c:1129
+msgid "_Delay between frames where unspecified:"
+msgstr "_Delay between frames where unspecified:"
+
+#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1507
+msgid "milliseconds"
+msgstr "milliseconds"
+
+#: ../plug-ins/common/file-gif-save.c:1154
+msgid "_Frame disposal where unspecified:"
+msgstr "_Frame disposal where unspecified:"
+
+#: ../plug-ins/common/file-gif-save.c:1158
+msgid "I don't care"
+msgstr "I don't care"
+
+#: ../plug-ins/common/file-gif-save.c:1160
+msgid "Cumulative layers (combine)"
+msgstr "Cumulative layers (combine)"
+
+#: ../plug-ins/common/file-gif-save.c:1162
+msgid "One frame per layer (replace)"
+msgstr "One frame per layer (replace)"
+
+#. The "Always use default values" toggles
+#: ../plug-ins/common/file-gif-save.c:1178
+msgid "_Use delay entered above for all frames"
+msgstr "_Use delay entered above for all frames"
+
+#: ../plug-ins/common/file-gif-save.c:1188
+msgid "U_se disposal entered above for all frames"
+msgstr "U_se disposal entered above for all frames"
+
+#: ../plug-ins/common/file-gif-save.c:2341
+msgid "Error writing output file."
+msgstr "Error writing output file."
+
+#: ../plug-ins/common/file-gif-save.c:2411
+#, c-format
+msgid "The default comment is limited to %d characters."
+msgstr "The default comment is limited to %d characters."
+
+#: ../plug-ins/common/file-gih.c:209 ../plug-ins/common/file-gih.c:230
+msgid "GIMP brush (animated)"
+msgstr "GIMP brush (animated)"
+
+#: ../plug-ins/common/file-gih.c:324
+#, c-format
+msgid "Layer %s doesn't have an alpha channel, skipped"
+msgstr "Layer %s doesn't have an alpha channel, skipped"
+
+#: ../plug-ins/common/file-gih.c:503
+msgid "Error in GIMP brush pipe file."
+msgstr "Error in GIMP brush pipe file."
+
+#: ../plug-ins/common/file-gih.c:569
+msgid "GIMP brush file appears to be corrupted."
+msgstr "GIMP brush file appears to be corrupted."
+
+#: ../plug-ins/common/file-gih.c:718
+msgid "Couldn't load one brush in the pipe, giving up."
+msgstr "Couldn't load one brush in the pipe, giving up."
+
+#: ../plug-ins/common/file-gih.c:881
+msgid "Save as Brush Pipe"
+msgstr "Save as Brush Pipe"
+
+#: ../plug-ins/common/file-gih.c:911
+msgid "Spacing (percent):"
+msgstr "Spacing (percent):"
+
+#: ../plug-ins/common/file-gih.c:978
+msgid "Pixels"
+msgstr "Pixels"
+
+#: ../plug-ins/common/file-gih.c:983
+msgid "Cell size:"
+msgstr "Cell size:"
+
+#: ../plug-ins/common/file-gih.c:995
+msgid "Number of cells:"
+msgstr "Number of cells:"
+
+#: ../plug-ins/common/file-gih.c:1020
+msgid " Rows of "
+msgstr " Rows of "
+
+#: ../plug-ins/common/file-gih.c:1032
+msgid " Columns on each layer"
+msgstr " Columns on each layer"
+
+#: ../plug-ins/common/file-gih.c:1036
+msgid " (Width Mismatch!) "
+msgstr " (Width Mismatch!) "
+
+#: ../plug-ins/common/file-gih.c:1040
+msgid " (Height Mismatch!) "
+msgstr " (Height Mismatch!) "
+
+#: ../plug-ins/common/file-gih.c:1045
+msgid "Display as:"
+msgstr "Display as:"
+
+#: ../plug-ins/common/file-gih.c:1054
+msgid "Dimension:"
+msgstr "Dimension:"
+
+#: ../plug-ins/common/file-gih.c:1129
+msgid "Ranks:"
+msgstr "Ranks:"
+
+#: ../plug-ins/common/file-header.c:77
+msgid "C source code header"
+msgstr "C source code header"
+
+#: ../plug-ins/common/file-html-table.c:156
+msgid "HTML table"
+msgstr "HTML table"
+
+#: ../plug-ins/common/file-html-table.c:409
+msgid "Save as HTML table"
+msgstr "Save as HTML table"
+
+#: ../plug-ins/common/file-html-table.c:436
+msgid "Warning"
+msgstr "Warning"
+
+#: ../plug-ins/common/file-html-table.c:447
+msgid ""
+"You are about to create a huge\n"
+"HTML file which will most likely\n"
+"crash your browser."
+msgstr ""
+"You are about to create a huge\n"
+"HTML file which will most likely\n"
+"crash your browser."
+
+#. HTML Page Options
+#: ../plug-ins/common/file-html-table.c:456
+msgid "HTML Page Options"
+msgstr "HTML Page Options"
+
+#: ../plug-ins/common/file-html-table.c:463
+msgid "_Generate full HTML document"
+msgstr "_Generate full HTML document"
+
+#: ../plug-ins/common/file-html-table.c:469
+msgid ""
+"If checked GTM will output a full HTML document with , , etc. "
+"tags instead of just the table html."
+msgstr ""
+"If checked GTM will output a full HTML document with , , etc. "
+"tags instead of just the table html."
+
+#. HTML Table Creation Options
+#: ../plug-ins/common/file-html-table.c:482
+msgid "Table Creation Options"
+msgstr "Table Creation Options"
+
+#: ../plug-ins/common/file-html-table.c:490
+msgid "_Use cellspan"
+msgstr "_Use cellspan"
+
+#: ../plug-ins/common/file-html-table.c:496
+msgid ""
+"If checked GTM will replace any rectangular sections of identically colored "
+"blocks with one large cell with ROWSPAN and COLSPAN values."
+msgstr ""
+"If checked GTM will replace any rectangular sections of identically coloured "
+"blocks with one large cell with ROWSPAN and COLSPAN values."
+
+#: ../plug-ins/common/file-html-table.c:505
+msgid "Co_mpress TD tags"
+msgstr "Co_mpress TD tags"
+
+#: ../plug-ins/common/file-html-table.c:511
+msgid ""
+"Checking this tag will cause GTM to leave no whitespace between the TD tags "
+"and the cellcontent.  This is only necessary for pixel level positioning "
+"control."
+msgstr ""
+"Checking this tag will cause GTM to leave no whitespace between the TD tags "
+"and the cellcontent.  This is only necessary for pixel level positioning "
+"control."
+
+#: ../plug-ins/common/file-html-table.c:521
+msgid "C_aption"
+msgstr "C_aption"
+
+#: ../plug-ins/common/file-html-table.c:527
+msgid "Check if you would like to have the table captioned."
+msgstr "Check if you would like to have the table captioned."
+
+#: ../plug-ins/common/file-html-table.c:542
+msgid "The text for the table caption."
+msgstr "The text for the table caption."
+
+#: ../plug-ins/common/file-html-table.c:555
+msgid "C_ell content:"
+msgstr "C_ell content:"
+
+#: ../plug-ins/common/file-html-table.c:559
+msgid "The text to go into each cell."
+msgstr "The text to go into each cell."
+
+#. HTML Table Options
+#: ../plug-ins/common/file-html-table.c:569
+msgid "Table Options"
+msgstr "Table Options"
+
+#: ../plug-ins/common/file-html-table.c:580
+msgid "_Border:"
+msgstr "_Border:"
+
+#: ../plug-ins/common/file-html-table.c:584
+msgid "The number of pixels in the table border."
+msgstr "The number of pixels in the table border."
+
+#: ../plug-ins/common/file-html-table.c:599
+msgid "The width for each table cell.  Can be a number or a percent."
+msgstr "The width for each table cell.  Can be a number or a percent."
+
+#: ../plug-ins/common/file-html-table.c:615
+msgid "The height for each table cell.  Can be a number or a percent."
+msgstr "The height for each table cell.  Can be a number or a percent."
+
+#: ../plug-ins/common/file-html-table.c:626
+msgid "Cell-_padding:"
+msgstr "Cell-_padding:"
+
+#: ../plug-ins/common/file-html-table.c:630
+msgid "The amount of cellpadding."
+msgstr "The amount of cellpadding."
+
+#: ../plug-ins/common/file-html-table.c:639
+msgid "Cell-_spacing:"
+msgstr "Cell-_spacing:"
+
+#: ../plug-ins/common/file-html-table.c:643
+msgid "The amount of cellspacing."
+msgstr "The amount of cellspacing."
+
+#. Inform the user that we couldn't losslessly save the
+#. * transparency & just use the full palette
+#: ../plug-ins/common/file-mng.c:498 ../plug-ins/common/file-png.c:1760
+msgid "Couldn't losslessly save transparency, saving opacity instead."
+msgstr "Couldn't losslessly save transparency, saving opacity instead."
+
+#: ../plug-ins/common/file-mng.c:1287
+msgid "Save as MNG"
+msgstr "Save as MNG"
+
+#: ../plug-ins/common/file-mng.c:1307
+msgid "MNG Options"
+msgstr "MNG Options"
+
+#: ../plug-ins/common/file-mng.c:1313
+msgid "Interlace"
+msgstr "Interlace"
+
+#: ../plug-ins/common/file-mng.c:1325
+msgid "Save background color"
+msgstr "Save background colour"
+
+#: ../plug-ins/common/file-mng.c:1336
+msgid "Save gamma"
+msgstr "Save gamma"
+
+#: ../plug-ins/common/file-mng.c:1346
+msgid "Save resolution"
+msgstr "Save resolution"
+
+#: ../plug-ins/common/file-mng.c:1357
+msgid "Save creation time"
+msgstr "Save creation time"
+
+#: ../plug-ins/common/file-mng.c:1376
+msgid "PNG"
+msgstr "PNG"
+
+#: ../plug-ins/common/file-mng.c:1377
+msgid "JNG"
+msgstr "JNG"
+
+#: ../plug-ins/common/file-mng.c:1380
+msgid "PNG + delta PNG"
+msgstr "PNG + delta PNG"
+
+#: ../plug-ins/common/file-mng.c:1381
+msgid "JNG + delta PNG"
+msgstr "JNG + delta PNG"
+
+#: ../plug-ins/common/file-mng.c:1382
+msgid "All PNG"
+msgstr "All PNG"
+
+#: ../plug-ins/common/file-mng.c:1383
+msgid "All JNG"
+msgstr "All JNG"
+
+#: ../plug-ins/common/file-mng.c:1395
+msgid "Default chunks type:"
+msgstr "Default chunks type:"
+
+#: ../plug-ins/common/file-mng.c:1398
+msgid "Combine"
+msgstr "Combine"
+
+#: ../plug-ins/common/file-mng.c:1399
+msgid "Replace"
+msgstr "Replace"
+
+#: ../plug-ins/common/file-mng.c:1410
+msgid "Default frame disposal:"
+msgstr "Default frame disposal:"
+
+#: ../plug-ins/common/file-mng.c:1422
+msgid "PNG compression level:"
+msgstr "PNG compression level:"
+
+#: ../plug-ins/common/file-mng.c:1430 ../plug-ins/common/file-png.c:1908
+msgid "Choose a high compression level for small file size"
+msgstr "Choose a high compression level for small file size"
+
+#: ../plug-ins/common/file-mng.c:1444
+msgid "JPEG compression quality:"
+msgstr "JPEG compression quality:"
+
+#: ../plug-ins/common/file-mng.c:1461
+msgid "JPEG smoothing factor:"
+msgstr "JPEG smoothing factor:"
+
+#: ../plug-ins/common/file-mng.c:1471
+msgid "Animated MNG Options"
+msgstr "Animated MNG Options"
+
+#: ../plug-ins/common/file-mng.c:1477
+msgid "Loop"
+msgstr "Loop"
+
+#: ../plug-ins/common/file-mng.c:1491
+msgid "Default frame delay:"
+msgstr "Default frame delay:"
+
+#: ../plug-ins/common/file-mng.c:1564
+msgid "MNG animation"
+msgstr "MNG animation"
+
+#: ../plug-ins/common/file-pat.c:123 ../plug-ins/common/file-pat.c:145
+msgid "GIMP pattern"
+msgstr "GIMP pattern"
+
+#: ../plug-ins/common/file-pat.c:371
+#, c-format
+msgid "Invalid UTF-8 string in pattern file '%s'."
+msgstr "Invalid UTF-8 string in pattern file '%s'."
+
+#: ../plug-ins/common/file-pat.c:528
+msgid "Save as Pattern"
+msgstr "Save as Pattern"
+
+#: ../plug-ins/common/file-pcx.c:133 ../plug-ins/common/file-pcx.c:152
+msgid "ZSoft PCX image"
+msgstr "ZSoft PCX image"
+
+#: ../plug-ins/common/file-pcx.c:372
+#, c-format
+msgid "Could not read header from '%s'"
+msgstr "Could not read header from '%s'"
+
+#: ../plug-ins/common/file-pcx.c:382
+#, c-format
+msgid "'%s' is not a PCX file"
+msgstr "'%s' is not a PCX file"
+
+#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:606
+#: ../plug-ins/file-psd/psd-load.c:302
+#, c-format
+msgid "Unsupported or invalid image width: %d"
+msgstr "Unsupported or invalid image width: %d"
+
+#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:612
+#: ../plug-ins/file-psd/psd-load.c:294
+#, c-format
+msgid "Unsupported or invalid image height: %d"
+msgstr "Unsupported or invalid image height: %d"
+
+#: ../plug-ins/common/file-pcx.c:405
+msgid "Invalid number of bytes per line in PCX header"
+msgstr "Invalid number of bytes per line in PCX header"
+
+#: ../plug-ins/common/file-pcx.c:453
+msgid "Unusual PCX flavour, giving up"
+msgstr "Unusual PCX flavour, giving up"
+
+#: ../plug-ins/common/file-pcx.c:676
+#, c-format
+msgid "Invalid X offset: %d"
+msgstr "Invalid X offset: %d"
+
+#: ../plug-ins/common/file-pcx.c:682
+#, c-format
+msgid "Invalid Y offset: %d"
+msgstr "Invalid Y offset: %d"
+
+#: ../plug-ins/common/file-pcx.c:688
+#, c-format
+msgid "Right border out of bounds (must be < %d): %d"
+msgstr "Right border out of bounds (must be < %d): %d"
+
+#: ../plug-ins/common/file-pcx.c:695
+#, c-format
+msgid "Bottom border out of bounds (must be < %d): %d"
+msgstr "Bottom border out of bounds (must be < %d): %d"
+
+#: ../plug-ins/common/file-pcx.c:752
+#, c-format
+msgid "Writing to file '%s' failed: %s"
+msgstr "Writing to file '%s' failed: %s"
+
+#: ../plug-ins/common/file-pdf.c:288
+msgid "Portable Document Format"
+msgstr "Portable Document Format"
+
+#: ../plug-ins/common/file-pdf.c:620
+#, c-format
+msgid "%s-%s"
+msgstr "%s-%s"
+
+#: ../plug-ins/common/file-pdf.c:622 ../plug-ins/common/file-ps.c:1125
+#, c-format
+msgid "%s-pages"
+msgstr "%s-pages"
+
+#: ../plug-ins/common/file-pdf.c:808
+msgid "Import from PDF"
+msgstr "Import from PDF"
+
+#: ../plug-ins/common/file-pdf.c:813 ../plug-ins/common/file-ps.c:3100
+#: ../plug-ins/common/file-tiff-load.c:483
+msgid "_Import"
+msgstr "_Import"
+
+#: ../plug-ins/common/file-pdf.c:879
+msgid "_Width (pixels):"
+msgstr "_Width (pixels):"
+
+#: ../plug-ins/common/file-pdf.c:880
+msgid "_Height (pixels):"
+msgstr "_Height (pixels):"
+
+#: ../plug-ins/common/file-pdf.c:882
+msgid "_Resolution:"
+msgstr "_Resolution:"
+
+#: ../plug-ins/common/file-pdf.c:1156
+#, c-format
+msgid "pixels/%s"
+msgstr "pixels/%s"
+
+#: ../plug-ins/common/file-pix.c:142 ../plug-ins/common/file-pix.c:159
+msgid "Alias Pix image"
+msgstr "Alias Pix image"
+
+#: ../plug-ins/common/file-png.c:263 ../plug-ins/common/file-png.c:284
+#: ../plug-ins/common/file-png.c:304 ../plug-ins/common/file-png.c:321
+msgid "PNG image"
+msgstr "PNG image"
+
+#: ../plug-ins/common/file-png.c:628
+#, c-format
+msgid "Error loading PNG file: %s"
+msgstr "Error loading PNG file: %s"
+
+#: ../plug-ins/common/file-png.c:703
+#, c-format
+msgid "Error while reading '%s'. File corrupted?"
+msgstr "Error while reading '%s'. File corrupted?"
+
+#: ../plug-ins/common/file-png.c:834
+#, c-format
+msgid "Unknown color model in PNG file '%s'."
+msgstr "Unknown colour model in PNG file '%s'."
+
+#: ../plug-ins/common/file-png.c:889
+msgid ""
+"The PNG file specifies an offset that caused the layer to be positioned "
+"outside the image."
+msgstr ""
+"The PNG file specifies an offset that caused the layer to be positioned "
+"outside the image."
+
+#: ../plug-ins/common/file-png.c:1254
+#, c-format
+msgid "Error while saving '%s'. Could not save image."
+msgstr "Error while saving '%s'. Could not save image."
+
+#: ../plug-ins/common/file-png.c:1785
+msgid "Save as PNG"
+msgstr "Save as PNG"
+
+#: ../plug-ins/common/file-png.c:1817
+msgid "_Interlacing (Adam7)"
+msgstr "_Interlacing (Adam7)"
+
+#: ../plug-ins/common/file-png.c:1828
+msgid "Save _background color"
+msgstr "Save _background colour"
+
+#: ../plug-ins/common/file-png.c:1836
+msgid "Save _gamma"
+msgstr "Save _gamma"
+
+#: ../plug-ins/common/file-png.c:1846
+msgid "Save layer o_ffset"
+msgstr "Save layer o_ffset"
+
+#: ../plug-ins/common/file-png.c:1855
+msgid "Save _resolution"
+msgstr "Save _resolution"
+
+#: ../plug-ins/common/file-png.c:1865
+msgid "Save creation _time"
+msgstr "Save creation _time"
+
+#: ../plug-ins/common/file-png.c:1874
+msgid "Save comme_nt"
+msgstr "Save comme_nt"
+
+#: ../plug-ins/common/file-png.c:1890
+msgid "Save color _values from transparent pixels"
+msgstr "Save colour _values from transparent pixels"
+
+#: ../plug-ins/common/file-png.c:1904
+msgid "Co_mpression level:"
+msgstr "Co_mpression level:"
+
+#: ../plug-ins/common/file-png.c:1922 ../plug-ins/file-jpeg/jpeg-save.c:1186
+msgid "_Load Defaults"
+msgstr "_Load Defaults"
+
+#: ../plug-ins/common/file-png.c:1930
+msgid "S_ave Defaults"
+msgstr "S_ave Defaults"
+
+#: ../plug-ins/common/file-pnm.c:248
+msgid "PNM Image"
+msgstr "PNM Image"
+
+#: ../plug-ins/common/file-pnm.c:268
+msgid "PNM image"
+msgstr "PNM image"
+
+#: ../plug-ins/common/file-pnm.c:280
+msgid "PBM image"
+msgstr "PBM image"
+
+#: ../plug-ins/common/file-pnm.c:292
+msgid "PGM image"
+msgstr "PGM image"
+
+#: ../plug-ins/common/file-pnm.c:304
+msgid "PPM image"
+msgstr "PPM image"
+
+#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550
+#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570
+#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:728
+msgid "Premature end of file."
+msgstr "Premature end of file."
+
+#: ../plug-ins/common/file-pnm.c:530
+msgid "Invalid file."
+msgstr "Invalid file."
+
+#: ../plug-ins/common/file-pnm.c:544
+msgid "File not in a supported format."
+msgstr "File not in a supported format."
+
+#: ../plug-ins/common/file-pnm.c:553
+msgid "Invalid X resolution."
+msgstr "Invalid X resolution."
+
+#: ../plug-ins/common/file-pnm.c:555
+msgid "Image width is larger than GIMP can handle."
+msgstr "Image width is larger than GIMP can handle."
+
+#: ../plug-ins/common/file-pnm.c:562
+msgid "Invalid Y resolution."
+msgstr "Invalid Y resolution."
+
+#: ../plug-ins/common/file-pnm.c:564
+msgid "Image height is larger than GIMP can handle."
+msgstr "Image height is larger than GIMP can handle."
+
+#: ../plug-ins/common/file-pnm.c:576
+msgid "Unsupported maximum value."
+msgstr "Unsupported maximum value."
+
+#: ../plug-ins/common/file-pnm.c:781
+msgid "Error reading file."
+msgstr "Error reading file."
+
+#: ../plug-ins/common/file-pnm.c:1185
+msgid "Save as PNM"
+msgstr "Save as PNM"
+
+#. file save type
+#: ../plug-ins/common/file-pnm.c:1202
+msgid "Data formatting"
+msgstr "Data formatting"
+
+#: ../plug-ins/common/file-pnm.c:1206
+msgid "Raw"
+msgstr "Raw"
+
+#: ../plug-ins/common/file-pnm.c:1207
+msgid "Ascii"
+msgstr "Ascii"
+
+#: ../plug-ins/common/file-ps.c:599 ../plug-ins/common/file-ps.c:691
+msgid "PostScript document"
+msgstr "PostScript document"
+
+#: ../plug-ins/common/file-ps.c:618 ../plug-ins/common/file-ps.c:707
+msgid "Encapsulated PostScript image"
+msgstr "Encapsulated PostScript image"
+
+#: ../plug-ins/common/file-ps.c:638
+msgid "PDF document"
+msgstr "PDF document"
+
+#: ../plug-ins/common/file-ps.c:1050
+#, c-format
+msgid "Could not interpret Postscript file '%s'"
+msgstr "Could not interpret Postscript file '%s'"
+
+#: ../plug-ins/common/file-ps.c:1192
+#, c-format
+msgid "PostScript save cannot handle images with alpha channels"
+msgstr "PostScript save cannot handle images with alpha channels"
+
+#: ../plug-ins/common/file-ps.c:1730 ../plug-ins/common/file-ps.c:1763
+#, c-format
+msgid ""
+"Error starting Ghostscript. Make sure that Ghostscript is installed and - if "
+"necessary - use the environment variable GS_PROG to tell GIMP about its "
+"location.\n"
+"(%s)"
+msgstr ""
+"Error starting Ghostscript. Make sure that Ghostscript is installed and - if "
+"necessary - use the environment variable GS_PROG to tell GIMP about its "
+"location.\n"
+"(%s)"
+
+#: ../plug-ins/common/file-ps.c:1930 ../plug-ins/common/file-tiff-load.c:999
+#, c-format
+msgid "Page %d"
+msgstr "Page %d"
+
+#: ../plug-ins/common/file-ps.c:2600 ../plug-ins/common/file-ps.c:2733
+#: ../plug-ins/common/file-ps.c:2885 ../plug-ins/common/file-ps.c:3011
+#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1612
+#: ../plug-ins/file-fits/fits.c:850 ../plug-ins/file-fits/fits.c:974
+msgid "Write error occurred"
+msgstr "Write error occurred"
+
+#: ../plug-ins/common/file-ps.c:3095
+msgid "Import from PostScript"
+msgstr "Import from PostScript"
+
+#. Rendering
+#: ../plug-ins/common/file-ps.c:3138
+msgid "Rendering"
+msgstr "Rendering"
+
+#. Resolution
+#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:929
+#: ../plug-ins/common/file-wmf.c:692
+msgid "Resolution:"
+msgstr "Resolution:"
+
+#: ../plug-ins/common/file-ps.c:3193
+msgid "Pages:"
+msgstr "Pages:"
+
+#: ../plug-ins/common/file-ps.c:3200
+msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
+msgstr "Pages to load (e.g.: 1-4 or 1,3,5-7)"
+
+#: ../plug-ins/common/file-ps.c:3204 ../plug-ins/common/sphere-designer.c:2643
+msgid "Layers"
+msgstr "Layers"
+
+#: ../plug-ins/common/file-ps.c:3206
+msgid "Images"
+msgstr "Images"
+
+#: ../plug-ins/common/file-ps.c:3209
+msgid "Open as"
+msgstr "Open as"
+
+#: ../plug-ins/common/file-ps.c:3213
+msgid "Try Bounding Box"
+msgstr "Try Bounding Box"
+
+#. Colouring
+#: ../plug-ins/common/file-ps.c:3226
+msgid "Coloring"
+msgstr "Colouring"
+
+#: ../plug-ins/common/file-ps.c:3230
+msgid "B/W"
+msgstr "B/W"
+
+#: ../plug-ins/common/file-ps.c:3232 ../plug-ins/common/file-xpm.c:479
+#: ../plug-ins/gimpressionist/color.c:66
+#: ../plug-ins/gimpressionist/general.c:170
+#: ../plug-ins/imagemap/imap_menu.c:213
+msgid "Color"
+msgstr "Colour"
+
+#: ../plug-ins/common/file-ps.c:3233 ../plug-ins/file-fits/fits.c:1033
+msgid "Automatic"
+msgstr "Automatic"
+
+#: ../plug-ins/common/file-ps.c:3243
+msgid "Text antialiasing"
+msgstr "Text antialiasing"
+
+#: ../plug-ins/common/file-ps.c:3248 ../plug-ins/common/file-ps.c:3260
+msgid "Weak"
+msgstr "Weak"
+
+#: ../plug-ins/common/file-ps.c:3249 ../plug-ins/common/file-ps.c:3261
+msgid "Strong"
+msgstr "Strong"
+
+#: ../plug-ins/common/file-ps.c:3255
+msgid "Graphic antialiasing"
+msgstr "Graphic antialiasing"
+
+#: ../plug-ins/common/file-ps.c:3333
+msgid "Save as PostScript"
+msgstr "Save as PostScript"
+
+#. Image Size
+#: ../plug-ins/common/file-ps.c:3364
+msgid "Image Size"
+msgstr "Image Size"
+
+#: ../plug-ins/common/file-ps.c:3413
+msgid "_Keep aspect ratio"
+msgstr "_Keep aspect ratio"
+
+#: ../plug-ins/common/file-ps.c:3419
+msgid ""
+"When toggled, the resulting image will be scaled to fit into the given size "
+"without changing the aspect ratio."
+msgstr ""
+"When toggled, the resulting image will be scaled to fit into the given size "
+"without changing the aspect ratio."
+
+#. Unit
+#: ../plug-ins/common/file-ps.c:3429
+msgid "Unit"
+msgstr "Unit"
+
+#: ../plug-ins/common/file-ps.c:3433
+msgid "_Inch"
+msgstr "_Inch"
+
+#: ../plug-ins/common/file-ps.c:3434
+msgid "_Millimeter"
+msgstr "_Millimetre"
+
+#. Rotation
+#: ../plug-ins/common/file-ps.c:3445
+#: ../plug-ins/map-object/map-object-ui.c:1035
+msgid "Rotation"
+msgstr "Rotation"
+
+#. Format
+#: ../plug-ins/common/file-ps.c:3460
+msgid "Output"
+msgstr "Output"
+
+#: ../plug-ins/common/file-ps.c:3466
+msgid "_PostScript level 2"
+msgstr "_PostScript level 2"
+
+#: ../plug-ins/common/file-ps.c:3475
+msgid "_Encapsulated PostScript"
+msgstr "_Encapsulated PostScript"
+
+#: ../plug-ins/common/file-ps.c:3484
+msgid "P_review"
+msgstr "P_review"
+
+#: ../plug-ins/common/file-ps.c:3505
+msgid "Preview _size:"
+msgstr "Preview _size:"
+
+#: ../plug-ins/common/file-psp.c:599 ../plug-ins/common/file-psp.c:623
+msgid "Paint Shop Pro image"
+msgstr "Paint Shop Pro image"
+
+#: ../plug-ins/common/file-psp.c:640
+msgid "Save as PSP"
+msgstr "Save as PSP"
+
+#. file save type
+#: ../plug-ins/common/file-psp.c:657
+msgid "Data Compression"
+msgstr "Data Compression"
+
+#: ../plug-ins/common/file-psp.c:662
+msgid "RLE"
+msgstr "RLE"
+
+#: ../plug-ins/common/file-psp.c:663
+msgid "LZ77"
+msgstr "LZ77"
+
+#: ../plug-ins/common/file-raw.c:182 ../plug-ins/common/file-raw.c:197
+msgid "Raw image data"
+msgstr "Raw image data"
+
+#: ../plug-ins/common/file-raw.c:980
+msgid "Load Image from Raw Data"
+msgstr "Load Image from Raw Data"
+
+#: ../plug-ins/common/file-raw.c:1013
+msgid "Image"
+msgstr "Image"
+
+#: ../plug-ins/common/file-raw.c:1024
+msgid "RGB Alpha"
+msgstr "RGB Alpha"
+
+#: ../plug-ins/common/file-raw.c:1025
+msgid "Planar RGB"
+msgstr "Planar RGB"
+
+#: ../plug-ins/common/file-raw.c:1026
+msgid "Indexed"
+msgstr "Indexed"
+
+#: ../plug-ins/common/file-raw.c:1027
+msgid "Indexed Alpha"
+msgstr "Indexed Alpha"
+
+#: ../plug-ins/common/file-raw.c:1032
+msgid "Image _Type:"
+msgstr "Image _Type:"
+
+#: ../plug-ins/common/file-raw.c:1082
+msgid "Palette"
+msgstr "Palette"
+
+#: ../plug-ins/common/file-raw.c:1092 ../plug-ins/common/file-raw.c:1191
+msgid "R, G, B (normal)"
+msgstr "R, G, B (normal)"
+
+#: ../plug-ins/common/file-raw.c:1093 ../plug-ins/common/file-raw.c:1193
+msgid "B, G, R, X (BMP style)"
+msgstr "B, G, R, X (BMP style)"
+
+#: ../plug-ins/common/file-raw.c:1098
+msgid "_Palette Type:"
+msgstr "_Palette Type:"
+
+#: ../plug-ins/common/file-raw.c:1109
+msgid "Off_set:"
+msgstr "Off_set:"
+
+#: ../plug-ins/common/file-raw.c:1121
+msgid "Select Palette File"
+msgstr "Select Palette File"
+
+#: ../plug-ins/common/file-raw.c:1127
+msgid "Pal_ette File:"
+msgstr "Pal_ette File:"
+
+#: ../plug-ins/common/file-raw.c:1155
+msgid "Raw Image Save"
+msgstr "Raw Image Save"
+
+#: ../plug-ins/common/file-raw.c:1177
+msgid "RGB Save Type"
+msgstr "RGB Save Type"
+
+#: ../plug-ins/common/file-raw.c:1181
+msgid "Standard (R,G,B)"
+msgstr "Standard (R,G,B)"
+
+#: ../plug-ins/common/file-raw.c:1182
+msgid "Planar (RRR,GGG,BBB)"
+msgstr "Planar (RRR,GGG,BBB)"
+
+#: ../plug-ins/common/file-raw.c:1187
+msgid "Indexed Palette Type"
+msgstr "Indexed Palette Type"
+
+#: ../plug-ins/common/file-sunras.c:217 ../plug-ins/common/file-sunras.c:237
+msgid "SUN Rasterfile image"
+msgstr "SUN Rasterfile image"
+
+#: ../plug-ins/common/file-sunras.c:402
+#, c-format
+msgid "Could not open '%s' as SUN-raster-file"
+msgstr "Could not open '%s' as SUN-raster-file"
+
+#: ../plug-ins/common/file-sunras.c:412
+msgid "The type of this SUN-rasterfile is not supported"
+msgstr "The type of this SUN-rasterfile is not supported"
+
+#: ../plug-ins/common/file-sunras.c:441
+#, c-format
+msgid "Could not read color entries from '%s'"
+msgstr "Could not read colour entries from '%s'"
+
+#: ../plug-ins/common/file-sunras.c:449
+msgid "Type of colormap not supported"
+msgstr "Type of colourmap not supported"
+
+#: ../plug-ins/common/file-sunras.c:456 ../plug-ins/common/file-xbm.c:826
+#: ../plug-ins/common/file-xwd.c:489
+#, c-format
+msgid ""
+"'%s':\n"
+"No image width specified"
+msgstr ""
+"'%s':\n"
+"No image width specified"
+
+#: ../plug-ins/common/file-sunras.c:464 ../plug-ins/common/file-xbm.c:833
+#: ../plug-ins/common/file-xwd.c:498
+#, c-format
+msgid ""
+"'%s':\n"
+"Image width is larger than GIMP can handle"
+msgstr ""
+"'%s':\n"
+"Image width is larger than GIMP can handle"
+
+#: ../plug-ins/common/file-sunras.c:472 ../plug-ins/common/file-xbm.c:840
+#: ../plug-ins/common/file-xwd.c:506
+#, c-format
+msgid ""
+"'%s':\n"
+"No image height specified"
+msgstr ""
+"'%s':\n"
+"No image height specified"
+
+#: ../plug-ins/common/file-sunras.c:480 ../plug-ins/common/file-xbm.c:847
+#: ../plug-ins/common/file-xwd.c:514
+#, c-format
+msgid ""
+"'%s':\n"
+"Image height is larger than GIMP can handle"
+msgstr ""
+"'%s':\n"
+"Image height is larger than GIMP can handle"
+
+#: ../plug-ins/common/file-sunras.c:518
+msgid "This image depth is not supported"
+msgstr "This image depth is not supported"
+
+#: ../plug-ins/common/file-sunras.c:542
+#, c-format
+msgid "SUNRAS save cannot handle images with alpha channels"
+msgstr "SUNRAS save cannot handle images with alpha channels"
+
+#: ../plug-ins/common/file-sunras.c:553
+msgid "Can't operate on unknown image types"
+msgstr "Can't operate on unknown image types"
+
+#: ../plug-ins/common/file-sunras.c:1082 ../plug-ins/common/file-sunras.c:1173
+#: ../plug-ins/common/file-sunras.c:1254 ../plug-ins/common/file-sunras.c:1349
+#: ../plug-ins/common/file-xwd.c:1348 ../plug-ins/common/file-xwd.c:1449
+#: ../plug-ins/common/file-xwd.c:1607 ../plug-ins/common/file-xwd.c:1807
+#: ../plug-ins/common/file-xwd.c:2064 ../plug-ins/file-fits/fits.c:697
+msgid "EOF encountered on reading"
+msgstr "EOF encountered on reading"
+
+#: ../plug-ins/common/file-sunras.c:1629
+msgid "Save as SUNRAS"
+msgstr "Save as SUNRAS"
+
+#. file save type
+#: ../plug-ins/common/file-sunras.c:1646
+msgid "Data Formatting"
+msgstr "Data Formatting"
+
+#: ../plug-ins/common/file-sunras.c:1650
+msgid "RunLength Encoded"
+msgstr "RunLength Encoded"
+
+#: ../plug-ins/common/file-svg.c:140
+msgid "SVG image"
+msgstr "SVG image"
+
+#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:733
+msgid "Unknown reason"
+msgstr "Unknown reason"
+
+#: ../plug-ins/common/file-svg.c:341
+msgid "Rendering SVG"
+msgstr "Rendering SVG"
+
+#: ../plug-ins/common/file-svg.c:353
+msgid "Rendered SVG"
+msgstr "Rendered SVG"
+
+#: ../plug-ins/common/file-svg.c:567 ../plug-ins/common/file-wmf.c:358
+#, c-format
+msgid "%d × %d"
+msgstr "%d × %d"
+
+#: ../plug-ins/common/file-svg.c:575
+msgid ""
+"SVG file does not\n"
+"specify a size!"
+msgstr ""
+"SVG file does not\n"
+"specify a size!"
+
+#. Scalable Vector Graphics is SVG, should perhaps not be translated
+#: ../plug-ins/common/file-svg.c:742
+msgid "Render Scalable Vector Graphics"
+msgstr "Render Scalable Vector Graphics"
+
+#. Width and Height
+#: ../plug-ins/common/file-svg.c:808 ../plug-ins/common/file-wmf.c:571
+#: ../plug-ins/common/grid.c:724
+msgid "Width:"
+msgstr "Width:"
+
+#: ../plug-ins/common/file-svg.c:814 ../plug-ins/common/file-wmf.c:577
+msgid "Height:"
+msgstr "Height:"
+
+#: ../plug-ins/common/file-svg.c:888 ../plug-ins/common/file-wmf.c:651
+msgid "_X ratio:"
+msgstr "_X ratio:"
+
+#: ../plug-ins/common/file-svg.c:910 ../plug-ins/common/file-wmf.c:673
+msgid "_Y ratio:"
+msgstr "_Y ratio:"
+
+#: ../plug-ins/common/file-svg.c:924 ../plug-ins/common/file-wmf.c:687
+msgid "Constrain aspect ratio"
+msgstr "Constrain aspect ratio"
+
+#: ../plug-ins/common/file-svg.c:935 ../plug-ins/common/file-wmf.c:698
+#: ../plug-ins/print/print-page-layout.c:273
+#, c-format
+msgid "pixels/%a"
+msgstr "pixels/%a"
+
+#. Path Import
+#: ../plug-ins/common/file-svg.c:955
+msgid "Import _paths"
+msgstr "Import _paths"
+
+#: ../plug-ins/common/file-svg.c:961
+msgid ""
+"Import path elements of the SVG so they can be used with the GIMP path tool"
+msgstr ""
+"Import path elements of the SVG so they can be used with the GIMP path tool"
+
+#: ../plug-ins/common/file-svg.c:974
+msgid "Merge imported paths"
+msgstr "Merge imported paths"
+
+#: ../plug-ins/common/file-tga.c:245 ../plug-ins/common/file-tga.c:264
+msgid "TarGA image"
+msgstr "TarGA image"
+
+#: ../plug-ins/common/file-tga.c:455
+#, c-format
+msgid "Cannot read footer from '%s'"
+msgstr "Cannot read footer from '%s'"
+
+#: ../plug-ins/common/file-tga.c:473
+#, c-format
+msgid "Cannot read extension from '%s'"
+msgstr "Cannot read extension from '%s'"
+
+#: ../plug-ins/common/file-tga.c:485
+#, c-format
+msgid "Cannot read header from '%s'"
+msgstr "Cannot read header from '%s'"
+
+#: ../plug-ins/common/file-tga.c:1368
+msgid "Save as TGA"
+msgstr "Save as TGA"
+
+#. rle
+#: ../plug-ins/common/file-tga.c:1391
+msgid "_RLE compression"
+msgstr "_RLE compression"
+
+#: ../plug-ins/common/file-tga.c:1405
+msgid "Or_igin:"
+msgstr "Or_igin:"
+
+#: ../plug-ins/common/file-tga.c:1409
+msgid "Bottom left"
+msgstr "Bottom left"
+
+#: ../plug-ins/common/file-tga.c:1410
+msgid "Top left"
+msgstr "Top left"
+
+#: ../plug-ins/common/file-tiff-load.c:240
+#: ../plug-ins/common/file-tiff-save.c:182
+#: ../plug-ins/common/file-tiff-save.c:199
+msgid "TIFF image"
+msgstr "TIFF image"
+
+#: ../plug-ins/common/file-tiff-load.c:310
+#, c-format
+msgid "TIFF '%s' does not contain any directories"
+msgstr "TIFF '%s' does not contain any directories"
+
+#: ../plug-ins/common/file-tiff-load.c:478
+msgid "Import from TIFF"
+msgstr "Import from TIFF"
+
+#: ../plug-ins/common/file-tiff-load.c:780
+#, c-format
+msgid "%s-%d-of-%d-pages"
+msgstr "%s-%d-of-%d-pages"
+
+#: ../plug-ins/common/file-tiff-load.c:1015
+msgid "TIFF Channel"
+msgstr "TIFF Channel"
+
+#: ../plug-ins/common/file-tiff-load.c:1024
+#: ../plug-ins/file-psd/psd-load.c:325
+msgid ""
+"Warning:\n"
+"The image you are loading has 16 bits per channel. GIMP can only handle 8 "
+"bit, so it will be converted for you. Information will be lost because of "
+"this conversion."
+msgstr ""
+"Warning:\n"
+"The image you are loading has 16 bits per channel. GIMP can only handle 8 "
+"bit, so it will be converted for you. Information will be lost because of "
+"this conversion."
+
+#: ../plug-ins/common/file-tiff-save.c:887
+msgid ""
+"The TIFF format only supports comments in\n"
+"7bit ASCII encoding. No comment is saved."
+msgstr ""
+"The TIFF format only supports comments in\n"
+"7bit ASCII encoding. No comment is saved."
+
+#: ../plug-ins/common/file-tiff-save.c:1061
+msgid "Save as TIFF"
+msgstr "Save as TIFF"
+
+#. compression
+#: ../plug-ins/common/file-tiff-save.c:1083
+msgid "Compression"
+msgstr "Compression"
+
+#: ../plug-ins/common/file-tiff-save.c:1087
+msgid "_None"
+msgstr "_None"
+
+#: ../plug-ins/common/file-tiff-save.c:1088
+msgid "_LZW"
+msgstr "_LZW"
+
+#: ../plug-ins/common/file-tiff-save.c:1089
+msgid "_Pack Bits"
+msgstr "_Pack Bits"
+
+#: ../plug-ins/common/file-tiff-save.c:1090
+msgid "_Deflate"
+msgstr "_Deflate"
+
+#: ../plug-ins/common/file-tiff-save.c:1091
+msgid "_JPEG"
+msgstr "_JPEG"
+
+#: ../plug-ins/common/file-tiff-save.c:1092
+msgid "CCITT Group _3 fax"
+msgstr "CCITT Group _3 fax"
+
+#: ../plug-ins/common/file-tiff-save.c:1093
+msgid "CCITT Group _4 fax"
+msgstr "CCITT Group _4 fax"
+
+#: ../plug-ins/common/file-tiff-save.c:1115
+msgid "Save _color values from transparent pixels"
+msgstr "Save _colour values from transparent pixels"
+
+#: ../plug-ins/common/file-tiff-save.c:1131 ../plug-ins/common/file-xbm.c:1246
+msgid "Comment:"
+msgstr "Comment:"
+
+#: ../plug-ins/common/file-wmf.c:129
+msgid "Microsoft WMF file"
+msgstr "Microsoft WMF file"
+
+#: ../plug-ins/common/file-wmf.c:352
+msgid ""
+"WMF file does not\n"
+"specify a size!"
+msgstr ""
+"WMF file does not\n"
+"specify a size!"
+
+#: ../plug-ins/common/file-wmf.c:500
+msgid "Render Windows Metafile"
+msgstr "Render Windows Metafile"
+
+#: ../plug-ins/common/file-wmf.c:963
+#, c-format
+msgid "Could not open '%s' for reading"
+msgstr "Could not open '%s' for reading"
+
+#: ../plug-ins/common/file-wmf.c:1003
+msgid "Rendered WMF"
+msgstr "Rendered WMF"
+
+#: ../plug-ins/common/file-xbm.c:176 ../plug-ins/common/file-xbm.c:194
+msgid "X BitMap image"
+msgstr "X BitMap image"
+
+#: ../plug-ins/common/file-xbm.c:819
+#, c-format
+msgid ""
+"'%s':\n"
+"Could not read header (ftell == %ld)"
+msgstr ""
+"'%s':\n"
+"Could not read header (ftell == %ld)"
+
+#: ../plug-ins/common/file-xbm.c:854
+#, c-format
+msgid ""
+"'%s':\n"
+"No image data type specified"
+msgstr ""
+"'%s':\n"
+"No image data type specified"
+
+#. The image is not black-and-white.
+#: ../plug-ins/common/file-xbm.c:997
+msgid ""
+"The image which you are trying to save as an XBM contains more than two "
+"colors.\n"
+"\n"
+"Please convert it to a black and white (1-bit) indexed image and try again."
+msgstr ""
+"The image which you are trying to save as an XBM contains more than two "
+"colours.\n"
+"\n"
+"Please convert it to a black and white (1-bit) indexed image and try again."
+
+#: ../plug-ins/common/file-xbm.c:1008
+msgid ""
+"You cannot save a cursor mask for an image\n"
+"which has no alpha channel."
+msgstr ""
+"You cannot save a cursor mask for an image\n"
+"which has no alpha channel."
+
+#: ../plug-ins/common/file-xbm.c:1185
+msgid "Save as XBM"
+msgstr "Save as XBM"
+
+#. parameter settings
+#: ../plug-ins/common/file-xbm.c:1202
+msgid "XBM Options"
+msgstr "XBM Options"
+
+#. X10 format
+#: ../plug-ins/common/file-xbm.c:1212
+msgid "_X10 format bitmap"
+msgstr "_X10 format bitmap"
+
+#: ../plug-ins/common/file-xbm.c:1232
+msgid "_Identifier prefix:"
+msgstr "_Identifier prefix:"
+
+#. hotspot toggle
+#: ../plug-ins/common/file-xbm.c:1254
+msgid "_Write hot spot values"
+msgstr "_Write hot spot values"
+
+#: ../plug-ins/common/file-xbm.c:1276
+msgid "Hot spot _X:"
+msgstr "Hot spot _X:"
+
+#: ../plug-ins/common/file-xbm.c:1286
+msgid "Hot spot _Y:"
+msgstr "Hot spot _Y:"
+
+#. mask file
+#: ../plug-ins/common/file-xbm.c:1293
+msgid "Mask File"
+msgstr "Mask File"
+
+#: ../plug-ins/common/file-xbm.c:1303
+msgid "W_rite extra mask file"
+msgstr "W_rite extra mask file"
+
+#: ../plug-ins/common/file-xbm.c:1316
+msgid "_Mask file extension:"
+msgstr "_Mask file extension:"
+
+#: ../plug-ins/common/file-xpm.c:174 ../plug-ins/common/file-xpm.c:199
+msgid "X PixMap image"
+msgstr "X PixMap image"
+
+#: ../plug-ins/common/file-xpm.c:363 ../plug-ins/common/file-xpm.c:773
+#, c-format
+msgid "Error opening file '%s'"
+msgstr "Error opening file '%s'"
+
+#: ../plug-ins/common/file-xpm.c:369 ../plug-ins/common/file-xpm.c:779
+msgid "XPM file invalid"
+msgstr "XPM file invalid"
+
+#: ../plug-ins/common/file-xpm.c:805
+msgid "Save as XPM"
+msgstr "Save as XPM"
+
+#: ../plug-ins/common/file-xpm.c:829
+msgid "_Alpha threshold:"
+msgstr "_Alpha threshold:"
+
+#: ../plug-ins/common/file-xwd.c:278 ../plug-ins/common/file-xwd.c:298
+msgid "X window dump"
+msgstr "X window dump"
+
+#: ../plug-ins/common/file-xwd.c:442
+#, c-format
+msgid "Could not read XWD header from '%s'"
+msgstr "Could not read XWD header from '%s'"
+
+#: ../plug-ins/common/file-xwd.c:480
+msgid "Can't read color entries"
+msgstr "Can't read colour entries"
+
+#: ../plug-ins/common/file-xwd.c:570
+#, c-format
+msgid ""
+"XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
+"not supported."
+msgstr ""
+"XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
+"not supported."
+
+#: ../plug-ins/common/file-xwd.c:593
+msgid "Cannot save images with alpha channels."
+msgstr "Cannot save images with alpha channels."
+
+#: ../plug-ins/common/file-xwd.c:2195
+msgid "Error during writing indexed/gray image"
+msgstr "Error during writing indexed/grey image"
+
+#: ../plug-ins/common/file-xwd.c:2293
+msgid "Error during writing rgb image"
+msgstr "Error during writing rgb image"
 
 #: ../plug-ins/common/film.c:217
 msgid "Combine several images on a film strip"
@@ -3790,8 +4673,8 @@ msgstr "_Filmstrip..."
 msgid "Composing images"
 msgstr "Composing images"
 
-#: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:185
-#: ../plug-ins/helpbrowser/dialog.c:1144
+#: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:216
+#: ../plug-ins/help-browser/dialog.c:1120
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -3803,12 +4686,6 @@ msgstr "Available images:"
 msgid "On film:"
 msgstr "On film:"
 
-#. Create selection
-#: ../plug-ins/common/film.c:966 ../plug-ins/imagemap/imap_selection.c:367
-#: ../plug-ins/rcm/rcm_dialog.c:173 ../plug-ins/sel2path/sel2path.c:430
-msgid "Selection"
-msgstr "Selection"
-
 #. Film height/colour
 #: ../plug-ins/common/film.c:976 ../plug-ins/common/film.c:1248
 msgid "Filmstrip"
@@ -3896,621 +4773,270 @@ msgstr "Hole sp_acing:"
 msgid "_Number height:"
 msgstr "_Number height:"
 
-#: ../plug-ins/common/flarefx.c:188
-msgid "Add a lens flare effect"
-msgstr "Add a lens flare effect"
+#. These values are translated for the GUI but also used internally
+#. to figure out which button the user pushed, etc.
+#. Not my design, please don't blame me -- njl
+#: ../plug-ins/common/filter-pack.c:220
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:953
+msgid "Red:"
+msgstr "Red:"
 
-#: ../plug-ins/common/flarefx.c:195
-msgid "Lens _Flare..."
-msgstr "Lens _Flare..."
+#: ../plug-ins/common/filter-pack.c:221
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:963
+msgid "Green:"
+msgstr "Green:"
 
-#: ../plug-ins/common/flarefx.c:270
-msgid "Render lens flare"
-msgstr "Render lens flare"
+#: ../plug-ins/common/filter-pack.c:222
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:973
+msgid "Blue:"
+msgstr "Blue:"
 
-#: ../plug-ins/common/flarefx.c:306
-msgid "Lens Flare"
-msgstr "Lens Flare"
-
-#: ../plug-ins/common/flarefx.c:753
-msgid "Center of Flare Effect"
-msgstr "Centre of Flare Effect"
-
-#: ../plug-ins/common/flarefx.c:793 ../plug-ins/common/nova.c:484
-msgid "Show _position"
-msgstr "Show _position"
-
-#: ../plug-ins/common/fp.c:223
+#: ../plug-ins/common/filter-pack.c:223
 msgid "Cyan:"
 msgstr "Cyan:"
 
-#: ../plug-ins/common/fp.c:224
+#: ../plug-ins/common/filter-pack.c:224
 msgid "Yellow:"
 msgstr "Yellow:"
 
-#: ../plug-ins/common/fp.c:225
+#: ../plug-ins/common/filter-pack.c:225
 msgid "Magenta:"
 msgstr "Magenta:"
 
-#: ../plug-ins/common/fp.c:227
+#: ../plug-ins/common/filter-pack.c:227
 msgid "Darker:"
 msgstr "Darker:"
 
-#: ../plug-ins/common/fp.c:228
+#: ../plug-ins/common/filter-pack.c:228
 msgid "Lighter:"
 msgstr "Lighter:"
 
-#: ../plug-ins/common/fp.c:230
+#: ../plug-ins/common/filter-pack.c:230
 msgid "More Sat:"
 msgstr "More Sat:"
 
-#: ../plug-ins/common/fp.c:231
+#: ../plug-ins/common/filter-pack.c:231
 msgid "Less Sat:"
 msgstr "Less Sat:"
 
-#: ../plug-ins/common/fp.c:233 ../plug-ins/common/fp.c:532
+#: ../plug-ins/common/filter-pack.c:233 ../plug-ins/common/filter-pack.c:532
 msgid "Current:"
 msgstr "Current:"
 
-#: ../plug-ins/common/fp.c:317
+#: ../plug-ins/common/filter-pack.c:317
 msgid "Interactively modify the image colors"
 msgstr "Interactively modify the image colours"
 
-#: ../plug-ins/common/fp.c:322
+#: ../plug-ins/common/filter-pack.c:322
 msgid "_Filter Pack..."
 msgstr "_Filter Pack..."
 
-#: ../plug-ins/common/fp.c:372
+#: ../plug-ins/common/filter-pack.c:372
 msgid "FP can only be used on RGB images."
 msgstr "FP can only be used on RGB images."
 
-#: ../plug-ins/common/fp.c:382
+#: ../plug-ins/common/filter-pack.c:382
 msgid "FP can only be run interactively."
 msgstr "FP can only be run interactively."
 
-#: ../plug-ins/common/fp.c:400
+#: ../plug-ins/common/filter-pack.c:400
 msgid "Applying filter pack"
 msgstr "Applying filter pack"
 
-#: ../plug-ins/common/fp.c:524
+#: ../plug-ins/common/filter-pack.c:524
 msgid "Original:"
 msgstr "Original:"
 
-#: ../plug-ins/common/fp.c:576
+#: ../plug-ins/common/filter-pack.c:576
 msgid "Hue Variations"
 msgstr "Hue Variations"
 
-#: ../plug-ins/common/fp.c:631
+#: ../plug-ins/common/filter-pack.c:631
 msgid "Roughness"
 msgstr "Roughness"
 
-#: ../plug-ins/common/fp.c:674 ../plug-ins/common/fp.c:1317
+#: ../plug-ins/common/filter-pack.c:674 ../plug-ins/common/filter-pack.c:1317
 msgid "Affected Range"
 msgstr "Affected Range"
 
-#: ../plug-ins/common/fp.c:678
+#: ../plug-ins/common/filter-pack.c:678
 msgid "Sha_dows"
 msgstr "Sha_dows"
 
-#: ../plug-ins/common/fp.c:679
+#: ../plug-ins/common/filter-pack.c:679
 msgid "_Midtones"
 msgstr "_Midtones"
 
-#: ../plug-ins/common/fp.c:680
+#: ../plug-ins/common/filter-pack.c:680
 msgid "H_ighlights"
 msgstr "H_ighlights"
 
-#: ../plug-ins/common/fp.c:694
+#: ../plug-ins/common/filter-pack.c:694
 msgid "Windows"
 msgstr "Windows"
 
-#: ../plug-ins/common/fp.c:704 ../plug-ins/common/lic.c:672
+#: ../plug-ins/common/filter-pack.c:704 ../plug-ins/common/van-gogh-lic.c:672
 msgid "_Saturation"
 msgstr "_Saturation"
 
-#: ../plug-ins/common/fp.c:712
+#: ../plug-ins/common/filter-pack.c:712
 msgid "A_dvanced"
 msgstr "A_dvanced"
 
-#: ../plug-ins/common/fp.c:732
+#: ../plug-ins/common/filter-pack.c:732
 msgid "Value Variations"
 msgstr "Value Variations"
 
-#: ../plug-ins/common/fp.c:777
+#: ../plug-ins/common/filter-pack.c:777
 msgid "Saturation Variations"
 msgstr "Saturation Variations"
 
-#: ../plug-ins/common/fp.c:830
+#: ../plug-ins/common/filter-pack.c:830
 msgid "Select Pixels By"
 msgstr "Select Pixels By"
 
-#: ../plug-ins/common/fp.c:835
+#: ../plug-ins/common/filter-pack.c:835
 msgid "H_ue"
 msgstr "H_ue"
 
-#: ../plug-ins/common/fp.c:836
+#: ../plug-ins/common/filter-pack.c:836
 msgid "Satu_ration"
 msgstr "Satu_ration"
 
-#: ../plug-ins/common/fp.c:837
+#: ../plug-ins/common/filter-pack.c:837
 msgid "V_alue"
 msgstr "V_alue"
 
-#: ../plug-ins/common/fp.c:863
+#: ../plug-ins/common/filter-pack.c:863
 msgid "Show"
 msgstr "Show"
 
-#: ../plug-ins/common/fp.c:868
+#: ../plug-ins/common/filter-pack.c:868
 msgid "_Entire image"
 msgstr "_Entire image"
 
-#: ../plug-ins/common/fp.c:869
+#: ../plug-ins/common/filter-pack.c:869
 msgid "Se_lection only"
 msgstr "Se_lection only"
 
-#: ../plug-ins/common/fp.c:870
+#: ../plug-ins/common/filter-pack.c:870
 msgid "Selec_tion in context"
 msgstr "Selec_tion in context"
 
-#: ../plug-ins/common/fp.c:1201
+#: ../plug-ins/common/filter-pack.c:1201
 msgid "Filter Pack Simulation"
 msgstr "Filter Pack Simulation"
 
-#: ../plug-ins/common/fp.c:1290
+#: ../plug-ins/common/filter-pack.c:1290
 msgid "Shadows:"
 msgstr "Shadows:"
 
-#: ../plug-ins/common/fp.c:1291
+#: ../plug-ins/common/filter-pack.c:1291
 msgid "Midtones:"
 msgstr "Midtones:"
 
-#: ../plug-ins/common/fp.c:1292
+#: ../plug-ins/common/filter-pack.c:1292
 msgid "Highlights:"
 msgstr "Highlights:"
 
-#: ../plug-ins/common/fp.c:1305
+#: ../plug-ins/common/filter-pack.c:1305
 msgid "Advanced Filter Pack Options"
 msgstr "Advanced Filter Pack Options"
 
 #. ****************** MISC OPTIONS **************************
-#: ../plug-ins/common/fp.c:1417
+#: ../plug-ins/common/filter-pack.c:1417
 msgid "Preview Size"
 msgstr "Preview Size"
 
-#: ../plug-ins/common/fractaltrace.c:116
+#: ../plug-ins/common/fractal-trace.c:116
 msgid "Transform image with the Mandelbrot Fractal"
 msgstr "Transform image with the Mandelbrot Fractal"
 
-#: ../plug-ins/common/fractaltrace.c:121
+#: ../plug-ins/common/fractal-trace.c:121
 msgid "_Fractal Trace..."
 msgstr "_Fractal Trace..."
 
-#: ../plug-ins/common/fractaltrace.c:460 ../plug-ins/common/fractaltrace.c:691
+#: ../plug-ins/common/fractal-trace.c:460
+#: ../plug-ins/common/fractal-trace.c:691
 msgid "Fractal Trace"
 msgstr "Fractal Trace"
 
 #. Settings
-#: ../plug-ins/common/fractaltrace.c:731
+#: ../plug-ins/common/fractal-trace.c:731
 msgid "Outside Type"
 msgstr "Outside Type"
 
-#: ../plug-ins/common/fractaltrace.c:742
+#: ../plug-ins/common/fractal-trace.c:742
 msgid "_White"
 msgstr "_White"
 
-#: ../plug-ins/common/fractaltrace.c:749
+#: ../plug-ins/common/fractal-trace.c:749
 msgid "Mandelbrot Parameters"
 msgstr "Mandelbrot Parameters"
 
-#: ../plug-ins/common/fractaltrace.c:760
+#: ../plug-ins/common/fractal-trace.c:760
 msgid "X_1:"
 msgstr "X_1:"
 
-#: ../plug-ins/common/fractaltrace.c:769
+#: ../plug-ins/common/fractal-trace.c:769
 msgid "X_2:"
 msgstr "X_2:"
 
-#: ../plug-ins/common/fractaltrace.c:778
+#: ../plug-ins/common/fractal-trace.c:778
 msgid "Y_1:"
 msgstr "Y_1:"
 
-#: ../plug-ins/common/fractaltrace.c:787
+#: ../plug-ins/common/fractal-trace.c:787
 msgid "Y_2:"
 msgstr "Y_2:"
 
-#: ../plug-ins/common/gauss.c:159
-msgid "Simplest, most commonly used way of blurring"
-msgstr "Simplest, most commonly used way of blurring"
-
-#: ../plug-ins/common/gauss.c:172
-msgid "_Gaussian Blur..."
-msgstr "_Gaussian Blur..."
-
-#: ../plug-ins/common/gauss.c:179 ../plug-ins/common/gauss.c:199
-#: ../plug-ins/common/gauss.c:219 ../plug-ins/common/gauss.c:239
-msgid "Apply a gaussian blur"
-msgstr "Apply a gaussian blur"
-
-#: ../plug-ins/common/gauss.c:428 ../plug-ins/common/gauss.c:476
-msgid "Gaussian Blur"
-msgstr "Gaussian Blur"
-
-#. parameter settings
-#: ../plug-ins/common/gauss.c:506
-msgid "Blur Radius"
-msgstr "Blur Radius"
-
-#: ../plug-ins/common/gauss.c:520 ../plug-ins/common/jigsaw.c:2456
-#: ../plug-ins/common/spread.c:384
-msgid "_Horizontal:"
-msgstr "_Horizontal:"
-
-#: ../plug-ins/common/gauss.c:524 ../plug-ins/common/jigsaw.c:2473
-#: ../plug-ins/common/spread.c:388
-msgid "_Vertical:"
-msgstr "_Vertical:"
-
-#: ../plug-ins/common/gauss.c:547
-msgid "Blur Method"
-msgstr "Blur Method"
-
-#: ../plug-ins/common/gauss.c:551
-msgid "_IIR"
-msgstr "_IIR"
-
-#: ../plug-ins/common/gauss.c:552
-msgid "_RLE"
-msgstr "_RLE"
-
-#: ../plug-ins/common/gbr.c:152 ../plug-ins/common/gbr.c:173
-msgid "GIMP brush"
-msgstr "GIMP brush"
-
-#: ../plug-ins/common/gbr.c:388 ../plug-ins/common/gbr.c:400
-msgid "Unsupported brush format"
-msgstr "Unsupported brush format"
-
-#: ../plug-ins/common/gbr.c:411
-#, c-format
-msgid "Error in GIMP brush file '%s'"
-msgstr "Error in GIMP brush file '%s'"
-
-#: ../plug-ins/common/gbr.c:419
-#, c-format
-msgid "Invalid UTF-8 string in brush file '%s'."
-msgstr "Invalid UTF-8 string in brush file '%s'."
-
-#: ../plug-ins/common/gbr.c:425 ../plug-ins/common/gih.c:499
-#: ../plug-ins/common/gih.c:1158 ../plug-ins/gflare/gflare.c:3017
-msgid "Unnamed"
-msgstr "Unnamed"
-
-#: ../plug-ins/common/gbr.c:607
-msgid "GIMP brushes are either GRAYSCALE or RGBA"
-msgstr "GIMP brushes are either GREYSCALE or RGBA"
-
-#: ../plug-ins/common/gbr.c:704
-msgid "Save as Brush"
-msgstr "Save as Brush"
-
-#. attach labels
-#: ../plug-ins/common/gbr.c:731 ../plug-ins/common/grid.c:790
-msgid "Spacing:"
-msgstr "Spacing:"
-
-#: ../plug-ins/common/gbr.c:742 ../plug-ins/common/gih.c:910
-#: ../plug-ins/common/pat.c:541 ../plug-ins/gimpressionist/presets.c:664
-msgid "Description:"
-msgstr "Description:"
-
-#: ../plug-ins/common/gee.c:99 ../plug-ins/common/gee_zoom.c:121
+#: ../plug-ins/common/gee-zoom.c:121 ../plug-ins/common/gee.c:99
 msgid "A big hello from the GIMP team!"
 msgstr "A big hello from the GIMP team!"
 
+#: ../plug-ins/common/gee-zoom.c:126 ../plug-ins/common/gee-zoom.c:186
+msgid "Gee Zoom"
+msgstr "Gee Zoom"
+
+#: ../plug-ins/common/gee-zoom.c:192 ../plug-ins/common/gee.c:166
+msgid "Thank You for Choosing GIMP"
+msgstr "Thank You for Choosing GIMP"
+
+#: ../plug-ins/common/gee-zoom.c:200
+#, c-format
+msgid "An obsolete creation by %s"
+msgstr "An obsolete creation by %s"
+
 #: ../plug-ins/common/gee.c:104 ../plug-ins/common/gee.c:160
 msgid "Gee Slime"
 msgstr "Gee Slime"
 
-#: ../plug-ins/common/gee.c:166 ../plug-ins/common/gee_zoom.c:192
-msgid "Thank You for Choosing GIMP"
-msgstr "Thank You for Choosing GIMP"
-
 #: ../plug-ins/common/gee.c:173
 #, c-format
 msgid "A less obsolete creation by %s"
 msgstr "A less obsolete creation by %s"
 
-#: ../plug-ins/common/gee_zoom.c:126 ../plug-ins/common/gee_zoom.c:186
-msgid "Gee Zoom"
-msgstr "Gee Zoom"
-
-#: ../plug-ins/common/gee_zoom.c:200
-#, c-format
-msgid "An obsolete creation by %s"
-msgstr "An obsolete creation by %s"
-
-#: ../plug-ins/common/gif-load.c:141 ../plug-ins/common/gif-save.c:410
-msgid "GIF image"
-msgstr "GIF image"
-
-#: ../plug-ins/common/gif-load.c:325
-msgid "This is not a GIF file"
-msgstr "This is not a GIF file"
-
-#: ../plug-ins/common/gif-load.c:364
-msgid "Non-square pixels.  Image might look squashed."
-msgstr "Non-square pixels.  Image might look squashed."
-
-#: ../plug-ins/common/gif-load.c:881
-#, c-format
-msgid "Background (%d%s)"
-msgstr "Background (%d%s)"
-
-#: ../plug-ins/common/gif-load.c:904
-#, c-format
-msgid "Opening '%s' (frame %d)"
-msgstr "Opening '%s' (frame %d)"
-
-#: ../plug-ins/common/gif-load.c:933 ../plug-ins/common/iwarp.c:791
-#: ../plug-ins/common/iwarp.c:826
-#, c-format
-msgid "Frame %d"
-msgstr "Frame %d"
-
-#: ../plug-ins/common/gif-load.c:935
-#, c-format
-msgid "Frame %d (%d%s)"
-msgstr "Frame %d (%d%s)"
-
-#: ../plug-ins/common/gif-load.c:966
-#, c-format
-msgid ""
-"GIF: Undocumented GIF composite type %d is not handled.  Animation might not "
-"play or re-save perfectly."
-msgstr ""
-"GIF: Undocumented GIF composite type %d is not handled.  Animation might not "
-"play or re-save perfectly."
-
-#: ../plug-ins/common/gif-save.c:683
-msgid "Couldn't simply reduce colors further. Saving as opaque."
-msgstr "Couldn't simply reduce colours further. Saving as opaque."
-
-#: ../plug-ins/common/gif-save.c:899
-msgid ""
-"The GIF format only supports comments in 7bit ASCII encoding. No comment is "
-"saved."
-msgstr ""
-"The GIF format only supports comments in 7bit ASCII encoding. No comment is "
-"saved."
-
-#: ../plug-ins/common/gif-save.c:958
-msgid ""
-"Cannot save RGB color images. Convert to indexed color or grayscale first."
-msgstr ""
-"Cannot save RGB colour images. Convert to indexed colour or greyscale first."
-
-#: ../plug-ins/common/gif-save.c:1135
-msgid "Delay inserted to prevent evil CPU-sucking animation."
-msgstr "Delay inserted to prevent evil CPU-sucking animation."
-
-#: ../plug-ins/common/gif-save.c:1175
-msgid ""
-"The image you are trying to save as a GIF contains layers which extend "
-"beyond the actual borders of the image."
-msgstr ""
-"The image you are trying to save as a GIF contains layers which extend "
-"beyond the actual borders of the image."
-
-#: ../plug-ins/common/gif-save.c:1192
-msgid ""
-"The GIF file format does not allow this.  You may choose whether to crop all "
-"of the layers to the image borders, or cancel this save."
-msgstr ""
-"The GIF file format does not allow this.  You may choose whether to crop all "
-"of the layers to the image borders, or cancel this save."
-
-#: ../plug-ins/common/gif-save.c:1233
-msgid "Save as GIF"
-msgstr "Save as GIF"
-
-#. regular gif parameter settings
-#: ../plug-ins/common/gif-save.c:1255
-msgid "GIF Options"
-msgstr "GIF Options"
-
-#: ../plug-ins/common/gif-save.c:1261
-msgid "I_nterlace"
-msgstr "I_nterlace"
-
-#: ../plug-ins/common/gif-save.c:1277
-msgid "_GIF comment:"
-msgstr "_GIF comment:"
-
-#. additional animated gif parameter settings
-#: ../plug-ins/common/gif-save.c:1334
-msgid "Animated GIF Options"
-msgstr "Animated GIF Options"
-
-#: ../plug-ins/common/gif-save.c:1340
-msgid "_Loop forever"
-msgstr "_Loop forever"
-
-#: ../plug-ins/common/gif-save.c:1353
-msgid "_Delay between frames where unspecified:"
-msgstr "_Delay between frames where unspecified:"
-
-#: ../plug-ins/common/gif-save.c:1368 ../plug-ins/common/mng.c:1539
-msgid "milliseconds"
-msgstr "milliseconds"
-
-#: ../plug-ins/common/gif-save.c:1378
-msgid "_Frame disposal where unspecified:"
-msgstr "_Frame disposal where unspecified:"
-
-#: ../plug-ins/common/gif-save.c:1382
-msgid "I don't care"
-msgstr "I don't care"
-
-#: ../plug-ins/common/gif-save.c:1384
-msgid "Cumulative layers (combine)"
-msgstr "Cumulative layers (combine)"
-
-#: ../plug-ins/common/gif-save.c:1386
-msgid "One frame per layer (replace)"
-msgstr "One frame per layer (replace)"
-
-#. The "Always use default values" toggles
-#: ../plug-ins/common/gif-save.c:1402
-msgid "_Use delay entered above for all frames"
-msgstr "_Use delay entered above for all frames"
-
-#: ../plug-ins/common/gif-save.c:1412
-msgid "U_se disposal entered above for all frames"
-msgstr "U_se disposal entered above for all frames"
-
-#: ../plug-ins/common/gif-save.c:2565
-msgid "Error writing output file."
-msgstr "Error writing output file."
-
-#: ../plug-ins/common/gif-save.c:2635
-#, c-format
-msgid "The default comment is limited to %d characters."
-msgstr "The default comment is limited to %d characters."
-
-#: ../plug-ins/common/gih.c:207 ../plug-ins/common/gih.c:228
-msgid "GIMP brush (animated)"
-msgstr "GIMP brush (animated)"
-
-#: ../plug-ins/common/gih.c:321
-#, c-format
-msgid "Layer %s doesn't have an alpha channel, skipped"
-msgstr "Layer %s doesn't have an alpha channel, skipped"
-
-#: ../plug-ins/common/gih.c:492
-msgid "Error in GIMP brush pipe file."
-msgstr "Error in GIMP brush pipe file."
-
-#: ../plug-ins/common/gih.c:558
-msgid "GIMP brush file appears to be corrupted."
-msgstr "GIMP brush file appears to be corrupted."
-
-#: ../plug-ins/common/gih.c:703
-msgid "Couldn't load one brush in the pipe, giving up."
-msgstr "Couldn't load one brush in the pipe, giving up."
-
-#: ../plug-ins/common/gih.c:866
-msgid "Save as Brush Pipe"
-msgstr "Save as Brush Pipe"
-
-#: ../plug-ins/common/gih.c:896
-msgid "Spacing (percent):"
-msgstr "Spacing (percent):"
-
-#: ../plug-ins/common/gih.c:963
-msgid "Pixels"
-msgstr "Pixels"
-
-#: ../plug-ins/common/gih.c:968
-msgid "Cell size:"
-msgstr "Cell size:"
-
-#: ../plug-ins/common/gih.c:980
-msgid "Number of cells:"
-msgstr "Number of cells:"
-
-#: ../plug-ins/common/gih.c:1005
-msgid " Rows of "
-msgstr " Rows of "
-
-#: ../plug-ins/common/gih.c:1017
-msgid " Columns on each layer"
-msgstr " Columns on each layer"
-
-#: ../plug-ins/common/gih.c:1021
-msgid " (Width Mismatch!) "
-msgstr " (Width Mismatch!) "
-
-#: ../plug-ins/common/gih.c:1025
-msgid " (Height Mismatch!) "
-msgstr " (Height Mismatch!) "
-
-#: ../plug-ins/common/gih.c:1030
-msgid "Display as:"
-msgstr "Display as:"
-
-#: ../plug-ins/common/gih.c:1039
-msgid "Dimension:"
-msgstr "Dimension:"
-
-#: ../plug-ins/common/gih.c:1114
-msgid "Ranks:"
-msgstr "Ranks:"
-
-#: ../plug-ins/common/glasstile.c:124
-msgid "Simulate distortion caused by square glass tiles"
-msgstr "Simulate distortion caused by square glass tiles"
-
-#: ../plug-ins/common/glasstile.c:130
-msgid "_Glass Tile..."
-msgstr "_Glass Tile..."
-
-#: ../plug-ins/common/glasstile.c:210 ../plug-ins/common/glasstile.c:250
-msgid "Glass Tile"
-msgstr "Glass Tile"
-
-#: ../plug-ins/common/glasstile.c:288
-msgid "Tile _width:"
-msgstr "Tile _width:"
-
-#: ../plug-ins/common/glasstile.c:302 ../plug-ins/common/mosaic.c:661
-msgid "Tile _height:"
-msgstr "Tile _height:"
-
-#: ../plug-ins/common/gqbist.c:402
-msgid "Generate a huge variety of abstract patterns"
-msgstr "Generate a huge variety of abstract patterns"
-
-#: ../plug-ins/common/gqbist.c:410
-msgid "_Qbist..."
-msgstr "_Qbist..."
-
-#: ../plug-ins/common/gqbist.c:511
-msgid "Qbist"
-msgstr "Qbist"
-
-#: ../plug-ins/common/gqbist.c:707
-msgid "Load QBE File"
-msgstr "Load QBE File"
-
-#: ../plug-ins/common/gqbist.c:749
-msgid "Save as QBE File"
-msgstr "Save as QBE File"
-
-#: ../plug-ins/common/gqbist.c:803
-msgid "G-Qbist"
-msgstr "G-Qbist"
-
-#: ../plug-ins/common/gradmap.c:84
+#: ../plug-ins/common/gradient-map.c:84
 msgid "Recolor the image using colors from the active gradient"
 msgstr "Recolour the image using colours from the active gradient"
 
-#: ../plug-ins/common/gradmap.c:97
+#: ../plug-ins/common/gradient-map.c:97
 msgid "_Gradient Map"
 msgstr "_Gradient Map"
 
-#: ../plug-ins/common/gradmap.c:106
+#: ../plug-ins/common/gradient-map.c:106
 msgid "Recolor the image using colors from the active palette"
 msgstr "Recolour the image using colours from the active palette"
 
-#: ../plug-ins/common/gradmap.c:119
+#: ../plug-ins/common/gradient-map.c:119
 msgid "_Palette Map"
 msgstr "_Palette Map"
 
-#: ../plug-ins/common/gradmap.c:162
+#: ../plug-ins/common/gradient-map.c:162
 msgid "Gradient Map"
 msgstr "Gradient Map"
 
-#: ../plug-ins/common/gradmap.c:167
+#: ../plug-ins/common/gradient-map.c:167
 msgid "Palette Map"
 msgstr "Palette Map"
 
@@ -4544,12 +5070,6 @@ msgstr "Vertical"
 msgid "Intersection"
 msgstr "Intersection"
 
-#. Width and Height
-#: ../plug-ins/common/grid.c:724 ../plug-ins/common/svg.c:777
-#: ../plug-ins/common/wmf.c:562
-msgid "Width:"
-msgstr "Width:"
-
 #. attach labels
 #: ../plug-ins/common/grid.c:857
 msgid "Offset:"
@@ -4568,149 +5088,18 @@ msgstr "Vertical Colour"
 msgid "Intersection Color"
 msgstr "Intersection Colour"
 
-#: ../plug-ins/common/gtm.c:155
-msgid "HTML table"
-msgstr "HTML table"
-
-#: ../plug-ins/common/gtm.c:398
-msgid "Save as HTML table"
-msgstr "Save as HTML table"
-
-#: ../plug-ins/common/gtm.c:425
-msgid "Warning"
-msgstr "Warning"
-
-#: ../plug-ins/common/gtm.c:436
-msgid ""
-"You are about to create a huge\n"
-"HTML file which will most likely\n"
-"crash your browser."
-msgstr ""
-"You are about to create a huge\n"
-"HTML file which will most likely\n"
-"crash your browser."
-
-#. HTML Page Options
-#: ../plug-ins/common/gtm.c:445
-msgid "HTML Page Options"
-msgstr "HTML Page Options"
-
-#: ../plug-ins/common/gtm.c:452
-msgid "_Generate full HTML document"
-msgstr "_Generate full HTML document"
-
-#: ../plug-ins/common/gtm.c:458
-msgid ""
-"If checked GTM will output a full HTML document with , , etc. "
-"tags instead of just the table html."
-msgstr ""
-"If checked GTM will output a full HTML document with , , etc. "
-"tags instead of just the table html."
-
-#. HTML Table Creation Options
-#: ../plug-ins/common/gtm.c:471
-msgid "Table Creation Options"
-msgstr "Table Creation Options"
-
-#: ../plug-ins/common/gtm.c:479
-msgid "_Use cellspan"
-msgstr "_Use cellspan"
-
-#: ../plug-ins/common/gtm.c:485
-msgid ""
-"If checked GTM will replace any rectangular sections of identically colored "
-"blocks with one large cell with ROWSPAN and COLSPAN values."
-msgstr ""
-"If checked GTM will replace any rectangular sections of identically coloured "
-"blocks with one large cell with ROWSPAN and COLSPAN values."
-
-#: ../plug-ins/common/gtm.c:494
-msgid "Co_mpress TD tags"
-msgstr "Co_mpress TD tags"
-
-#: ../plug-ins/common/gtm.c:500
-msgid ""
-"Checking this tag will cause GTM to leave no whitespace between the TD tags "
-"and the cellcontent.  This is only necessary for pixel level positioning "
-"control."
-msgstr ""
-"Checking this tag will cause GTM to leave no whitespace between the TD tags "
-"and the cellcontent.  This is only necessary for pixel level positioning "
-"control."
-
-#: ../plug-ins/common/gtm.c:510
-msgid "C_aption"
-msgstr "C_aption"
-
-#: ../plug-ins/common/gtm.c:516
-msgid "Check if you would like to have the table captioned."
-msgstr "Check if you would like to have the table captioned."
-
-#: ../plug-ins/common/gtm.c:531
-msgid "The text for the table caption."
-msgstr "The text for the table caption."
-
-#: ../plug-ins/common/gtm.c:544
-msgid "C_ell content:"
-msgstr "C_ell content:"
-
-#: ../plug-ins/common/gtm.c:548
-msgid "The text to go into each cell."
-msgstr "The text to go into each cell."
-
-#. HTML Table Options
-#: ../plug-ins/common/gtm.c:558
-msgid "Table Options"
-msgstr "Table Options"
-
-#: ../plug-ins/common/gtm.c:569
-msgid "_Border:"
-msgstr "_Border:"
-
-#: ../plug-ins/common/gtm.c:573
-msgid "The number of pixels in the table border."
-msgstr "The number of pixels in the table border."
-
-#: ../plug-ins/common/gtm.c:588
-msgid "The width for each table cell.  Can be a number or a percent."
-msgstr "The width for each table cell.  Can be a number or a percent."
-
-#: ../plug-ins/common/gtm.c:604
-msgid "The height for each table cell.  Can be a number or a percent."
-msgstr "The height for each table cell.  Can be a number or a percent."
-
-#: ../plug-ins/common/gtm.c:615
-msgid "Cell-_padding:"
-msgstr "Cell-_padding:"
-
-#: ../plug-ins/common/gtm.c:619
-msgid "The amount of cellpadding."
-msgstr "The amount of cellpadding."
-
-#: ../plug-ins/common/gtm.c:628
-msgid "Cell-_spacing:"
-msgstr "Cell-_spacing:"
-
-#: ../plug-ins/common/gtm.c:632
-msgid "The amount of cellspacing."
-msgstr "The amount of cellspacing."
-
-#: ../plug-ins/common/guillotine.c:69
+#: ../plug-ins/common/guillotine.c:75
 msgid "Slice the image into subimages using guides"
 msgstr "Slice the image into subimages using guides"
 
-#: ../plug-ins/common/guillotine.c:74
+#: ../plug-ins/common/guillotine.c:82
 msgid "_Guillotine"
 msgstr "_Guillotine"
 
-#: ../plug-ins/common/guillotine.c:106
+#: ../plug-ins/common/guillotine.c:120
 msgid "Guillotine"
 msgstr "Guillotine"
 
-#: ../plug-ins/common/header.c:77
-msgid "C source code header"
-msgstr "C source code header"
-
 #: ../plug-ins/common/hot.c:207
 msgid "Find and fix pixels that may be unsafely bright"
 msgstr "Find and fix pixels that may be unsafely bright"
@@ -4719,27 +5108,27 @@ msgstr "Find and fix pixels that may be unsafely bright"
 msgid "_Hot..."
 msgstr "_Hot..."
 
-#: ../plug-ins/common/hot.c:379 ../plug-ins/common/hot.c:570
+#: ../plug-ins/common/hot.c:387 ../plug-ins/common/hot.c:586
 msgid "Hot"
 msgstr "Hot"
 
-#: ../plug-ins/common/hot.c:607
+#: ../plug-ins/common/hot.c:623
 msgid "Create _new layer"
 msgstr "Create _new layer"
 
-#: ../plug-ins/common/hot.c:616
+#: ../plug-ins/common/hot.c:632
 msgid "Action"
 msgstr "Action"
 
-#: ../plug-ins/common/hot.c:620
+#: ../plug-ins/common/hot.c:636
 msgid "Reduce _Luminance"
 msgstr "Reduce _Luminance"
 
-#: ../plug-ins/common/hot.c:621
+#: ../plug-ins/common/hot.c:637
 msgid "Reduce _Saturation"
 msgstr "Reduce _Saturation"
 
-#: ../plug-ins/common/hot.c:622 ../plug-ins/common/waves.c:281
+#: ../plug-ins/common/hot.c:638 ../plug-ins/common/waves.c:282
 msgid "_Blacken"
 msgstr "_Blacken"
 
@@ -4861,7 +5250,7 @@ msgid "Thresho_ld:"
 msgstr "Thresho_ld:"
 
 #: ../plug-ins/common/iwarp.c:1214 ../plug-ins/common/sinus.c:771
-#: ../plug-ins/gflare/gflare.c:2821
+#: ../plug-ins/gradient-flare/gradient-flare.c:2867
 msgid "_Settings"
 msgstr "_Settings"
 
@@ -4893,320 +5282,300 @@ msgstr "Assembling jigsaw"
 msgid "Jigsaw"
 msgstr "Jigsaw"
 
-#: ../plug-ins/common/jigsaw.c:2444
+#: ../plug-ins/common/jigsaw.c:2445
 msgid "Number of Tiles"
 msgstr "Number of Tiles"
 
-#: ../plug-ins/common/jigsaw.c:2459
+#: ../plug-ins/common/jigsaw.c:2460
 msgid "Number of pieces going across"
 msgstr "Number of pieces going across"
 
-#: ../plug-ins/common/jigsaw.c:2476
+#: ../plug-ins/common/jigsaw.c:2477
 msgid "Number of pieces going down"
 msgstr "Number of pieces going down"
 
-#: ../plug-ins/common/jigsaw.c:2490
+#: ../plug-ins/common/jigsaw.c:2491
 msgid "Bevel Edges"
 msgstr "Bevel Edges"
 
-#: ../plug-ins/common/jigsaw.c:2500
+#: ../plug-ins/common/jigsaw.c:2501
 msgid "_Bevel width:"
 msgstr "_Bevel width:"
 
-#: ../plug-ins/common/jigsaw.c:2504
+#: ../plug-ins/common/jigsaw.c:2505
 msgid "Degree of slope of each piece's edge"
 msgstr "Degree of slope of each piece's edge"
 
-#: ../plug-ins/common/jigsaw.c:2517
+#: ../plug-ins/common/jigsaw.c:2518
 msgid "H_ighlight:"
 msgstr "H_ighlight:"
 
-#: ../plug-ins/common/jigsaw.c:2521
+#: ../plug-ins/common/jigsaw.c:2522
 msgid "The amount of highlighting on the edges of each piece"
 msgstr "The amount of highlighting on the edges of each piece"
 
 #. frame for primitive radio buttons
-#: ../plug-ins/common/jigsaw.c:2538
+#: ../plug-ins/common/jigsaw.c:2539
 msgid "Jigsaw Style"
 msgstr "Jigsaw Style"
 
-#: ../plug-ins/common/jigsaw.c:2542
+#: ../plug-ins/common/jigsaw.c:2543
 msgid "_Square"
 msgstr "_Square"
 
-#: ../plug-ins/common/jigsaw.c:2543
+#: ../plug-ins/common/jigsaw.c:2544
 msgid "C_urved"
 msgstr "C_urved"
 
-#: ../plug-ins/common/jigsaw.c:2547
+#: ../plug-ins/common/jigsaw.c:2548
 msgid "Each piece has straight sides"
 msgstr "Each piece has straight sides"
 
-#: ../plug-ins/common/jigsaw.c:2548
+#: ../plug-ins/common/jigsaw.c:2549
 msgid "Each piece has curved sides"
 msgstr "Each piece has curved sides"
 
-#: ../plug-ins/common/laplace.c:75
-msgid "High-resolution edge detection"
-msgstr "High-resolution edge detection"
-
-#: ../plug-ins/common/laplace.c:85
-msgid "_Laplace"
-msgstr "_Laplace"
-
-#: ../plug-ins/common/laplace.c:321
-msgid "Cleanup"
-msgstr "Cleanup"
-
-#: ../plug-ins/common/lcms.c:222
+#: ../plug-ins/common/lcms.c:218
 msgid "Set a color profile on the image"
 msgstr "Set a colour profile on the image"
 
-#: ../plug-ins/common/lcms.c:229
+#: ../plug-ins/common/lcms.c:225
 msgid "_Assign Color Profile..."
 msgstr "_Assign Colour Profile..."
 
-#: ../plug-ins/common/lcms.c:245
+#: ../plug-ins/common/lcms.c:241
 msgid "Assign default RGB Profile"
 msgstr "Assign default RGB Profile"
 
-#: ../plug-ins/common/lcms.c:252
+#: ../plug-ins/common/lcms.c:248
 msgid "Apply a color profile on the image"
 msgstr "Apply a colour profile on the image"
 
-#: ../plug-ins/common/lcms.c:262
+#: ../plug-ins/common/lcms.c:258
 msgid "_Convert to Color Profile..."
 msgstr "_Convert to Colour Profile..."
 
-#: ../plug-ins/common/lcms.c:280
+#: ../plug-ins/common/lcms.c:276
 msgid "Convert to default RGB Profile"
 msgstr "Convert to default RGB Profile"
 
-#: ../plug-ins/common/lcms.c:294
+#: ../plug-ins/common/lcms.c:290
 msgid "Image Color Profile Information"
 msgstr "Image Colour Profile Information"
 
-#: ../plug-ins/common/lcms.c:308
+#: ../plug-ins/common/lcms.c:304
 msgid "Color Profile Information"
 msgstr "Colour Profile Information"
 
-#: ../plug-ins/common/lcms.c:571
+#: ../plug-ins/common/lcms.c:572
 #, c-format
 msgid "Color profile '%s' is not for RGB color space."
 msgstr "Colour profile '%s' is not for RGB colour space."
 
-#: ../plug-ins/common/lcms.c:678
+#: ../plug-ins/common/lcms.c:679
 msgid "Default RGB working space"
 msgstr "Default RGB working space"
 
-#: ../plug-ins/common/lcms.c:766
+#: ../plug-ins/common/lcms.c:775
 msgid ""
 "Data attached as 'icc-profile' does not appear to be an ICC color profile"
 msgstr ""
 "Data attached as 'icc-profile' does not appear to be an ICC colour profile"
 
-#: ../plug-ins/common/lcms.c:816
+#: ../plug-ins/common/lcms.c:825
 #, c-format
 msgid "'%s' does not appear to be an ICC color profile"
 msgstr "'%s' does not appear to be an ICC colour profile"
 
 #. ICC color profile conversion
-#: ../plug-ins/common/lcms.c:874
+#: ../plug-ins/common/lcms.c:885
 #, c-format
 msgid "Converting from '%s' to '%s'"
 msgstr "Converting from '%s' to '%s'"
 
-#: ../plug-ins/common/lcms.c:1119
+#: ../plug-ins/common/lcms.c:1129
 #, c-format
 msgid "Could not load ICC profile from '%s'"
 msgstr "Could not load ICC profile from '%s'"
 
-#: ../plug-ins/common/lcms.c:1141
+#: ../plug-ins/common/lcms.c:1151
 #, c-format
 msgid "The image '%s' has an embedded color profile:"
 msgstr "The image '%s' has an embedded colour profile:"
 
-#: ../plug-ins/common/lcms.c:1185
+#: ../plug-ins/common/lcms.c:1195
 #, c-format
 msgid "Convert the image to the RGB working space (%s)?"
 msgstr "Convert the image to the RGB working space (%s)?"
 
-#: ../plug-ins/common/lcms.c:1216
+#: ../plug-ins/common/lcms.c:1226
 msgid "Convert to RGB working space?"
 msgstr "Convert to RGB working space?"
 
-#: ../plug-ins/common/lcms.c:1221
+#: ../plug-ins/common/lcms.c:1231
 msgid "_Keep"
 msgstr "_Keep"
 
-#: ../plug-ins/common/lcms.c:1226
+#: ../plug-ins/common/lcms.c:1236
 msgid "_Convert"
 msgstr "_Convert"
 
-#: ../plug-ins/common/lcms.c:1253 ../plug-ins/jpeg/jpeg-exif.c:372
+#: ../plug-ins/common/lcms.c:1263 ../plug-ins/file-jpeg/jpeg-exif.c:377
 msgid "_Don't ask me again"
 msgstr "_Don't ask me again"
 
-#: ../plug-ins/common/lcms.c:1317
+#: ../plug-ins/common/lcms.c:1327
 msgid "Select destination profile"
 msgstr "Select destination profile"
 
-#: ../plug-ins/common/lcms.c:1344
+#: ../plug-ins/common/lcms.c:1354
 msgid "All files (*.*)"
 msgstr "All files (*.*)"
 
-#: ../plug-ins/common/lcms.c:1349
+#: ../plug-ins/common/lcms.c:1359
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC colour profile (*.icc, *.icm)"
 
-#: ../plug-ins/common/lcms.c:1392
+#: ../plug-ins/common/lcms.c:1402
 #, c-format
 msgid "RGB workspace (%s)"
 msgstr "RGB workspace (%s)"
 
-#: ../plug-ins/common/lcms.c:1442
+#: ../plug-ins/common/lcms.c:1452
 msgid "Convert to ICC Color Profile"
 msgstr "Convert to ICC Colour Profile"
 
-#: ../plug-ins/common/lcms.c:1443
+#: ../plug-ins/common/lcms.c:1453
 msgid "Assign ICC Color Profile"
 msgstr "Assign ICC Colour Profile"
 
-#: ../plug-ins/common/lcms.c:1451
+#: ../plug-ins/common/lcms.c:1461
 msgid "_Assign"
 msgstr "_Assign"
 
-#: ../plug-ins/common/lcms.c:1468
+#: ../plug-ins/common/lcms.c:1478
 msgid "Current Color Profile"
 msgstr "Current Colour Profile"
 
-#: ../plug-ins/common/lcms.c:1483
+#: ../plug-ins/common/lcms.c:1493
 msgid "Convert to"
 msgstr "Convert to"
 
-#: ../plug-ins/common/lcms.c:1483
+#: ../plug-ins/common/lcms.c:1493
 msgid "Assign"
 msgstr "Assign"
 
-#: ../plug-ins/common/lcms.c:1507
+#: ../plug-ins/common/lcms.c:1517
 msgid "_Rendering Intent:"
 msgstr "_Rendering Intent:"
 
-#: ../plug-ins/common/lcms.c:1523
+#: ../plug-ins/common/lcms.c:1533
 msgid "_Black Point Compensation"
 msgstr "_Black Point Compensation"
 
-#: ../plug-ins/common/lcms.c:1565
+#: ../plug-ins/common/lcms.c:1575
 msgid "Destination profile is not for RGB color space."
 msgstr "Destination profile is not for RGB colour space."
 
-#: ../plug-ins/common/lens.c:115
+#: ../plug-ins/common/lens-apply.c:108
+msgid "Simulate an elliptical lens over the image"
+msgstr "Simulate an elliptical lens over the image"
+
+#: ../plug-ins/common/lens-apply.c:114
+msgid "Apply _Lens..."
+msgstr "Apply _Lens..."
+
+#: ../plug-ins/common/lens-apply.c:181
+msgid "Applying lens"
+msgstr "Applying lens"
+
+#: ../plug-ins/common/lens-apply.c:393
+msgid "Lens Effect"
+msgstr "Lens Effect"
+
+#: ../plug-ins/common/lens-apply.c:427
+msgid "_Keep original surroundings"
+msgstr "_Keep original surroundings"
+
+#: ../plug-ins/common/lens-apply.c:442
+msgid "_Set surroundings to index 0"
+msgstr "_Set surroundings to index 0"
+
+#: ../plug-ins/common/lens-apply.c:443
+msgid "_Set surroundings to background color"
+msgstr "_Set surroundings to background colour"
+
+#: ../plug-ins/common/lens-apply.c:458
+msgid "_Make surroundings transparent"
+msgstr "_Make surroundings transparent"
+
+#: ../plug-ins/common/lens-apply.c:475
+msgid "_Lens refraction index:"
+msgstr "_Lens refraction index:"
+
+#: ../plug-ins/common/lens-distortion.c:115
 msgid "Corrects lens distortion"
 msgstr "Corrects lens distortion"
 
-#: ../plug-ins/common/lens.c:120
+#: ../plug-ins/common/lens-distortion.c:120
 msgid "Lens Distortion..."
 msgstr "Lens Distortion..."
 
-#: ../plug-ins/common/lens.c:383
+#: ../plug-ins/common/lens-distortion.c:383
 msgid "Lens distortion"
 msgstr "Lens distortion"
 
-#: ../plug-ins/common/lens.c:483
+#: ../plug-ins/common/lens-distortion.c:483
 msgid "Lens Distortion"
 msgstr "Lens Distortion"
 
-#: ../plug-ins/common/lens.c:520
+#: ../plug-ins/common/lens-distortion.c:521
 msgid "_Main:"
 msgstr "_Main:"
 
-#: ../plug-ins/common/lens.c:534
+#: ../plug-ins/common/lens-distortion.c:535
 msgid "_Edge:"
 msgstr "_Edge:"
 
-#: ../plug-ins/common/lens.c:548 ../plug-ins/flame/flame.c:1213
+#: ../plug-ins/common/lens-distortion.c:549 ../plug-ins/flame/flame.c:1237
 msgid "_Zoom:"
 msgstr "_Zoom:"
 
-#: ../plug-ins/common/lens.c:562
+#: ../plug-ins/common/lens-distortion.c:563
 msgid "_Brighten:"
 msgstr "_Brighten:"
 
-#: ../plug-ins/common/lens.c:576
+#: ../plug-ins/common/lens-distortion.c:577
 msgid "_X shift:"
 msgstr "_X shift:"
 
-#: ../plug-ins/common/lens.c:590
+#: ../plug-ins/common/lens-distortion.c:591
 msgid "_Y shift:"
 msgstr "_Y shift:"
 
-#: ../plug-ins/common/lic.c:566 ../plug-ins/common/lic.c:641
-msgid "Van Gogh (LIC)"
-msgstr "Van Gogh (LIC)"
+#: ../plug-ins/common/lens-flare.c:188
+msgid "Add a lens flare effect"
+msgstr "Add a lens flare effect"
 
-#: ../plug-ins/common/lic.c:666
-msgid "Effect Channel"
-msgstr "Effect Channel"
+#: ../plug-ins/common/lens-flare.c:195
+msgid "Lens _Flare..."
+msgstr "Lens _Flare..."
 
-#: ../plug-ins/common/lic.c:673
-msgid "_Brightness"
-msgstr "_Brightness"
+#: ../plug-ins/common/lens-flare.c:270
+msgid "Render lens flare"
+msgstr "Render lens flare"
 
-#: ../plug-ins/common/lic.c:679
-msgid "Effect Operator"
-msgstr "Effect Operator"
+#: ../plug-ins/common/lens-flare.c:306
+msgid "Lens Flare"
+msgstr "Lens Flare"
 
-#: ../plug-ins/common/lic.c:684
-msgid "_Derivative"
-msgstr "_Derivative"
+#: ../plug-ins/common/lens-flare.c:753
+msgid "Center of Flare Effect"
+msgstr "Centre of Flare Effect"
 
-#: ../plug-ins/common/lic.c:685
-msgid "_Gradient"
-msgstr "_Gradient"
-
-#: ../plug-ins/common/lic.c:691
-msgid "Convolve"
-msgstr "Convolve"
-
-#: ../plug-ins/common/lic.c:696
-msgid "_With white noise"
-msgstr "_With white noise"
-
-#: ../plug-ins/common/lic.c:697
-msgid "W_ith source image"
-msgstr "W_ith source image"
-
-#: ../plug-ins/common/lic.c:716
-msgid "_Effect image:"
-msgstr "_Effect image:"
-
-#: ../plug-ins/common/lic.c:727
-msgid "_Filter length:"
-msgstr "_Filter length:"
-
-#: ../plug-ins/common/lic.c:736
-msgid "_Noise magnitude:"
-msgstr "_Noise magnitude:"
-
-#: ../plug-ins/common/lic.c:745
-msgid "In_tegration steps:"
-msgstr "In_tegration steps:"
-
-#: ../plug-ins/common/lic.c:754
-msgid "_Minimum value:"
-msgstr "_Minimum value:"
-
-#: ../plug-ins/common/lic.c:763
-msgid "M_aximum value:"
-msgstr "M_aximum value:"
-
-#: ../plug-ins/common/lic.c:809
-msgid "Special effects that nobody understands"
-msgstr "Special effects that nobody understands"
-
-#: ../plug-ins/common/lic.c:814
-msgid "_Van Gogh (LIC)..."
-msgstr "_Van Gogh (LIC)..."
+#: ../plug-ins/common/lens-flare.c:793 ../plug-ins/common/nova.c:484
+msgid "Show _position"
+msgstr "Show _position"
 
 #: ../plug-ins/common/mail.c:188
 msgid "Send the image by email"
@@ -5216,221 +5585,67 @@ msgstr "Send the image by e-mail"
 msgid "Send by E_mail..."
 msgstr "Send by E-_mail..."
 
-#: ../plug-ins/common/mail.c:408
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
 msgstr "Send by E-mail"
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "_Send"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "_Filename:"
 
-#: ../plug-ins/common/mail.c:457
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
 msgstr "_To:"
 
-#: ../plug-ins/common/mail.c:471
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
 msgstr "_From:"
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "S_ubject:"
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "some sort of error with the file extension or lack thereof"
 
-#: ../plug-ins/common/mail.c:726
+#: ../plug-ins/common/mail.c:725
 #, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "Could not start sendmail (%s)"
 
-#: ../plug-ins/common/max_rgb.c:90
+#: ../plug-ins/common/max-rgb.c:90
 msgid "Reduce image to pure red, green, and blue"
-msgstr "Reduce image to pure red, green, and blue"
+msgstr "Reduce image to pure red, green and blue"
 
-#: ../plug-ins/common/max_rgb.c:95
+#: ../plug-ins/common/max-rgb.c:95
 msgid "Maxim_um RGB..."
 msgstr "Maxim_um RGB..."
 
-#: ../plug-ins/common/max_rgb.c:134 ../plug-ins/common/scatter_hsv.c:158
+#: ../plug-ins/common/max-rgb.c:134 ../plug-ins/common/noise-hsv.c:158
 msgid "Can only operate on RGB drawables."
 msgstr "Can only operate on RGB drawables."
 
-#: ../plug-ins/common/max_rgb.c:234
+#: ../plug-ins/common/max-rgb.c:234
 msgid "Max RGB"
 msgstr "Max RGB"
 
-#: ../plug-ins/common/max_rgb.c:259
+#: ../plug-ins/common/max-rgb.c:259
 msgid "Maximum RGB Value"
 msgstr "Maximum RGB Value"
 
-#: ../plug-ins/common/max_rgb.c:291
+#: ../plug-ins/common/max-rgb.c:292
 msgid "_Hold the maximal channels"
 msgstr "_Hold the maximal channels"
 
-#: ../plug-ins/common/max_rgb.c:294
+#: ../plug-ins/common/max-rgb.c:295
 msgid "Ho_ld the minimal channels"
 msgstr "Ho_ld the minimal channels"
 
-#: ../plug-ins/common/mblur.c:157 ../plug-ins/common/mblur.c:171
-msgid "Simulate movement using directional blur"
-msgstr "Simulate movement using directional blur"
-
-#: ../plug-ins/common/mblur.c:164 ../plug-ins/common/mblur.c:177
-msgid "_Motion Blur..."
-msgstr "_Motion Blur..."
-
-#: ../plug-ins/common/mblur.c:910
-msgid "Motion blurring"
-msgstr "Motion blurring"
-
-#: ../plug-ins/common/mblur.c:1012
-msgid "Motion Blur"
-msgstr "Motion Blur"
-
-#: ../plug-ins/common/mblur.c:1045
-msgid "Blur Type"
-msgstr "Blur Type"
-
-#: ../plug-ins/common/mblur.c:1049
-msgid "_Linear"
-msgstr "_Linear"
-
-#: ../plug-ins/common/mblur.c:1050
-msgid "_Radial"
-msgstr "_Radial"
-
-#: ../plug-ins/common/mblur.c:1051 ../plug-ins/imagemap/imap_menu.c:203
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../plug-ins/common/mblur.c:1058
-msgid "Blur Center"
-msgstr "Blur Centre"
-
-#: ../plug-ins/common/mblur.c:1101
-msgid "Blur _outward"
-msgstr "Blur _outward"
-
-#: ../plug-ins/common/mblur.c:1114
-msgid "Blur Parameters"
-msgstr "Blur Parameters"
-
-#: ../plug-ins/common/mblur.c:1138 ../plug-ins/common/newsprint.c:1001
-msgid "_Angle:"
-msgstr "_Angle:"
-
-#. Inform the user that we couldn't losslessly save the
-#. * transparency & just use the full palette
-#: ../plug-ins/common/mng.c:499 ../plug-ins/common/png.c:1734
-msgid "Couldn't losslessly save transparency, saving opacity instead."
-msgstr "Couldn't losslessly save transparency, saving opacity instead."
-
-#: ../plug-ins/common/mng.c:1319
-msgid "Save as MNG"
-msgstr "Save as MNG"
-
-#: ../plug-ins/common/mng.c:1339
-msgid "MNG Options"
-msgstr "MNG Options"
-
-#: ../plug-ins/common/mng.c:1345
-msgid "Interlace"
-msgstr "Interlace"
-
-#: ../plug-ins/common/mng.c:1357
-msgid "Save background color"
-msgstr "Save background colour"
-
-#: ../plug-ins/common/mng.c:1368
-msgid "Save gamma"
-msgstr "Save gamma"
-
-#: ../plug-ins/common/mng.c:1378
-msgid "Save resolution"
-msgstr "Save resolution"
-
-#: ../plug-ins/common/mng.c:1389
-msgid "Save creation time"
-msgstr "Save creation time"
-
-#: ../plug-ins/common/mng.c:1408
-msgid "PNG"
-msgstr "PNG"
-
-#: ../plug-ins/common/mng.c:1409
-msgid "JNG"
-msgstr "JNG"
-
-#: ../plug-ins/common/mng.c:1412
-msgid "PNG + delta PNG"
-msgstr "PNG + delta PNG"
-
-#: ../plug-ins/common/mng.c:1413
-msgid "JNG + delta PNG"
-msgstr "JNG + delta PNG"
-
-#: ../plug-ins/common/mng.c:1414
-msgid "All PNG"
-msgstr "All PNG"
-
-#: ../plug-ins/common/mng.c:1415
-msgid "All JNG"
-msgstr "All JNG"
-
-#: ../plug-ins/common/mng.c:1427
-msgid "Default chunks type:"
-msgstr "Default chunks type:"
-
-#: ../plug-ins/common/mng.c:1430
-msgid "Combine"
-msgstr "Combine"
-
-#: ../plug-ins/common/mng.c:1431
-msgid "Replace"
-msgstr "Replace"
-
-#: ../plug-ins/common/mng.c:1442
-msgid "Default frame disposal:"
-msgstr "Default frame disposal:"
-
-#: ../plug-ins/common/mng.c:1454
-msgid "PNG compression level:"
-msgstr "PNG compression level:"
-
-#: ../plug-ins/common/mng.c:1462 ../plug-ins/common/png.c:1881
-msgid "Choose a high compression level for small file size"
-msgstr "Choose a high compression level for small file size"
-
-#: ../plug-ins/common/mng.c:1476
-msgid "JPEG compression quality:"
-msgstr "JPEG compression quality:"
-
-#: ../plug-ins/common/mng.c:1493
-msgid "JPEG smoothing factor:"
-msgstr "JPEG smoothing factor:"
-
-#: ../plug-ins/common/mng.c:1503
-msgid "Animated MNG Options"
-msgstr "Animated MNG Options"
-
-#: ../plug-ins/common/mng.c:1509
-msgid "Loop"
-msgstr "Loop"
-
-#: ../plug-ins/common/mng.c:1523
-msgid "Default frame delay:"
-msgstr "Default frame delay:"
-
-#: ../plug-ins/common/mng.c:1596
-msgid "MNG animation"
-msgstr "MNG animation"
-
 #: ../plug-ins/common/mosaic.c:359
 msgid "Convert the image into irregular tiles"
 msgstr "Convert the image into irregular tiles"
@@ -5440,100 +5655,79 @@ msgid "_Mosaic..."
 msgstr "_Mosaic..."
 
 #. progress bar for gradient finding
-#: ../plug-ins/common/mosaic.c:503
+#: ../plug-ins/common/mosaic.c:502
 msgid "Finding edges"
 msgstr "Finding edges"
 
 #. Progress bar for rendering tiles
-#: ../plug-ins/common/mosaic.c:557
+#: ../plug-ins/common/mosaic.c:556
 msgid "Rendering tiles"
 msgstr "Rendering tiles"
 
-#: ../plug-ins/common/mosaic.c:590
+#: ../plug-ins/common/mosaic.c:589
 msgid "Mosaic"
 msgstr "Mosaic"
 
-#: ../plug-ins/common/mosaic.c:630
+#: ../plug-ins/common/mosaic.c:629
 msgid "Squares"
 msgstr "Squares"
 
-#: ../plug-ins/common/mosaic.c:631
+#: ../plug-ins/common/mosaic.c:630
 msgid "Hexagons"
 msgstr "Hexagons"
 
-#: ../plug-ins/common/mosaic.c:632
+#: ../plug-ins/common/mosaic.c:631
 msgid "Octagons & squares"
 msgstr "Octagons & squares"
 
-#: ../plug-ins/common/mosaic.c:633
+#: ../plug-ins/common/mosaic.c:632
 msgid "Triangles"
 msgstr "Triangles"
 
-#: ../plug-ins/common/mosaic.c:641
+#: ../plug-ins/common/mosaic.c:640
 msgid "_Tiling primitives:"
 msgstr "_Tiling primitives:"
 
-#: ../plug-ins/common/mosaic.c:649
+#: ../plug-ins/common/mosaic.c:648
 msgid "Tile _size:"
 msgstr "Tile _size:"
 
-#: ../plug-ins/common/mosaic.c:674
+#: ../plug-ins/common/mosaic.c:660 ../plug-ins/common/tile-glass.c:303
+msgid "Tile _height:"
+msgstr "Tile _height:"
+
+#: ../plug-ins/common/mosaic.c:673
 msgid "Til_e spacing:"
 msgstr "Til_e spacing:"
 
-#: ../plug-ins/common/mosaic.c:686
+#: ../plug-ins/common/mosaic.c:685
 msgid "Tile _neatness:"
 msgstr "Tile _neatness:"
 
-#: ../plug-ins/common/mosaic.c:699
+#: ../plug-ins/common/mosaic.c:698
 msgid "Light _direction:"
 msgstr "Light _direction:"
 
-#: ../plug-ins/common/mosaic.c:711
+#: ../plug-ins/common/mosaic.c:710
 msgid "Color _variation:"
 msgstr "Colour _variation:"
 
-#: ../plug-ins/common/mosaic.c:740
+#: ../plug-ins/common/mosaic.c:739
 msgid "Co_lor averaging"
 msgstr "Co_lour averaging"
 
-#: ../plug-ins/common/mosaic.c:753
+#: ../plug-ins/common/mosaic.c:752
 msgid "Allo_w tile splitting"
 msgstr "Allo_w tile splitting"
 
-#: ../plug-ins/common/mosaic.c:766
+#: ../plug-ins/common/mosaic.c:765
 msgid "_Pitted surfaces"
 msgstr "_Pitted surfaces"
 
-#: ../plug-ins/common/mosaic.c:779
+#: ../plug-ins/common/mosaic.c:778
 msgid "_FG/BG lighting"
 msgstr "_FG/BG lighting"
 
-#: ../plug-ins/common/mosaic.c:2685
-#, c-format
-msgid "Unable to add additional point.\n"
-msgstr "Unable to add additional point.\n"
-
-#: ../plug-ins/common/neon.c:134
-msgid "Simulate the glowing boundary of a neon light"
-msgstr "Simulate the glowing boundary of a neon light"
-
-#: ../plug-ins/common/neon.c:139
-msgid "_Neon..."
-msgstr "_Neon..."
-
-#: ../plug-ins/common/neon.c:211
-msgid "Neon"
-msgstr "Neon"
-
-#: ../plug-ins/common/neon.c:693
-msgid "Neon Detection"
-msgstr "Neon Detection"
-
-#: ../plug-ins/common/neon.c:745 ../plug-ins/common/unsharp.c:691
-msgid "_Amount:"
-msgstr "_Amount:"
-
 #: ../plug-ins/common/newsprint.c:127
 msgid "Round"
 msgstr "Round"
@@ -5542,7 +5736,7 @@ msgstr "Round"
 msgid "Line"
 msgstr "Line"
 
-#: ../plug-ins/common/newsprint.c:145
+#: ../plug-ins/common/newsprint.c:145 ../plug-ins/flame/flame.c:760
 msgid "Diamond"
 msgstr "Diamond"
 
@@ -5595,136 +5789,261 @@ msgid "_Spot function:"
 msgstr "_Spot function:"
 
 #. resolution settings
-#: ../plug-ins/common/newsprint.c:1239
+#: ../plug-ins/common/newsprint.c:1240
 msgid "Resolution"
 msgstr "Resolution"
 
-#: ../plug-ins/common/newsprint.c:1258
+#: ../plug-ins/common/newsprint.c:1259
 msgid "_Input SPI:"
 msgstr "_Input SPI:"
 
-#: ../plug-ins/common/newsprint.c:1272
+#: ../plug-ins/common/newsprint.c:1273
 msgid "O_utput LPI:"
 msgstr "O_utput LPI:"
 
-#: ../plug-ins/common/newsprint.c:1285
+#: ../plug-ins/common/newsprint.c:1286
 msgid "C_ell size:"
 msgstr "C_ell size:"
 
 #. screen settings
-#: ../plug-ins/common/newsprint.c:1298 ../plug-ins/gflare/gflare.c:555
+#: ../plug-ins/common/newsprint.c:1299
+#: ../plug-ins/gradient-flare/gradient-flare.c:554
 msgid "Screen"
 msgstr "Screen"
 
-#: ../plug-ins/common/newsprint.c:1317
+#: ../plug-ins/common/newsprint.c:1318
 msgid "B_lack pullout (%):"
 msgstr "B_lack pullout (%):"
 
-#: ../plug-ins/common/newsprint.c:1339
+#: ../plug-ins/common/newsprint.c:1340
 msgid "Separate to:"
 msgstr "Separate to:"
 
-#: ../plug-ins/common/newsprint.c:1343
+#: ../plug-ins/common/newsprint.c:1344
 msgid "_RGB"
 msgstr "_RGB"
 
-#: ../plug-ins/common/newsprint.c:1360
+#: ../plug-ins/common/newsprint.c:1361
 msgid "C_MYK"
 msgstr "C_MYK"
 
-#: ../plug-ins/common/newsprint.c:1377
+#: ../plug-ins/common/newsprint.c:1378
 msgid "I_ntensity"
 msgstr "I_ntensity"
 
-#: ../plug-ins/common/newsprint.c:1402
+#: ../plug-ins/common/newsprint.c:1403
 msgid "_Lock channels"
 msgstr "_Lock channels"
 
-#: ../plug-ins/common/newsprint.c:1415
+#: ../plug-ins/common/newsprint.c:1416
 msgid "_Factory Defaults"
 msgstr "_Factory Defaults"
 
 #. anti-alias control
-#: ../plug-ins/common/newsprint.c:1441 ../plug-ins/gfig/gfig-dialog.c:1256
+#: ../plug-ins/common/newsprint.c:1442 ../plug-ins/gfig/gfig-dialog.c:1256
 msgid "Antialiasing"
 msgstr "Antialiasing"
 
-#: ../plug-ins/common/newsprint.c:1449
+#: ../plug-ins/common/newsprint.c:1450
 msgid "O_versample:"
 msgstr "O_versample:"
 
-#: ../plug-ins/common/nlfilt.c:118
+#: ../plug-ins/common/nl-filter.c:118
 msgid "Nonlinear swiss army knife filter"
 msgstr "Nonlinear swiss army knife filter"
 
-#: ../plug-ins/common/nlfilt.c:124
+#: ../plug-ins/common/nl-filter.c:124
 msgid "_NL Filter..."
 msgstr "_NL Filter..."
 
-#: ../plug-ins/common/nlfilt.c:952 ../plug-ins/common/nlfilt.c:1015
+#: ../plug-ins/common/nl-filter.c:952 ../plug-ins/common/nl-filter.c:1015
 msgid "NL Filter"
 msgstr "NL Filter"
 
-#: ../plug-ins/common/nlfilt.c:1043
+#: ../plug-ins/common/nl-filter.c:1044
 msgid "Filter"
 msgstr "Filter"
 
-#: ../plug-ins/common/nlfilt.c:1047
+#: ../plug-ins/common/nl-filter.c:1048
 msgid "_Alpha trimmed mean"
 msgstr "_Alpha trimmed mean"
 
-#: ../plug-ins/common/nlfilt.c:1049
+#: ../plug-ins/common/nl-filter.c:1050
 msgid "Op_timal estimation"
 msgstr "Op_timal estimation"
 
-#: ../plug-ins/common/nlfilt.c:1051
+#: ../plug-ins/common/nl-filter.c:1052
 msgid "_Edge enhancement"
 msgstr "_Edge enhancement"
 
-#: ../plug-ins/common/nlfilt.c:1076
+#: ../plug-ins/common/nl-filter.c:1077
 msgid "A_lpha:"
 msgstr "A_lpha:"
 
-#: ../plug-ins/common/noisify.c:144
+#: ../plug-ins/common/noise-hsv.c:103
+msgid "Randomize hue/saturation/value independently"
+msgstr "Randomize hue/saturation/value independently"
+
+#: ../plug-ins/common/noise-hsv.c:108
+msgid "HSV Noise..."
+msgstr "HSV Noise..."
+
+#: ../plug-ins/common/noise-hsv.c:215 ../plug-ins/common/noise-hsv.c:361
+msgid "HSV Noise"
+msgstr "HSV Noise"
+
+#: ../plug-ins/common/noise-hsv.c:397
+msgid "_Holdness:"
+msgstr "_Holdness:"
+
+#: ../plug-ins/common/noise-hsv.c:409
+msgid "H_ue:"
+msgstr "H_ue:"
+
+#: ../plug-ins/common/noise-randomize.c:102
+msgid "Random Hurl"
+msgstr "Random Hurl"
+
+#: ../plug-ins/common/noise-randomize.c:103
+msgid "Random Pick"
+msgstr "Random Pick"
+
+#: ../plug-ins/common/noise-randomize.c:104
+msgid "Random Slur"
+msgstr "Random Slur"
+
+#: ../plug-ins/common/noise-randomize.c:202
+msgid "Completely randomize a fraction of pixels"
+msgstr "Completely randomize a fraction of pixels"
+
+#: ../plug-ins/common/noise-randomize.c:204
+msgid "Randomly interchange some pixels with neighbors"
+msgstr "Randomly interchange some pixels with neighbours"
+
+#: ../plug-ins/common/noise-randomize.c:206
+msgid "Randomly slide some pixels downward (similar to melting)"
+msgstr "Randomly slide some pixels downward (similar to melting)"
+
+#: ../plug-ins/common/noise-randomize.c:233
+msgid "_Hurl..."
+msgstr "_Hurl..."
+
+#: ../plug-ins/common/noise-randomize.c:245
+msgid "_Pick..."
+msgstr "_Pick..."
+
+#: ../plug-ins/common/noise-randomize.c:257
+msgid "_Slur..."
+msgstr "_Slur..."
+
+#: ../plug-ins/common/noise-randomize.c:771
+#: ../plug-ins/common/noise-solid.c:602
+msgid "_Random seed:"
+msgstr "_Random seed:"
+
+#: ../plug-ins/common/noise-randomize.c:780
+msgid "R_andomization (%):"
+msgstr "R_andomisation (%):"
+
+#: ../plug-ins/common/noise-randomize.c:783
+msgid "Percentage of pixels to be filtered"
+msgstr "Percentage of pixels to be filtered"
+
+#: ../plug-ins/common/noise-randomize.c:795
+msgid "R_epeat:"
+msgstr "R_epeat:"
+
+#: ../plug-ins/common/noise-randomize.c:798
+msgid "Number of times to apply filter"
+msgstr "Number of times to apply filter"
+
+#: ../plug-ins/common/noise-rgb.c:144
 msgid "Distort colors by random amounts"
 msgstr "Distort colours by random amounts"
 
-#: ../plug-ins/common/noisify.c:154
+#: ../plug-ins/common/noise-rgb.c:154
 msgid "_RGB Noise..."
 msgstr "_RGB Noise..."
 
-#: ../plug-ins/common/noisify.c:282
+#: ../plug-ins/common/noise-rgb.c:282
 msgid "Adding noise"
 msgstr "Adding noise"
 
-#: ../plug-ins/common/noisify.c:448
+#: ../plug-ins/common/noise-rgb.c:448
 msgid "RGB Noise"
 msgstr "RGB Noise"
 
-#: ../plug-ins/common/noisify.c:481
+#: ../plug-ins/common/noise-rgb.c:481
 msgid "Co_rrelated noise"
 msgstr "Co_rrelated noise"
 
-#: ../plug-ins/common/noisify.c:496
+#: ../plug-ins/common/noise-rgb.c:496
 msgid "_Independent RGB"
 msgstr "_Independent RGB"
 
-#: ../plug-ins/common/noisify.c:520 ../plug-ins/common/noisify.c:524
+#: ../plug-ins/common/noise-rgb.c:520 ../plug-ins/common/noise-rgb.c:524
 msgid "_Gray:"
 msgstr "_Grey:"
 
-#: ../plug-ins/common/noisify.c:550
+#: ../plug-ins/common/noise-rgb.c:550
 #, c-format
 msgid "Channel #%d:"
 msgstr "Channel #%d:"
 
-#: ../plug-ins/common/normalize.c:80
-msgid "Stretch brightness values to cover the full range"
-msgstr "Stretch brightness values to cover the full range"
+#: ../plug-ins/common/noise-solid.c:176
+msgid "Create a random cloud-like texture"
+msgstr "Create a random cloud-like texture"
 
-#: ../plug-ins/common/normalize.c:126
-msgid "Normalizing"
-msgstr "Normalising"
+#: ../plug-ins/common/noise-solid.c:182
+msgid "_Solid Noise..."
+msgstr "_Solid Noise..."
+
+#. Dialog initialization
+#: ../plug-ins/common/noise-solid.c:315 ../plug-ins/common/noise-solid.c:563
+msgid "Solid Noise"
+msgstr "Solid Noise"
+
+#: ../plug-ins/common/noise-solid.c:615
+msgid "_Detail:"
+msgstr "_Detail:"
+
+#. Turbulent
+#: ../plug-ins/common/noise-solid.c:625
+msgid "T_urbulent"
+msgstr "T_urbulent"
+
+#. Tilable
+#: ../plug-ins/common/noise-solid.c:639
+msgid "T_ilable"
+msgstr "T_ilable"
+
+#: ../plug-ins/common/noise-solid.c:654
+msgid "_X size:"
+msgstr "_X size:"
+
+#: ../plug-ins/common/noise-solid.c:667
+msgid "_Y size:"
+msgstr "_Y size:"
+
+#: ../plug-ins/common/noise-spread.c:89
+msgid "Move pixels around randomly"
+msgstr "Move pixels around randomly"
+
+#: ../plug-ins/common/noise-spread.c:98
+msgid "Sp_read..."
+msgstr "Sp_read..."
+
+#: ../plug-ins/common/noise-spread.c:181
+msgid "Spreading"
+msgstr "Spreading"
+
+#: ../plug-ins/common/noise-spread.c:346
+msgid "Spread"
+msgstr "Spread"
+
+#: ../plug-ins/common/noise-spread.c:371
+msgid "Spread Amount"
+msgstr "Spread Amount"
 
 #: ../plug-ins/common/nova.c:168
 msgid "Add a starburst to the image"
@@ -5803,146 +6122,6 @@ msgstr "Use e_xponent map:"
 msgid "_Use intensity algorithm"
 msgstr "_Use intensity algorithm"
 
-#: ../plug-ins/common/papertile.c:243 ../plug-ins/common/papertile.c:556
-msgid "Paper Tile"
-msgstr "Paper Tile"
-
-#: ../plug-ins/common/papertile.c:269
-msgid "Division"
-msgstr "Division"
-
-#: ../plug-ins/common/papertile.c:319
-msgid "Fractional Pixels"
-msgstr "Fractional Pixels"
-
-#: ../plug-ins/common/papertile.c:324
-msgid "_Background"
-msgstr "_Background"
-
-#: ../plug-ins/common/papertile.c:326
-msgid "_Ignore"
-msgstr "_Ignore"
-
-#: ../plug-ins/common/papertile.c:328
-msgid "_Force"
-msgstr "_Force"
-
-#: ../plug-ins/common/papertile.c:335
-msgid "C_entering"
-msgstr "C_entring"
-
-#: ../plug-ins/common/papertile.c:350
-msgid "Movement"
-msgstr "Movement"
-
-#: ../plug-ins/common/papertile.c:363
-msgid "_Max (%):"
-msgstr "_Max (%):"
-
-#: ../plug-ins/common/papertile.c:369
-msgid "_Wrap around"
-msgstr "_Wrap around"
-
-#: ../plug-ins/common/papertile.c:379
-msgid "Background Type"
-msgstr "Background Type"
-
-#: ../plug-ins/common/papertile.c:386
-msgid "I_nverted image"
-msgstr "I_nverted image"
-
-#: ../plug-ins/common/papertile.c:388
-msgid "Im_age"
-msgstr "Im_age"
-
-#: ../plug-ins/common/papertile.c:390
-msgid "Fo_reground color"
-msgstr "Fo_reground colour"
-
-#: ../plug-ins/common/papertile.c:392
-msgid "Bac_kground color"
-msgstr "Bac_kground colour"
-
-#: ../plug-ins/common/papertile.c:394
-msgid "S_elect here:"
-msgstr "S_elect here:"
-
-#: ../plug-ins/common/papertile.c:401
-msgid "Background Color"
-msgstr "Background Colour"
-
-#: ../plug-ins/common/papertile.c:846
-msgid "Cut image into paper tiles, and slide them"
-msgstr "Cut image into paper tiles, and slide them"
-
-#: ../plug-ins/common/papertile.c:851
-msgid "September 31, 1999"
-msgstr "September 31, 1999"
-
-#: ../plug-ins/common/papertile.c:852
-msgid "_Paper Tile..."
-msgstr "_Paper Tile..."
-
-#: ../plug-ins/common/pat.c:121 ../plug-ins/common/pat.c:143
-msgid "GIMP pattern"
-msgstr "GIMP pattern"
-
-#: ../plug-ins/common/pat.c:358
-#, c-format
-msgid "Invalid UTF-8 string in pattern file '%s'."
-msgstr "Invalid UTF-8 string in pattern file '%s'."
-
-#: ../plug-ins/common/pat.c:513
-msgid "Save as Pattern"
-msgstr "Save as Pattern"
-
-#: ../plug-ins/common/pcx.c:129 ../plug-ins/common/pcx.c:148
-msgid "ZSoft PCX image"
-msgstr "ZSoft PCX image"
-
-#: ../plug-ins/common/pcx.c:354
-#, c-format
-msgid "Could not read header from '%s'"
-msgstr "Could not read header from '%s'"
-
-#: ../plug-ins/common/pcx.c:363
-#, c-format
-msgid "'%s' is not a PCX file"
-msgstr "'%s' is not a PCX file"
-
-#: ../plug-ins/common/pcx.c:386
-msgid "Invalid number of bytes per line in PCX header"
-msgstr "Invalid number of bytes per line in PCX header"
-
-#: ../plug-ins/common/pcx.c:434
-msgid "Unusual PCX flavour, giving up"
-msgstr "Unusual PCX flavour, giving up"
-
-#: ../plug-ins/common/pcx.c:655
-#, c-format
-msgid "Invalid X offset: %d"
-msgstr "Invalid X offset: %d"
-
-#: ../plug-ins/common/pcx.c:661
-#, c-format
-msgid "Invalid Y offset: %d"
-msgstr "Invalid Y offset: %d"
-
-#: ../plug-ins/common/pcx.c:667
-#, c-format
-msgid "Right border out of bounds (must be < %d): %d"
-msgstr "Right border out of bounds (must be < %d): %d"
-
-#: ../plug-ins/common/pcx.c:674
-#, c-format
-msgid "Bottom border out of bounds (must be < %d): %d"
-msgstr "Bottom border out of bounds (must be < %d): %d"
-
-#: ../plug-ins/common/pcx.c:730
-#, c-format
-msgid "Writing to file '%s' failed: %s"
-msgstr "Writing to file '%s' failed: %s"
-
 #: ../plug-ins/common/photocopy.c:153
 msgid "Simulate color distortion produced by a copy machine"
 msgstr "Simulate colour distortion produced by a copy machine"
@@ -5951,27 +6130,23 @@ msgstr "Simulate colour distortion produced by a copy machine"
 msgid "_Photocopy..."
 msgstr "_Photocopy..."
 
-#: ../plug-ins/common/photocopy.c:837
+#: ../plug-ins/common/photocopy.c:839
 msgid "Photocopy"
 msgstr "Photocopy"
 
-#: ../plug-ins/common/photocopy.c:888 ../plug-ins/common/sharpen.c:511
-#: ../plug-ins/common/softglow.c:695
+#: ../plug-ins/common/photocopy.c:890 ../plug-ins/common/sharpen.c:511
+#: ../plug-ins/common/softglow.c:697
 msgid "_Sharpness:"
 msgstr "_Sharpness:"
 
-#: ../plug-ins/common/photocopy.c:902
+#: ../plug-ins/common/photocopy.c:904
 msgid "Percent _black:"
 msgstr "Percent _black:"
 
-#: ../plug-ins/common/photocopy.c:916
+#: ../plug-ins/common/photocopy.c:918
 msgid "Percent _white:"
 msgstr "Percent _white:"
 
-#: ../plug-ins/common/pix.c:140 ../plug-ins/common/pix.c:157
-msgid "Alias Pix image"
-msgstr "Alias Pix image"
-
 #: ../plug-ins/common/pixelize.c:164
 msgid "Simplify image into an array of solid-colored squares"
 msgstr "Simplify image into an array of solid-coloured squares"
@@ -5984,15 +6159,15 @@ msgstr "_Pixelise..."
 msgid "Pixelizing"
 msgstr "Pixelising"
 
-#: ../plug-ins/common/pixelize.c:314
+#: ../plug-ins/common/pixelize.c:316
 msgid "Pixelize"
 msgstr "Pixelise"
 
-#: ../plug-ins/common/pixelize.c:350
+#: ../plug-ins/common/pixelize.c:352
 msgid "Pixel _width:"
 msgstr "Pixel _width:"
 
-#: ../plug-ins/common/pixelize.c:355
+#: ../plug-ins/common/pixelize.c:357
 msgid "Pixel _height:"
 msgstr "Pixel _height:"
 
@@ -6008,11 +6183,11 @@ msgstr "_Plasma..."
 msgid "Plasma"
 msgstr "Plasma"
 
-#: ../plug-ins/common/plasma.c:336
+#: ../plug-ins/common/plasma.c:337
 msgid "Random _seed:"
 msgstr "Random _seed:"
 
-#: ../plug-ins/common/plasma.c:347
+#: ../plug-ins/common/plasma.c:348
 msgid "T_urbulence:"
 msgstr "T_urbulence:"
 
@@ -6081,192 +6256,35 @@ msgstr "List View"
 msgid "Tree View"
 msgstr "Tree View"
 
-#: ../plug-ins/common/png.c:261 ../plug-ins/common/png.c:282
-#: ../plug-ins/common/png.c:302 ../plug-ins/common/png.c:319
-msgid "PNG image"
-msgstr "PNG image"
-
-#: ../plug-ins/common/png.c:613
-#, c-format
-msgid "Error loading PNG file: %s"
-msgstr "Error loading PNG file: %s"
-
-#: ../plug-ins/common/png.c:686
-#, c-format
-msgid "Error while reading '%s'. File corrupted?"
-msgstr "Error while reading '%s'. File corrupted?"
-
-#. Aie! Unknown type
-#: ../plug-ins/common/png.c:814
-#, c-format
-msgid "Unknown color model in PNG file '%s'."
-msgstr "Unknown colour model in PNG file '%s'."
-
-#: ../plug-ins/common/png.c:868
-msgid ""
-"The PNG file specifies an offset that caused the layer to be positioned "
-"outside the image."
-msgstr ""
-"The PNG file specifies an offset that caused the layer to be positioned "
-"outside the image."
-
-#: ../plug-ins/common/png.c:1229
-#, c-format
-msgid "Error while saving '%s'. Could not save image."
-msgstr "Error while saving '%s'. Could not save image."
-
-#: ../plug-ins/common/png.c:1759
-msgid "Save as PNG"
-msgstr "Save as PNG"
-
-#: ../plug-ins/common/png.c:1790
-msgid "_Interlacing (Adam7)"
-msgstr "_Interlacing (Adam7)"
-
-#: ../plug-ins/common/png.c:1801
-msgid "Save _background color"
-msgstr "Save _background colour"
-
-#: ../plug-ins/common/png.c:1809
-msgid "Save _gamma"
-msgstr "Save _gamma"
-
-#: ../plug-ins/common/png.c:1819
-msgid "Save layer o_ffset"
-msgstr "Save layer o_ffset"
-
-#: ../plug-ins/common/png.c:1828
-msgid "Save _resolution"
-msgstr "Save _resolution"
-
-#: ../plug-ins/common/png.c:1838
-msgid "Save creation _time"
-msgstr "Save creation _time"
-
-#: ../plug-ins/common/png.c:1847
-msgid "Save comme_nt"
-msgstr "Save comme_nt"
-
-#: ../plug-ins/common/png.c:1863
-msgid "Save color _values from transparent pixels"
-msgstr "Save colour _values from transparent pixels"
-
-#: ../plug-ins/common/png.c:1877
-msgid "Co_mpression level:"
-msgstr "Co_mpression level:"
-
-#: ../plug-ins/common/png.c:1895 ../plug-ins/jpeg/jpeg-save.c:1164
-msgid "_Load Defaults"
-msgstr "_Load Defaults"
-
-#: ../plug-ins/common/png.c:1903 ../plug-ins/jpeg/jpeg-save.c:1173
-msgid "S_ave Defaults"
-msgstr "S_ave Defaults"
-
-#: ../plug-ins/common/pnm.c:245
-msgid "PNM Image"
-msgstr "PNM Image"
-
-#: ../plug-ins/common/pnm.c:265
-msgid "PNM image"
-msgstr "PNM image"
-
-#: ../plug-ins/common/pnm.c:277
-msgid "PBM image"
-msgstr "PBM image"
-
-#: ../plug-ins/common/pnm.c:289
-msgid "PGM image"
-msgstr "PGM image"
-
-#: ../plug-ins/common/pnm.c:301
-msgid "PPM image"
-msgstr "PPM image"
-
-#: ../plug-ins/common/pnm.c:514 ../plug-ins/common/pnm.c:536
-#: ../plug-ins/common/pnm.c:545 ../plug-ins/common/pnm.c:556
-#: ../plug-ins/common/pnm.c:644 ../plug-ins/common/pnm.c:714
-msgid "Premature end of file."
-msgstr "Premature end of file."
-
-#: ../plug-ins/common/pnm.c:516
-msgid "Invalid file."
-msgstr "Invalid file."
-
-#: ../plug-ins/common/pnm.c:530
-msgid "File not in a supported format."
-msgstr "File not in a supported format."
-
-#: ../plug-ins/common/pnm.c:539
-msgid "Invalid X resolution."
-msgstr "Invalid X resolution."
-
-#: ../plug-ins/common/pnm.c:541
-msgid "Image width is larger than GIMP can handle."
-msgstr "Image width is larger than GIMP can handle."
-
-#: ../plug-ins/common/pnm.c:548
-msgid "Invalid Y resolution."
-msgstr "Invalid Y resolution."
-
-#: ../plug-ins/common/pnm.c:550
-msgid "Image height is larger than GIMP can handle."
-msgstr "Image height is larger than GIMP can handle."
-
-#: ../plug-ins/common/pnm.c:562
-msgid "Invalid maximum value."
-msgstr "Invalid maximum value."
-
-#: ../plug-ins/common/pnm.c:767
-msgid "Error reading file."
-msgstr "Error reading file."
-
-#: ../plug-ins/common/pnm.c:1133
-msgid "Save as PNM"
-msgstr "Save as PNM"
-
-#. file save type
-#: ../plug-ins/common/pnm.c:1150
-msgid "Data formatting"
-msgstr "Data formatting"
-
-#: ../plug-ins/common/pnm.c:1154
-msgid "Raw"
-msgstr "Raw"
-
-#: ../plug-ins/common/pnm.c:1155
-msgid "Ascii"
-msgstr "Ascii"
-
-#: ../plug-ins/common/polar.c:156
+#: ../plug-ins/common/polar-coords.c:156
 msgid "Convert image to or from polar coordinates"
 msgstr "Convert image to or from polar coordinates"
 
-#: ../plug-ins/common/polar.c:163
+#: ../plug-ins/common/polar-coords.c:163
 msgid "P_olar Coordinates..."
 msgstr "P_olar Coordinates..."
 
-#: ../plug-ins/common/polar.c:360
+#: ../plug-ins/common/polar-coords.c:360
 msgid "Polar coordinates"
 msgstr "Polar coordinates"
 
-#: ../plug-ins/common/polar.c:592
+#: ../plug-ins/common/polar-coords.c:592
 msgid "Polar Coordinates"
 msgstr "Polar Coordinates"
 
-#: ../plug-ins/common/polar.c:630
+#: ../plug-ins/common/polar-coords.c:631
 msgid "Circle _depth in percent:"
 msgstr "Circle _depth in percent:"
 
-#: ../plug-ins/common/polar.c:642
+#: ../plug-ins/common/polar-coords.c:643
 msgid "Offset _angle:"
 msgstr "Offset _angle:"
 
-#: ../plug-ins/common/polar.c:657
+#: ../plug-ins/common/polar-coords.c:658
 msgid "_Map backwards"
 msgstr "_Map backwards"
 
-#: ../plug-ins/common/polar.c:663
+#: ../plug-ins/common/polar-coords.c:664
 msgid ""
 "If checked the mapping will begin at the right side, as opposed to beginning "
 "at the left."
@@ -6274,11 +6292,11 @@ msgstr ""
 "If checked the mapping will begin at the right side, as opposed to beginning "
 "at the left."
 
-#: ../plug-ins/common/polar.c:674
+#: ../plug-ins/common/polar-coords.c:675
 msgid "Map from _top"
 msgstr "Map from _top"
 
-#: ../plug-ins/common/polar.c:680
+#: ../plug-ins/common/polar-coords.c:681
 msgid ""
 "If unchecked the mapping will put the bottom row in the middle and the top "
 "row on the outside.  If checked it will be the opposite."
@@ -6286,11 +6304,11 @@ msgstr ""
 "If unchecked the mapping will put the bottom row in the middle and the top "
 "row on the outside.  If checked it will be the opposite."
 
-#: ../plug-ins/common/polar.c:692
+#: ../plug-ins/common/polar-coords.c:693
 msgid "To _polar"
 msgstr "To _polar"
 
-#: ../plug-ins/common/polar.c:698
+#: ../plug-ins/common/polar-coords.c:699
 msgid ""
 "If unchecked the image will be circularly mapped onto a rectangle.  If "
 "checked the image will be mapped onto a circle."
@@ -6298,228 +6316,6 @@ msgstr ""
 "If unchecked the image will be circularly mapped onto a rectangle.  If "
 "checked the image will be mapped onto a circle."
 
-#: ../plug-ins/common/poppler.c:285
-msgid "Portable Document Format"
-msgstr "Portable Document Format"
-
-#: ../plug-ins/common/poppler.c:606
-#, c-format
-msgid "%s-%s"
-msgstr "%s-%s"
-
-#: ../plug-ins/common/poppler.c:608 ../plug-ins/common/postscript.c:1111
-#, c-format
-msgid "%s-pages"
-msgstr "%s-pages"
-
-#: ../plug-ins/common/poppler.c:786
-msgid "Import from PDF"
-msgstr "Import from PDF"
-
-#: ../plug-ins/common/poppler.c:791 ../plug-ins/common/postscript.c:3083
-#: ../plug-ins/common/tiff-load.c:451
-msgid "_Import"
-msgstr "_Import"
-
-#: ../plug-ins/common/poppler.c:857
-msgid "_Width (pixels):"
-msgstr "_Width (pixels):"
-
-#: ../plug-ins/common/poppler.c:858
-msgid "_Height (pixels):"
-msgstr "_Height (pixels):"
-
-#: ../plug-ins/common/poppler.c:860
-msgid "_Resolution:"
-msgstr "_Resolution:"
-
-#: ../plug-ins/common/poppler.c:1134
-#, c-format
-msgid "pixels/%s"
-msgstr "pixels/%s"
-
-#: ../plug-ins/common/postscript.c:597 ../plug-ins/common/postscript.c:689
-msgid "PostScript document"
-msgstr "PostScript document"
-
-#: ../plug-ins/common/postscript.c:616 ../plug-ins/common/postscript.c:705
-msgid "Encapsulated PostScript image"
-msgstr "Encapsulated PostScript image"
-
-#: ../plug-ins/common/postscript.c:636
-msgid "PDF document"
-msgstr "PDF document"
-
-#: ../plug-ins/common/postscript.c:1036
-#, c-format
-msgid "Could not interpret '%s'"
-msgstr "Could not interpret '%s'"
-
-#: ../plug-ins/common/postscript.c:1176
-msgid "PostScript save cannot handle images with alpha channels"
-msgstr "PostScript save cannot handle images with alpha channels"
-
-#: ../plug-ins/common/postscript.c:1713 ../plug-ins/common/postscript.c:1746
-#, c-format
-msgid ""
-"Error starting Ghostscript. Make sure that Ghostscript is installed and - if "
-"necessary - use the environment variable GS_PROG to tell GIMP about its "
-"location.\n"
-"(%s)"
-msgstr ""
-"Error starting Ghostscript. Make sure that Ghostscript is installed and - if "
-"necessary - use the environment variable GS_PROG to tell GIMP about its "
-"location.\n"
-"(%s)"
-
-#: ../plug-ins/common/postscript.c:1913 ../plug-ins/common/tiff-load.c:954
-#, c-format
-msgid "Page %d"
-msgstr "Page %d"
-
-#: ../plug-ins/common/postscript.c:2583 ../plug-ins/common/postscript.c:2716
-#: ../plug-ins/common/postscript.c:2868 ../plug-ins/common/postscript.c:2994
-#: ../plug-ins/common/sunras.c:1485 ../plug-ins/common/sunras.c:1593
-#: ../plug-ins/fits/fits.c:831 ../plug-ins/fits/fits.c:955
-msgid "Write error occurred"
-msgstr "Write error occurred"
-
-#: ../plug-ins/common/postscript.c:3078
-msgid "Import from PostScript"
-msgstr "Import from PostScript"
-
-#. Rendering
-#: ../plug-ins/common/postscript.c:3121
-msgid "Rendering"
-msgstr "Rendering"
-
-#. Resolution
-#: ../plug-ins/common/postscript.c:3137 ../plug-ins/common/svg.c:898
-#: ../plug-ins/common/wmf.c:683
-msgid "Resolution:"
-msgstr "Resolution:"
-
-#: ../plug-ins/common/postscript.c:3176
-msgid "Pages:"
-msgstr "Pages:"
-
-#: ../plug-ins/common/postscript.c:3183
-msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
-msgstr "Pages to load (e.g.: 1-4 or 1,3,5-7)"
-
-#: ../plug-ins/common/postscript.c:3187
-#: ../plug-ins/common/spheredesigner.c:2650
-msgid "Layers"
-msgstr "Layers"
-
-#: ../plug-ins/common/postscript.c:3189
-msgid "Images"
-msgstr "Images"
-
-#: ../plug-ins/common/postscript.c:3192
-msgid "Open as"
-msgstr "Open as"
-
-#: ../plug-ins/common/postscript.c:3196
-msgid "Try Bounding Box"
-msgstr "Try Bounding Box"
-
-#. Colouring
-#: ../plug-ins/common/postscript.c:3209
-msgid "Coloring"
-msgstr "Colouring"
-
-#: ../plug-ins/common/postscript.c:3213
-msgid "B/W"
-msgstr "B/W"
-
-#: ../plug-ins/common/postscript.c:3214 ../plug-ins/imagemap/imap_menu.c:214
-#: ../plug-ins/rcm/rcm_dialog.c:419
-msgid "Gray"
-msgstr "Grey"
-
-#: ../plug-ins/common/postscript.c:3215 ../plug-ins/common/xpm.c:468
-#: ../plug-ins/gimpressionist/color.c:66
-#: ../plug-ins/gimpressionist/general.c:170
-#: ../plug-ins/imagemap/imap_menu.c:213
-msgid "Color"
-msgstr "Colour"
-
-#: ../plug-ins/common/postscript.c:3216 ../plug-ins/fits/fits.c:1014
-msgid "Automatic"
-msgstr "Automatic"
-
-#: ../plug-ins/common/postscript.c:3226
-msgid "Text antialiasing"
-msgstr "Text antialiasing"
-
-#: ../plug-ins/common/postscript.c:3231 ../plug-ins/common/postscript.c:3243
-msgid "Weak"
-msgstr "Weak"
-
-#: ../plug-ins/common/postscript.c:3232 ../plug-ins/common/postscript.c:3244
-msgid "Strong"
-msgstr "Strong"
-
-#: ../plug-ins/common/postscript.c:3238
-msgid "Graphic antialiasing"
-msgstr "Graphic antialiasing"
-
-#: ../plug-ins/common/postscript.c:3316
-msgid "Save as PostScript"
-msgstr "Save as PostScript"
-
-#. Image Size
-#: ../plug-ins/common/postscript.c:3347
-msgid "Image Size"
-msgstr "Image Size"
-
-#: ../plug-ins/common/postscript.c:3396
-msgid "_Keep aspect ratio"
-msgstr "_Keep aspect ratio"
-
-#: ../plug-ins/common/postscript.c:3402
-msgid ""
-"When toggled, the resulting image will be scaled to fit into the given size "
-"without changing the aspect ratio."
-msgstr ""
-"When toggled, the resulting image will be scaled to fit into the given size "
-"without changing the aspect ratio."
-
-#. Unit
-#: ../plug-ins/common/postscript.c:3412
-msgid "Unit"
-msgstr "Unit"
-
-#: ../plug-ins/common/postscript.c:3416
-msgid "_Inch"
-msgstr "_Inch"
-
-#: ../plug-ins/common/postscript.c:3417
-msgid "_Millimeter"
-msgstr "_Millimetre"
-
-#. Format
-#: ../plug-ins/common/postscript.c:3443
-msgid "Output"
-msgstr "Output"
-
-#: ../plug-ins/common/postscript.c:3449
-msgid "_PostScript level 2"
-msgstr "_PostScript level 2"
-
-#: ../plug-ins/common/postscript.c:3458
-msgid "_Encapsulated PostScript"
-msgstr "_Encapsulated PostScript"
-
-#: ../plug-ins/common/postscript.c:3467
-msgid "P_review"
-msgstr "P_review"
-
-#: ../plug-ins/common/postscript.c:3488
-msgid "Preview _size:"
-msgstr "Preview _size:"
-
 #: ../plug-ins/common/procedure-browser.c:83
 msgid "List available procedures in the PDB"
 msgstr "List available procedures in the PDB"
@@ -6532,271 +6328,61 @@ msgstr "Procedure _Browser"
 msgid "Procedure Browser"
 msgstr "Procedure Browser"
 
-#: ../plug-ins/common/psd-save.c:222 ../plug-ins/psd/psd.c:114
-#: ../plug-ins/psd/psd.c:153
-msgid "Photoshop image"
-msgstr "Photoshop image"
+#: ../plug-ins/common/qbist.c:402
+msgid "Generate a huge variety of abstract patterns"
+msgstr "Generate a huge variety of abstract patterns"
 
-#: ../plug-ins/common/psd-save.c:353
-#, c-format
-msgid ""
-"Unable to save layer with mode '%s'.  Either the PSD file format or the save "
-"plug-in does not support that, using normal mode instead."
-msgstr ""
-"Unable to save layer with mode '%s'.  Either the PSD file format or the save "
-"plug-in does not support that, using normal mode instead."
+#: ../plug-ins/common/qbist.c:410
+msgid "_Qbist..."
+msgstr "_Qbist..."
 
-#: ../plug-ins/common/psd-save.c:608
-msgid "Error: Can't convert GIMP base imagetype to PSD mode"
-msgstr "Error: Can't convert GIMP base imagetype to PSD mode"
+#: ../plug-ins/common/qbist.c:511
+msgid "Qbist"
+msgstr "Qbist"
 
-#: ../plug-ins/common/psd-save.c:1533
-#, c-format
-msgid ""
-"Unable to save '%s'.  The psd file format does not support images that are "
-"more than 30000 pixels wide or tall."
-msgstr ""
-"Unable to save '%s'.  The psd file format does not support images that are "
-"more than 30000 pixels wide or tall."
+#: ../plug-ins/common/qbist.c:707
+msgid "Load QBE File"
+msgstr "Load QBE File"
 
-#: ../plug-ins/common/psd-save.c:1545
-#, c-format
-msgid ""
-"Unable to save '%s'.  The psd file format does not support images with "
-"layers that are more than 30000 pixels wide or tall."
-msgstr ""
-"Unable to save '%s'.  The psd file format does not support images with "
-"layers that are more than 30000 pixels wide or tall."
+#: ../plug-ins/common/qbist.c:749
+msgid "Save as QBE File"
+msgstr "Save as QBE File"
 
-#: ../plug-ins/common/psp.c:356 ../plug-ins/common/psp.c:380
-msgid "Paint Shop Pro image"
-msgstr "Paint Shop Pro image"
+#: ../plug-ins/common/qbist.c:803
+msgid "G-Qbist"
+msgstr "G-Qbist"
 
-#: ../plug-ins/common/psp.c:397
-msgid "Save as PSP"
-msgstr "Save as PSP"
-
-#. file save type
-#: ../plug-ins/common/psp.c:414
-msgid "Data Compression"
-msgstr "Data Compression"
-
-#: ../plug-ins/common/psp.c:419
-msgid "RLE"
-msgstr "RLE"
-
-#: ../plug-ins/common/psp.c:420
-msgid "LZ77"
-msgstr "LZ77"
-
-#: ../plug-ins/common/randomize.c:102
-msgid "Random Hurl"
-msgstr "Random Hurl"
-
-#: ../plug-ins/common/randomize.c:103
-msgid "Random Pick"
-msgstr "Random Pick"
-
-#: ../plug-ins/common/randomize.c:104
-msgid "Random Slur"
-msgstr "Random Slur"
-
-#: ../plug-ins/common/randomize.c:202
-msgid "Completely randomize a fraction of pixels"
-msgstr "Completely randomize a fraction of pixels"
-
-#: ../plug-ins/common/randomize.c:204
-msgid "Randomly interchange some pixels with neighbors"
-msgstr "Randomly interchange some pixels with neighbours"
-
-#: ../plug-ins/common/randomize.c:206
-msgid "Randomly slide some pixels downward (similar to melting)"
-msgstr "Randomly slide some pixels downward (similar to melting)"
-
-#: ../plug-ins/common/randomize.c:233
-msgid "_Hurl..."
-msgstr "_Hurl..."
-
-#: ../plug-ins/common/randomize.c:245
-msgid "_Pick..."
-msgstr "_Pick..."
-
-#: ../plug-ins/common/randomize.c:257
-msgid "_Slur..."
-msgstr "_Slur..."
-
-#: ../plug-ins/common/randomize.c:771 ../plug-ins/common/snoise.c:601
-msgid "_Random seed:"
-msgstr "_Random seed:"
-
-#: ../plug-ins/common/randomize.c:780
-msgid "R_andomization (%):"
-msgstr "R_andomisation (%):"
-
-#: ../plug-ins/common/randomize.c:783
-msgid "Percentage of pixels to be filtered"
-msgstr "Percentage of pixels to be filtered"
-
-#: ../plug-ins/common/randomize.c:795
-msgid "R_epeat:"
-msgstr "R_epeat:"
-
-#: ../plug-ins/common/randomize.c:798
-msgid "Number of times to apply filter"
-msgstr "Number of times to apply filter"
-
-#: ../plug-ins/common/raw.c:179 ../plug-ins/common/raw.c:194
-msgid "Raw image data"
-msgstr "Raw image data"
-
-#: ../plug-ins/common/raw.c:959
-msgid "Load Image from Raw Data"
-msgstr "Load Image from Raw Data"
-
-#: ../plug-ins/common/raw.c:992
-msgid "Image"
-msgstr "Image"
-
-#: ../plug-ins/common/raw.c:1003
-msgid "RGB Alpha"
-msgstr "RGB Alpha"
-
-#: ../plug-ins/common/raw.c:1004
-msgid "Planar RGB"
-msgstr "Planar RGB"
-
-#: ../plug-ins/common/raw.c:1005
-msgid "Indexed"
-msgstr "Indexed"
-
-#: ../plug-ins/common/raw.c:1006
-msgid "Indexed Alpha"
-msgstr "Indexed Alpha"
-
-#: ../plug-ins/common/raw.c:1011
-msgid "Image _Type:"
-msgstr "Image _Type:"
-
-#: ../plug-ins/common/raw.c:1061
-msgid "Palette"
-msgstr "Palette"
-
-#: ../plug-ins/common/raw.c:1071 ../plug-ins/common/raw.c:1170
-msgid "R, G, B (normal)"
-msgstr "R, G, B (normal)"
-
-#: ../plug-ins/common/raw.c:1072 ../plug-ins/common/raw.c:1172
-msgid "B, G, R, X (BMP style)"
-msgstr "B, G, R, X (BMP style)"
-
-#: ../plug-ins/common/raw.c:1077
-msgid "_Palette Type:"
-msgstr "_Palette Type:"
-
-#: ../plug-ins/common/raw.c:1088
-msgid "Off_set:"
-msgstr "Off_set:"
-
-#: ../plug-ins/common/raw.c:1100
-msgid "Select Palette File"
-msgstr "Select Palette File"
-
-#: ../plug-ins/common/raw.c:1106
-msgid "Pal_ette File:"
-msgstr "Pal_ette File:"
-
-#: ../plug-ins/common/raw.c:1134
-msgid "Raw Image Save"
-msgstr "Raw Image Save"
-
-#: ../plug-ins/common/raw.c:1156
-msgid "RGB Save Type"
-msgstr "RGB Save Type"
-
-#: ../plug-ins/common/raw.c:1160
-msgid "Standard (R,G,B)"
-msgstr "Standard (R,G,B)"
-
-#: ../plug-ins/common/raw.c:1161
-msgid "Planar (RRR,GGG,BBB)"
-msgstr "Planar (RRR,GGG,BBB)"
-
-#: ../plug-ins/common/raw.c:1166
-msgid "Indexed Palette Type"
-msgstr "Indexed Palette Type"
-
-#: ../plug-ins/common/redeye.c:107
+#: ../plug-ins/common/red-eye-removal.c:105
 msgid "Remove the red eye effect caused by camera flashes"
 msgstr "Remove the red eye effect caused by camera flashes"
 
-#: ../plug-ins/common/redeye.c:118
+#: ../plug-ins/common/red-eye-removal.c:116
 msgid "_Red Eye Removal..."
 msgstr "_Red Eye Removal..."
 
-#: ../plug-ins/common/redeye.c:145
+#: ../plug-ins/common/red-eye-removal.c:142
 msgid "Red Eye Removal"
 msgstr "Red Eye Removal"
 
-#: ../plug-ins/common/redeye.c:179
+#: ../plug-ins/common/red-eye-removal.c:170
+#: ../plug-ins/common/unsharp-mask.c:706 ../plug-ins/common/wind.c:1008
+#: ../plug-ins/imagemap/imap_preferences.c:441
+#: ../plug-ins/map-object/map-object-ui.c:585
+msgid "_Threshold:"
+msgstr "_Threshold:"
+
+#: ../plug-ins/common/red-eye-removal.c:176
 msgid "Threshold for the red eye color to remove."
 msgstr "Threshold for the red eye colour to remove."
 
-#: ../plug-ins/common/redeye.c:184
+#: ../plug-ins/common/red-eye-removal.c:181
 msgid "Manually selecting the eyes may improve the results."
 msgstr "Manually selecting the eyes may improve the results."
 
-#: ../plug-ins/common/redeye.c:317
+#: ../plug-ins/common/red-eye-removal.c:301
 msgid "Removing red eye"
 msgstr "Removing red eye"
 
-#: ../plug-ins/common/retinex.c:156
-msgid "Enhance contrast using the Retinex method"
-msgstr "Enhance contrast using the Retinex method"
-
-#: ../plug-ins/common/retinex.c:166
-msgid "Retine_x..."
-msgstr "Retine_x..."
-
-#: ../plug-ins/common/retinex.c:250
-msgid "Retinex"
-msgstr "Retinex"
-
-#: ../plug-ins/common/retinex.c:286
-msgid "Retinex Image Enhancement"
-msgstr "Retinex Image Enhancement"
-
-#: ../plug-ins/common/retinex.c:321
-msgid "Uniform"
-msgstr "Uniform"
-
-#: ../plug-ins/common/retinex.c:322
-msgid "Low"
-msgstr "Low"
-
-#: ../plug-ins/common/retinex.c:323
-msgid "High"
-msgstr "High"
-
-#: ../plug-ins/common/retinex.c:334
-msgid "_Level:"
-msgstr "_Level:"
-
-#: ../plug-ins/common/retinex.c:339
-msgid "_Scale:"
-msgstr "_Scale:"
-
-#: ../plug-ins/common/retinex.c:354
-msgid "Scale _division:"
-msgstr "Scale _division:"
-
-#: ../plug-ins/common/retinex.c:369
-msgid "Dy_namic:"
-msgstr "Dy_namic:"
-
-#: ../plug-ins/common/retinex.c:642
-msgid "Retinex: filtering"
-msgstr "Retinex: filtering"
-
 #: ../plug-ins/common/ripple.c:129
 msgid "Displace pixels in a ripple pattern"
 msgstr "Displace pixels in a ripple pattern"
@@ -6813,41 +6399,41 @@ msgstr "Rippling"
 msgid "Ripple"
 msgstr "Ripple"
 
-#: ../plug-ins/common/ripple.c:525
+#: ../plug-ins/common/ripple.c:526
 msgid "_Retain tilability"
 msgstr "_Retain tilability"
 
 #. Edges toggle box
-#: ../plug-ins/common/ripple.c:559
+#: ../plug-ins/common/ripple.c:560
 msgid "Edges"
 msgstr "Edges"
 
-#: ../plug-ins/common/ripple.c:565
+#: ../plug-ins/common/ripple.c:566
 msgid "_Blank"
 msgstr "_Blank"
 
 #. Wave toggle box
-#: ../plug-ins/common/ripple.c:587
+#: ../plug-ins/common/ripple.c:588
 msgid "Wave Type"
 msgstr "Wave Type"
 
-#: ../plug-ins/common/ripple.c:591
+#: ../plug-ins/common/ripple.c:592
 msgid "Saw_tooth"
 msgstr "Saw_tooth"
 
-#: ../plug-ins/common/ripple.c:592
+#: ../plug-ins/common/ripple.c:593
 msgid "S_ine"
 msgstr "S_ine"
 
-#: ../plug-ins/common/ripple.c:615
+#: ../plug-ins/common/ripple.c:616
 msgid "_Period:"
 msgstr "_Period:"
 
-#: ../plug-ins/common/ripple.c:628
+#: ../plug-ins/common/ripple.c:629
 msgid "A_mplitude:"
 msgstr "A_mplitude:"
 
-#: ../plug-ins/common/ripple.c:641
+#: ../plug-ins/common/ripple.c:642
 msgid "Phase _shift:"
 msgstr "Phase _shift:"
 
@@ -6867,108 +6453,88 @@ msgstr "Sorry, channels and masks can not be rotated."
 msgid "Rotating"
 msgstr "Rotating"
 
-#: ../plug-ins/common/sample_colorize.c:298
+#: ../plug-ins/common/sample-colorize.c:298
 msgid "Colorize image using a sample image as a guide"
 msgstr "Colourize image using a sample image as a guide"
 
-#: ../plug-ins/common/sample_colorize.c:303
+#: ../plug-ins/common/sample-colorize.c:303
 msgid "_Sample Colorize..."
 msgstr "_Sample Colourise..."
 
-#: ../plug-ins/common/sample_colorize.c:1313
+#: ../plug-ins/common/sample-colorize.c:1318
 msgid "Sample Colorize"
 msgstr "Sample Colourise"
 
-#: ../plug-ins/common/sample_colorize.c:1318
+#: ../plug-ins/common/sample-colorize.c:1323
 msgid "Get _Sample Colors"
 msgstr "Get _Sample Colours"
 
 #. layer combo_box (Dst)
-#: ../plug-ins/common/sample_colorize.c:1347
+#: ../plug-ins/common/sample-colorize.c:1352
 msgid "Destination:"
 msgstr "Destination:"
 
 #. layer combo_box (Sample)
-#: ../plug-ins/common/sample_colorize.c:1363
+#: ../plug-ins/common/sample-colorize.c:1368
 msgid "Sample:"
 msgstr "Sample:"
 
-#: ../plug-ins/common/sample_colorize.c:1373
+#: ../plug-ins/common/sample-colorize.c:1378
 msgid "From reverse gradient"
 msgstr "From reverse gradient"
 
-#: ../plug-ins/common/sample_colorize.c:1378
+#: ../plug-ins/common/sample-colorize.c:1383
 msgid "From gradient"
 msgstr "From gradient"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1399
-#: ../plug-ins/common/sample_colorize.c:1426
+#: ../plug-ins/common/sample-colorize.c:1404
+#: ../plug-ins/common/sample-colorize.c:1431
 msgid "Show selection"
 msgstr "Show selection"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1410
-#: ../plug-ins/common/sample_colorize.c:1437
+#: ../plug-ins/common/sample-colorize.c:1415
+#: ../plug-ins/common/sample-colorize.c:1442
 msgid "Show color"
 msgstr "Show colour"
 
-#: ../plug-ins/common/sample_colorize.c:1550
+#: ../plug-ins/common/sample-colorize.c:1555
 msgid "Input levels:"
 msgstr "Input levels:"
 
-#: ../plug-ins/common/sample_colorize.c:1600
+#: ../plug-ins/common/sample-colorize.c:1605
 msgid "Output levels:"
 msgstr "Output levels:"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1640
+#: ../plug-ins/common/sample-colorize.c:1645
 msgid "Hold intensity"
 msgstr "Hold intensity"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1651
+#: ../plug-ins/common/sample-colorize.c:1656
 msgid "Original intensity"
 msgstr "Original intensity"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1669
+#: ../plug-ins/common/sample-colorize.c:1674
 msgid "Use subcolors"
 msgstr "Use subcolours"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1680
+#: ../plug-ins/common/sample-colorize.c:1685
 msgid "Smooth samples"
 msgstr "Smooth samples"
 
-#: ../plug-ins/common/sample_colorize.c:2652
+#: ../plug-ins/common/sample-colorize.c:2657
 msgid "Sample analyze"
 msgstr "Sample analyse"
 
-#: ../plug-ins/common/sample_colorize.c:3030
+#: ../plug-ins/common/sample-colorize.c:3035
 msgid "Remap colorized"
 msgstr "Remap colourised"
 
-#: ../plug-ins/common/scatter_hsv.c:103
-msgid "Randomize hue/saturation/value independently"
-msgstr "Randomize hue/saturation/value independently"
-
-#: ../plug-ins/common/scatter_hsv.c:108
-msgid "HSV Noise..."
-msgstr "HSV Noise..."
-
-#: ../plug-ins/common/scatter_hsv.c:215 ../plug-ins/common/scatter_hsv.c:361
-msgid "HSV Noise"
-msgstr "HSV Noise"
-
-#: ../plug-ins/common/scatter_hsv.c:397
-msgid "_Holdness:"
-msgstr "_Holdness:"
-
-#: ../plug-ins/common/scatter_hsv.c:409
-msgid "H_ue:"
-msgstr "H_ue:"
-
 #: ../plug-ins/common/screenshot.c:240
 msgid "Create an image from an area of the screen"
 msgstr "Create an image from an area of the screen"
@@ -6977,112 +6543,92 @@ msgstr "Create an image from an area of the screen"
 msgid "_Screenshot..."
 msgstr "_Screenshot..."
 
-#: ../plug-ins/common/screenshot.c:418
+#: ../plug-ins/common/screenshot.c:417
 msgid "Error selecting the window"
 msgstr "Error selecting the window"
 
-#: ../plug-ins/common/screenshot.c:779
+#: ../plug-ins/common/screenshot.c:778
 msgid "Importing screenshot"
 msgstr "Importing screenshot"
 
-#: ../plug-ins/common/screenshot.c:805 ../plug-ins/common/screenshot.c:1061
+#: ../plug-ins/common/screenshot.c:804 ../plug-ins/common/screenshot.c:1060
 msgid "Screenshot"
 msgstr "Screenshot"
 
-#: ../plug-ins/common/screenshot.c:846
+#: ../plug-ins/common/screenshot.c:845
 msgid "Mouse Pointer"
 msgstr "Mouse Pointer"
 
-#: ../plug-ins/common/screenshot.c:950
+#: ../plug-ins/common/screenshot.c:949
 msgid "Specified window not found"
 msgstr "Specified window not found"
 
-#: ../plug-ins/common/screenshot.c:976
+#: ../plug-ins/common/screenshot.c:975
 msgid "There was an error taking the screenshot."
 msgstr "There was an error taking the screenshot."
 
-#: ../plug-ins/common/screenshot.c:1070
+#: ../plug-ins/common/screenshot.c:1069
 msgid "S_nap"
 msgstr "S_nap"
 
-#: ../plug-ins/common/screenshot.c:1100
+#: ../plug-ins/common/screenshot.c:1099
 msgid "After the delay, the screenshot is taken."
 msgstr "After the delay, the screenshot is taken."
 
-#: ../plug-ins/common/screenshot.c:1102
+#: ../plug-ins/common/screenshot.c:1101
 msgid ""
 "After the delay, drag your mouse to select the region for the screenshot."
 msgstr ""
 "After the delay, drag your mouse to select the region for the screenshot."
 
-#: ../plug-ins/common/screenshot.c:1105
+#: ../plug-ins/common/screenshot.c:1104
 msgid "At the end of the delay, click in a window to snap it."
 msgstr "At the end of the delay, click in a window to snap it."
 
 #. Area
-#: ../plug-ins/common/screenshot.c:1111
+#: ../plug-ins/common/screenshot.c:1110
 msgid "Area"
 msgstr "Area"
 
-#: ../plug-ins/common/screenshot.c:1122
+#: ../plug-ins/common/screenshot.c:1121
 msgid "Take a screenshot of a single _window"
 msgstr "Take a screenshot of a single _window"
 
-#: ../plug-ins/common/screenshot.c:1141
+#: ../plug-ins/common/screenshot.c:1140
 msgid "Include window _decoration"
 msgstr "Include window _decoration"
 
-#: ../plug-ins/common/screenshot.c:1159
+#: ../plug-ins/common/screenshot.c:1158
 msgid "Take a screenshot of the entire _screen"
 msgstr "Take a screenshot of the entire _screen"
 
-#: ../plug-ins/common/screenshot.c:1178
+#: ../plug-ins/common/screenshot.c:1177
 msgid "Include _mouse pointer"
 msgstr "Include _mouse pointer"
 
-#: ../plug-ins/common/screenshot.c:1198
+#: ../plug-ins/common/screenshot.c:1197
 msgid "Select a _region to grab"
 msgstr "Select a _region to grab"
 
 #. Delay
-#: ../plug-ins/common/screenshot.c:1213
+#: ../plug-ins/common/screenshot.c:1212
 msgid "Delay"
 msgstr "Delay"
 
 #. this is the unit label of a spinbutton
-#: ../plug-ins/common/screenshot.c:1235
+#: ../plug-ins/common/screenshot.c:1234
 msgid "seconds"
 msgstr "seconds"
 
-#: ../plug-ins/common/sel_gauss.c:104
-msgid "Blur neighboring pixels, but only in low-contrast areas"
-msgstr "Blur neighbouring pixels, but only in low-contrast areas"
-
-#: ../plug-ins/common/sel_gauss.c:115
-msgid "_Selective Gaussian Blur..."
-msgstr "_Selective Gaussian Blur..."
-
-#: ../plug-ins/common/sel_gauss.c:195 ../plug-ins/common/sel_gauss.c:232
-msgid "Selective Gaussian Blur"
-msgstr "Selective Gaussian Blur"
-
-#: ../plug-ins/common/sel_gauss.c:271
-msgid "_Blur radius:"
-msgstr "_Blur radius:"
-
-#: ../plug-ins/common/sel_gauss.c:281
-msgid "_Max. delta:"
-msgstr "_Max. delta:"
-
-#: ../plug-ins/common/semiflatten.c:68
+#: ../plug-ins/common/semi-flatten.c:68
 msgid "Replace partial transparency with the current background color"
 msgstr "Replace partial transparency with the current background colour"
 
-#: ../plug-ins/common/semiflatten.c:75
+#: ../plug-ins/common/semi-flatten.c:75
 msgid "_Semi-Flatten"
 msgstr "_Semi-Flatten"
 
-#: ../plug-ins/common/semiflatten.c:118
+#: ../plug-ins/common/semi-flatten.c:118
 msgid "Semi-Flattening"
 msgstr "Semi-Flattening"
 
@@ -7121,15 +6667,15 @@ msgstr "Shifting"
 msgid "Shift"
 msgstr "Shift"
 
-#: ../plug-ins/common/shift.c:386
+#: ../plug-ins/common/shift.c:388
 msgid "Shift _horizontally"
 msgstr "Shift _horizontally"
 
-#: ../plug-ins/common/shift.c:389
+#: ../plug-ins/common/shift.c:391
 msgid "Shift _vertically"
 msgstr "Shift _vertically"
 
-#: ../plug-ins/common/shift.c:420
+#: ../plug-ins/common/shift.c:422
 msgid "Shift _amount:"
 msgstr "Shift _amount:"
 
@@ -7229,6 +6775,11 @@ msgstr "F_irst colour:"
 msgid "S_econd color:"
 msgstr "S_econd colour:"
 
+#: ../plug-ins/common/sinus.c:886
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:904
+msgid "Co_lors"
+msgstr "Co_lours"
+
 #: ../plug-ins/common/sinus.c:895
 msgid "Blend Settings"
 msgstr "Blend Settings"
@@ -7253,89 +6804,26 @@ msgstr "_Blend"
 msgid "Do _preview"
 msgstr "Do _preview"
 
-#: ../plug-ins/common/smooth_palette.c:83
+#: ../plug-ins/common/smooth-palette.c:83
 msgid "Derive a smooth color palette from the image"
 msgstr "Derive a smooth colour palette from the image"
 
-#: ../plug-ins/common/smooth_palette.c:88
+#: ../plug-ins/common/smooth-palette.c:88
 msgid "Smoo_th Palette..."
 msgstr "Smoo_th Palette..."
 
-#: ../plug-ins/common/smooth_palette.c:179
+#: ../plug-ins/common/smooth-palette.c:179
 msgid "Deriving smooth palette"
 msgstr "Deriving smooth palette"
 
-#: ../plug-ins/common/smooth_palette.c:412
+#: ../plug-ins/common/smooth-palette.c:412
 msgid "Smooth Palette"
 msgstr "Smooth Palette"
 
-#: ../plug-ins/common/smooth_palette.c:452
+#: ../plug-ins/common/smooth-palette.c:452
 msgid "_Search depth:"
 msgstr "_Search depth:"
 
-#: ../plug-ins/common/snoise.c:176
-msgid "Create a random cloud-like texture"
-msgstr "Create a random cloud-like texture"
-
-#: ../plug-ins/common/snoise.c:182
-msgid "_Solid Noise..."
-msgstr "_Solid Noise..."
-
-#. Dialog initialization
-#: ../plug-ins/common/snoise.c:315 ../plug-ins/common/snoise.c:563
-msgid "Solid Noise"
-msgstr "Solid Noise"
-
-#: ../plug-ins/common/snoise.c:614
-msgid "_Detail:"
-msgstr "_Detail:"
-
-#. Turbulent
-#: ../plug-ins/common/snoise.c:624
-msgid "T_urbulent"
-msgstr "T_urbulent"
-
-#. Tilable
-#: ../plug-ins/common/snoise.c:638
-msgid "T_ilable"
-msgstr "T_ilable"
-
-#: ../plug-ins/common/snoise.c:653
-msgid "_X size:"
-msgstr "_X size:"
-
-#: ../plug-ins/common/snoise.c:666
-msgid "_Y size:"
-msgstr "_Y size:"
-
-#: ../plug-ins/common/sobel.c:108
-msgid "Specialized direction-dependent edge detection"
-msgstr "Specialized direction-dependent edge detection"
-
-#: ../plug-ins/common/sobel.c:121
-msgid "_Sobel..."
-msgstr "_Sobel..."
-
-#: ../plug-ins/common/sobel.c:229
-msgid "Sobel Edge Detection"
-msgstr "Sobel Edge Detection"
-
-#: ../plug-ins/common/sobel.c:258
-msgid "Sobel _horizontally"
-msgstr "Sobel _horizontally"
-
-#: ../plug-ins/common/sobel.c:270
-msgid "Sobel _vertically"
-msgstr "Sobel _vertically"
-
-#: ../plug-ins/common/sobel.c:282
-msgid "_Keep sign of result (one direction only)"
-msgstr "_Keep sign of result (one direction only)"
-
-#: ../plug-ins/common/sobel.c:368
-msgid "Sobel edge detecting"
-msgstr "Sobel edge detecting"
-
 #: ../plug-ins/common/softglow.c:134
 msgid "Simulate glow by making highlights intense and fuzzy"
 msgstr "Simulate glow by making highlights intense and fuzzy"
@@ -7344,11 +6832,11 @@ msgstr "Simulate glow by making highlights intense and fuzzy"
 msgid "_Softglow..."
 msgstr "_Softglow..."
 
-#: ../plug-ins/common/softglow.c:630
+#: ../plug-ins/common/softglow.c:632
 msgid "Softglow"
 msgstr "Softglow"
 
-#: ../plug-ins/common/softglow.c:667
+#: ../plug-ins/common/softglow.c:669
 msgid "_Glow radius:"
 msgstr "_Glow radius:"
 
@@ -7492,522 +6980,370 @@ msgstr "Use the foreground colour"
 msgid "Use the background color"
 msgstr "Use the background colour"
 
-#: ../plug-ins/common/spheredesigner.c:291
+#: ../plug-ins/common/sphere-designer.c:291
 #: ../plug-ins/gimpressionist/general.c:166
 msgid "Solid"
 msgstr "Solid"
 
-#: ../plug-ins/common/spheredesigner.c:292
+#: ../plug-ins/common/sphere-designer.c:292
 msgid "Checker"
 msgstr "Checker"
 
-#: ../plug-ins/common/spheredesigner.c:293
+#: ../plug-ins/common/sphere-designer.c:293
 msgid "Marble"
 msgstr "Marble"
 
-#: ../plug-ins/common/spheredesigner.c:294
+#: ../plug-ins/common/sphere-designer.c:294
 msgid "Lizard"
 msgstr "Lizard"
 
-#: ../plug-ins/common/spheredesigner.c:295
+#: ../plug-ins/common/sphere-designer.c:295
 msgid "Phong"
 msgstr "Phong"
 
-#: ../plug-ins/common/spheredesigner.c:296
+#: ../plug-ins/common/sphere-designer.c:296 ../plug-ins/flame/flame.c:774
 msgid "Noise"
 msgstr "Noise"
 
-#: ../plug-ins/common/spheredesigner.c:297
+#: ../plug-ins/common/sphere-designer.c:297
 msgid "Wood"
 msgstr "Wood"
 
-#: ../plug-ins/common/spheredesigner.c:298
+#: ../plug-ins/common/sphere-designer.c:298 ../plug-ins/flame/flame.c:758
 msgid "Spiral"
 msgstr "Spiral"
 
-#: ../plug-ins/common/spheredesigner.c:299
+#: ../plug-ins/common/sphere-designer.c:299
 msgid "Spots"
 msgstr "Spots"
 
-#: ../plug-ins/common/spheredesigner.c:1750
-#: ../plug-ins/common/spheredesigner.c:2697
+#: ../plug-ins/common/sphere-designer.c:1742
+#: ../plug-ins/common/sphere-designer.c:2690
 msgid "Texture"
 msgstr "Texture"
 
-#: ../plug-ins/common/spheredesigner.c:1752
+#: ../plug-ins/common/sphere-designer.c:1744
 msgid "Bumpmap"
 msgstr "Bumpmap"
 
-#: ../plug-ins/common/spheredesigner.c:1754
-#: ../plug-ins/common/spheredesigner.c:2699
+#: ../plug-ins/common/sphere-designer.c:1746
+#: ../plug-ins/common/sphere-designer.c:2692
 msgid "Light"
 msgstr "Light"
 
-#: ../plug-ins/common/spheredesigner.c:2017
+#: ../plug-ins/common/sphere-designer.c:2009
 #, c-format
 msgid "File '%s' is not a valid save file."
 msgstr "File '%s' is not a valid save file."
 
-#: ../plug-ins/common/spheredesigner.c:2196
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Open File"
 msgstr "Open File"
 
-#: ../plug-ins/common/spheredesigner.c:2196
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Save File"
 msgstr "Save File"
 
-#: ../plug-ins/common/spheredesigner.c:2551
+#: ../plug-ins/common/sphere-designer.c:2544
 msgid "Sphere Designer"
 msgstr "Sphere Designer"
 
-#: ../plug-ins/common/spheredesigner.c:2682
+#: ../plug-ins/common/sphere-designer.c:2675
 msgid "Properties"
 msgstr "Properties"
 
-#: ../plug-ins/common/spheredesigner.c:2698
+#: ../plug-ins/common/sphere-designer.c:2691
 msgid "Bump"
 msgstr "Bump"
 
-#: ../plug-ins/common/spheredesigner.c:2725
+#. row labels
+#: ../plug-ins/common/sphere-designer.c:2699
+#: ../plug-ins/lighting/lighting-ui.c:405
+msgid "Type:"
+msgstr "Type:"
+
+#: ../plug-ins/common/sphere-designer.c:2718
 msgid "Texture:"
 msgstr "Texture:"
 
-#: ../plug-ins/common/spheredesigner.c:2730
+#: ../plug-ins/common/sphere-designer.c:2723
 msgid "Colors:"
 msgstr "Colours:"
 
-#: ../plug-ins/common/spheredesigner.c:2733
-#: ../plug-ins/common/spheredesigner.c:2744
+#: ../plug-ins/common/sphere-designer.c:2726
+#: ../plug-ins/common/sphere-designer.c:2737
 msgid "Color Selection Dialog"
-msgstr "Colour Selection Dialog"
+msgstr "Colour Selection Dialogue"
 
 #. Scale
-#: ../plug-ins/common/spheredesigner.c:2755
+#: ../plug-ins/common/sphere-designer.c:2748
 #: ../plug-ins/gimpressionist/paper.c:194
-#: ../plug-ins/ifscompose/ifscompose.c:553
+#: ../plug-ins/ifs-compose/ifs-compose.c:554
 msgid "Scale:"
 msgstr "Scale:"
 
-#: ../plug-ins/common/spheredesigner.c:2763
+#: ../plug-ins/common/sphere-designer.c:2756
 msgid "Turbulence:"
 msgstr "Turbulence:"
 
-#: ../plug-ins/common/spheredesigner.c:2770
+#: ../plug-ins/common/sphere-designer.c:2763
 msgid "Amount:"
 msgstr "Amount:"
 
-#: ../plug-ins/common/spheredesigner.c:2777
+#: ../plug-ins/common/sphere-designer.c:2770
 msgid "Exp.:"
 msgstr "Exp.:"
 
-#: ../plug-ins/common/spheredesigner.c:2784
+#: ../plug-ins/common/sphere-designer.c:2777
 msgid "Transformations"
 msgstr "Transformations"
 
-#: ../plug-ins/common/spheredesigner.c:2807
+#: ../plug-ins/common/sphere-designer.c:2793
+#: ../plug-ins/map-object/map-object-ui.c:1143
+msgid "Scale X:"
+msgstr "Scale X:"
+
+#: ../plug-ins/common/sphere-designer.c:2800
 msgid "Scale Y:"
 msgstr "Scale Y:"
 
-#: ../plug-ins/common/spheredesigner.c:2813
+#: ../plug-ins/common/sphere-designer.c:2806
 msgid "Scale Z:"
 msgstr "Scale Z:"
 
-#: ../plug-ins/common/spheredesigner.c:2820
+#: ../plug-ins/common/sphere-designer.c:2813
 msgid "Rotate X:"
 msgstr "Rotate X:"
 
-#: ../plug-ins/common/spheredesigner.c:2827
+#: ../plug-ins/common/sphere-designer.c:2820
 msgid "Rotate Y:"
 msgstr "Rotate Y:"
 
-#: ../plug-ins/common/spheredesigner.c:2834
+#: ../plug-ins/common/sphere-designer.c:2827
 msgid "Rotate Z:"
 msgstr "Rotate Z:"
 
-#: ../plug-ins/common/spheredesigner.c:2841
+#: ../plug-ins/common/sphere-designer.c:2834
 msgid "Position X:"
 msgstr "Position X:"
 
-#: ../plug-ins/common/spheredesigner.c:2848
+#: ../plug-ins/common/sphere-designer.c:2841
 msgid "Position Y:"
 msgstr "Position Y:"
 
-#: ../plug-ins/common/spheredesigner.c:2855
+#: ../plug-ins/common/sphere-designer.c:2848
 msgid "Position Z:"
 msgstr "Position Z:"
 
-#: ../plug-ins/common/spheredesigner.c:2970
+#: ../plug-ins/common/sphere-designer.c:2963
 msgid "Rendering sphere"
 msgstr "Rendering sphere"
 
-#: ../plug-ins/common/spheredesigner.c:3020
+#: ../plug-ins/common/sphere-designer.c:3013
 msgid "Create an image of a textured sphere"
 msgstr "Create an image of a textured sphere"
 
-#: ../plug-ins/common/spheredesigner.c:3027
+#: ../plug-ins/common/sphere-designer.c:3020
 msgid "Sphere _Designer..."
 msgstr "Sphere _Designer..."
 
-#: ../plug-ins/common/spheredesigner.c:3081
+#: ../plug-ins/common/sphere-designer.c:3080
 msgid "Region selected for plug-in is empty"
 msgstr "Region selected for plug-in is empty"
 
-#: ../plug-ins/common/spread.c:89
-msgid "Move pixels around randomly"
-msgstr "Move pixels around randomly"
-
-#: ../plug-ins/common/spread.c:98
-msgid "Sp_read..."
-msgstr "Sp_read..."
-
-#: ../plug-ins/common/spread.c:181
-msgid "Spreading"
-msgstr "Spreading"
-
-#: ../plug-ins/common/spread.c:344
-msgid "Spread"
-msgstr "Spread"
-
-#: ../plug-ins/common/spread.c:369
-msgid "Spread Amount"
-msgstr "Spread Amount"
-
-#: ../plug-ins/common/struc.c:1140
-msgid "Add a canvas texture to the image"
-msgstr "Add a canvas texture to the image"
-
-#: ../plug-ins/common/struc.c:1145
-msgid "_Apply Canvas..."
-msgstr "_Apply Canvas..."
-
-#: ../plug-ins/common/struc.c:1226
-msgid "Applying canvas"
-msgstr "Applying canvas"
-
-#: ../plug-ins/common/struc.c:1263
-msgid "Apply Canvas"
-msgstr "Apply Canvas"
-
-#: ../plug-ins/common/struc.c:1296
-msgid "_Top-right"
-msgstr "_Top-right"
-
-#: ../plug-ins/common/struc.c:1297
-msgid "Top-_left"
-msgstr "Top-_left"
-
-#: ../plug-ins/common/struc.c:1298
-msgid "_Bottom-left"
-msgstr "_Bottom-left"
-
-#: ../plug-ins/common/struc.c:1299
-msgid "Bottom-_right"
-msgstr "Bottom-_right"
-
-#: ../plug-ins/common/sunras.c:215 ../plug-ins/common/sunras.c:235
-msgid "SUN Rasterfile image"
-msgstr "SUN Rasterfile image"
-
-#: ../plug-ins/common/sunras.c:388
-#, c-format
-msgid "Could not open '%s' as SUN-raster-file"
-msgstr "Could not open '%s' as SUN-raster-file"
-
-#: ../plug-ins/common/sunras.c:396
-msgid "The type of this SUN-rasterfile is not supported"
-msgstr "The type of this SUN-rasterfile is not supported"
-
-#: ../plug-ins/common/sunras.c:425
-#, c-format
-msgid "Could not read color entries from '%s'"
-msgstr "Could not read colour entries from '%s'"
-
-#: ../plug-ins/common/sunras.c:433
-msgid "Type of colormap not supported"
-msgstr "Type of colourmap not supported"
-
-#: ../plug-ins/common/sunras.c:440 ../plug-ins/common/xbm.c:810
-#: ../plug-ins/common/xwd.c:475
-#, c-format
-msgid ""
-"'%s':\n"
-"No image width specified"
-msgstr ""
-"'%s':\n"
-"No image width specified"
-
-#: ../plug-ins/common/sunras.c:448 ../plug-ins/common/xbm.c:817
-#: ../plug-ins/common/xwd.c:484
-#, c-format
-msgid ""
-"'%s':\n"
-"Image width is larger than GIMP can handle"
-msgstr ""
-"'%s':\n"
-"Image width is larger than GIMP can handle"
-
-#: ../plug-ins/common/sunras.c:456 ../plug-ins/common/xbm.c:824
-#: ../plug-ins/common/xwd.c:492
-#, c-format
-msgid ""
-"'%s':\n"
-"No image height specified"
-msgstr ""
-"'%s':\n"
-"No image height specified"
-
-#: ../plug-ins/common/sunras.c:464 ../plug-ins/common/xbm.c:831
-#: ../plug-ins/common/xwd.c:500
-#, c-format
-msgid ""
-"'%s':\n"
-"Image height is larger than GIMP can handle"
-msgstr ""
-"'%s':\n"
-"Image height is larger than GIMP can handle"
-
-#: ../plug-ins/common/sunras.c:502
-msgid "This image depth is not supported"
-msgstr "This image depth is not supported"
-
-#: ../plug-ins/common/sunras.c:524
-msgid "SUNRAS save cannot handle images with alpha channels"
-msgstr "SUNRAS save cannot handle images with alpha channels"
-
-#: ../plug-ins/common/sunras.c:535
-msgid "Can't operate on unknown image types"
-msgstr "Can't operate on unknown image types"
-
-#: ../plug-ins/common/sunras.c:1063 ../plug-ins/common/sunras.c:1154
-#: ../plug-ins/common/sunras.c:1235 ../plug-ins/common/sunras.c:1330
-#: ../plug-ins/common/xwd.c:1332 ../plug-ins/common/xwd.c:1433
-#: ../plug-ins/common/xwd.c:1591 ../plug-ins/common/xwd.c:1791
-#: ../plug-ins/common/xwd.c:2048 ../plug-ins/fits/fits.c:678
-msgid "EOF encountered on reading"
-msgstr "EOF encountered on reading"
-
-#: ../plug-ins/common/sunras.c:1610
-msgid "Save as SUNRAS"
-msgstr "Save as SUNRAS"
-
-#. file save type
-#: ../plug-ins/common/sunras.c:1627
-msgid "Data Formatting"
-msgstr "Data Formatting"
-
-#: ../plug-ins/common/sunras.c:1631
-msgid "RunLength Encoded"
-msgstr "RunLength Encoded"
-
-#: ../plug-ins/common/svg.c:138
-msgid "SVG image"
-msgstr "SVG image"
-
-#: ../plug-ins/common/svg.c:323 ../plug-ins/common/svg.c:704
-msgid "Unknown reason"
-msgstr "Unknown reason"
-
-#: ../plug-ins/common/svg.c:327
-msgid "Rendering SVG"
-msgstr "Rendering SVG"
-
-#: ../plug-ins/common/svg.c:339
-msgid "Rendered SVG"
-msgstr "Rendered SVG"
-
-#: ../plug-ins/common/svg.c:553 ../plug-ins/common/wmf.c:349
-#, c-format
-msgid "%d × %d"
-msgstr "%d × %d"
-
-#: ../plug-ins/common/svg.c:561
-msgid ""
-"SVG file does not\n"
-"specify a size!"
-msgstr ""
-"SVG file does not\n"
-"specify a size!"
-
-#. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/svg.c:711
-msgid "Render Scalable Vector Graphics"
-msgstr "Render Scalable Vector Graphics"
-
-#: ../plug-ins/common/svg.c:783 ../plug-ins/common/wmf.c:568
-msgid "Height:"
-msgstr "Height:"
-
-#: ../plug-ins/common/svg.c:857 ../plug-ins/common/wmf.c:642
-msgid "_X ratio:"
-msgstr "_X ratio:"
-
-#: ../plug-ins/common/svg.c:879 ../plug-ins/common/wmf.c:664
-msgid "_Y ratio:"
-msgstr "_Y ratio:"
-
-#: ../plug-ins/common/svg.c:893 ../plug-ins/common/wmf.c:678
-msgid "Constrain aspect ratio"
-msgstr "Constrain aspect ratio"
-
-#: ../plug-ins/common/svg.c:904 ../plug-ins/common/wmf.c:689
-#: ../plug-ins/print/print-page-layout.c:273
-#, c-format
-msgid "pixels/%a"
-msgstr "pixels/%a"
-
-#. Path Import
-#: ../plug-ins/common/svg.c:924
-msgid "Import _paths"
-msgstr "Import _paths"
-
-#: ../plug-ins/common/svg.c:930
-msgid ""
-"Import path elements of the SVG so they can be used with the GIMP path tool"
-msgstr ""
-"Import path elements of the SVG so they can be used with the GIMP path tool"
-
-#: ../plug-ins/common/svg.c:943
-msgid "Merge imported paths"
-msgstr "Merge imported paths"
-
-#: ../plug-ins/common/tga.c:238 ../plug-ins/common/tga.c:257
-msgid "TarGA image"
-msgstr "TarGA image"
-
-#: ../plug-ins/common/tga.c:434
-#, c-format
-msgid "Cannot read footer from '%s'"
-msgstr "Cannot read footer from '%s'"
-
-#: ../plug-ins/common/tga.c:450
-#, c-format
-msgid "Cannot read extension from '%s'"
-msgstr "Cannot read extension from '%s'"
-
-#: ../plug-ins/common/tga.c:1323
-msgid "Save as TGA"
-msgstr "Save as TGA"
-
-#. rle
-#: ../plug-ins/common/tga.c:1346
-msgid "_RLE compression"
-msgstr "_RLE compression"
-
-#. origin
-#: ../plug-ins/common/tga.c:1356
-msgid "Or_igin at bottom left"
-msgstr "Or_igin at bottom left"
-
-#: ../plug-ins/common/threshold_alpha.c:85
+#: ../plug-ins/common/threshold-alpha.c:85
 msgid "Make transparency all-or-nothing"
 msgstr "Make transparency all-or-nothing"
 
-#: ../plug-ins/common/threshold_alpha.c:90
+#: ../plug-ins/common/threshold-alpha.c:90
 msgid "_Threshold Alpha..."
 msgstr "_Threshold Alpha..."
 
-#: ../plug-ins/common/threshold_alpha.c:131
+#: ../plug-ins/common/threshold-alpha.c:131
 msgid "The layer has its alpha channel locked."
 msgstr "The layer has its alpha channel locked."
 
-#: ../plug-ins/common/threshold_alpha.c:137
+#: ../plug-ins/common/threshold-alpha.c:137
 msgid "RGBA/GRAYA drawable is not selected."
 msgstr "RGBA/GREYA drawable is not selected."
 
-#: ../plug-ins/common/threshold_alpha.c:165
+#: ../plug-ins/common/threshold-alpha.c:165
 msgid "Coloring transparency"
 msgstr "Colouring transparency"
 
-#: ../plug-ins/common/threshold_alpha.c:248
+#: ../plug-ins/common/threshold-alpha.c:248
 msgid "Threshold Alpha"
 msgstr "Threshold Alpha"
 
-#: ../plug-ins/common/threshold_alpha.c:283
+#: ../plug-ins/common/threshold-alpha.c:283
 msgid "Threshold:"
 msgstr "Threshold:"
 
-#: ../plug-ins/common/tiff-load.c:239 ../plug-ins/common/tiff-save.c:181
-#: ../plug-ins/common/tiff-save.c:198
-msgid "TIFF image"
-msgstr "TIFF image"
+#: ../plug-ins/common/tile-glass.c:124
+msgid "Simulate distortion caused by square glass tiles"
+msgstr "Simulate distortion caused by square glass tiles"
 
-#: ../plug-ins/common/tiff-load.c:305
-#, c-format
-msgid "TIFF '%s' does not contain any directories"
-msgstr "TIFF '%s' does not contain any directories"
+#: ../plug-ins/common/tile-glass.c:130
+msgid "_Glass Tile..."
+msgstr "_Glass Tile..."
 
-#: ../plug-ins/common/tiff-load.c:446
-msgid "Import from TIFF"
-msgstr "Import from TIFF"
+#: ../plug-ins/common/tile-glass.c:210 ../plug-ins/common/tile-glass.c:250
+msgid "Glass Tile"
+msgstr "Glass Tile"
 
-#: ../plug-ins/common/tiff-load.c:970
-msgid "TIFF Channel"
-msgstr "TIFF Channel"
+#: ../plug-ins/common/tile-glass.c:289
+msgid "Tile _width:"
+msgstr "Tile _width:"
 
-#: ../plug-ins/common/tiff-load.c:979
-msgid ""
-"Warning:\n"
-"The image you are loading has 16 bits per channel. GIMP can only handle 8 "
-"bit, so it will be converted for you. Information will be lost because of "
-"this conversion."
-msgstr ""
-"Warning:\n"
-"The image you are loading has 16 bits per channel. GIMP can only handle 8 "
-"bit, so it will be converted for you. Information will be lost because of "
-"this conversion."
+#: ../plug-ins/common/tile-paper.c:243 ../plug-ins/common/tile-paper.c:556
+msgid "Paper Tile"
+msgstr "Paper Tile"
 
-#: ../plug-ins/common/tiff-save.c:873
-msgid ""
-"The TIFF format only supports comments in\n"
-"7bit ASCII encoding. No comment is saved."
-msgstr ""
-"The TIFF format only supports comments in\n"
-"7bit ASCII encoding. No comment is saved."
+#: ../plug-ins/common/tile-paper.c:269
+msgid "Division"
+msgstr "Division"
 
-#: ../plug-ins/common/tiff-save.c:1047
-msgid "Save as TIFF"
-msgstr "Save as TIFF"
+#: ../plug-ins/common/tile-paper.c:319
+msgid "Fractional Pixels"
+msgstr "Fractional Pixels"
 
-#. compression
-#: ../plug-ins/common/tiff-save.c:1069
-msgid "Compression"
-msgstr "Compression"
+#: ../plug-ins/common/tile-paper.c:324
+msgid "_Background"
+msgstr "_Background"
 
-#: ../plug-ins/common/tiff-save.c:1073
-msgid "_None"
-msgstr "_None"
+#: ../plug-ins/common/tile-paper.c:326
+msgid "_Ignore"
+msgstr "_Ignore"
 
-#: ../plug-ins/common/tiff-save.c:1074
-msgid "_LZW"
-msgstr "_LZW"
+#: ../plug-ins/common/tile-paper.c:328
+msgid "_Force"
+msgstr "_Force"
 
-#: ../plug-ins/common/tiff-save.c:1075
-msgid "_Pack Bits"
-msgstr "_Pack Bits"
+#: ../plug-ins/common/tile-paper.c:335
+msgid "C_entering"
+msgstr "C_entring"
 
-#: ../plug-ins/common/tiff-save.c:1076
-msgid "_Deflate"
-msgstr "_Deflate"
+#: ../plug-ins/common/tile-paper.c:350
+msgid "Movement"
+msgstr "Movement"
 
-#: ../plug-ins/common/tiff-save.c:1077
-msgid "_JPEG"
-msgstr "_JPEG"
+#: ../plug-ins/common/tile-paper.c:363
+msgid "_Max (%):"
+msgstr "_Max (%):"
 
-#: ../plug-ins/common/tiff-save.c:1078
-msgid "CCITT Group _3 fax"
-msgstr "CCITT Group _3 fax"
+#: ../plug-ins/common/tile-paper.c:369
+msgid "_Wrap around"
+msgstr "_Wrap around"
 
-#: ../plug-ins/common/tiff-save.c:1079
-msgid "CCITT Group _4 fax"
-msgstr "CCITT Group _4 fax"
+#: ../plug-ins/common/tile-paper.c:379
+msgid "Background Type"
+msgstr "Background Type"
 
-#: ../plug-ins/common/tiff-save.c:1101
-msgid "Save _color values from transparent pixels"
-msgstr "Save _colour values from transparent pixels"
+#: ../plug-ins/common/tile-paper.c:386
+msgid "I_nverted image"
+msgstr "I_nverted image"
 
-#: ../plug-ins/common/tiff-save.c:1117 ../plug-ins/common/xbm.c:1227
-msgid "Comment:"
-msgstr "Comment:"
+#: ../plug-ins/common/tile-paper.c:388
+msgid "Im_age"
+msgstr "Im_age"
+
+#: ../plug-ins/common/tile-paper.c:390
+msgid "Fo_reground color"
+msgstr "Fo_reground colour"
+
+#: ../plug-ins/common/tile-paper.c:392
+msgid "Bac_kground color"
+msgstr "Bac_kground colour"
+
+#: ../plug-ins/common/tile-paper.c:394
+msgid "S_elect here:"
+msgstr "S_elect here:"
+
+#: ../plug-ins/common/tile-paper.c:401
+msgid "Background Color"
+msgstr "Background Colour"
+
+#: ../plug-ins/common/tile-paper.c:846
+msgid "Cut image into paper tiles, and slide them"
+msgstr "Cut image into paper tiles, and slide them"
+
+#: ../plug-ins/common/tile-paper.c:851
+msgid "September 31, 1999"
+msgstr "September 31, 1999"
+
+#: ../plug-ins/common/tile-paper.c:852
+msgid "_Paper Tile..."
+msgstr "_Paper Tile..."
+
+#: ../plug-ins/common/tile-seamless.c:67
+msgid "Alters edges to make the image seamlessly tileable"
+msgstr "Alters edges to make the image seamlessly tileable"
+
+#: ../plug-ins/common/tile-seamless.c:73
+msgid "_Make Seamless"
+msgstr "_Make Seamless"
+
+#: ../plug-ins/common/tile-seamless.c:338
+msgid "Tiler"
+msgstr "Tiler"
+
+#: ../plug-ins/common/tile-small.c:215
+msgid "Tile image into smaller versions of the original"
+msgstr "Tile image into smaller versions of the original"
+
+#: ../plug-ins/common/tile-small.c:220
+msgid "_Small Tiles..."
+msgstr "_Small Tiles..."
+
+#: ../plug-ins/common/tile-small.c:263
+msgid "Region selected for filter is empty."
+msgstr "Region selected for filter is empty."
+
+#. Set the tile cache size
+#: ../plug-ins/common/tile-small.c:321 ../plug-ins/common/tile.c:190
+msgid "Tiling"
+msgstr "Tiling"
+
+#. Get the preview image
+#: ../plug-ins/common/tile-small.c:364
+msgid "Small Tiles"
+msgstr "Small Tiles"
+
+#. Area for buttons etc
+#. Flip
+#: ../plug-ins/common/tile-small.c:414
+#: ../plug-ins/ifs-compose/ifs-compose.c:610
+msgid "Flip"
+msgstr "Flip"
+
+#: ../plug-ins/common/tile-small.c:462
+msgid "A_ll tiles"
+msgstr "A_ll tiles"
+
+#: ../plug-ins/common/tile-small.c:476
+msgid "Al_ternate tiles"
+msgstr "Al_ternate tiles"
+
+#: ../plug-ins/common/tile-small.c:490
+msgid "_Explicit tile"
+msgstr "_Explicit tile"
+
+#: ../plug-ins/common/tile-small.c:496
+msgid "Ro_w:"
+msgstr "Ro_w:"
+
+#: ../plug-ins/common/tile-small.c:520
+msgid "Col_umn:"
+msgstr "Col_umn:"
+
+#: ../plug-ins/common/tile-small.c:572
+msgid "O_pacity:"
+msgstr "O_pacity:"
+
+#. Lower frame saying howmany segments
+#: ../plug-ins/common/tile-small.c:581
+msgid "Number of Segments"
+msgstr "Number of Segments"
 
 #: ../plug-ins/common/tile.c:101
 msgid "Create an array of copies of the image"
@@ -8017,11 +7353,6 @@ msgstr "Create an array of copies of the image"
 msgid "_Tile..."
 msgstr "_Tile..."
 
-#. Set the tile cache size
-#: ../plug-ins/common/tile.c:190 ../plug-ins/common/tileit.c:321
-msgid "Tiling"
-msgstr "Tiling"
-
 #: ../plug-ins/common/tile.c:401
 msgid "Tile"
 msgstr "Tile"
@@ -8034,75 +7365,11 @@ msgstr "Tile to New Size"
 msgid "C_reate new image"
 msgstr "C_reate new image"
 
-#: ../plug-ins/common/tileit.c:215
-msgid "Tile image into smaller versions of the original"
-msgstr "Tile image into smaller versions of the original"
-
-#: ../plug-ins/common/tileit.c:220
-msgid "_Small Tiles..."
-msgstr "_Small Tiles..."
-
-#: ../plug-ins/common/tileit.c:263
-msgid "Region selected for filter is empty."
-msgstr "Region selected for filter is empty."
-
-#. Get the preview image
-#: ../plug-ins/common/tileit.c:364
-msgid "Small Tiles"
-msgstr "Small Tiles"
-
-#. Area for buttons etc
-#. Flip
-#: ../plug-ins/common/tileit.c:414 ../plug-ins/ifscompose/ifscompose.c:609
-msgid "Flip"
-msgstr "Flip"
-
-#: ../plug-ins/common/tileit.c:462
-msgid "A_ll tiles"
-msgstr "A_ll tiles"
-
-#: ../plug-ins/common/tileit.c:476
-msgid "Al_ternate tiles"
-msgstr "Al_ternate tiles"
-
-#: ../plug-ins/common/tileit.c:490
-msgid "_Explicit tile"
-msgstr "_Explicit tile"
-
-#: ../plug-ins/common/tileit.c:496
-msgid "Ro_w:"
-msgstr "Ro_w:"
-
-#: ../plug-ins/common/tileit.c:520
-msgid "Col_umn:"
-msgstr "Col_umn:"
-
-#: ../plug-ins/common/tileit.c:572
-msgid "O_pacity:"
-msgstr "O_pacity:"
-
-#. Lower frame saying howmany segments
-#: ../plug-ins/common/tileit.c:581
-msgid "Number of Segments"
-msgstr "Number of Segments"
-
-#: ../plug-ins/common/tiler.c:67
-msgid "Alters edges to make the image seamlessly tileable"
-msgstr "Alters edges to make the image seamlessly tileable"
-
-#: ../plug-ins/common/tiler.c:73
-msgid "_Make Seamless"
-msgstr "_Make Seamless"
-
-#: ../plug-ins/common/tiler.c:338
-msgid "Tiler"
-msgstr "Tiler"
-
-#: ../plug-ins/common/uniteditor.c:94
+#: ../plug-ins/common/unit-editor.c:94
 msgid "Saved"
 msgstr "Saved"
 
-#: ../plug-ins/common/uniteditor.c:94
+#: ../plug-ins/common/unit-editor.c:94
 msgid ""
 "A unit definition will only be saved before GIMP exits if this column is "
 "checked."
@@ -8110,29 +7377,29 @@ msgstr ""
 "A unit definition will only be saved before GIMP exits if this column is "
 "checked."
 
-#: ../plug-ins/common/uniteditor.c:96
+#: ../plug-ins/common/unit-editor.c:96
 msgid "ID"
 msgstr "ID"
 
-#: ../plug-ins/common/uniteditor.c:96
+#: ../plug-ins/common/unit-editor.c:96
 msgid ""
 "This string will be used to identify a unit in GIMP's configuration files."
 msgstr ""
 "This string will be used to identify a unit in GIMP's configuration files."
 
-#: ../plug-ins/common/uniteditor.c:98
+#: ../plug-ins/common/unit-editor.c:98
 msgid "Factor"
 msgstr "Factor"
 
-#: ../plug-ins/common/uniteditor.c:98
+#: ../plug-ins/common/unit-editor.c:98
 msgid "How many units make up an inch."
 msgstr "How many units make up an inch."
 
-#: ../plug-ins/common/uniteditor.c:99
+#: ../plug-ins/common/unit-editor.c:99
 msgid "Digits"
 msgstr "Digits"
 
-#: ../plug-ins/common/uniteditor.c:99
+#: ../plug-ins/common/unit-editor.c:99
 msgid ""
 "This field is a hint for numerical input fields. It specifies how many "
 "decimal digits the input field should provide to get approximately the same "
@@ -8142,11 +7409,11 @@ msgstr ""
 "decimal digits the input field should provide to get approximately the same "
 "accuracy as an \"inch\" input field with two decimal digits."
 
-#: ../plug-ins/common/uniteditor.c:104
+#: ../plug-ins/common/unit-editor.c:104
 msgid "Symbol"
 msgstr "Symbol"
 
-#: ../plug-ins/common/uniteditor.c:104
+#: ../plug-ins/common/unit-editor.c:104
 msgid ""
 "The unit's symbol if it has one (e.g. \"'\" for inches). The unit's "
 "abbreviation is used if doesn't have a symbol."
@@ -8154,280 +7421,349 @@ msgstr ""
 "The unit's symbol if it has one (e.g. \"'\" for inches). The unit's "
 "abbreviation is used if doesn't have a symbol."
 
-#: ../plug-ins/common/uniteditor.c:107
+#: ../plug-ins/common/unit-editor.c:107
 msgid "Abbreviation"
 msgstr "Abbreviation"
 
-#: ../plug-ins/common/uniteditor.c:107
+#: ../plug-ins/common/unit-editor.c:107
 msgid "The unit's abbreviation (e.g. \"cm\" for centimeters)."
 msgstr "The unit's abbreviation (e.g. \"cm\" for centimeters)."
 
-#: ../plug-ins/common/uniteditor.c:109
+#: ../plug-ins/common/unit-editor.c:109
 msgid "Singular"
 msgstr "Singular"
 
-#: ../plug-ins/common/uniteditor.c:109
+#: ../plug-ins/common/unit-editor.c:109
 msgid "The unit's singular form."
 msgstr "The unit's singular form."
 
-#: ../plug-ins/common/uniteditor.c:110
+#: ../plug-ins/common/unit-editor.c:110
 msgid "Plural"
 msgstr "Plural"
 
-#: ../plug-ins/common/uniteditor.c:110
+#: ../plug-ins/common/unit-editor.c:110
 msgid "The unit's plural form."
 msgstr "The unit's plural form."
 
-#: ../plug-ins/common/uniteditor.c:121
+#: ../plug-ins/common/unit-editor.c:121
 msgid "Create a new unit from scratch"
 msgstr "Create a new unit from scratch"
 
-#: ../plug-ins/common/uniteditor.c:127
+#: ../plug-ins/common/unit-editor.c:127
 msgid "Create a new unit using the currently selected unit as template"
 msgstr "Create a new unit using the currently selected unit as template"
 
-#: ../plug-ins/common/uniteditor.c:145
+#: ../plug-ins/common/unit-editor.c:145
 msgid "Create or alter units used in GIMP"
 msgstr "Create or alter units used in GIMP"
 
-#: ../plug-ins/common/uniteditor.c:150
+#: ../plug-ins/common/unit-editor.c:150
 msgid "U_nits"
 msgstr "U_nits"
 
-#: ../plug-ins/common/uniteditor.c:209
+#: ../plug-ins/common/unit-editor.c:208
 msgid "Add a New Unit"
 msgstr "Add a New Unit"
 
-#: ../plug-ins/common/uniteditor.c:238
+#: ../plug-ins/common/unit-editor.c:237
 msgid "_ID:"
 msgstr "_ID:"
 
-#: ../plug-ins/common/uniteditor.c:249
+#: ../plug-ins/common/unit-editor.c:248
 msgid "_Factor:"
 msgstr "_Factor:"
 
-#: ../plug-ins/common/uniteditor.c:259
+#: ../plug-ins/common/unit-editor.c:258
 msgid "_Digits:"
 msgstr "_Digits:"
 
-#: ../plug-ins/common/uniteditor.c:271
+#: ../plug-ins/common/unit-editor.c:270
 msgid "_Symbol:"
 msgstr "_Symbol:"
 
-#: ../plug-ins/common/uniteditor.c:283
+#: ../plug-ins/common/unit-editor.c:282
 msgid "_Abbreviation:"
 msgstr "_Abbreviation:"
 
-#: ../plug-ins/common/uniteditor.c:295
+#: ../plug-ins/common/unit-editor.c:294
 msgid "Si_ngular:"
 msgstr "Si_ngular:"
 
-#: ../plug-ins/common/uniteditor.c:307
+#: ../plug-ins/common/unit-editor.c:306
 msgid "_Plural:"
 msgstr "_Plural:"
 
-#: ../plug-ins/common/uniteditor.c:350
+#: ../plug-ins/common/unit-editor.c:349
 msgid "Incomplete input"
 msgstr "Incomplete input"
 
-#: ../plug-ins/common/uniteditor.c:353
+#: ../plug-ins/common/unit-editor.c:352
 msgid "Please fill in all text fields."
 msgstr "Please fill in all text fields."
 
-#: ../plug-ins/common/uniteditor.c:410
+#: ../plug-ins/common/unit-editor.c:409
 msgid "Unit Editor"
 msgstr "Unit Editor"
 
-#: ../plug-ins/common/unsharp.c:128
+#: ../plug-ins/common/unsharp-mask.c:128
 msgid "The most widely useful method for sharpening an image"
 msgstr "The most widely useful method for sharpening an image"
 
-#: ../plug-ins/common/unsharp.c:138
+#: ../plug-ins/common/unsharp-mask.c:138
 msgid "_Unsharp Mask..."
 msgstr "_Unsharp Mask..."
 
-#: ../plug-ins/common/unsharp.c:475
+#: ../plug-ins/common/unsharp-mask.c:475
 msgid "Merging"
 msgstr "Merging"
 
-#: ../plug-ins/common/unsharp.c:642
+#: ../plug-ins/common/unsharp-mask.c:644
 msgid "Unsharp Mask"
 msgstr "Unsharp Mask"
 
-#: ../plug-ins/common/video.c:41
-msgid "_Staggered"
-msgstr "_Staggered"
-
-#: ../plug-ins/common/video.c:42
-msgid "_Large staggered"
-msgstr "_Large staggered"
-
-#: ../plug-ins/common/video.c:43
-msgid "S_triped"
-msgstr "S_triped"
-
-#: ../plug-ins/common/video.c:44
-msgid "_Wide-striped"
-msgstr "_Wide-striped"
-
-#: ../plug-ins/common/video.c:45
-msgid "Lo_ng-staggered"
-msgstr "Lo_ng-staggered"
-
-#: ../plug-ins/common/video.c:46
-msgid "_3x3"
-msgstr "_3x3"
-
-#: ../plug-ins/common/video.c:47
-msgid "Larg_e 3x3"
-msgstr "Larg_e 3x3"
-
-#: ../plug-ins/common/video.c:48
-msgid "_Hex"
-msgstr "_Hex"
-
-#: ../plug-ins/common/video.c:49
-msgid "_Dots"
-msgstr "_Dots"
-
-#: ../plug-ins/common/video.c:1806
-msgid "Simulate distortion produced by a fuzzy or low-res monitor"
-msgstr "Simulate distortion produced by a fuzzy or low-res monitor"
-
-#: ../plug-ins/common/video.c:1813
-msgid "Vi_deo..."
-msgstr "Vi_deo..."
-
-#: ../plug-ins/common/video.c:1885 ../plug-ins/common/video.c:2016
-msgid "Video"
-msgstr "Video"
-
-#. frame for the radio buttons
-#: ../plug-ins/common/video.c:2038
-msgid "Video Pattern"
-msgstr "Video Pattern"
-
-#: ../plug-ins/common/video.c:2082
-msgid "_Additive"
-msgstr "_Additive"
-
-#: ../plug-ins/common/video.c:2092
-msgid "_Rotated"
-msgstr "_Rotated"
-
-#: ../plug-ins/common/vinvert.c:90
+#: ../plug-ins/common/value-invert.c:90
 msgid "Invert the brightness of each pixel"
 msgstr "Invert the brightness of each pixel"
 
-#: ../plug-ins/common/vinvert.c:104
+#: ../plug-ins/common/value-invert.c:104
 msgid "_Value Invert"
 msgstr "_Value Invert"
 
-#: ../plug-ins/common/vinvert.c:191
+#: ../plug-ins/common/value-invert.c:191
 msgid "Value Invert"
 msgstr "Value Invert"
 
-#: ../plug-ins/common/vpropagate.c:189
+#: ../plug-ins/common/value-propagate.c:189
 msgid "More _white (larger value)"
 msgstr "More _white (larger value)"
 
-#: ../plug-ins/common/vpropagate.c:192
+#: ../plug-ins/common/value-propagate.c:192
 msgid "More blac_k (smaller value)"
 msgstr "More blac_k (smaller value)"
 
-#: ../plug-ins/common/vpropagate.c:195
+#: ../plug-ins/common/value-propagate.c:195
 msgid "_Middle value to peaks"
 msgstr "_Middle value to peaks"
 
-#: ../plug-ins/common/vpropagate.c:198
+#: ../plug-ins/common/value-propagate.c:198
 msgid "_Foreground to peaks"
 msgstr "_Foreground to peaks"
 
-#: ../plug-ins/common/vpropagate.c:201
+#: ../plug-ins/common/value-propagate.c:201
 msgid "O_nly foreground"
 msgstr "O_nly foreground"
 
-#: ../plug-ins/common/vpropagate.c:204
+#: ../plug-ins/common/value-propagate.c:204
 msgid "Only b_ackground"
 msgstr "Only b_ackground"
 
-#: ../plug-ins/common/vpropagate.c:207
+#: ../plug-ins/common/value-propagate.c:207
 msgid "Mor_e opaque"
 msgstr "Mor_e opaque"
 
-#: ../plug-ins/common/vpropagate.c:210
+#: ../plug-ins/common/value-propagate.c:210
 msgid "More t_ransparent"
 msgstr "More t_ransparent"
 
-#: ../plug-ins/common/vpropagate.c:233
+#: ../plug-ins/common/value-propagate.c:233
 msgid "Propagate certain colors to neighboring pixels"
 msgstr "Propagate certain colours to neighboring pixels"
 
-#: ../plug-ins/common/vpropagate.c:238
+#: ../plug-ins/common/value-propagate.c:238
 msgid "_Value Propagate..."
 msgstr "_Value Propagate..."
 
-#: ../plug-ins/common/vpropagate.c:245
+#: ../plug-ins/common/value-propagate.c:245
 msgid "Shrink lighter areas of the image"
 msgstr "Shrink lighter areas of the image"
 
-#: ../plug-ins/common/vpropagate.c:250
+#: ../plug-ins/common/value-propagate.c:250
 msgid "E_rode"
 msgstr "E_rode"
 
-#: ../plug-ins/common/vpropagate.c:257
+#: ../plug-ins/common/value-propagate.c:257
 msgid "Grow lighter areas of the image"
 msgstr "Grow lighter areas of the image"
 
-#: ../plug-ins/common/vpropagate.c:262
+#: ../plug-ins/common/value-propagate.c:262
 msgid "_Dilate"
 msgstr "_Dilate"
 
-#: ../plug-ins/common/vpropagate.c:473 ../plug-ins/common/vpropagate.c:1063
+#: ../plug-ins/common/value-propagate.c:473
+#: ../plug-ins/common/value-propagate.c:1086
 msgid "Value Propagate"
 msgstr "Value Propagate"
 
 #. Parameter settings
-#: ../plug-ins/common/vpropagate.c:1128
+#: ../plug-ins/common/value-propagate.c:1152
 msgid "Propagate"
 msgstr "Propagate"
 
-#: ../plug-ins/common/vpropagate.c:1141
+#: ../plug-ins/common/value-propagate.c:1165
 msgid "Lower t_hreshold:"
 msgstr "Lower t_hreshold:"
 
-#: ../plug-ins/common/vpropagate.c:1153
+#: ../plug-ins/common/value-propagate.c:1177
 msgid "_Upper threshold:"
 msgstr "_Upper threshold:"
 
-#: ../plug-ins/common/vpropagate.c:1165
+#: ../plug-ins/common/value-propagate.c:1189
 msgid "_Propagating rate:"
 msgstr "_Propagating rate:"
 
-#: ../plug-ins/common/vpropagate.c:1176
+#: ../plug-ins/common/value-propagate.c:1200
 msgid "To l_eft"
 msgstr "To l_eft"
 
-#: ../plug-ins/common/vpropagate.c:1179
+#: ../plug-ins/common/value-propagate.c:1203
 msgid "To _right"
 msgstr "To _right"
 
-#: ../plug-ins/common/vpropagate.c:1182
+#: ../plug-ins/common/value-propagate.c:1206
 msgid "To _top"
 msgstr "To _top"
 
-#: ../plug-ins/common/vpropagate.c:1185
+#: ../plug-ins/common/value-propagate.c:1209
 msgid "To _bottom"
 msgstr "To _bottom"
 
-#: ../plug-ins/common/vpropagate.c:1194
+#: ../plug-ins/common/value-propagate.c:1218
 msgid "Propagating _alpha channel"
 msgstr "Propagating _alpha channel"
 
-#: ../plug-ins/common/vpropagate.c:1205
+#: ../plug-ins/common/value-propagate.c:1229
 msgid "Propagating value channel"
 msgstr "Propagating value channel"
 
+#: ../plug-ins/common/van-gogh-lic.c:566 ../plug-ins/common/van-gogh-lic.c:641
+msgid "Van Gogh (LIC)"
+msgstr "Van Gogh (LIC)"
+
+#: ../plug-ins/common/van-gogh-lic.c:666
+msgid "Effect Channel"
+msgstr "Effect Channel"
+
+#: ../plug-ins/common/van-gogh-lic.c:673
+msgid "_Brightness"
+msgstr "_Brightness"
+
+#: ../plug-ins/common/van-gogh-lic.c:679
+msgid "Effect Operator"
+msgstr "Effect Operator"
+
+#: ../plug-ins/common/van-gogh-lic.c:684
+msgid "_Derivative"
+msgstr "_Derivative"
+
+#: ../plug-ins/common/van-gogh-lic.c:685
+msgid "_Gradient"
+msgstr "_Gradient"
+
+#: ../plug-ins/common/van-gogh-lic.c:691
+msgid "Convolve"
+msgstr "Convolve"
+
+#: ../plug-ins/common/van-gogh-lic.c:696
+msgid "_With white noise"
+msgstr "_With white noise"
+
+#: ../plug-ins/common/van-gogh-lic.c:697
+msgid "W_ith source image"
+msgstr "W_ith source image"
+
+#: ../plug-ins/common/van-gogh-lic.c:716
+msgid "_Effect image:"
+msgstr "_Effect image:"
+
+#: ../plug-ins/common/van-gogh-lic.c:727
+msgid "_Filter length:"
+msgstr "_Filter length:"
+
+#: ../plug-ins/common/van-gogh-lic.c:736
+msgid "_Noise magnitude:"
+msgstr "_Noise magnitude:"
+
+#: ../plug-ins/common/van-gogh-lic.c:745
+msgid "In_tegration steps:"
+msgstr "In_tegration steps:"
+
+#: ../plug-ins/common/van-gogh-lic.c:754
+msgid "_Minimum value:"
+msgstr "_Minimum value:"
+
+#: ../plug-ins/common/van-gogh-lic.c:763
+msgid "M_aximum value:"
+msgstr "M_aximum value:"
+
+#: ../plug-ins/common/van-gogh-lic.c:809
+msgid "Special effects that nobody understands"
+msgstr "Special effects that nobody understands"
+
+#: ../plug-ins/common/van-gogh-lic.c:814
+msgid "_Van Gogh (LIC)..."
+msgstr "_Van Gogh (LIC)..."
+
+#: ../plug-ins/common/video.c:42
+msgid "_Staggered"
+msgstr "_Staggered"
+
+#: ../plug-ins/common/video.c:43
+msgid "_Large staggered"
+msgstr "_Large staggered"
+
+#: ../plug-ins/common/video.c:44
+msgid "S_triped"
+msgstr "S_triped"
+
+#: ../plug-ins/common/video.c:45
+msgid "_Wide-striped"
+msgstr "_Wide-striped"
+
+#: ../plug-ins/common/video.c:46
+msgid "Lo_ng-staggered"
+msgstr "Lo_ng-staggered"
+
+#: ../plug-ins/common/video.c:47
+msgid "_3x3"
+msgstr "_3x3"
+
+#: ../plug-ins/common/video.c:48
+msgid "Larg_e 3x3"
+msgstr "Larg_e 3x3"
+
+#: ../plug-ins/common/video.c:49
+msgid "_Hex"
+msgstr "_Hex"
+
+#: ../plug-ins/common/video.c:50
+msgid "_Dots"
+msgstr "_Dots"
+
+#: ../plug-ins/common/video.c:1807
+msgid "Simulate distortion produced by a fuzzy or low-res monitor"
+msgstr "Simulate distortion produced by a fuzzy or low-res monitor"
+
+#: ../plug-ins/common/video.c:1814
+msgid "Vi_deo..."
+msgstr "Vi_deo..."
+
+#: ../plug-ins/common/video.c:1886 ../plug-ins/common/video.c:2017
+msgid "Video"
+msgstr "Video"
+
+#. frame for the radio buttons
+#: ../plug-ins/common/video.c:2039
+msgid "Video Pattern"
+msgstr "Video Pattern"
+
+#: ../plug-ins/common/video.c:2083
+msgid "_Additive"
+msgstr "_Additive"
+
+#: ../plug-ins/common/video.c:2093
+msgid "_Rotated"
+msgstr "_Rotated"
+
 #: ../plug-ins/common/warp.c:233
 msgid "Twist or smear image in many different ways"
 msgstr "Twist or smear image in many different ways"
@@ -8448,6 +7784,12 @@ msgstr "Basic Options"
 msgid "Step size:"
 msgstr "Step size:"
 
+#: ../plug-ins/common/warp.c:433
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:770
+#: ../plug-ins/ifs-compose/ifs-compose.c:1212
+msgid "Iterations:"
+msgstr "Iterations:"
+
 #. Displacement map menu
 #: ../plug-ins/common/warp.c:442
 msgid "Displacement map:"
@@ -8467,8 +7809,8 @@ msgstr "Wrap"
 msgid "Smear"
 msgstr "Smear"
 
-#: ../plug-ins/common/warp.c:501 ../plug-ins/fits/fits.c:1002
-#: ../plug-ins/flame/flame.c:1151 ../plug-ins/gfig/gfig-dialog.c:1460
+#: ../plug-ins/common/warp.c:501 ../plug-ins/file-fits/fits.c:1021
+#: ../plug-ins/flame/flame.c:1175 ../plug-ins/gfig/gfig-dialog.c:1460
 msgid "Black"
 msgstr "Black"
 
@@ -8522,7 +7864,7 @@ msgid "Vector mag:"
 msgstr "Vector mag:"
 
 #. Angle
-#: ../plug-ins/common/warp.c:683 ../plug-ins/ifscompose/ifscompose.c:567
+#: ../plug-ins/common/warp.c:683 ../plug-ins/ifs-compose/ifs-compose.c:568
 msgid "Angle:"
 msgstr "Angle:"
 
@@ -8557,81 +7899,88 @@ msgstr "Distort the image with waves"
 msgid "_Waves..."
 msgstr "_Waves..."
 
-#: ../plug-ins/common/waves.c:248
+#: ../plug-ins/common/waves.c:248 ../plug-ins/flame/flame.c:763
 msgid "Waves"
 msgstr "Waves"
 
-#: ../plug-ins/common/waves.c:293
+#: ../plug-ins/common/waves.c:294
 msgid "_Reflective"
 msgstr "_Reflective"
 
-#: ../plug-ins/common/waves.c:312
+#: ../plug-ins/common/waves.c:313
 msgid "_Amplitude:"
 msgstr "_Amplitude:"
 
-#: ../plug-ins/common/waves.c:324
+#: ../plug-ins/common/waves.c:325
 msgid "_Phase:"
 msgstr "_Phase:"
 
-#: ../plug-ins/common/waves.c:336
+#: ../plug-ins/common/waves.c:337
 msgid "_Wavelength:"
 msgstr "_Wavelength:"
 
-#: ../plug-ins/common/waves.c:447
+#: ../plug-ins/common/waves.c:448
 msgid "Waving"
 msgstr "Waving"
 
-#: ../plug-ins/common/webbrowser.c:141
-msgid ""
-"Web browser not specified.\n"
-"Please specify a web browser using the Preferences Dialog."
-msgstr ""
-"Web browser not specified.\n"
-"Please specify a web browser using the Preferences Dialogue."
-
-#: ../plug-ins/common/webbrowser.c:161
+#: ../plug-ins/common/web-browser.c:206
 #, c-format
 msgid ""
-"Could not parse specified web browser command:\n"
-"%s"
+"Web browser not specified.\n"
+"Please specify a web browser using the Preferences dialog."
 msgstr ""
-"Could not parse specified web browser command:\n"
-"%s"
+"Web browser not specified.\n"
+"Please specify a web browser using the Preferences dialogue."
 
-#: ../plug-ins/common/webbrowser.c:174
+#: ../plug-ins/common/web-browser.c:228
 #, c-format
 msgid ""
-"Could not execute specified web browser:\n"
+"Could not parse the web browser command specified in the Preferences "
+"dialog:\n"
+"\n"
 "%s"
 msgstr ""
-"Could not execute specified web browser:\n"
+"Could not parse the web browser command specified in the Preferences "
+"dialogue:\n"
+"\n"
 "%s"
 
-#: ../plug-ins/common/whirlpinch.c:138
+#: ../plug-ins/common/web-browser.c:246
+#, c-format
+msgid ""
+"Could not execute the web browser specified in the Preferences dialog:\n"
+"\n"
+"%s"
+msgstr ""
+"Could not execute the web browser specified in the Preferences dialogue:\n"
+"\n"
+"%s"
+
+#: ../plug-ins/common/whirl-pinch.c:138
 msgid "Distort an image by whirling and pinching"
 msgstr "Distort an image by whirling and pinching"
 
-#: ../plug-ins/common/whirlpinch.c:149
+#: ../plug-ins/common/whirl-pinch.c:149
 msgid "W_hirl and Pinch..."
 msgstr "W_hirl and Pinch..."
 
-#: ../plug-ins/common/whirlpinch.c:193
+#: ../plug-ins/common/whirl-pinch.c:193
 msgid "Region affected by plug-in is empty"
 msgstr "Region affected by plug-in is empty"
 
-#: ../plug-ins/common/whirlpinch.c:341
+#: ../plug-ins/common/whirl-pinch.c:341
 msgid "Whirling and pinching"
 msgstr "Whirling and pinching"
 
-#: ../plug-ins/common/whirlpinch.c:528
+#: ../plug-ins/common/whirl-pinch.c:528
 msgid "Whirl and Pinch"
 msgstr "Whirl and Pinch"
 
-#: ../plug-ins/common/whirlpinch.c:564
+#: ../plug-ins/common/whirl-pinch.c:565
 msgid "_Whirl angle:"
 msgstr "_Whirl angle:"
 
-#: ../plug-ins/common/whirlpinch.c:576
+#: ../plug-ins/common/whirl-pinch.c:577
 msgid "_Pinch amount:"
 msgstr "_Pinch amount:"
 
@@ -8658,403 +8007,1271 @@ msgstr "Wind"
 #. ********************************************************
 #. radio buttons for choosing wind rendering algorithm
 #. *****************************************************
-#: ../plug-ins/common/wind.c:919
+#: ../plug-ins/common/wind.c:921
 msgid "Style"
 msgstr "Style"
 
-#: ../plug-ins/common/wind.c:923
+#: ../plug-ins/common/wind.c:925
 msgid "_Wind"
 msgstr "_Wind"
 
-#: ../plug-ins/common/wind.c:924
+#: ../plug-ins/common/wind.c:926
 msgid "_Blast"
 msgstr "_Blast"
 
-#: ../plug-ins/common/wind.c:947
+#: ../plug-ins/common/wind.c:949
 msgid "_Left"
 msgstr "_Left"
 
-#: ../plug-ins/common/wind.c:948
+#: ../plug-ins/common/wind.c:950
 msgid "_Right"
 msgstr "_Right"
 
 #. ****************************************************
 #. radio buttons for choosing BOTH, LEADING, TRAILING
 #. **************************************************
-#: ../plug-ins/common/wind.c:967
+#: ../plug-ins/common/wind.c:969
 msgid "Edge Affected"
 msgstr "Edge Affected"
 
-#: ../plug-ins/common/wind.c:971
+#: ../plug-ins/common/wind.c:973
 msgid "L_eading"
 msgstr "L_eading"
 
-#: ../plug-ins/common/wind.c:972
+#: ../plug-ins/common/wind.c:974
 msgid "Tr_ailing"
 msgstr "Tr_ailing"
 
-#: ../plug-ins/common/wind.c:973
+#: ../plug-ins/common/wind.c:975
 msgid "Bot_h"
 msgstr "Bot_h"
 
-#: ../plug-ins/common/wind.c:1010
+#: ../plug-ins/common/wind.c:1012
 msgid "Higher values restrict the effect to fewer areas of the image"
 msgstr "Higher values restrict the effect to fewer areas of the image"
 
-#: ../plug-ins/common/wind.c:1025 ../plug-ins/gimpressionist/orientmap.c:694
+#: ../plug-ins/common/wind.c:1027 ../plug-ins/gimpressionist/orientmap.c:694
 msgid "_Strength:"
 msgstr "_Strength:"
 
-#: ../plug-ins/common/wind.c:1029
+#: ../plug-ins/common/wind.c:1031
 msgid "Higher values increase the magnitude of the effect"
 msgstr "Higher values increase the magnitude of the effect"
 
-#: ../plug-ins/common/wmf.c:128
-msgid "Microsoft WMF file"
-msgstr "Microsoft WMF file"
+#: ../plug-ins/file-bmp/bmp-read.c:88
+msgid "Bad colormap"
+msgstr "Bad colourmap"
 
-#: ../plug-ins/common/wmf.c:343
-msgid ""
-"WMF file does not\n"
-"specify a size!"
-msgstr ""
-"WMF file does not\n"
-"specify a size!"
-
-#: ../plug-ins/common/wmf.c:491
-msgid "Render Windows Metafile"
-msgstr "Render Windows Metafile"
-
-#: ../plug-ins/common/wmf.c:985
+#: ../plug-ins/file-bmp/bmp-read.c:172 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:422
+#: ../plug-ins/file-bmp/bmp-read.c:430 ../plug-ins/file-bmp/bmp-read.c:438
+#: ../plug-ins/file-bmp/bmp-read.c:446
 #, c-format
-msgid "Could not open '%s' for reading"
-msgstr "Could not open '%s' for reading"
+msgid "'%s' is not a valid BMP file"
+msgstr "'%s' is not a valid BMP file"
 
-#: ../plug-ins/common/wmf.c:1001
-msgid "Rendered WMF"
-msgstr "Rendered WMF"
-
-#: ../plug-ins/common/xbm.c:172 ../plug-ins/common/xbm.c:190
-msgid "X BitMap image"
-msgstr "X BitMap image"
-
-#: ../plug-ins/common/xbm.c:803
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
 #, c-format
-msgid ""
-"'%s':\n"
-"Could not read header (ftell == %ld)"
-msgstr ""
-"'%s':\n"
-"Could not read header (ftell == %ld)"
+msgid "Error reading BMP file header from '%s'"
+msgstr "Error reading BMP file header from '%s'"
 
-#: ../plug-ins/common/xbm.c:838
-#, c-format
-msgid ""
-"'%s':\n"
-"No image data type specified"
-msgstr ""
-"'%s':\n"
-"No image data type specified"
+#: ../plug-ins/file-bmp/bmp-read.c:558
+msgid "Unrecognized or invalid BMP compression format."
+msgstr "Unrecognised or invalid BMP compression format."
 
-#. The image is not black-and-white.
-#: ../plug-ins/common/xbm.c:980
-msgid ""
-"The image which you are trying to save as an XBM contains more than two "
-"colors.\n"
-"\n"
-"Please convert it to a black and white (1-bit) indexed image and try again."
-msgstr ""
-"The image which you are trying to save as an XBM contains more than two "
-"colours.\n"
-"\n"
-"Please convert it to a black and white (1-bit) indexed image and try again."
+#: ../plug-ins/file-bmp/bmp-read.c:600
+msgid "Unsupported or invalid bitdepth."
+msgstr "Unsupported or invalid bitdepth."
 
-#: ../plug-ins/common/xbm.c:991
-msgid ""
-"You cannot save a cursor mask for an image\n"
-"which has no alpha channel."
-msgstr ""
-"You cannot save a cursor mask for an image\n"
-"which has no alpha channel."
+#: ../plug-ins/file-bmp/bmp-read.c:788 ../plug-ins/file-bmp/bmp-read.c:829
+#: ../plug-ins/file-bmp/bmp-read.c:879
+msgid "The bitmap ends unexpectedly."
+msgstr "The bitmap ends unexpectedly."
 
-#: ../plug-ins/common/xbm.c:1166
-msgid "Save as XBM"
-msgstr "Save as XBM"
+#: ../plug-ins/file-bmp/bmp-write.c:188 ../plug-ins/file-bmp/bmp-write.c:210
+msgid "Cannot save indexed image with transparency in BMP file format."
+msgstr "Cannot save indexed image with transparency in BMP file format."
 
-#. parameter settings
-#: ../plug-ins/common/xbm.c:1183
-msgid "XBM Options"
-msgstr "XBM Options"
+#: ../plug-ins/file-bmp/bmp-write.c:190 ../plug-ins/file-bmp/bmp-write.c:212
+msgid "Alpha channel will be ignored."
+msgstr "Alpha channel will be ignored."
 
-#. X10 format
-#: ../plug-ins/common/xbm.c:1193
-msgid "_X10 format bitmap"
-msgstr "_X10 format bitmap"
+#: ../plug-ins/file-bmp/bmp-write.c:793
+msgid "Save as BMP"
+msgstr "Save as BMP"
 
-#: ../plug-ins/common/xbm.c:1213
-msgid "_Identifier prefix:"
-msgstr "_Identifier prefix:"
+#: ../plug-ins/file-bmp/bmp-write.c:816
+msgid "_Run-Length Encoded"
+msgstr "_Run-Length Encoded"
 
-#. hotspot toggle
-#: ../plug-ins/common/xbm.c:1235
-msgid "_Write hot spot values"
-msgstr "_Write hot spot values"
+#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:900
+msgid "_Advanced Options"
+msgstr "_Advanced Options"
 
-#: ../plug-ins/common/xbm.c:1257
-msgid "Hot spot _X:"
-msgstr "Hot spot _X:"
+#: ../plug-ins/file-bmp/bmp-write.c:843
+msgid "16 bits"
+msgstr "16 bits"
 
-#: ../plug-ins/common/xbm.c:1267
-msgid "Hot spot _Y:"
-msgstr "Hot spot _Y:"
+#: ../plug-ins/file-bmp/bmp-write.c:879
+msgid "24 bits"
+msgstr "24 bits"
 
-#. mask file
-#: ../plug-ins/common/xbm.c:1274
-msgid "Mask File"
-msgstr "Mask File"
+#: ../plug-ins/file-bmp/bmp-write.c:896
+msgid "32 bits"
+msgstr "32 bits"
 
-#: ../plug-ins/common/xbm.c:1284
-msgid "W_rite extra mask file"
-msgstr "W_rite extra mask file"
+#: ../plug-ins/file-bmp/bmp.c:124 ../plug-ins/file-bmp/bmp.c:143
+msgid "Windows BMP image"
+msgstr "Windows BMP image"
 
-#: ../plug-ins/common/xbm.c:1297
-msgid "_Mask file extension:"
-msgstr "_Mask file extension:"
-
-#: ../plug-ins/common/xpm.c:173 ../plug-ins/common/xpm.c:198
-msgid "X PixMap image"
-msgstr "X PixMap image"
-
-#: ../plug-ins/common/xpm.c:353
-#, c-format
-msgid "Error opening file '%s'"
-msgstr "Error opening file '%s'"
-
-#: ../plug-ins/common/xpm.c:358
-msgid "XPM file invalid"
-msgstr "XPM file invalid"
-
-#: ../plug-ins/common/xpm.c:772
-msgid "Save as XPM"
-msgstr "Save as XPM"
-
-#: ../plug-ins/common/xpm.c:796
-msgid "_Alpha threshold:"
-msgstr "_Alpha threshold:"
-
-#: ../plug-ins/common/xwd.c:276 ../plug-ins/common/xwd.c:296
-msgid "X window dump"
-msgstr "X window dump"
-
-#: ../plug-ins/common/xwd.c:428
-#, c-format
-msgid "Could not read XWD header from '%s'"
-msgstr "Could not read XWD header from '%s'"
-
-#: ../plug-ins/common/xwd.c:466
-msgid "Can't read color entries"
-msgstr "Can't read colour entries"
-
-#: ../plug-ins/common/xwd.c:555
-#, c-format
-msgid ""
-"XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
-"not supported."
-msgstr ""
-"XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
-"not supported."
-
-#: ../plug-ins/common/xwd.c:578
-msgid "Cannot save images with alpha channels."
-msgstr "Cannot save images with alpha channels."
-
-#: ../plug-ins/common/xwd.c:2179
-msgid "Error during writing indexed/gray image"
-msgstr "Error during writing indexed/grey image"
-
-#: ../plug-ins/common/xwd.c:2277
-msgid "Error during writing rgb image"
-msgstr "Error during writing rgb image"
-
-#: ../plug-ins/common/zealouscrop.c:85
-msgid "Autocrop unused space from edges and middle"
-msgstr "Autocrop unused space from edges and middle"
-
-#: ../plug-ins/common/zealouscrop.c:90
-msgid "_Zealous Crop"
-msgstr "_Zealous Crop"
-
-#: ../plug-ins/common/zealouscrop.c:138
-msgid "Zealous cropping"
-msgstr "Zealous cropping"
-
-#: ../plug-ins/common/zealouscrop.c:239
-msgid "Nothing to crop."
-msgstr "Nothing to crop."
-
-#: ../plug-ins/faxg3/faxg3.c:102
+#: ../plug-ins/file-faxg3/faxg3.c:103
 msgid "G3 fax image"
 msgstr "G3 fax image"
 
-#: ../plug-ins/fits/fits.c:166 ../plug-ins/fits/fits.c:186
+#: ../plug-ins/file-fits/fits.c:168 ../plug-ins/file-fits/fits.c:188
 msgid "Flexible Image Transport System"
 msgstr "Flexible Image Transport System"
 
-#: ../plug-ins/fits/fits.c:354
+#: ../plug-ins/file-fits/fits.c:368
 msgid "Error during open of FITS file"
 msgstr "Error during open of FITS file"
 
-#: ../plug-ins/fits/fits.c:359
+#: ../plug-ins/file-fits/fits.c:374
 msgid "FITS file keeps no displayable images"
 msgstr "FITS file keeps no displayable images"
 
-#: ../plug-ins/fits/fits.c:437
+#: ../plug-ins/file-fits/fits.c:455
 msgid "FITS save cannot handle images with alpha channels"
 msgstr "FITS save cannot handle images with alpha channels"
 
-#: ../plug-ins/fits/fits.c:974
+#: ../plug-ins/file-fits/fits.c:993
 msgid "Load FITS File"
 msgstr "Load FITS File"
 
-#: ../plug-ins/fits/fits.c:998
+#: ../plug-ins/file-fits/fits.c:1017
 msgid "Replacement for undefined pixels"
 msgstr "Replacement for undefined pixels"
 
-#: ../plug-ins/fits/fits.c:1003 ../plug-ins/gfig/gfig-dialog.c:1286
+#: ../plug-ins/file-fits/fits.c:1022 ../plug-ins/gfig/gfig-dialog.c:1286
 #: ../plug-ins/gfig/gfig-dialog.c:1461
 msgid "White"
 msgstr "White"
 
-#: ../plug-ins/fits/fits.c:1010
+#: ../plug-ins/file-fits/fits.c:1029
 msgid "Pixel value scaling"
 msgstr "Pixel value scaling"
 
-#: ../plug-ins/fits/fits.c:1015
+#: ../plug-ins/file-fits/fits.c:1034
 msgid "By DATAMIN/DATAMAX"
 msgstr "By DATAMIN/DATAMAX"
 
-#: ../plug-ins/fits/fits.c:1022
+#: ../plug-ins/file-fits/fits.c:1041
 msgid "Image Composing"
 msgstr "Image Composing"
 
-#: ../plug-ins/flame/flame.c:128
+#: ../plug-ins/file-fli/fli-gimp.c:166 ../plug-ins/file-fli/fli-gimp.c:186
+msgid "AutoDesk FLIC animation"
+msgstr "AutoDesk FLIC animation"
+
+#: ../plug-ins/file-fli/fli-gimp.c:562
+#, c-format
+msgid "Frame (%i)"
+msgstr "Frame (%i)"
+
+#: ../plug-ins/file-fli/fli-gimp.c:714
+msgid "Sorry, I can save only INDEXED and GRAY images."
+msgstr "Sorry, I can save only INDEXED and GREY images."
+
+#: ../plug-ins/file-fli/fli-gimp.c:846
+msgid "GFLI 1.3 - Load framestack"
+msgstr "GFLI 1.3 - Load framestack"
+
+#: ../plug-ins/file-fli/fli-gimp.c:914
+msgid "GFLI 1.3 - Save framestack"
+msgstr "GFLI 1.3 - Save framestack"
+
+#: ../plug-ins/file-ico/ico-dialog.c:54
+msgid "Save as Windows Icon"
+msgstr "Save as Windows Icon"
+
+#: ../plug-ins/file-ico/ico-dialog.c:86
+msgid "Icon Details"
+msgstr "Icon Details"
+
+#: ../plug-ins/file-ico/ico-dialog.c:106
+msgid ""
+"Large icons and compression are not supported by all programs. Older "
+"applications may not open this file correctly."
+msgstr ""
+"Large icons and compression are not supported by all programs. Older "
+"applications may not open this file correctly."
+
+#: ../plug-ins/file-ico/ico-dialog.c:178
+msgid "1 bpp, 1-bit alpha, 2-slot palette"
+msgstr "1 bpp, 1-bit alpha, 2-slot palette"
+
+#: ../plug-ins/file-ico/ico-dialog.c:179
+msgid "4 bpp, 1-bit alpha, 16-slot palette"
+msgstr "4 bpp, 1-bit alpha, 16-slot palette"
+
+#: ../plug-ins/file-ico/ico-dialog.c:180
+msgid "8 bpp, 1-bit alpha, 256-slot palette"
+msgstr "8 bpp, 1-bit alpha, 256-slot palette"
+
+#: ../plug-ins/file-ico/ico-dialog.c:181
+msgid "24 bpp, 1-bit alpha, no palette"
+msgstr "24 bpp, 1-bit alpha, no palette"
+
+#: ../plug-ins/file-ico/ico-dialog.c:182
+msgid "32 bpp, 8-bit alpha, no palette"
+msgstr "32 bpp, 8-bit alpha, no palette"
+
+#: ../plug-ins/file-ico/ico-dialog.c:196
+msgid "Compressed (PNG)"
+msgstr "Compressed (PNG)"
+
+#. read successfully. add to image
+#: ../plug-ins/file-ico/ico-load.c:616
+#, c-format
+msgid "Icon #%i"
+msgstr "Icon #%i"
+
+#: ../plug-ins/file-ico/ico-load.c:725 ../plug-ins/file-jpeg/jpeg-load.c:633
+#: ../plug-ins/file-psd/psd-thumb-load.c:85
+#, c-format
+msgid "Opening thumbnail for '%s'"
+msgstr "Opening thumbnail for '%s'"
+
+#: ../plug-ins/file-ico/ico.c:103 ../plug-ins/file-ico/ico.c:137
+msgid "Microsoft Windows icon"
+msgstr "Microsoft Windows icon"
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:293
+msgid "Rotate Image?"
+msgstr "Rotate Image?"
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:296
+msgid "_Keep Orientation"
+msgstr "_Keep Orientation"
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:352
+msgid "According to the EXIF data, this image is rotated."
+msgstr "According to the EXIF data, this image is rotated."
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:367
+msgid "Would you like GIMP to rotate it into the standard orientation?"
+msgstr "Would you like GIMP to rotate it into the standard orientation?"
+
+#: ../plug-ins/file-jpeg/jpeg-load.c:241
+msgid "JPEG preview"
+msgstr "JPEG preview"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:200
+#, c-format
+msgid "File size: %02.01f kB"
+msgstr "File size: %02.01f kB"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:682
+msgid "Calculating file size..."
+msgstr "Calculating file size..."
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:774 ../plug-ins/file-jpeg/jpeg-save.c:876
+msgid "File size: unknown"
+msgstr "File size: unknown"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:827
+msgid "Save as JPEG"
+msgstr "Save as JPEG"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:862
+msgid "_Quality:"
+msgstr "_Quality:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:866
+msgid "JPEG quality parameter"
+msgstr "JPEG quality parameter"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:885
+msgid "Enable preview to obtain the file size."
+msgstr "Enable preview to obtain the file size."
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:888
+msgid "Sho_w preview in image window"
+msgstr "Sho_w preview in image window"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:929
+msgid "S_moothing:"
+msgstr "S_moothing:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:942
+msgid "Frequency (rows):"
+msgstr "Frequency (rows):"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:958
+msgid "Use _restart markers"
+msgstr "Use _restart markers"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:974
+msgid "_Optimize"
+msgstr "_Optimise"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:988
+msgid "_Progressive"
+msgstr "_Progressive"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1004
+msgid "Save _EXIF data"
+msgstr "Save _EXIF data"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1021
+msgid "Save _thumbnail"
+msgstr "Save _thumbnail"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1038
+msgid "Save _XMP data"
+msgstr "Save _XMP data"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1053
+msgid "_Use quality settings from original image"
+msgstr "_Use quality settings from original image"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1059
+msgid ""
+"If the original image was loaded from a JPEG file using non-standard quality "
+"settings (quantization tables), enable this option to get almost the same "
+"quality and file size."
+msgstr ""
+"If the original image was loaded from a JPEG file using non-standard quality "
+"settings (quantisation tables), enable this option to get almost the same "
+"quality and file size."
+
+#. Subsampling
+#: ../plug-ins/file-jpeg/jpeg-save.c:1083
+msgid "Su_bsampling:"
+msgstr "Su_bsampling:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1090
+msgid "1x1,1x1,1x1 (best quality)"
+msgstr "1x1,1x1,1x1 (best quality)"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1092
+msgid "2x1,1x1,1x1 (4:2:2)"
+msgstr "2x1,1x1,1x1 (4:2:2)"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1094
+msgid "1x2,1x1,1x1"
+msgstr "1x2,1x1,1x1"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1096
+msgid "2x2,1x1,1x1 (smallest file)"
+msgstr "2x2,1x1,1x1 (smallest file)"
+
+#. DCT method
+#: ../plug-ins/file-jpeg/jpeg-save.c:1126
+msgid "_DCT method:"
+msgstr "_DCT method:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1132
+msgid "Fast Integer"
+msgstr "Fast Integer"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1133
+msgid "Integer"
+msgstr "Integer"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1134
+msgid "Floating-Point"
+msgstr "Floating-Point"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1150
+msgid "Comment"
+msgstr "Comment"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1195
+msgid "Sa_ve Defaults"
+msgstr "Sa_ve Defaults"
+
+#: ../plug-ins/file-jpeg/jpeg.c:137 ../plug-ins/file-jpeg/jpeg.c:175
+msgid "JPEG image"
+msgstr "JPEG image"
+
+#: ../plug-ins/file-jpeg/jpeg.c:301
+msgid "Export Preview"
+msgstr "Export Preview"
+
+#: ../plug-ins/file-psd/psd-load.c:215
+#: ../plug-ins/file-psd/psd-thumb-load.c:131
+#, c-format
+msgid "Error loading PSD file: %s"
+msgstr "Error loading PSD file: %s"
+
+#: ../plug-ins/file-psd/psd-load.c:270
+#, c-format
+msgid "Not a valid photoshop document file"
+msgstr "Not a valid Photoshop document file"
+
+#: ../plug-ins/file-psd/psd-load.c:277
+#, c-format
+msgid "Unsupported file format version: %d"
+msgstr "Unsupported file format version: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:284
+#, c-format
+msgid "Too many channels in file: %d"
+msgstr "Too many channels in file: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:314
+#, c-format
+msgid "Unsupported color mode: %s"
+msgstr "Unsupported colour mode: %s"
+
+#: ../plug-ins/file-psd/psd-load.c:341
+#, c-format
+msgid "Unsupported bit depth: %d"
+msgstr "Unsupported bit depth: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:375 ../plug-ins/file-psd/psd-load.c:385
+#: ../plug-ins/file-psd/psd-load.c:604 ../plug-ins/file-psd/psd-load.c:785
+#, c-format
+msgid "The file is corrupt!"
+msgstr "The file is corrupt!"
+
+#: ../plug-ins/file-psd/psd-load.c:545
+#, c-format
+msgid "Too many channels in layer: %d"
+msgstr "Too many channels in layer: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:552
+#, c-format
+msgid "Unsupported or invalid layer height: %d"
+msgstr "Unsupported or invalid layer height: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:559
+#, c-format
+msgid "Unsupported or invalid layer width: %d"
+msgstr "Unsupported or invalid layer width: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:1153 ../plug-ins/file-psd/psd-load.c:1502
+#, c-format
+msgid "Unsupported compression mode: %d"
+msgstr "Unsupported compression mode: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:1595
+msgid "Extra"
+msgstr "Extra"
+
+#: ../plug-ins/file-psd/psd-save.c:228 ../plug-ins/file-psd/psd.c:114
+#: ../plug-ins/file-psd/psd.c:153
+msgid "Photoshop image"
+msgstr "Photoshop image"
+
+#: ../plug-ins/file-psd/psd-save.c:371
+#, c-format
+msgid ""
+"Unable to save layer with mode '%s'.  Either the PSD file format or the save "
+"plug-in does not support that, using normal mode instead."
+msgstr ""
+"Unable to save layer with mode '%s'.  Either the PSD file format or the save "
+"plug-in does not support that, using normal mode instead."
+
+#: ../plug-ins/file-psd/psd-save.c:631
+msgid "Error: Can't convert GIMP base imagetype to PSD mode"
+msgstr "Error: Can't convert GIMP base imagetype to PSD mode"
+
+#: ../plug-ins/file-psd/psd-save.c:1605
+#, c-format
+msgid ""
+"Unable to save '%s'.  The PSD file format does not support images that are "
+"more than 30,000 pixels wide or tall."
+msgstr ""
+"Unable to save '%s'.  The PSD file format does not support images that are "
+"more than 30,000 pixels wide or tall."
+
+#: ../plug-ins/file-psd/psd-save.c:1620
+#, c-format
+msgid ""
+"Unable to save '%s'.  The PSD file format does not support images with "
+"layers that are more than 30,000 pixels wide or tall."
+msgstr ""
+"Unable to save '%s'.  The PSD file format does not support images with "
+"layers that are more than 30,000 pixels wide or tall."
+
+#: ../plug-ins/file-psd/psd-util.c:51
+msgid "Unexpected end of file"
+msgstr "Unexpected end of file"
+
+#: ../plug-ins/file-sgi/sgi.c:121 ../plug-ins/file-sgi/sgi.c:141
+msgid "Silicon Graphics IRIS image"
+msgstr "Silicon Graphics IRIS image"
+
+#: ../plug-ins/file-sgi/sgi.c:326
+#, c-format
+msgid "Could not open '%s' for reading."
+msgstr "Could not open '%s' for reading."
+
+#: ../plug-ins/file-sgi/sgi.c:549
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "Could not open '%s' for writing."
+
+#: ../plug-ins/file-sgi/sgi.c:629
+msgid "Save as SGI"
+msgstr "Save as SGI"
+
+#: ../plug-ins/file-sgi/sgi.c:645
+msgid "Compression type"
+msgstr "Compression type"
+
+#: ../plug-ins/file-sgi/sgi.c:649
+msgid "No compression"
+msgstr "No compression"
+
+#: ../plug-ins/file-sgi/sgi.c:651
+msgid "RLE compression"
+msgstr "RLE compression"
+
+#: ../plug-ins/file-sgi/sgi.c:653
+msgid ""
+"Aggressive RLE\n"
+"(not supported by SGI)"
+msgstr ""
+"Aggressive RLE\n"
+"(not supported by SGI)"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:448
+msgid "Co_nnect"
+msgstr "Co_nnect"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:492
+msgid "Connect _anonymously"
+msgstr "Connect _anonymously"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:501
+msgid "Connect as u_ser:"
+msgstr "Connect as u_ser:"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:538
+msgid "_Username:"
+msgstr "_Username:"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:542
+msgid "_Domain:"
+msgstr "_Domain:"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:547
+msgid "_Password:"
+msgstr "_Password:"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:562
+msgid "_Forget password immediately"
+msgstr "_Forget password immediately"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:570
+msgid "_Remember password until you logout"
+msgstr "_Remember password until you logout"
+
+#: ../plug-ins/file-uri/gimpmountoperation.c:578
+msgid "_Remember forever"
+msgstr "_Remember forever"
+
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:163
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:129
+#: ../plug-ins/file-uri/uri-backend-wget.c:303
+#, c-format
+msgid "Downloading %s of image data"
+msgstr "Downloading %s of image data"
+
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:164
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:226
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:136
+#: ../plug-ins/file-uri/uri-backend-wget.c:346
+#, c-format
+msgid "Downloaded %s of image data"
+msgstr "Downloaded %s of image data"
+
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:182
+#, c-format
+msgid "Uploading %s of image data"
+msgstr "Uploading %s of image data"
+
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:183
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:230
+#, c-format
+msgid "Uploaded %s of image data"
+msgstr "Uploaded %s of image data"
+
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:253
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:297
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:158
+#: ../plug-ins/file-uri/uri-backend-wget.c:195
+msgid "Connecting to server"
+msgstr "Connecting to server"
+
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:312
+#, c-format
+msgid "Failed to read %s from '%s': %s"
+msgstr "Failed to read %s from '%s': %s"
+
+#: ../plug-ins/file-uri/uri-backend-gnomevfs.c:361
+#, c-format
+msgid "Failed to write %s to '%s': %s"
+msgstr "Failed to write %s to '%s': %s"
+
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:200
+#, c-format
+msgid "Downloading image (%s of %s)"
+msgstr "Downloading image (%s of %s)"
+
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:204
+#, c-format
+msgid "Uploading image (%s of %s)"
+msgstr "Uploading image (%s of %s)"
+
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:60
+msgid "Could not initialize libcurl"
+msgstr "Could not initialise libcurl"
+
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:202
+#, c-format
+msgid "Opening '%s' for reading resulted in HTTP response code: %d"
+msgstr "Opening '%s' for reading resulted in HTTP response code: %d"
+
+#: ../plug-ins/file-uri/uri-backend-wget.c:162
+#: ../plug-ins/file-uri/uri-backend-wget.c:182
+#: ../plug-ins/file-uri/uri-backend-wget.c:201
+#: ../plug-ins/file-uri/uri-backend-wget.c:224
+#: ../plug-ins/file-uri/uri-backend-wget.c:253
+#, c-format
+msgid "wget exited abnormally on URI '%s'"
+msgstr "wget exited abnormally on URI '%s'"
+
+#. The third line is "Connecting to..."
+#: ../plug-ins/file-uri/uri-backend-wget.c:190
+#, c-format
+msgid "(timeout is %d second)"
+msgid_plural "(timeout is %d seconds)"
+msgstr[0] "(timeout is %d second)"
+msgstr[1] "(timeout is %d seconds)"
+
+#. The fourth line is either the network request or an error
+#: ../plug-ins/file-uri/uri-backend-wget.c:219
+msgid "Opening URI"
+msgstr "Opening URI"
+
+#: ../plug-ins/file-uri/uri-backend-wget.c:230
+#: ../plug-ins/file-uri/uri-backend-wget.c:263
+#, c-format
+msgid "A network error occurred: %s"
+msgstr "A network error occurred: %s"
+
+#: ../plug-ins/file-uri/uri-backend-wget.c:308
+msgid "Downloading unknown amount of image data"
+msgstr "Downloading unknown amount of image data"
+
+#: ../plug-ins/file-uri/uri.c:119 ../plug-ins/file-uri/uri.c:140
+msgid "URI"
+msgstr "URI"
+
+#: ../plug-ins/file-xjt/xjt.c:488 ../plug-ins/file-xjt/xjt.c:506
+msgid "GIMP compressed XJT image"
+msgstr "GIMP compressed XJT image"
+
+#: ../plug-ins/file-xjt/xjt.c:736
+#, c-format
+msgid "XJT file contains unknown layermode %d"
+msgstr "XJT file contains unknown layermode %d"
+
+#: ../plug-ins/file-xjt/xjt.c:773
+#, c-format
+msgid "Warning: unsupported layermode %d saved to XJT"
+msgstr "Warning: unsupported layermode %d saved to XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:789
+#, c-format
+msgid "XJT file contains unknown pathtype %d"
+msgstr "XJT file contains unknown pathtype %d"
+
+#: ../plug-ins/file-xjt/xjt.c:805
+#, c-format
+msgid "Warning: unsupported pathtype %d saved to XJT"
+msgstr "Warning: unsupported pathtype %d saved to XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:824
+#, c-format
+msgid "XJT file contains unknown unittype %d"
+msgstr "XJT file contains unknown unittype %d"
+
+#: ../plug-ins/file-xjt/xjt.c:845
+#, c-format
+msgid "Warning: unsupported unittype %d saved to XJT"
+msgstr "Warning: unsupported unittype %d saved to XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:866
+msgid "Save as XJT"
+msgstr "Save as XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:889
+msgid "Optimize"
+msgstr "Optimise"
+
+#: ../plug-ins/file-xjt/xjt.c:899
+msgid "Clear transparent"
+msgstr "Clear transparent"
+
+#: ../plug-ins/file-xjt/xjt.c:911
+msgid "Quality:"
+msgstr "Quality:"
+
+#: ../plug-ins/file-xjt/xjt.c:920
+msgid "Smoothing:"
+msgstr "Smoothing:"
+
+#: ../plug-ins/file-xjt/xjt.c:1719 ../plug-ins/file-xjt/xjt.c:3373
+#, c-format
+msgid "Could not create working folder '%s': %s"
+msgstr "Could not create working folder '%s': %s"
+
+#: ../plug-ins/file-xjt/xjt.c:3239
+#, c-format
+msgid "Error: Could not read XJT property file '%s'."
+msgstr "Error: Could not read XJT property file '%s'."
+
+#: ../plug-ins/file-xjt/xjt.c:3246
+#, c-format
+msgid "Error: XJT property file '%s' is empty."
+msgstr "Error: XJT property file '%s' is empty."
+
+#: ../plug-ins/flame/flame.c:129
 msgid "Create cosmic recursive fractal flames"
 msgstr "Create cosmic recursive fractal flames"
 
-#: ../plug-ins/flame/flame.c:133
+#: ../plug-ins/flame/flame.c:134
 msgid "_Flame..."
 msgstr "_Flame..."
 
-#: ../plug-ins/flame/flame.c:226
+#: ../plug-ins/flame/flame.c:227
 msgid "Drawing flame"
 msgstr "Drawing flame"
 
-#: ../plug-ins/flame/flame.c:318
+#: ../plug-ins/flame/flame.c:319
 msgid "Flame works only on RGB drawables."
 msgstr "Flame works only on RGB drawables."
 
-#: ../plug-ins/flame/flame.c:401
+#: ../plug-ins/flame/flame.c:402
 #, c-format
 msgid "'%s' is not a regular file"
 msgstr "'%s' is not a regular file"
 
-#: ../plug-ins/flame/flame.c:645
+#: ../plug-ins/flame/flame.c:646
 msgid "Edit Flame"
 msgstr "Edit Flame"
 
-#: ../plug-ins/flame/flame.c:668
+#: ../plug-ins/flame/flame.c:669
 msgid "Directions"
 msgstr "Directions"
 
-#: ../plug-ins/flame/flame.c:704
+#: ../plug-ins/flame/flame.c:705
 msgid "Controls"
 msgstr "Controls"
 
-#: ../plug-ins/flame/flame.c:718
+#: ../plug-ins/flame/flame.c:719
 msgid "_Speed:"
 msgstr "_Speed:"
 
-#: ../plug-ins/flame/flame.c:735
+#: ../plug-ins/flame/flame.c:736
 msgid "_Randomize"
 msgstr "_Randomise"
 
-#: ../plug-ins/flame/flame.c:744
+#: ../plug-ins/flame/flame.c:746
 msgid "Same"
 msgstr "Same"
 
-#: ../plug-ins/flame/flame.c:745 ../plug-ins/gimpressionist/orientation.c:164
+#: ../plug-ins/flame/flame.c:747 ../plug-ins/gimpressionist/orientation.c:164
 #: ../plug-ins/gimpressionist/size.c:167
 msgid "Random"
 msgstr "Random"
 
-#: ../plug-ins/flame/flame.c:749
+#: ../plug-ins/flame/flame.c:751
 msgid "Swirl"
 msgstr "Swirl"
 
-#: ../plug-ins/flame/flame.c:750
+#: ../plug-ins/flame/flame.c:752
 msgid "Horseshoe"
 msgstr "Horseshoe"
 
-#: ../plug-ins/flame/flame.c:751 ../plug-ins/gfig/gfig-dialog.c:1442
+#: ../plug-ins/flame/flame.c:753 ../plug-ins/gfig/gfig-dialog.c:1442
 msgid "Polar"
 msgstr "Polar"
 
-#: ../plug-ins/flame/flame.c:752
+#: ../plug-ins/flame/flame.c:754
 msgid "Bent"
 msgstr "Bent"
 
+#: ../plug-ins/flame/flame.c:755
+msgid "Handkerchief"
+msgstr "Handkerchief"
+
+#: ../plug-ins/flame/flame.c:756
+msgid "Heart"
+msgstr "Heart"
+
+#: ../plug-ins/flame/flame.c:757
+msgid "Disc"
+msgstr "Disc"
+
+#: ../plug-ins/flame/flame.c:759
+msgid "Hyperbolic"
+msgstr "Hyperbolic"
+
+#: ../plug-ins/flame/flame.c:761
+msgid "Ex"
+msgstr "Ex"
+
+#: ../plug-ins/flame/flame.c:762
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:844
+msgid "Julia"
+msgstr "Julia"
+
+#: ../plug-ins/flame/flame.c:764
+msgid "Fisheye"
+msgstr "Fisheye"
+
 #: ../plug-ins/flame/flame.c:765
+msgid "Popcorn"
+msgstr "Popcorn"
+
+#: ../plug-ins/flame/flame.c:766
+msgid "Exponential"
+msgstr "Exponential"
+
+#: ../plug-ins/flame/flame.c:767
+msgid "Power"
+msgstr "Power"
+
+#: ../plug-ins/flame/flame.c:768
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:997
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1038
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1079
+msgid "Cosine"
+msgstr "Cosine"
+
+#: ../plug-ins/flame/flame.c:769
+msgid "Rings"
+msgstr "Rings"
+
+#: ../plug-ins/flame/flame.c:770
+msgid "Fan"
+msgstr "Fan"
+
+#: ../plug-ins/flame/flame.c:771
+msgid "Eyefish"
+msgstr "Eyefish"
+
+#: ../plug-ins/flame/flame.c:772
+msgid "Bubble"
+msgstr "Bubble"
+
+#: ../plug-ins/flame/flame.c:773 ../plug-ins/map-object/map-object-ui.c:491
+msgid "Cylinder"
+msgstr "Cylinder"
+
+#: ../plug-ins/flame/flame.c:775
+msgid "Blur"
+msgstr "Blur"
+
+#: ../plug-ins/flame/flame.c:776
+msgid "Gaussian"
+msgstr "Gaussian"
+
+#: ../plug-ins/flame/flame.c:789
 msgid "_Variation:"
 msgstr "_Variation:"
 
-#: ../plug-ins/flame/flame.c:787
+#: ../plug-ins/flame/flame.c:811
 msgid "Load Flame"
 msgstr "Load Flame"
 
-#: ../plug-ins/flame/flame.c:802
+#: ../plug-ins/flame/flame.c:826
 msgid "Save Flame"
 msgstr "Save Flame"
 
-#: ../plug-ins/flame/flame.c:944
+#: ../plug-ins/flame/flame.c:968
 msgid "Flame"
 msgstr "Flame"
 
-#: ../plug-ins/flame/flame.c:1045
+#: ../plug-ins/flame/flame.c:1069
 msgid "_Rendering"
 msgstr "_Rendering"
 
-#: ../plug-ins/flame/flame.c:1071
+#: ../plug-ins/flame/flame.c:1095
 msgid "Co_ntrast:"
 msgstr "Co_ntrast:"
 
-#: ../plug-ins/flame/flame.c:1085
+#: ../plug-ins/flame/flame.c:1109
 msgid "_Gamma:"
 msgstr "_Gamma:"
 
-#: ../plug-ins/flame/flame.c:1099
+#: ../plug-ins/flame/flame.c:1123
 msgid "Sample _density:"
 msgstr "Sample _density:"
 
-#: ../plug-ins/flame/flame.c:1110
+#: ../plug-ins/flame/flame.c:1134
 msgid "Spa_tial oversample:"
 msgstr "Spa_tial oversample:"
 
-#: ../plug-ins/flame/flame.c:1121
+#: ../plug-ins/flame/flame.c:1145
 msgid "Spatial _filter radius:"
 msgstr "Spatial _filter radius:"
 
-#: ../plug-ins/flame/flame.c:1140
+#: ../plug-ins/flame/flame.c:1164
 msgid "Color_map:"
 msgstr "Colour_map:"
 
-#: ../plug-ins/flame/flame.c:1182
+#: ../plug-ins/flame/flame.c:1206
 msgid "Custom gradient"
 msgstr "Custom gradient"
 
-#: ../plug-ins/flame/flame.c:1208
+#: ../plug-ins/flame/flame.c:1232
 msgid "C_amera"
 msgstr "C_amera"
 
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:547
+#: ../plug-ins/gfig/gfig-dialog.c:274 ../plug-ins/gimpressionist/utils.c:143
+#: ../plug-ins/gradient-flare/gradient-flare.c:881
+#, c-format
+msgid ""
+"No %s in gimprc:\n"
+"You need to add an entry like\n"
+"(%s \"%s\")\n"
+"to your %s file."
+msgstr ""
+"No %s in gimprc:\n"
+"You need to add an entry like\n"
+"(%s \"%s\")\n"
+"to your %s file."
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:638
+msgid "Realtime preview"
+msgstr "Realtime preview"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:646
+msgid "If enabled the preview will be redrawn automatically"
+msgstr "If enabled the preview will be redrawn automatically"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:649
+msgid "R_edraw preview"
+msgstr "R_edraw preview"
+
+#. Zoom Options
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:657
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:693
+msgid "Undo last zoom change"
+msgstr "Undo last zoom change"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:703
+msgid "Redo last zoom change"
+msgstr "Redo last zoom change"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:718
+msgid "_Parameters"
+msgstr "_Parameters"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:721
+msgid "Fractal Parameters"
+msgstr "Fractal Parameters"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:734
+#: ../plug-ins/map-object/map-object-ui.c:1099
+msgid "Left:"
+msgstr "Left:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:743
+#: ../plug-ins/map-object/map-object-ui.c:1099
+msgid "Right:"
+msgstr "Right:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:752
+#: ../plug-ins/map-object/map-object-ui.c:1098
+msgid "Top:"
+msgstr "Top:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:761
+#: ../plug-ins/map-object/map-object-ui.c:1098
+msgid "Bottom:"
+msgstr "Bottom:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:773
+msgid ""
+"The higher the number of iterations, the more details will be calculated"
+msgstr ""
+"The higher the number of iterations, the more details will be calculated"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:781
+msgid "CX:"
+msgstr "CX:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:784
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:794
+msgid "Changes aspect of fractal"
+msgstr "Changes aspect of fractal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:791
+msgid "CY:"
+msgstr "CY:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:809
+msgid "Load a fractal from file"
+msgstr "Load a fractal from file"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:817
+msgid "Reset parameters to default values"
+msgstr "Reset parameters to default values"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:826
+msgid "Save active fractal to file"
+msgstr "Save active fractal to file"
+
+#. Fractal type toggle box
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:829
+msgid "Fractal Type"
+msgstr "Fractal Type"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:842
+msgid "Mandelbrot"
+msgstr "Mandelbrot"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:846
+msgid "Barnsley 1"
+msgstr "Barnsley 1"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:848
+msgid "Barnsley 2"
+msgstr "Barnsley 2"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:850
+msgid "Barnsley 3"
+msgstr "Barnsley 3"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:852
+msgid "Spider"
+msgstr "Spider"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:854
+msgid "Man'o'war"
+msgstr "Man'o'war"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:856
+msgid "Lambda"
+msgstr "Lambda"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:858
+msgid "Sierpinski"
+msgstr "Sierpinski"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:920
+msgid "Number of colors:"
+msgstr "Number of colours:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:923
+msgid "Change the number of colors in the mapping"
+msgstr "Change the number of colours in the mapping"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:930
+msgid "Use loglog smoothing"
+msgstr "Use loglog smoothing"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:937
+msgid "Use log log smoothing to eliminate \"banding\" in the result"
+msgstr "Use log log smoothing to eliminate \"banding\" in the result"
+
+#. Color Density frame
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:941
+msgid "Color Density"
+msgstr "Colour Density"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:956
+msgid "Change the intensity of the red channel"
+msgstr "Change the intensity of the red channel"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:966
+msgid "Change the intensity of the green channel"
+msgstr "Change the intensity of the green channel"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:976
+msgid "Change the intensity of the blue channel"
+msgstr "Change the intensity of the blue channel"
+
+#. Color Function frame
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:982
+msgid "Color Function"
+msgstr "Colour Function"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:995
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1036
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1077
+msgid "Sine"
+msgstr "Sine"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1004
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1045
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1086
+msgid "Use sine-function for this color component"
+msgstr "Use sine-function for this colour component"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1007
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1048
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1089
+msgid "Use cosine-function for this color component"
+msgstr "Use cosine-function for this colour component"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1010
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1051
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1092
+msgid ""
+"Use linear mapping instead of any trigonometrical function for this color "
+"channel"
+msgstr ""
+"Use linear mapping instead of any trigonometrical function for this colour "
+"channel"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1019
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1060
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1101
+msgid "Inversion"
+msgstr "Inversion"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1027
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1068
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1109
+msgid ""
+"If you enable this option higher color values will be swapped with lower "
+"ones and vice versa"
+msgstr ""
+"If you enable this option higher colour values will be swapped with lower "
+"ones and vice versa"
+
+#. Colormode toggle box
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1114
+msgid "Color Mode"
+msgstr "Colour Mode"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1123
+msgid "As specified above"
+msgstr "As specified above"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1135
+msgid ""
+"Create a color-map with the options you specified above (color density/"
+"function). The result is visible in the preview image"
+msgstr ""
+"Create a colour-map with the options you specified above (colour density/"
+"function). The result is visible in the preview image"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1145
+msgid "Apply active gradient to final image"
+msgstr "Apply active gradient to final image"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1157
+msgid "Create a color-map using a gradient from the gradient editor"
+msgstr "Create a colour-map using a gradient from the gradient editor"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1168
+msgid "FractalExplorer Gradient"
+msgstr "FractalExplorer Gradient"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1198
+msgid "_Fractals"
+msgstr "_Fractals"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1560
+#, c-format
+msgid "Could not write '%s': %s"
+msgstr "Could not write '%s': %s"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1635
+msgid "Load Fractal Parameters"
+msgstr "Load Fractal Parameters"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1673
+msgid "Save Fractal Parameters"
+msgstr "Save Fractal Parameters"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1871
+#, c-format
+msgid "'%s' is not a FractalExplorer file"
+msgstr "'%s' is not a FractalExplorer file"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1877
+#, c-format
+msgid "'%s' is corrupt. Line %d Option section incorrect"
+msgstr "'%s' is corrupt. Line %d Option section incorrect"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:239
+msgid "Render fractal art"
+msgstr "Render fractal art"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:244
+msgid "_Fractal Explorer..."
+msgstr "_Fractal Explorer..."
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:374
+msgid "Rendering fractal"
+msgstr "Rendering fractal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:756
+#: ../plug-ins/gradient-flare/gradient-flare.c:3200
+#, c-format
+msgid "Are you sure you want to delete \"%s\" from the list and from disk?"
+msgstr "Are you sure you want to delete \"%s\" from the list and from disk?"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:760
+msgid "Delete Fractal"
+msgstr "Delete Fractal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:950
+#, c-format
+msgid "File '%s' is not a FractalExplorer file"
+msgstr "File '%s' is not a FractalExplorer file"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:959
+#, c-format
+msgid ""
+"File '%s' is corrupt.\n"
+"Line %d Option section incorrect"
+msgstr ""
+"File '%s' is corrupt.\n"
+"Line %d Option section incorrect"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1003
+msgid "My first fractal"
+msgstr "My first fractal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1067
+msgid "Select folder and rescan collection"
+msgstr "Select folder and rescan collection"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1079
+msgid "Apply currently selected fractal"
+msgstr "Apply currently selected fractal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1091
+msgid "Delete currently selected fractal"
+msgstr "Delete currently selected fractal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1114
+msgid "Rescan for Fractals"
+msgstr "Rescan for Fractals"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1133
+msgid "Add FractalExplorer Path"
+msgstr "Add FractalExplorer Path"
+
 #: ../plug-ins/gfig/gfig-bezier.c:443
 msgid "Closed"
 msgstr "Closed"
@@ -9121,7 +9338,8 @@ msgstr "Show image"
 
 #. "snap to grid" checkbutton at bottom of style frame
 #: ../plug-ins/gfig/gfig-dialog.c:493
-msgid "checkbutton|Snap to grid"
+msgctxt "checkbutton"
+msgid "Snap to grid"
 msgstr "Snap to grid"
 
 #. "show grid" checkbutton at bottom of style frame
@@ -9313,7 +9531,8 @@ msgstr "Isometric"
 msgid "Grid type:"
 msgstr "Grid type:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1459 ../plug-ins/gflare/gflare.c:552
+#: ../plug-ins/gfig/gfig-dialog.c:1459
+#: ../plug-ins/gradient-flare/gradient-flare.c:551
 msgid "Normal"
 msgstr "Normal"
 
@@ -9410,301 +9629,6 @@ msgstr ""
 msgid "Error trying to open temporary file '%s' for parasite loading: %s"
 msgstr "Error trying to open temporary file '%s' for parasite loading: %s"
 
-#: ../plug-ins/gflare/gflare.c:553
-msgid "Addition"
-msgstr "Addition"
-
-#: ../plug-ins/gflare/gflare.c:554
-msgid "Overlay"
-msgstr "Overlay"
-
-#: ../plug-ins/gflare/gflare.c:809
-msgid "Produce a lense flare effect using gradients"
-msgstr "Produce a lense flare effect using gradients"
-
-#: ../plug-ins/gflare/gflare.c:814
-msgid "_Gradient Flare..."
-msgstr "_Gradient Flare..."
-
-#.
-#. *    Dialog Shell
-#.
-#: ../plug-ins/gflare/gflare.c:953 ../plug-ins/gflare/gflare.c:2311
-msgid "Gradient Flare"
-msgstr "Gradient Flare"
-
-#: ../plug-ins/gflare/gflare.c:1264
-#, c-format
-msgid "Failed to open GFlare file '%s': %s"
-msgstr "Failed to open GFlare file '%s': %s"
-
-#: ../plug-ins/gflare/gflare.c:1272
-#, c-format
-msgid "'%s' is not a valid GFlare file."
-msgstr "'%s' is not a valid GFlare file."
-
-#: ../plug-ins/gflare/gflare.c:1326
-#, c-format
-msgid "invalid formatted GFlare file: %s\n"
-msgstr "invalid formatted GFlare file: %s\n"
-
-#: ../plug-ins/gflare/gflare.c:1451
-#, c-format
-msgid ""
-"GFlare '%s' is not saved. If you add a new entry in '%s', like:\n"
-"(gflare-path \"%s\")\n"
-"and make a folder '%s', then you can save your own GFlares into that folder."
-msgstr ""
-"GFlare '%s' is not saved. If you add a new entry in '%s', like:\n"
-"(gflare-path \"%s\")\n"
-"and make a folder '%s', then you can save your own GFlares into that folder."
-
-#: ../plug-ins/gflare/gflare.c:1484
-#, c-format
-msgid "Failed to write GFlare file '%s': %s"
-msgstr "Failed to write GFlare file '%s': %s"
-
-#: ../plug-ins/gflare/gflare.c:2368
-msgid "A_uto update preview"
-msgstr "A_uto update preview"
-
-#: ../plug-ins/gflare/gflare.c:2419
-msgid "`Default' is created."
-msgstr "`Default' is created."
-
-#: ../plug-ins/gflare/gflare.c:2420
-msgid "Default"
-msgstr "Default"
-
-#.
-#. *  Scales
-#.
-#.
-#. *    Scales
-#.
-#: ../plug-ins/gflare/gflare.c:2699 ../plug-ins/gflare/gflare.c:3536
-#: ../plug-ins/gflare/gflare.c:3641 ../plug-ins/gflare/gflare.c:3778
-msgid "Parameters"
-msgstr "Parameters"
-
-#: ../plug-ins/gflare/gflare.c:2725
-msgid "Ro_tation:"
-msgstr "Ro_tation:"
-
-#: ../plug-ins/gflare/gflare.c:2737
-msgid "_Hue rotation:"
-msgstr "_Hue rotation:"
-
-#: ../plug-ins/gflare/gflare.c:2749
-msgid "Vector _angle:"
-msgstr "Vector _angle:"
-
-#: ../plug-ins/gflare/gflare.c:2761
-msgid "Vector _length:"
-msgstr "Vector _length:"
-
-#: ../plug-ins/gflare/gflare.c:2782
-msgid "A_daptive supersampling"
-msgstr "A_daptive supersampling"
-
-#: ../plug-ins/gflare/gflare.c:2801
-msgid "_Max depth:"
-msgstr "_Max depth:"
-
-#: ../plug-ins/gflare/gflare.c:2811
-msgid "_Threshold"
-msgstr "_Threshold"
-
-#: ../plug-ins/gflare/gflare.c:2949
-msgid "S_elector"
-msgstr "S_elector"
-
-#: ../plug-ins/gflare/gflare.c:3013
-msgid "New Gradient Flare"
-msgstr "New Gradient Flare"
-
-#: ../plug-ins/gflare/gflare.c:3016
-msgid "Enter a name for the new GFlare"
-msgstr "Enter a name for the new GFlare"
-
-#: ../plug-ins/gflare/gflare.c:3036
-#, c-format
-msgid "The name '%s' is used already!"
-msgstr "The name '%s' is used already!"
-
-#: ../plug-ins/gflare/gflare.c:3092
-msgid "Copy Gradient Flare"
-msgstr "Copy Gradient Flare"
-
-#: ../plug-ins/gflare/gflare.c:3095
-msgid "Enter a name for the copied GFlare"
-msgstr "Enter a name for the copied GFlare"
-
-#: ../plug-ins/gflare/gflare.c:3117
-#, c-format
-msgid "The name `%s' is used already!"
-msgstr "The name `%s' is used already!"
-
-#: ../plug-ins/gflare/gflare.c:3148
-msgid "Cannot delete!! There must be at least one GFlare."
-msgstr "Cannot delete!! There must be at least one GFlare."
-
-#: ../plug-ins/gflare/gflare.c:3158
-msgid "Delete Gradient Flare"
-msgstr "Delete Gradient Flare"
-
-#: ../plug-ins/gflare/gflare.c:3230
-#, c-format
-msgid "not found %s in gflares_list"
-msgstr "not found %s in gflares_list"
-
-#: ../plug-ins/gflare/gflare.c:3271
-msgid "Gradient Flare Editor"
-msgstr "Gradient Flare Editor"
-
-#: ../plug-ins/gflare/gflare.c:3275
-msgid "Rescan Gradients"
-msgstr "Rescan Gradients"
-
-#. Glow
-#: ../plug-ins/gflare/gflare.c:3400
-msgid "Glow Paint Options"
-msgstr "Glow Paint Options"
-
-#: ../plug-ins/gflare/gflare.c:3411 ../plug-ins/gflare/gflare.c:3439
-#: ../plug-ins/gflare/gflare.c:3467
-msgid "Opacity:"
-msgstr "Opacity:"
-
-#: ../plug-ins/gflare/gflare.c:3424 ../plug-ins/gflare/gflare.c:3452
-#: ../plug-ins/gflare/gflare.c:3480
-msgid "Paint mode:"
-msgstr "Paint mode:"
-
-#. Rays
-#: ../plug-ins/gflare/gflare.c:3428
-msgid "Rays Paint Options"
-msgstr "Rays Paint Options"
-
-#. Rays
-#: ../plug-ins/gflare/gflare.c:3456
-msgid "Second Flares Paint Options"
-msgstr "Second Flares Paint Options"
-
-#: ../plug-ins/gflare/gflare.c:3483 ../plug-ins/gimpressionist/general.c:134
-msgid "_General"
-msgstr "_General"
-
-#.
-#. *  Gradient Menus
-#.
-#: ../plug-ins/gflare/gflare.c:3509 ../plug-ins/gflare/gflare.c:3612
-#: ../plug-ins/gflare/gflare.c:3751
-msgid "Gradients"
-msgstr "Gradients"
-
-#: ../plug-ins/gflare/gflare.c:3520 ../plug-ins/gflare/gflare.c:3625
-#: ../plug-ins/gflare/gflare.c:3762
-msgid "Radial gradient:"
-msgstr "Radial gradient:"
-
-#: ../plug-ins/gflare/gflare.c:3524 ../plug-ins/gflare/gflare.c:3629
-msgid "Angular gradient:"
-msgstr "Angular gradient:"
-
-#: ../plug-ins/gflare/gflare.c:3528 ../plug-ins/gflare/gflare.c:3633
-msgid "Angular size gradient:"
-msgstr "Angular size gradient:"
-
-#: ../plug-ins/gflare/gflare.c:3548 ../plug-ins/gflare/gflare.c:3653
-#: ../plug-ins/gflare/gflare.c:3790
-msgid "Size (%):"
-msgstr "Size (%):"
-
-#: ../plug-ins/gflare/gflare.c:3560 ../plug-ins/gflare/gflare.c:3665
-#: ../plug-ins/gflare/gflare.c:3802
-msgid "Rotation:"
-msgstr "Rotation:"
-
-#: ../plug-ins/gflare/gflare.c:3572 ../plug-ins/gflare/gflare.c:3678
-#: ../plug-ins/gflare/gflare.c:3815
-msgid "Hue rotation:"
-msgstr "Hue rotation:"
-
-#: ../plug-ins/gflare/gflare.c:3586
-msgid "G_low"
-msgstr "G_low"
-
-#: ../plug-ins/gflare/gflare.c:3690
-msgid "# of Spikes:"
-msgstr "# of Spikes:"
-
-#: ../plug-ins/gflare/gflare.c:3702
-msgid "Spike thickness:"
-msgstr "Spike thickness:"
-
-#: ../plug-ins/gflare/gflare.c:3716
-msgid "_Rays"
-msgstr "_Rays"
-
-#: ../plug-ins/gflare/gflare.c:3766
-msgid "Size factor gradient:"
-msgstr "Size factor gradient:"
-
-#: ../plug-ins/gflare/gflare.c:3770
-msgid "Probability gradient:"
-msgstr "Probability gradient:"
-
-#.
-#. *    Shape Radio Button Frame
-#.
-#: ../plug-ins/gflare/gflare.c:3832
-msgid "Shape of Second Flares"
-msgstr "Shape of Second Flares"
-
-#: ../plug-ins/gflare/gflare.c:3840 ../plug-ins/imagemap/imap_menu.c:222
-msgid "Circle"
-msgstr "Circle"
-
-#: ../plug-ins/gflare/gflare.c:3857 ../plug-ins/imagemap/imap_menu.c:224
-msgid "Polygon"
-msgstr "Polygon"
-
-#: ../plug-ins/gflare/gflare.c:3890
-msgid "Random seed:"
-msgstr "Random seed:"
-
-#: ../plug-ins/gflare/gflare.c:3904
-msgid "_Second Flares"
-msgstr "_Second Flares"
-
-#: ../plug-ins/gfli/gfli.c:163 ../plug-ins/gfli/gfli.c:183
-msgid "AutoDesk FLIC animation"
-msgstr "AutoDesk FLIC animation"
-
-#: ../plug-ins/gfli/gfli.c:529
-#, c-format
-msgid "Frame (%i)"
-msgstr "Frame (%i)"
-
-#: ../plug-ins/gfli/gfli.c:680
-msgid "Sorry, I can save only INDEXED and GRAY images."
-msgstr "Sorry, I can save only INDEXED and GREY images."
-
-#: ../plug-ins/gfli/gfli.c:811
-msgid "GFLI 1.3 - Load framestack"
-msgstr "GFLI 1.3 - Load framestack"
-
-#. spinbutton 2
-#: ../plug-ins/gfli/gfli.c:849 ../plug-ins/gfli/gfli.c:919
-#: ../plug-ins/rcm/rcm_dialog.c:325 ../plug-ins/rcm/rcm_dialog.c:378
-msgid "To:"
-msgstr "To:"
-
-#: ../plug-ins/gfli/gfli.c:879
-msgid "GFLI 1.3 - Save framestack"
-msgstr "GFLI 1.3 - Save framestack"
-
 #: ../plug-ins/gimpressionist/brush.c:247
 msgid "Can only save drawables!"
 msgstr "Can only save drawables!"
@@ -9775,6 +9699,11 @@ msgstr "Colour _noise:"
 msgid "Adds random noise to the color"
 msgstr "Adds random noise to the colour"
 
+#: ../plug-ins/gimpressionist/general.c:134
+#: ../plug-ins/gradient-flare/gradient-flare.c:3529
+msgid "_General"
+msgstr "_General"
+
 #: ../plug-ins/gimpressionist/general.c:150
 msgid "Keep original"
 msgstr "Keep original"
@@ -9808,7 +9737,7 @@ msgid "Selects if to place strokes all the way out to the edges of the image"
 msgstr "Selects if to place strokes all the way out to the edges of the image"
 
 #. Tileable checkbox
-#: ../plug-ins/gimpressionist/general.c:213 ../plug-ins/maze/maze_face.c:284
+#: ../plug-ins/gimpressionist/general.c:213 ../plug-ins/maze/maze-dialog.c:278
 msgid "Tileable"
 msgstr "Tileable"
 
@@ -10159,38 +10088,45 @@ msgstr "The relative density of the brush strokes"
 msgid "Failed to save PPM file '%s': %s"
 msgstr "Failed to save PPM file '%s': %s"
 
-#: ../plug-ins/gimpressionist/presets.c:638
+#: ../plug-ins/gimpressionist/presets.c:640
 msgid "Save Current"
 msgstr "Save Current"
 
-#: ../plug-ins/gimpressionist/presets.c:892
+#: ../plug-ins/gimpressionist/presets.c:894
 msgid "Gimpressionist Defaults"
 msgstr "Gimpressionist Defaults"
 
-#: ../plug-ins/gimpressionist/presets.c:1013
+#: ../plug-ins/gimpressionist/presets.c:1015
 msgid "_Presets"
 msgstr "_Presets"
 
-#: ../plug-ins/gimpressionist/presets.c:1028
+#: ../plug-ins/gimpressionist/presets.c:1030
 msgid "Save Current..."
 msgstr "Save Current..."
 
-#: ../plug-ins/gimpressionist/presets.c:1036
+#: ../plug-ins/gimpressionist/presets.c:1038
 msgid "Save the current settings to the specified file"
 msgstr "Save the current settings to the specified file"
 
-#: ../plug-ins/gimpressionist/presets.c:1064
+#: ../plug-ins/gimpressionist/presets.c:1066
 msgid "Reads the selected Preset into memory"
 msgstr "Reads the selected Preset into memory"
 
-#: ../plug-ins/gimpressionist/presets.c:1070
+#: ../plug-ins/gimpressionist/presets.c:1072
 msgid "Deletes the selected Preset"
 msgstr "Deletes the selected Preset"
 
-#: ../plug-ins/gimpressionist/presets.c:1076
+#: ../plug-ins/gimpressionist/presets.c:1078
 msgid "Reread the folder of Presets"
 msgstr "Reread the folder of Presets"
 
+#: ../plug-ins/gimpressionist/preview.c:174
+#: ../plug-ins/gimpressionist/repaint.c:1184
+#: ../plug-ins/imagemap/imap_polygon.c:515
+#: ../plug-ins/lighting/lighting-ui.c:1075
+msgid "_Update"
+msgstr "_Update"
+
 #: ../plug-ins/gimpressionist/preview.c:180
 msgid "Refresh the Preview window"
 msgstr "Refresh the Preview window"
@@ -10323,11 +10259,369 @@ msgstr ""
 "Voronoi-mode makes only the smvector closest to the given point have any "
 "influence"
 
-#: ../plug-ins/help/gimphelpdomain.c:178
-msgid "The GIMP help files are not found."
-msgstr "The GIMP help files are not found."
+#: ../plug-ins/gradient-flare/gradient-flare.c:552
+msgid "Addition"
+msgstr "Addition"
 
-#: ../plug-ins/help/gimphelpdomain.c:179
+#: ../plug-ins/gradient-flare/gradient-flare.c:553
+msgid "Overlay"
+msgstr "Overlay"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:807
+msgid "Produce a lense flare effect using gradients"
+msgstr "Produce a lense flare effect using gradients"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:812
+msgid "_Gradient Flare..."
+msgstr "_Gradient Flare..."
+
+#.
+#. *    Dialog Shell
+#.
+#: ../plug-ins/gradient-flare/gradient-flare.c:951
+#: ../plug-ins/gradient-flare/gradient-flare.c:2357
+msgid "Gradient Flare"
+msgstr "Gradient Flare"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:1264
+#, c-format
+msgid "Failed to open GFlare file '%s': %s"
+msgstr "Failed to open GFlare file '%s': %s"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:1272
+#, c-format
+msgid "'%s' is not a valid GFlare file."
+msgstr "'%s' is not a valid GFlare file."
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:1326
+#, c-format
+msgid "invalid formatted GFlare file: %s\n"
+msgstr "invalid formatted GFlare file: %s\n"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:1451
+#, c-format
+msgid ""
+"GFlare '%s' is not saved. If you add a new entry in '%s', like:\n"
+"(gflare-path \"%s\")\n"
+"and make a folder '%s', then you can save your own GFlares into that folder."
+msgstr ""
+"GFlare '%s' is not saved. If you add a new entry in '%s', like:\n"
+"(gflare-path \"%s\")\n"
+"and make a folder '%s', then you can save your own GFlares into that folder."
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:1484
+#, c-format
+msgid "Failed to write GFlare file '%s': %s"
+msgstr "Failed to write GFlare file '%s': %s"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2414
+msgid "A_uto update preview"
+msgstr "A_uto update preview"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2465
+msgid "`Default' is created."
+msgstr "`Default' is created."
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2466
+msgid "Default"
+msgstr "Default"
+
+#.
+#. *  Scales
+#.
+#.
+#. *    Scales
+#.
+#: ../plug-ins/gradient-flare/gradient-flare.c:2745
+#: ../plug-ins/gradient-flare/gradient-flare.c:3582
+#: ../plug-ins/gradient-flare/gradient-flare.c:3687
+#: ../plug-ins/gradient-flare/gradient-flare.c:3824
+msgid "Parameters"
+msgstr "Parameters"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2771
+msgid "Ro_tation:"
+msgstr "Ro_tation:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2783
+msgid "_Hue rotation:"
+msgstr "_Hue rotation:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2795
+msgid "Vector _angle:"
+msgstr "Vector _angle:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2807
+msgid "Vector _length:"
+msgstr "Vector _length:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2828
+msgid "A_daptive supersampling"
+msgstr "A_daptive supersampling"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2847
+msgid "_Max depth:"
+msgstr "_Max depth:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2857
+msgid "_Threshold"
+msgstr "_Threshold"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:2995
+msgid "S_elector"
+msgstr "S_elector"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3059
+msgid "New Gradient Flare"
+msgstr "New Gradient Flare"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3062
+msgid "Enter a name for the new GFlare"
+msgstr "Enter a name for the new GFlare"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3082
+#, c-format
+msgid "The name '%s' is used already!"
+msgstr "The name '%s' is used already!"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3138
+msgid "Copy Gradient Flare"
+msgstr "Copy Gradient Flare"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3141
+msgid "Enter a name for the copied GFlare"
+msgstr "Enter a name for the copied GFlare"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3163
+#, c-format
+msgid "The name `%s' is used already!"
+msgstr "The name `%s' is used already!"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3194
+msgid "Cannot delete!! There must be at least one GFlare."
+msgstr "Cannot delete!! There must be at least one GFlare."
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3204
+msgid "Delete Gradient Flare"
+msgstr "Delete Gradient Flare"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3276
+#, c-format
+msgid "not found %s in gflares_list"
+msgstr "not found %s in gflares_list"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3317
+msgid "Gradient Flare Editor"
+msgstr "Gradient Flare Editor"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3321
+msgid "Rescan Gradients"
+msgstr "Rescan Gradients"
+
+#. Glow
+#: ../plug-ins/gradient-flare/gradient-flare.c:3446
+msgid "Glow Paint Options"
+msgstr "Glow Paint Options"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3457
+#: ../plug-ins/gradient-flare/gradient-flare.c:3485
+#: ../plug-ins/gradient-flare/gradient-flare.c:3513
+msgid "Opacity:"
+msgstr "Opacity:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3470
+#: ../plug-ins/gradient-flare/gradient-flare.c:3498
+#: ../plug-ins/gradient-flare/gradient-flare.c:3526
+msgid "Paint mode:"
+msgstr "Paint mode:"
+
+#. Rays
+#: ../plug-ins/gradient-flare/gradient-flare.c:3474
+msgid "Rays Paint Options"
+msgstr "Rays Paint Options"
+
+#. Rays
+#: ../plug-ins/gradient-flare/gradient-flare.c:3502
+msgid "Second Flares Paint Options"
+msgstr "Second Flares Paint Options"
+
+#.
+#. *  Gradient Menus
+#.
+#: ../plug-ins/gradient-flare/gradient-flare.c:3555
+#: ../plug-ins/gradient-flare/gradient-flare.c:3658
+#: ../plug-ins/gradient-flare/gradient-flare.c:3797
+msgid "Gradients"
+msgstr "Gradients"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3566
+#: ../plug-ins/gradient-flare/gradient-flare.c:3671
+#: ../plug-ins/gradient-flare/gradient-flare.c:3808
+msgid "Radial gradient:"
+msgstr "Radial gradient:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3570
+#: ../plug-ins/gradient-flare/gradient-flare.c:3675
+msgid "Angular gradient:"
+msgstr "Angular gradient:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3574
+#: ../plug-ins/gradient-flare/gradient-flare.c:3679
+msgid "Angular size gradient:"
+msgstr "Angular size gradient:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3594
+#: ../plug-ins/gradient-flare/gradient-flare.c:3699
+#: ../plug-ins/gradient-flare/gradient-flare.c:3836
+msgid "Size (%):"
+msgstr "Size (%):"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3606
+#: ../plug-ins/gradient-flare/gradient-flare.c:3711
+#: ../plug-ins/gradient-flare/gradient-flare.c:3848
+msgid "Rotation:"
+msgstr "Rotation:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3618
+#: ../plug-ins/gradient-flare/gradient-flare.c:3724
+#: ../plug-ins/gradient-flare/gradient-flare.c:3861
+msgid "Hue rotation:"
+msgstr "Hue rotation:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3632
+msgid "G_low"
+msgstr "G_low"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3736
+msgid "# of Spikes:"
+msgstr "# of Spikes:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3748
+msgid "Spike thickness:"
+msgstr "Spike thickness:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3762
+msgid "_Rays"
+msgstr "_Rays"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3812
+msgid "Size factor gradient:"
+msgstr "Size factor gradient:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3816
+msgid "Probability gradient:"
+msgstr "Probability gradient:"
+
+#.
+#. *    Shape Radio Button Frame
+#.
+#: ../plug-ins/gradient-flare/gradient-flare.c:3878
+msgid "Shape of Second Flares"
+msgstr "Shape of Second Flares"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3886
+#: ../plug-ins/imagemap/imap_menu.c:222
+msgid "Circle"
+msgstr "Circle"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3903
+#: ../plug-ins/imagemap/imap_menu.c:224
+msgid "Polygon"
+msgstr "Polygon"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3936
+msgid "Random seed:"
+msgstr "Random seed:"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:3950
+msgid "_Second Flares"
+msgstr "_Second Flares"
+
+#: ../plug-ins/help-browser/dialog.c:186
+#: ../plug-ins/help-browser/dialog.c:1121
+msgid "GIMP Help Browser"
+msgstr "GIMP Help Browser"
+
+#: ../plug-ins/help-browser/dialog.c:564
+msgid "Go back one page"
+msgstr "Go back one page"
+
+#: ../plug-ins/help-browser/dialog.c:569
+msgid "Go forward one page"
+msgstr "Go forward one page"
+
+#: ../plug-ins/help-browser/dialog.c:574
+msgid "_Reload"
+msgstr "_Reload"
+
+#: ../plug-ins/help-browser/dialog.c:574
+msgid "Reload current page"
+msgstr "Reload current page"
+
+#: ../plug-ins/help-browser/dialog.c:579
+msgid "_Stop"
+msgstr "_Stop"
+
+#: ../plug-ins/help-browser/dialog.c:579
+msgid "Stop loading this page"
+msgstr "Stop loading this page"
+
+#: ../plug-ins/help-browser/dialog.c:584
+msgid "Go to the index page"
+msgstr "Go to the index page"
+
+#: ../plug-ins/help-browser/dialog.c:589
+msgid "C_opy location"
+msgstr "C_opy location"
+
+#: ../plug-ins/help-browser/dialog.c:590
+msgid "Copy the location of this page to the clipboard"
+msgstr "Copy the location of this page to the clipboard"
+
+#: ../plug-ins/help-browser/dialog.c:610
+msgid "Find text in current page"
+msgstr "Find text in current page"
+
+#: ../plug-ins/help-browser/dialog.c:615
+msgid "Find _Again"
+msgstr "Find _Again"
+
+#: ../plug-ins/help-browser/dialog.c:634
+msgid "S_how Index"
+msgstr "S_how Index"
+
+#: ../plug-ins/help-browser/dialog.c:635
+msgid "Toggle the visibility of the sidebar"
+msgstr "Toggle the visibility of the sidebar"
+
+#: ../plug-ins/help-browser/dialog.c:656
+msgid "Visit the GIMP documentation website"
+msgstr "Visit the GIMP documentation website"
+
+#: ../plug-ins/help-browser/dialog.c:1162
+msgid "Find:"
+msgstr "Find:"
+
+#: ../plug-ins/help-browser/dialog.c:1179
+msgctxt "search"
+msgid "_Previous"
+msgstr "_Previous"
+
+#: ../plug-ins/help-browser/dialog.c:1191
+msgctxt "search"
+msgid "_Next"
+msgstr "_Next"
+
+#: ../plug-ins/help/gimphelpdomain.c:181
+#, c-format
+msgid "The help pages for '%s' are not available."
+msgstr "The help pages for '%s' are not available."
+
+#: ../plug-ins/help/gimphelpdomain.c:187
+msgid "The GIMP user manual is not available."
+msgstr "The GIMP user manual is not available."
+
+#: ../plug-ins/help/gimphelpdomain.c:188
 msgid ""
 "Please install the additional help package or use the online user manual at "
 "http://docs.gimp.org/."
@@ -10335,20 +10629,21 @@ msgstr ""
 "Please install the additional help package or use the online user manual at "
 "http://docs.gimp.org/."
 
-#: ../plug-ins/help/gimphelpdomain.c:185
-msgid "There is a problem with the GIMP help files."
-msgstr "There is a problem with the GIMP help files."
-
-#: ../plug-ins/help/gimphelpdomain.c:187
-msgid "Please check your installation."
-msgstr "Please check your installation."
-
 #: ../plug-ins/help/gimphelpdomain.c:197
+msgid "Perhaps you are missing GIO backends and need to install GVFS?"
+msgstr "Perhaps you are missing GIO backends and need to install GVFS?"
+
+#: ../plug-ins/help/gimphelpdomain.c:216
 #, c-format
 msgid "Help ID '%s' unknown"
 msgstr "Help ID '%s' unknown"
 
-#: ../plug-ins/help/gimphelplocale.c:215
+#: ../plug-ins/help/gimphelplocale.c:209
+#, c-format
+msgid "Loading index from '%s'"
+msgstr "Loading index from '%s'"
+
+#: ../plug-ins/help/gimphelplocale.c:267
 #, c-format
 msgid ""
 "Parse error in '%s':\n"
@@ -10357,190 +10652,179 @@ msgstr ""
 "Parse error in '%s':\n"
 "%s"
 
-#: ../plug-ins/helpbrowser/dialog.c:217
-msgid "GIMP Help Browser"
-msgstr "GIMP Help Browser"
-
-#: ../plug-ins/helpbrowser/dialog.c:312
-msgid "Drag and drop this icon to a web browser"
-msgstr "Drag and drop this icon to a web browser"
-
-#: ../plug-ins/helpbrowser/dialog.c:703
-msgid "Go back one page"
-msgstr "Go back one page"
-
-#: ../plug-ins/helpbrowser/dialog.c:708
-msgid "Go forward one page"
-msgstr "Go forward one page"
-
-#: ../plug-ins/helpbrowser/dialog.c:713
-msgid "Go to the index page"
-msgstr "Go to the index page"
-
-#: ../plug-ins/helpbrowser/dialog.c:748
-msgid "Visit the GIMP documentation website"
-msgstr "Visit the GIMP documentation website"
-
-#: ../plug-ins/helpbrowser/dialog.c:824
-msgid "Document not found"
-msgstr "Document not found"
-
-#: ../plug-ins/helpbrowser/dialog.c:826
-msgid "The requested URL could not be loaded:"
-msgstr "The requested URL could not be loaded:"
-
-#: ../plug-ins/ifscompose/ifscompose.c:333
+#: ../plug-ins/ifs-compose/ifs-compose.c:334
 msgid "Create an Iterated Function System (IFS) fractal"
 msgstr "Create an Iterated Function System (IFS) fractal"
 
-#: ../plug-ins/ifscompose/ifscompose.c:345
+#: ../plug-ins/ifs-compose/ifs-compose.c:346
 msgid "_IFS Fractal..."
 msgstr "_IFS Fractal..."
 
+#. X
+#: ../plug-ins/ifs-compose/ifs-compose.c:526
+#: ../plug-ins/lighting/lighting-ui.c:527
+#: ../plug-ins/map-object/map-object-ui.c:675
+#: ../plug-ins/map-object/map-object-ui.c:729
+#: ../plug-ins/map-object/map-object-ui.c:997
+#: ../plug-ins/map-object/map-object-ui.c:1046
+msgid "X:"
+msgstr "X:"
+
+#. Y
+#: ../plug-ins/ifs-compose/ifs-compose.c:540
+#: ../plug-ins/lighting/lighting-ui.c:541
+#: ../plug-ins/map-object/map-object-ui.c:689
+#: ../plug-ins/map-object/map-object-ui.c:742
+#: ../plug-ins/map-object/map-object-ui.c:1010
+#: ../plug-ins/map-object/map-object-ui.c:1057
+#: ../plug-ins/map-object/map-object-ui.c:1155
+msgid "Y:"
+msgstr "Y:"
+
 #. Asym
-#: ../plug-ins/ifscompose/ifscompose.c:581
+#: ../plug-ins/ifs-compose/ifs-compose.c:582
 msgid "Asymmetry:"
 msgstr "Asymmetry:"
 
 #. Shear
-#: ../plug-ins/ifscompose/ifscompose.c:595
+#: ../plug-ins/ifs-compose/ifs-compose.c:596
 msgid "Shear:"
 msgstr "Shear:"
 
 #. Simple color control section
-#: ../plug-ins/ifscompose/ifscompose.c:640
+#: ../plug-ins/ifs-compose/ifs-compose.c:641
 msgid "Simple"
 msgstr "Simple"
 
-#: ../plug-ins/ifscompose/ifscompose.c:649
+#: ../plug-ins/ifs-compose/ifs-compose.c:650
 msgid "IFS Fractal: Target"
 msgstr "IFS Fractal: Target"
 
-#: ../plug-ins/ifscompose/ifscompose.c:655
+#: ../plug-ins/ifs-compose/ifs-compose.c:656
 msgid "Scale hue by:"
 msgstr "Scale hue by:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:670
+#: ../plug-ins/ifs-compose/ifs-compose.c:671
 msgid "Scale value by:"
 msgstr "Scale value by:"
 
 #. Full color control section
-#: ../plug-ins/ifscompose/ifscompose.c:687
+#: ../plug-ins/ifs-compose/ifs-compose.c:688
 msgid "Full"
 msgstr "Full"
 
-#: ../plug-ins/ifscompose/ifscompose.c:695
+#: ../plug-ins/ifs-compose/ifs-compose.c:696
 msgid "IFS Fractal: Red"
 msgstr "IFS Fractal: Red"
 
-#: ../plug-ins/ifscompose/ifscompose.c:703
+#: ../plug-ins/ifs-compose/ifs-compose.c:704
 msgid "IFS Fractal: Green"
 msgstr "IFS Fractal: Green"
 
-#: ../plug-ins/ifscompose/ifscompose.c:711
+#: ../plug-ins/ifs-compose/ifs-compose.c:712
 msgid "IFS Fractal: Blue"
 msgstr "IFS Fractal: Blue"
 
-#: ../plug-ins/ifscompose/ifscompose.c:719
+#: ../plug-ins/ifs-compose/ifs-compose.c:720
 msgid "IFS Fractal: Black"
 msgstr "IFS Fractal: Black"
 
-#: ../plug-ins/ifscompose/ifscompose.c:769
+#: ../plug-ins/ifs-compose/ifs-compose.c:770
 msgid "IFS Fractal"
 msgstr "IFS Fractal"
 
-#: ../plug-ins/ifscompose/ifscompose.c:867
+#: ../plug-ins/ifs-compose/ifs-compose.c:868
 msgid "Spatial Transformation"
 msgstr "Spatial Transformation"
 
-#: ../plug-ins/ifscompose/ifscompose.c:873
+#: ../plug-ins/ifs-compose/ifs-compose.c:874
 msgid "Color Transformation"
 msgstr "Colour Transformation"
 
-#: ../plug-ins/ifscompose/ifscompose.c:883
+#: ../plug-ins/ifs-compose/ifs-compose.c:884
 msgid "Relative probability:"
 msgstr "Relative probability:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1058
+#: ../plug-ins/ifs-compose/ifs-compose.c:1059
 #: ../plug-ins/imagemap/imap_menu.c:163
 msgid "Select _All"
 msgstr "Select _All"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1062
+#: ../plug-ins/ifs-compose/ifs-compose.c:1063
 msgid "Re_center"
 msgstr "Re_centre"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1062
+#: ../plug-ins/ifs-compose/ifs-compose.c:1063
 msgid "Recompute Center"
 msgstr "Recompute Centre"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1066
+#: ../plug-ins/ifs-compose/ifs-compose.c:1067
 msgid "Render Options"
 msgstr "Render Options"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1072
+#: ../plug-ins/ifs-compose/ifs-compose.c:1073
 #: ../plug-ins/imagemap/imap_cmd_move.c:86
 #: ../plug-ins/imagemap/imap_cmd_object_move.c:57
 msgid "Move"
 msgstr "Move"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1075
+#: ../plug-ins/ifs-compose/ifs-compose.c:1076
 msgid "Rotate"
 msgstr "Rotate"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1075
+#: ../plug-ins/ifs-compose/ifs-compose.c:1076
 msgid "Rotate / Scale"
 msgstr "Rotate / Scale"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1078
+#: ../plug-ins/ifs-compose/ifs-compose.c:1079
 msgid "Stretch"
 msgstr "Stretch"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1176
+#: ../plug-ins/ifs-compose/ifs-compose.c:1177
 msgid "IFS Fractal Render Options"
 msgstr "IFS Fractal Render Options"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1197
+#: ../plug-ins/ifs-compose/ifs-compose.c:1199
 msgid "Max. memory:"
 msgstr "Max. memory:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1224
+#: ../plug-ins/ifs-compose/ifs-compose.c:1226
 msgid "Subdivide:"
 msgstr "Subdivide:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1237
+#: ../plug-ins/ifs-compose/ifs-compose.c:1239
 msgid "Spot radius:"
 msgstr "Spot radius:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1302
+#: ../plug-ins/ifs-compose/ifs-compose.c:1304
 #, c-format
 msgid "Rendering IFS (%d/%d)"
 msgstr "Rendering IFS (%d/%d)"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1468
+#: ../plug-ins/ifs-compose/ifs-compose.c:1470
 #, c-format
 msgid "Transformation %s"
 msgstr "Transformation %s"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2381
+#: ../plug-ins/ifs-compose/ifs-compose.c:2379
 msgid "Save failed"
 msgstr "Save failed"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2462
-#: ../plug-ins/ifscompose/ifscompose.c:2475
+#: ../plug-ins/ifs-compose/ifs-compose.c:2460
+#: ../plug-ins/ifs-compose/ifs-compose.c:2473
 msgid "Open failed"
 msgstr "Open failed"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2470
+#: ../plug-ins/ifs-compose/ifs-compose.c:2468
 #, c-format
 msgid "File '%s' doesn't seem to be an IFS Fractal file."
 msgstr "File '%s' doesn't seem to be an IFS Fractal file."
 
-#: ../plug-ins/ifscompose/ifscompose.c:2510
+#: ../plug-ins/ifs-compose/ifs-compose.c:2508
 msgid "Save as IFS Fractal file"
 msgstr "Save as IFS Fractal file"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2547
+#: ../plug-ins/ifs-compose/ifs-compose.c:2545
 msgid "Open IFS Fractal file"
 msgstr "Open IFS Fractal file"
 
@@ -10667,7 +10951,7 @@ msgid ""
 "suitable for navigation bars."
 msgstr ""
 "Guides are pre-defined rectangles covering the image. You define them by "
-"their width, height, and spacing from each other. This allows you to rapidly "
+"their width, height and spacing from each other. This allows you to rapidly "
 "create the most common image map type - image collection of \"thumbnails\", "
 "suitable for navigation bars."
 
@@ -10745,11 +11029,6 @@ msgstr "Paste"
 msgid "Select"
 msgstr "Select"
 
-#: ../plug-ins/imagemap/imap_cmd_select_all.c:51
-#: ../plug-ins/rcm/rcm_stock.c:41
-msgid "Select All"
-msgstr "Select All"
-
 #: ../plug-ins/imagemap/imap_cmd_select_next.c:51
 msgid "Select Next"
 msgstr "Select Next"
@@ -10919,49 +11198,49 @@ msgstr "pixels from _top"
 msgid "_Preview"
 msgstr "_Preview"
 
-#: ../plug-ins/imagemap/imap_main.c:124
+#: ../plug-ins/imagemap/imap_main.c:122
 msgid "Create a clickable imagemap"
 msgstr "Create a clickable imagemap"
 
-#: ../plug-ins/imagemap/imap_main.c:129
+#: ../plug-ins/imagemap/imap_main.c:127
 msgid "_Image Map..."
 msgstr "_Image Map..."
 
-#: ../plug-ins/imagemap/imap_main.c:519
+#: ../plug-ins/imagemap/imap_main.c:517
 #: ../plug-ins/imagemap/imap_settings.c:171
 msgid ""
 msgstr ""
 
-#: ../plug-ins/imagemap/imap_main.c:662
+#: ../plug-ins/imagemap/imap_main.c:660
 msgid "Some data has been changed!"
 msgstr "Some data has been changed!"
 
-#: ../plug-ins/imagemap/imap_main.c:665
+#: ../plug-ins/imagemap/imap_main.c:663
 msgid "Do you really want to discard your changes?"
 msgstr "Do you really want to discard your changes?"
 
-#: ../plug-ins/imagemap/imap_main.c:875
+#: ../plug-ins/imagemap/imap_main.c:873
 #, c-format
 msgid "File \"%s\" saved."
 msgstr "File \"%s\" saved."
 
-#: ../plug-ins/imagemap/imap_main.c:879
+#: ../plug-ins/imagemap/imap_main.c:877
 msgid "Couldn't save file:"
 msgstr "Couldn't save file:"
 
-#: ../plug-ins/imagemap/imap_main.c:892
+#: ../plug-ins/imagemap/imap_main.c:890
 msgid "Image size has changed."
 msgstr "Image size has changed."
 
-#: ../plug-ins/imagemap/imap_main.c:893
+#: ../plug-ins/imagemap/imap_main.c:891
 msgid "Resize area's?"
 msgstr "Resize area's?"
 
-#: ../plug-ins/imagemap/imap_main.c:927
+#: ../plug-ins/imagemap/imap_main.c:925
 msgid "Couldn't read file:"
 msgstr "Couldn't read file:"
 
-#: ../plug-ins/imagemap/imap_main.c:974
+#: ../plug-ins/imagemap/imap_main.c:972
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
@@ -11096,6 +11375,10 @@ msgstr "_Help"
 msgid "_Contents"
 msgstr "_Contents"
 
+#: ../plug-ins/imagemap/imap_menu.c:203
+msgid "_Zoom"
+msgstr "_Zoom"
+
 #: ../plug-ins/imagemap/imap_menu.c:208
 msgid "Area List"
 msgstr "Area List"
@@ -11284,218 +11567,590 @@ msgstr "Map File Format"
 msgid "View Source"
 msgstr "View Source"
 
-#: ../plug-ins/jpeg/jpeg-exif.c:288
-msgid "Rotate Image?"
-msgstr "Rotate Image?"
+#: ../plug-ins/lighting/lighting-apply.c:105
+#: ../plug-ins/lighting/lighting-ui.c:1019
+msgid "Lighting Effects"
+msgstr "Lighting Effects"
 
-#: ../plug-ins/jpeg/jpeg-exif.c:291
-msgid "_Keep Orientation"
-msgstr "_Keep Orientation"
+#: ../plug-ins/lighting/lighting-main.c:192
+msgid "Apply various lighting effects to an image"
+msgstr "Apply various lighting effects to an image"
 
-#: ../plug-ins/jpeg/jpeg-exif.c:347
-msgid "According to the EXIF data, this image is rotated."
-msgstr "According to the EXIF data, this image is rotated."
+#: ../plug-ins/lighting/lighting-main.c:197
+msgid "_Lighting Effects..."
+msgstr "_Lighting Effects..."
 
-#: ../plug-ins/jpeg/jpeg-exif.c:362
-msgid "Would you like GIMP to rotate it into the standard orientation?"
-msgstr "Would you like GIMP to rotate it into the standard orientation?"
+#. General options
+#: ../plug-ins/lighting/lighting-ui.c:295
+#: ../plug-ins/map-object/map-object-ui.c:472
+msgid "General Options"
+msgstr "General Options"
 
-#: ../plug-ins/jpeg/jpeg-load.c:241
-msgid "JPEG preview"
-msgstr "JPEG preview"
+#: ../plug-ins/lighting/lighting-ui.c:303
+msgid "T_ransparent background"
+msgstr "T_ransparent background"
 
-#: ../plug-ins/jpeg/jpeg-load.c:626 ../plug-ins/psd/psd-thumb-load.c:83
-#: ../plug-ins/winicon/icoload.c:722
-#, c-format
-msgid "Opening thumbnail for '%s'"
-msgstr "Opening thumbnail for '%s'"
+#: ../plug-ins/lighting/lighting-ui.c:313
+msgid "Make destination image transparent where bump height is zero"
+msgstr "Make destination image transparent where bump height is zero"
 
-#: ../plug-ins/jpeg/jpeg-save.c:198
-#, c-format
-msgid "File size: %02.01f kB"
-msgstr "File size: %02.01f kB"
+#: ../plug-ins/lighting/lighting-ui.c:316
+msgid "Cre_ate new image"
+msgstr "Cre_ate new image"
 
-#: ../plug-ins/jpeg/jpeg-save.c:673
-msgid "Calculating file size..."
-msgstr "Calculating file size..."
+#: ../plug-ins/lighting/lighting-ui.c:326
+#: ../plug-ins/map-object/map-object-ui.c:541
+msgid "Create a new image when applying filter"
+msgstr "Create a new image when applying filter"
 
-#: ../plug-ins/jpeg/jpeg-save.c:764 ../plug-ins/jpeg/jpeg-save.c:868
-msgid "File size: unknown"
-msgstr "File size: unknown"
+#: ../plug-ins/lighting/lighting-ui.c:328
+msgid "High _quality preview"
+msgstr "High _quality preview"
 
-#: ../plug-ins/jpeg/jpeg-save.c:819
-msgid "Save as JPEG"
-msgstr "Save as JPEG"
+#: ../plug-ins/lighting/lighting-ui.c:338
+msgid "Enable/disable high quality preview"
+msgstr "Enable/disable high quality preview"
 
-#: ../plug-ins/jpeg/jpeg-save.c:854
-msgid "_Quality:"
-msgstr "_Quality:"
+#: ../plug-ins/lighting/lighting-ui.c:345
+msgid "Distance:"
+msgstr "Distance:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:858
-msgid "JPEG quality parameter"
-msgstr "JPEG quality parameter"
+#: ../plug-ins/lighting/lighting-ui.c:378
+#: ../plug-ins/map-object/map-object-ui.c:619
+msgid "Light Settings"
+msgstr "Light Settings"
 
-#: ../plug-ins/jpeg/jpeg-save.c:877
-msgid "Enable preview to obtain the file size."
-msgstr "Enable preview to obtain the file size."
+#: ../plug-ins/lighting/lighting-ui.c:391
+msgid "Light 1"
+msgstr "Light 1"
 
-#: ../plug-ins/jpeg/jpeg-save.c:880
-msgid "Show _preview in image window"
-msgstr "Show _preview in image window"
+#: ../plug-ins/lighting/lighting-ui.c:392
+msgid "Light 2"
+msgstr "Light 2"
 
-#: ../plug-ins/jpeg/jpeg-save.c:921
-msgid "_Smoothing:"
-msgstr "_Smoothing:"
+#: ../plug-ins/lighting/lighting-ui.c:393
+msgid "Light 3"
+msgstr "Light 3"
 
-#: ../plug-ins/jpeg/jpeg-save.c:934
-msgid "Frequency (rows):"
-msgstr "Frequency (rows):"
+#: ../plug-ins/lighting/lighting-ui.c:394
+msgid "Light 4"
+msgstr "Light 4"
 
-#: ../plug-ins/jpeg/jpeg-save.c:950
-msgid "Use restart markers"
-msgstr "Use restart markers"
+#: ../plug-ins/lighting/lighting-ui.c:395
+msgid "Light 5"
+msgstr "Light 5"
 
-#: ../plug-ins/jpeg/jpeg-save.c:966 ../plug-ins/xjt/xjt.c:877
-msgid "Optimize"
-msgstr "Optimise"
+#: ../plug-ins/lighting/lighting-ui.c:396
+msgid "Light 6"
+msgstr "Light 6"
 
-#: ../plug-ins/jpeg/jpeg-save.c:979
-msgid "Progressive"
-msgstr "Progressive"
+#: ../plug-ins/lighting/lighting-ui.c:410
+msgid "Color:"
+msgstr "Colour:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:994
-msgid "Save EXIF data"
-msgstr "Save EXIF data"
+#: ../plug-ins/lighting/lighting-ui.c:417
+msgid "Directional"
+msgstr "Directional"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1011
-msgid "Save thumbnail"
-msgstr "Save thumbnail"
+#: ../plug-ins/lighting/lighting-ui.c:418
+msgid "Point"
+msgstr "Point"
 
-#. XMP metadata
-#: ../plug-ins/jpeg/jpeg-save.c:1027
-msgid "Save XMP data"
-msgstr "Save XMP data"
+#: ../plug-ins/lighting/lighting-ui.c:432
+#: ../plug-ins/map-object/map-object-ui.c:642
+msgid "Type of light source to apply"
+msgstr "Type of light source to apply"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1042
-msgid "Use quality settings from original image"
-msgstr "Use quality settings from original image"
+#: ../plug-ins/lighting/lighting-ui.c:434
+#: ../plug-ins/map-object/map-object-ui.c:644
+msgid "Select lightsource color"
+msgstr "Select lightsource colour"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1048
-msgid ""
-"If the original image was loaded from a JPEG file using non-standard quality "
-"settings (quantization tables), enable this option to get almost the same "
-"quality and file size."
-msgstr ""
-"If the original image was loaded from a JPEG file using non-standard quality "
-"settings (quantisation tables), enable this option to get almost the same "
-"quality and file size."
+#: ../plug-ins/lighting/lighting-ui.c:448
+#: ../plug-ins/map-object/map-object-ui.c:657
+msgid "Set light source color"
+msgstr "Set light source colour"
 
-#. Subsampling
-#: ../plug-ins/jpeg/jpeg-save.c:1072
-msgid "Subsampling:"
-msgstr "Subsampling:"
+#: ../plug-ins/lighting/lighting-ui.c:456
+msgid "_Intensity:"
+msgstr "_Intensity:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1079
-msgid "1x1,1x1,1x1 (best quality)"
-msgstr "1x1,1x1,1x1 (best quality)"
+#: ../plug-ins/lighting/lighting-ui.c:464
+msgid "Light intensity"
+msgstr "Light intensity"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1080
-msgid "2x1,1x1,1x1 (4:2:2)"
-msgstr "2x1,1x1,1x1 (4:2:2)"
+#: ../plug-ins/lighting/lighting-ui.c:467
+#: ../plug-ins/map-object/map-object-ui.c:659
+#: ../plug-ins/map-object/map-object-ui.c:986
+#: ../plug-ins/print/print-page-layout.c:343
+msgid "Position"
+msgstr "Position"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1081
-msgid "1x2,1x1,1x1"
-msgstr "1x2,1x1,1x1"
+#: ../plug-ins/lighting/lighting-ui.c:485
+#: ../plug-ins/map-object/map-object-ui.c:683
+msgid "Light source X position in XYZ space"
+msgstr "Light source X position in XYZ space"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1082
-msgid "2x2,1x1,1x1 (smallest file)"
-msgstr "2x2,1x1,1x1 (smallest file)"
+#: ../plug-ins/lighting/lighting-ui.c:500
+#: ../plug-ins/map-object/map-object-ui.c:697
+msgid "Light source Y position in XYZ space"
+msgstr "Light source Y position in XYZ space"
 
-#. DCT method
-#: ../plug-ins/jpeg/jpeg-save.c:1106
-msgid "DCT method:"
-msgstr "DCT method:"
+#: ../plug-ins/lighting/lighting-ui.c:507
+msgid "_Z:"
+msgstr "_Z:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1112
-msgid "Fast Integer"
-msgstr "Fast Integer"
+#: ../plug-ins/lighting/lighting-ui.c:515
+#: ../plug-ins/map-object/map-object-ui.c:711
+msgid "Light source Z position in XYZ space"
+msgstr "Light source Z position in XYZ space"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1113
-msgid "Integer"
-msgstr "Integer"
+#: ../plug-ins/lighting/lighting-ui.c:535
+#: ../plug-ins/map-object/map-object-ui.c:737
+msgid "Light source X direction in XYZ space"
+msgstr "Light source X direction in XYZ space"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1114
-msgid "Floating-Point"
-msgstr "Floating-Point"
+#: ../plug-ins/lighting/lighting-ui.c:549
+#: ../plug-ins/map-object/map-object-ui.c:750
+msgid "Light source Y direction in XYZ space"
+msgstr "Light source Y direction in XYZ space"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1128
-msgid "Comment"
-msgstr "Comment"
+#: ../plug-ins/lighting/lighting-ui.c:555
+#: ../plug-ins/map-object/map-object-ui.c:703
+#: ../plug-ins/map-object/map-object-ui.c:755
+#: ../plug-ins/map-object/map-object-ui.c:1023
+#: ../plug-ins/map-object/map-object-ui.c:1068
+#: ../plug-ins/map-object/map-object-ui.c:1167
+msgid "Z:"
+msgstr "Z:"
 
-#: ../plug-ins/jpeg/jpeg.c:137 ../plug-ins/jpeg/jpeg.c:175
-msgid "JPEG image"
-msgstr "JPEG image"
+#: ../plug-ins/lighting/lighting-ui.c:563
+#: ../plug-ins/map-object/map-object-ui.c:763
+msgid "Light source Z direction in XYZ space"
+msgstr "Light source Z direction in XYZ space"
 
-#: ../plug-ins/jpeg/jpeg.c:301
-msgid "Export Preview"
-msgstr "Export Preview"
+#: ../plug-ins/lighting/lighting-ui.c:566
+msgid "I_solate"
+msgstr "I_solate"
 
-#: ../plug-ins/maze/algorithms.c:289
+#: ../plug-ins/lighting/lighting-ui.c:575
+msgid "Lighting preset:"
+msgstr "Lighting preset:"
+
+#: ../plug-ins/lighting/lighting-ui.c:621
+msgid "Material Properties"
+msgstr "Material Properties"
+
+#: ../plug-ins/lighting/lighting-ui.c:639
+msgid "_Glowing:"
+msgstr "_Glowing:"
+
+#: ../plug-ins/lighting/lighting-ui.c:658
+#: ../plug-ins/map-object/map-object-ui.c:824
+msgid "Amount of original color to show where no direct light falls"
+msgstr "Amount of original colour to show where no direct light falls"
+
+#: ../plug-ins/lighting/lighting-ui.c:672
+msgid "_Bright:"
+msgstr "_Bright:"
+
+#: ../plug-ins/lighting/lighting-ui.c:691
+#: ../plug-ins/map-object/map-object-ui.c:853
+msgid "Intensity of original color when lit by a light source"
+msgstr "Intensity of original colour when lit by a light source"
+
+#: ../plug-ins/lighting/lighting-ui.c:705
+msgid "_Shiny:"
+msgstr "_Shiny:"
+
+#: ../plug-ins/lighting/lighting-ui.c:724
+#: ../plug-ins/map-object/map-object-ui.c:925
+msgid "Controls how intense the highlights will be"
+msgstr "Controls how intense the highlights will be"
+
+#: ../plug-ins/lighting/lighting-ui.c:737
+msgid "_Polished:"
+msgstr "_Polished:"
+
+#: ../plug-ins/lighting/lighting-ui.c:756
+#: ../plug-ins/map-object/map-object-ui.c:954
+msgid "Higher values makes the highlights more focused"
+msgstr "Higher values makes the highlights more focused"
+
+#. Metallic
+#: ../plug-ins/lighting/lighting-ui.c:766
+msgid "_Metallic"
+msgstr "_Metallic"
+
+#: ../plug-ins/lighting/lighting-ui.c:803
+msgid "E_nable bump mapping"
+msgstr "E_nable bump mapping"
+
+#: ../plug-ins/lighting/lighting-ui.c:817
+msgid "Enable/disable bump-mapping (image depth)"
+msgstr "Enable/disable bump-mapping (image depth)"
+
+#: ../plug-ins/lighting/lighting-ui.c:839
+msgid "Bumpm_ap image:"
+msgstr "Bumpm_ap image:"
+
+#: ../plug-ins/lighting/lighting-ui.c:843
+msgid "Logarithmic"
+msgstr "Logarithmic"
+
+#: ../plug-ins/lighting/lighting-ui.c:855
+msgid "Cu_rve:"
+msgstr "Cu_rve:"
+
+#: ../plug-ins/lighting/lighting-ui.c:860
+msgid "Ma_ximum height:"
+msgstr "Ma_ximum height:"
+
+#: ../plug-ins/lighting/lighting-ui.c:870
+msgid "Maximum height for bumps"
+msgstr "Maximum height for bumps"
+
+#: ../plug-ins/lighting/lighting-ui.c:894
+msgid "E_nable environment mapping"
+msgstr "E_nable environment mapping"
+
+#: ../plug-ins/lighting/lighting-ui.c:908
+msgid "Enable/disable environment-mapping (reflection)"
+msgstr "Enable/disable environment-mapping (reflection)"
+
+#: ../plug-ins/lighting/lighting-ui.c:925
+msgid "En_vironment image:"
+msgstr "En_vironment image:"
+
+#: ../plug-ins/lighting/lighting-ui.c:928
+msgid "Environment image to use"
+msgstr "Environment image to use"
+
+#: ../plug-ins/lighting/lighting-ui.c:950
+msgid "Op_tions"
+msgstr "Op_tions"
+
+#: ../plug-ins/lighting/lighting-ui.c:954
+#: ../plug-ins/map-object/map-object-ui.c:1291
+msgid "_Light"
+msgstr "_Light"
+
+#: ../plug-ins/lighting/lighting-ui.c:958
+#: ../plug-ins/map-object/map-object-ui.c:1295
+msgid "_Material"
+msgstr "_Material"
+
+#: ../plug-ins/lighting/lighting-ui.c:962
+msgid "_Bump Map"
+msgstr "_Bump Map"
+
+#: ../plug-ins/lighting/lighting-ui.c:966
+msgid "_Environment Map"
+msgstr "_Environment Map"
+
+#: ../plug-ins/lighting/lighting-ui.c:1082
+#: ../plug-ins/map-object/map-object-ui.c:1397
+msgid "Recompute preview image"
+msgstr "Recompute preview image"
+
+#: ../plug-ins/lighting/lighting-ui.c:1084
+msgid "I_nteractive"
+msgstr "I_nteractive"
+
+#: ../plug-ins/lighting/lighting-ui.c:1098
+msgid "Enable/disable real time preview of changes"
+msgstr "Enable/disable real time preview of changes"
+
+#: ../plug-ins/lighting/lighting-ui.c:1137
+msgid "Save Lighting Preset"
+msgstr "Save Lighting Preset"
+
+#: ../plug-ins/lighting/lighting-ui.c:1281
+msgid "Load Lighting Preset"
+msgstr "Load Lighting Preset"
+
+#: ../plug-ins/map-object/map-object-apply.c:276
+msgid "Map to plane"
+msgstr "Map to plane"
+
+#: ../plug-ins/map-object/map-object-apply.c:279
+msgid "Map to sphere"
+msgstr "Map to sphere"
+
+#: ../plug-ins/map-object/map-object-apply.c:282
+msgid "Map to box"
+msgstr "Map to box"
+
+#: ../plug-ins/map-object/map-object-apply.c:285
+msgid "Map to cylinder"
+msgstr "Map to cylinder"
+
+#: ../plug-ins/map-object/map-object-main.c:193
+msgid "Map the image to an object (plane, sphere, box or cylinder)"
+msgstr "Map the image to an object (plane, sphere, box or cylinder)"
+
+#: ../plug-ins/map-object/map-object-main.c:198
+msgid "Map _Object..."
+msgstr "Map _Object..."
+
+#: ../plug-ins/map-object/map-object-ui.c:248
+#: ../plug-ins/map-object/map-object-ui.c:1305
+msgid "_Box"
+msgstr "_Box"
+
+#: ../plug-ins/map-object/map-object-ui.c:266
+#: ../plug-ins/map-object/map-object-ui.c:1311
+msgid "C_ylinder"
+msgstr "C_ylinder"
+
+#: ../plug-ins/map-object/map-object-ui.c:484
+msgid "Map to:"
+msgstr "Map to:"
+
+#: ../plug-ins/map-object/map-object-ui.c:488
+msgid "Plane"
+msgstr "Plane"
+
+#: ../plug-ins/map-object/map-object-ui.c:489
+msgid "Sphere"
+msgstr "Sphere"
+
+#: ../plug-ins/map-object/map-object-ui.c:490
+msgid "Box"
+msgstr "Box"
+
+#: ../plug-ins/map-object/map-object-ui.c:501
+msgid "Type of object to map to"
+msgstr "Type of object to map to"
+
+#: ../plug-ins/map-object/map-object-ui.c:503
+msgid "Transparent background"
+msgstr "Transparent background"
+
+#: ../plug-ins/map-object/map-object-ui.c:514
+msgid "Make image transparent outside object"
+msgstr "Make image transparent outside object"
+
+#: ../plug-ins/map-object/map-object-ui.c:516
+msgid "Tile source image"
+msgstr "Tile source image"
+
+#: ../plug-ins/map-object/map-object-ui.c:527
+msgid "Tile source image: useful for infinite planes"
+msgstr "Tile source image: useful for infinite planes"
+
+#: ../plug-ins/map-object/map-object-ui.c:530
+msgid "Create new image"
+msgstr "Create new image"
+
+#: ../plug-ins/map-object/map-object-ui.c:549
+msgid "Enable _antialiasing"
+msgstr "Enable _antialiasing"
+
+#: ../plug-ins/map-object/map-object-ui.c:560
+msgid "Enable/disable jagged edges removal (antialiasing)"
+msgstr "Enable/disable jagged edges removal (antialiasing)"
+
+#: ../plug-ins/map-object/map-object-ui.c:576
+msgid "Antialiasing quality. Higher is better, but slower"
+msgstr "Antialiasing quality. Higher is better, but slower"
+
+#: ../plug-ins/map-object/map-object-ui.c:593
+msgid "Stop when pixel differences are smaller than this value"
+msgstr "Stop when pixel differences are smaller than this value"
+
+#: ../plug-ins/map-object/map-object-ui.c:628
+msgid "Point light"
+msgstr "Point light"
+
+#: ../plug-ins/map-object/map-object-ui.c:629
+msgid "Directional light"
+msgstr "Directional light"
+
+#: ../plug-ins/map-object/map-object-ui.c:630
+msgid "No light"
+msgstr "No light"
+
+#: ../plug-ins/map-object/map-object-ui.c:635
+msgid "Lightsource type:"
+msgstr "Lightsource type:"
+
+#: ../plug-ins/map-object/map-object-ui.c:649
+msgid "Lightsource color:"
+msgstr "Lightsource colour:"
+
+#: ../plug-ins/map-object/map-object-ui.c:714
+msgid "Direction Vector"
+msgstr "Direction Vector"
+
+#: ../plug-ins/map-object/map-object-ui.c:790
+msgid "Intensity Levels"
+msgstr "Intensity Levels"
+
+#: ../plug-ins/map-object/map-object-ui.c:809
+msgid "Ambient:"
+msgstr "Ambient:"
+
+#: ../plug-ins/map-object/map-object-ui.c:838
+#: ../plug-ins/map-object/map-object-ui.c:881
+msgid "Diffuse:"
+msgstr "Diffuse:"
+
+#: ../plug-ins/map-object/map-object-ui.c:862
+msgid "Reflectivity"
+msgstr "Reflectivity"
+
+#: ../plug-ins/map-object/map-object-ui.c:896
+msgid "Higher values makes the object reflect more light (appear lighter)"
+msgstr "Higher values makes the object reflect more light (appear lighter)"
+
+#: ../plug-ins/map-object/map-object-ui.c:910
+msgid "Specular:"
+msgstr "Specular:"
+
+#: ../plug-ins/map-object/map-object-ui.c:939
+msgid "Highlight:"
+msgstr "Highlight:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1000
+msgid "Object X position in XYZ space"
+msgstr "Object X position in XYZ space"
+
+#: ../plug-ins/map-object/map-object-ui.c:1013
+msgid "Object Y position in XYZ space"
+msgstr "Object Y position in XYZ space"
+
+#: ../plug-ins/map-object/map-object-ui.c:1026
+msgid "Object Z position in XYZ space"
+msgstr "Object Z position in XYZ space"
+
+#: ../plug-ins/map-object/map-object-ui.c:1049
+msgid "Rotation angle about X axis"
+msgstr "Rotation angle about X axis"
+
+#: ../plug-ins/map-object/map-object-ui.c:1060
+msgid "Rotation angle about Y axis"
+msgstr "Rotation angle about Y axis"
+
+#: ../plug-ins/map-object/map-object-ui.c:1071
+msgid "Rotation angle about Z axis"
+msgstr "Rotation angle about Z axis"
+
+#: ../plug-ins/map-object/map-object-ui.c:1097
+msgid "Front:"
+msgstr "Front:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1097
+msgid "Back:"
+msgstr "Back:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1105
+msgid "Map Images to Box Faces"
+msgstr "Map Images to Box Faces"
+
+#: ../plug-ins/map-object/map-object-ui.c:1146
+msgid "X scale (size)"
+msgstr "X scale (size)"
+
+#: ../plug-ins/map-object/map-object-ui.c:1158
+msgid "Y scale (size)"
+msgstr "Y scale (size)"
+
+#: ../plug-ins/map-object/map-object-ui.c:1170
+msgid "Z scale (size)"
+msgstr "Z scale (size)"
+
+#: ../plug-ins/map-object/map-object-ui.c:1193
+#: ../plug-ins/print/print-page-layout.c:402
+msgid "_Top:"
+msgstr "_Top:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1193
+#: ../plug-ins/print/print-page-layout.c:421
+msgid "_Bottom:"
+msgstr "_Bottom:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1198
+msgid "Images for the Cap Faces"
+msgstr "Images for the Cap Faces"
+
+#: ../plug-ins/map-object/map-object-ui.c:1227
+#: ../plug-ins/print/print-page-layout.c:219
+msgid "Size"
+msgstr "Size"
+
+#: ../plug-ins/map-object/map-object-ui.c:1238
+msgid "R_adius:"
+msgstr "R_adius:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1242
+msgid "Cylinder radius"
+msgstr "Cylinder radius"
+
+#: ../plug-ins/map-object/map-object-ui.c:1256
+msgid "Cylinder length"
+msgstr "Cylinder length"
+
+#: ../plug-ins/map-object/map-object-ui.c:1287
+msgid "O_ptions"
+msgstr "O_ptions"
+
+#: ../plug-ins/map-object/map-object-ui.c:1299
+msgid "O_rientation"
+msgstr "O_rientation"
+
+#: ../plug-ins/map-object/map-object-ui.c:1335
+msgid "Map to Object"
+msgstr "Map to Object"
+
+#: ../plug-ins/map-object/map-object-ui.c:1415
+msgid "Show preview _wireframe"
+msgstr "Show preview _wireframe"
+
+#: ../plug-ins/maze/maze-algorithms.c:279
 msgid "Constructing maze using Prim's Algorithm"
 msgstr "Constructing maze using Prim's Algorithm"
 
-#: ../plug-ins/maze/algorithms.c:465
+#: ../plug-ins/maze/maze-algorithms.c:488
 msgid "Constructing tileable maze using Prim's Algorithm"
 msgstr "Constructing tileable maze using Prim's Algorithm"
 
-#: ../plug-ins/maze/maze.c:153
-msgid "Draw a labyrinth"
-msgstr "Draw a labyrinth"
-
-#: ../plug-ins/maze/maze.c:160
-msgid "_Maze..."
-msgstr "_Maze..."
-
-#: ../plug-ins/maze/maze.c:449
-msgid "Drawing maze"
-msgstr "Drawing maze"
-
-#: ../plug-ins/maze/maze.h:22
+#: ../plug-ins/maze/maze-dialog.c:172
 msgid "Maze"
 msgstr "Maze"
 
 #. The maze size frame
-#: ../plug-ins/maze/maze_face.c:200
+#: ../plug-ins/maze/maze-dialog.c:194
 msgid "Maze Size"
 msgstr "Maze Size"
 
 #. entscale == Entry and Scale pair function found in pixelize.c
-#: ../plug-ins/maze/maze_face.c:214
+#: ../plug-ins/maze/maze-dialog.c:208
 msgid "Width (pixels):"
 msgstr "Width (pixels):"
 
-#: ../plug-ins/maze/maze_face.c:226 ../plug-ins/maze/maze_face.c:242
+#: ../plug-ins/maze/maze-dialog.c:220 ../plug-ins/maze/maze-dialog.c:236
 msgid "Pieces:"
 msgstr "Pieces:"
 
-#: ../plug-ins/maze/maze_face.c:231
+#: ../plug-ins/maze/maze-dialog.c:225
 msgid "Height (pixels):"
 msgstr "Height (pixels):"
 
 #. The maze algorithm frame
-#: ../plug-ins/maze/maze_face.c:250
+#: ../plug-ins/maze/maze-dialog.c:244
 msgid "Algorithm"
 msgstr "Algorithm"
 
-#: ../plug-ins/maze/maze_face.c:276
+#: ../plug-ins/maze/maze-dialog.c:270
 msgid "Depth first"
 msgstr "Depth first"
 
-#: ../plug-ins/maze/maze_face.c:277
+#: ../plug-ins/maze/maze-dialog.c:271
 msgid "Prim's algorithm"
 msgstr "Prim's algorithm"
 
-#: ../plug-ins/maze/maze_face.c:396
+#: ../plug-ins/maze/maze-dialog.c:390
 msgid ""
 "Selection size is not even.\n"
 "Tileable maze won't work perfectly."
@@ -11503,6 +12158,18 @@ msgstr ""
 "Selection size is not even.\n"
 "Tileable maze won't work perfectly."
 
+#: ../plug-ins/maze/maze.c:123
+msgid "Draw a labyrinth"
+msgstr "Draw a labyrinth"
+
+#: ../plug-ins/maze/maze.c:130
+msgid "_Maze..."
+msgstr "_Maze..."
+
+#: ../plug-ins/maze/maze.c:426
+msgid "Drawing maze"
+msgstr "Drawing maze"
+
 #: ../plug-ins/metadata/xmp-parse.c:240
 #, c-format
 msgid "Error: No XMP packet found"
@@ -11543,25 +12210,25 @@ msgstr "Required attribute rdf:about missing in <%s>"
 msgid "Nested elements (<%s>) are not allowed in this context"
 msgstr "Nested elements (<%s>) are not allowed in this context"
 
-#: ../plug-ins/metadata/xmp-parse.c:1005
+#: ../plug-ins/metadata/xmp-parse.c:1010
 #, c-format
 msgid "End of element <%s> not expected in this context"
 msgstr "End of element <%s> not expected in this context"
 
-#: ../plug-ins/metadata/xmp-parse.c:1107
+#: ../plug-ins/metadata/xmp-parse.c:1112
 #, c-format
 msgid "The current element (<%s>) cannot contain text"
 msgstr "The current element (<%s>) cannot contain text"
 
-#: ../plug-ins/metadata/xmp-parse.c:1132
+#: ../plug-ins/metadata/xmp-parse.c:1137
 msgid "XMP packets must start with "
 msgstr "XMP packets must start with "
 
-#: ../plug-ins/metadata/xmp-parse.c:1146
+#: ../plug-ins/metadata/xmp-parse.c:1151
 msgid "XMP packets must end with "
 msgstr "XMP packets must end with "
 
-#: ../plug-ins/metadata/xmp-parse.c:1159
+#: ../plug-ins/metadata/xmp-parse.c:1164
 msgid "XMP cannot contain XML comments or processing instructions"
 msgstr "XMP cannot contain XML comments or processing instructions"
 
@@ -11681,505 +12348,115 @@ msgstr "Adjust page size and orientation for printing"
 msgid "Page Set_up"
 msgstr "Page Set_up"
 
-#: ../plug-ins/print/print.c:261
+#: ../plug-ins/print/print.c:265
 msgid "Image Settings"
 msgstr "Image Settings"
 
-#: ../plug-ins/print/print.c:341
+#: ../plug-ins/print/print.c:348
 msgid "An error occurred while trying to print:"
 msgstr "An error occurred while trying to print:"
 
-#: ../plug-ins/print/print.c:371
+#: ../plug-ins/print/print.c:375
 msgid "Printing"
 msgstr "Printing"
 
-#: ../plug-ins/psd/psd-load.c:208
-#, c-format
-msgid ""
-"Error loading PSD file:\n"
-"\n"
-"%s"
-msgstr ""
-"Error loading PSD file:\n"
-"\n"
-"%s"
-
-#: ../plug-ins/psd/psd-load.c:263
-#, c-format
-msgid "Not a valid photoshop document file"
-msgstr "Not a valid Photoshop document file"
-
-#: ../plug-ins/psd/psd-load.c:270
-#, c-format
-msgid "Unsupported file format version: %d"
-msgstr "Unsupported file format version: %d"
-
-#: ../plug-ins/psd/psd-load.c:277
-#, c-format
-msgid "Too many channels in file: %d"
-msgstr "Too many channels in file: %d"
-
-#: ../plug-ins/psd/psd-load.c:307
-#, c-format
-msgid "Unsupported color mode: %s"
-msgstr "Unsupported colour mode: %s"
-
-#: ../plug-ins/psd/psd-load.c:334
-#, c-format
-msgid "Unsupported bit depth: %d"
-msgstr "Unsupported bit depth: %d"
-
-#: ../plug-ins/psd/psd-load.c:368 ../plug-ins/psd/psd-load.c:378
-#: ../plug-ins/psd/psd-load.c:597 ../plug-ins/psd/psd-load.c:778
-#, c-format
-msgid "The file is corrupt!"
-msgstr "The file is corrupt!"
-
-#: ../plug-ins/psd/psd-load.c:538
-#, c-format
-msgid "Too many channels in layer: %d"
-msgstr "Too many channels in layer: %d"
-
-#: ../plug-ins/psd/psd-load.c:545
-#, c-format
-msgid "Unsupported or invalid layer height: %d"
-msgstr "Unsupported or invalid layer height: %d"
-
-#: ../plug-ins/psd/psd-load.c:552
-#, c-format
-msgid "Unsupported or invalid layer width: %d"
-msgstr "Unsupported or invalid layer width: %d"
-
-#: ../plug-ins/psd/psd-load.c:1138 ../plug-ins/psd/psd-load.c:1486
-#, c-format
-msgid "Unsupported compression mode: %d"
-msgstr "Unsupported compression mode: %d"
-
-#: ../plug-ins/psd/psd-load.c:1575
-msgid "Extra"
-msgstr "Extra"
-
-#: ../plug-ins/psd/psd-util.c:53
-#, c-format
-msgid "Unexpected end of file"
-msgstr "Unexpected end of file"
-
-#: ../plug-ins/rcm/rcm.c:99
-msgid "Replace a range of colors with another"
-msgstr "Replace a range of colours with another"
-
-#: ../plug-ins/rcm/rcm.c:106
-msgid "_Rotate Colors..."
-msgstr "_Rotate Colours..."
-
-#: ../plug-ins/rcm/rcm.c:140
-msgid "Rotating the colors"
-msgstr "Rotating the colours"
-
-#: ../plug-ins/rcm/rcm_dialog.c:119
-msgid "Original"
-msgstr "Original"
-
-#: ../plug-ins/rcm/rcm_dialog.c:137
-msgid "Rotated"
-msgstr "Rotated"
-
-#: ../plug-ins/rcm/rcm_dialog.c:155
-msgid "Continuous update"
-msgstr "Continuous update"
-
-#: ../plug-ins/rcm/rcm_dialog.c:168
-msgid "Area:"
-msgstr "Area:"
-
-#: ../plug-ins/rcm/rcm_dialog.c:172
-msgid "Entire Layer"
-msgstr "Entire Layer"
-
-#: ../plug-ins/rcm/rcm_dialog.c:174
-msgid "Context"
-msgstr "Context"
-
-#. Gray: Circle: Spinbutton 1
-#: ../plug-ins/rcm/rcm_dialog.c:467
-msgid "Hue:"
-msgstr "Hue:"
-
-#. Gray: Circle: Spinbutton 2
-#: ../plug-ins/rcm/rcm_dialog.c:494 ../plug-ins/rcm/rcm_dialog.c:556
-msgid "Saturation:"
-msgstr "Saturation:"
-
-#. * Gray: Operation-Mode *
-#: ../plug-ins/rcm/rcm_dialog.c:514
-msgid "Gray Mode"
-msgstr "Grey Mode"
-
-#. Gray: Operation-Mode: two radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:523
-msgid "Treat as this"
-msgstr "Treat as this"
-
-#: ../plug-ins/rcm/rcm_dialog.c:535
-msgid "Change to this"
-msgstr "Change to this"
-
-#. * Gray: What is gray? *
-#: ../plug-ins/rcm/rcm_dialog.c:548
-msgid "Gray Threshold"
-msgstr "Grey Threshold"
-
-#. * Misc: Used unit selection *
-#: ../plug-ins/rcm/rcm_dialog.c:588 ../plug-ins/rcm/rcm_dialog.c:698
-msgid "Units"
-msgstr "Units"
-
-#. Misc: Used unit selection: 3 radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:597
-msgid "Radians"
-msgstr "Radians"
-
-#: ../plug-ins/rcm/rcm_dialog.c:609
-msgid "Radians/Pi"
-msgstr "Radians/Pi"
-
-#: ../plug-ins/rcm/rcm_dialog.c:621
-msgid "Degrees"
-msgstr "Degrees"
-
-#: ../plug-ins/rcm/rcm_dialog.c:652
-msgid "Rotate Colors"
-msgstr "Rotate Colours"
-
-#: ../plug-ins/rcm/rcm_dialog.c:692
-msgid "Main Options"
-msgstr "Main Options"
-
-#: ../plug-ins/rcm/rcm_dialog.c:695
-msgid "Gray Options"
-msgstr "Grey Options"
-
-#: ../plug-ins/rcm/rcm_stock.c:35
-msgid "Switch to Clockwise"
-msgstr "Switch to Clockwise"
-
-#: ../plug-ins/rcm/rcm_stock.c:37
-msgid "Switch to C/Clockwise"
-msgstr "Switch to Anticlockwise"
-
-#: ../plug-ins/rcm/rcm_stock.c:39
-msgid "Change Order of Arrows"
-msgstr "Change Order of Arrows"
-
 #. printf("width = %d, height = %d\n",BITMAP_WIDTH(marked),BITMAP_HEIGHT(marked));
-#: ../plug-ins/sel2path/pxl-outline.c:84
+#: ../plug-ins/selection-to-path/pxl-outline.c:82
 msgid "Selection to Path"
 msgstr "Selection to Path"
 
-#: ../plug-ins/sel2path/sel2path.c:183
+#: ../plug-ins/selection-to-path/selection-to-path.c:185
 msgid "No selection to convert"
 msgstr "No selection to convert"
 
-#: ../plug-ins/sel2path/sel2path.c:300
+#: ../plug-ins/selection-to-path/selection-to-path.c:302
 msgid "Selection to Path Advanced Settings"
 msgstr "Selection to Path Advanced Settings"
 
-#: ../plug-ins/sgi/sgi.c:119 ../plug-ins/sgi/sgi.c:139
-msgid "Silicon Graphics IRIS image"
-msgstr "Silicon Graphics IRIS image"
-
-#: ../plug-ins/sgi/sgi.c:313
-#, c-format
-msgid "Could not open '%s' for reading."
-msgstr "Could not open '%s' for reading."
-
-#: ../plug-ins/sgi/sgi.c:532
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Could not open '%s' for writing."
-
-#: ../plug-ins/sgi/sgi.c:612
-msgid "Save as SGI"
-msgstr "Save as SGI"
-
-#: ../plug-ins/sgi/sgi.c:628
-msgid "Compression type"
-msgstr "Compression type"
-
-#: ../plug-ins/sgi/sgi.c:632
-msgid "No compression"
-msgstr "No compression"
-
-#: ../plug-ins/sgi/sgi.c:634
-msgid "RLE compression"
-msgstr "RLE compression"
-
-#: ../plug-ins/sgi/sgi.c:636
-msgid ""
-"Aggressive RLE\n"
-"(not supported by SGI)"
-msgstr ""
-"Aggressive RLE\n"
-"(not supported by SGI)"
-
 #: ../plug-ins/twain/twain.c:87
 msgid "Capture an image from a TWAIN datasource"
 msgstr "Capture an image from a TWAIN datasource"
 
-#: ../plug-ins/twain/twain.c:354
+#: ../plug-ins/twain/twain.c:352
 msgid "_Scanner/Camera..."
 msgstr "_Scanner/Camera..."
 
 #. Initialize our progress dialog
-#: ../plug-ins/twain/twain.c:489
+#: ../plug-ins/twain/twain.c:486
 msgid "Transferring data from scanner/camera"
 msgstr "Transferring data from scanner/camera"
 
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:162
-#: ../plug-ins/uri/uri-backend-libcurl.c:126
-#, c-format
-msgid "Downloading %s of image data..."
-msgstr "Downloading %s of image data..."
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:163
-#: ../plug-ins/uri/uri-backend-libcurl.c:133
-#: ../plug-ins/uri/uri-backend-wget.c:345
-#, c-format
-msgid "Downloaded %s of image data"
-msgstr "Downloaded %s of image data"
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:181
-#, c-format
-msgid "Uploading %s of image data..."
-msgstr "Uploading %s of image data..."
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:182
-#, c-format
-msgid "Uploaded %s of image data"
-msgstr "Uploaded %s of image data"
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:252
-#: ../plug-ins/uri/uri-backend-libcurl.c:155
-#: ../plug-ins/uri/uri-backend-wget.c:194
-msgid "Connecting to server"
-msgstr "Connecting to server"
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:311
-#, c-format
-msgid "Failed to read %s from '%s': %s"
-msgstr "Failed to read %s from '%s': %s"
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:360
-#, c-format
-msgid "Failed to write %s to '%s': %s"
-msgstr "Failed to write %s to '%s': %s"
-
-#: ../plug-ins/uri/uri-backend-libcurl.c:57
-#, c-format
-msgid "Could not initialize libcurl"
-msgstr "Could not initialise libcurl"
-
-#: ../plug-ins/uri/uri-backend-libcurl.c:160
-#, c-format
-msgid "Could not open output file for writing"
-msgstr "Could not open output file for writing"
-
-#: ../plug-ins/uri/uri-backend-libcurl.c:198
-#, c-format
-msgid "Opening '%s' for reading resulted in HTTP response code: %d"
-msgstr "Opening '%s' for reading resulted in HTTP response code: %d"
-
-#: ../plug-ins/uri/uri-backend-wget.c:161
-#: ../plug-ins/uri/uri-backend-wget.c:181
-#: ../plug-ins/uri/uri-backend-wget.c:200
-#: ../plug-ins/uri/uri-backend-wget.c:223
-#: ../plug-ins/uri/uri-backend-wget.c:252
-#, c-format
-msgid "wget exited abnormally on URI '%s'"
-msgstr "wget exited abnormally on URI '%s'"
-
-#. The third line is "Connecting to..."
-#: ../plug-ins/uri/uri-backend-wget.c:189
-#, c-format
-msgid "(timeout is %d second)"
-msgid_plural "(timeout is %d seconds)"
-msgstr[0] "(timeout is %d second)"
-msgstr[1] "(timeout is %d seconds)"
-
-#. The fourth line is either the network request or an error
-#: ../plug-ins/uri/uri-backend-wget.c:218
-msgid "Opening URI"
-msgstr "Opening URI"
-
-#: ../plug-ins/uri/uri-backend-wget.c:229
-#: ../plug-ins/uri/uri-backend-wget.c:262
-#, c-format
-msgid "A network error occurred: %s"
-msgstr "A network error occurred: %s"
-
-#: ../plug-ins/uri/uri-backend-wget.c:302
-#, c-format
-msgid "Downloading %s of image data"
-msgstr "Downloading %s of image data"
-
-#: ../plug-ins/uri/uri-backend-wget.c:307
-msgid "Downloading unknown amount of image data"
-msgstr "Downloading unknown amount of image data"
-
-#: ../plug-ins/uri/uri.c:117 ../plug-ins/uri/uri.c:138
-msgid "URI"
-msgstr "URI"
-
-#: ../plug-ins/winicon/icodialog.c:54
-msgid "Save as Windows Icon"
-msgstr "Save as Windows Icon"
-
-#: ../plug-ins/winicon/icodialog.c:86
-msgid "Icon Details"
-msgstr "Icon Details"
-
-#: ../plug-ins/winicon/icodialog.c:106
-msgid ""
-"Large icons and compression are not supported by all programs. Older "
-"applications may not open this file correctly."
-msgstr ""
-"Large icons and compression are not supported by all programs. Older "
-"applications may not open this file correctly."
-
-#: ../plug-ins/winicon/icodialog.c:178
-msgid "1 bpp, 1-bit alpha, 2-slot palette"
-msgstr "1 bpp, 1-bit alpha, 2-slot palette"
-
-#: ../plug-ins/winicon/icodialog.c:179
-msgid "4 bpp, 1-bit alpha, 16-slot palette"
-msgstr "4 bpp, 1-bit alpha, 16-slot palette"
-
-#: ../plug-ins/winicon/icodialog.c:180
-msgid "8 bpp, 1-bit alpha, 256-slot palette"
-msgstr "8 bpp, 1-bit alpha, 256-slot palette"
-
-#: ../plug-ins/winicon/icodialog.c:181
-msgid "24 bpp, 1-bit alpha, no palette"
-msgstr "24 bpp, 1-bit alpha, no palette"
-
-#: ../plug-ins/winicon/icodialog.c:182
-msgid "32 bpp, 8-bit alpha, no palette"
-msgstr "32 bpp, 8-bit alpha, no palette"
-
-#: ../plug-ins/winicon/icodialog.c:196
-msgid "Compressed (PNG)"
-msgstr "Compressed (PNG)"
-
-#. read successfully. add to image
-#: ../plug-ins/winicon/icoload.c:616
-#, c-format
-msgid "Icon #%i"
-msgstr "Icon #%i"
-
-#: ../plug-ins/winicon/main.c:103 ../plug-ins/winicon/main.c:137
-msgid "Microsoft Windows icon"
-msgstr "Microsoft Windows icon"
-
-#: ../plug-ins/winsnap/winsnap.c:864
+#: ../plug-ins/win-snap/winsnap.c:865
 msgid "Grab"
 msgstr "Grab"
 
-#: ../plug-ins/winsnap/winsnap.c:880
+#: ../plug-ins/win-snap/winsnap.c:881
 msgid "Grab a single window"
 msgstr "Grab a single window"
 
-#: ../plug-ins/winsnap/winsnap.c:894
+#: ../plug-ins/win-snap/winsnap.c:895
 msgid "Grab the whole screen"
 msgstr "Grab the whole screen"
 
-#: ../plug-ins/winsnap/winsnap.c:910
+#: ../plug-ins/win-snap/winsnap.c:911
 msgid "after"
 msgstr "after"
 
-#: ../plug-ins/winsnap/winsnap.c:922
+#: ../plug-ins/win-snap/winsnap.c:923
 msgid "Seconds delay"
 msgstr "Seconds delay"
 
-#: ../plug-ins/winsnap/winsnap.c:929
+#: ../plug-ins/win-snap/winsnap.c:930
 msgid "Include decorations"
 msgstr "Include decorations"
 
-#: ../plug-ins/winsnap/winsnap.c:988
+#: ../plug-ins/win-snap/winsnap.c:989
 msgid "Capture a window or desktop image"
 msgstr "Capture a window or desktop image"
 
-#: ../plug-ins/winsnap/winsnap.c:993
+#: ../plug-ins/win-snap/winsnap.c:994
 msgid "_Screen Shot..."
 msgstr "_Screen Shot..."
 
-#: ../plug-ins/winsnap/winsnap.c:1142
+#: ../plug-ins/win-snap/winsnap.c:1142
 msgid "No data captured"
 msgstr "No data captured"
 
-#: ../plug-ins/xjt/xjt.c:485 ../plug-ins/xjt/xjt.c:503
-msgid "GIMP compressed XJT image"
-msgstr "GIMP compressed XJT image"
+#~ msgid "Unable to add additional point.\n"
+#~ msgstr "Unable to add additional point.\n"
 
-#: ../plug-ins/xjt/xjt.c:724
-#, c-format
-msgid "XJT file contains unknown layermode %d"
-msgstr "XJT file contains unknown layermode %d"
+#~ msgid "Or_igin at bottom left"
+#~ msgstr "Or_igin at bottom left"
 
-#: ../plug-ins/xjt/xjt.c:761
-#, c-format
-msgid "Warning: unsupported layermode %d saved to XJT"
-msgstr "Warning: unsupported layermode %d saved to XJT"
+#~ msgid "checkbutton|Snap to grid"
+#~ msgstr "Snap to grid"
 
-#: ../plug-ins/xjt/xjt.c:777
-#, c-format
-msgid "XJT file contains unknown pathtype %d"
-msgstr "XJT file contains unknown pathtype %d"
+#~ msgid "The GIMP help files are not found."
+#~ msgstr "The GIMP help files are not found."
 
-#: ../plug-ins/xjt/xjt.c:793
-#, c-format
-msgid "Warning: unsupported pathtype %d saved to XJT"
-msgstr "Warning: unsupported pathtype %d saved to XJT"
+#~ msgid "There is a problem with the GIMP help files."
+#~ msgstr "There is a problem with the GIMP help files."
 
-#: ../plug-ins/xjt/xjt.c:812
-#, c-format
-msgid "XJT file contains unknown unittype %d"
-msgstr "XJT file contains unknown unittype %d"
+#~ msgid "Please check your installation."
+#~ msgstr "Please check your installation."
 
-#: ../plug-ins/xjt/xjt.c:833
-#, c-format
-msgid "Warning: unsupported unittype %d saved to XJT"
-msgstr "Warning: unsupported unittype %d saved to XJT"
+#~ msgid "Drag and drop this icon to a web browser"
+#~ msgstr "Drag and drop this icon to a web browser"
 
-#: ../plug-ins/xjt/xjt.c:854
-msgid "Save as XJT"
-msgstr "Save as XJT"
+#~ msgid "Document not found"
+#~ msgstr "Document not found"
 
-#: ../plug-ins/xjt/xjt.c:887
-msgid "Clear transparent"
-msgstr "Clear transparent"
+#~ msgid "The requested URL could not be loaded:"
+#~ msgstr "The requested URL could not be loaded:"
 
-#: ../plug-ins/xjt/xjt.c:899
-msgid "Quality:"
-msgstr "Quality:"
+#~ msgid "_Smoothing:"
+#~ msgstr "_Smoothing:"
 
-#: ../plug-ins/xjt/xjt.c:908
-msgid "Smoothing:"
-msgstr "Smoothing:"
+#~ msgid "Downloading %s of image data..."
+#~ msgstr "Downloading %s of image data..."
 
-#: ../plug-ins/xjt/xjt.c:1705 ../plug-ins/xjt/xjt.c:3353
-#, c-format
-msgid "Could not create working folder '%s': %s"
-msgstr "Could not create working folder '%s': %s"
-
-#: ../plug-ins/xjt/xjt.c:3222
-#, c-format
-msgid "Error: Could not read XJT property file '%s'."
-msgstr "Error: Could not read XJT property file '%s'."
-
-#: ../plug-ins/xjt/xjt.c:3228
-#, c-format
-msgid "Error: XJT property file '%s' is empty."
-msgstr "Error: XJT property file '%s' is empty."
+#~ msgid "Could not open output file for writing"
+#~ msgstr "Could not open output file for writing"
 
 #~ msgid "Smoothness of Aliasing"
 #~ msgstr "Smoothness of Aliasing"
@@ -12328,18 +12605,12 @@ msgstr "Error: XJT property file '%s' is empty."
 #~ msgid "Description _writer:"
 #~ msgstr "Description _writer:"
 
-#~ msgid "_Keywords:"
-#~ msgstr "_Keywords:"
-
 #~ msgid "Empty"
 #~ msgstr "Empty"
 
 #~ msgid "Copyright"
 #~ msgstr "Copyright"
 
-#~ msgid "Origin"
-#~ msgstr "Origin"
-
 #~ msgid "Camera 1"
 #~ msgstr "Camera 1"
 
@@ -13328,9 +13599,6 @@ msgstr "Error: XJT property file '%s' is empty."
 #~ msgid "Optimize the output for the type of image being printed"
 #~ msgstr "Optimise the output for the type of image being printed"
 
-#~ msgid "Line art"
-#~ msgstr "Line art"
-
 #~ msgid "Fastest and brightest color for text and line art"
 #~ msgstr "Fastest and brightest colour for text and line art"
 
diff --git a/po-plug-ins/fr.po b/po-plug-ins/fr.po
index 6d58e23ef0..61dbbafd7e 100644
--- a/po-plug-ins/fr.po
+++ b/po-plug-ins/fr.po
@@ -18,9 +18,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: GIMP po-plugins fr\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-08 21:49+0200\n"
-"PO-Revision-Date: 2009-03-01 21:03+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=general\n"
+"POT-Creation-Date: 2009-08-01 09:34+0000\n"
+"PO-Revision-Date: 2009-09-05 22:43+0200\n"
 "Last-Translator: Julien Hardelin \n"
 "Language-Team: GNOME French Team \n"
 "MIME-Version: 1.0\n"
@@ -279,7 +280,7 @@ msgstr "Modèle de couleur _RVB"
 
 #: ../plug-ins/common/alien-map.c:520
 msgid "_HSL color model"
-msgstr "Modèle de couleur _TSV"
+msgstr "Modèle de couleur _TSL"
 
 #: ../plug-ins/common/align-layers.c:128
 msgid "Align all visible layers of the image"
@@ -608,14 +609,14 @@ msgstr "_Vertical"
 #: ../plug-ins/common/file-cel.c:365 ../plug-ins/common/file-dicom.c:557
 #: ../plug-ins/common/file-gif-load.c:911 ../plug-ins/common/file-pcx.c:412
 #: ../plug-ins/common/file-pcx.c:418 ../plug-ins/common/file-pix.c:382
-#: ../plug-ins/common/file-png.c:852 ../plug-ins/common/file-pnm.c:584
+#: ../plug-ins/common/file-png.c:852 ../plug-ins/common/file-pnm.c:585
 #: ../plug-ins/common/file-raw.c:712 ../plug-ins/common/file-sunras.c:975
 #: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997
 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:746
 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:267
-#: ../plug-ins/file-bmp/bmp-read.c:590 ../plug-ins/file-faxg3/faxg3.c:478
-#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:249
-#: ../plug-ins/file-jpeg/jpeg-load.c:758
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:617
+#: ../plug-ins/file-faxg3/faxg3.c:478 ../plug-ins/file-fits/fits.c:530
+#: ../plug-ins/file-jpeg/jpeg-load.c:249 ../plug-ins/file-jpeg/jpeg-load.c:761
 #: ../plug-ins/file-psd/psd-image-res-load.c:995
 #: ../plug-ins/file-psd/psd-load.c:1526 ../plug-ins/file-sgi/sgi.c:384
 #: ../plug-ins/gfig/gfig-dialog.c:1284
@@ -692,12 +693,12 @@ msgid "Blur Radius"
 msgstr "Rayon du flou"
 
 #: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457
-#: ../plug-ins/common/noise-spread.c:384
+#: ../plug-ins/common/noise-spread.c:386
 msgid "_Horizontal:"
 msgstr "_Horizontal :"
 
 #: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474
-#: ../plug-ins/common/noise-spread.c:388
+#: ../plug-ins/common/noise-spread.c:390
 msgid "_Vertical:"
 msgstr "_Vertical :"
 
@@ -1022,21 +1023,21 @@ msgstr "Chargez les paramètres du mixeur de canaux"
 #: ../plug-ins/common/file-compressor.c:666
 #: ../plug-ins/common/file-dicom.c:325 ../plug-ins/common/file-gbr.c:361
 #: ../plug-ins/common/file-gif-load.c:340 ../plug-ins/common/file-gih.c:662
-#: ../plug-ins/common/file-mng.c:1073 ../plug-ins/common/file-pat.c:330
+#: ../plug-ins/common/file-mng.c:1108 ../plug-ins/common/file-pat.c:330
 #: ../plug-ins/common/file-pcx.c:361 ../plug-ins/common/file-pdf.c:541
 #: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:721
-#: ../plug-ins/common/file-pnm.c:493 ../plug-ins/common/file-ps.c:1036
+#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1036
 #: ../plug-ins/common/file-ps.c:3048 ../plug-ins/common/file-psp.c:1751
 #: ../plug-ins/common/file-raw.c:249 ../plug-ins/common/file-raw.c:666
 #: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333
-#: ../plug-ins/common/file-svg.c:718 ../plug-ins/common/file-tga.c:442
+#: ../plug-ins/common/file-svg.c:731 ../plug-ins/common/file-tga.c:442
 #: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
 #: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2002
-#: ../plug-ins/file-bmp/bmp-read.c:154 ../plug-ins/file-faxg3/faxg3.c:233
+#: ../plug-ins/file-bmp/bmp-read.c:156 ../plug-ins/file-faxg3/faxg3.c:233
 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:460
 #: ../plug-ins/file-fli/fli-gimp.c:497 ../plug-ins/file-ico/ico-load.c:653
 #: ../plug-ins/file-ico/ico-load.c:732 ../plug-ins/file-jpeg/jpeg-load.c:109
-#: ../plug-ins/file-jpeg/jpeg-load.c:828 ../plug-ins/file-psd/psd-load.c:131
+#: ../plug-ins/file-jpeg/jpeg-load.c:831 ../plug-ins/file-psd/psd-load.c:131
 #: ../plug-ins/file-psd/psd-thumb-load.c:80
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:272
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:190
@@ -1064,17 +1065,17 @@ msgstr "Enregistrez les paramètres du mixeur de canaux"
 #: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:801
 #: ../plug-ins/common/file-gbr.c:632 ../plug-ins/common/file-gif-save.c:761
 #: ../plug-ins/common/file-gih.c:1275 ../plug-ins/common/file-html-table.c:236
-#: ../plug-ins/common/file-mng.c:575 ../plug-ins/common/file-mng.c:909
+#: ../plug-ins/common/file-mng.c:610 ../plug-ins/common/file-mng.c:944
 #: ../plug-ins/common/file-pat.c:462 ../plug-ins/common/file-pcx.c:666
 #: ../plug-ins/common/file-pix.c:524 ../plug-ins/common/file-png.c:1270
-#: ../plug-ins/common/file-pnm.c:973 ../plug-ins/common/file-ps.c:1213
+#: ../plug-ins/common/file-pnm.c:977 ../plug-ins/common/file-ps.c:1213
 #: ../plug-ins/common/file-raw.c:546 ../plug-ins/common/file-raw.c:574
 #: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1170
 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
-#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2112
+#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2111
 #: ../plug-ins/file-bmp/bmp-write.c:296 ../plug-ins/file-fits/fits.c:476
 #: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1008
-#: ../plug-ins/file-jpeg/jpeg-save.c:325 ../plug-ins/file-psd/psd-save.c:1626
+#: ../plug-ins/file-jpeg/jpeg-save.c:325 ../plug-ins/file-psd/psd-save.c:1635
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:283
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:163
 #: ../plug-ins/file-xjt/xjt.c:1292 ../plug-ins/file-xjt/xjt.c:1729
@@ -1392,8 +1393,7 @@ msgstr "Décalage de départ :"
 #: ../plug-ins/common/cml-explorer.c:1361
 msgid "Seed of Random (only for \"From Seed\" Modes)"
 msgstr ""
-"Valeur de germe de hasard (uniquement pour les modes « Depuis un "
-"germe »)"
+"Valeur de germe de hasard (uniquement pour les modes « Depuis un germe »)"
 
 #: ../plug-ins/common/cml-explorer.c:1372 ../plug-ins/maze/maze-dialog.c:261
 msgid "Seed:"
@@ -1784,7 +1784,7 @@ msgstr "Vale_ur :"
 
 #: ../plug-ins/common/compose.c:219 ../plug-ins/common/decompose.c:193
 msgid "HSL"
-msgstr "TSV"
+msgstr "TSL"
 
 #: ../plug-ins/common/compose.c:222
 msgid "_Lightness:"
@@ -1952,7 +1952,7 @@ msgstr "_Modèle colorimétrique :"
 #. Channel representation table
 #: ../plug-ins/common/compose.c:1557
 msgid "Channel Representations"
-msgstr "Représentations de canaux"
+msgstr "Réarrangement des canaux"
 
 #: ../plug-ins/common/compose.c:1620
 msgid "Mask value"
@@ -2041,7 +2041,7 @@ msgstr "Étend le contraste sur une échelle maximale"
 
 #: ../plug-ins/common/contrast-stretch.c:79
 msgid "_Stretch Contrast"
-msgstr "Étendre le _contraste..."
+msgstr "Renforcer le _contraste..."
 
 #: ../plug-ins/common/contrast-stretch.c:113
 msgid "Auto-stretching contrast"
@@ -2398,11 +2398,11 @@ msgstr "lumière"
 
 #: ../plug-ins/common/decompose.c:197
 msgid "Hue (HSL)"
-msgstr "Teinte (TSV)"
+msgstr "Teinte (TSL)"
 
 #: ../plug-ins/common/decompose.c:198
 msgid "Saturation (HSL)"
-msgstr "Saturation (TSV)"
+msgstr "Saturation (TSL)"
 
 #: ../plug-ins/common/decompose.c:199
 msgid "Lightness"
@@ -3023,12 +3023,12 @@ msgstr "Charger une palette KISS"
 #: ../plug-ins/common/file-gih.c:667 ../plug-ins/common/file-pat.c:335
 #: ../plug-ins/common/file-pcx.c:366 ../plug-ins/common/file-pdf.c:586
 #: ../plug-ins/common/file-pix.c:348 ../plug-ins/common/file-png.c:728
-#: ../plug-ins/common/file-pnm.c:498 ../plug-ins/common/file-ps.c:1042
+#: ../plug-ins/common/file-pnm.c:499 ../plug-ins/common/file-ps.c:1042
 #: ../plug-ins/common/file-raw.c:671 ../plug-ins/common/file-sunras.c:486
 #: ../plug-ins/common/file-tga.c:447 ../plug-ins/common/file-tiff-load.c:603
 #: ../plug-ins/common/file-wmf.c:994 ../plug-ins/common/file-xbm.c:741
 #: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:520
-#: ../plug-ins/file-bmp/bmp-read.c:159 ../plug-ins/file-faxg3/faxg3.c:217
+#: ../plug-ins/file-bmp/bmp-read.c:161 ../plug-ins/file-faxg3/faxg3.c:217
 #: ../plug-ins/file-fli/fli-gimp.c:502 ../plug-ins/file-ico/ico-load.c:646
 #: ../plug-ins/file-jpeg/jpeg-load.c:115 ../plug-ins/file-psd/psd-load.c:136
 #: ../plug-ins/file-sgi/sgi.c:331 ../plug-ins/file-xjt/xjt.c:3363
@@ -3051,14 +3051,14 @@ msgstr "Profondeur de bit non prise en charge (%d)"
 #: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1280
 #: ../plug-ins/common/file-html-table.c:256 ../plug-ins/common/file-pat.c:467
 #: ../plug-ins/common/file-pcx.c:627 ../plug-ins/common/file-pix.c:529
-#: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:978
+#: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:982
 #: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:568
 #: ../plug-ins/common/file-tga.c:1175 ../plug-ins/common/file-tiff-save.c:693
 #: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xpm.c:637
 #: ../plug-ins/common/file-xwd.c:619 ../plug-ins/file-bmp/bmp-write.c:307
 #: ../plug-ins/file-fits/fits.c:481 ../plug-ins/file-fli/fli-gimp.c:718
 #: ../plug-ins/file-ico/ico-save.c:1002 ../plug-ins/file-jpeg/jpeg-save.c:282
-#: ../plug-ins/file-psd/psd-save.c:1631 ../plug-ins/file-sgi/sgi.c:554
+#: ../plug-ins/file-psd/psd-save.c:1640 ../plug-ins/file-sgi/sgi.c:554
 #: ../plug-ins/file-xjt/xjt.c:1710
 #, c-format
 msgid "Saving '%s'"
@@ -3154,7 +3154,7 @@ msgid "'%s' is not a DICOM file."
 msgstr "« %s » n'est pas un fichier DICOM."
 
 #: ../plug-ins/common/file-dicom.c:769 ../plug-ins/common/file-pcx.c:659
-#: ../plug-ins/common/file-pnm.c:963
+#: ../plug-ins/common/file-pnm.c:967
 msgid "Cannot save images with alpha channel."
 msgstr "Impossible d'enregistrer des images avec un canal alpha."
 
@@ -3219,7 +3219,7 @@ msgstr "Ce n'est pas un fichier GIF."
 msgid "Non-square pixels.  Image might look squashed."
 msgstr "Pixels non carrés. L'image peut apparaître tassée."
 
-#: ../plug-ins/common/file-gif-load.c:915
+#: ../plug-ins/common/file-gif-load.c:913
 #, c-format
 msgid "Background (%d%s)"
 msgstr "Arrière-plan (%d%s)"
@@ -3253,8 +3253,8 @@ msgstr ""
 #: ../plug-ins/common/file-gif-save.c:447
 msgid "Couldn't simply reduce colors further. Saving as opaque."
 msgstr ""
-"Impossible de réduire les couleurs de manière plus poussée. Enregistrement en "
-"tant qu'image opaque."
+"Impossible de réduire les couleurs de manière plus poussée. Enregistrement "
+"en tant qu'image opaque."
 
 #: ../plug-ins/common/file-gif-save.c:562
 #, c-format
@@ -3332,7 +3332,7 @@ msgstr "_Boucle infinie"
 msgid "_Delay between frames where unspecified:"
 msgstr "_Délai entre les images lorsque non spécifié :"
 
-#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1474
+#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1507
 msgid "milliseconds"
 msgstr "millisecondes"
 
@@ -3586,104 +3586,104 @@ msgstr ""
 "Impossible d'enregistrer la transparence sans perte, enregistrement de "
 "l'opacité à la place."
 
-#: ../plug-ins/common/file-mng.c:1254
+#: ../plug-ins/common/file-mng.c:1287
 msgid "Save as MNG"
 msgstr "Enregistrer en MNG"
 
-#: ../plug-ins/common/file-mng.c:1274
+#: ../plug-ins/common/file-mng.c:1307
 msgid "MNG Options"
 msgstr "Options MNG"
 
-#: ../plug-ins/common/file-mng.c:1280
+#: ../plug-ins/common/file-mng.c:1313
 msgid "Interlace"
 msgstr "Entrelacement"
 
-#: ../plug-ins/common/file-mng.c:1292
+#: ../plug-ins/common/file-mng.c:1325
 msgid "Save background color"
 msgstr "Enregistrer la couleur d'arrière-plan"
 
-#: ../plug-ins/common/file-mng.c:1303
+#: ../plug-ins/common/file-mng.c:1336
 msgid "Save gamma"
 msgstr "Enregistrer le gamma"
 
-#: ../plug-ins/common/file-mng.c:1313
+#: ../plug-ins/common/file-mng.c:1346
 msgid "Save resolution"
 msgstr "Enregistrer la résolution"
 
-#: ../plug-ins/common/file-mng.c:1324
+#: ../plug-ins/common/file-mng.c:1357
 msgid "Save creation time"
 msgstr "Enregistrer la date de création"
 
-#: ../plug-ins/common/file-mng.c:1343
+#: ../plug-ins/common/file-mng.c:1376
 msgid "PNG"
 msgstr "PNG"
 
-#: ../plug-ins/common/file-mng.c:1344
+#: ../plug-ins/common/file-mng.c:1377
 msgid "JNG"
 msgstr "JNG"
 
-#: ../plug-ins/common/file-mng.c:1347
+#: ../plug-ins/common/file-mng.c:1380
 msgid "PNG + delta PNG"
 msgstr "PNG + delta PNG"
 
-#: ../plug-ins/common/file-mng.c:1348
+#: ../plug-ins/common/file-mng.c:1381
 msgid "JNG + delta PNG"
 msgstr "JNG + delta PNG"
 
-#: ../plug-ins/common/file-mng.c:1349
+#: ../plug-ins/common/file-mng.c:1382
 msgid "All PNG"
 msgstr "Tout PNG"
 
-#: ../plug-ins/common/file-mng.c:1350
+#: ../plug-ins/common/file-mng.c:1383
 msgid "All JNG"
 msgstr "Tout JNG"
 
-#: ../plug-ins/common/file-mng.c:1362
+#: ../plug-ins/common/file-mng.c:1395
 msgid "Default chunks type:"
 msgstr "Type de partitions par défaut :"
 
-#: ../plug-ins/common/file-mng.c:1365
+#: ../plug-ins/common/file-mng.c:1398
 msgid "Combine"
 msgstr "Combiner"
 
-#: ../plug-ins/common/file-mng.c:1366
+#: ../plug-ins/common/file-mng.c:1399
 msgid "Replace"
 msgstr "Remplacer"
 
-#: ../plug-ins/common/file-mng.c:1377
+#: ../plug-ins/common/file-mng.c:1410
 msgid "Default frame disposal:"
 msgstr "Découpage des séquences par défaut :"
 
-#: ../plug-ins/common/file-mng.c:1389
+#: ../plug-ins/common/file-mng.c:1422
 msgid "PNG compression level:"
 msgstr "Niveau de compression PNG :"
 
-#: ../plug-ins/common/file-mng.c:1397 ../plug-ins/common/file-png.c:1908
+#: ../plug-ins/common/file-mng.c:1430 ../plug-ins/common/file-png.c:1908
 msgid "Choose a high compression level for small file size"
 msgstr ""
 "Choisissez un haut degré de compression pour des fichiers de petite taille"
 
-#: ../plug-ins/common/file-mng.c:1411
+#: ../plug-ins/common/file-mng.c:1444
 msgid "JPEG compression quality:"
 msgstr "Qualité de compression JPEG :"
 
-#: ../plug-ins/common/file-mng.c:1428
+#: ../plug-ins/common/file-mng.c:1461
 msgid "JPEG smoothing factor:"
 msgstr "Facteur d'adoucissement JPEG :"
 
-#: ../plug-ins/common/file-mng.c:1438
+#: ../plug-ins/common/file-mng.c:1471
 msgid "Animated MNG Options"
 msgstr "Options d'animation MNG"
 
-#: ../plug-ins/common/file-mng.c:1444
+#: ../plug-ins/common/file-mng.c:1477
 msgid "Loop"
 msgstr "Boucler"
 
-#: ../plug-ins/common/file-mng.c:1458
+#: ../plug-ins/common/file-mng.c:1491
 msgid "Default frame delay:"
 msgstr "Temps par défaut d'affichage d'une séquence :"
 
-#: ../plug-ins/common/file-mng.c:1531
+#: ../plug-ins/common/file-mng.c:1564
 msgid "MNG animation"
 msgstr "Animation MNG"
 
@@ -3714,13 +3714,13 @@ msgstr "Impossible de lire l'en-tête depuis « %s »"
 msgid "'%s' is not a PCX file"
 msgstr "« %s » n'est pas un fichier PCX"
 
-#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:579
+#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:606
 #: ../plug-ins/file-psd/psd-load.c:302
 #, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr "La largeur de l'image est non valide ou non prise en charge : %d"
 
-#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:585
+#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:612
 #: ../plug-ins/file-psd/psd-load.c:294
 #, c-format
 msgid "Unsupported or invalid image height: %d"
@@ -3877,7 +3877,7 @@ msgstr "Enregistrer les valeurs de couleur pour les pixels _transparents"
 msgid "Co_mpression level:"
 msgstr "Niveau de _compression :"
 
-#: ../plug-ins/common/file-png.c:1922 ../plug-ins/file-jpeg/jpeg-save.c:1185
+#: ../plug-ins/common/file-png.c:1922 ../plug-ins/file-jpeg/jpeg-save.c:1186
 msgid "_Load Defaults"
 msgstr "_Charger défauts"
 
@@ -3885,78 +3885,78 @@ msgstr "_Charger défauts"
 msgid "S_ave Defaults"
 msgstr "_Enregistrer défauts"
 
-#: ../plug-ins/common/file-pnm.c:247
+#: ../plug-ins/common/file-pnm.c:248
 msgid "PNM Image"
 msgstr "Image PNM"
 
-#: ../plug-ins/common/file-pnm.c:267
+#: ../plug-ins/common/file-pnm.c:268
 msgid "PNM image"
 msgstr "Image PNM"
 
-#: ../plug-ins/common/file-pnm.c:279
+#: ../plug-ins/common/file-pnm.c:280
 msgid "PBM image"
 msgstr "Image PBM"
 
-#: ../plug-ins/common/file-pnm.c:291
+#: ../plug-ins/common/file-pnm.c:292
 msgid "PGM image"
 msgstr "Image PGM"
 
-#: ../plug-ins/common/file-pnm.c:303
+#: ../plug-ins/common/file-pnm.c:304
 msgid "PPM image"
 msgstr "Image PPM"
 
-#: ../plug-ins/common/file-pnm.c:527 ../plug-ins/common/file-pnm.c:549
-#: ../plug-ins/common/file-pnm.c:558 ../plug-ins/common/file-pnm.c:569
-#: ../plug-ins/common/file-pnm.c:657 ../plug-ins/common/file-pnm.c:727
+#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550
+#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570
+#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:728
 msgid "Premature end of file."
 msgstr "Fin de fichier prématurée."
 
-#: ../plug-ins/common/file-pnm.c:529
+#: ../plug-ins/common/file-pnm.c:530
 msgid "Invalid file."
 msgstr "Fichier non valide."
 
-#: ../plug-ins/common/file-pnm.c:543
+#: ../plug-ins/common/file-pnm.c:544
 msgid "File not in a supported format."
 msgstr "Le fichier est dans un format non pris en charge."
 
-#: ../plug-ins/common/file-pnm.c:552
+#: ../plug-ins/common/file-pnm.c:553
 msgid "Invalid X resolution."
 msgstr "Résolution X non valide."
 
-#: ../plug-ins/common/file-pnm.c:554
+#: ../plug-ins/common/file-pnm.c:555
 msgid "Image width is larger than GIMP can handle."
 msgstr "L'image est plus large que GIMP ne peut prendre en charge."
 
-#: ../plug-ins/common/file-pnm.c:561
+#: ../plug-ins/common/file-pnm.c:562
 msgid "Invalid Y resolution."
 msgstr "Résolution Y non valide."
 
-#: ../plug-ins/common/file-pnm.c:563
+#: ../plug-ins/common/file-pnm.c:564
 msgid "Image height is larger than GIMP can handle."
 msgstr "L'image est plus haute que GIMP ne peut prendre en charge."
 
-#: ../plug-ins/common/file-pnm.c:575
+#: ../plug-ins/common/file-pnm.c:576
 msgid "Unsupported maximum value."
 msgstr "Valeur maximale non valide."
 
-#: ../plug-ins/common/file-pnm.c:780
+#: ../plug-ins/common/file-pnm.c:781
 msgid "Error reading file."
 msgstr "Erreur de lecture du fichier."
 
-#: ../plug-ins/common/file-pnm.c:1148
+#: ../plug-ins/common/file-pnm.c:1185
 msgid "Save as PNM"
 msgstr "Enregistrer en PNM"
 
 #. file save type
-#: ../plug-ins/common/file-pnm.c:1165
+#: ../plug-ins/common/file-pnm.c:1202
 msgid "Data formatting"
 msgstr "Formatage des données"
 
-#: ../plug-ins/common/file-pnm.c:1169
+#: ../plug-ins/common/file-pnm.c:1206
 msgid "Raw"
 msgstr "Brut"
 
-#: ../plug-ins/common/file-pnm.c:1170
+#: ../plug-ins/common/file-pnm.c:1207
 msgid "Ascii"
 msgstr "ASCII"
 
@@ -4019,7 +4019,7 @@ msgid "Rendering"
 msgstr "Interprétation"
 
 #. Resolution
-#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:916
+#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:929
 #: ../plug-ins/common/file-wmf.c:692
 msgid "Resolution:"
 msgstr "Résolution :"
@@ -4348,7 +4348,7 @@ msgstr "Encodage RunLength"
 msgid "SVG image"
 msgstr "Image SVG"
 
-#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:720
+#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:733
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -4374,51 +4374,51 @@ msgstr ""
 "aucune taille !"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/file-svg.c:729
+#: ../plug-ins/common/file-svg.c:742
 msgid "Render Scalable Vector Graphics"
 msgstr "Rendre un Scalable Vector Graphics"
 
 #. Width and Height
-#: ../plug-ins/common/file-svg.c:795 ../plug-ins/common/file-wmf.c:571
+#: ../plug-ins/common/file-svg.c:808 ../plug-ins/common/file-wmf.c:571
 #: ../plug-ins/common/grid.c:724
 msgid "Width:"
 msgstr "Largeur :"
 
-#: ../plug-ins/common/file-svg.c:801 ../plug-ins/common/file-wmf.c:577
+#: ../plug-ins/common/file-svg.c:814 ../plug-ins/common/file-wmf.c:577
 msgid "Height:"
 msgstr "Hauteur :"
 
-#: ../plug-ins/common/file-svg.c:875 ../plug-ins/common/file-wmf.c:651
+#: ../plug-ins/common/file-svg.c:888 ../plug-ins/common/file-wmf.c:651
 msgid "_X ratio:"
 msgstr "Ratio _X :"
 
-#: ../plug-ins/common/file-svg.c:897 ../plug-ins/common/file-wmf.c:673
+#: ../plug-ins/common/file-svg.c:910 ../plug-ins/common/file-wmf.c:673
 msgid "_Y ratio:"
 msgstr "Ratio _Y :"
 
-#: ../plug-ins/common/file-svg.c:911 ../plug-ins/common/file-wmf.c:687
+#: ../plug-ins/common/file-svg.c:924 ../plug-ins/common/file-wmf.c:687
 msgid "Constrain aspect ratio"
 msgstr "Conserver les proportions"
 
-#: ../plug-ins/common/file-svg.c:922 ../plug-ins/common/file-wmf.c:698
+#: ../plug-ins/common/file-svg.c:935 ../plug-ins/common/file-wmf.c:698
 #: ../plug-ins/print/print-page-layout.c:273
 #, c-format
 msgid "pixels/%a"
 msgstr "pixels/%a"
 
 #. Path Import
-#: ../plug-ins/common/file-svg.c:942
+#: ../plug-ins/common/file-svg.c:955
 msgid "Import _paths"
 msgstr "Importer les _chemins"
 
-#: ../plug-ins/common/file-svg.c:948
+#: ../plug-ins/common/file-svg.c:961
 msgid ""
 "Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr ""
 "Importe les éléments du chemin du SVG afin qu'ils puissent être utilisés "
 "avec l'outil de chemins GIMP"
 
-#: ../plug-ins/common/file-svg.c:961
+#: ../plug-ins/common/file-svg.c:974
 msgid "Merge imported paths"
 msgstr "Fusionner les chemins importés"
 
@@ -4732,7 +4732,7 @@ msgid "Composing images"
 msgstr "Composition des images"
 
 #: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:216
-#: ../plug-ins/help-browser/dialog.c:1133
+#: ../plug-ins/help-browser/dialog.c:1120
 msgid "Untitled"
 msgstr "Sans titre"
 
@@ -4887,7 +4887,7 @@ msgstr "Modifie interactivement les couleurs de l'image"
 
 #: ../plug-ins/common/filter-pack.c:322
 msgid "_Filter Pack..."
-msgstr "Paquet de _filtres..."
+msgstr "Collection de _filtres..."
 
 #: ../plug-ins/common/filter-pack.c:372
 msgid "FP can only be used on RGB images."
@@ -5427,114 +5427,114 @@ msgstr "Information sur le profil de couleurs de l'image"
 msgid "Color Profile Information"
 msgstr "Information sur le profil de couleurs"
 
-#: ../plug-ins/common/lcms.c:570
+#: ../plug-ins/common/lcms.c:572
 #, c-format
 msgid "Color profile '%s' is not for RGB color space."
 msgstr "Le profil de couleurs « %s » n'est pas pour un espace de couleur RVB."
 
-#: ../plug-ins/common/lcms.c:677
+#: ../plug-ins/common/lcms.c:679
 msgid "Default RGB working space"
 msgstr "Espace de travail RVB par défaut"
 
-#: ../plug-ins/common/lcms.c:773
+#: ../plug-ins/common/lcms.c:775
 msgid ""
 "Data attached as 'icc-profile' does not appear to be an ICC color profile"
 msgstr ""
 "Les données attachées comme « icc-profile » ne semblent pas être un profil de "
 "couleur ICC"
 
-#: ../plug-ins/common/lcms.c:823
+#: ../plug-ins/common/lcms.c:825
 #, c-format
 msgid "'%s' does not appear to be an ICC color profile"
 msgstr "« %s » ne semble pas être un fichier de couleur ICC"
 
 #. ICC color profile conversion
-#: ../plug-ins/common/lcms.c:883
+#: ../plug-ins/common/lcms.c:885
 #, c-format
 msgid "Converting from '%s' to '%s'"
 msgstr "Conversion de « %s » vers « %s »"
 
-#: ../plug-ins/common/lcms.c:1127
+#: ../plug-ins/common/lcms.c:1129
 #, c-format
 msgid "Could not load ICC profile from '%s'"
 msgstr "Impossible de charger le profil ICC depuis « %s »"
 
-#: ../plug-ins/common/lcms.c:1149
+#: ../plug-ins/common/lcms.c:1151
 #, c-format
 msgid "The image '%s' has an embedded color profile:"
 msgstr "L'image « %s » a un profil de couleurs embarqué :"
 
-#: ../plug-ins/common/lcms.c:1193
+#: ../plug-ins/common/lcms.c:1195
 #, c-format
 msgid "Convert the image to the RGB working space (%s)?"
 msgstr "Convertir l'image vers l'espace de travail RVB (%s) ?"
 
-#: ../plug-ins/common/lcms.c:1224
+#: ../plug-ins/common/lcms.c:1226
 msgid "Convert to RGB working space?"
 msgstr "Convertir vers l'espace de travail RVB ?"
 
-#: ../plug-ins/common/lcms.c:1229
+#: ../plug-ins/common/lcms.c:1231
 msgid "_Keep"
 msgstr "_Conserver"
 
-#: ../plug-ins/common/lcms.c:1234
+#: ../plug-ins/common/lcms.c:1236
 msgid "_Convert"
 msgstr "_Convertir"
 
-#: ../plug-ins/common/lcms.c:1261 ../plug-ins/file-jpeg/jpeg-exif.c:377
+#: ../plug-ins/common/lcms.c:1263 ../plug-ins/file-jpeg/jpeg-exif.c:377
 msgid "_Don't ask me again"
 msgstr "_Ne plus me demander"
 
-#: ../plug-ins/common/lcms.c:1325
+#: ../plug-ins/common/lcms.c:1327
 msgid "Select destination profile"
 msgstr "Sélection du profil de destination"
 
-#: ../plug-ins/common/lcms.c:1352
+#: ../plug-ins/common/lcms.c:1354
 msgid "All files (*.*)"
 msgstr "Tous les fichiers (*.*)"
 
-#: ../plug-ins/common/lcms.c:1357
+#: ../plug-ins/common/lcms.c:1359
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "Profil de couleurs ICC (*.icc, *.icm)"
 
-#: ../plug-ins/common/lcms.c:1400
+#: ../plug-ins/common/lcms.c:1402
 #, c-format
 msgid "RGB workspace (%s)"
 msgstr "Espace de travail RVB (%s)"
 
-#: ../plug-ins/common/lcms.c:1450
+#: ../plug-ins/common/lcms.c:1452
 msgid "Convert to ICC Color Profile"
 msgstr "Convertir en profil de couleurs ICC"
 
-#: ../plug-ins/common/lcms.c:1451
+#: ../plug-ins/common/lcms.c:1453
 msgid "Assign ICC Color Profile"
 msgstr "Assigner un profil de couleurs ICC"
 
-#: ../plug-ins/common/lcms.c:1459
+#: ../plug-ins/common/lcms.c:1461
 msgid "_Assign"
 msgstr "_Assigner"
 
-#: ../plug-ins/common/lcms.c:1476
+#: ../plug-ins/common/lcms.c:1478
 msgid "Current Color Profile"
 msgstr "Profil de couleurs actuel"
 
-#: ../plug-ins/common/lcms.c:1491
+#: ../plug-ins/common/lcms.c:1493
 msgid "Convert to"
 msgstr "Convertir"
 
-#: ../plug-ins/common/lcms.c:1491
+#: ../plug-ins/common/lcms.c:1493
 msgid "Assign"
 msgstr "Assigner"
 
-#: ../plug-ins/common/lcms.c:1515
+#: ../plug-ins/common/lcms.c:1517
 msgid "_Rendering Intent:"
 msgstr "Destination du _rendu :"
 
-#: ../plug-ins/common/lcms.c:1531
+#: ../plug-ins/common/lcms.c:1533
 msgid "_Black Point Compensation"
 msgstr "_Compensation du point noir"
 
-#: ../plug-ins/common/lcms.c:1573
+#: ../plug-ins/common/lcms.c:1575
 msgid "Destination profile is not for RGB color space."
 msgstr "Le profil de destination n'est pas pour un espace de couleur RVB."
 
@@ -5646,35 +5646,35 @@ msgstr "Envoyer l'image par courriel"
 msgid "Send by E_mail..."
 msgstr "En_voyer par courriel..."
 
-#: ../plug-ins/common/mail.c:408
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
 msgstr "Envoyer par courriel"
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "_Envoyer"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "_Nom du fichier :"
 
-#: ../plug-ins/common/mail.c:457
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
 msgstr "_À :"
 
-#: ../plug-ins/common/mail.c:471
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
 msgstr "_De :"
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "_Sujet :"
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "erreur due à l'extension du fichier ou son absence"
 
-#: ../plug-ins/common/mail.c:726
+#: ../plug-ins/common/mail.c:725
 #, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "Impossible de démarrer sendmail (%s)"
@@ -6100,11 +6100,11 @@ msgstr "Épa_rpiller..."
 msgid "Spreading"
 msgstr "Éparpillement en cours"
 
-#: ../plug-ins/common/noise-spread.c:344
+#: ../plug-ins/common/noise-spread.c:346
 msgid "Spread"
 msgstr "Éparpiller"
 
-#: ../plug-ins/common/noise-spread.c:369
+#: ../plug-ins/common/noise-spread.c:371
 msgid "Spread Amount"
 msgstr "Taux d'éparpillement :"
 
@@ -7105,11 +7105,11 @@ msgstr "Lumière"
 msgid "File '%s' is not a valid save file."
 msgstr "Le fichier « %s » n'est pas un fichier d'enregistrement valide."
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Open File"
 msgstr "Ouvrir le fichier"
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Save File"
 msgstr "Enregistrer le fichier"
 
@@ -7216,7 +7216,7 @@ msgstr "Crée une image d'une sphère texturée"
 msgid "Sphere _Designer..."
 msgstr "Créateur de sphè_re..."
 
-#: ../plug-ins/common/sphere-designer.c:3074
+#: ../plug-ins/common/sphere-designer.c:3080
 msgid "Region selected for plug-in is empty"
 msgstr "La région sélectionnée pour le greffon est vide"
 
@@ -7978,7 +7978,7 @@ msgstr "Vagues"
 
 #: ../plug-ins/common/waves.c:294
 msgid "_Reflective"
-msgstr "_Réflexive"
+msgstr "_Réverbération"
 
 #: ../plug-ins/common/waves.c:313
 msgid "_Amplitude:"
@@ -7997,6 +7997,7 @@ msgid "Waving"
 msgstr "Calcul d'ondulations"
 
 #: ../plug-ins/common/web-browser.c:206
+#, c-format
 msgid ""
 "Web browser not specified.\n"
 "Please specify a web browser using the Preferences dialog."
@@ -8131,36 +8132,36 @@ msgstr "_Force :"
 msgid "Higher values increase the magnitude of the effect"
 msgstr "De grandes valeur augmentent l'ampleur de l'effet"
 
-#: ../plug-ins/file-bmp/bmp-read.c:86
+#: ../plug-ins/file-bmp/bmp-read.c:88
 msgid "Bad colormap"
 msgstr "Mauvaise palette de couleurs"
 
-#: ../plug-ins/file-bmp/bmp-read.c:170 ../plug-ins/file-bmp/bmp-read.c:180
-#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196
-#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:395
-#: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:411
-#: ../plug-ins/file-bmp/bmp-read.c:419
+#: ../plug-ins/file-bmp/bmp-read.c:172 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:422
+#: ../plug-ins/file-bmp/bmp-read.c:430 ../plug-ins/file-bmp/bmp-read.c:438
+#: ../plug-ins/file-bmp/bmp-read.c:446
 #, c-format
 msgid "'%s' is not a valid BMP file"
 msgstr "« %s » n'est pas un fichier BMP valide"
 
-#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252
-#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345
-#: ../plug-ins/file-bmp/bmp-read.c:371
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
 #, c-format
 msgid "Error reading BMP file header from '%s'"
 msgstr "Erreur de lecture de l'en-tête BMP depuis « %s »"
 
-#: ../plug-ins/file-bmp/bmp-read.c:531
+#: ../plug-ins/file-bmp/bmp-read.c:558
 msgid "Unrecognized or invalid BMP compression format."
 msgstr "Format de compression BMP inconnu ou non valide."
 
-#: ../plug-ins/file-bmp/bmp-read.c:573
+#: ../plug-ins/file-bmp/bmp-read.c:600
 msgid "Unsupported or invalid bitdepth."
 msgstr "Profondeur de bit non valide ou non prise en charge."
 
-#: ../plug-ins/file-bmp/bmp-read.c:761 ../plug-ins/file-bmp/bmp-read.c:802
-#: ../plug-ins/file-bmp/bmp-read.c:852
+#: ../plug-ins/file-bmp/bmp-read.c:788 ../plug-ins/file-bmp/bmp-read.c:829
+#: ../plug-ins/file-bmp/bmp-read.c:879
 msgid "The bitmap ends unexpectedly."
 msgstr "Fin de bitmap anormale."
 
@@ -8182,7 +8183,7 @@ msgstr "Enregistrer en BMP"
 msgid "_Run-Length Encoded"
 msgstr "Encodé en _Run-Length"
 
-#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:899
+#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:900
 msgid "_Advanced Options"
 msgstr "_Options avancées"
 
@@ -8318,7 +8319,7 @@ msgstr "Compressée (PNG)"
 msgid "Icon #%i"
 msgstr "Icône n° %i"
 
-#: ../plug-ins/file-ico/ico-load.c:725 ../plug-ins/file-jpeg/jpeg-load.c:630
+#: ../plug-ins/file-ico/ico-load.c:725 ../plug-ins/file-jpeg/jpeg-load.c:633
 #: ../plug-ins/file-psd/psd-thumb-load.c:85
 #, c-format
 msgid "Opening thumbnail for '%s'"
@@ -8357,67 +8358,67 @@ msgstr "Taille du fichier : %02.01f Kio"
 msgid "Calculating file size..."
 msgstr "Calcul de la taille du fichier..."
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:773 ../plug-ins/file-jpeg/jpeg-save.c:875
+#: ../plug-ins/file-jpeg/jpeg-save.c:774 ../plug-ins/file-jpeg/jpeg-save.c:876
 msgid "File size: unknown"
 msgstr "Taille du fichier : inconnue"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:826
+#: ../plug-ins/file-jpeg/jpeg-save.c:827
 msgid "Save as JPEG"
 msgstr "Enregistrer en JPEG"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:861
+#: ../plug-ins/file-jpeg/jpeg-save.c:862
 msgid "_Quality:"
 msgstr "_Qualité :"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:865
+#: ../plug-ins/file-jpeg/jpeg-save.c:866
 msgid "JPEG quality parameter"
 msgstr "Paramètres de qualité du JPEG"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:884
+#: ../plug-ins/file-jpeg/jpeg-save.c:885
 msgid "Enable preview to obtain the file size."
 msgstr "Active l'aperçu pour obtenir la taille de fichier."
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:887
+#: ../plug-ins/file-jpeg/jpeg-save.c:888
 msgid "Sho_w preview in image window"
 msgstr "A_fficher l'aperçu dans la fenêtre d'image"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:928
+#: ../plug-ins/file-jpeg/jpeg-save.c:929
 msgid "S_moothing:"
 msgstr "Ad_oucissement :"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:941
+#: ../plug-ins/file-jpeg/jpeg-save.c:942
 msgid "Frequency (rows):"
 msgstr "Fréquence (rangées) :"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:957
+#: ../plug-ins/file-jpeg/jpeg-save.c:958
 msgid "Use _restart markers"
 msgstr "_Marqueurs de reprise"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:973
+#: ../plug-ins/file-jpeg/jpeg-save.c:974
 msgid "_Optimize"
 msgstr "_Optimiser"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:987
+#: ../plug-ins/file-jpeg/jpeg-save.c:988
 msgid "_Progressive"
 msgstr "_Progressif"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1003
+#: ../plug-ins/file-jpeg/jpeg-save.c:1004
 msgid "Save _EXIF data"
 msgstr "Enregistrer les données EXI_F"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1020
+#: ../plug-ins/file-jpeg/jpeg-save.c:1021
 msgid "Save _thumbnail"
 msgstr "Enregistrer la _vignette"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1037
+#: ../plug-ins/file-jpeg/jpeg-save.c:1038
 msgid "Save _XMP data"
 msgstr "Enregistrer les données _XMP"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1052
+#: ../plug-ins/file-jpeg/jpeg-save.c:1053
 msgid "_Use quality settings from original image"
 msgstr "_Utiliser les paramètres de qualité de l'image originale"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1058
+#: ../plug-ins/file-jpeg/jpeg-save.c:1059
 msgid ""
 "If the original image was loaded from a JPEG file using non-standard quality "
 "settings (quantization tables), enable this option to get almost the same "
@@ -8428,48 +8429,48 @@ msgstr ""
 "cette option pour obtenir une qualité et une taille de fichier similaire."
 
 #. Subsampling
-#: ../plug-ins/file-jpeg/jpeg-save.c:1082
+#: ../plug-ins/file-jpeg/jpeg-save.c:1083
 msgid "Su_bsampling:"
 msgstr "_Sous-échantillonnage :"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1089
+#: ../plug-ins/file-jpeg/jpeg-save.c:1090
 msgid "1x1,1x1,1x1 (best quality)"
 msgstr "1x1, 1x1, 1x1 (meilleure qualité)"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1091
+#: ../plug-ins/file-jpeg/jpeg-save.c:1092
 msgid "2x1,1x1,1x1 (4:2:2)"
 msgstr "2x1, 1x1, 1x1 (4:2:2)"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1093
+#: ../plug-ins/file-jpeg/jpeg-save.c:1094
 msgid "1x2,1x1,1x1"
 msgstr "1x2, 1x1, 1x1"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1095
+#: ../plug-ins/file-jpeg/jpeg-save.c:1096
 msgid "2x2,1x1,1x1 (smallest file)"
 msgstr "2x2, 1x1, 1x1 (fichier le plus petit)"
 
 #. DCT method
-#: ../plug-ins/file-jpeg/jpeg-save.c:1125
+#: ../plug-ins/file-jpeg/jpeg-save.c:1126
 msgid "_DCT method:"
 msgstr "Méthode DC_T :"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1131
+#: ../plug-ins/file-jpeg/jpeg-save.c:1132
 msgid "Fast Integer"
 msgstr "Entier rapide"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1132
+#: ../plug-ins/file-jpeg/jpeg-save.c:1133
 msgid "Integer"
 msgstr "Entier"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1133
+#: ../plug-ins/file-jpeg/jpeg-save.c:1134
 msgid "Floating-Point"
 msgstr "Virgule flottante"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1149
+#: ../plug-ins/file-jpeg/jpeg-save.c:1150
 msgid "Comment"
 msgstr "Commentaire"
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:1194
+#: ../plug-ins/file-jpeg/jpeg-save.c:1195
 msgid "Sa_ve Defaults"
 msgstr "Enre_gistrer défauts"
 
@@ -8481,7 +8482,7 @@ msgstr "Image JPEG"
 msgid "Export Preview"
 msgstr "Exporter l'aperçu"
 
-#: ../plug-ins/file-psd/psd-load.c:211
+#: ../plug-ins/file-psd/psd-load.c:215
 #: ../plug-ins/file-psd/psd-thumb-load.c:131
 #, c-format
 msgid "Error loading PSD file: %s"
@@ -8538,7 +8539,7 @@ msgstr "Largeur de calque non valide ou non prise en charge : %d"
 msgid "Unsupported compression mode: %d"
 msgstr "Mode de compression non pris en charge : %d"
 
-#: ../plug-ins/file-psd/psd-load.c:1591
+#: ../plug-ins/file-psd/psd-load.c:1595
 msgid "Extra"
 msgstr "Supplémentaire"
 
@@ -8557,11 +8558,11 @@ msgstr ""
 "fichier PSD, soit le greffon d'enregistrement ne le prend pas en charge, "
 "utilisation du mode normal à la place."
 
-#: ../plug-ins/file-psd/psd-save.c:628
+#: ../plug-ins/file-psd/psd-save.c:631
 msgid "Error: Can't convert GIMP base imagetype to PSD mode"
 msgstr "Erreur : ne peut convertir le type d'image de base GIMP en mode PSD"
 
-#: ../plug-ins/file-psd/psd-save.c:1596
+#: ../plug-ins/file-psd/psd-save.c:1605
 #, c-format
 msgid ""
 "Unable to save '%s'.  The PSD file format does not support images that are "
@@ -8570,7 +8571,7 @@ msgstr ""
 "Impossible d'enregistrer « %s ». Le format PSD ne prend pas en charge les "
 "images de plus de 30 000 pixels de haut ou de large."
 
-#: ../plug-ins/file-psd/psd-save.c:1611
+#: ../plug-ins/file-psd/psd-save.c:1620
 #, c-format
 msgid ""
 "Unable to save '%s'.  The PSD file format does not support images with "
@@ -9905,7 +9906,7 @@ msgstr "Exécuter diverses opérations artistiques"
 
 #: ../plug-ins/gimpressionist/gimp.c:95
 msgid "_GIMPressionist..."
-msgstr "_GIMPressionist..."
+msgstr "_GIMPressionniste..."
 
 #: ../plug-ins/gimpressionist/gimp.c:371
 msgid "Painting"
@@ -9913,7 +9914,7 @@ msgstr "Peinture"
 
 #: ../plug-ins/gimpressionist/gimpressionist.c:139
 msgid "GIMPressionist"
-msgstr "GIMPressionist"
+msgstr "GIMPressionniste"
 
 #: ../plug-ins/gimpressionist/orientation.c:92
 msgid "Or_ientation"
@@ -10198,7 +10199,7 @@ msgstr "Enregistrer courants"
 
 #: ../plug-ins/gimpressionist/presets.c:894
 msgid "Gimpressionist Defaults"
-msgstr "Valeurs pas défauts de GIMPressionist"
+msgstr "Valeurs par défaut de GIMPressionniste"
 
 #: ../plug-ins/gimpressionist/presets.c:1015
 msgid "_Presets"
@@ -10274,8 +10275,8 @@ msgstr "Taille :"
 #: ../plug-ins/gimpressionist/size.c:160
 msgid ""
 "Let the value (brightness) of the region determine the size of the stroke"
-msgstr "La valeur (luminosité) de la région détermine la longueur du coup "
-"de brosse"
+msgstr ""
+"La valeur (luminosité) de la région détermine la longueur du coup de brosse"
 
 #: ../plug-ins/gimpressionist/size.c:164
 msgid ""
@@ -10647,76 +10648,76 @@ msgid "_Second Flares"
 msgstr "Reflets _secondaires"
 
 #: ../plug-ins/help-browser/dialog.c:186
-#: ../plug-ins/help-browser/dialog.c:1134
+#: ../plug-ins/help-browser/dialog.c:1121
 msgid "GIMP Help Browser"
 msgstr "Navigateur d'aide GIMP"
 
-#: ../plug-ins/help-browser/dialog.c:566
+#: ../plug-ins/help-browser/dialog.c:564
 msgid "Go back one page"
 msgstr "Recule d'une page"
 
-#: ../plug-ins/help-browser/dialog.c:571
+#: ../plug-ins/help-browser/dialog.c:569
 msgid "Go forward one page"
 msgstr "Avance d'une page"
 
-#: ../plug-ins/help-browser/dialog.c:576
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "_Reload"
 msgstr "_Recharger"
 
-#: ../plug-ins/help-browser/dialog.c:576
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "Reload current page"
 msgstr "Recharge la page actuelle"
 
-#: ../plug-ins/help-browser/dialog.c:581
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "_Stop"
 msgstr "_Arrêter"
 
-#: ../plug-ins/help-browser/dialog.c:581
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "Stop loading this page"
 msgstr "Arrête le chargement de la page"
 
-#: ../plug-ins/help-browser/dialog.c:586
+#: ../plug-ins/help-browser/dialog.c:584
 msgid "Go to the index page"
 msgstr "Va à la page du sommaire"
 
-#: ../plug-ins/help-browser/dialog.c:591
+#: ../plug-ins/help-browser/dialog.c:589
 msgid "C_opy location"
 msgstr "C_opier l'emplacement"
 
-#: ../plug-ins/help-browser/dialog.c:592
+#: ../plug-ins/help-browser/dialog.c:590
 msgid "Copy the location of this page to the clipboard"
 msgstr "Copie l'emplacement de cette page dans le presse-papiers"
 
-#: ../plug-ins/help-browser/dialog.c:612
+#: ../plug-ins/help-browser/dialog.c:610
 msgid "Find text in current page"
 msgstr "Recherche du texte dans la page actuelle"
 
-#: ../plug-ins/help-browser/dialog.c:617
+#: ../plug-ins/help-browser/dialog.c:615
 msgid "Find _Again"
 msgstr "Reprendre l_a recherche"
 
-#: ../plug-ins/help-browser/dialog.c:629
+#: ../plug-ins/help-browser/dialog.c:634
 msgid "S_how Index"
 msgstr "Afficher le so_mmaire"
 
-#: ../plug-ins/help-browser/dialog.c:637
+#: ../plug-ins/help-browser/dialog.c:635
 msgid "Toggle the visibility of the sidebar"
 msgstr "Affiche ou masque le panneau latéral"
 
-#: ../plug-ins/help-browser/dialog.c:658
+#: ../plug-ins/help-browser/dialog.c:656
 msgid "Visit the GIMP documentation website"
 msgstr "Visiter le site Web de la documentation GIMP"
 
-#: ../plug-ins/help-browser/dialog.c:1175
+#: ../plug-ins/help-browser/dialog.c:1162
 msgid "Find:"
 msgstr "Chercher :"
 
-#: ../plug-ins/help-browser/dialog.c:1192
+#: ../plug-ins/help-browser/dialog.c:1179
 msgctxt "search"
 msgid "_Previous"
 msgstr "_Précédent"
 
-#: ../plug-ins/help-browser/dialog.c:1204
+#: ../plug-ins/help-browser/dialog.c:1191
 msgctxt "search"
 msgid "_Next"
 msgstr "_Suivant"
@@ -10741,8 +10742,7 @@ msgstr ""
 #: ../plug-ins/help/gimphelpdomain.c:197
 msgid "Perhaps you are missing GIO backends and need to install GVFS?"
 msgstr ""
-"Il vous manque peut-être des moteurs GIO et il faudrait alors installer "
-"GVFS."
+"Il vous manque peut-être des moteurs GIO et il faudrait alors installer GVFS."
 
 #: ../plug-ins/help/gimphelpdomain.c:216
 #, c-format
@@ -12332,25 +12332,25 @@ msgstr "Attribut RDF requis : à propos du manquant dans « %s »"
 msgid "Nested elements (<%s>) are not allowed in this context"
 msgstr "Des éléments imbriqués (« %s ») ne sont pas autorisés dans ce contexte"
 
-#: ../plug-ins/metadata/xmp-parse.c:1005
+#: ../plug-ins/metadata/xmp-parse.c:1010
 #, c-format
 msgid "End of element <%s> not expected in this context"
 msgstr "La fin de l'élément « %s » n'est pas attendue dans ce contexte"
 
-#: ../plug-ins/metadata/xmp-parse.c:1107
+#: ../plug-ins/metadata/xmp-parse.c:1112
 #, c-format
 msgid "The current element (<%s>) cannot contain text"
 msgstr "L'élément courant (« %s ») ne peut contenir du texte"
 
-#: ../plug-ins/metadata/xmp-parse.c:1132
+#: ../plug-ins/metadata/xmp-parse.c:1137
 msgid "XMP packets must start with "
 msgstr "Les paquets XMP doivent commencer par "
 
-#: ../plug-ins/metadata/xmp-parse.c:1146
+#: ../plug-ins/metadata/xmp-parse.c:1151
 msgid "XMP packets must end with "
 msgstr "Les paquets XMP doivent finir par "
 
-#: ../plug-ins/metadata/xmp-parse.c:1159
+#: ../plug-ins/metadata/xmp-parse.c:1164
 msgid "XMP cannot contain XML comments or processing instructions"
 msgstr ""
 "XMP ne peut contenir des commentaires XML ou des instructions de commandes"
@@ -12544,4 +12544,3 @@ msgstr "_Capture d'écran..."
 #: ../plug-ins/win-snap/winsnap.c:1142
 msgid "No data captured"
 msgstr "Aucune donnée capturée"
-
diff --git a/po-plug-ins/it.po b/po-plug-ins/it.po
index f0d4a3d367..c5bdb75580 100644
--- a/po-plug-ins/it.po
+++ b/po-plug-ins/it.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-04-27 00:42+0200\n"
-"PO-Revision-Date: 2009-04-27 00:43+0200\n"
+"POT-Creation-Date: 2009-08-20 23:02+0200\n"
+"PO-Revision-Date: 2009-08-20 22:55+0200\n"
 "Last-Translator: Marco Ciampa \n"
 "Language-Team: tp@lists.linux.it\n"
 "MIME-Version: 1.0\n"
@@ -601,9 +601,9 @@ msgstr "_Verticale"
 #: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997
 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:746
 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:267
-#: ../plug-ins/file-bmp/bmp-read.c:590 ../plug-ins/file-faxg3/faxg3.c:478
-#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:249
-#: ../plug-ins/file-jpeg/jpeg-load.c:761
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:617
+#: ../plug-ins/file-faxg3/faxg3.c:478 ../plug-ins/file-fits/fits.c:530
+#: ../plug-ins/file-jpeg/jpeg-load.c:249 ../plug-ins/file-jpeg/jpeg-load.c:761
 #: ../plug-ins/file-psd/psd-image-res-load.c:995
 #: ../plug-ins/file-psd/psd-load.c:1526 ../plug-ins/file-sgi/sgi.c:384
 #: ../plug-ins/gfig/gfig-dialog.c:1284
@@ -679,12 +679,12 @@ msgid "Blur Radius"
 msgstr "Raggio di sfocatura"
 
 #: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457
-#: ../plug-ins/common/noise-spread.c:384
+#: ../plug-ins/common/noise-spread.c:386
 msgid "_Horizontal:"
 msgstr "_Orizzontale:"
 
 #: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474
-#: ../plug-ins/common/noise-spread.c:388
+#: ../plug-ins/common/noise-spread.c:390
 msgid "_Vertical:"
 msgstr "_Verticale:"
 
@@ -1007,17 +1007,17 @@ msgstr "Carica le impostazioni del mixer dei canali"
 #: ../plug-ins/common/file-compressor.c:666
 #: ../plug-ins/common/file-dicom.c:325 ../plug-ins/common/file-gbr.c:361
 #: ../plug-ins/common/file-gif-load.c:340 ../plug-ins/common/file-gih.c:662
-#: ../plug-ins/common/file-mng.c:1073 ../plug-ins/common/file-pat.c:330
+#: ../plug-ins/common/file-mng.c:1108 ../plug-ins/common/file-pat.c:330
 #: ../plug-ins/common/file-pcx.c:361 ../plug-ins/common/file-pdf.c:541
 #: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:721
 #: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1036
 #: ../plug-ins/common/file-ps.c:3048 ../plug-ins/common/file-psp.c:1751
 #: ../plug-ins/common/file-raw.c:249 ../plug-ins/common/file-raw.c:666
 #: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333
-#: ../plug-ins/common/file-svg.c:718 ../plug-ins/common/file-tga.c:442
+#: ../plug-ins/common/file-svg.c:731 ../plug-ins/common/file-tga.c:442
 #: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
 #: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2002
-#: ../plug-ins/file-bmp/bmp-read.c:154 ../plug-ins/file-faxg3/faxg3.c:233
+#: ../plug-ins/file-bmp/bmp-read.c:156 ../plug-ins/file-faxg3/faxg3.c:233
 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:460
 #: ../plug-ins/file-fli/fli-gimp.c:497 ../plug-ins/file-ico/ico-load.c:653
 #: ../plug-ins/file-ico/ico-load.c:732 ../plug-ins/file-jpeg/jpeg-load.c:109
@@ -1049,14 +1049,14 @@ msgstr "Salva le impostazioni del mixer dei canali"
 #: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:801
 #: ../plug-ins/common/file-gbr.c:632 ../plug-ins/common/file-gif-save.c:761
 #: ../plug-ins/common/file-gih.c:1275 ../plug-ins/common/file-html-table.c:236
-#: ../plug-ins/common/file-mng.c:575 ../plug-ins/common/file-mng.c:909
+#: ../plug-ins/common/file-mng.c:610 ../plug-ins/common/file-mng.c:944
 #: ../plug-ins/common/file-pat.c:462 ../plug-ins/common/file-pcx.c:666
 #: ../plug-ins/common/file-pix.c:524 ../plug-ins/common/file-png.c:1270
 #: ../plug-ins/common/file-pnm.c:977 ../plug-ins/common/file-ps.c:1213
 #: ../plug-ins/common/file-raw.c:546 ../plug-ins/common/file-raw.c:574
 #: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1170
 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
-#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2112
+#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2111
 #: ../plug-ins/file-bmp/bmp-write.c:296 ../plug-ins/file-fits/fits.c:476
 #: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1008
 #: ../plug-ins/file-jpeg/jpeg-save.c:325 ../plug-ins/file-psd/psd-save.c:1635
@@ -3007,7 +3007,7 @@ msgstr "Carica tavolozza KISS"
 #: ../plug-ins/common/file-tga.c:447 ../plug-ins/common/file-tiff-load.c:603
 #: ../plug-ins/common/file-wmf.c:994 ../plug-ins/common/file-xbm.c:741
 #: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:520
-#: ../plug-ins/file-bmp/bmp-read.c:159 ../plug-ins/file-faxg3/faxg3.c:217
+#: ../plug-ins/file-bmp/bmp-read.c:161 ../plug-ins/file-faxg3/faxg3.c:217
 #: ../plug-ins/file-fli/fli-gimp.c:502 ../plug-ins/file-ico/ico-load.c:646
 #: ../plug-ins/file-jpeg/jpeg-load.c:115 ../plug-ins/file-psd/psd-load.c:136
 #: ../plug-ins/file-sgi/sgi.c:331 ../plug-ins/file-xjt/xjt.c:3363
@@ -3309,7 +3309,7 @@ msgstr "Cic_lo infinito"
 msgid "_Delay between frames where unspecified:"
 msgstr "Ritar_do predefinito tra fotogrammi:"
 
-#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1474
+#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1507
 msgid "milliseconds"
 msgstr "millisecondi"
 
@@ -3554,103 +3554,103 @@ msgid "Couldn't losslessly save transparency, saving opacity instead."
 msgstr ""
 "Impossibile salvare senza degrado la trasparenza; salvataggio dell'opacità."
 
-#: ../plug-ins/common/file-mng.c:1254
+#: ../plug-ins/common/file-mng.c:1287
 msgid "Save as MNG"
 msgstr "Salva come MNG"
 
-#: ../plug-ins/common/file-mng.c:1274
+#: ../plug-ins/common/file-mng.c:1307
 msgid "MNG Options"
 msgstr "Opzioni MNG"
 
-#: ../plug-ins/common/file-mng.c:1280
+#: ../plug-ins/common/file-mng.c:1313
 msgid "Interlace"
 msgstr "Interlaccia"
 
-#: ../plug-ins/common/file-mng.c:1292
+#: ../plug-ins/common/file-mng.c:1325
 msgid "Save background color"
 msgstr "Salva colore di sfondo"
 
-#: ../plug-ins/common/file-mng.c:1303
+#: ../plug-ins/common/file-mng.c:1336
 msgid "Save gamma"
 msgstr "Salva la gamma"
 
-#: ../plug-ins/common/file-mng.c:1313
+#: ../plug-ins/common/file-mng.c:1346
 msgid "Save resolution"
 msgstr "Salva la risoluzione"
 
-#: ../plug-ins/common/file-mng.c:1324
+#: ../plug-ins/common/file-mng.c:1357
 msgid "Save creation time"
 msgstr "Salva la data di creazione"
 
-#: ../plug-ins/common/file-mng.c:1343
+#: ../plug-ins/common/file-mng.c:1376
 msgid "PNG"
 msgstr "PNG"
 
-#: ../plug-ins/common/file-mng.c:1344
+#: ../plug-ins/common/file-mng.c:1377
 msgid "JNG"
 msgstr "JNG"
 
-#: ../plug-ins/common/file-mng.c:1347
+#: ../plug-ins/common/file-mng.c:1380
 msgid "PNG + delta PNG"
 msgstr "PNG + delta PNG"
 
-#: ../plug-ins/common/file-mng.c:1348
+#: ../plug-ins/common/file-mng.c:1381
 msgid "JNG + delta PNG"
 msgstr "JNG + delta PNG"
 
-#: ../plug-ins/common/file-mng.c:1349
+#: ../plug-ins/common/file-mng.c:1382
 msgid "All PNG"
 msgstr "Tutti i PNG"
 
-#: ../plug-ins/common/file-mng.c:1350
+#: ../plug-ins/common/file-mng.c:1383
 msgid "All JNG"
 msgstr "Tutti i JNG"
 
-#: ../plug-ins/common/file-mng.c:1362
+#: ../plug-ins/common/file-mng.c:1395
 msgid "Default chunks type:"
 msgstr "Tipo blocchi predefiniti:"
 
-#: ../plug-ins/common/file-mng.c:1365
+#: ../plug-ins/common/file-mng.c:1398
 msgid "Combine"
 msgstr "Combina"
 
-#: ../plug-ins/common/file-mng.c:1366
+#: ../plug-ins/common/file-mng.c:1399
 msgid "Replace"
 msgstr "Rimpiazza"
 
-#: ../plug-ins/common/file-mng.c:1377
+#: ../plug-ins/common/file-mng.c:1410
 msgid "Default frame disposal:"
 msgstr "Disposizione predefinita fotogrammi:"
 
-#: ../plug-ins/common/file-mng.c:1389
+#: ../plug-ins/common/file-mng.c:1422
 msgid "PNG compression level:"
 msgstr "Livello di compressione PNG:"
 
-#: ../plug-ins/common/file-mng.c:1397 ../plug-ins/common/file-png.c:1908
+#: ../plug-ins/common/file-mng.c:1430 ../plug-ins/common/file-png.c:1908
 msgid "Choose a high compression level for small file size"
 msgstr "Scegliere una compressione alta per ottenere file piccoli"
 
-#: ../plug-ins/common/file-mng.c:1411
+#: ../plug-ins/common/file-mng.c:1444
 msgid "JPEG compression quality:"
 msgstr "Livello di compressione JPEG:"
 
-#: ../plug-ins/common/file-mng.c:1428
+#: ../plug-ins/common/file-mng.c:1461
 msgid "JPEG smoothing factor:"
 msgstr "Fattore di sfocatura JPEG:"
 
-#: ../plug-ins/common/file-mng.c:1438
+#: ../plug-ins/common/file-mng.c:1471
 msgid "Animated MNG Options"
 msgstr "Opzioni MNG animata"
 
-#: ../plug-ins/common/file-mng.c:1444
+#: ../plug-ins/common/file-mng.c:1477
 msgid "Loop"
 msgstr "Ciclico"
 
-#: ../plug-ins/common/file-mng.c:1458
+#: ../plug-ins/common/file-mng.c:1491
 msgid "Default frame delay:"
 msgstr "Ritardo predefinito fotogrammi:"
 
-#: ../plug-ins/common/file-mng.c:1531
+#: ../plug-ins/common/file-mng.c:1564
 msgid "MNG animation"
 msgstr "Animazione MNG"
 
@@ -3681,13 +3681,13 @@ msgstr "Impossibile leggere l'intestazione da '%s'"
 msgid "'%s' is not a PCX file"
 msgstr "'%s' non è un file PCX"
 
-#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:579
+#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:606
 #: ../plug-ins/file-psd/psd-load.c:302
 #, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr "Larghezza immagine non supportata o non valida: %d"
 
-#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:585
+#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:612
 #: ../plug-ins/file-psd/psd-load.c:294
 #, c-format
 msgid "Unsupported or invalid image height: %d"
@@ -3983,7 +3983,7 @@ msgid "Rendering"
 msgstr "Rendering"
 
 #. Resolution
-#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:916
+#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:929
 #: ../plug-ins/common/file-wmf.c:692
 msgid "Resolution:"
 msgstr "Risoluzione:"
@@ -4310,7 +4310,7 @@ msgstr "RLE"
 msgid "SVG image"
 msgstr "Immagine SVG"
 
-#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:720
+#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:733
 msgid "Unknown reason"
 msgstr "Motivo sconosciuto"
 
@@ -4336,51 +4336,51 @@ msgstr ""
 "specifica l'ampiezza!"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/file-svg.c:729
+#: ../plug-ins/common/file-svg.c:742
 msgid "Render Scalable Vector Graphics"
 msgstr "Renderizza Grafica Vettoriale Scalabile (SVG)"
 
 #. Width and Height
-#: ../plug-ins/common/file-svg.c:795 ../plug-ins/common/file-wmf.c:571
+#: ../plug-ins/common/file-svg.c:808 ../plug-ins/common/file-wmf.c:571
 #: ../plug-ins/common/grid.c:724
 msgid "Width:"
 msgstr "Larghezza:"
 
-#: ../plug-ins/common/file-svg.c:801 ../plug-ins/common/file-wmf.c:577
+#: ../plug-ins/common/file-svg.c:814 ../plug-ins/common/file-wmf.c:577
 msgid "Height:"
 msgstr "Altezza:"
 
-#: ../plug-ins/common/file-svg.c:875 ../plug-ins/common/file-wmf.c:651
+#: ../plug-ins/common/file-svg.c:888 ../plug-ins/common/file-wmf.c:651
 msgid "_X ratio:"
 msgstr "Rapporto _X:"
 
-#: ../plug-ins/common/file-svg.c:897 ../plug-ins/common/file-wmf.c:673
+#: ../plug-ins/common/file-svg.c:910 ../plug-ins/common/file-wmf.c:673
 msgid "_Y ratio:"
 msgstr "Rapporto _Y:"
 
-#: ../plug-ins/common/file-svg.c:911 ../plug-ins/common/file-wmf.c:687
+#: ../plug-ins/common/file-svg.c:924 ../plug-ins/common/file-wmf.c:687
 msgid "Constrain aspect ratio"
 msgstr "Mantieni rapporto dimensioni"
 
-#: ../plug-ins/common/file-svg.c:922 ../plug-ins/common/file-wmf.c:698
+#: ../plug-ins/common/file-svg.c:935 ../plug-ins/common/file-wmf.c:698
 #: ../plug-ins/print/print-page-layout.c:273
 #, c-format
 msgid "pixels/%a"
 msgstr "Punti/%a"
 
 #. Path Import
-#: ../plug-ins/common/file-svg.c:942
+#: ../plug-ins/common/file-svg.c:955
 msgid "Import _paths"
 msgstr "Importa _tracciati"
 
-#: ../plug-ins/common/file-svg.c:948
+#: ../plug-ins/common/file-svg.c:961
 msgid ""
 "Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr ""
 "Importa i tracciati dal file SVG in modo da poterli usare con lo strumento "
 "tracciati di GIMP"
 
-#: ../plug-ins/common/file-svg.c:961
+#: ../plug-ins/common/file-svg.c:974
 msgid "Merge imported paths"
 msgstr "Fondi tracciati importati"
 
@@ -4695,7 +4695,7 @@ msgid "Composing images"
 msgstr "Composizione immagini"
 
 #: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:216
-#: ../plug-ins/help-browser/dialog.c:1133
+#: ../plug-ins/help-browser/dialog.c:1120
 msgid "Untitled"
 msgstr "Senza nome"
 
@@ -5607,35 +5607,35 @@ msgstr "Invia l'immagine per email"
 msgid "Send by E_mail..."
 msgstr "Invia per email..."
 
-#: ../plug-ins/common/mail.c:408
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
 msgstr "Invia per email"
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "_Spedisci"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "_Nome file:"
 
-#: ../plug-ins/common/mail.c:457
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
 msgstr "_A:"
 
-#: ../plug-ins/common/mail.c:471
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
 msgstr "_Da:"
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "_Oggetto:"
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "estensione del file errata o mancante"
 
-#: ../plug-ins/common/mail.c:726
+#: ../plug-ins/common/mail.c:725
 #, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "Impossibile eseguire sendmail (%s)"
@@ -6061,11 +6061,11 @@ msgstr "Di_ffusione..."
 msgid "Spreading"
 msgstr "Diffusione"
 
-#: ../plug-ins/common/noise-spread.c:344
+#: ../plug-ins/common/noise-spread.c:346
 msgid "Spread"
 msgstr "Diffusione"
 
-#: ../plug-ins/common/noise-spread.c:369
+#: ../plug-ins/common/noise-spread.c:371
 msgid "Spread Amount"
 msgstr "Ammontare della diffusione"
 
@@ -6435,7 +6435,7 @@ msgstr "Contorni"
 
 #: ../plug-ins/common/ripple.c:566
 msgid "_Blank"
-msgstr "_Vuoto"
+msgstr "_Cancella"
 
 #. Wave toggle box
 #: ../plug-ins/common/ripple.c:588
@@ -7063,11 +7063,11 @@ msgstr "Luce"
 msgid "File '%s' is not a valid save file."
 msgstr "\"%s\" non è un file di salvataggio valido."
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Open File"
 msgstr "Apri file"
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Save File"
 msgstr "Salva file"
 
@@ -7174,7 +7174,7 @@ msgstr "Crea un'immagine di una sfera con texture"
 msgid "Sphere _Designer..."
 msgstr "_Designer sfera..."
 
-#: ../plug-ins/common/sphere-designer.c:3074
+#: ../plug-ins/common/sphere-designer.c:3080
 msgid "Region selected for plug-in is empty"
 msgstr "La regione selezionata per il plug-in è vuota"
 
@@ -8091,36 +8091,36 @@ msgstr "_Forza:"
 msgid "Higher values increase the magnitude of the effect"
 msgstr "Valori alti possono incrementarne l'effetto"
 
-#: ../plug-ins/file-bmp/bmp-read.c:86
+#: ../plug-ins/file-bmp/bmp-read.c:88
 msgid "Bad colormap"
 msgstr "Mappa colore non valida"
 
-#: ../plug-ins/file-bmp/bmp-read.c:170 ../plug-ins/file-bmp/bmp-read.c:180
-#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196
-#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:395
-#: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:411
-#: ../plug-ins/file-bmp/bmp-read.c:419
+#: ../plug-ins/file-bmp/bmp-read.c:172 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:422
+#: ../plug-ins/file-bmp/bmp-read.c:430 ../plug-ins/file-bmp/bmp-read.c:438
+#: ../plug-ins/file-bmp/bmp-read.c:446
 #, c-format
 msgid "'%s' is not a valid BMP file"
 msgstr "'%s' non è un file BMP valido"
 
-#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252
-#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345
-#: ../plug-ins/file-bmp/bmp-read.c:371
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
 #, c-format
 msgid "Error reading BMP file header from '%s'"
 msgstr "Errore lettura intestazione file BMP da '%s'"
 
-#: ../plug-ins/file-bmp/bmp-read.c:531
+#: ../plug-ins/file-bmp/bmp-read.c:558
 msgid "Unrecognized or invalid BMP compression format."
 msgstr "Formato di compressione BMP non riconosciuto o non valido."
 
-#: ../plug-ins/file-bmp/bmp-read.c:573
+#: ../plug-ins/file-bmp/bmp-read.c:600
 msgid "Unsupported or invalid bitdepth."
 msgstr "Profondità di colore (in bit) non supportata o non valida."
 
-#: ../plug-ins/file-bmp/bmp-read.c:761 ../plug-ins/file-bmp/bmp-read.c:802
-#: ../plug-ins/file-bmp/bmp-read.c:852
+#: ../plug-ins/file-bmp/bmp-read.c:788 ../plug-ins/file-bmp/bmp-read.c:829
+#: ../plug-ins/file-bmp/bmp-read.c:879
 msgid "The bitmap ends unexpectedly."
 msgstr "La bitmap termina in maniera inaspettata."
 
@@ -10588,76 +10588,76 @@ msgid "_Second Flares"
 msgstr "Riverberi _secondari"
 
 #: ../plug-ins/help-browser/dialog.c:186
-#: ../plug-ins/help-browser/dialog.c:1134
+#: ../plug-ins/help-browser/dialog.c:1121
 msgid "GIMP Help Browser"
 msgstr "Navigatore della guida di Gimp"
 
-#: ../plug-ins/help-browser/dialog.c:566
+#: ../plug-ins/help-browser/dialog.c:564
 msgid "Go back one page"
 msgstr "Indietro di una pagina"
 
-#: ../plug-ins/help-browser/dialog.c:571
+#: ../plug-ins/help-browser/dialog.c:569
 msgid "Go forward one page"
 msgstr "Avanti di una pagina"
 
-#: ../plug-ins/help-browser/dialog.c:576
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "_Reload"
 msgstr "_Ricarica"
 
-#: ../plug-ins/help-browser/dialog.c:576
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "Reload current page"
 msgstr "Ricarica la pagina corrente"
 
-#: ../plug-ins/help-browser/dialog.c:581
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "_Stop"
 msgstr "_Stop"
 
-#: ../plug-ins/help-browser/dialog.c:581
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "Stop loading this page"
 msgstr "Blocca il caricamento di questa pagina"
 
-#: ../plug-ins/help-browser/dialog.c:586
+#: ../plug-ins/help-browser/dialog.c:584
 msgid "Go to the index page"
 msgstr "Vai all'indice"
 
-#: ../plug-ins/help-browser/dialog.c:591
+#: ../plug-ins/help-browser/dialog.c:589
 msgid "C_opy location"
 msgstr "C_opia posizione"
 
-#: ../plug-ins/help-browser/dialog.c:592
+#: ../plug-ins/help-browser/dialog.c:590
 msgid "Copy the location of this page to the clipboard"
 msgstr "Copia la posizione di questa pagina negli appunti"
 
-#: ../plug-ins/help-browser/dialog.c:612
+#: ../plug-ins/help-browser/dialog.c:610
 msgid "Find text in current page"
 msgstr "Trova il testo nella pagina corrente"
 
-#: ../plug-ins/help-browser/dialog.c:617
+#: ../plug-ins/help-browser/dialog.c:615
 msgid "Find _Again"
 msgstr "Trova _ancora"
 
-#: ../plug-ins/help-browser/dialog.c:636
+#: ../plug-ins/help-browser/dialog.c:634
 msgid "S_how Index"
 msgstr "_Mostra l'indice"
 
-#: ../plug-ins/help-browser/dialog.c:637
+#: ../plug-ins/help-browser/dialog.c:635
 msgid "Toggle the visibility of the sidebar"
 msgstr "Commuta la visibilità della barra laterale"
 
-#: ../plug-ins/help-browser/dialog.c:658
+#: ../plug-ins/help-browser/dialog.c:656
 msgid "Visit the GIMP documentation website"
 msgstr "Visita il sito di documentazione di GIMP"
 
-#: ../plug-ins/help-browser/dialog.c:1175
+#: ../plug-ins/help-browser/dialog.c:1162
 msgid "Find:"
 msgstr "Trova:"
 
-#: ../plug-ins/help-browser/dialog.c:1192
+#: ../plug-ins/help-browser/dialog.c:1179
 msgctxt "search"
 msgid "_Previous"
 msgstr "_Precedente"
 
-#: ../plug-ins/help-browser/dialog.c:1204
+#: ../plug-ins/help-browser/dialog.c:1191
 msgctxt "search"
 msgid "_Next"
 msgstr "_Successivo"
@@ -12266,25 +12266,25 @@ msgstr "Richiesto attributo rdf:about mancante in <%s>"
 msgid "Nested elements (<%s>) are not allowed in this context"
 msgstr "Gli elementi annidati (<%s>) non sono permessi in questo contesto"
 
-#: ../plug-ins/metadata/xmp-parse.c:1005
+#: ../plug-ins/metadata/xmp-parse.c:1010
 #, c-format
 msgid "End of element <%s> not expected in this context"
 msgstr "Fine dell'elemento <%s> non attesa in questo contesto"
 
-#: ../plug-ins/metadata/xmp-parse.c:1107
+#: ../plug-ins/metadata/xmp-parse.c:1112
 #, c-format
 msgid "The current element (<%s>) cannot contain text"
 msgstr "L'elemento corrente (<%s>) non può contenere testo"
 
-#: ../plug-ins/metadata/xmp-parse.c:1132
+#: ../plug-ins/metadata/xmp-parse.c:1137
 msgid "XMP packets must start with "
 msgstr "I pacchetti XMP devono cominciare con "
 
-#: ../plug-ins/metadata/xmp-parse.c:1146
+#: ../plug-ins/metadata/xmp-parse.c:1151
 msgid "XMP packets must end with "
 msgstr "I pacchetti XMP devono finire con "
 
-#: ../plug-ins/metadata/xmp-parse.c:1159
+#: ../plug-ins/metadata/xmp-parse.c:1164
 msgid "XMP cannot contain XML comments or processing instructions"
 msgstr "XMP non può contenere commenti XML o istruzioni di processo"
 
diff --git a/po-plug-ins/ja.po b/po-plug-ins/ja.po
index e45ef1169e..504ac75823 100644
--- a/po-plug-ins/ja.po
+++ b/po-plug-ins/ja.po
@@ -1,24 +1,25 @@
 # GIMP plug-ins message translation table
-# Copyright (C) 1999-2001 Free Software Foundation, Inc.
+# Copyright (C) 1999-2009 Free Software Foundation, Inc.
 # SHIRASAKI Yasuhiro , 1999-2001.
 # Takashi Kido , 2000.
 # Ryoichi INAGAKI , 2003.
 # Tadashi Jokagi , 2005.
-# Nishibori Kiyotaka , 2008
+# Nishibori Kiyotaka , 2008-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-21 22:13+0900\n"
-"PO-Revision-Date: 2009-07-21 22:39+0900\n"
+"Project-Id-Version: gimp gimp-2-6\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=Internationalisation\n"
+"POT-Creation-Date: 2009-10-03 21:12+0900\n"
+"PO-Revision-Date: 2009-09-28 22:49+0900\n"
 "Last-Translator: Nishibori Kiyotaka \n"
-"Language-Team: Japanese \n"
+"Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Bookmarks: 1312,539,750,776,788,796,1925,1629,8,1692\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:119
 msgid "Original"
@@ -42,8 +43,7 @@ msgstr "レイヤー全体"
 
 #. Create selection
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:173
-#: ../plug-ins/common/film.c:966
-#: ../plug-ins/imagemap/imap_selection.c:367
+#: ../plug-ins/common/film.c:966 ../plug-ins/imagemap/imap_selection.c:367
 #: ../plug-ins/selection-to-path/selection-to-path.c:433
 msgid "Selection"
 msgstr "選択範囲"
@@ -55,8 +55,7 @@ msgstr "状況に応じて"
 #. spinbutton 1
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:299
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:377
-#: ../plug-ins/common/color-to-alpha.c:410
-#: ../plug-ins/file-fli/fli-gimp.c:875
+#: ../plug-ins/common/color-to-alpha.c:410 ../plug-ins/file-fli/fli-gimp.c:875
 #: ../plug-ins/file-fli/fli-gimp.c:945
 msgid "From:"
 msgstr "最初: "
@@ -64,14 +63,12 @@ msgstr "最初: "
 #. spinbutton 2
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:325
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:378
-#: ../plug-ins/file-fli/fli-gimp.c:884
-#: ../plug-ins/file-fli/fli-gimp.c:954
+#: ../plug-ins/file-fli/fli-gimp.c:884 ../plug-ins/file-fli/fli-gimp.c:954
 msgid "To:"
 msgstr "宛: "
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:419
-#: ../plug-ins/common/file-ps.c:3231
-#: ../plug-ins/imagemap/imap_menu.c:214
+#: ../plug-ins/common/file-ps.c:3231 ../plug-ins/imagemap/imap_menu.c:214
 msgid "Gray"
 msgstr "グレー"
 
@@ -155,7 +152,8 @@ msgstr "すべて選択"
 
 #: ../plug-ins/color-rotate/color-rotate.c:99
 msgid "Replace a range of colors with another"
-msgstr "色相環上の色範囲を他の位置に移動したり、グレーの色としての扱いを調整します"
+msgstr ""
+"色相環上の色範囲を他の位置に移動したり、グレーの色としての扱いを調整します"
 
 #: ../plug-ins/color-rotate/color-rotate.c:106
 msgid "_Rotate Colors..."
@@ -253,23 +251,19 @@ msgstr "エイリアンマップ:  変換しています"
 msgid "Alien Map"
 msgstr "エイリアンマップ"
 
-#: ../plug-ins/common/alien-map.c:441
-#: ../plug-ins/common/alien-map.c:465
+#: ../plug-ins/common/alien-map.c:441 ../plug-ins/common/alien-map.c:465
 #: ../plug-ins/common/alien-map.c:489
 msgid "Number of cycles covering full value range"
 msgstr "値全体をカバーする周波数"
 
-#: ../plug-ins/common/alien-map.c:453
-#: ../plug-ins/common/alien-map.c:477
+#: ../plug-ins/common/alien-map.c:453 ../plug-ins/common/alien-map.c:477
 #: ../plug-ins/common/alien-map.c:501
 msgid "Phase angle, range 0-360"
 msgstr "位相角、範囲は 0-360"
 
 #. Propagate Mode
-#: ../plug-ins/common/alien-map.c:515
-#: ../plug-ins/common/hot.c:611
-#: ../plug-ins/common/value-propagate.c:1120
-#: ../plug-ins/common/waves.c:277
+#: ../plug-ins/common/alien-map.c:515 ../plug-ins/common/hot.c:611
+#: ../plug-ins/common/value-propagate.c:1120 ../plug-ins/common/waves.c:277
 msgid "Mode"
 msgstr "モード"
 
@@ -298,12 +292,9 @@ msgid "Align Visible Layers"
 msgstr "可視レイヤーの整列"
 
 #. if and how to center the image on the page
-#: ../plug-ins/common/align-layers.c:424
-#: ../plug-ins/common/align-layers.c:455
-#: ../plug-ins/common/cml-explorer.c:166
-#: ../plug-ins/common/file-ps.c:3247
-#: ../plug-ins/common/file-ps.c:3259
-#: ../plug-ins/common/file-psp.c:661
+#: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455
+#: ../plug-ins/common/cml-explorer.c:166 ../plug-ins/common/file-ps.c:3247
+#: ../plug-ins/common/file-ps.c:3259 ../plug-ins/common/file-psp.c:661
 #: ../plug-ins/file-fits/fits.c:1045
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:999
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1040
@@ -313,8 +304,7 @@ msgstr "可視レイヤーの整列"
 msgid "None"
 msgstr "なし"
 
-#: ../plug-ins/common/align-layers.c:425
-#: ../plug-ins/common/align-layers.c:456
+#: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456
 msgid "Collect"
 msgstr "合わせる"
 
@@ -326,8 +316,7 @@ msgstr "左から右へ順番に"
 msgid "Fill (right to left)"
 msgstr "右から左へ順番に"
 
-#: ../plug-ins/common/align-layers.c:428
-#: ../plug-ins/common/align-layers.c:459
+#: ../plug-ins/common/align-layers.c:428 ../plug-ins/common/align-layers.c:459
 msgid "Snap to grid"
 msgstr "グリッドに付ける"
 
@@ -339,8 +328,7 @@ msgstr "水平方向スタイル(_H): "
 msgid "Left edge"
 msgstr "左端"
 
-#: ../plug-ins/common/align-layers.c:442
-#: ../plug-ins/common/align-layers.c:472
+#: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472
 #: ../plug-ins/gradient-flare/gradient-flare.c:2713
 msgid "Center"
 msgstr "中央"
@@ -546,8 +534,7 @@ msgstr "キャンバス地"
 #. *****************************************************
 #. radio buttons for choosing LEFT or RIGHT
 #. *************************************************
-#: ../plug-ins/common/apply-canvas.c:1292
-#: ../plug-ins/common/wind.c:945
+#: ../plug-ins/common/apply-canvas.c:1292 ../plug-ins/common/wind.c:945
 #: ../plug-ins/lighting/lighting-ui.c:518
 msgid "Direction"
 msgstr "方向"
@@ -568,10 +555,8 @@ msgstr "左下(_B)"
 msgid "Bottom-_right"
 msgstr "右下(_R)"
 
-#: ../plug-ins/common/apply-canvas.c:1324
-#: ../plug-ins/common/bump-map.c:916
-#: ../plug-ins/common/emboss.c:523
-#: ../plug-ins/common/fractal-trace.c:796
+#: ../plug-ins/common/apply-canvas.c:1324 ../plug-ins/common/bump-map.c:916
+#: ../plug-ins/common/emboss.c:523 ../plug-ins/common/fractal-trace.c:796
 #: ../plug-ins/map-object/map-object-ui.c:573
 msgid "_Depth:"
 msgstr "深度(_D): "
@@ -593,65 +578,45 @@ msgid "Blinds"
 msgstr "ブラインド"
 
 #. Orientation toggle box
-#: ../plug-ins/common/blinds.c:260
-#: ../plug-ins/common/ripple.c:539
+#: ../plug-ins/common/blinds.c:260 ../plug-ins/common/ripple.c:539
 msgid "Orientation"
 msgstr "向き"
 
-#: ../plug-ins/common/blinds.c:264
-#: ../plug-ins/common/ripple.c:543
-#: ../plug-ins/common/tile-small.c:426
-#: ../plug-ins/pagecurl/pagecurl.c:534
+#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:543
+#: ../plug-ins/common/tile-small.c:426 ../plug-ins/pagecurl/pagecurl.c:534
 msgid "_Horizontal"
 msgstr "水平(_H)"
 
-#: ../plug-ins/common/blinds.c:265
-#: ../plug-ins/common/ripple.c:544
-#: ../plug-ins/common/tile-small.c:436
-#: ../plug-ins/pagecurl/pagecurl.c:533
+#: ../plug-ins/common/blinds.c:265 ../plug-ins/common/ripple.c:544
+#: ../plug-ins/common/tile-small.c:436 ../plug-ins/pagecurl/pagecurl.c:533
 msgid "_Vertical"
 msgstr "垂直(_V)"
 
 #.
 #. * Create the "background" layer to hold the image...
 #.
-#: ../plug-ins/common/blinds.c:278
-#: ../plug-ins/common/compose.c:935
-#: ../plug-ins/common/decompose.c:723
-#: ../plug-ins/common/file-cel.c:362
-#: ../plug-ins/common/file-cel.c:365
-#: ../plug-ins/common/file-dicom.c:557
-#: ../plug-ins/common/file-gif-load.c:911
-#: ../plug-ins/common/file-pcx.c:412
-#: ../plug-ins/common/file-pcx.c:418
-#: ../plug-ins/common/file-pix.c:382
-#: ../plug-ins/common/file-png.c:852
-#: ../plug-ins/common/file-pnm.c:585
-#: ../plug-ins/common/file-raw.c:712
-#: ../plug-ins/common/file-sunras.c:975
-#: ../plug-ins/common/file-tga.c:1064
-#: ../plug-ins/common/file-tiff-load.c:997
-#: ../plug-ins/common/file-xbm.c:896
-#: ../plug-ins/common/film.c:746
-#: ../plug-ins/common/smooth-palette.c:257
-#: ../plug-ins/common/tile.c:267
-#: ../plug-ins/file-bmp/bmp-read.c:590
-#: ../plug-ins/file-faxg3/faxg3.c:478
-#: ../plug-ins/file-fits/fits.c:530
-#: ../plug-ins/file-jpeg/jpeg-load.c:249
-#: ../plug-ins/file-jpeg/jpeg-load.c:761
+#: ../plug-ins/common/blinds.c:278 ../plug-ins/common/compose.c:935
+#: ../plug-ins/common/decompose.c:723 ../plug-ins/common/file-cel.c:362
+#: ../plug-ins/common/file-cel.c:365 ../plug-ins/common/file-dicom.c:557
+#: ../plug-ins/common/file-gif-load.c:911 ../plug-ins/common/file-pcx.c:412
+#: ../plug-ins/common/file-pcx.c:418 ../plug-ins/common/file-pix.c:382
+#: ../plug-ins/common/file-png.c:852 ../plug-ins/common/file-pnm.c:585
+#: ../plug-ins/common/file-raw.c:712 ../plug-ins/common/file-sunras.c:975
+#: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997
+#: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:746
+#: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:267
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:617
+#: ../plug-ins/file-faxg3/faxg3.c:478 ../plug-ins/file-fits/fits.c:530
+#: ../plug-ins/file-jpeg/jpeg-load.c:249 ../plug-ins/file-jpeg/jpeg-load.c:761
 #: ../plug-ins/file-psd/psd-image-res-load.c:995
-#: ../plug-ins/file-psd/psd-load.c:1526
-#: ../plug-ins/file-sgi/sgi.c:384
+#: ../plug-ins/file-psd/psd-load.c:1526 ../plug-ins/file-sgi/sgi.c:384
 #: ../plug-ins/gfig/gfig-dialog.c:1284
-#: ../plug-ins/gimpressionist/general.c:140
-#: ../plug-ins/twain/twain.c:568
+#: ../plug-ins/gimpressionist/general.c:140 ../plug-ins/twain/twain.c:568
 #: ../plug-ins/win-snap/winsnap.c:1155
 msgid "Background"
 msgstr "背景"
 
-#: ../plug-ins/common/blinds.c:282
-#: ../plug-ins/common/fractal-trace.c:738
+#: ../plug-ins/common/blinds.c:282 ../plug-ins/common/fractal-trace.c:738
 #: ../plug-ins/common/tile-paper.c:384
 msgid "_Transparent"
 msgstr "透明(_T)"
@@ -678,16 +643,11 @@ msgid "Selective Gaussian Blur"
 msgstr "選択的ガウシアンぼかし"
 
 #: ../plug-ins/common/blur-gauss-selective.c:211
-#: ../plug-ins/common/blur-gauss.c:448
-#: ../plug-ins/common/cartoon.c:232
-#: ../plug-ins/common/edge-dog.c:267
-#: ../plug-ins/common/edge-neon.c:228
-#: ../plug-ins/common/edge-sobel.c:212
-#: ../plug-ins/common/photocopy.c:244
-#: ../plug-ins/common/pixelize.c:293
-#: ../plug-ins/common/softglow.c:224
-#: ../plug-ins/file-sgi/sgi.c:536
-#: ../plug-ins/file-xjt/xjt.c:1701
+#: ../plug-ins/common/blur-gauss.c:448 ../plug-ins/common/cartoon.c:232
+#: ../plug-ins/common/edge-dog.c:267 ../plug-ins/common/edge-neon.c:228
+#: ../plug-ins/common/edge-sobel.c:212 ../plug-ins/common/photocopy.c:244
+#: ../plug-ins/common/pixelize.c:293 ../plug-ins/common/softglow.c:224
+#: ../plug-ins/file-sgi/sgi.c:536 ../plug-ins/file-xjt/xjt.c:1701
 #: ../plug-ins/gradient-flare/gradient-flare.c:966
 msgid "Cannot operate on indexed color images."
 msgstr "インデックス画像には適用できません"
@@ -708,15 +668,12 @@ msgstr "最もシンプルで良く使われるぼかしです"
 msgid "_Gaussian Blur..."
 msgstr "ガウシアンぼかし(_G)..."
 
-#: ../plug-ins/common/blur-gauss.c:179
-#: ../plug-ins/common/blur-gauss.c:199
-#: ../plug-ins/common/blur-gauss.c:219
-#: ../plug-ins/common/blur-gauss.c:239
+#: ../plug-ins/common/blur-gauss.c:179 ../plug-ins/common/blur-gauss.c:199
+#: ../plug-ins/common/blur-gauss.c:219 ../plug-ins/common/blur-gauss.c:239
 msgid "Apply a gaussian blur"
 msgstr "ガウシアンぼかしを適用しています"
 
-#: ../plug-ins/common/blur-gauss.c:428
-#: ../plug-ins/common/blur-gauss.c:478
+#: ../plug-ins/common/blur-gauss.c:428 ../plug-ins/common/blur-gauss.c:478
 msgid "Gaussian Blur"
 msgstr "ガウシアンぼかし"
 
@@ -725,14 +682,12 @@ msgstr "ガウシアンぼかし"
 msgid "Blur Radius"
 msgstr "ぼかし半径"
 
-#: ../plug-ins/common/blur-gauss.c:522
-#: ../plug-ins/common/jigsaw.c:2457
+#: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457
 #: ../plug-ins/common/noise-spread.c:386
 msgid "_Horizontal:"
 msgstr "水平(_H): "
 
-#: ../plug-ins/common/blur-gauss.c:526
-#: ../plug-ins/common/jigsaw.c:2474
+#: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474
 #: ../plug-ins/common/noise-spread.c:390
 msgid "_Vertical:"
 msgstr "垂直(_V): "
@@ -749,13 +704,11 @@ msgstr "_IIR"
 msgid "_RLE"
 msgstr "_RLE"
 
-#: ../plug-ins/common/blur-motion.c:157
-#: ../plug-ins/common/blur-motion.c:171
+#: ../plug-ins/common/blur-motion.c:157 ../plug-ins/common/blur-motion.c:171
 msgid "Simulate movement using directional blur"
 msgstr "指向性のあるぼかし方で「動き」を表現します"
 
-#: ../plug-ins/common/blur-motion.c:164
-#: ../plug-ins/common/blur-motion.c:177
+#: ../plug-ins/common/blur-motion.c:164 ../plug-ins/common/blur-motion.c:177
 msgid "_Motion Blur..."
 msgstr "モーションぼかし(_M)..."
 
@@ -790,20 +743,16 @@ msgstr "拡大(_Z)"
 msgid "Blur Center"
 msgstr "ぼかしの中心"
 
-#: ../plug-ins/common/blur-motion.c:1094
-#: ../plug-ins/common/lens-flare.c:772
-#: ../plug-ins/common/nova.c:463
-#: ../plug-ins/common/tile-paper.c:282
+#: ../plug-ins/common/blur-motion.c:1094 ../plug-ins/common/lens-flare.c:772
+#: ../plug-ins/common/nova.c:463 ../plug-ins/common/tile-paper.c:282
 #: ../plug-ins/flame/flame.c:1251
 #: ../plug-ins/gradient-flare/gradient-flare.c:2725
 #: ../plug-ins/lighting/lighting-ui.c:477
 msgid "_X:"
 msgstr "_X:"
 
-#: ../plug-ins/common/blur-motion.c:1099
-#: ../plug-ins/common/lens-flare.c:777
-#: ../plug-ins/common/nova.c:468
-#: ../plug-ins/common/tile-paper.c:291
+#: ../plug-ins/common/blur-motion.c:1099 ../plug-ins/common/lens-flare.c:777
+#: ../plug-ins/common/nova.c:468 ../plug-ins/common/tile-paper.c:291
 #: ../plug-ins/flame/flame.c:1265
 #: ../plug-ins/gradient-flare/gradient-flare.c:2729
 #: ../plug-ins/lighting/lighting-ui.c:492
@@ -823,21 +772,21 @@ msgstr "ぼかしのパラメータ"
 msgid "L_ength:"
 msgstr "長さ(_E): "
 
-#: ../plug-ins/common/blur-motion.c:1138
-#: ../plug-ins/common/newsprint.c:1001
+#: ../plug-ins/common/blur-motion.c:1138 ../plug-ins/common/newsprint.c:1001
 msgid "_Angle:"
 msgstr "角度(_A): "
 
 #: ../plug-ins/common/blur.c:125
 msgid "Simple blur, fast but not very strong"
-msgstr "単純なぼかしを適用します。処理速度は速いですがぼかし度合いはあまり強くありません。"
+msgstr ""
+"単純なぼかしを適用します。処理速度は速いですがぼかし度合いはあまり強くありま"
+"せん。"
 
 #: ../plug-ins/common/blur.c:134
 msgid "_Blur"
 msgstr "ぼかし(_B)"
 
-#: ../plug-ins/common/blur.c:178
-#: ../plug-ins/common/unsharp-mask.c:439
+#: ../plug-ins/common/blur.c:178 ../plug-ins/common/unsharp-mask.c:439
 msgid "Blurring"
 msgstr "ぼかしています"
 
@@ -896,20 +845,17 @@ msgid "_Bump map:"
 msgstr "バンプマップ(_B): "
 
 #. Map type menu
-#: ../plug-ins/common/bump-map.c:835
-#: ../plug-ins/flame/flame.c:748
+#: ../plug-ins/common/bump-map.c:835 ../plug-ins/flame/flame.c:748
 #: ../plug-ins/lighting/lighting-ui.c:842
 msgid "Linear"
 msgstr "線形"
 
-#: ../plug-ins/common/bump-map.c:836
-#: ../plug-ins/flame/flame.c:750
+#: ../plug-ins/common/bump-map.c:836 ../plug-ins/flame/flame.c:750
 #: ../plug-ins/lighting/lighting-ui.c:845
 msgid "Spherical"
 msgstr "球面"
 
-#: ../plug-ins/common/bump-map.c:837
-#: ../plug-ins/flame/flame.c:749
+#: ../plug-ins/common/bump-map.c:837 ../plug-ins/flame/flame.c:749
 #: ../plug-ins/lighting/lighting-ui.c:844
 msgid "Sinusoidal"
 msgstr "波状"
@@ -933,8 +879,7 @@ msgstr "反転バンプマップ(_N)"
 msgid "_Tile bumpmap"
 msgstr "タイルバンプマップ(_T)"
 
-#: ../plug-ins/common/bump-map.c:892
-#: ../plug-ins/common/emboss.c:499
+#: ../plug-ins/common/bump-map.c:892 ../plug-ins/common/emboss.c:499
 msgid "_Azimuth:"
 msgstr "方向(_A): "
 
@@ -942,18 +887,19 @@ msgstr "方向(_A): "
 msgid "_Elevation:"
 msgstr "持ち上げ(_E): "
 
-#: ../plug-ins/common/bump-map.c:930
-#: ../plug-ins/common/file-ps.c:3398
+#: ../plug-ins/common/bump-map.c:930 ../plug-ins/common/file-ps.c:3398
 msgid "_X offset:"
 msgstr "X オフセット(_X): "
 
-#: ../plug-ins/common/bump-map.c:933
-#: ../plug-ins/common/bump-map.c:947
-msgid "The offset can be adjusted by dragging the preview using the middle mouse button."
-msgstr "オフセットは、プレビューをマウスの中ボタンでドラッグして調整することもできます"
+#: ../plug-ins/common/bump-map.c:933 ../plug-ins/common/bump-map.c:947
+msgid ""
+"The offset can be adjusted by dragging the preview using the middle mouse "
+"button."
+msgstr ""
+"オフセットは、プレビューをマウスの中ボタンでドラッグして調整することもできま"
+"す"
 
-#: ../plug-ins/common/bump-map.c:944
-#: ../plug-ins/common/file-ps.c:3407
+#: ../plug-ins/common/bump-map.c:944 ../plug-ins/common/file-ps.c:3407
 msgid "_Y offset:"
 msgstr "Y オフセット(_Y): "
 
@@ -977,8 +923,7 @@ msgstr "漫画(_R)..."
 msgid "Cartoon"
 msgstr "漫画"
 
-#: ../plug-ins/common/cartoon.c:848
-#: ../plug-ins/common/photocopy.c:876
+#: ../plug-ins/common/cartoon.c:848 ../plug-ins/common/photocopy.c:876
 msgid "_Mask radius:"
 msgstr "マスク半径(_M): "
 
@@ -1007,59 +952,44 @@ msgid "O_utput channel:"
 msgstr "出力レベル(_U): "
 
 #. Redmode radio frame
-#: ../plug-ins/common/channel-mixer.c:538
-#: ../plug-ins/common/decompose.c:174
+#: ../plug-ins/common/channel-mixer.c:538 ../plug-ins/common/decompose.c:174
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:991
 msgid "Red"
 msgstr "赤チャンネル"
 
 #. Greenmode radio frame
-#: ../plug-ins/common/channel-mixer.c:543
-#: ../plug-ins/common/decompose.c:175
+#: ../plug-ins/common/channel-mixer.c:543 ../plug-ins/common/decompose.c:175
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1032
 msgid "Green"
 msgstr "緑チャンネル"
 
 #. Bluemode radio frame
-#: ../plug-ins/common/channel-mixer.c:548
-#: ../plug-ins/common/decompose.c:176
+#: ../plug-ins/common/channel-mixer.c:548 ../plug-ins/common/decompose.c:176
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1073
 msgid "Blue"
 msgstr "青チャンネル"
 
 #: ../plug-ins/common/channel-mixer.c:583
-#: ../plug-ins/common/color-exchange.c:398
-#: ../plug-ins/common/compose.c:190
-#: ../plug-ins/common/compose.c:201
-#: ../plug-ins/common/diffraction.c:501
-#: ../plug-ins/common/diffraction.c:539
-#: ../plug-ins/common/diffraction.c:577
-#: ../plug-ins/common/noise-rgb.c:530
-#: ../plug-ins/common/noise-rgb.c:537
+#: ../plug-ins/common/color-exchange.c:398 ../plug-ins/common/compose.c:190
+#: ../plug-ins/common/compose.c:201 ../plug-ins/common/diffraction.c:501
+#: ../plug-ins/common/diffraction.c:539 ../plug-ins/common/diffraction.c:577
+#: ../plug-ins/common/noise-rgb.c:530 ../plug-ins/common/noise-rgb.c:537
 msgid "_Red:"
 msgstr "赤(_R): "
 
 #: ../plug-ins/common/channel-mixer.c:601
-#: ../plug-ins/common/color-exchange.c:458
-#: ../plug-ins/common/compose.c:191
-#: ../plug-ins/common/compose.c:202
-#: ../plug-ins/common/diffraction.c:510
-#: ../plug-ins/common/diffraction.c:548
-#: ../plug-ins/common/diffraction.c:586
-#: ../plug-ins/common/noise-rgb.c:531
-#: ../plug-ins/common/noise-rgb.c:538
+#: ../plug-ins/common/color-exchange.c:458 ../plug-ins/common/compose.c:191
+#: ../plug-ins/common/compose.c:202 ../plug-ins/common/diffraction.c:510
+#: ../plug-ins/common/diffraction.c:548 ../plug-ins/common/diffraction.c:586
+#: ../plug-ins/common/noise-rgb.c:531 ../plug-ins/common/noise-rgb.c:538
 msgid "_Green:"
 msgstr "緑(_G): "
 
 #: ../plug-ins/common/channel-mixer.c:620
-#: ../plug-ins/common/color-exchange.c:519
-#: ../plug-ins/common/compose.c:192
-#: ../plug-ins/common/compose.c:203
-#: ../plug-ins/common/diffraction.c:519
-#: ../plug-ins/common/diffraction.c:557
-#: ../plug-ins/common/diffraction.c:595
-#: ../plug-ins/common/noise-rgb.c:532
-#: ../plug-ins/common/noise-rgb.c:539
+#: ../plug-ins/common/color-exchange.c:519 ../plug-ins/common/compose.c:192
+#: ../plug-ins/common/compose.c:203 ../plug-ins/common/diffraction.c:519
+#: ../plug-ins/common/diffraction.c:557 ../plug-ins/common/diffraction.c:595
+#: ../plug-ins/common/noise-rgb.c:532 ../plug-ins/common/noise-rgb.c:539
 msgid "_Blue:"
 msgstr "青(_B): "
 
@@ -1077,55 +1007,34 @@ msgstr "チャンネルミキサー設定読み込み"
 
 #. stat error (file does not exist)
 #: ../plug-ins/common/channel-mixer.c:982
-#: ../plug-ins/common/cml-explorer.c:2178
-#: ../plug-ins/common/curve-bend.c:885
-#: ../plug-ins/common/file-cel.c:312
-#: ../plug-ins/common/file-compressor.c:498
+#: ../plug-ins/common/cml-explorer.c:2178 ../plug-ins/common/curve-bend.c:885
+#: ../plug-ins/common/file-cel.c:312 ../plug-ins/common/file-compressor.c:498
 #: ../plug-ins/common/file-compressor.c:666
-#: ../plug-ins/common/file-dicom.c:325
-#: ../plug-ins/common/file-gbr.c:361
-#: ../plug-ins/common/file-gif-load.c:340
-#: ../plug-ins/common/file-gih.c:662
-#: ../plug-ins/common/file-mng.c:1108
-#: ../plug-ins/common/file-pat.c:330
-#: ../plug-ins/common/file-pcx.c:361
-#: ../plug-ins/common/file-pdf.c:541
-#: ../plug-ins/common/file-pix.c:343
-#: ../plug-ins/common/file-png.c:721
-#: ../plug-ins/common/file-pnm.c:494
-#: ../plug-ins/common/file-ps.c:1036
-#: ../plug-ins/common/file-ps.c:3048
-#: ../plug-ins/common/file-psp.c:1751
-#: ../plug-ins/common/file-raw.c:249
-#: ../plug-ins/common/file-raw.c:666
-#: ../plug-ins/common/file-sunras.c:391
-#: ../plug-ins/common/file-svg.c:333
-#: ../plug-ins/common/file-svg.c:731
-#: ../plug-ins/common/file-tga.c:442
-#: ../plug-ins/common/file-tiff-load.c:291
-#: ../plug-ins/common/file-xbm.c:736
-#: ../plug-ins/common/file-xwd.c:433
-#: ../plug-ins/common/sphere-designer.c:2002
-#: ../plug-ins/file-bmp/bmp-read.c:154
-#: ../plug-ins/file-faxg3/faxg3.c:233
-#: ../plug-ins/file-fits/fits.c:358
-#: ../plug-ins/file-fli/fli-gimp.c:460
-#: ../plug-ins/file-fli/fli-gimp.c:497
-#: ../plug-ins/file-ico/ico-load.c:653
-#: ../plug-ins/file-ico/ico-load.c:732
-#: ../plug-ins/file-jpeg/jpeg-load.c:109
-#: ../plug-ins/file-jpeg/jpeg-load.c:831
-#: ../plug-ins/file-psd/psd-load.c:131
+#: ../plug-ins/common/file-dicom.c:325 ../plug-ins/common/file-gbr.c:361
+#: ../plug-ins/common/file-gif-load.c:340 ../plug-ins/common/file-gih.c:662
+#: ../plug-ins/common/file-mng.c:1108 ../plug-ins/common/file-pat.c:330
+#: ../plug-ins/common/file-pcx.c:361 ../plug-ins/common/file-pdf.c:541
+#: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:721
+#: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1036
+#: ../plug-ins/common/file-ps.c:3048 ../plug-ins/common/file-psp.c:1751
+#: ../plug-ins/common/file-raw.c:249 ../plug-ins/common/file-raw.c:666
+#: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333
+#: ../plug-ins/common/file-svg.c:731 ../plug-ins/common/file-tga.c:442
+#: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
+#: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2002
+#: ../plug-ins/file-bmp/bmp-read.c:156 ../plug-ins/file-faxg3/faxg3.c:233
+#: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:460
+#: ../plug-ins/file-fli/fli-gimp.c:497 ../plug-ins/file-ico/ico-load.c:653
+#: ../plug-ins/file-ico/ico-load.c:732 ../plug-ins/file-jpeg/jpeg-load.c:109
+#: ../plug-ins/file-jpeg/jpeg-load.c:831 ../plug-ins/file-psd/psd-load.c:131
 #: ../plug-ins/file-psd/psd-thumb-load.c:80
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:272
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:190
-#: ../plug-ins/file-xjt/xjt.c:2560
-#: ../plug-ins/file-xjt/xjt.c:2568
+#: ../plug-ins/file-xjt/xjt.c:2560 ../plug-ins/file-xjt/xjt.c:2568
 #: ../plug-ins/flame/flame.c:412
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1863
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:929
-#: ../plug-ins/gfig/gfig.c:434
-#: ../plug-ins/help/gimphelplocale.c:223
+#: ../plug-ins/gfig/gfig.c:434 ../plug-ins/help/gimphelplocale.c:223
 #: ../plug-ins/help/gimphelplocale.c:239
 #: ../plug-ins/lighting/lighting-ui.c:1354
 #, c-format
@@ -1141,49 +1050,31 @@ msgid "Save Channel Mixer Settings"
 msgstr "チャンネルミキサー設定保存"
 
 #: ../plug-ins/common/channel-mixer.c:1060
-#: ../plug-ins/common/cml-explorer.c:2005
-#: ../plug-ins/common/curve-bend.c:833
-#: ../plug-ins/common/file-cel.c:583
-#: ../plug-ins/common/file-compressor.c:426
+#: ../plug-ins/common/cml-explorer.c:2005 ../plug-ins/common/curve-bend.c:833
+#: ../plug-ins/common/file-cel.c:583 ../plug-ins/common/file-compressor.c:426
 #: ../plug-ins/common/file-compressor.c:508
 #: ../plug-ins/common/file-compressor.c:590
 #: ../plug-ins/common/file-compressor.c:677
-#: ../plug-ins/common/file-csource.c:406
-#: ../plug-ins/common/file-dicom.c:801
-#: ../plug-ins/common/file-gbr.c:632
-#: ../plug-ins/common/file-gif-save.c:761
-#: ../plug-ins/common/file-gih.c:1275
-#: ../plug-ins/common/file-html-table.c:236
-#: ../plug-ins/common/file-mng.c:610
-#: ../plug-ins/common/file-mng.c:944
-#: ../plug-ins/common/file-pat.c:462
-#: ../plug-ins/common/file-pcx.c:666
-#: ../plug-ins/common/file-pix.c:524
-#: ../plug-ins/common/file-png.c:1270
-#: ../plug-ins/common/file-pnm.c:977
-#: ../plug-ins/common/file-ps.c:1213
-#: ../plug-ins/common/file-raw.c:546
-#: ../plug-ins/common/file-raw.c:574
-#: ../plug-ins/common/file-sunras.c:563
-#: ../plug-ins/common/file-tga.c:1170
-#: ../plug-ins/common/file-tiff-save.c:683
-#: ../plug-ins/common/file-xbm.c:1034
-#: ../plug-ins/common/file-xwd.c:614
-#: ../plug-ins/common/sphere-designer.c:2112
-#: ../plug-ins/file-bmp/bmp-write.c:296
-#: ../plug-ins/file-fits/fits.c:476
-#: ../plug-ins/file-fli/fli-gimp.c:750
-#: ../plug-ins/file-ico/ico-save.c:1008
-#: ../plug-ins/file-jpeg/jpeg-save.c:325
-#: ../plug-ins/file-psd/psd-save.c:1635
+#: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:801
+#: ../plug-ins/common/file-gbr.c:632 ../plug-ins/common/file-gif-save.c:761
+#: ../plug-ins/common/file-gih.c:1275 ../plug-ins/common/file-html-table.c:236
+#: ../plug-ins/common/file-mng.c:610 ../plug-ins/common/file-mng.c:944
+#: ../plug-ins/common/file-pat.c:462 ../plug-ins/common/file-pcx.c:666
+#: ../plug-ins/common/file-pix.c:524 ../plug-ins/common/file-png.c:1270
+#: ../plug-ins/common/file-pnm.c:977 ../plug-ins/common/file-ps.c:1213
+#: ../plug-ins/common/file-raw.c:546 ../plug-ins/common/file-raw.c:574
+#: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1170
+#: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
+#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2111
+#: ../plug-ins/file-bmp/bmp-write.c:296 ../plug-ins/file-fits/fits.c:476
+#: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1008
+#: ../plug-ins/file-jpeg/jpeg-save.c:325 ../plug-ins/file-psd/psd-save.c:1635
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:283
 #: ../plug-ins/file-uri/uri-backend-libcurl.c:163
-#: ../plug-ins/file-xjt/xjt.c:1292
-#: ../plug-ins/file-xjt/xjt.c:1729
+#: ../plug-ins/file-xjt/xjt.c:1292 ../plug-ins/file-xjt/xjt.c:1729
 #: ../plug-ins/flame/flame.c:443
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1546
-#: ../plug-ins/gfig/gfig.c:794
-#: ../plug-ins/ifs-compose/ifs-compose.c:2374
+#: ../plug-ins/gfig/gfig.c:794 ../plug-ins/ifs-compose/ifs-compose.c:2374
 #: ../plug-ins/lighting/lighting-ui.c:1211
 #, c-format
 msgid "Could not open '%s' for writing: %s"
@@ -1332,8 +1223,7 @@ msgstr "Min (x-d, -), (x < 0.5)"
 msgid "Min (x-d, -), (0.5 < x)"
 msgstr "Min (x-d, -), (0.5 < x)"
 
-#: ../plug-ins/common/cml-explorer.c:200
-#: ../plug-ins/common/file-sunras.c:1651
+#: ../plug-ins/common/cml-explorer.c:200 ../plug-ins/common/file-sunras.c:1651
 msgid "Standard"
 msgstr "標準"
 
@@ -1413,22 +1303,19 @@ msgstr "種を元にした乱数"
 msgid "Randoms from seed (shared)"
 msgstr "共通種を元にした乱数"
 
-#: ../plug-ins/common/cml-explorer.c:300
-#: ../plug-ins/common/cml-explorer.c:308
+#: ../plug-ins/common/cml-explorer.c:300 ../plug-ins/common/cml-explorer.c:308
 #: ../plug-ins/common/decompose.c:188
 #: ../plug-ins/gimpressionist/orientation.c:180
 #: ../plug-ins/gimpressionist/size.c:183
 msgid "Hue"
 msgstr "色相"
 
-#: ../plug-ins/common/cml-explorer.c:301
-#: ../plug-ins/common/cml-explorer.c:309
+#: ../plug-ins/common/cml-explorer.c:301 ../plug-ins/common/cml-explorer.c:309
 #: ../plug-ins/common/decompose.c:189
 msgid "Saturation"
 msgstr "彩度"
 
-#: ../plug-ins/common/cml-explorer.c:302
-#: ../plug-ins/common/cml-explorer.c:310
+#: ../plug-ins/common/cml-explorer.c:302 ../plug-ins/common/cml-explorer.c:310
 #: ../plug-ins/common/decompose.c:190
 #: ../plug-ins/gimpressionist/orientation.c:156
 #: ../plug-ins/gimpressionist/size.c:159
@@ -1467,8 +1354,7 @@ msgstr "固定種"
 msgid "Random Seed"
 msgstr "乱数種"
 
-#: ../plug-ins/common/cml-explorer.c:1288
-#: ../plug-ins/common/filter-pack.c:700
+#: ../plug-ins/common/cml-explorer.c:1288 ../plug-ins/common/filter-pack.c:700
 #: ../plug-ins/common/van-gogh-lic.c:671
 msgid "_Hue"
 msgstr "色相(_H)"
@@ -1477,8 +1363,7 @@ msgstr "色相(_H)"
 msgid "Sat_uration"
 msgstr "彩度(_U)"
 
-#: ../plug-ins/common/cml-explorer.c:1296
-#: ../plug-ins/common/filter-pack.c:708
+#: ../plug-ins/common/cml-explorer.c:1296 ../plug-ins/common/filter-pack.c:708
 msgid "_Value"
 msgstr "明度(_V)"
 
@@ -1506,8 +1391,7 @@ msgstr "開始オフセット: "
 msgid "Seed of Random (only for \"From Seed\" Modes)"
 msgstr "乱数の種 (「種を元に」モードでのみ有効)"
 
-#: ../plug-ins/common/cml-explorer.c:1372
-#: ../plug-ins/maze/maze-dialog.c:261
+#: ../plug-ins/common/cml-explorer.c:1372 ../plug-ins/maze/maze-dialog.c:261
 msgid "Seed:"
 msgstr "種: "
 
@@ -1518,7 +1402,9 @@ msgstr "最後の種を用いて 「種を元に」 モードに移る"
 #: ../plug-ins/common/cml-explorer.c:1397
 msgid ""
 "\"Fix seed\" button is an alias of me.\n"
-"The same seed produces the same image, if (1) the widths of images are same (this is the reason why image on drawable is different from preview), and (2) all mutation rates equal to zero."
+"The same seed produces the same image, if (1) the widths of images are same "
+"(this is the reason why image on drawable is different from preview), and "
+"(2) all mutation rates equal to zero."
 msgstr ""
 "「固定種」 ボタンはこれのエイリアスです。\n"
 "(1) 画像の幅が同じで (描画対象に描かれるものとプレビューが違う原因)\n"
@@ -1530,20 +1416,20 @@ msgstr "その他(_T)"
 
 #: ../plug-ins/common/cml-explorer.c:1420
 msgid "Copy Settings"
-msgstr "設定コピー"
+msgstr "設定をコピー"
 
 #: ../plug-ins/common/cml-explorer.c:1439
 msgid "Source channel:"
-msgstr "元チャンネル: "
+msgstr "コピー元チャンネル: "
 
 #: ../plug-ins/common/cml-explorer.c:1454
 #: ../plug-ins/common/cml-explorer.c:1502
 msgid "Destination channel:"
-msgstr "先チャンネル: "
+msgstr "コピー先チャンネル: "
 
 #: ../plug-ins/common/cml-explorer.c:1458
 msgid "Copy Parameters"
-msgstr "コピーパラメータ"
+msgstr "パラメータをコピーする"
 
 #: ../plug-ins/common/cml-explorer.c:1467
 msgid "Selective Load Settings"
@@ -1649,7 +1535,8 @@ msgstr "警告: '%s' は古い形式のファイルです"
 #: ../plug-ins/common/cml-explorer.c:2211
 #, c-format
 msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
-msgstr "警告: パラメータファイル '%s' は、新しいバージョンの CMLエクスプローラ用です"
+msgstr ""
+"警告: パラメータファイル '%s' は、新しいバージョンの CMLエクスプローラ用です"
 
 #: ../plug-ins/common/cml-explorer.c:2274
 msgid "Error: failed to load parameters"
@@ -1848,51 +1735,46 @@ msgid "Rearrange Colormap"
 msgstr "カラーマップ変更"
 
 #: ../plug-ins/common/colormap-remap.c:699
-msgid "Drag and drop colors to rearrange the colormap.  The numbers shown are the original indices.  Right-click for a menu with sort options."
+msgid ""
+"Drag and drop colors to rearrange the colormap.  The numbers shown are the "
+"original indices.  Right-click for a menu with sort options."
 msgstr ""
-"色(のアイコン)をドラッグ-ドロップしてカラーマップを変更します。各色の下に表示されている番号はマップでの識別番号です。\n"
+"色(のアイコン)をドラッグ-ドロップしてカラーマップを変更します。各色の下に表示"
+"されている番号はマップでの識別番号です。\n"
 "右クリックすると並び替えのためのメニューが出ます。"
 
-#: ../plug-ins/common/compose.c:189
-#: ../plug-ins/common/decompose.c:170
+#: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170
 #: ../plug-ins/common/file-raw.c:1023
 msgid "RGB"
 msgstr "RGB"
 
-#: ../plug-ins/common/compose.c:200
-#: ../plug-ins/common/decompose.c:178
+#: ../plug-ins/common/compose.c:200 ../plug-ins/common/decompose.c:178
 msgid "RGBA"
 msgstr "RGBA"
 
-#: ../plug-ins/common/compose.c:204
-#: ../plug-ins/common/noise-rgb.c:525
+#: ../plug-ins/common/compose.c:204 ../plug-ins/common/noise-rgb.c:525
 #: ../plug-ins/common/noise-rgb.c:540
 msgid "_Alpha:"
 msgstr "透明度(_A): "
 
-#: ../plug-ins/common/compose.c:211
-#: ../plug-ins/common/decompose.c:184
+#: ../plug-ins/common/compose.c:211 ../plug-ins/common/decompose.c:184
 msgid "HSV"
 msgstr "HSV"
 
-#: ../plug-ins/common/compose.c:212
-#: ../plug-ins/common/compose.c:220
+#: ../plug-ins/common/compose.c:212 ../plug-ins/common/compose.c:220
 msgid "_Hue:"
 msgstr "色相(_H): "
 
-#: ../plug-ins/common/compose.c:213
-#: ../plug-ins/common/compose.c:221
+#: ../plug-ins/common/compose.c:213 ../plug-ins/common/compose.c:221
 #: ../plug-ins/common/noise-hsv.c:421
 msgid "_Saturation:"
 msgstr "彩度(_S): "
 
-#: ../plug-ins/common/compose.c:214
-#: ../plug-ins/common/noise-hsv.c:433
+#: ../plug-ins/common/compose.c:214 ../plug-ins/common/noise-hsv.c:433
 msgid "_Value:"
 msgstr "明度(_V): "
 
-#: ../plug-ins/common/compose.c:219
-#: ../plug-ins/common/decompose.c:193
+#: ../plug-ins/common/compose.c:219 ../plug-ins/common/decompose.c:193
 msgid "HSL"
 msgstr "HSL"
 
@@ -1900,28 +1782,23 @@ msgstr "HSL"
 msgid "_Lightness:"
 msgstr "輝度(_L): "
 
-#: ../plug-ins/common/compose.c:227
-#: ../plug-ins/common/decompose.c:202
+#: ../plug-ins/common/compose.c:227 ../plug-ins/common/decompose.c:202
 msgid "CMY"
 msgstr "CMY"
 
-#: ../plug-ins/common/compose.c:228
-#: ../plug-ins/common/compose.c:236
+#: ../plug-ins/common/compose.c:228 ../plug-ins/common/compose.c:236
 msgid "_Cyan:"
 msgstr "シアン(_C): "
 
-#: ../plug-ins/common/compose.c:229
-#: ../plug-ins/common/compose.c:237
+#: ../plug-ins/common/compose.c:229 ../plug-ins/common/compose.c:237
 msgid "_Magenta:"
 msgstr "マゼンタ(_M): "
 
-#: ../plug-ins/common/compose.c:230
-#: ../plug-ins/common/compose.c:238
+#: ../plug-ins/common/compose.c:230 ../plug-ins/common/compose.c:238
 msgid "_Yellow:"
 msgstr "イエロー(_Y): "
 
-#: ../plug-ins/common/compose.c:235
-#: ../plug-ins/common/decompose.c:211
+#: ../plug-ins/common/compose.c:235 ../plug-ins/common/decompose.c:211
 msgid "CMYK"
 msgstr "CMYK"
 
@@ -1929,8 +1806,7 @@ msgstr "CMYK"
 msgid "_Black:"
 msgstr "黒(_B): "
 
-#: ../plug-ins/common/compose.c:243
-#: ../plug-ins/common/decompose.c:224
+#: ../plug-ins/common/compose.c:243 ../plug-ins/common/decompose.c:224
 msgid "LAB"
 msgstr "LAB"
 
@@ -1999,12 +1875,15 @@ msgid "R_ecompose"
 msgstr "再合成(_E)"
 
 #: ../plug-ins/common/compose.c:488
-msgid "You can only run 'Recompose' if the active image was originally produced by 'Decompose'."
+msgid ""
+"You can only run 'Recompose' if the active image was originally produced by "
+"'Decompose'."
 msgstr "'再合成' は、 'チャンネル分解' で生成した画像に対してのみ実行できます"
 
 #: ../plug-ins/common/compose.c:512
 msgid "Error scanning 'decompose-data' parasite: too few layers found"
-msgstr "'チャンネル分解' データ・パラサイトの解析中にエラー: レイヤーの数が足りません"
+msgstr ""
+"'チャンネル分解' データ・パラサイトの解析中にエラー: レイヤーの数が足りません"
 
 #: ../plug-ins/common/compose.c:545
 #, c-format
@@ -2015,13 +1894,11 @@ msgstr "画像 %d に対するレイヤーが得られません"
 msgid "Composing"
 msgstr "合成しています..."
 
-#: ../plug-ins/common/compose.c:697
-#: ../plug-ins/common/compose.c:1735
+#: ../plug-ins/common/compose.c:697 ../plug-ins/common/compose.c:1735
 msgid "At least one image is needed to compose"
 msgstr "合成には少なくとも一枚の画像が必要です"
 
-#: ../plug-ins/common/compose.c:708
-#: ../plug-ins/common/compose.c:722
+#: ../plug-ins/common/compose.c:708 ../plug-ins/common/compose.c:722
 #, c-format
 msgid "Specified layer %d not found"
 msgstr "指定されたレイヤー %d が見つかりません"
@@ -2056,8 +1933,7 @@ msgstr "チャンネル合成"
 msgid "Compose Channels"
 msgstr "合成チャンネル"
 
-#: ../plug-ins/common/compose.c:1525
-#: ../plug-ins/common/decompose.c:1515
+#: ../plug-ins/common/compose.c:1525 ../plug-ins/common/decompose.c:1515
 msgid "Color _model:"
 msgstr "色モデル(_M): "
 
@@ -2190,10 +2066,8 @@ msgid "E_xtend"
 msgstr "拡張(_X)"
 
 #: ../plug-ins/common/convolution-matrix.c:74
-#: ../plug-ins/common/displace.c:472
-#: ../plug-ins/common/edge.c:709
-#: ../plug-ins/common/fractal-trace.c:736
-#: ../plug-ins/common/ripple.c:564
+#: ../plug-ins/common/displace.c:472 ../plug-ins/common/edge.c:709
+#: ../plug-ins/common/fractal-trace.c:736 ../plug-ins/common/ripple.c:564
 msgid "_Wrap"
 msgstr "回り込み(_W)"
 
@@ -2211,7 +2085,8 @@ msgstr "コンボリューション行列(_C)..."
 
 #: ../plug-ins/common/convolution-matrix.c:241
 msgid "Convolution does not work on layers smaller than 3x3 pixels."
-msgstr "コンボリューション行列は 3 x 3 ピクセルより小さなレイヤーには適用できません"
+msgstr ""
+"コンボリューション行列は 3 x 3 ピクセルより小さなレイヤーには適用できません"
 
 #: ../plug-ins/common/convolution-matrix.c:314
 msgid "Applying convolution"
@@ -2230,8 +2105,7 @@ msgid "D_ivisor:"
 msgstr "割る数(_I): "
 
 #: ../plug-ins/common/convolution-matrix.c:1008
-#: ../plug-ins/common/depth-merge.c:768
-#: ../plug-ins/common/file-raw.c:1043
+#: ../plug-ins/common/depth-merge.c:768 ../plug-ins/common/file-raw.c:1043
 msgid "O_ffset:"
 msgstr "オフセット(_F): "
 
@@ -2273,7 +2147,9 @@ msgstr "切り抜いています"
 
 #: ../plug-ins/common/crop-zealous.c:85
 msgid "Autocrop unused space from edges and middle"
-msgstr "画像の端と中央部の空白部分を切り取り、描かれているものが最小枠に収まるようにします"
+msgstr ""
+"画像の端と中央部の空白部分を切り取り、描かれているものが最小枠に収まるように"
+"します"
 
 #: ../plug-ins/common/crop-zealous.c:90
 msgid "_Zealous Crop"
@@ -2323,10 +2199,11 @@ msgstr "画像を上下 2 つのカーブに沿って曲げます"
 msgid "_Curve Bend..."
 msgstr "ひん曲げる(_C)..."
 
-#: ../plug-ins/common/curve-bend.c:677
-#: ../plug-ins/common/edge-dog.c:176
+#: ../plug-ins/common/curve-bend.c:677 ../plug-ins/common/edge-dog.c:176
 msgid "Can operate on layers only (but was called on channel or mask)."
-msgstr "ひん曲げることができるのはレイヤーだけです (チャンネルやマスクに対して呼び出されました)"
+msgstr ""
+"ひん曲げることができるのはレイヤーだけです (チャンネルやマスクに対して呼び出"
+"されました)"
 
 #: ../plug-ins/common/curve-bend.c:687
 msgid "Cannot operate on layers with masks."
@@ -2338,8 +2215,7 @@ msgstr "空の選択領域には適用できません"
 
 #. Possibly retrieve data from a previous run
 #. The shell and main vbox
-#: ../plug-ins/common/curve-bend.c:1211
-#: ../plug-ins/common/curve-bend.c:2932
+#: ../plug-ins/common/curve-bend.c:1211 ../plug-ins/common/curve-bend.c:2932
 msgid "Curve Bend"
 msgstr "ひん曲げる"
 
@@ -2364,8 +2240,7 @@ msgstr "自動プレビュー(_V)"
 
 #. Options area, bottom of column
 #. Options section
-#: ../plug-ins/common/curve-bend.c:1295
-#: ../plug-ins/common/ripple.c:505
+#: ../plug-ins/common/curve-bend.c:1295 ../plug-ins/common/ripple.c:505
 #: ../plug-ins/gfig/gfig-dialog.c:1207
 msgid "Options"
 msgstr "オプション"
@@ -2381,10 +2256,8 @@ msgid "Smoo_thing"
 msgstr "スムージング(_T)"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve-bend.c:1338
-#: ../plug-ins/common/mosaic.c:727
-#: ../plug-ins/common/qbist.c:853
-#: ../plug-ins/common/ripple.c:514
+#: ../plug-ins/common/curve-bend.c:1338 ../plug-ins/common/mosaic.c:727
+#: ../plug-ins/common/qbist.c:853 ../plug-ins/common/ripple.c:514
 msgid "_Antialiasing"
 msgstr "滑らかに(_A)"
 
@@ -2469,56 +2342,46 @@ msgstr "カーブ点をファイルから読み込み"
 msgid "Save Curve Points to File"
 msgstr "カーブ点をファイルに保存"
 
-#: ../plug-ins/common/decompose.c:170
-#: ../plug-ins/common/decompose.c:174
+#: ../plug-ins/common/decompose.c:170 ../plug-ins/common/decompose.c:174
 #: ../plug-ins/common/decompose.c:178
 msgid "red"
 msgstr "赤チャンネル"
 
-#: ../plug-ins/common/decompose.c:171
-#: ../plug-ins/common/decompose.c:175
+#: ../plug-ins/common/decompose.c:171 ../plug-ins/common/decompose.c:175
 #: ../plug-ins/common/decompose.c:179
 msgid "green"
 msgstr "緑チャンネル"
 
-#: ../plug-ins/common/decompose.c:172
-#: ../plug-ins/common/decompose.c:176
+#: ../plug-ins/common/decompose.c:172 ../plug-ins/common/decompose.c:176
 #: ../plug-ins/common/decompose.c:180
 msgid "blue"
 msgstr "青チャンネル"
 
-#: ../plug-ins/common/decompose.c:181
-#: ../plug-ins/common/decompose.c:221
+#: ../plug-ins/common/decompose.c:181 ../plug-ins/common/decompose.c:221
 msgid "alpha"
 msgstr "アルファ"
 
-#: ../plug-ins/common/decompose.c:184
-#: ../plug-ins/common/decompose.c:188
+#: ../plug-ins/common/decompose.c:184 ../plug-ins/common/decompose.c:188
 msgid "hue"
 msgstr "色相"
 
-#: ../plug-ins/common/decompose.c:185
-#: ../plug-ins/common/decompose.c:189
+#: ../plug-ins/common/decompose.c:185 ../plug-ins/common/decompose.c:189
 msgid "saturation"
 msgstr "彩度"
 
-#: ../plug-ins/common/decompose.c:186
-#: ../plug-ins/common/decompose.c:190
+#: ../plug-ins/common/decompose.c:186 ../plug-ins/common/decompose.c:190
 msgid "value"
 msgstr "明度"
 
-#: ../plug-ins/common/decompose.c:193
-#: ../plug-ins/common/decompose.c:197
+#: ../plug-ins/common/decompose.c:193 ../plug-ins/common/decompose.c:197
 msgid "hue_l"
 msgstr "色相"
 
-#: ../plug-ins/common/decompose.c:194
-#: ../plug-ins/common/decompose.c:198
+#: ../plug-ins/common/decompose.c:194 ../plug-ins/common/decompose.c:198
 msgid "saturation_l"
 msgstr "彩度 (HSL)"
 
-#: ../plug-ins/common/decompose.c:195
-#: ../plug-ins/common/decompose.c:199
+#: ../plug-ins/common/decompose.c:195 ../plug-ins/common/decompose.c:199
 msgid "lightness"
 msgstr "輝度"
 
@@ -2534,18 +2397,15 @@ msgstr "彩度(HSL)"
 msgid "Lightness"
 msgstr "輝度(_L)"
 
-#: ../plug-ins/common/decompose.c:202
-#: ../plug-ins/common/decompose.c:206
+#: ../plug-ins/common/decompose.c:202 ../plug-ins/common/decompose.c:206
 msgid "cyan"
 msgstr "シアン"
 
-#: ../plug-ins/common/decompose.c:203
-#: ../plug-ins/common/decompose.c:207
+#: ../plug-ins/common/decompose.c:203 ../plug-ins/common/decompose.c:207
 msgid "magenta"
 msgstr "マゼンダ"
 
-#: ../plug-ins/common/decompose.c:204
-#: ../plug-ins/common/decompose.c:208
+#: ../plug-ins/common/decompose.c:204 ../plug-ins/common/decompose.c:208
 msgid "yellow"
 msgstr "イエロー"
 
@@ -2561,18 +2421,15 @@ msgstr "マゼンダ"
 msgid "Yellow"
 msgstr "イエロー"
 
-#: ../plug-ins/common/decompose.c:211
-#: ../plug-ins/common/decompose.c:216
+#: ../plug-ins/common/decompose.c:211 ../plug-ins/common/decompose.c:216
 msgid "cyan-k"
 msgstr "シアン-k"
 
-#: ../plug-ins/common/decompose.c:212
-#: ../plug-ins/common/decompose.c:217
+#: ../plug-ins/common/decompose.c:212 ../plug-ins/common/decompose.c:217
 msgid "magenta-k"
 msgstr "マゼンタ-k"
 
-#: ../plug-ins/common/decompose.c:213
-#: ../plug-ins/common/decompose.c:218
+#: ../plug-ins/common/decompose.c:213 ../plug-ins/common/decompose.c:218
 msgid "yellow-k"
 msgstr "イエロー-k"
 
@@ -2644,13 +2501,13 @@ msgstr "blueness-cb709f"
 msgid "redness-cr709f"
 msgstr "redness-cr709f"
 
-#: ../plug-ins/common/decompose.c:312
-#: ../plug-ins/common/decompose.c:326
+#: ../plug-ins/common/decompose.c:312 ../plug-ins/common/decompose.c:326
 msgid "Decompose an image into separate colorspace components"
-msgstr "カラースペースの各コンポーネントを表す画像(またはレイヤー)から、新しい画像を合成します"
+msgstr ""
+"カラースペースの各コンポーネントを表す画像(またはレイヤー)から、新しい画像を"
+"合成します"
 
-#: ../plug-ins/common/decompose.c:318
-#: ../plug-ins/common/decompose.c:336
+#: ../plug-ins/common/decompose.c:318 ../plug-ins/common/decompose.c:336
 msgid "_Decompose..."
 msgstr "チャンネル分解(_D)..."
 
@@ -2675,8 +2532,13 @@ msgid "_Foreground as registration color"
 msgstr "描画色領域を指定色で出力"
 
 #: ../plug-ins/common/decompose.c:1562
-msgid "Pixels in the foreground color will appear black in all output images.  This can be used for things like crop marks that have to show up on all channels."
-msgstr "元画像中の描画色のピクセルを分解された画像（またはレイヤー)のすべてで白色で出力します。製版のトンボ（クロップマーク）のように、すべてのチャンネルで表示したいものがある時にこのオプションを指定します"
+msgid ""
+"Pixels in the foreground color will appear black in all output images.  This "
+"can be used for things like crop marks that have to show up on all channels."
+msgstr ""
+"元画像中の描画色のピクセルを分解された画像（またはレイヤー)のすべてで白色で出"
+"力します。製版のトンボ（クロップマーク）のように、すべてのチャンネルで表示し"
+"たいものがある時にこのオプションを指定します"
 
 #: ../plug-ins/common/deinterlace.c:91
 msgid "Fix images where every other row is missing"
@@ -2686,8 +2548,7 @@ msgstr "ビデオキャプチャ画像などのインターレースを除去し
 msgid "_Deinterlace..."
 msgstr "インターレース除去(_D)..."
 
-#: ../plug-ins/common/deinterlace.c:157
-#: ../plug-ins/common/deinterlace.c:325
+#: ../plug-ins/common/deinterlace.c:157 ../plug-ins/common/deinterlace.c:325
 msgid "Deinterlace"
 msgstr "インターレース除去"
 
@@ -2719,8 +2580,7 @@ msgstr "深度統合"
 msgid "Source 1:"
 msgstr "画像源 1: "
 
-#: ../plug-ins/common/depth-merge.c:711
-#: ../plug-ins/common/depth-merge.c:741
+#: ../plug-ins/common/depth-merge.c:711 ../plug-ins/common/depth-merge.c:741
 msgid "Depth map:"
 msgstr "深度マップ: "
 
@@ -2750,8 +2610,7 @@ msgstr ""
 msgid "Des_peckle..."
 msgstr "ノイズ除去(_P)..."
 
-#: ../plug-ins/common/despeckle.c:425
-#: ../plug-ins/common/despeckle.c:645
+#: ../plug-ins/common/despeckle.c:425 ../plug-ins/common/despeckle.c:645
 msgid "Despeckle"
 msgstr "ノイズ除去"
 
@@ -2767,12 +2626,9 @@ msgstr "適応的(_A)"
 msgid "R_ecursive"
 msgstr "再帰的(_E)"
 
-#: ../plug-ins/common/despeckle.c:493
-#: ../plug-ins/common/edge-neon.c:732
-#: ../plug-ins/common/nl-filter.c:1089
-#: ../plug-ins/common/nova.c:366
-#: ../plug-ins/common/unsharp-mask.c:680
-#: ../plug-ins/common/whirl-pinch.c:589
+#: ../plug-ins/common/despeckle.c:493 ../plug-ins/common/edge-neon.c:732
+#: ../plug-ins/common/nl-filter.c:1089 ../plug-ins/common/nova.c:366
+#: ../plug-ins/common/unsharp-mask.c:680 ../plug-ins/common/whirl-pinch.c:589
 #: ../plug-ins/gradient-flare/gradient-flare.c:2758
 #: ../plug-ins/imagemap/imap_circle.c:278
 msgid "_Radius:"
@@ -2802,14 +2658,10 @@ msgstr "ストライプを除去しています"
 msgid "Destripe"
 msgstr "ストライプ除去"
 
-#: ../plug-ins/common/destripe.c:473
-#: ../plug-ins/common/file-html-table.c:595
-#: ../plug-ins/common/file-ps.c:3171
-#: ../plug-ins/common/file-ps.c:3380
-#: ../plug-ins/common/file-raw.c:1056
-#: ../plug-ins/common/smooth-palette.c:436
-#: ../plug-ins/common/tile-paper.c:302
-#: ../plug-ins/common/tile.c:431
+#: ../plug-ins/common/destripe.c:473 ../plug-ins/common/file-html-table.c:595
+#: ../plug-ins/common/file-ps.c:3171 ../plug-ins/common/file-ps.c:3380
+#: ../plug-ins/common/file-raw.c:1056 ../plug-ins/common/smooth-palette.c:436
+#: ../plug-ins/common/tile-paper.c:302 ../plug-ins/common/tile.c:431
 #: ../plug-ins/imagemap/imap_cmd_guides.c:165
 #: ../plug-ins/imagemap/imap_rectangle.c:403
 #: ../plug-ins/print/print-page-layout.c:252
@@ -2853,8 +2705,7 @@ msgstr "輪郭"
 msgid "Sharp Edges"
 msgstr "明瞭端"
 
-#: ../plug-ins/common/diffraction.c:615
-#: ../plug-ins/common/softglow.c:683
+#: ../plug-ins/common/diffraction.c:615 ../plug-ins/common/softglow.c:683
 #: ../plug-ins/flame/flame.c:1081
 msgid "_Brightness:"
 msgstr "明るさ(_B): "
@@ -2929,17 +2780,13 @@ msgstr "極座標(_P)"
 msgid "Edge Behavior"
 msgstr "縁の処理"
 
-#: ../plug-ins/common/displace.c:474
-#: ../plug-ins/common/edge.c:722
-#: ../plug-ins/common/ripple.c:565
-#: ../plug-ins/common/waves.c:281
+#: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:722
+#: ../plug-ins/common/ripple.c:565 ../plug-ins/common/waves.c:281
 msgid "_Smear"
 msgstr "ぼかす(_S)"
 
-#: ../plug-ins/common/displace.c:476
-#: ../plug-ins/common/edge.c:735
-#: ../plug-ins/common/fractal-trace.c:740
-#: ../plug-ins/common/newsprint.c:398
+#: ../plug-ins/common/displace.c:476 ../plug-ins/common/edge.c:735
+#: ../plug-ins/common/fractal-trace.c:740 ../plug-ins/common/newsprint.c:398
 msgid "_Black"
 msgstr "黒(_B)"
 
@@ -2951,8 +2798,7 @@ msgstr "輪郭の厚みを確認しながら輪郭検出をおこないます"
 msgid "_Difference of Gaussians..."
 msgstr "ガウシアン差分(_D)..."
 
-#: ../plug-ins/common/edge-dog.c:243
-#: ../plug-ins/common/edge-dog.c:300
+#: ../plug-ins/common/edge-dog.c:243 ../plug-ins/common/edge-dog.c:300
 msgid "DoG Edge Detect"
 msgstr "ガウシアン差分輪郭抽出"
 
@@ -2968,8 +2814,7 @@ msgstr "半径 1(_R): "
 msgid "R_adius 2:"
 msgstr "半径 2(_A): "
 
-#: ../plug-ins/common/edge-dog.c:370
-#: ../plug-ins/gimpressionist/paper.c:167
+#: ../plug-ins/common/edge-dog.c:370 ../plug-ins/gimpressionist/paper.c:167
 msgid "_Invert"
 msgstr "反転(_I)"
 
@@ -2981,8 +2826,7 @@ msgstr "高解像度の輪郭検出をおこないます"
 msgid "_Laplace"
 msgstr "ラプラス(_L)"
 
-#: ../plug-ins/common/edge-laplace.c:243
-#: ../plug-ins/common/edge.c:673
+#: ../plug-ins/common/edge-laplace.c:243 ../plug-ins/common/edge.c:673
 msgid "Laplace"
 msgstr "ラプラス"
 
@@ -3006,8 +2850,7 @@ msgstr "ネオン光彩を適用しています"
 msgid "Neon Detection"
 msgstr "ネオン光彩"
 
-#: ../plug-ins/common/edge-neon.c:747
-#: ../plug-ins/common/unsharp-mask.c:693
+#: ../plug-ins/common/edge-neon.c:747 ../plug-ins/common/unsharp-mask.c:693
 msgid "_Amount:"
 msgstr "量(_A): "
 
@@ -3063,8 +2906,7 @@ msgstr "ソーベル"
 msgid "Prewitt compass"
 msgstr "プレヴィット"
 
-#: ../plug-ins/common/edge.c:670
-#: ../plug-ins/common/sinus.c:904
+#: ../plug-ins/common/edge.c:670 ../plug-ins/common/sinus.c:904
 msgid "Gradient"
 msgstr "勾配/グラデーション"
 
@@ -3092,8 +2934,7 @@ msgstr "エンボス（押し出し）されたような効果を施します"
 msgid "_Emboss..."
 msgstr "エンボス(_E)..."
 
-#: ../plug-ins/common/emboss.c:384
-#: ../plug-ins/common/emboss.c:446
+#: ../plug-ins/common/emboss.c:384 ../plug-ins/common/emboss.c:446
 msgid "Emboss"
 msgstr "エンボス"
 
@@ -3129,16 +2970,11 @@ msgstr "彫金しています"
 msgid "Engrave"
 msgstr "彫金"
 
-#: ../plug-ins/common/engrave.c:244
-#: ../plug-ins/common/file-html-table.c:611
-#: ../plug-ins/common/file-ps.c:3181
-#: ../plug-ins/common/file-ps.c:3389
-#: ../plug-ins/common/file-raw.c:1069
-#: ../plug-ins/common/film.c:1003
-#: ../plug-ins/common/smooth-palette.c:441
-#: ../plug-ins/common/tile-paper.c:313
-#: ../plug-ins/common/tile.c:435
-#: ../plug-ins/imagemap/imap_cmd_guides.c:175
+#: ../plug-ins/common/engrave.c:244 ../plug-ins/common/file-html-table.c:611
+#: ../plug-ins/common/file-ps.c:3181 ../plug-ins/common/file-ps.c:3389
+#: ../plug-ins/common/file-raw.c:1069 ../plug-ins/common/film.c:1003
+#: ../plug-ins/common/smooth-palette.c:441 ../plug-ins/common/tile-paper.c:313
+#: ../plug-ins/common/tile.c:435 ../plug-ins/imagemap/imap_cmd_guides.c:175
 #: ../plug-ins/imagemap/imap_rectangle.c:410
 #: ../plug-ins/print/print-page-layout.c:254
 msgid "_Height:"
@@ -3161,8 +2997,7 @@ msgstr "テキスト形式で保存"
 msgid "_Format:"
 msgstr "形式(_F): "
 
-#: ../plug-ins/common/file-cel.c:111
-#: ../plug-ins/common/file-cel.c:129
+#: ../plug-ins/common/file-cel.c:111 ../plug-ins/common/file-cel.c:129
 msgid "KISS CEL"
 msgstr "KISS CEL"
 
@@ -3174,34 +3009,20 @@ msgstr "KISS パレットの読み込み"
 #. column, highest column ever used
 #. -1  assume fsel is not available (and not attached to any drawable)
 #. -1  assume there is no floating selection
-#: ../plug-ins/common/file-cel.c:317
-#: ../plug-ins/common/file-dicom.c:330
-#: ../plug-ins/common/file-gbr.c:366
-#: ../plug-ins/common/file-gif-load.c:345
-#: ../plug-ins/common/file-gih.c:667
-#: ../plug-ins/common/file-pat.c:335
-#: ../plug-ins/common/file-pcx.c:366
-#: ../plug-ins/common/file-pdf.c:586
-#: ../plug-ins/common/file-pix.c:348
-#: ../plug-ins/common/file-png.c:728
-#: ../plug-ins/common/file-pnm.c:499
-#: ../plug-ins/common/file-ps.c:1042
-#: ../plug-ins/common/file-raw.c:671
-#: ../plug-ins/common/file-sunras.c:486
-#: ../plug-ins/common/file-tga.c:447
-#: ../plug-ins/common/file-tiff-load.c:603
-#: ../plug-ins/common/file-wmf.c:994
-#: ../plug-ins/common/file-xbm.c:741
-#: ../plug-ins/common/file-xpm.c:352
-#: ../plug-ins/common/file-xwd.c:520
-#: ../plug-ins/file-bmp/bmp-read.c:159
-#: ../plug-ins/file-faxg3/faxg3.c:217
-#: ../plug-ins/file-fli/fli-gimp.c:502
-#: ../plug-ins/file-ico/ico-load.c:646
-#: ../plug-ins/file-jpeg/jpeg-load.c:115
-#: ../plug-ins/file-psd/psd-load.c:136
-#: ../plug-ins/file-sgi/sgi.c:331
-#: ../plug-ins/file-xjt/xjt.c:3363
+#: ../plug-ins/common/file-cel.c:317 ../plug-ins/common/file-dicom.c:330
+#: ../plug-ins/common/file-gbr.c:366 ../plug-ins/common/file-gif-load.c:345
+#: ../plug-ins/common/file-gih.c:667 ../plug-ins/common/file-pat.c:335
+#: ../plug-ins/common/file-pcx.c:366 ../plug-ins/common/file-pdf.c:586
+#: ../plug-ins/common/file-pix.c:348 ../plug-ins/common/file-png.c:728
+#: ../plug-ins/common/file-pnm.c:499 ../plug-ins/common/file-ps.c:1042
+#: ../plug-ins/common/file-raw.c:671 ../plug-ins/common/file-sunras.c:486
+#: ../plug-ins/common/file-tga.c:447 ../plug-ins/common/file-tiff-load.c:603
+#: ../plug-ins/common/file-wmf.c:994 ../plug-ins/common/file-xbm.c:741
+#: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:520
+#: ../plug-ins/file-bmp/bmp-read.c:161 ../plug-ins/file-faxg3/faxg3.c:217
+#: ../plug-ins/file-fli/fli-gimp.c:502 ../plug-ins/file-ico/ico-load.c:646
+#: ../plug-ins/file-jpeg/jpeg-load.c:115 ../plug-ins/file-psd/psd-load.c:136
+#: ../plug-ins/file-sgi/sgi.c:331 ../plug-ins/file-xjt/xjt.c:3363
 #, c-format
 msgid "Opening '%s'"
 msgstr "Opening '%s'"
@@ -3217,30 +3038,18 @@ msgstr "利用できない色数 (%d)!"
 
 #. init the progress meter
 #. And let's begin the progress
-#: ../plug-ins/common/file-cel.c:588
-#: ../plug-ins/common/file-gbr.c:637
-#: ../plug-ins/common/file-gif-save.c:768
-#: ../plug-ins/common/file-gih.c:1280
-#: ../plug-ins/common/file-html-table.c:256
-#: ../plug-ins/common/file-pat.c:467
-#: ../plug-ins/common/file-pcx.c:627
-#: ../plug-ins/common/file-pix.c:529
-#: ../plug-ins/common/file-png.c:1277
-#: ../plug-ins/common/file-pnm.c:982
-#: ../plug-ins/common/file-ps.c:1218
-#: ../plug-ins/common/file-sunras.c:568
-#: ../plug-ins/common/file-tga.c:1175
-#: ../plug-ins/common/file-tiff-save.c:693
-#: ../plug-ins/common/file-xbm.c:1039
-#: ../plug-ins/common/file-xpm.c:637
-#: ../plug-ins/common/file-xwd.c:619
-#: ../plug-ins/file-bmp/bmp-write.c:307
-#: ../plug-ins/file-fits/fits.c:481
-#: ../plug-ins/file-fli/fli-gimp.c:718
-#: ../plug-ins/file-ico/ico-save.c:1002
-#: ../plug-ins/file-jpeg/jpeg-save.c:282
-#: ../plug-ins/file-psd/psd-save.c:1640
-#: ../plug-ins/file-sgi/sgi.c:554
+#: ../plug-ins/common/file-cel.c:588 ../plug-ins/common/file-gbr.c:637
+#: ../plug-ins/common/file-gif-save.c:768 ../plug-ins/common/file-gih.c:1280
+#: ../plug-ins/common/file-html-table.c:256 ../plug-ins/common/file-pat.c:467
+#: ../plug-ins/common/file-pcx.c:627 ../plug-ins/common/file-pix.c:529
+#: ../plug-ins/common/file-png.c:1277 ../plug-ins/common/file-pnm.c:982
+#: ../plug-ins/common/file-ps.c:1218 ../plug-ins/common/file-sunras.c:568
+#: ../plug-ins/common/file-tga.c:1175 ../plug-ins/common/file-tiff-save.c:693
+#: ../plug-ins/common/file-xbm.c:1039 ../plug-ins/common/file-xpm.c:637
+#: ../plug-ins/common/file-xwd.c:619 ../plug-ins/file-bmp/bmp-write.c:307
+#: ../plug-ins/file-fits/fits.c:481 ../plug-ins/file-fli/fli-gimp.c:718
+#: ../plug-ins/file-ico/ico-save.c:1002 ../plug-ins/file-jpeg/jpeg-save.c:282
+#: ../plug-ins/file-psd/psd-save.c:1640 ../plug-ins/file-sgi/sgi.c:554
 #: ../plug-ins/file-xjt/xjt.c:1710
 #, c-format
 msgid "Saving '%s'"
@@ -3338,27 +3147,22 @@ msgstr "医用デジタル画像と通信"
 msgid "'%s' is not a DICOM file."
 msgstr "'%s' は DICOM ファイルではありません"
 
-#: ../plug-ins/common/file-dicom.c:769
-#: ../plug-ins/common/file-pcx.c:659
+#: ../plug-ins/common/file-dicom.c:769 ../plug-ins/common/file-pcx.c:659
 #: ../plug-ins/common/file-pnm.c:967
 msgid "Cannot save images with alpha channel."
 msgstr "アルファチャンネルを持った画像は保存できません。"
 
-#: ../plug-ins/common/file-dicom.c:784
-#: ../plug-ins/common/file-ps.c:1203
-#: ../plug-ins/common/file-xwd.c:604
-#: ../plug-ins/file-fits/fits.c:466
+#: ../plug-ins/common/file-dicom.c:784 ../plug-ins/common/file-ps.c:1203
+#: ../plug-ins/common/file-xwd.c:604 ../plug-ins/file-fits/fits.c:466
 #: ../plug-ins/file-xjt/xjt.c:1705
 msgid "Cannot operate on unknown image types."
 msgstr "不明な画像タイプは扱えません。"
 
-#: ../plug-ins/common/file-gbr.c:154
-#: ../plug-ins/common/file-gbr.c:175
+#: ../plug-ins/common/file-gbr.c:154 ../plug-ins/common/file-gbr.c:175
 msgid "GIMP brush"
 msgstr "GIMP ブラシ"
 
-#: ../plug-ins/common/file-gbr.c:401
-#: ../plug-ins/common/file-gbr.c:413
+#: ../plug-ins/common/file-gbr.c:401 ../plug-ins/common/file-gbr.c:413
 msgid "Unsupported brush format"
 msgstr "非対応のブラシフォーマット"
 
@@ -3372,8 +3176,7 @@ msgstr "GIMP ブラシファイル '%s' でエラー発生"
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "ブラシファイル '%s' に不正な UTF-8 文字列"
 
-#: ../plug-ins/common/file-gbr.c:439
-#: ../plug-ins/common/file-gih.c:510
+#: ../plug-ins/common/file-gbr.c:439 ../plug-ins/common/file-gih.c:510
 #: ../plug-ins/common/file-gih.c:1173
 #: ../plug-ins/gradient-flare/gradient-flare.c:3063
 msgid "Unnamed"
@@ -3388,15 +3191,12 @@ msgid "Save as Brush"
 msgstr "ブラシ形式で保存"
 
 #. attach labels
-#: ../plug-ins/common/file-gbr.c:747
-#: ../plug-ins/common/grid.c:790
+#: ../plug-ins/common/file-gbr.c:747 ../plug-ins/common/grid.c:790
 msgid "Spacing:"
 msgstr "間隔: "
 
-#: ../plug-ins/common/file-gbr.c:758
-#: ../plug-ins/common/file-gih.c:925
-#: ../plug-ins/common/file-pat.c:556
-#: ../plug-ins/gimpressionist/presets.c:666
+#: ../plug-ins/common/file-gbr.c:758 ../plug-ins/common/file-gih.c:925
+#: ../plug-ins/common/file-pat.c:556 ../plug-ins/gimpressionist/presets.c:666
 msgid "Description:"
 msgstr "説明: "
 
@@ -3423,8 +3223,7 @@ msgstr "背景 (%d%s)"
 msgid "Opening '%s' (frame %d)"
 msgstr "(フレーム %2$d として) %1$s を開いています..."
 
-#: ../plug-ins/common/file-gif-load.c:965
-#: ../plug-ins/common/iwarp.c:791
+#: ../plug-ins/common/file-gif-load.c:965 ../plug-ins/common/iwarp.c:791
 #: ../plug-ins/common/iwarp.c:826
 #, c-format
 msgid "Frame %d"
@@ -3437,8 +3236,12 @@ msgstr "フレーム %d (%d%s)"
 
 #: ../plug-ins/common/file-gif-load.c:998
 #, c-format
-msgid "GIF: Undocumented GIF composite type %d is not handled.  Animation might not play or re-save perfectly."
-msgstr "GIF: 文書化されていない GIF 合成タイプ %d は扱えません。動画が再生されないか、完全に保存できない可能性があります。"
+msgid ""
+"GIF: Undocumented GIF composite type %d is not handled.  Animation might not "
+"play or re-save perfectly."
+msgstr ""
+"GIF: 文書化されていない GIF 合成タイプ %d は扱えません。動画が再生されない"
+"か、完全に保存できない可能性があります。"
 
 #: ../plug-ins/common/file-gif-save.c:447
 msgid "Couldn't simply reduce colors further. Saving as opaque."
@@ -3446,27 +3249,46 @@ msgstr "これ以上単純には減色できません。不透明として保存
 
 #: ../plug-ins/common/file-gif-save.c:562
 #, c-format
-msgid "Unable to save '%s'.  The GIF file format does not support images that are more than %d pixels wide or tall."
-msgstr "'%s' を保存できません。 GIF 形式での保存では幅や高さが %d ピクセルを超える画像をサポートしていません。"
+msgid ""
+"Unable to save '%s'.  The GIF file format does not support images that are "
+"more than %d pixels wide or tall."
+msgstr ""
+"'%s' を保存できません。 GIF 形式での保存では幅や高さが %d ピクセルを超える画"
+"像をサポートしていません。"
 
 #: ../plug-ins/common/file-gif-save.c:673
-msgid "The GIF format only supports comments in 7bit ASCII encoding. No comment is saved."
-msgstr "GIF フォーマットは 7bit ASCII エンコードのコメントしかサポートされません。コメントは保存されませんでした。"
+msgid ""
+"The GIF format only supports comments in 7bit ASCII encoding. No comment is "
+"saved."
+msgstr ""
+"GIF フォーマットは 7bit ASCII エンコードのコメントしかサポートされません。コ"
+"メントは保存されませんでした。"
 
 #: ../plug-ins/common/file-gif-save.c:732
-msgid "Cannot save RGB color images. Convert to indexed color or grayscale first."
-msgstr "RGB 画像を直接 GIF 形式で保存することはできません。インデックス形式もしくはグレースケールに変換してください。"
+msgid ""
+"Cannot save RGB color images. Convert to indexed color or grayscale first."
+msgstr ""
+"RGB 画像を直接 GIF 形式で保存することはできません。インデックス形式もしくはグ"
+"レースケールに変換してください。"
 
 #: ../plug-ins/common/file-gif-save.c:910
 msgid "Delay inserted to prevent evil CPU-sucking animation."
-msgstr "「悪意ある CPU-sucking アニメーション」になることを防ぐためにフレーム間に待ち時間を挿入しました"
+msgstr ""
+"「悪意ある CPU-sucking アニメーション」になることを防ぐためにフレーム間に待ち"
+"時間を挿入しました"
 
 #: ../plug-ins/common/file-gif-save.c:950
-msgid "The image you are trying to save as a GIF contains layers which extend beyond the actual borders of the image."
-msgstr "GIF 形式で保存しようとしている画像中に実画像サイズより大きなレイヤーが含まれています"
+msgid ""
+"The image you are trying to save as a GIF contains layers which extend "
+"beyond the actual borders of the image."
+msgstr ""
+"GIF 形式で保存しようとしている画像中に実画像サイズより大きなレイヤーが含まれ"
+"ています"
 
 #: ../plug-ins/common/file-gif-save.c:967
-msgid "The GIF file format does not allow this.  You may choose whether to crop all of the layers to the image borders, or cancel this save."
+msgid ""
+"The GIF file format does not allow this.  You may choose whether to crop all "
+"of the layers to the image borders, or cancel this save."
 msgstr ""
 "GIF 形式ではこれは許可されません。\n"
 "全てのレイヤーを画像サイズ以下に切り詰めるか、保存をキャンセルしてください。"
@@ -3501,8 +3323,7 @@ msgstr "無限ループ(_L)"
 msgid "_Delay between frames where unspecified:"
 msgstr "指定しない場合のフレーム間の時間(_D): "
 
-#: ../plug-ins/common/file-gif-save.c:1144
-#: ../plug-ins/common/file-mng.c:1507
+#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1507
 msgid "milliseconds"
 msgstr "ミリ秒"
 
@@ -3540,8 +3361,7 @@ msgstr "出力ファイル書き込みエラー。"
 msgid "The default comment is limited to %d characters."
 msgstr "デフォルトのコメントは %d 文字までです。"
 
-#: ../plug-ins/common/file-gih.c:209
-#: ../plug-ins/common/file-gih.c:230
+#: ../plug-ins/common/file-gih.c:209 ../plug-ins/common/file-gih.c:230
 msgid "GIMP brush (animated)"
 msgstr "GIMP ブラシ (動画)"
 
@@ -3646,8 +3466,12 @@ msgid "_Generate full HTML document"
 msgstr "完全な HTML 文書を生成する(_G)"
 
 #: ../plug-ins/common/file-html-table.c:469
-msgid "If checked GTM will output a full HTML document with , , etc. tags instead of just the table html."
-msgstr "チェックしておくと GTM は単なる表の部分の HTML だけではなく  や  等のタグも含む完全な HTML 文書を出力します。"
+msgid ""
+"If checked GTM will output a full HTML document with , , etc. "
+"tags instead of just the table html."
+msgstr ""
+"チェックしておくと GTM は単なる表の部分の HTML だけではなく  や  "
+"等のタグも含む完全な HTML 文書を出力します。"
 
 #. HTML Table Creation Options
 #: ../plug-ins/common/file-html-table.c:482
@@ -3659,16 +3483,25 @@ msgid "_Use cellspan"
 msgstr "Cellspan を使う(_U)"
 
 #: ../plug-ins/common/file-html-table.c:496
-msgid "If checked GTM will replace any rectangular sections of identically colored blocks with one large cell with ROWSPAN and COLSPAN values."
-msgstr "チェックしておくと ROWSPAN と COLSPAN を用いて均質な色の矩形部分を一つの大きなセルにします。"
+msgid ""
+"If checked GTM will replace any rectangular sections of identically colored "
+"blocks with one large cell with ROWSPAN and COLSPAN values."
+msgstr ""
+"チェックしておくと ROWSPAN と COLSPAN を用いて均質な色の矩形部分を一つの大き"
+"なセルにします。"
 
 #: ../plug-ins/common/file-html-table.c:505
 msgid "Co_mpress TD tags"
 msgstr "TD タグ圧縮(_M)"
 
 #: ../plug-ins/common/file-html-table.c:511
-msgid "Checking this tag will cause GTM to leave no whitespace between the TD tags and the cellcontent.  This is only necessary for pixel level positioning control."
-msgstr "チェックしておくと GTM は TD タグとセルの中身の間の空白を取り除きます。ピクセルレベルの位置指定にのみ必要でしょう。"
+msgid ""
+"Checking this tag will cause GTM to leave no whitespace between the TD tags "
+"and the cellcontent.  This is only necessary for pixel level positioning "
+"control."
+msgstr ""
+"チェックしておくと GTM は TD タグとセルの中身の間の空白を取り除きます。ピクセ"
+"ルレベルの位置指定にのみ必要でしょう。"
 
 #: ../plug-ins/common/file-html-table.c:521
 msgid "C_aption"
@@ -3729,8 +3562,7 @@ msgstr "セルの間隔を設定します。"
 
 #. Inform the user that we couldn't losslessly save the
 #. * transparency & just use the full palette
-#: ../plug-ins/common/file-mng.c:498
-#: ../plug-ins/common/file-png.c:1760
+#: ../plug-ins/common/file-mng.c:498 ../plug-ins/common/file-png.c:1760
 msgid "Couldn't losslessly save transparency, saving opacity instead."
 msgstr "透明度を劣化させずに保存できませんでした。不透明で保存します。"
 
@@ -3806,8 +3638,7 @@ msgstr "デフォルトのフレーム配置: "
 msgid "PNG compression level:"
 msgstr "PNG 圧縮レベル: "
 
-#: ../plug-ins/common/file-mng.c:1430
-#: ../plug-ins/common/file-png.c:1908
+#: ../plug-ins/common/file-mng.c:1430 ../plug-ins/common/file-png.c:1908
 msgid "Choose a high compression level for small file size"
 msgstr "ファイルサイズを小さくするには高圧縮レベルを選択してください"
 
@@ -3835,8 +3666,7 @@ msgstr "デフォルトのフレーム遅延: "
 msgid "MNG animation"
 msgstr "MNG 動画"
 
-#: ../plug-ins/common/file-pat.c:123
-#: ../plug-ins/common/file-pat.c:145
+#: ../plug-ins/common/file-pat.c:123 ../plug-ins/common/file-pat.c:145
 msgid "GIMP pattern"
 msgstr "GIMP パターン"
 
@@ -3849,8 +3679,7 @@ msgstr "パターンファイル '%s' に不正な UTF-8 文字列がありま
 msgid "Save as Pattern"
 msgstr "パターン形式で保存"
 
-#: ../plug-ins/common/file-pcx.c:133
-#: ../plug-ins/common/file-pcx.c:152
+#: ../plug-ins/common/file-pcx.c:133 ../plug-ins/common/file-pcx.c:152
 msgid "ZSoft PCX image"
 msgstr "ZSoft PCX 画像"
 
@@ -3864,15 +3693,13 @@ msgstr "'%s' からヘッダが読めません"
 msgid "'%s' is not a PCX file"
 msgstr "'%s' はPCXファイルではありません"
 
-#: ../plug-ins/common/file-pcx.c:395
-#: ../plug-ins/file-bmp/bmp-read.c:579
+#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:606
 #: ../plug-ins/file-psd/psd-load.c:302
 #, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr "画像の幅: '%d' は、サポートされていないか無効な値です"
 
-#: ../plug-ins/common/file-pcx.c:400
-#: ../plug-ins/file-bmp/bmp-read.c:585
+#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:612
 #: ../plug-ins/file-psd/psd-load.c:294
 #, c-format
 msgid "Unsupported or invalid image height: %d"
@@ -3899,12 +3726,16 @@ msgstr "Yオフセット値: '%d' は無効な値です"
 #: ../plug-ins/common/file-pcx.c:688
 #, c-format
 msgid "Right border out of bounds (must be < %d): %d"
-msgstr "右の境界がはみ出ています:　設定値は '%2$d' ですが '%1$d' より小さくなければいけません"
+msgstr ""
+"右の境界がはみ出ています:　設定値は '%2$d' ですが '%1$d' より小さくなければい"
+"けません"
 
 #: ../plug-ins/common/file-pcx.c:695
 #, c-format
 msgid "Bottom border out of bounds (must be < %d): %d"
-msgstr "下の境界がはみ出ています:　設定値は '%2$d' ですが '%1$d' より小さくなければいけません"
+msgstr ""
+"下の境界がはみ出ています:　設定値は '%2$d' ですが '%1$d' より小さくなければい"
+"けません"
 
 #: ../plug-ins/common/file-pcx.c:752
 #, c-format
@@ -3924,8 +3755,7 @@ msgstr "PDF 形式"
 msgid "%s-%s"
 msgstr "%s-%s"
 
-#: ../plug-ins/common/file-pdf.c:622
-#: ../plug-ins/common/file-ps.c:1125
+#: ../plug-ins/common/file-pdf.c:622 ../plug-ins/common/file-ps.c:1125
 #, c-format
 msgid "%s-pages"
 msgstr "%s ページ"
@@ -3934,8 +3764,7 @@ msgstr "%s ページ"
 msgid "Import from PDF"
 msgstr "PDF ドキュメントのインポート"
 
-#: ../plug-ins/common/file-pdf.c:813
-#: ../plug-ins/common/file-ps.c:3100
+#: ../plug-ins/common/file-pdf.c:813 ../plug-ins/common/file-ps.c:3100
 #: ../plug-ins/common/file-tiff-load.c:483
 msgid "_Import"
 msgstr "インポート(_I)"
@@ -3957,15 +3786,12 @@ msgstr "解像度(_R): "
 msgid "pixels/%s"
 msgstr "ピクセル/%s"
 
-#: ../plug-ins/common/file-pix.c:142
-#: ../plug-ins/common/file-pix.c:159
+#: ../plug-ins/common/file-pix.c:142 ../plug-ins/common/file-pix.c:159
 msgid "Alias Pix image"
 msgstr "Alias Pix 画像"
 
-#: ../plug-ins/common/file-png.c:263
-#: ../plug-ins/common/file-png.c:284
-#: ../plug-ins/common/file-png.c:304
-#: ../plug-ins/common/file-png.c:321
+#: ../plug-ins/common/file-png.c:263 ../plug-ins/common/file-png.c:284
+#: ../plug-ins/common/file-png.c:304 ../plug-ins/common/file-png.c:321
 msgid "PNG image"
 msgstr "PNG 画像"
 
@@ -3989,8 +3815,12 @@ msgid "Unknown color model in PNG file '%s'."
 msgstr "PNG ファイル '%s' で未知のカラーモデル。"
 
 #: ../plug-ins/common/file-png.c:889
-msgid "The PNG file specifies an offset that caused the layer to be positioned outside the image."
-msgstr "この PNG ファイルでは、レイヤーが画像の外に配置されるようなオフセットが指定されています。"
+msgid ""
+"The PNG file specifies an offset that caused the layer to be positioned "
+"outside the image."
+msgstr ""
+"この PNG ファイルでは、レイヤーが画像の外に配置されるようなオフセットが指定さ"
+"れています。"
 
 #: ../plug-ins/common/file-png.c:1254
 #, c-format
@@ -4037,8 +3867,7 @@ msgstr "透明ピクセルの色の値を保存(_V)"
 msgid "Co_mpression level:"
 msgstr "圧縮レベル(_M): "
 
-#: ../plug-ins/common/file-png.c:1922
-#: ../plug-ins/file-jpeg/jpeg-save.c:1186
+#: ../plug-ins/common/file-png.c:1922 ../plug-ins/file-jpeg/jpeg-save.c:1186
 msgid "_Load Defaults"
 msgstr "既定値を読み込み(_L)"
 
@@ -4066,12 +3895,9 @@ msgstr "PGM 画像"
 msgid "PPM image"
 msgstr "PPM 画像"
 
-#: ../plug-ins/common/file-pnm.c:528
-#: ../plug-ins/common/file-pnm.c:550
-#: ../plug-ins/common/file-pnm.c:559
-#: ../plug-ins/common/file-pnm.c:570
-#: ../plug-ins/common/file-pnm.c:658
-#: ../plug-ins/common/file-pnm.c:728
+#: ../plug-ins/common/file-pnm.c:528 ../plug-ins/common/file-pnm.c:550
+#: ../plug-ins/common/file-pnm.c:559 ../plug-ins/common/file-pnm.c:570
+#: ../plug-ins/common/file-pnm.c:658 ../plug-ins/common/file-pnm.c:728
 msgid "Premature end of file."
 msgstr "ファイルが途中で切れています"
 
@@ -4124,13 +3950,11 @@ msgstr "Raw"
 msgid "Ascii"
 msgstr "ASCII"
 
-#: ../plug-ins/common/file-ps.c:599
-#: ../plug-ins/common/file-ps.c:691
+#: ../plug-ins/common/file-ps.c:599 ../plug-ins/common/file-ps.c:691
 msgid "PostScript document"
 msgstr "PostScript ドキュメント"
 
-#: ../plug-ins/common/file-ps.c:618
-#: ../plug-ins/common/file-ps.c:707
+#: ../plug-ins/common/file-ps.c:618 ../plug-ins/common/file-ps.c:707
 msgid "Encapsulated PostScript image"
 msgstr "EPS 形式"
 
@@ -4148,33 +3972,30 @@ msgstr "PostScript ドキュメント '%s' を解釈できませんでした"
 msgid "PostScript save cannot handle images with alpha channels"
 msgstr "PostScript 形式による保存はアルファチャンネルを取り扱えません"
 
-#: ../plug-ins/common/file-ps.c:1730
-#: ../plug-ins/common/file-ps.c:1763
+#: ../plug-ins/common/file-ps.c:1730 ../plug-ins/common/file-ps.c:1763
 #, c-format
 msgid ""
-"Error starting Ghostscript. Make sure that Ghostscript is installed and - if necessary - use the environment variable GS_PROG to tell GIMP about its location.\n"
+"Error starting Ghostscript. Make sure that Ghostscript is installed and - if "
+"necessary - use the environment variable GS_PROG to tell GIMP about its "
+"location.\n"
 "(%s)"
 msgstr ""
 "Ghostscript 起動時にエラーが発生しました。\n"
-"Ghostscript がインストールされているか確認し、必要ならば環境変数 GS_PROG に Ghostscript へのパスを設定してください。\n"
+"Ghostscript がインストールされているか確認し、必要ならば環境変数 GS_PROG に "
+"Ghostscript へのパスを設定してください。\n"
 "（詳細または原因は次のとおりです）\n"
 "\n"
 "  %s"
 
-#: ../plug-ins/common/file-ps.c:1930
-#: ../plug-ins/common/file-tiff-load.c:999
+#: ../plug-ins/common/file-ps.c:1930 ../plug-ins/common/file-tiff-load.c:999
 #, c-format
 msgid "Page %d"
 msgstr "ページ %d"
 
-#: ../plug-ins/common/file-ps.c:2600
-#: ../plug-ins/common/file-ps.c:2733
-#: ../plug-ins/common/file-ps.c:2885
-#: ../plug-ins/common/file-ps.c:3011
-#: ../plug-ins/common/file-sunras.c:1504
-#: ../plug-ins/common/file-sunras.c:1612
-#: ../plug-ins/file-fits/fits.c:850
-#: ../plug-ins/file-fits/fits.c:974
+#: ../plug-ins/common/file-ps.c:2600 ../plug-ins/common/file-ps.c:2733
+#: ../plug-ins/common/file-ps.c:2885 ../plug-ins/common/file-ps.c:3011
+#: ../plug-ins/common/file-sunras.c:1504 ../plug-ins/common/file-sunras.c:1612
+#: ../plug-ins/file-fits/fits.c:850 ../plug-ins/file-fits/fits.c:974
 msgid "Write error occurred"
 msgstr "書き込みエラーが発生しました"
 
@@ -4188,8 +4009,7 @@ msgid "Rendering"
 msgstr "解像度とサイズ"
 
 #. Resolution
-#: ../plug-ins/common/file-ps.c:3154
-#: ../plug-ins/common/file-svg.c:929
+#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:929
 #: ../plug-ins/common/file-wmf.c:692
 msgid "Resolution:"
 msgstr "解像度: "
@@ -4202,8 +4022,7 @@ msgstr "ページ: "
 msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
 msgstr "読み込むページ番号 (例: 1-4 あるいは 1,3,5-7)"
 
-#: ../plug-ins/common/file-ps.c:3204
-#: ../plug-ins/common/sphere-designer.c:2643
+#: ../plug-ins/common/file-ps.c:3204 ../plug-ins/common/sphere-designer.c:2643
 msgid "Layers"
 msgstr "レイヤー"
 
@@ -4228,16 +4047,14 @@ msgstr "色の設定"
 msgid "B/W"
 msgstr "モノクロ 2 階調"
 
-#: ../plug-ins/common/file-ps.c:3232
-#: ../plug-ins/common/file-xpm.c:479
+#: ../plug-ins/common/file-ps.c:3232 ../plug-ins/common/file-xpm.c:479
 #: ../plug-ins/gimpressionist/color.c:66
 #: ../plug-ins/gimpressionist/general.c:170
 #: ../plug-ins/imagemap/imap_menu.c:213
 msgid "Color"
 msgstr "カラー"
 
-#: ../plug-ins/common/file-ps.c:3233
-#: ../plug-ins/file-fits/fits.c:1033
+#: ../plug-ins/common/file-ps.c:3233 ../plug-ins/file-fits/fits.c:1033
 msgid "Automatic"
 msgstr "自動"
 
@@ -4247,13 +4064,11 @@ msgstr ""
 "テキストの\n"
 "アンチエイリアス"
 
-#: ../plug-ins/common/file-ps.c:3248
-#: ../plug-ins/common/file-ps.c:3260
+#: ../plug-ins/common/file-ps.c:3248 ../plug-ins/common/file-ps.c:3260
 msgid "Weak"
 msgstr "少し"
 
-#: ../plug-ins/common/file-ps.c:3249
-#: ../plug-ins/common/file-ps.c:3261
+#: ../plug-ins/common/file-ps.c:3249 ../plug-ins/common/file-ps.c:3261
 msgid "Strong"
 msgstr "強く"
 
@@ -4277,8 +4092,12 @@ msgid "_Keep aspect ratio"
 msgstr "縦横比を維持(_K)"
 
 #: ../plug-ins/common/file-ps.c:3419
-msgid "When toggled, the resulting image will be scaled to fit into the given size without changing the aspect ratio."
-msgstr "チェックを入れると、画像は縦横比を変更せずに与えられたサイズに合うように調整されて出力されます。"
+msgid ""
+"When toggled, the resulting image will be scaled to fit into the given size "
+"without changing the aspect ratio."
+msgstr ""
+"チェックを入れると、画像は縦横比を変更せずに与えられたサイズに合うように調整"
+"されて出力されます。"
 
 #. Unit
 #: ../plug-ins/common/file-ps.c:3429
@@ -4320,8 +4139,7 @@ msgstr "プレビュー(_R)"
 msgid "Preview _size:"
 msgstr "プレビューサイズ(_S): "
 
-#: ../plug-ins/common/file-psp.c:599
-#: ../plug-ins/common/file-psp.c:623
+#: ../plug-ins/common/file-psp.c:599 ../plug-ins/common/file-psp.c:623
 msgid "Paint Shop Pro image"
 msgstr "Paint Shop Pro 画像"
 
@@ -4342,8 +4160,7 @@ msgstr "RLE"
 msgid "LZ77"
 msgstr "LZ77"
 
-#: ../plug-ins/common/file-raw.c:182
-#: ../plug-ins/common/file-raw.c:197
+#: ../plug-ins/common/file-raw.c:182 ../plug-ins/common/file-raw.c:197
 msgid "Raw image data"
 msgstr "Raw画像データ"
 
@@ -4379,13 +4196,11 @@ msgstr "画像の種類(_T): "
 msgid "Palette"
 msgstr "パレット"
 
-#: ../plug-ins/common/file-raw.c:1092
-#: ../plug-ins/common/file-raw.c:1191
+#: ../plug-ins/common/file-raw.c:1092 ../plug-ins/common/file-raw.c:1191
 msgid "R, G, B (normal)"
 msgstr "R, G, B (通常)"
 
-#: ../plug-ins/common/file-raw.c:1093
-#: ../plug-ins/common/file-raw.c:1193
+#: ../plug-ins/common/file-raw.c:1093 ../plug-ins/common/file-raw.c:1193
 msgid "B, G, R, X (BMP style)"
 msgstr "B, G, R, X (BMP スタイル)"
 
@@ -4425,8 +4240,7 @@ msgstr "Planar (RRR,GGG,BBB)"
 msgid "Indexed Palette Type"
 msgstr "インデックスパレット型"
 
-#: ../plug-ins/common/file-sunras.c:217
-#: ../plug-ins/common/file-sunras.c:237
+#: ../plug-ins/common/file-sunras.c:217 ../plug-ins/common/file-sunras.c:237
 msgid "SUN Rasterfile image"
 msgstr "SUN-raster ファイル画像"
 
@@ -4448,8 +4262,7 @@ msgstr "'%s' から色情報が読み込めません"
 msgid "Type of colormap not supported"
 msgstr "このカラーマップ形式は使用できません"
 
-#: ../plug-ins/common/file-sunras.c:456
-#: ../plug-ins/common/file-xbm.c:826
+#: ../plug-ins/common/file-sunras.c:456 ../plug-ins/common/file-xbm.c:826
 #: ../plug-ins/common/file-xwd.c:489
 #, c-format
 msgid ""
@@ -4459,8 +4272,7 @@ msgstr ""
 "'%s':\n"
 "画像の幅が指定されていません"
 
-#: ../plug-ins/common/file-sunras.c:464
-#: ../plug-ins/common/file-xbm.c:833
+#: ../plug-ins/common/file-sunras.c:464 ../plug-ins/common/file-xbm.c:833
 #: ../plug-ins/common/file-xwd.c:498
 #, c-format
 msgid ""
@@ -4470,8 +4282,7 @@ msgstr ""
 "'%s':\n"
 "画像の幅がGIMPで扱える範囲を超えています"
 
-#: ../plug-ins/common/file-sunras.c:472
-#: ../plug-ins/common/file-xbm.c:840
+#: ../plug-ins/common/file-sunras.c:472 ../plug-ins/common/file-xbm.c:840
 #: ../plug-ins/common/file-xwd.c:506
 #, c-format
 msgid ""
@@ -4481,8 +4292,7 @@ msgstr ""
 "'%s':\n"
 "画像の高さが指定されていません"
 
-#: ../plug-ins/common/file-sunras.c:480
-#: ../plug-ins/common/file-xbm.c:847
+#: ../plug-ins/common/file-sunras.c:480 ../plug-ins/common/file-xbm.c:847
 #: ../plug-ins/common/file-xwd.c:514
 #, c-format
 msgid ""
@@ -4505,16 +4315,11 @@ msgstr "SUNRAS による保存はアルファチャンネルを持った画像
 msgid "Can't operate on unknown image types"
 msgstr "不明な画像種は扱えません"
 
-#: ../plug-ins/common/file-sunras.c:1082
-#: ../plug-ins/common/file-sunras.c:1173
-#: ../plug-ins/common/file-sunras.c:1254
-#: ../plug-ins/common/file-sunras.c:1349
-#: ../plug-ins/common/file-xwd.c:1348
-#: ../plug-ins/common/file-xwd.c:1449
-#: ../plug-ins/common/file-xwd.c:1607
-#: ../plug-ins/common/file-xwd.c:1807
-#: ../plug-ins/common/file-xwd.c:2064
-#: ../plug-ins/file-fits/fits.c:697
+#: ../plug-ins/common/file-sunras.c:1082 ../plug-ins/common/file-sunras.c:1173
+#: ../plug-ins/common/file-sunras.c:1254 ../plug-ins/common/file-sunras.c:1349
+#: ../plug-ins/common/file-xwd.c:1348 ../plug-ins/common/file-xwd.c:1449
+#: ../plug-ins/common/file-xwd.c:1607 ../plug-ins/common/file-xwd.c:1807
+#: ../plug-ins/common/file-xwd.c:2064 ../plug-ins/file-fits/fits.c:697
 msgid "EOF encountered on reading"
 msgstr "読み込み中に EOF が現れた"
 
@@ -4535,8 +4340,7 @@ msgstr "RLE エンコード"
 msgid "SVG image"
 msgstr "SVG 画像"
 
-#: ../plug-ins/common/file-svg.c:335
-#: ../plug-ins/common/file-svg.c:733
+#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:733
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -4548,8 +4352,7 @@ msgstr "SVG を描画しています"
 msgid "Rendered SVG"
 msgstr "SVG 描画"
 
-#: ../plug-ins/common/file-svg.c:567
-#: ../plug-ins/common/file-wmf.c:358
+#: ../plug-ins/common/file-svg.c:567 ../plug-ins/common/file-wmf.c:358
 #, c-format
 msgid "%d × %d"
 msgstr "%d × %d"
@@ -4568,34 +4371,28 @@ msgid "Render Scalable Vector Graphics"
 msgstr "Scalable Vector Graphics を描く"
 
 #. Width and Height
-#: ../plug-ins/common/file-svg.c:808
-#: ../plug-ins/common/file-wmf.c:571
+#: ../plug-ins/common/file-svg.c:808 ../plug-ins/common/file-wmf.c:571
 #: ../plug-ins/common/grid.c:724
 msgid "Width:"
 msgstr "幅: "
 
-#: ../plug-ins/common/file-svg.c:814
-#: ../plug-ins/common/file-wmf.c:577
+#: ../plug-ins/common/file-svg.c:814 ../plug-ins/common/file-wmf.c:577
 msgid "Height:"
 msgstr "高さ: "
 
-#: ../plug-ins/common/file-svg.c:888
-#: ../plug-ins/common/file-wmf.c:651
+#: ../plug-ins/common/file-svg.c:888 ../plug-ins/common/file-wmf.c:651
 msgid "_X ratio:"
 msgstr "比率 _X: "
 
-#: ../plug-ins/common/file-svg.c:910
-#: ../plug-ins/common/file-wmf.c:673
+#: ../plug-ins/common/file-svg.c:910 ../plug-ins/common/file-wmf.c:673
 msgid "_Y ratio:"
 msgstr "比率 _Y: "
 
-#: ../plug-ins/common/file-svg.c:924
-#: ../plug-ins/common/file-wmf.c:687
+#: ../plug-ins/common/file-svg.c:924 ../plug-ins/common/file-wmf.c:687
 msgid "Constrain aspect ratio"
 msgstr "縦横比指定"
 
-#: ../plug-ins/common/file-svg.c:935
-#: ../plug-ins/common/file-wmf.c:698
+#: ../plug-ins/common/file-svg.c:935 ../plug-ins/common/file-wmf.c:698
 #: ../plug-ins/print/print-page-layout.c:273
 #, c-format
 msgid "pixels/%a"
@@ -4607,15 +4404,15 @@ msgid "Import _paths"
 msgstr "パスをインポート(_P)"
 
 #: ../plug-ins/common/file-svg.c:961
-msgid "Import path elements of the SVG so they can be used with the GIMP path tool"
+msgid ""
+"Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr "SVG のパス要素を GIMP パスツールで使えるようにインポートします"
 
 #: ../plug-ins/common/file-svg.c:974
 msgid "Merge imported paths"
 msgstr "インポートしたパスを統合"
 
-#: ../plug-ins/common/file-tga.c:245
-#: ../plug-ins/common/file-tga.c:264
+#: ../plug-ins/common/file-tga.c:245 ../plug-ins/common/file-tga.c:264
 msgid "TarGA image"
 msgstr "TarGA 画像"
 
@@ -4683,10 +4480,14 @@ msgstr "TIFF チャンネル"
 #: ../plug-ins/file-psd/psd-load.c:325
 msgid ""
 "Warning:\n"
-"The image you are loading has 16 bits per channel. GIMP can only handle 8 bit, so it will be converted for you. Information will be lost because of this conversion."
+"The image you are loading has 16 bits per channel. GIMP can only handle 8 "
+"bit, so it will be converted for you. Information will be lost because of "
+"this conversion."
 msgstr ""
 "警告:\n"
-"16 bit /チャンネルの画像を読み込もうとしていますが、GIMPはこのモードが取り扱えないので 8 bit /チャンネルに変換します。この変換によりカラー情報の一部が失われます。"
+"16 bit /チャンネルの画像を読み込もうとしていますが、GIMPはこのモードが取り扱"
+"えないので 8 bit /チャンネルに変換します。この変換によりカラー情報の一部が失"
+"われます。"
 
 #: ../plug-ins/common/file-tiff-save.c:887
 msgid ""
@@ -4737,8 +4538,7 @@ msgstr "CCITT Group 4 fax(_4)"
 msgid "Save _color values from transparent pixels"
 msgstr "透明ピクセルの色の値を保存(_C)"
 
-#: ../plug-ins/common/file-tiff-save.c:1131
-#: ../plug-ins/common/file-xbm.c:1246
+#: ../plug-ins/common/file-tiff-save.c:1131 ../plug-ins/common/file-xbm.c:1246
 msgid "Comment:"
 msgstr "コメント: "
 
@@ -4767,8 +4567,7 @@ msgstr "'%s' を読込み用でオープンできませんでした。"
 msgid "Rendered WMF"
 msgstr "描画した WMF"
 
-#: ../plug-ins/common/file-xbm.c:176
-#: ../plug-ins/common/file-xbm.c:194
+#: ../plug-ins/common/file-xbm.c:176 ../plug-ins/common/file-xbm.c:194
 msgid "X BitMap image"
 msgstr "X ビットマップイメージ"
 
@@ -4793,7 +4592,8 @@ msgstr ""
 #. The image is not black-and-white.
 #: ../plug-ins/common/file-xbm.c:997
 msgid ""
-"The image which you are trying to save as an XBM contains more than two colors.\n"
+"The image which you are trying to save as an XBM contains more than two "
+"colors.\n"
 "\n"
 "Please convert it to a black and white (1-bit) indexed image and try again."
 msgstr ""
@@ -4853,19 +4653,16 @@ msgstr "外部マスクファイルに書く(_R)"
 msgid "_Mask file extension:"
 msgstr "マスクファイル拡張子(_M): "
 
-#: ../plug-ins/common/file-xpm.c:174
-#: ../plug-ins/common/file-xpm.c:199
+#: ../plug-ins/common/file-xpm.c:174 ../plug-ins/common/file-xpm.c:199
 msgid "X PixMap image"
 msgstr "X PixMap 画像"
 
-#: ../plug-ins/common/file-xpm.c:363
-#: ../plug-ins/common/file-xpm.c:773
+#: ../plug-ins/common/file-xpm.c:363 ../plug-ins/common/file-xpm.c:773
 #, c-format
 msgid "Error opening file '%s'"
 msgstr "ファイル '%s' のオープン中にエラー"
 
-#: ../plug-ins/common/file-xpm.c:369
-#: ../plug-ins/common/file-xpm.c:779
+#: ../plug-ins/common/file-xpm.c:369 ../plug-ins/common/file-xpm.c:779
 msgid "XPM file invalid"
 msgstr "XPM ファイルが不正です"
 
@@ -4877,8 +4674,7 @@ msgstr "XPM 形式で保存する"
 msgid "_Alpha threshold:"
 msgstr "アルファしきい値(_A): "
 
-#: ../plug-ins/common/file-xwd.c:278
-#: ../plug-ins/common/file-xwd.c:298
+#: ../plug-ins/common/file-xwd.c:278 ../plug-ins/common/file-xwd.c:298
 msgid "X window dump"
 msgstr "X ウィンドウダンプ"
 
@@ -4893,8 +4689,12 @@ msgstr "色情報が読み込めません"
 
 #: ../plug-ins/common/file-xwd.c:570
 #, c-format
-msgid "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is not supported."
-msgstr "XWD-ファイル %s は形式 %d, 深度 %d, ピクセル当たり %d です。現在この形式は利用できません。"
+msgid ""
+"XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
+"not supported."
+msgstr ""
+"XWD-ファイル %s は形式 %d, 深度 %d, ピクセル当たり %d です。現在この形式は利"
+"用できません。"
 
 #: ../plug-ins/common/file-xwd.c:593
 msgid "Cannot save images with alpha channels."
@@ -4920,8 +4720,7 @@ msgstr "フィルムストリップ(_F)..."
 msgid "Composing images"
 msgstr "画像合成中"
 
-#: ../plug-ins/common/film.c:425
-#: ../plug-ins/common/guillotine.c:216
+#: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:216
 #: ../plug-ins/help-browser/dialog.c:1120
 msgid "Untitled"
 msgstr "名称未設定"
@@ -4935,8 +4734,7 @@ msgid "On film:"
 msgstr "フィルム上には: "
 
 #. Film height/colour
-#: ../plug-ins/common/film.c:976
-#: ../plug-ins/common/film.c:1248
+#: ../plug-ins/common/film.c:976 ../plug-ins/common/film.c:1248
 msgid "Filmstrip"
 msgstr "フィルムストリップ"
 
@@ -4950,8 +4748,7 @@ msgstr "画像に高さを合わせる(_F)"
 msgid "Select Film Color"
 msgstr "フィルムの色"
 
-#: ../plug-ins/common/film.c:1026
-#: ../plug-ins/common/film.c:1076
+#: ../plug-ins/common/film.c:1026 ../plug-ins/common/film.c:1076
 #: ../plug-ins/common/nova.c:353
 msgid "Co_lor:"
 msgstr "色(_L): "
@@ -5069,8 +4866,7 @@ msgstr "彩度を上げる: "
 msgid "Less Sat:"
 msgstr "彩度を下げる: "
 
-#: ../plug-ins/common/filter-pack.c:233
-#: ../plug-ins/common/filter-pack.c:532
+#: ../plug-ins/common/filter-pack.c:233 ../plug-ins/common/filter-pack.c:532
 msgid "Current:"
 msgstr "現在"
 
@@ -5106,8 +4902,7 @@ msgstr "色相バリエーション"
 msgid "Roughness"
 msgstr "変化率"
 
-#: ../plug-ins/common/filter-pack.c:674
-#: ../plug-ins/common/filter-pack.c:1317
+#: ../plug-ins/common/filter-pack.c:674 ../plug-ins/common/filter-pack.c:1317
 msgid "Affected Range"
 msgstr "対象領域"
 
@@ -5127,8 +4922,7 @@ msgstr "ハイライト(_I)"
 msgid "Windows"
 msgstr "ウィンドウ"
 
-#: ../plug-ins/common/filter-pack.c:704
-#: ../plug-ins/common/van-gogh-lic.c:672
+#: ../plug-ins/common/filter-pack.c:704 ../plug-ins/common/van-gogh-lic.c:672
 msgid "_Saturation"
 msgstr "彩度(_S)"
 
@@ -5243,18 +5037,15 @@ msgstr "Y_1:"
 msgid "Y_2:"
 msgstr "Y_2:"
 
-#: ../plug-ins/common/gee-zoom.c:121
-#: ../plug-ins/common/gee.c:99
+#: ../plug-ins/common/gee-zoom.c:121 ../plug-ins/common/gee.c:99
 msgid "A big hello from the GIMP team!"
 msgstr "A big hello from the GIMP team!"
 
-#: ../plug-ins/common/gee-zoom.c:126
-#: ../plug-ins/common/gee-zoom.c:186
+#: ../plug-ins/common/gee-zoom.c:126 ../plug-ins/common/gee-zoom.c:186
 msgid "Gee Zoom"
 msgstr "Gee ズーム"
 
-#: ../plug-ins/common/gee-zoom.c:192
-#: ../plug-ins/common/gee.c:166
+#: ../plug-ins/common/gee-zoom.c:192 ../plug-ins/common/gee.c:166
 msgid "Thank You for Choosing GIMP"
 msgstr "GIMP を選んでくれてありがとう"
 
@@ -5263,8 +5054,7 @@ msgstr "GIMP を選んでくれてありがとう"
 msgid "An obsolete creation by %s"
 msgstr "%s の昔の作品"
 
-#: ../plug-ins/common/gee.c:104
-#: ../plug-ins/common/gee.c:160
+#: ../plug-ins/common/gee.c:104 ../plug-ins/common/gee.c:160
 msgid "Gee Slime"
 msgstr "Gee スライム"
 
@@ -5309,8 +5099,7 @@ msgstr "グリッド(_G)..."
 msgid "Drawing grid"
 msgstr "グリッドを描いています"
 
-#: ../plug-ins/common/grid.c:635
-#: ../plug-ins/gfig/gfig-dialog.c:1355
+#: ../plug-ins/common/grid.c:635 ../plug-ins/gfig/gfig-dialog.c:1355
 #: ../plug-ins/imagemap/imap_menu.c:209
 msgid "Grid"
 msgstr "グリッド"
@@ -5360,14 +5149,14 @@ msgstr "ギロチンで切断しています"
 
 #: ../plug-ins/common/hot.c:207
 msgid "Find and fix pixels that may be unsafely bright"
-msgstr "明るすぎるかもしれないピクセルを検出して、それを適正な明るさに修正します"
+msgstr ""
+"明るすぎるかもしれないピクセルを検出して、それを適正な明るさに修正します"
 
 #: ../plug-ins/common/hot.c:217
 msgid "_Hot..."
 msgstr "ホット(_H)..."
 
-#: ../plug-ins/common/hot.c:387
-#: ../plug-ins/common/hot.c:586
+#: ../plug-ins/common/hot.c:387 ../plug-ins/common/hot.c:586
 msgid "Hot"
 msgstr "ホット"
 
@@ -5387,8 +5176,7 @@ msgstr "発光を減らす(_L)"
 msgid "Reduce _Saturation"
 msgstr "彩度を減らす(_S)"
 
-#: ../plug-ins/common/hot.c:638
-#: ../plug-ins/common/waves.c:282
+#: ../plug-ins/common/hot.c:638 ../plug-ins/common/waves.c:282
 msgid "_Blacken"
 msgstr "黒くする(_B)"
 
@@ -5400,8 +5188,7 @@ msgstr "画像を変化させながら重ねます"
 msgid "_Illusion..."
 msgstr "幻(_I)..."
 
-#: ../plug-ins/common/illusion.c:168
-#: ../plug-ins/common/illusion.c:350
+#: ../plug-ins/common/illusion.c:168 ../plug-ins/common/illusion.c:350
 msgid "Illusion"
 msgstr "幻"
 
@@ -5419,7 +5206,9 @@ msgstr "モード _2"
 
 #: ../plug-ins/common/iwarp.c:262
 msgid "Use mouse control to warp image areas"
-msgstr "マウスで変化させたい箇所をクリック - ドラッグしながら対話的に画像を歪めていきます"
+msgstr ""
+"マウスで変化させたい箇所をクリック - ドラッグしながら対話的に画像を歪めていき"
+"ます"
 
 #: ../plug-ins/common/iwarp.c:267
 msgid "_IWarp..."
@@ -5510,8 +5299,7 @@ msgstr "最大深度(_X):"
 msgid "Thresho_ld:"
 msgstr "しきい値(_L):"
 
-#: ../plug-ins/common/iwarp.c:1214
-#: ../plug-ins/common/sinus.c:771
+#: ../plug-ins/common/iwarp.c:1214 ../plug-ins/common/sinus.c:771
 #: ../plug-ins/gradient-flare/gradient-flare.c:2867
 msgid "_Settings"
 msgstr "設定(_S)"
@@ -5521,7 +5309,9 @@ msgid "IWarp"
 msgstr "対話型歪め"
 
 #: ../plug-ins/common/iwarp.c:1299
-msgid "Click and drag in the preview to define the distortions to apply to the image."
+msgid ""
+"Click and drag in the preview to define the distortions to apply to the "
+"image."
 msgstr "プレビュー内でクリック・ドラッグして、画像へ適用する歪みを定義します。"
 
 #: ../plug-ins/common/jigsaw.c:356
@@ -5595,7 +5385,8 @@ msgstr "それぞれのピースの端が丸めてある"
 
 #: ../plug-ins/common/lcms.c:218
 msgid "Set a color profile on the image"
-msgstr "ICCカラープロファイルを画像に設定します。この操作では色の変換は行われません。"
+msgstr ""
+"ICCカラープロファイルを画像に設定します。この操作では色の変換は行われません。"
 
 #: ../plug-ins/common/lcms.c:225
 msgid "_Assign Color Profile..."
@@ -5628,15 +5419,19 @@ msgstr "カラープロファイル情報"
 #: ../plug-ins/common/lcms.c:572
 #, c-format
 msgid "Color profile '%s' is not for RGB color space."
-msgstr "カラープロファイル '%s' は、RGB カラースペース用のプロファイルではありません"
+msgstr ""
+"カラープロファイル '%s' は、RGB カラースペース用のプロファイルではありません"
 
 #: ../plug-ins/common/lcms.c:679
 msgid "Default RGB working space"
 msgstr "既定の RGB ワークスペース"
 
 #: ../plug-ins/common/lcms.c:775
-msgid "Data attached as 'icc-profile' does not appear to be an ICC color profile"
-msgstr "'icc-profile' として付加されたデータは、ICCカラープロファイルのようではありません"
+msgid ""
+"Data attached as 'icc-profile' does not appear to be an ICC color profile"
+msgstr ""
+"'icc-profile' として付加されたデータは、ICCカラープロファイルのようではありま"
+"せん"
 
 #: ../plug-ins/common/lcms.c:825
 #, c-format
@@ -5676,8 +5471,7 @@ msgstr "変換しない"
 msgid "_Convert"
 msgstr "変換(_C)"
 
-#: ../plug-ins/common/lcms.c:1263
-#: ../plug-ins/file-jpeg/jpeg-exif.c:377
+#: ../plug-ins/common/lcms.c:1263 ../plug-ins/file-jpeg/jpeg-exif.c:377
 msgid "_Don't ask me again"
 msgstr "次回から確認しない(_D)"
 
@@ -5794,8 +5588,7 @@ msgstr "メイン"
 msgid "_Edge:"
 msgstr "周辺部"
 
-#: ../plug-ins/common/lens-distortion.c:549
-#: ../plug-ins/flame/flame.c:1237
+#: ../plug-ins/common/lens-distortion.c:549 ../plug-ins/flame/flame.c:1237
 msgid "_Zoom:"
 msgstr "拡大(_Z):"
 
@@ -5831,8 +5624,7 @@ msgstr "レンズフレア"
 msgid "Center of Flare Effect"
 msgstr "フレア効果の中心"
 
-#: ../plug-ins/common/lens-flare.c:793
-#: ../plug-ins/common/nova.c:484
+#: ../plug-ins/common/lens-flare.c:793 ../plug-ins/common/nova.c:484
 msgid "Show _position"
 msgstr "中心をガイドで表示"
 
@@ -5844,35 +5636,35 @@ msgstr "画像をEメールで送信します"
 msgid "Send by E_mail..."
 msgstr "メールで送信..."
 
-#: ../plug-ins/common/mail.c:408
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
 msgstr "メールで画像を送信"
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "送信(_S)"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "ファイル名(_F):"
 
-#: ../plug-ins/common/mail.c:457
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
 msgstr "宛先(_T):  "
 
-#: ../plug-ins/common/mail.c:471
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
 msgstr "差出人(_F):  "
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "件名(_U):"
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "ファイル拡張子に関するエラーが発生しました。"
 
-#: ../plug-ins/common/mail.c:726
+#: ../plug-ins/common/mail.c:725
 #, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "sendmail を開始できません (%s)"
@@ -5885,8 +5677,7 @@ msgstr "RGB各チャンネルの値を比較して、色を純粋な赤・緑・
 msgid "Maxim_um RGB..."
 msgstr "RGB 値最大(_M)..."
 
-#: ../plug-ins/common/max-rgb.c:134
-#: ../plug-ins/common/noise-hsv.c:158
+#: ../plug-ins/common/max-rgb.c:134 ../plug-ins/common/noise-hsv.c:158
 msgid "Can only operate on RGB drawables."
 msgstr "RGB 描画対象のみ操作できます。"
 
@@ -5952,8 +5743,7 @@ msgstr "タイルの形状"
 msgid "Tile _size:"
 msgstr "タイルサイズ(_T):"
 
-#: ../plug-ins/common/mosaic.c:660
-#: ../plug-ins/common/tile-glass.c:303
+#: ../plug-ins/common/mosaic.c:660 ../plug-ins/common/tile-glass.c:303
 msgid "Tile _height:"
 msgstr "タイル高(_H):"
 
@@ -5997,8 +5787,7 @@ msgstr "丸"
 msgid "Line"
 msgstr "線形"
 
-#: ../plug-ins/common/newsprint.c:145
-#: ../plug-ins/flame/flame.c:760
+#: ../plug-ins/common/newsprint.c:145 ../plug-ins/flame/flame.c:760
 msgid "Diamond"
 msgstr "ダイヤモンド"
 
@@ -6042,8 +5831,7 @@ msgstr "新聞紙上の写真のようなハーフトーンの効果を施しま
 msgid "Newsprin_t..."
 msgstr "新聞印刷(_T)..."
 
-#: ../plug-ins/common/newsprint.c:627
-#: ../plug-ins/common/newsprint.c:1188
+#: ../plug-ins/common/newsprint.c:627 ../plug-ins/common/newsprint.c:1188
 msgid "Newsprint"
 msgstr "新聞印刷"
 
@@ -6103,8 +5891,7 @@ msgid "_Factory Defaults"
 msgstr "初期値に戻す(_F)"
 
 #. anti-alias control
-#: ../plug-ins/common/newsprint.c:1442
-#: ../plug-ins/gfig/gfig-dialog.c:1256
+#: ../plug-ins/common/newsprint.c:1442 ../plug-ins/gfig/gfig-dialog.c:1256
 msgid "Antialiasing"
 msgstr "アンチエイリアシング"
 
@@ -6120,8 +5907,7 @@ msgstr "非線形アルゴリズムを用いた 3 種類のフィルタ効果を
 msgid "_NL Filter..."
 msgstr "非線形フィルタ(_N)..."
 
-#: ../plug-ins/common/nl-filter.c:952
-#: ../plug-ins/common/nl-filter.c:1015
+#: ../plug-ins/common/nl-filter.c:952 ../plug-ins/common/nl-filter.c:1015
 msgid "NL Filter"
 msgstr "非線形フィルタ"
 
@@ -6153,8 +5939,7 @@ msgstr "色相・彩度・明度を独立してランダム化します"
 msgid "HSV Noise..."
 msgstr "HSV ノイズ..."
 
-#: ../plug-ins/common/noise-hsv.c:215
-#: ../plug-ins/common/noise-hsv.c:361
+#: ../plug-ins/common/noise-hsv.c:215 ../plug-ins/common/noise-hsv.c:361
 msgid "HSV Noise"
 msgstr "HSV ノイズを生成しています"
 
@@ -6247,8 +6032,7 @@ msgstr "相関ノイズ(_R)"
 msgid "_Independent RGB"
 msgstr "RGB 独立(_I)"
 
-#: ../plug-ins/common/noise-rgb.c:520
-#: ../plug-ins/common/noise-rgb.c:524
+#: ../plug-ins/common/noise-rgb.c:520 ../plug-ins/common/noise-rgb.c:524
 msgid "_Gray:"
 msgstr "グレー(_G):"
 
@@ -6266,8 +6050,7 @@ msgid "_Solid Noise..."
 msgstr "ソリッドノイズ(_S)..."
 
 #. Dialog initialization
-#: ../plug-ins/common/noise-solid.c:315
-#: ../plug-ins/common/noise-solid.c:563
+#: ../plug-ins/common/noise-solid.c:315 ../plug-ins/common/noise-solid.c:563
 msgid "Solid Noise"
 msgstr "ソリッドノイズ"
 
@@ -6345,8 +6128,7 @@ msgstr "乱数色相(_A):"
 msgid "Center of Nova"
 msgstr "超新星の中心"
 
-#: ../plug-ins/common/oilify.c:119
-#: ../plug-ins/common/oilify.c:134
+#: ../plug-ins/common/oilify.c:119 ../plug-ins/common/oilify.c:134
 msgid "Smear colors to simulate an oil painting"
 msgstr "油絵のような効果を施します"
 
@@ -6373,8 +6155,7 @@ msgstr "マスクサイズ(_M):"
 msgid "Use m_ask-size map:"
 msgstr "マスクサイズマップを使用(_A):"
 
-#: ../plug-ins/common/oilify.c:867
-#: ../plug-ins/common/sinus.c:922
+#: ../plug-ins/common/oilify.c:867 ../plug-ins/common/sinus.c:922
 msgid "_Exponent:"
 msgstr "指数(_E):"
 
@@ -6404,8 +6185,7 @@ msgstr "写真コピー(_P)..."
 msgid "Photocopy"
 msgstr "写真コピー"
 
-#: ../plug-ins/common/photocopy.c:890
-#: ../plug-ins/common/sharpen.c:511
+#: ../plug-ins/common/photocopy.c:890 ../plug-ins/common/sharpen.c:511
 #: ../plug-ins/common/softglow.c:697
 msgid "_Sharpness:"
 msgstr "シャープ度(_S):"
@@ -6450,8 +6230,7 @@ msgstr "プラズマのテクスチャを生成します"
 msgid "_Plasma..."
 msgstr "プラズマ(_P)..."
 
-#: ../plug-ins/common/plasma.c:263
-#: ../plug-ins/common/plasma.c:300
+#: ../plug-ins/common/plasma.c:263 ../plug-ins/common/plasma.c:300
 msgid "Plasma"
 msgstr "プラズマ"
 
@@ -6480,7 +6259,6 @@ msgstr "名前で検索"
 msgid "%d plug-in"
 msgid_plural "%d plug-ins"
 msgstr[0] "%d個のプラグイン"
-msgstr[1] "%d個のプラグイン"
 
 #: ../plug-ins/common/plugin-browser.c:395
 msgid "No matches for your query"
@@ -6490,8 +6268,7 @@ msgstr "該当するプラグインは見つかりませんでした"
 #, c-format
 msgid "%d plug-in matches your query"
 msgid_plural "%d plug-ins match your query"
-msgstr[0] "該当のプラグインが %d個だけ見つかりました"
-msgstr[1] "%d個のプラグインが見つかりました"
+msgstr[0] "%d個のプラグインが見つかりました"
 
 #: ../plug-ins/common/plugin-browser.c:529
 msgid "No matches"
@@ -6530,7 +6307,9 @@ msgstr "ツリー表示"
 
 #: ../plug-ins/common/polar-coords.c:156
 msgid "Convert image to or from polar coordinates"
-msgstr "極座標または直交座標で画像を変換します。凸面鏡や凹面鏡に映されたような効果が得られます。"
+msgstr ""
+"極座標または直交座標で画像を変換します。凸面鏡や凹面鏡に映されたような効果が"
+"得られます。"
 
 #: ../plug-ins/common/polar-coords.c:163
 msgid "P_olar Coordinates..."
@@ -6557,28 +6336,40 @@ msgid "_Map backwards"
 msgstr "逆方向マップ(_M)"
 
 #: ../plug-ins/common/polar-coords.c:664
-msgid "If checked the mapping will begin at the right side, as opposed to beginning at the left."
-msgstr "チェックしてある場合には右側から、そうでなければ左側からマッピングします。"
+msgid ""
+"If checked the mapping will begin at the right side, as opposed to beginning "
+"at the left."
+msgstr ""
+"チェックしてある場合には右側から、そうでなければ左側からマッピングします。"
 
 #: ../plug-ins/common/polar-coords.c:675
 msgid "Map from _top"
 msgstr "上側からマップ(_T)"
 
 #: ../plug-ins/common/polar-coords.c:681
-msgid "If unchecked the mapping will put the bottom row in the middle and the top row on the outside.  If checked it will be the opposite."
-msgstr "チェックしてない場合には画像の下側を中心に、上側を外に向けてマッピングします。チェックした場合には逆になります。"
+msgid ""
+"If unchecked the mapping will put the bottom row in the middle and the top "
+"row on the outside.  If checked it will be the opposite."
+msgstr ""
+"チェックしてない場合には画像の下側を中心に、上側を外に向けてマッピングしま"
+"す。チェックした場合には逆になります。"
 
 #: ../plug-ins/common/polar-coords.c:693
 msgid "To _polar"
 msgstr "極座標へ(_P)"
 
 #: ../plug-ins/common/polar-coords.c:699
-msgid "If unchecked the image will be circularly mapped onto a rectangle.  If checked the image will be mapped onto a circle."
-msgstr "チェックしてない場合には極座標から直交座標への変換、チェックした場合には直交座標から極座標へ変換されます。"
+msgid ""
+"If unchecked the image will be circularly mapped onto a rectangle.  If "
+"checked the image will be mapped onto a circle."
+msgstr ""
+"チェックしてない場合には極座標から直交座標への変換、チェックした場合には直交"
+"座標から極座標へ変換されます。"
 
 #: ../plug-ins/common/procedure-browser.c:83
 msgid "List available procedures in the PDB"
-msgstr "プロシージャ・データベース(PDB)で使用可能なプロシージャの一覧を表示します"
+msgstr ""
+"プロシージャ・データベース(PDB)で使用可能なプロシージャの一覧を表示します"
 
 #: ../plug-ins/common/procedure-browser.c:88
 msgid "Procedure _Browser"
@@ -6625,8 +6416,7 @@ msgid "Red Eye Removal"
 msgstr "赤目除去"
 
 #: ../plug-ins/common/red-eye-removal.c:170
-#: ../plug-ins/common/unsharp-mask.c:706
-#: ../plug-ins/common/wind.c:1008
+#: ../plug-ins/common/unsharp-mask.c:706 ../plug-ins/common/wind.c:1008
 #: ../plug-ins/imagemap/imap_preferences.c:441
 #: ../plug-ins/map-object/map-object-ui.c:585
 msgid "_Threshold:"
@@ -6638,7 +6428,8 @@ msgstr "赤目の領域を決定するしきい値を設定します"
 
 #: ../plug-ins/common/red-eye-removal.c:181
 msgid "Manually selecting the eyes may improve the results."
-msgstr "あらかじめ「目」の部分の選択範囲を作っておくと、よい結果を生むでしょう。"
+msgstr ""
+"あらかじめ「目」の部分の選択範囲を作っておくと、よい結果を生むでしょう。"
 
 #: ../plug-ins/common/red-eye-removal.c:301
 msgid "Removing red eye"
@@ -6812,8 +6603,7 @@ msgstr "ウィンドウ選択中にエラーが発生しました。"
 msgid "Importing screenshot"
 msgstr "スクリーンショットを取り込んでいます..."
 
-#: ../plug-ins/common/screenshot.c:804
-#: ../plug-ins/common/screenshot.c:1060
+#: ../plug-ins/common/screenshot.c:804 ../plug-ins/common/screenshot.c:1060
 msgid "Screenshot"
 msgstr "スクリーンショット"
 
@@ -6838,7 +6628,8 @@ msgid "After the delay, the screenshot is taken."
 msgstr "設定した待ち時間が経過した後にスクリーンショットが取り込まれます"
 
 #: ../plug-ins/common/screenshot.c:1101
-msgid "After the delay, drag your mouse to select the region for the screenshot."
+msgid ""
+"After the delay, drag your mouse to select the region for the screenshot."
 msgstr "待ち時間経過後に取り込みたい範囲をドラッグしてください"
 
 #: ../plug-ins/common/screenshot.c:1104
@@ -6882,7 +6673,9 @@ msgstr "秒後に取り込み"
 
 #: ../plug-ins/common/semi-flatten.c:68
 msgid "Replace partial transparency with the current background color"
-msgstr "半透明部分をアクティブな背景色と入れ替えます（このフィルタは、アルファチャンネルを持つレイヤーにのみ作用します）"
+msgstr ""
+"半透明部分をアクティブな背景色と入れ替えます（このフィルタは、アルファチャン"
+"ネルを持つレイヤーにのみ作用します）"
 
 #: ../plug-ins/common/semi-flatten.c:75
 msgid "_Semi-Flatten"
@@ -6894,7 +6687,9 @@ msgstr "半統合しています"
 
 #: ../plug-ins/common/sharpen.c:113
 msgid "Make image sharper (less powerful than Unsharp Mask)"
-msgstr "画像をよりシャープにします。(ただし、その効果はアンシャープマスクほど強くはありません。）"
+msgstr ""
+"画像をよりシャープにします。(ただし、その効果はアンシャープマスクほど強くはあ"
+"りません。）"
 
 #: ../plug-ins/common/sharpen.c:120
 msgid "_Sharpen..."
@@ -6993,8 +6788,7 @@ msgstr "典型(_I)"
 msgid "_Distorted"
 msgstr "ゆがめる(_D)"
 
-#: ../plug-ins/common/sinus.c:782
-#: ../plug-ins/common/sinus.c:798
+#: ../plug-ins/common/sinus.c:782 ../plug-ins/common/sinus.c:798
 #: ../plug-ins/imagemap/imap_preferences.c:422
 msgid "Colors"
 msgstr "カラー"
@@ -7087,7 +6881,9 @@ msgstr "検索回数(_S):"
 
 #: ../plug-ins/common/softglow.c:134
 msgid "Simulate glow by making highlights intense and fuzzy"
-msgstr "ハイライト部分を激しくかつあいまいにすることで発光しているような効果を施します"
+msgstr ""
+"ハイライト部分を激しくかつあいまいにすることで発光しているような効果を施しま"
+"す"
 
 #: ../plug-ins/common/softglow.c:139
 msgid "_Softglow..."
@@ -7262,8 +7058,7 @@ msgstr "線形"
 msgid "Phong"
 msgstr "フォング"
 
-#: ../plug-ins/common/sphere-designer.c:296
-#: ../plug-ins/flame/flame.c:774
+#: ../plug-ins/common/sphere-designer.c:296 ../plug-ins/flame/flame.c:774
 msgid "Noise"
 msgstr "ノイズ"
 
@@ -7271,8 +7066,7 @@ msgstr "ノイズ"
 msgid "Wood"
 msgstr "木目"
 
-#: ../plug-ins/common/sphere-designer.c:298
-#: ../plug-ins/flame/flame.c:758
+#: ../plug-ins/common/sphere-designer.c:298 ../plug-ins/flame/flame.c:758
 msgid "Spiral"
 msgstr "螺旋"
 
@@ -7299,11 +7093,11 @@ msgstr "光源"
 msgid "File '%s' is not a valid save file."
 msgstr "ファイル '%s' は正常な保存ファイルではありません。"
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Open File"
 msgstr "ファイルを開く"
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Save File"
 msgstr "ファイルを保存"
 
@@ -7410,13 +7204,14 @@ msgstr "テクスチャーマッピングされた球体の画像を生成しま
 msgid "Sphere _Designer..."
 msgstr "球面デザイナ(_D)..."
 
-#: ../plug-ins/common/sphere-designer.c:3074
+#: ../plug-ins/common/sphere-designer.c:3080
 msgid "Region selected for plug-in is empty"
 msgstr "プラグイン処理用の選択領域が空です"
 
 #: ../plug-ins/common/threshold-alpha.c:85
 msgid "Make transparency all-or-nothing"
-msgstr "アルファチャンネルをしきい値で 2 階調化して透明または不透明のいずれかにします"
+msgstr ""
+"アルファチャンネルをしきい値で 2 階調化して透明または不透明のいずれかにします"
 
 #: ../plug-ins/common/threshold-alpha.c:90
 msgid "_Threshold Alpha..."
@@ -7450,8 +7245,7 @@ msgstr "ガラスタイルを通して見たような効果を表現します"
 msgid "_Glass Tile..."
 msgstr "ガラスタイル(_G)..."
 
-#: ../plug-ins/common/tile-glass.c:210
-#: ../plug-ins/common/tile-glass.c:250
+#: ../plug-ins/common/tile-glass.c:210 ../plug-ins/common/tile-glass.c:250
 msgid "Glass Tile"
 msgstr "ガラスタイル"
 
@@ -7459,8 +7253,7 @@ msgstr "ガラスタイル"
 msgid "Tile _width:"
 msgstr "タイル幅(_W):"
 
-#: ../plug-ins/common/tile-paper.c:243
-#: ../plug-ins/common/tile-paper.c:556
+#: ../plug-ins/common/tile-paper.c:243 ../plug-ins/common/tile-paper.c:556
 msgid "Paper Tile"
 msgstr "紙タイル"
 
@@ -7567,8 +7360,7 @@ msgid "Region selected for filter is empty."
 msgstr "フィルタ処理用の選択領域が空です"
 
 #. Set the tile cache size
-#: ../plug-ins/common/tile-small.c:321
-#: ../plug-ins/common/tile.c:190
+#: ../plug-ins/common/tile-small.c:321 ../plug-ins/common/tile.c:190
 msgid "Tiling"
 msgstr "並べています"
 
@@ -7615,7 +7407,9 @@ msgstr "区切りの数"
 
 #: ../plug-ins/common/tile.c:101
 msgid "Create an array of copies of the image"
-msgstr "元画像(レイヤー)のコピーを並べて新しい画像を作成します。並べるにはレイヤーサイズより大きいサイズの設定が必要です。"
+msgstr ""
+"元画像(レイヤー)のコピーを並べて新しい画像を作成します。並べるにはレイヤーサ"
+"イズより大きいサイズの設定が必要です。"
 
 #: ../plug-ins/common/tile.c:111
 msgid "_Tile..."
@@ -7638,15 +7432,20 @@ msgid "Saved"
 msgstr "保存済"
 
 #: ../plug-ins/common/unit-editor.c:94
-msgid "A unit definition will only be saved before GIMP exits if this column is checked."
-msgstr "この列がチェックされているときのみ単位定義は GIMP が終了する前に保存されます。"
+msgid ""
+"A unit definition will only be saved before GIMP exits if this column is "
+"checked."
+msgstr ""
+"この列がチェックされているときのみ単位定義は GIMP が終了する前に保存されま"
+"す。"
 
 #: ../plug-ins/common/unit-editor.c:96
 msgid "ID"
 msgstr "ID"
 
 #: ../plug-ins/common/unit-editor.c:96
-msgid "This string will be used to identify a unit in GIMP's configuration files."
+msgid ""
+"This string will be used to identify a unit in GIMP's configuration files."
 msgstr "これらの文字列は GIMP の設定ファイルで単位を識別するために使われます。"
 
 #: ../plug-ins/common/unit-editor.c:98
@@ -7662,16 +7461,26 @@ msgid "Digits"
 msgstr "桁数"
 
 #: ../plug-ins/common/unit-editor.c:99
-msgid "This field is a hint for numerical input fields. It specifies how many decimal digits the input field should provide to get approximately the same accuracy as an \"inch\" input field with two decimal digits."
-msgstr "ここでの値は数値入力欄のヒントに用いられます。「インチ」 で用意される入力欄が (10 進数で) 2 桁のとき、他の単位で同じ長さを表すために必要な (10進数での) 桁数を設定します。"
+msgid ""
+"This field is a hint for numerical input fields. It specifies how many "
+"decimal digits the input field should provide to get approximately the same "
+"accuracy as an \"inch\" input field with two decimal digits."
+msgstr ""
+"ここでの値は数値入力欄のヒントに用いられます。「インチ」 で用意される入力欄"
+"が (10 進数で) 2 桁のとき、他の単位で同じ長さを表すために必要な (10進数での) "
+"桁数を設定します。"
 
 #: ../plug-ins/common/unit-editor.c:104
 msgid "Symbol"
 msgstr "記号"
 
 #: ../plug-ins/common/unit-editor.c:104
-msgid "The unit's symbol if it has one (e.g. \"'\" for inches). The unit's abbreviation is used if doesn't have a symbol."
-msgstr "単位を示す記号 (例: インチならば \"'\")を定義します。単位に記号がない場合は単位の省略形を定義してください。"
+msgid ""
+"The unit's symbol if it has one (e.g. \"'\" for inches). The unit's "
+"abbreviation is used if doesn't have a symbol."
+msgstr ""
+"単位を示す記号 (例: インチならば \"'\")を定義します。単位に記号がない場合は単"
+"位の省略形を定義してください。"
 
 #: ../plug-ins/common/unit-editor.c:107
 msgid "Abbreviation"
@@ -7889,8 +7698,7 @@ msgstr "アルファチャンネルを伝搬(_A)"
 msgid "Propagating value channel"
 msgstr "明度チャンネルを伝搬"
 
-#: ../plug-ins/common/van-gogh-lic.c:566
-#: ../plug-ins/common/van-gogh-lic.c:641
+#: ../plug-ins/common/van-gogh-lic.c:566 ../plug-ins/common/van-gogh-lic.c:641
 msgid "Van Gogh (LIC)"
 msgstr "ヴァン ゴッホ風 (LIC)"
 
@@ -8002,8 +7810,7 @@ msgstr "不鮮明なビデオ映像のような効果を施します"
 msgid "Vi_deo..."
 msgstr "ビデオ(_D)..."
 
-#: ../plug-ins/common/video.c:1886
-#: ../plug-ins/common/video.c:2017
+#: ../plug-ins/common/video.c:1886 ../plug-ins/common/video.c:2017
 msgid "Video"
 msgstr "ビデオ"
 
@@ -8065,10 +7872,8 @@ msgstr "回り込み"
 msgid "Smear"
 msgstr "ぼかす"
 
-#: ../plug-ins/common/warp.c:501
-#: ../plug-ins/file-fits/fits.c:1021
-#: ../plug-ins/flame/flame.c:1175
-#: ../plug-ins/gfig/gfig-dialog.c:1460
+#: ../plug-ins/common/warp.c:501 ../plug-ins/file-fits/fits.c:1021
+#: ../plug-ins/flame/flame.c:1175 ../plug-ins/gfig/gfig-dialog.c:1460
 msgid "Black"
 msgstr "黒"
 
@@ -8122,8 +7927,7 @@ msgid "Vector mag:"
 msgstr "ベクトル拡大:"
 
 #. Angle
-#: ../plug-ins/common/warp.c:683
-#: ../plug-ins/ifs-compose/ifs-compose.c:568
+#: ../plug-ins/common/warp.c:683 ../plug-ins/ifs-compose/ifs-compose.c:568
 msgid "Angle:"
 msgstr "角度:"
 
@@ -8158,8 +7962,7 @@ msgstr "池に小石を投げ入れたときの水面のような効果を施し
 msgid "_Waves..."
 msgstr "波(_W)..."
 
-#: ../plug-ins/common/waves.c:248
-#: ../plug-ins/flame/flame.c:763
+#: ../plug-ins/common/waves.c:248 ../plug-ins/flame/flame.c:763
 msgid "Waves"
 msgstr "波"
 
@@ -8195,7 +7998,8 @@ msgstr ""
 #: ../plug-ins/common/web-browser.c:228
 #, c-format
 msgid ""
-"Could not parse the web browser command specified in the Preferences dialog:\n"
+"Could not parse the web browser command specified in the Preferences "
+"dialog:\n"
 "\n"
 "%s"
 msgstr ""
@@ -8309,8 +8113,7 @@ msgstr "両方(_H)"
 msgid "Higher values restrict the effect to fewer areas of the image"
 msgstr "値を大きくすると影響を受ける領域が小さくなります"
 
-#: ../plug-ins/common/wind.c:1027
-#: ../plug-ins/gimpressionist/orientmap.c:694
+#: ../plug-ins/common/wind.c:1027 ../plug-ins/gimpressionist/orientmap.c:694
 msgid "_Strength:"
 msgstr "強さ(_S):"
 
@@ -8318,53 +8121,44 @@ msgstr "強さ(_S):"
 msgid "Higher values increase the magnitude of the effect"
 msgstr "値を大きくすると効果が大きくなります"
 
-#: ../plug-ins/file-bmp/bmp-read.c:86
+#: ../plug-ins/file-bmp/bmp-read.c:88
 msgid "Bad colormap"
 msgstr "不正なカラーマップです"
 
-#: ../plug-ins/file-bmp/bmp-read.c:170
-#: ../plug-ins/file-bmp/bmp-read.c:180
-#: ../plug-ins/file-bmp/bmp-read.c:187
-#: ../plug-ins/file-bmp/bmp-read.c:196
-#: ../plug-ins/file-bmp/bmp-read.c:211
-#: ../plug-ins/file-bmp/bmp-read.c:395
-#: ../plug-ins/file-bmp/bmp-read.c:403
-#: ../plug-ins/file-bmp/bmp-read.c:411
-#: ../plug-ins/file-bmp/bmp-read.c:419
+#: ../plug-ins/file-bmp/bmp-read.c:172 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:422
+#: ../plug-ins/file-bmp/bmp-read.c:430 ../plug-ins/file-bmp/bmp-read.c:438
+#: ../plug-ins/file-bmp/bmp-read.c:446
 #, c-format
 msgid "'%s' is not a valid BMP file"
 msgstr "'%s' は正常な BMP ファイルではありません"
 
-#: ../plug-ins/file-bmp/bmp-read.c:225
-#: ../plug-ins/file-bmp/bmp-read.c:252
-#: ../plug-ins/file-bmp/bmp-read.c:280
-#: ../plug-ins/file-bmp/bmp-read.c:345
-#: ../plug-ins/file-bmp/bmp-read.c:371
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
 #, c-format
 msgid "Error reading BMP file header from '%s'"
 msgstr "'%s' から BMP ファイルヘッダ読み込み中にエラー発生"
 
-#: ../plug-ins/file-bmp/bmp-read.c:531
+#: ../plug-ins/file-bmp/bmp-read.c:558
 msgid "Unrecognized or invalid BMP compression format."
 msgstr "不明または不正な BMP 圧縮形式です"
 
-#: ../plug-ins/file-bmp/bmp-read.c:573
+#: ../plug-ins/file-bmp/bmp-read.c:600
 msgid "Unsupported or invalid bitdepth."
 msgstr "非対応または不正なビット深度です"
 
-#: ../plug-ins/file-bmp/bmp-read.c:761
-#: ../plug-ins/file-bmp/bmp-read.c:802
-#: ../plug-ins/file-bmp/bmp-read.c:852
+#: ../plug-ins/file-bmp/bmp-read.c:788 ../plug-ins/file-bmp/bmp-read.c:829
+#: ../plug-ins/file-bmp/bmp-read.c:879
 msgid "The bitmap ends unexpectedly."
 msgstr "ビットマップ画像が途中で途切れています"
 
-#: ../plug-ins/file-bmp/bmp-write.c:188
-#: ../plug-ins/file-bmp/bmp-write.c:210
+#: ../plug-ins/file-bmp/bmp-write.c:188 ../plug-ins/file-bmp/bmp-write.c:210
 msgid "Cannot save indexed image with transparency in BMP file format."
 msgstr "BMP 形式では、透明度情報の付いたインデックス画像は保存できません"
 
-#: ../plug-ins/file-bmp/bmp-write.c:190
-#: ../plug-ins/file-bmp/bmp-write.c:212
+#: ../plug-ins/file-bmp/bmp-write.c:190 ../plug-ins/file-bmp/bmp-write.c:212
 msgid "Alpha channel will be ignored."
 msgstr "アルファチャンネルは無視されます"
 
@@ -8376,8 +8170,7 @@ msgstr "BMP 形式で保存する"
 msgid "_Run-Length Encoded"
 msgstr "RLE エンコード(_R)"
 
-#: ../plug-ins/file-bmp/bmp-write.c:828
-#: ../plug-ins/file-jpeg/jpeg-save.c:900
+#: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:900
 msgid "_Advanced Options"
 msgstr "詳細設定(_A)"
 
@@ -8393,8 +8186,7 @@ msgstr "24 ビット"
 msgid "32 bits"
 msgstr "32 ビット"
 
-#: ../plug-ins/file-bmp/bmp.c:124
-#: ../plug-ins/file-bmp/bmp.c:143
+#: ../plug-ins/file-bmp/bmp.c:124 ../plug-ins/file-bmp/bmp.c:143
 msgid "Windows BMP image"
 msgstr "Windows BMP 画像"
 
@@ -8402,8 +8194,7 @@ msgstr "Windows BMP 画像"
 msgid "G3 fax image"
 msgstr "G3 fax 画像"
 
-#: ../plug-ins/file-fits/fits.c:168
-#: ../plug-ins/file-fits/fits.c:188
+#: ../plug-ins/file-fits/fits.c:168 ../plug-ins/file-fits/fits.c:188
 msgid "Flexible Image Transport System"
 msgstr "Flexible Image Transport System"
 
@@ -8427,8 +8218,7 @@ msgstr "FITS ファイル読込"
 msgid "Replacement for undefined pixels"
 msgstr "未定義のピクセルを置き換える色"
 
-#: ../plug-ins/file-fits/fits.c:1022
-#: ../plug-ins/gfig/gfig-dialog.c:1286
+#: ../plug-ins/file-fits/fits.c:1022 ../plug-ins/gfig/gfig-dialog.c:1286
 #: ../plug-ins/gfig/gfig-dialog.c:1461
 msgid "White"
 msgstr "白"
@@ -8445,8 +8235,7 @@ msgstr "DATAMIN/DATAMAX で"
 msgid "Image Composing"
 msgstr "画像を構成しています"
 
-#: ../plug-ins/file-fli/fli-gimp.c:166
-#: ../plug-ins/file-fli/fli-gimp.c:186
+#: ../plug-ins/file-fli/fli-gimp.c:166 ../plug-ins/file-fli/fli-gimp.c:186
 msgid "AutoDesk FLIC animation"
 msgstr "AutoDesk FLIC 動画"
 
@@ -8476,8 +8265,13 @@ msgid "Icon Details"
 msgstr "アイコン詳細"
 
 #: ../plug-ins/file-ico/ico-dialog.c:106
-msgid "Large icons and compression are not supported by all programs. Older applications may not open this file correctly."
-msgstr "大きなアイコンと圧縮は、すべてのプログラムでサポートされているわけではありませんので、古いアプリケーションではこのファイルを正確に開けない場合があります。"
+msgid ""
+"Large icons and compression are not supported by all programs. Older "
+"applications may not open this file correctly."
+msgstr ""
+"大きなアイコンと圧縮は、すべてのプログラムでサポートされているわけではありま"
+"せんので、古いアプリケーションではこのファイルを正確に開けない場合がありま"
+"す。"
 
 #: ../plug-ins/file-ico/ico-dialog.c:178
 msgid "1 bpp, 1-bit alpha, 2-slot palette"
@@ -8509,15 +8303,13 @@ msgstr "圧縮(PNG)"
 msgid "Icon #%i"
 msgstr "アイコン #%i"
 
-#: ../plug-ins/file-ico/ico-load.c:725
-#: ../plug-ins/file-jpeg/jpeg-load.c:633
+#: ../plug-ins/file-ico/ico-load.c:725 ../plug-ins/file-jpeg/jpeg-load.c:633
 #: ../plug-ins/file-psd/psd-thumb-load.c:85
 #, c-format
 msgid "Opening thumbnail for '%s'"
 msgstr "'%s' のサムネイルを開いています"
 
-#: ../plug-ins/file-ico/ico.c:103
-#: ../plug-ins/file-ico/ico.c:137
+#: ../plug-ins/file-ico/ico.c:103 ../plug-ins/file-ico/ico.c:137
 msgid "Microsoft Windows icon"
 msgstr "Microsoft Windows アイコン"
 
@@ -8552,8 +8344,7 @@ msgstr "ファイルサイズ: %02.01f kB"
 msgid "Calculating file size..."
 msgstr "ファイルサイズを計算しています..."
 
-#: ../plug-ins/file-jpeg/jpeg-save.c:774
-#: ../plug-ins/file-jpeg/jpeg-save.c:876
+#: ../plug-ins/file-jpeg/jpeg-save.c:774 ../plug-ins/file-jpeg/jpeg-save.c:876
 msgid "File size: unknown"
 msgstr "ファイルサイズ: 不明"
 
@@ -8614,8 +8405,14 @@ msgid "_Use quality settings from original image"
 msgstr "原画の品位設定を使用(_U)"
 
 #: ../plug-ins/file-jpeg/jpeg-save.c:1059
-msgid "If the original image was loaded from a JPEG file using non-standard quality settings (quantization tables), enable this option to get almost the same quality and file size."
-msgstr "オリジナル画像が非標準の品位設定を使用しているJPEGファイルから読み込まれている場合、このオプションを有効にするとオリジナル画像とほぼ同じ品位・ファイルサイズで保存できます"
+msgid ""
+"If the original image was loaded from a JPEG file using non-standard quality "
+"settings (quantization tables), enable this option to get almost the same "
+"quality and file size."
+msgstr ""
+"オリジナル画像が非標準の品位設定を使用しているJPEGファイルから読み込まれてい"
+"る場合、このオプションを有効にするとオリジナル画像とほぼ同じ品位・ファイルサ"
+"イズで保存できます"
 
 #. Subsampling
 #: ../plug-ins/file-jpeg/jpeg-save.c:1083
@@ -8663,8 +8460,7 @@ msgstr "コメント"
 msgid "Sa_ve Defaults"
 msgstr "既定値として保存(_V)"
 
-#: ../plug-ins/file-jpeg/jpeg.c:137
-#: ../plug-ins/file-jpeg/jpeg.c:175
+#: ../plug-ins/file-jpeg/jpeg.c:137 ../plug-ins/file-jpeg/jpeg.c:175
 msgid "JPEG image"
 msgstr "JPEG 画像"
 
@@ -8677,7 +8473,8 @@ msgstr "エクスポートプレビュー"
 #, c-format
 msgid "Error loading PSD file: %s"
 msgstr ""
-"PSD形式ファイルの読み込み時にエラーが発生しました　（詳細または原因は次のとおりです）\n"
+"PSD形式ファイルの読み込み時にエラーが発生しました　（詳細または原因は次のとお"
+"りです）\n"
 "\n"
 "  %s"
 
@@ -8706,10 +8503,8 @@ msgstr "カラーモード %s はサポートされていません"
 msgid "Unsupported bit depth: %d"
 msgstr "サポートされないビット深度です: %d bit"
 
-#: ../plug-ins/file-psd/psd-load.c:375
-#: ../plug-ins/file-psd/psd-load.c:385
-#: ../plug-ins/file-psd/psd-load.c:604
-#: ../plug-ins/file-psd/psd-load.c:785
+#: ../plug-ins/file-psd/psd-load.c:375 ../plug-ins/file-psd/psd-load.c:385
+#: ../plug-ins/file-psd/psd-load.c:604 ../plug-ins/file-psd/psd-load.c:785
 #, c-format
 msgid "The file is corrupt!"
 msgstr "ファイルは壊れています"
@@ -8729,8 +8524,7 @@ msgstr "レイヤー高の値（%d）はサポートされないか無効です"
 msgid "Unsupported or invalid layer width: %d"
 msgstr "レイヤー幅の値（%d）はサポートされないか無効です"
 
-#: ../plug-ins/file-psd/psd-load.c:1153
-#: ../plug-ins/file-psd/psd-load.c:1502
+#: ../plug-ins/file-psd/psd-load.c:1153 ../plug-ins/file-psd/psd-load.c:1502
 #, c-format
 msgid "Unsupported compression mode: %d"
 msgstr "圧縮モード（%d）は、サポートされていません"
@@ -8739,16 +8533,20 @@ msgstr "圧縮モード（%d）は、サポートされていません"
 msgid "Extra"
 msgstr "拡張"
 
-#: ../plug-ins/file-psd/psd-save.c:228
-#: ../plug-ins/file-psd/psd.c:114
+#: ../plug-ins/file-psd/psd-save.c:228 ../plug-ins/file-psd/psd.c:114
 #: ../plug-ins/file-psd/psd.c:153
 msgid "Photoshop image"
 msgstr "Photoshop 画像"
 
 #: ../plug-ins/file-psd/psd-save.c:371
 #, c-format
-msgid "Unable to save layer with mode '%s'.  Either the PSD file format or the save plug-in does not support that, using normal mode instead."
-msgstr "レイヤーモード '%s' は PSD形式がサポートしない（または保存プラグインがサポートしない）ので保存できません。このレイヤーモードを '標準' モードに換えて保存します。"
+msgid ""
+"Unable to save layer with mode '%s'.  Either the PSD file format or the save "
+"plug-in does not support that, using normal mode instead."
+msgstr ""
+"レイヤーモード '%s' は PSD形式がサポートしない（または保存プラグインがサポー"
+"トしない）ので保存できません。このレイヤーモードを '標準' モードに換えて保存"
+"します。"
 
 #: ../plug-ins/file-psd/psd-save.c:631
 msgid "Error: Can't convert GIMP base imagetype to PSD mode"
@@ -8756,20 +8554,27 @@ msgstr "保存中にエラー: GIMP の画像タイプを PSDのモードに変
 
 #: ../plug-ins/file-psd/psd-save.c:1605
 #, c-format
-msgid "Unable to save '%s'.  The PSD file format does not support images that are more than 30,000 pixels wide or tall."
-msgstr "'%s' を保存できません。 psd 形式での保存では、幅や高さが 30000 ピクセルを超える画像をサポートしていません。"
+msgid ""
+"Unable to save '%s'.  The PSD file format does not support images that are "
+"more than 30,000 pixels wide or tall."
+msgstr ""
+"'%s' を保存できません。 psd 形式での保存では、幅や高さが 30000 ピクセルを超え"
+"る画像をサポートしていません。"
 
 #: ../plug-ins/file-psd/psd-save.c:1620
 #, c-format
-msgid "Unable to save '%s'.  The PSD file format does not support images with layers that are more than 30,000 pixels wide or tall."
-msgstr "'%s' を保存できません。 psd 形式での保存では、幅や高さが 30000 ピクセルを超えるレイヤーを持つ画像をサポートしていません。"
+msgid ""
+"Unable to save '%s'.  The PSD file format does not support images with "
+"layers that are more than 30,000 pixels wide or tall."
+msgstr ""
+"'%s' を保存できません。 psd 形式での保存では、幅や高さが 30000 ピクセルを超え"
+"るレイヤーを持つ画像をサポートしていません。"
 
 #: ../plug-ins/file-psd/psd-util.c:51
 msgid "Unexpected end of file"
 msgstr "ファイルが途中で切れています"
 
-#: ../plug-ins/file-sgi/sgi.c:121
-#: ../plug-ins/file-sgi/sgi.c:141
+#: ../plug-ins/file-sgi/sgi.c:121 ../plug-ins/file-sgi/sgi.c:141
 msgid "Silicon Graphics IRIS image"
 msgstr "Silicon Graphics IRIS 画像"
 
@@ -8920,7 +8725,6 @@ msgstr "URI '%s' で wget が異常終了しました"
 msgid "(timeout is %d second)"
 msgid_plural "(timeout is %d seconds)"
 msgstr[0] "(%d 秒でタイムアウト)"
-msgstr[1] "(%d 秒でタイムアウト)"
 
 #. The fourth line is either the network request or an error
 #: ../plug-ins/file-uri/uri-backend-wget.c:219
@@ -8937,13 +8741,11 @@ msgstr "ネットワークエラー発生: %s"
 msgid "Downloading unknown amount of image data"
 msgstr "容量不明の画像データをダウンロードしています"
 
-#: ../plug-ins/file-uri/uri.c:119
-#: ../plug-ins/file-uri/uri.c:140
+#: ../plug-ins/file-uri/uri.c:119 ../plug-ins/file-uri/uri.c:140
 msgid "URI"
 msgstr "URI"
 
-#: ../plug-ins/file-xjt/xjt.c:488
-#: ../plug-ins/file-xjt/xjt.c:506
+#: ../plug-ins/file-xjt/xjt.c:488 ../plug-ins/file-xjt/xjt.c:506
 msgid "GIMP compressed XJT image"
 msgstr "GIMP 圧縮 XJT 画像"
 
@@ -8997,8 +8799,7 @@ msgstr "品質:"
 msgid "Smoothing:"
 msgstr "スムージング:"
 
-#: ../plug-ins/file-xjt/xjt.c:1719
-#: ../plug-ins/file-xjt/xjt.c:3373
+#: ../plug-ins/file-xjt/xjt.c:1719 ../plug-ins/file-xjt/xjt.c:3373
 #, c-format
 msgid "Could not create working folder '%s': %s"
 msgstr "作業ディレクトリ %s が作れません: %s"
@@ -9060,8 +8861,7 @@ msgstr ""
 msgid "Same"
 msgstr "同じ"
 
-#: ../plug-ins/flame/flame.c:747
-#: ../plug-ins/gimpressionist/orientation.c:164
+#: ../plug-ins/flame/flame.c:747 ../plug-ins/gimpressionist/orientation.c:164
 #: ../plug-ins/gimpressionist/size.c:167
 msgid "Random"
 msgstr "ランダム"
@@ -9074,8 +8874,7 @@ msgstr "渦巻"
 msgid "Horseshoe"
 msgstr "蹄鉄"
 
-#: ../plug-ins/flame/flame.c:753
-#: ../plug-ins/gfig/gfig-dialog.c:1442
+#: ../plug-ins/flame/flame.c:753 ../plug-ins/gfig/gfig-dialog.c:1442
 msgid "Polar"
 msgstr "極座標"
 
@@ -9147,8 +8946,7 @@ msgstr "Eyefish"
 msgid "Bubble"
 msgstr "バブル"
 
-#: ../plug-ins/flame/flame.c:773
-#: ../plug-ins/map-object/map-object-ui.c:491
+#: ../plug-ins/flame/flame.c:773 ../plug-ins/map-object/map-object-ui.c:491
 msgid "Cylinder"
 msgstr "円柱"
 
@@ -9213,8 +9011,7 @@ msgid "C_amera"
 msgstr "ビューオプション(_A)"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:547
-#: ../plug-ins/gfig/gfig-dialog.c:274
-#: ../plug-ins/gimpressionist/utils.c:143
+#: ../plug-ins/gfig/gfig-dialog.c:274 ../plug-ins/gimpressionist/utils.c:143
 #: ../plug-ins/gradient-flare/gradient-flare.c:881
 #, c-format
 msgid ""
@@ -9284,7 +9081,8 @@ msgid "Bottom:"
 msgstr "下:"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:773
-msgid "The higher the number of iterations, the more details will be calculated"
+msgid ""
+"The higher the number of iterations, the more details will be calculated"
 msgstr "繰り返し回数を変更します。大きくすると詳細に計算されます。"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:781
@@ -9363,7 +9161,8 @@ msgstr "loglog スムージングを使用"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:937
 msgid "Use log log smoothing to eliminate \"banding\" in the result"
-msgstr "log log スムージングを使用して結果に「すじ」が見えにくくなるようにします"
+msgstr ""
+"log log スムージングを使用して結果に「すじ」が見えにくくなるようにします"
 
 #. Color Density frame
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:941
@@ -9408,7 +9207,9 @@ msgstr "この色要素に対して Cos 関数を使用します"
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1010
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1051
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1092
-msgid "Use linear mapping instead of any trigonometrical function for this color channel"
+msgid ""
+"Use linear mapping instead of any trigonometrical function for this color "
+"channel"
 msgstr "この色チャンネルに対して三角関数ではなく線形マッピングを使用します"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1019
@@ -9420,7 +9221,9 @@ msgstr "反転"
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1027
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1068
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1109
-msgid "If you enable this option higher color values will be swapped with lower ones and vice versa"
+msgid ""
+"If you enable this option higher color values will be swapped with lower "
+"ones and vice versa"
 msgstr "この設定がオンのときは、高い色値と低い色値が逆転されます。"
 
 #. Colormode toggle box
@@ -9433,8 +9236,12 @@ msgid "As specified above"
 msgstr "上の設定に基づいて"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1135
-msgid "Create a color-map with the options you specified above (color density/function). The result is visible in the preview image"
-msgstr "色密度、色関数の設定に基づいたカラーマップを生成します。この結果はプレビューで確認できます。"
+msgid ""
+"Create a color-map with the options you specified above (color density/"
+"function). The result is visible in the preview image"
+msgstr ""
+"色密度、色関数の設定に基づいたカラーマップを生成します。この結果はプレビュー"
+"で確認できます。"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1145
 msgid "Apply active gradient to final image"
@@ -9634,8 +9441,7 @@ msgstr "1 段階戻る(_U)"
 msgid "_Clear"
 msgstr "消去(_C)"
 
-#: ../plug-ins/gfig/gfig-dialog.c:878
-#: ../plug-ins/imagemap/imap_menu.c:209
+#: ../plug-ins/gfig/gfig-dialog.c:878 ../plug-ins/imagemap/imap_menu.c:209
 msgid "_Grid"
 msgstr "グリッド(_G)"
 
@@ -9663,48 +9469,39 @@ msgstr "前のオブジェクトを表示"
 msgid "Show next object"
 msgstr "次のオブジェクトを表示"
 
-#: ../plug-ins/gfig/gfig-dialog.c:910
-#: ../plug-ins/gfig/gfig-stock.c:53
+#: ../plug-ins/gfig/gfig-dialog.c:910 ../plug-ins/gfig/gfig-stock.c:53
 msgid "Show all objects"
 msgstr "すべてのオブジェクトを表示"
 
-#: ../plug-ins/gfig/gfig-dialog.c:916
-#: ../plug-ins/gfig/gfig-stock.c:47
+#: ../plug-ins/gfig/gfig-dialog.c:916 ../plug-ins/gfig/gfig-stock.c:47
 msgid "Create line"
 msgstr "直線の作成"
 
-#: ../plug-ins/gfig/gfig-dialog.c:919
-#: ../plug-ins/gfig/gfig-stock.c:51
+#: ../plug-ins/gfig/gfig-dialog.c:919 ../plug-ins/gfig/gfig-stock.c:51
 msgid "Create rectangle"
 msgstr "矩形の作成"
 
-#: ../plug-ins/gfig/gfig-dialog.c:922
-#: ../plug-ins/gfig/gfig-stock.c:42
+#: ../plug-ins/gfig/gfig-dialog.c:922 ../plug-ins/gfig/gfig-stock.c:42
 msgid "Create circle"
 msgstr "円の作成"
 
-#: ../plug-ins/gfig/gfig-dialog.c:925
-#: ../plug-ins/gfig/gfig-stock.c:46
+#: ../plug-ins/gfig/gfig-dialog.c:925 ../plug-ins/gfig/gfig-stock.c:46
 msgid "Create ellipse"
 msgstr "楕円の作成"
 
-#: ../plug-ins/gfig/gfig-dialog.c:928
-#: ../plug-ins/gfig/gfig-stock.c:44
+#: ../plug-ins/gfig/gfig-dialog.c:928 ../plug-ins/gfig/gfig-stock.c:44
 msgid "Create arc"
 msgstr "アーチの作成"
 
-#: ../plug-ins/gfig/gfig-dialog.c:931
-#: ../plug-ins/gfig/gfig-stock.c:50
+#: ../plug-ins/gfig/gfig-dialog.c:931 ../plug-ins/gfig/gfig-stock.c:50
 msgid "Create reg polygon"
 msgstr "規則的ポリゴンの作成"
 
-#: ../plug-ins/gfig/gfig-dialog.c:934
-#: ../plug-ins/gfig/gfig-stock.c:55
+#: ../plug-ins/gfig/gfig-dialog.c:934 ../plug-ins/gfig/gfig-stock.c:55
 msgid "Create star"
 msgstr "星の作成"
 
-#: ../plug-ins/gfig/gfig-dialog.c:937
-#: ../plug-ins/gfig/gfig-stock.c:54
+#: ../plug-ins/gfig/gfig-dialog.c:937 ../plug-ins/gfig/gfig-stock.c:54
 msgid "Create spiral"
 msgstr "螺旋の作成"
 
@@ -9712,28 +9509,23 @@ msgstr "螺旋の作成"
 msgid "Create bezier curve. Shift + Button ends object creation."
 msgstr "ベジエ曲線の作成。Shift + ボタン でオブジェクト作成の終了"
 
-#: ../plug-ins/gfig/gfig-dialog.c:944
-#: ../plug-ins/gfig/gfig-stock.c:48
+#: ../plug-ins/gfig/gfig-dialog.c:944 ../plug-ins/gfig/gfig-stock.c:48
 msgid "Move an object"
 msgstr "オブジェクトを移動"
 
-#: ../plug-ins/gfig/gfig-dialog.c:947
-#: ../plug-ins/gfig/gfig-stock.c:49
+#: ../plug-ins/gfig/gfig-dialog.c:947 ../plug-ins/gfig/gfig-stock.c:49
 msgid "Move a single point"
 msgstr "一つのポイントを移動"
 
-#: ../plug-ins/gfig/gfig-dialog.c:950
-#: ../plug-ins/gfig/gfig-stock.c:43
+#: ../plug-ins/gfig/gfig-dialog.c:950 ../plug-ins/gfig/gfig-stock.c:43
 msgid "Copy an object"
 msgstr "オブジェクトのコピー"
 
-#: ../plug-ins/gfig/gfig-dialog.c:953
-#: ../plug-ins/gfig/gfig-stock.c:45
+#: ../plug-ins/gfig/gfig-dialog.c:953 ../plug-ins/gfig/gfig-stock.c:45
 msgid "Delete an object"
 msgstr "オブジェクトの削除"
 
-#: ../plug-ins/gfig/gfig-dialog.c:956
-#: ../plug-ins/gfig/gfig-stock.c:52
+#: ../plug-ins/gfig/gfig-dialog.c:956 ../plug-ins/gfig/gfig-stock.c:52
 msgid "Select an object"
 msgstr "オブジェクトの選択"
 
@@ -9763,15 +9555,16 @@ msgstr "透明"
 msgid "Foreground"
 msgstr "前景"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1287
-#: ../plug-ins/imagemap/imap_cmd_copy.c:54
+#: ../plug-ins/gfig/gfig-dialog.c:1287 ../plug-ins/imagemap/imap_cmd_copy.c:54
 #: ../plug-ins/imagemap/imap_cmd_copy_object.c:55
 #: ../plug-ins/imagemap/imap_menu.c:160
 msgid "Copy"
 msgstr "コピー"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1296
-msgid "Layer background type. Copy causes the previous layer to be copied before the draw is performed."
+msgid ""
+"Layer background type. Copy causes the previous layer to be copied before "
+"the draw is performed."
 msgstr "レイヤー背景種。コピーは描かれる前にその前のレイヤーを複製します"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1302
@@ -9798,8 +9591,7 @@ msgstr "極座標グリッドの分割数:"
 msgid "Polar grid radius interval:"
 msgstr "極座標グリッドの半径間隔:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1441
-#: ../plug-ins/imagemap/imap_menu.c:220
+#: ../plug-ins/gfig/gfig-dialog.c:1441 ../plug-ins/imagemap/imap_menu.c:220
 msgid "Rectangle"
 msgstr "矩形"
 
@@ -9899,7 +9691,8 @@ msgid "_Gfig..."
 msgstr "シェイプ (Gfig)(_G)..."
 
 #: ../plug-ins/gfig/gfig.c:731
-msgid "Error trying to save figure as a parasite: can't attach parasite to drawable."
+msgid ""
+"Error trying to save figure as a parasite: can't attach parasite to drawable."
 msgstr "図を付属物として保存中にエラー: 描画対象に付属物を付け加えられません。"
 
 #: ../plug-ins/gfig/gfig.c:758
@@ -10015,8 +9808,7 @@ msgid "Selects if to place strokes all the way out to the edges of the image"
 msgstr "画像の周りに出ていくようにブラシストロークさせるかどうか"
 
 #. Tileable checkbox
-#: ../plug-ins/gimpressionist/general.c:213
-#: ../plug-ins/maze/maze-dialog.c:278
+#: ../plug-ins/gimpressionist/general.c:213 ../plug-ins/maze/maze-dialog.c:278
 msgid "Tileable"
 msgstr "タイル化可能"
 
@@ -10053,7 +9845,8 @@ msgid "Shadow depth:"
 msgstr "影深度:"
 
 #: ../plug-ins/gimpressionist/general.c:262
-msgid "The depth of the drop shadow, i.e. how far apart from the object it should be"
+msgid ""
+"The depth of the drop shadow, i.e. how far apart from the object it should be"
 msgstr "影の深さ、物体からどの程度影を離すか"
 
 #: ../plug-ins/gimpressionist/general.c:267
@@ -10117,7 +9910,9 @@ msgid "The angle span of the first brush to create"
 msgstr "最初に作成するブラシの角度範囲"
 
 #: ../plug-ins/gimpressionist/orientation.c:157
-msgid "Let the value (brightness) of the region determine the direction of the stroke"
+msgid ""
+"Let the value (brightness) of the region determine the direction of the "
+"stroke"
 msgstr "付近の明度でストローク方向を決定します"
 
 #: ../plug-ins/gimpressionist/orientation.c:160
@@ -10126,7 +9921,9 @@ msgid "Radius"
 msgstr "中央からの距離"
 
 #: ../plug-ins/gimpressionist/orientation.c:161
-msgid "The distance from the center of the image determines the direction of the stroke"
+msgid ""
+"The distance from the center of the image determines the direction of the "
+"stroke"
 msgstr "画像中央からの距離でストローク方向を決定します"
 
 #: ../plug-ins/gimpressionist/orientation.c:165
@@ -10187,8 +9984,12 @@ msgid "Vectors"
 msgstr "ベクトル"
 
 #: ../plug-ins/gimpressionist/orientmap.c:567
-msgid "The vector-field. Left-click to move selected vector, Right-click to point it towards mouse, Middle-click to add a new vector."
-msgstr "ベクトル欄。左クリックで選択したベクトルの移動、右クリックでポイントをマウスの方へ、中クリックで新規ベクトルの追加。"
+msgid ""
+"The vector-field. Left-click to move selected vector, Right-click to point "
+"it towards mouse, Middle-click to add a new vector."
+msgstr ""
+"ベクトル欄。左クリックで選択したベクトルの移動、右クリックでポイントをマウス"
+"の方へ、中クリックで新規ベクトルの追加。"
 
 #: ../plug-ins/gimpressionist/orientmap.c:590
 #: ../plug-ins/gimpressionist/sizemap.c:459
@@ -10247,8 +10048,11 @@ msgid "_Voronoi"
 msgstr "ボロノイ(_V)"
 
 #: ../plug-ins/gimpressionist/orientmap.c:662
-msgid "Voronoi-mode makes only the vector closest to the given point have any influence"
-msgstr "ボロノイ-モードでは指定した点について最近接ベクトルのみが影響を施します"
+msgid ""
+"Voronoi-mode makes only the vector closest to the given point have any "
+"influence"
+msgstr ""
+"ボロノイ-モードでは指定した点について最近接ベクトルのみが影響を施します"
 
 #: ../plug-ins/gimpressionist/orientmap.c:672
 msgid "A_ngle:"
@@ -10428,11 +10232,13 @@ msgid "Size:"
 msgstr "サイズの決定基準:"
 
 #: ../plug-ins/gimpressionist/size.c:160
-msgid "Let the value (brightness) of the region determine the size of the stroke"
+msgid ""
+"Let the value (brightness) of the region determine the size of the stroke"
 msgstr "付近の明度でストロークサイズを決定します"
 
 #: ../plug-ins/gimpressionist/size.c:164
-msgid "The distance from the center of the image determines the size of the stroke"
+msgid ""
+"The distance from the center of the image determines the size of the stroke"
 msgstr "画像中央からの距離でストロークサイズを決定します"
 
 #: ../plug-ins/gimpressionist/size.c:168
@@ -10468,8 +10274,12 @@ msgid "Smvectors"
 msgstr "サイズマップベクトル"
 
 #: ../plug-ins/gimpressionist/sizemap.c:439
-msgid "The smvector-field. Left-click to move selected smvector, Right-click to point it towards mouse, Middle-click to add a new smvector."
-msgstr "サイズマップベクトル欄。左クリックで選択した smvector を移動、右クリックでポイントをマウスの方へ、中クリックで新規 smvector を追加。"
+msgid ""
+"The smvector-field. Left-click to move selected smvector, Right-click to "
+"point it towards mouse, Middle-click to add a new smvector."
+msgstr ""
+"サイズマップベクトル欄。左クリックで選択した smvector を移動、右クリックでポ"
+"イントをマウスの方へ、中クリックで新規 smvector を追加。"
 
 #: ../plug-ins/gimpressionist/sizemap.c:481
 msgid "Select previous smvector"
@@ -10504,8 +10314,12 @@ msgid "St_rength exp.:"
 msgstr "強さ指数(_R):"
 
 #: ../plug-ins/gimpressionist/sizemap.c:549
-msgid "Voronoi-mode makes only the smvector closest to the given point have any influence"
-msgstr "ボロノイ-モードでは指定した点から最近接のサイズマップベクトルのみが影響を持ちます"
+msgid ""
+"Voronoi-mode makes only the smvector closest to the given point have any "
+"influence"
+msgstr ""
+"ボロノイ-モードでは指定した点から最近接のサイズマップベクトルのみが影響を持ち"
+"ます"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:552
 msgid "Addition"
@@ -10556,7 +10370,8 @@ msgstr ""
 "グラデーションフレア `%s' は保存されません。\n"
 "%s に:\n"
 "(gflare-path \"%s\")\n"
-"という行を追加して %s というディレクトリを作成すると自分の グラデーションフレアを保存できるようになります。"
+"という行を追加して %s というディレクトリを作成すると自分の グラデーションフレ"
+"アを保存できるようになります。"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:1484
 #, c-format
@@ -10871,12 +10686,18 @@ msgid "The GIMP user manual is not available."
 msgstr "現在、GIMP ユーザーマニュアルは利用できません。"
 
 #: ../plug-ins/help/gimphelpdomain.c:188
-msgid "Please install the additional help package or use the online user manual at http://docs.gimp.org/."
-msgstr "GIMP 2 ユーザーマニュアル・パッケージをインストールするか、オンライン・ユーザーマニュアル ( http://docs.gimp.org/) を利用してください。　(ただし、どちらの場合も日本語に翻訳された GIMP 2 ユーザーマニュアルは用意されていません。）"
+msgid ""
+"Please install the additional help package or use the online user manual at "
+"http://docs.gimp.org/."
+msgstr ""
+"GIMP 2 ユーザーマニュアル・パッケージをインストールするか、オンライン・ユー"
+"ザーマニュアル ( http://docs.gimp.org/) を利用してください。"
 
 #: ../plug-ins/help/gimphelpdomain.c:197
 msgid "Perhaps you are missing GIO backends and need to install GVFS?"
-msgstr "おそらく GIO バックエンドが見つからないためと思われます。GVFS のインストールを確認してください。"
+msgstr ""
+"おそらく GIO バックエンドが見つからないためと思われます。GVFS のインストール"
+"を確認してください。"
 
 #: ../plug-ins/help/gimphelpdomain.c:216
 #, c-format
@@ -11097,8 +10918,7 @@ msgstr "中心 _X:"
 
 #: ../plug-ins/imagemap/imap_circle.c:269
 #: ../plug-ins/imagemap/imap_circle.c:276
-#: ../plug-ins/imagemap/imap_circle.c:282
-#: ../plug-ins/imagemap/imap_grid.c:250
+#: ../plug-ins/imagemap/imap_circle.c:282 ../plug-ins/imagemap/imap_grid.c:250
 #: ../plug-ins/imagemap/imap_grid.c:256
 #: ../plug-ins/imagemap/imap_polygon.c:505
 #: ../plug-ins/imagemap/imap_polygon.c:513
@@ -11192,8 +11012,15 @@ msgid "Resulting Guide Bounds: %d,%d to %d,%d (%d areas)"
 msgstr "ガイド範囲の結果: %d,%d から %d,%d (%d マス)"
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:144
-msgid "Guides are pre-defined rectangles covering the image. You define them by their width, height, and spacing from each other. This allows you to rapidly create the most common image map type - image collection of \"thumbnails\", suitable for navigation bars."
-msgstr "ガイドは画像を覆う前もって定められる長方形です。個々の幅、高さ、間隔によって定義します。これはナビゲーション・バーに適した、「サムネイル」の共通イメージマップ型-コレクション画像をあなたが素早く作成することを可能にします。"
+msgid ""
+"Guides are pre-defined rectangles covering the image. You define them by "
+"their width, height, and spacing from each other. This allows you to rapidly "
+"create the most common image map type - image collection of \"thumbnails\", "
+"suitable for navigation bars."
+msgstr ""
+"ガイドは画像を覆う前もって定められる長方形です。個々の幅、高さ、間隔によって"
+"定義します。これはナビゲーション・バーに適した、「サムネイル」の共通イメージ"
+"マップ型-コレクション画像をあなたが素早く作成することを可能にします。"
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:170
 msgid "_Left start at:"
@@ -11374,8 +11201,7 @@ msgstr "領域設定"
 msgid "Area #%d Settings"
 msgstr "領域 #%d 設定"
 
-#: ../plug-ins/imagemap/imap_file.c:48
-#: ../plug-ins/imagemap/imap_menu.c:71
+#: ../plug-ins/imagemap/imap_file.c:48 ../plug-ins/imagemap/imap_menu.c:71
 msgid "Error opening file"
 msgstr "ファイルオープンエラー"
 
@@ -12172,7 +11998,9 @@ msgstr "背景を透明に"
 
 #: ../plug-ins/map-object/map-object-ui.c:514
 msgid "Make image transparent outside object"
-msgstr "設定がオンのときは、オブジェクト部分以外を透明にします。オフのときは、オブジェクト以外の部分は現在の背景色で塗りつぶされます。"
+msgstr ""
+"設定がオンのときは、オブジェクト部分以外を透明にします。オフのときは、オブ"
+"ジェクト以外の部分は現在の背景色で塗りつぶされます。"
 
 #: ../plug-ins/map-object/map-object-ui.c:516
 msgid "Tile source image"
@@ -12180,7 +12008,9 @@ msgstr "元画像を並べる"
 
 #: ../plug-ins/map-object/map-object-ui.c:527
 msgid "Tile source image: useful for infinite planes"
-msgstr "設定がオンのときは、元画像を並べてマッピングします。無限平面の作成が可能になります。"
+msgstr ""
+"設定がオンのときは、元画像を並べてマッピングします。無限平面の作成が可能にな"
+"ります。"
 
 #: ../plug-ins/map-object/map-object-ui.c:530
 msgid "Create new image"
@@ -12196,7 +12026,9 @@ msgstr "設定がオンのときは、オブジェクト境界のジャギーを
 
 #: ../plug-ins/map-object/map-object-ui.c:576
 msgid "Antialiasing quality. Higher is better, but slower"
-msgstr "「滑らかに」の深度を設定します。この値が高いほどきれいな境界になりますが、適用までに時間が掛かります。"
+msgstr ""
+"「滑らかに」の深度を設定します。この値が高いほどきれいな境界になりますが、適"
+"用までに時間が掛かります。"
 
 #: ../plug-ins/map-object/map-object-ui.c:593
 msgid "Stop when pixel differences are smaller than this value"
@@ -12372,8 +12204,7 @@ msgstr "迷路サイズ"
 msgid "Width (pixels):"
 msgstr "幅 (ピクセル):"
 
-#: ../plug-ins/maze/maze-dialog.c:220
-#: ../plug-ins/maze/maze-dialog.c:236
+#: ../plug-ins/maze/maze-dialog.c:220 ../plug-ins/maze/maze-dialog.c:236
 msgid "Pieces:"
 msgstr "部品数:"
 
@@ -12668,480 +12499,703 @@ msgstr "何も取り込まれませんでした"
 
 #~ msgid "Image type can't be saved as PNG"
 #~ msgstr "PNG 形式で保存できない画像形式です"
+
 #~ msgid "Could not open output file for writing"
 #~ msgstr "書き込み用ファイルが開けません"
+
 #~ msgid "Unable to add additional point.\n"
 #~ msgstr "これ以上点を追加できません。\n"
+
 #~ msgid "There is a problem with the GIMP user manual."
 #~ msgstr "GIMP ユーザーマニュアルに以下の問題が発生しました。"
+
 #~ msgid "Please check your installation."
 #~ msgstr "インストール内容を確認してください。"
+
 #~ msgid "Drag and drop this icon to a web browser"
 #~ msgstr "このアイコンを web ブラウザへドラッグ && ドロップ"
+
 #~ msgid "Document not found"
 #~ msgstr "ドキュメントが見つかりません"
+
 #~ msgid "The requested URL could not be loaded:"
 #~ msgstr "要求された URL は読み込めません:"
+
 #~ msgid "Or_igin at bottom left"
 #~ msgstr "左下の原点(_I)"
+
 #~ msgid "checkbutton|Snap to grid"
 #~ msgstr "グリッドにスナップ"
+
 #~ msgid "_Smoothing:"
 #~ msgstr "スムージング(_S):"
+
 #~ msgid "The GIMP help files are not found."
 #~ msgstr "GIMP ヘルプファイルが見つかりません。"
+
 #~ msgid "The GIF format does not support images larger than %d x %d pixels."
 #~ msgstr "GIF 形式は %d × %d ピクセルより大きい画像をサポートしません。"
+
 #~ msgid "Enter Password"
 #~ msgstr "パスワードを入力"
+
 #~ msgid "_Log In"
 #~ msgstr "ログイン(_L)："
+
 #~ msgid "Downloading %s of image data..."
 #~ msgstr "%s の画像データをダウンロードしています..."
+
 #~ msgid "Printable area:"
 #~ msgstr "印刷可能範囲："
+
 #~ msgid "_Mail Image..."
 #~ msgstr "画像送信(_M)..."
+
 #~ msgid "Encapsulation:"
 #~ msgstr "梱包方法:"
+
 #~ msgid "_MIME"
 #~ msgstr "MIME(_M)"
+
 #~ msgid "_Uuencode"
 #~ msgstr "Uuencode(_U)"
+
 #~ msgid "_Recipient:"
 #~ msgstr "宛先(_R):"
+
 #~ msgid "_Sender:"
 #~ msgstr "送り主(_S):"
+
 #~ msgid "Comm_ent:"
 #~ msgstr "コメント(_E):"
+
 #~ msgid "_Adjust Page Size and Orientation"
 #~ msgstr "ページサイズと向きを調整(_A)"
+
 #~ msgid "Email the image"
 #~ msgstr "メールで画像送信"
+
 #~ msgid "First Source Color"
 #~ msgstr "1つ目の元色"
+
 #~ msgid "Second Source Color"
 #~ msgstr "2つ目の元色"
+
 #~ msgid "First Destination Color"
 #~ msgstr "1つ目の宛色"
+
 #~ msgid "Second Destination Color"
 #~ msgstr "2つ目の宛色"
+
 #~ msgid "Map colors sending foreground to black, background to white"
 #~ msgstr ""
 #~ "画像中の黒を描画色、白を背景色の基準でマッピングします。また、描画色と同じ"
 #~ "色のピクセルは黒に、背景色と同じ色のピクセルは白にマップされます。\n"
 #~ "(GIMP2.2 の「前景-背景調整」)"
+
 #~ msgid "Adjust _Foreground & Background"
 #~ msgstr "描画色と背景色でマップ"
+
 #~ msgid "Map color range specified by two colors to another range"
 #~ msgstr "特定の2色間の色範囲を別の色範囲にマッピングします"
+
 #~ msgid "Color Range _Mapping..."
 #~ msgstr "色範囲をマップ(_M)..."
+
 #~ msgid "Cannot operate on gray or indexed color images."
 #~ msgstr "グレースケールやインデックス画像には適用できません。"
+
 #~ msgid "Adjusting foreground and background colors"
 #~ msgstr ""
 #~ "現在の描画色と背景色でマッピングします\n"
 #~ "(GIMP2.2 の「前景/背景調整」)"
+
 #~ msgid "Mapping colors"
 #~ msgstr "カラーマッピングしています"
+
 #~ msgid "Map Color Range"
 #~ msgstr "色範囲をマップ"
+
 #~ msgid "Source Color Range"
 #~ msgstr "元の色範囲"
+
 #~ msgid "Destination Color Range"
 #~ msgstr "適用後の色範囲"
+
 #~ msgid "Invalid UTF-8 string in PSD file"
 #~ msgstr "PSD ファイルに不正な UTF-8 文字列があります"
+
 #~ msgid "Cannot handle bitmap PSD files"
 #~ msgstr "ビットマップの PSD形式は取り扱えません"
+
 #~ msgid "Cannot handle PSD files in CMYK color"
 #~ msgstr "CMYK カラーの PSD形式ファイルは取り扱えません"
+
 #~ msgid "Cannot handle PSD files in Multichannel color"
 #~ msgstr "マルチチャンネルの PSD形式ファイルは取り扱えません"
+
 #~ msgid "Cannot handle PSD files in Duotone color"
 #~ msgstr "ダブルトーンの PSD形式ファイルは取り扱えません"
+
 #~ msgid "Cannot handle PSD files in Lab color"
 #~ msgstr "Lab カラーの PSD形式ファイルは取り扱えません"
+
 #~ msgid "Cannot handle the color mode %d of the PSD file"
 #~ msgstr "カラーモード %d の PSD形式ファイルは取り扱えません"
+
 #~ msgid "Cannot handle PSD file with more than %d channels"
 #~ msgstr "%d枚以上のチャンネルがある PSD形式ファイルは取り扱えません"
+
 #~ msgid "Cannot handle PSD files in CMYK color with more than 5 channels"
 #~ msgstr "5版以上ある CMYKカラーの PSD形式は取り扱えません"
+
 #~ msgid "Cannot handle image mode %d (%s)"
 #~ msgstr "イメージモード %d (%s) は取り扱えません"
+
 #~ msgid "Cannot handle %d bits per channel PSD files"
 #~ msgstr "%d ビットチャンネルの PSD形式ファイルは取り扱えません "
+
 #~ msgid "This is not an Adobe Photoshop PSD file"
 #~ msgstr "このファイルは Adobe Photoshop の PSD形式ではありません"
+
 #~ msgid "The PSD file has bad version number '%d', not 1"
 #~ msgstr "PSD 形式の 'バージョン %d' は誤ったバージョンナンバーです"
+
 #~ msgid "About"
 #~ msgstr "このプラグインについて"
+
 #~ msgid "Realtime Preview"
 #~ msgstr "リアルタイムプレビュー"
+
 #~ msgid "If you enable this option the preview will be redrawn automatically"
 #~ msgstr "このオプションを有効にするとプレビューは自動的に再描画されます"
+
 #~ msgid "Redraw"
 #~ msgstr "再描画"
+
 #~ msgid "Redraw preview"
 #~ msgstr "再描画プレビュー"
+
 #~ msgid "Undo last zoom"
 #~ msgstr "最後の拡大を取り消し"
+
 #~ msgid "Redo last zoom"
 #~ msgstr "最後の拡大をやり直し"
+
 #~ msgid "XMIN:"
 #~ msgstr "X最小:"
+
 #~ msgid "Change the first (minimal) x-coordinate delimitation"
 #~ msgstr "第一 X 座標境界 (最小値) を変える"
+
 #~ msgid "XMAX:"
 #~ msgstr "X最大:"
+
 #~ msgid "Change the second (maximal) x-coordinate delimitation"
 #~ msgstr "第二 X 座標境界 (最大値) を変える"
+
 #~ msgid "YMIN:"
 #~ msgstr "Y最小:"
+
 #~ msgid "Change the first (minimal) y-coordinate delimitation"
 #~ msgstr "第一 Y 座標境界 (最小値) を変える"
+
 #~ msgid "YMAX:"
 #~ msgstr "Y最大:"
+
 #~ msgid "Change the second (maximal) y-coordinate delimitation"
 #~ msgstr "第二 Y 座標境界 (最大値) を変える"
+
 #~ msgid "ITER:"
 #~ msgstr "繰り返し:"
+
 #~ msgid ""
 #~ "Change the iteration value. The higher it is, the more details will be "
 #~ "calculated, which will take more time"
 #~ msgstr ""
 #~ "繰り返し回数を変える。大きくすると詳細に計算するが、当然余計に時間がかか"
 #~ "る。"
+
 #~ msgid ""
 #~ "Change the CX value (changes aspect of fractal, active with every fractal "
 #~ "but Mandelbrot and Sierpinski)"
 #~ msgstr ""
 #~ "CX 値を変える (マンデルブローとシエルピンスキを除く、すべてのフラクタルの"
 #~ "アスペクト比が変わる)。"
+
 #~ msgid ""
 #~ "Change the CY value (changes aspect of fractal, active with every fractal "
 #~ "but Mandelbrot and Sierpinski)"
 #~ msgstr ""
 #~ "CY 値を変える (マンデルブローとシエルピンスキを除く、すべてのフラクタルの"
 #~ "アスペクト比が変わる)。"
+
 #~ msgid "Rendering Fractal..."
 #~ msgstr "フラクタルを描いています..."
+
 #~ msgid "Edit fractal name"
 #~ msgstr "フラクタル名を編集"
+
 #~ msgid "Fractal name:"
 #~ msgstr "フラクタル名:"
+
 #~ msgid "New Fractal"
 #~ msgstr "新規フラクタル"
+
 #~ msgid "Choose Fractal by double-clicking on it"
 #~ msgstr "フラクタルをダブルクリックして選んで下さい"
+
 #~ msgid "Lighting Effects..."
 #~ msgstr "ライト効果..."
+
 #~ msgid "High _Quality preview"
 #~ msgstr "高品位プレビュー(_Q)"
+
 #~ msgid "Material properties"
 #~ msgstr "材質設定"
+
 #~ msgid "Map to Plane..."
 #~ msgstr "面にマップしています..."
+
 #~ msgid "Map to Sphere..."
 #~ msgstr "球にマップしています..."
+
 #~ msgid "Map to Box..."
 #~ msgstr "直方体にマップしています..."
+
 #~ msgid "Map to Cylinder..."
 #~ msgstr "円柱にマップしています..."
+
 #~ msgid "General options"
 #~ msgstr "一般オプション"
+
 #~ msgid "Zoom out (make image smaller)"
 #~ msgstr "縮小 (画像を小さくする)"
+
 #~ msgid "Zoom in (make image bigger)"
 #~ msgstr "拡大 (画像を大きくする)"
+
 #~ msgid "Show/hide preview wireframe"
 #~ msgstr "プレビューワイヤーフレームの表示/非表示"
+
 #~ msgid "Opening '%s'..."
 #~ msgstr "'%s' を開いています..."
+
 #~ msgid "Saving '%s'..."
 #~ msgstr "'%s' を保存しています..."
+
 #~ msgid "_RLE encoded"
 #~ msgstr "_RLE エンコード"
+
 #~ msgid "Alien Map _2..."
 #~ msgstr "エイリアンマップ _2..."
+
 #~ msgid "AlienMap2: Transforming..."
 #~ msgstr "エイリアンマップ 2: 変換しています..."
+
 #~ msgid "AlienMap2"
 #~ msgstr "エイリアンマップ 2"
+
 #~ msgid "CML_explorer: evoluting..."
 #~ msgstr "CML_explorer: 展開しています..."
+
 #~ msgid "New seed"
 #~ msgstr "新しい種"
+
 #~ msgid "Random seed"
 #~ msgstr "乱数種"
+
 #~ msgid "Switch to \"From seed\" with the last seed"
 #~ msgstr "最後の種を用いて \"種を元に\" モードに移る"
+
 #~ msgid "Copy parameters"
 #~ msgstr "コピーパラメータ"
+
 #~ msgid "Plot a graph of the settings"
 #~ msgstr "設定のグラフを描く"
+
 #~ msgid "Graph of the current settings"
 #~ msgstr "現在の設定のグラフ"
+
 #~ msgid "Save Parameters to"
 #~ msgstr "パラメータを保存"
+
 #~ msgid "CML Explorer: Overwrite File?"
 #~ msgstr "CML エクスプローラ: ファイルを上書きしますか?"
+
 #~ msgid ""
 #~ "File '%s' exists.\n"
 #~ "Overwrite it?"
 #~ msgstr ""
 #~ "ファイル '%s' は存在します。\n"
 #~ "上書きしますか?"
+
 #~ msgid "Load Parameters from"
 #~ msgstr "パラメータ読み込み"
+
 #~ msgid "Selective Load from"
 #~ msgstr "選択的読み込み"
+
 #~ msgid "Warning: '%s' is a parameter file for newer CML_explorer than me."
 #~ msgstr "警告: '%s' は新しい CML explorer のパラメータファイルです。"
+
 #~ msgid "Align _Visible Layers..."
 #~ msgstr "可視レイヤーの整列(_V)..."
+
 #~ msgid "Playback:"
 #~ msgstr "再生: "
+
 #~ msgid "Play/Stop"
 #~ msgstr "再生/停止"
+
 #~ msgid "Rewind"
 #~ msgstr "巻戻し"
+
 #~ msgid "_UnOptimize"
 #~ msgstr "非最適化(_U)"
+
 #~ msgid "UnOptimizing Animation..."
 #~ msgstr "動画を非最適化しています..."
+
 #~ msgid "Removing Animation Background..."
 #~ msgstr "動画の背景を削除しています..."
+
 #~ msgid "Finding Animation Background..."
 #~ msgstr "動画を背景を見つけようとしています..."
+
 #~ msgid "Optimizing Animation..."
 #~ msgstr "動画を最適化しています..."
+
 #~ msgid "Applying lens..."
 #~ msgstr "レンズ効果適用中..."
+
 #~ msgid "_Autocrop Image"
 #~ msgstr "画像の自動切り抜き(_A)"
+
 #~ msgid "_Autocrop Layer"
 #~ msgstr "レイヤーの自動切り抜き(_A)"
+
 #~ msgid "Cropping..."
 #~ msgstr "切り抜いています..."
+
 #~ msgid "Auto-Stretching HSV..."
 #~ msgstr "HSV 自動伸長中..."
+
 #~ msgid "Adding Blinds..."
 #~ msgstr "ブラインドを追加しています..."
+
 #~ msgid "Blurring..."
 #~ msgstr "ぼかしています..."
+
 #~ msgid "Border Average..."
 #~ msgstr "縁の平均をとっています..."
+
 #~ msgid "Bump-mapping..."
 #~ msgstr "バンプマップしています..."
+
 #~ msgid "Auto-Stretching Contrast..."
 #~ msgstr "コントラスト自動伸長中..."
+
 #~ msgid "Colorcube Analysis..."
 #~ msgstr "色立体を分析しています..."
+
 #~ msgid "Image dimensions: %d x %d"
 #~ msgstr "画像寸法: %d x %d"
+
 #~ msgid "Uncompressed size: %s"
 #~ msgstr "非圧縮時のサイズ: %s"
+
 #~ msgid "Filename: %s"
 #~ msgstr "ファイル名: %s"
+
 #~ msgid "Compressed size: %s"
 #~ msgstr "圧縮時のサイズ: %s"
+
 #~ msgid "Compression ratio (approx.): %d to 1"
 #~ msgstr "圧縮率 (概算): %d 対 1"
+
 #~ msgid "Channel Mixer File Operation Warning"
 #~ msgstr "チャンネルミキサーファイル操作警告"
+
 #~ msgid "Adding Checkerboard..."
 #~ msgstr "市松模様を付加中..."
+
 #~ msgid "Color Enhance..."
 #~ msgstr "色を強調しています..."
+
 #~ msgid "_Colorify..."
 #~ msgstr "単色塗り(_C)..."
+
 #~ msgid "Colorifying..."
 #~ msgstr "単色塗り中..."
+
 #~ msgid "Custom Color:"
 #~ msgstr "カスタムカラー:"
+
 #~ msgid "Removing color..."
 #~ msgstr "カラーマップを削除しています..."
+
 #~ msgid "Alpha:"
 #~ msgstr "アルファ:"
+
 #~ msgid "Value:"
 #~ msgstr "明度:"
+
 #~ msgid "Black:"
 #~ msgstr "ブラック:"
+
 #~ msgid "Luma_y470:"
 #~ msgstr "Luma_y470:"
+
 #~ msgid "Blueness_cb470:"
 #~ msgstr "Blueness_cb470:"
+
 #~ msgid "Redness_cr470:"
 #~ msgstr "Redness_cr470:"
+
 #~ msgid "Luma_y709:"
 #~ msgstr "Luma_y709:"
+
 #~ msgid "Blueness_cb709:"
 #~ msgstr "Blueness_cb709:"
+
 #~ msgid "Redness_cr709:"
 #~ msgstr "Redness_cr709:"
+
 #~ msgid "Luma_y470f:"
 #~ msgstr "Luma_y470f:"
+
 #~ msgid "Blueness_cb470f:"
 #~ msgstr "Blueness_cb470f:"
+
 #~ msgid "Redness_cr470f:"
 #~ msgstr "Redness_cr470f:"
+
 #~ msgid "Luma_y709f:"
 #~ msgstr "Luma_y709f:"
+
 #~ msgid "Blueness_cb709f:"
 #~ msgstr "Blueness_cb709f:"
+
 #~ msgid "Redness_cr709f:"
 #~ msgstr "Redness_cr709f:"
+
 #~ msgid "Composing..."
 #~ msgstr "チャンネル合成中..."
+
 #~ msgid "No sensible extension, saving as compressed XCF."
 #~ msgstr "拡張子が判別できないので gzip 圧縮した xcf ファイルとして保存します"
+
 #~ msgid "No sensible extension, attempting to load with file magic."
 #~ msgstr "拡張子が判別できないので、ファイルの magic を用いて読み込みます"
+
 #~ msgid "Convolution Matrix does not work on layers smaller than 3 pixels."
 #~ msgstr ""
 #~ "コンボリューション行列は3ピクセルより小さなレイヤーについては適用できませ"
 #~ "ん。"
+
 #~ msgid "A_utomatic"
 #~ msgstr "自動(_U)"
+
 #~ msgid "Cubistic Transformation..."
 #~ msgstr "キュービズム変換しています..."
+
 #~ msgid "_Preview once"
 #~ msgstr "一回プレビュー(_P)"
+
 #~ msgid "Load Curve Points from file"
 #~ msgstr "カーブ点をファイルから読み込み"
+
 #~ msgid "Save Curve Points to file"
 #~ msgstr "カーブ点をファイルに保存"
+
 #~ msgid "Curve Bend..."
 #~ msgstr "ひん曲げています..."
+
 #~ msgid "cyan_k"
 #~ msgstr "シアン_k"
+
 #~ msgid "magenta_k"
 #~ msgstr "マゼンダ_k"
+
 #~ msgid "yellow_k"
 #~ msgstr "イエロー_k"
+
 #~ msgid "luma_y470"
 #~ msgstr "luma_y470"
+
 #~ msgid "blueness_cb470"
 #~ msgstr "blueness_cb470"
+
 #~ msgid "redness_cr470"
 #~ msgstr "redness_cr470"
+
 #~ msgid "luma_y709"
 #~ msgstr "luma_y709"
+
 #~ msgid "blueness_cb709"
 #~ msgstr "blueness_cb709"
+
 #~ msgid "redness_cr709"
 #~ msgstr "redness_cr709"
+
 #~ msgid "luma_y470f"
 #~ msgstr "luma_y470f"
+
 #~ msgid "blueness_cb470f"
 #~ msgstr "blueness_cb470f"
+
 #~ msgid "redness_cr470f"
 #~ msgstr "redness_cr470f"
+
 #~ msgid "luma_y709f"
 #~ msgstr "luma_y709f"
+
 #~ msgid "blueness_cb709f"
 #~ msgstr "blueness_cb709f"
+
 #~ msgid "redness_cr709f"
 #~ msgstr "redness_cr709f"
+
 #~ msgid "Decomposing..."
 #~ msgstr "チャンネル分解中..."
+
 #~ msgid "Decompose to _layers"
 #~ msgstr "レイヤーに分解する(_L)"
+
 #~ msgid "Deinterlace..."
 #~ msgstr "インターレースを除去しています..."
+
 #~ msgid "Depth-merging..."
 #~ msgstr "深度統合中..."
+
 #~ msgid "Destriping..."
 #~ msgstr "ストライプを除去しています..."
+
 #~ msgid "Creating diffraction pattern..."
 #~ msgstr "回折模様を生成しています..."
+
 #~ msgid "Sharp edges"
 #~ msgstr "明瞭端"
+
 #~ msgid "Other options"
 #~ msgstr "その他のオプション"
+
 #~ msgid "Displacing..."
 #~ msgstr "ずらしています..."
+
 #~ msgid "On Edges:"
 #~ msgstr "周辺部:"
+
 #~ msgid "Difference of Gaussians..."
 #~ msgstr "ガウシアン差分..."
+
 #~ msgid "Smoothing parameters"
 #~ msgstr "スムーズ化パラメータ"
+
 #~ msgid "Edge Detection..."
 #~ msgstr "輪郭を抽出しています..."
+
 #~ msgid "Prewitt"
 #~ msgstr "プレヴィット"
+
 #~ msgid "Engraving..."
 #~ msgstr "彫金しています..."
+
 #~ msgid "Color Exchange..."
 #~ msgstr "色を交換しています..."
+
 #~ msgid "Middle-click inside preview to pick \"From Color\""
 #~ msgstr "プレビューを中クリックして \"元色\" 選択"
+
 #~ msgid "_Film..."
 #~ msgstr "フィルム(_F)..."
+
 #~ msgid "Composing Images..."
 #~ msgstr "画像合成中..."
+
 #~ msgid "Temporary"
 #~ msgstr "テンポラリ"
+
 #~ msgid "Available Images:"
 #~ msgstr "利用可能な画像:"
+
 #~ msgid "On Film:"
 #~ msgstr "フィルム上には:"
+
 #~ msgid "Film"
 #~ msgstr "フィルム"
+
 #~ msgid "All Values are Fractions of the Film Height"
 #~ msgstr "すべてフィルム高に対する値です"
+
 #~ msgid "_FlareFX..."
 #~ msgstr "フレア効果(_F)..."
+
 #~ msgid "Render Flare..."
 #~ msgstr "フレアを描画しています..."
+
 #~ msgid "FlareFX"
 #~ msgstr "フレア効果"
+
 #~ msgid "_Show cursor"
 #~ msgstr "カーソル表示(_S)"
+
 #~ msgid "Applying Filter Pack..."
 #~ msgstr "色調バリエーションを適用しています..."
+
 #~ msgid "Select Pixels by"
 #~ msgstr "ピクセル選択法"
+
 #~ msgid "_Entire Image"
 #~ msgstr "画像全体(_E)"
+
 #~ msgid "Se_lection Only"
 #~ msgstr "選択領域(_L)"
+
 #~ msgid "Selec_tion In Context"
 #~ msgstr "コンテキスト中の選択部分(_T)"
+
 #~ msgid "Smoothness of Aliasing"
 #~ msgstr "エイリアシングの滑らかさ"
+
 #~ msgid "Preview as You Drag"
 #~ msgstr "ドラッグに合わせてプレビュー"
+
 #~ msgid "_Warp"
 #~ msgstr "ワープ(_W)"
+
 #~ msgid "Gaussian Blur..."
 #~ msgstr "ガウシアンぼかし..."
+
 #~ msgid "Gee-_Slime"
 #~ msgstr "Gee-スライム(_S)"
+
 #~ msgid "GEE-SLIME"
 #~ msgstr "GEE-スライム"
+
 #~ msgid "Thank you for choosing GIMP"
 #~ msgstr "GIMP を選んでくれてありがとう"
+
 #~ msgid ""
 #~ "A less-obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox."
 #~ "org / 1998-2000"
 #~ msgstr ""
 #~ "ちょっと古い Adam D. Moss の作品 / adam@gimp.org / adam@foxbox.org / 1998-"
 #~ "2000"
+
 #~ msgid "Gee-_Zoom"
 #~ msgstr "Gee-ズーム(_Z)"
+
 #~ msgid "GEE-ZOOM"
 #~ msgstr "GEE-ズーム"
+
 #~ msgid ""
 #~ "An obsolete creation of Adam D. Moss / adam@gimp.org / adam@foxbox.org / "
 #~ "1998-2000"
 #~ msgstr ""
 #~ "Adam D. Moss の昔の作品 / adam@gimp.org / adam@foxbox.org / 1998-2000"
+
 #~ msgid ""
 #~ "Warning:\n"
 #~ "Transparent color in written file might be incorrect on viewers which "
@@ -13150,10 +13204,13 @@ msgstr "何も取り込まれませんでした"
 #~ "警告:\n"
 #~ "書き込んだファイルの透明色は、透明度に対応していないビューアでは正しく表示"
 #~ "されない可能性があります。"
+
 #~ msgid "Delay inserted to prevent evil CPU-sucking anim."
 #~ msgstr "凶悪な動画が CPU を食い尽くすのを防ぐため、遅延を挿入しました。"
+
 #~ msgid "GIF Warning"
 #~ msgstr "GIF 警告"
+
 #~ msgid ""
 #~ "The image which you are trying to save as a GIF\n"
 #~ "contains layers which extend beyond the actual\n"
@@ -13169,402 +13226,599 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "すべてのレイヤーを画像サイズ以下に切り詰めるか、キャンセル\n"
 #~ "してください。"
+
 #~ msgid "_Interlace"
 #~ msgstr "インターレース(_I)"
+
 #~ msgid "Frame disposal where unspecified: "
 #~ msgstr "指定しない場合のフレーム処理: "
+
 #~ msgid "Glass Tile..."
 #~ msgstr "ガラスタイルにしています..."
+
 #~ msgid "Qbist ..."
 #~ msgstr "Qビスト..."
+
 #~ msgid "Load QBE file"
 #~ msgstr "QBE ファイル読み込み"
+
 #~ msgid "Save (middle transform) as QBE file"
 #~ msgstr "変形経過を QBE ファイルとして保存"
+
 #~ msgid "Gradient Map..."
 #~ msgstr "グラデーションマップしています..."
+
 #~ msgid "Drawing Grid..."
 #~ msgstr "グリッドを描いています..."
+
 #~ msgid "GIMP Table Magic"
 #~ msgstr "GIMP 表の魔法"
+
 #~ msgid "Guillotine..."
 #~ msgstr "ギロチンで切断しています..."
+
 #~ msgid "Hot..."
 #~ msgstr "ホット..."
+
 #~ msgid "Create _New layer"
 #~ msgstr "新規レイヤー作成(_N)"
+
 #~ msgid "Illusion..."
 #~ msgstr "幻を描いています..."
+
 #~ msgid "Warping..."
 #~ msgstr "歪めています..."
+
 #~ msgid "Warping Frame No. %d..."
 #~ msgstr "%d番目のフレームを歪めています..."
+
 #~ msgid "Number of _Frames:"
 #~ msgstr "フレーム数(_F):"
+
 #~ msgid "_Ping Pong"
 #~ msgstr "ピンポン(_P)"
+
 #~ msgid "Assembling Jigsaw..."
 #~ msgstr "ジグソーパズルを組み立てる..."
+
 #~ msgid "EXIF data will be ignored."
 #~ msgstr "EXIF データは無視されます。"
+
 #~ msgid "Show _Preview in image window"
 #~ msgstr "画像ウインドウ中でプレビュー(_P)"
+
 #~ msgid "Force baseline JPEG"
 #~ msgstr "ベースライン JPEG 化"
+
 #~ msgid "Opening thumbnail for '%s'..."
 #~ msgstr "'%s' のサムネイルを開いています..."
+
 #~ msgid "Laplace..."
 #~ msgstr "ラプラス変換しています..."
+
 #~ msgid "Cleanup..."
 #~ msgstr "まとめています..."
+
 #~ msgid "Van Gogh (LIC)..."
 #~ msgstr "ヴァン ゴッホ風 (LIC)..."
+
 #~ msgid "_Effect Image:"
 #~ msgstr "対象画像(_E):"
+
 #~ msgid "Adjust _FG-BG"
 #~ msgstr "前景-背景調整(_F)"
+
 #~ msgid "Adjusting Foreground/Background..."
 #~ msgstr "前景/背景色を調整しています..."
+
 #~ msgid "Mapping colors..."
 #~ msgstr "色をマップしています..."
+
 #~ msgid "Source color range"
 #~ msgstr "元の色範囲"
+
 #~ msgid "Destination color range"
 #~ msgstr "適用後の色範囲"
+
 #~ msgid "_Max RGB..."
 #~ msgstr "RGB 値最大(_M)..."
+
 #~ msgid "Max RGB..."
 #~ msgstr "RGB 値最大..."
+
 #~ msgid "Motion Blurring..."
 #~ msgstr "モーションぼかし..."
+
 #~ msgid "Animated MNG options"
 #~ msgstr "動画 MNG オプション"
+
 #~ msgid "Finding Edges..."
 #~ msgstr "輪郭を探しています..."
+
 #~ msgid "Rendering Tiles..."
 #~ msgstr "タイルを描画しています..."
+
 #~ msgid "Tiling Primitives"
 #~ msgstr "並べる図形"
+
 #~ msgid "_Squares"
 #~ msgstr "四角形(_S)"
+
 #~ msgid "He_xagons"
 #~ msgstr "六角形(_X)"
+
 #~ msgid "Oc_tagons & squares"
 #~ msgstr "八角形と四角(_T)"
+
 #~ msgid "Settings"
 #~ msgstr "設定"
+
 #~ msgid "T_ile size:"
 #~ msgstr "タイルサイズ(_I):"
+
 #~ msgid "Neon..."
 #~ msgstr "ネオン..."
+
 #~ msgid "Intensity"
 #~ msgstr "強度"
+
 #~ msgid "Newsprint..."
 #~ msgstr "新聞印刷..."
+
 #~ msgid "_Factory defaults"
 #~ msgstr "初期値に戻す(_F)"
+
 #~ msgid "NL Filter..."
 #~ msgstr "非線形フィルタ..."
+
 #~ msgid "_Scatter RGB..."
 #~ msgstr "RGB 散乱(_S)..."
+
 #~ msgid "Adding Noise..."
 #~ msgstr "ノイズを追加しています..."
+
 #~ msgid "Scatter RGB"
 #~ msgstr "RGB 散乱"
+
 #~ msgid "Normalizing..."
 #~ msgstr "正規化しています..."
+
 #~ msgid "Su_perNova..."
 #~ msgstr "超新星(_P)..."
+
 #~ msgid "Rendering SuperNova..."
 #~ msgstr "超新星を描画しています..."
+
 #~ msgid "SuperNova"
 #~ msgstr "超新星"
+
 #~ msgid "SuperNova Color Picker"
 #~ msgstr "超新星 色 選択"
+
 #~ msgid "Center of SuperNova"
 #~ msgstr "超新星の中心"
+
 #~ msgid "S_how cursor"
 #~ msgstr "カーソル表示(_H)"
+
 #~ msgid "Oil Painting..."
 #~ msgstr "油絵化しています..."
+
 #~ msgid "Paper Tile..."
 #~ msgstr "紙タイル..."
+
 #~ msgid "Alias|Wavefront PIX image"
 #~ msgstr "Alias|Wavefront PIX 画像"
+
 #~ msgid "Pixelizing..."
 #~ msgstr "ピクセル化しています..."
+
 #~ msgid "Pixel _Width:"
 #~ msgstr "ピクセル幅(_W):"
+
 #~ msgid "Pixel _Height:"
 #~ msgstr "ピクセル高(_H):"
+
 #~ msgid "Plasma..."
 #~ msgstr "プラズマ..."
+
 #~ msgid "_Load defaults"
 #~ msgstr "初期値を読み込み(_L)"
+
 #~ msgid "_Save defaults"
 #~ msgstr "初期値を保存(_S)"
+
 #~ msgid "Could not load PNG defaults"
 #~ msgstr "PNG のデフォルトが読み込めません"
+
 #~ msgid "PNM: Premature end of file."
 #~ msgstr "PNM: ファイルが千切れています。"
+
 #~ msgid "PNM: Invalid file."
 #~ msgstr "PNM: 不正なファイルです。"
+
 #~ msgid "PNM: Invalid X resolution."
 #~ msgstr "PNM: 不正な X 解像度です。"
+
 #~ msgid "PNM: Invalid Y resolution."
 #~ msgstr "PNM: 不正な Y 解像度です。"
+
 #~ msgid "PNM: Invalid maximum value."
 #~ msgstr "PNM: 不正な最大値です。"
+
 #~ msgid "PNM: Error reading file."
 #~ msgstr "PNM: ファイル読み込みエラー"
+
 #~ msgid "PNM save cannot handle images with alpha channels."
 #~ msgstr "PNM による保存はアルファチャンネルを持った画像を取り扱えません"
+
 #~ msgid "P_olar Coords..."
 #~ msgstr "極座標(_O)..."
+
 #~ msgid "Polarizing..."
 #~ msgstr "極座標に変換しています..."
+
 #~ msgid "Polarize"
 #~ msgstr "極座標"
+
 #~ msgid "Error starting ghostscript (%s)"
 #~ msgstr "ghostscript 起動エラー (%s)"
+
 #~ msgid "Error starting ghostscript: %s"
 #~ msgstr "ghostscript 起動エラー: %s"
+
 #~ msgid "Load PostScript"
 #~ msgstr "PostScript 読み込み"
+
 #~ msgid "Random Hurl 1.7"
 #~ msgstr "ランダムに浴びせる 1.7"
+
 #~ msgid "Random Pick 1.7"
 #~ msgstr "ランダムにつまむ 1.7"
+
 #~ msgid "Random Slur 1.7"
 #~ msgstr "ランダムにごまかす 1.7"
+
 #~ msgid "Raw Image Data"
 #~ msgstr "生画像データ"
+
 #~ msgid "Raw Image Loader"
 #~ msgstr "生画像ローダー"
+
 #~ msgid "B, G, R, X (bmp style)"
 #~ msgstr "R, G, B, X (BMP スタイル)"
+
 #~ msgid "Select Palette File to Load"
 #~ msgstr "選択パレットファイルを読み込む"
+
 #~ msgid "_Retinex..."
 #~ msgstr "レティネックス(_R)..."
+
 #~ msgid "Retinex..."
 #~ msgstr "レティネックス処理中..."
+
 #~ msgid "Retinex (4/4): updated..."
 #~ msgstr "レティネックス (4/4): 更新しています..."
+
 #~ msgid "Retinex: Filtering..."
 #~ msgstr "レティネックス: フィルタをかけています..."
+
 #~ msgid "Rippling..."
 #~ msgstr "波立たせています..."
+
 #~ msgid "Rotating..."
 #~ msgstr "回転しています..."
+
 #~ msgid "Get sample colors"
 #~ msgstr "サンプル色取得"
+
 #~ msgid "Apply"
 #~ msgstr "適用"
+
 #~ msgid "Output Levels:"
 #~ msgstr "出力レベル: "
+
 #~ msgid "Sample Analyze..."
 #~ msgstr "サンプルを解析..."
+
 #~ msgid "Remap Colorized..."
 #~ msgstr "再マップ色付けしています..."
+
 #~ msgid "S_catter HSV..."
 #~ msgstr "HSV 散乱(_C)..."
+
 #~ msgid "Scattering HSV..."
 #~ msgstr "HSV 散乱..."
+
 #~ msgid "Scatter HSV"
 #~ msgstr "HSV 散乱"
+
 #~ msgid "Error grabbing the pointer"
 #~ msgstr "ポインタ取得エラー"
+
 #~ msgid "Loading Screen Shot..."
 #~ msgstr "画面取り込みの読み込み..."
+
 #~ msgid "Screen Shot"
 #~ msgstr "画面取り込み"
+
 #~ msgid "Error obtaining Screen Shot"
 #~ msgstr "スクリーンショットの獲得エラー"
+
 #~ msgid "a _Single Window"
 #~ msgstr "単一ウィンドウを取り込む(_S)"
+
 #~ msgid "S_elect Window After"
 #~ msgstr "後でウィンドウを選択(_E)"
+
 #~ msgid "Seconds Delay"
 #~ msgstr "秒後"
+
 #~ msgid "the _Whole Screen"
 #~ msgstr "画面全体を取り込む(_W)"
+
 #~ msgid "Grab _After"
 #~ msgstr "後で取り込み(_A)"
+
 #~ msgid "Selective Gaussian Blur..."
 #~ msgstr "選択的ガウシアンぼかし..."
+
 #~ msgid "Semi-Flattening..."
 #~ msgstr "半統合しています..."
+
 #~ msgid "Sharpening..."
 #~ msgstr "明瞭にしています..."
+
 #~ msgid "Shifting..."
 #~ msgstr "ずらしています..."
+
 #~ msgid "Sinus: rendering..."
 #~ msgstr "Sin 曲線: レンダリングしています..."
+
 #~ msgid "_X Scale:"
 #~ msgstr "_X 拡大縮小:"
+
 #~ msgid "_Y Scale:"
 #~ msgstr "_Y 拡大縮小:"
+
 #~ msgid "F_irst Color:"
 #~ msgstr "第一色(_I):"
+
 #~ msgid "S_econd Color:"
 #~ msgstr "第二色(_E):"
+
 #~ msgid "Do _Preview"
 #~ msgstr "プレビュー(_P)"
+
 #~ msgid "Deriving Smooth Palette..."
 #~ msgstr "滑らかなパレットを生成しています..."
+
 #~ msgid "Solid Noise..."
 #~ msgstr "ソリッドノイズを生成しています..."
+
 #~ msgid "Sobel _Horizontally"
 #~ msgstr "水平方向ソーベル(_H)"
+
 #~ msgid "Sobel _Vertically"
 #~ msgstr "垂直方向ソーベル(_V)"
+
 #~ msgid "Sobel Edge Detecting..."
 #~ msgstr "ソーベル輪郭を抽出しています..."
+
 #~ msgid "Sparkling..."
 #~ msgstr "きらめかせています..."
+
 #~ msgid "Luminosity _Threshold:"
 #~ msgstr "光度しきい値(_T):"
+
 #~ msgid "Adjust the Luminosity Threshold"
 #~ msgstr "光度しきい値を調節する"
+
 #~ msgid "Adjust the Flare Intensity"
 #~ msgstr "フレア強度を調節する"
+
 #~ msgid "Adjust the Spike Length"
 #~ msgstr "尖りの長さを調節する"
+
 #~ msgid "Adjust the Number of Spikes"
 #~ msgstr "尖りの数を調節する"
+
 #~ msgid "Adjust the Spike Angle (-1 means a Random Angle is chosen)"
 #~ msgstr "尖りの角度を調節する (-1 を指定するとランダムに角度が設定されます)"
+
 #~ msgid "Adjust the Spike Density"
 #~ msgstr "尖りの密度を調節する"
+
 #~ msgid "Adjust the Opacity of the Spikes"
 #~ msgstr "尖りの不透明度を調節する"
+
 #~ msgid "Adjust the Value how much the Hue should be changed randomly"
 #~ msgstr "色相をどの程度ランダムに変えるか調節する"
+
 #~ msgid "Adjust the Value how much the Saturation should be changed randomly"
 #~ msgstr "彩度をどの程度ランダムに変えるか調節する"
+
 #~ msgid "Should the Luminosity be preserved?"
 #~ msgstr "光度を保存するかどうか"
+
 #~ msgid "Should an Inverse Effect be done?"
 #~ msgstr "反転効果にするかどうか"
+
 #~ msgid "Draw a Border of Spikes around the Image"
 #~ msgstr "尖りの縁を画像につけるかどうか"
+
 #~ msgid "Update _Preview"
 #~ msgstr "プレビュー更新(_P)"
+
 #~ msgid "Textures"
 #~ msgstr "テクスチャ"
+
 #~ msgid "Texture Properties"
 #~ msgstr "テクスチャ設定"
+
 #~ msgid "Texture Transformations"
 #~ msgstr "テクスチャ変換"
+
 #~ msgid "Rendering Sphere..."
 #~ msgstr "球体を描画しています..."
+
 #~ msgid "Spreading..."
 #~ msgstr "拡散させています..."
+
 #~ msgid "Applying Canvas..."
 #~ msgstr "キャンバス地を適用しています..."
+
 #~ msgid "Scalable SVG image"
 #~ msgstr "拡大縮小可能な SVG 画像"
+
 #~ msgid "Rendering SVG..."
 #~ msgstr "SVG 描画..."
+
 #~ msgid "%d x %d"
 #~ msgstr "%d x %d"
+
 #~ msgid "The layer preserves transparency."
 #~ msgstr "レイヤーが透明保護されています。"
+
 #~ msgid "Threshold Alpha: Coloring Transparency..."
 #~ msgstr "アルファチャンネル閾値: 半透明部分を切り分けています..."
+
 #~ msgid "Tiling..."
 #~ msgstr "並べています..."
+
 #~ msgid "C_reate New Image"
 #~ msgstr "新規画像作成(_R)"
+
 #~ msgid "TileIt"
 #~ msgstr "それを並べる"
+
 #~ msgid "Tiler..."
 #~ msgstr "タイルを生成しています..."
+
 #~ msgid "Create a new unit from scratch."
 #~ msgstr "まっさらなところから新しい単位を作る。"
+
 #~ msgid "Create a new unit with the currently selected unit as template."
 #~ msgstr "現在選択中の単位を元にして新しい単位を作る。"
+
 #~ msgid "_Unit Editor"
 #~ msgstr "単位エディタ(_U)"
+
 #~ msgid "New Unit"
 #~ msgstr "新しい単位"
+
 #~ msgid "Unit factor must not be 0."
 #~ msgstr "単位乗数は0であってはなりません。"
+
 #~ msgid "All text fields must contain a value."
 #~ msgstr "すべての文字フィールドが埋められていなければなりません。"
+
 #~ msgid "Merging..."
 #~ msgstr "混ぜ合わせています..."
+
 #~ msgid "Video/RGB..."
 #~ msgstr "ビデオ/RGB..."
+
 #~ msgid "Value Invert..."
 #~ msgstr "明度を反転させています..."
+
 #~ msgid "Value Propagating..."
 #~ msgstr "明度を伝搬させています..."
+
 #~ msgid "Propagating _Alpha Channel"
 #~ msgstr "アルファチャンネルを伝搬(_A)"
+
 #~ msgid "Propagating Value Channel"
 #~ msgstr "明度チャンネルを伝搬"
+
 #~ msgid "FG color"
 #~ msgstr "前景色"
+
 #~ msgid "Smoothing X gradient..."
 #~ msgstr "X グラデーションを滑らかにしています..."
+
 #~ msgid "Smoothing Y gradient..."
 #~ msgstr "Y グラデーションを滑らかにしています..."
+
 #~ msgid "Finding XY gradient..."
 #~ msgstr "XYグラデーションを探しています..."
+
 #~ msgid "Flow Step %d..."
 #~ msgstr "ステップ %d..."
+
 #~ msgid "Waving..."
 #~ msgstr "波立たせています..."
+
 #~ msgid "Whirling and Pinching..."
 #~ msgstr "ぐるぐるひねっています..."
+
 #~ msgid "Copy to Clipboard"
 #~ msgstr "クリップボードへコピー"
+
 #~ msgid "Paste from Clipboard"
 #~ msgstr "クリップボードから貼り付け"
+
 #~ msgid "From Clipboard"
 #~ msgstr "クリップボードから"
+
 #~ msgid "Copying..."
 #~ msgstr "コピーしています..."
+
 #~ msgid "Unsupported format or Clipboard empty!"
 #~ msgstr "サポートしていない形式かクリップボードが空です!"
+
 #~ msgid "Can't get Clipboard data."
 #~ msgstr "クリップボードのデータを取得できません。"
+
 #~ msgid "Pasted"
 #~ msgstr "ペースト結果"
+
 #~ msgid "Pasting..."
 #~ msgstr "ペーストしています..."
+
 #~ msgid "Rendering Blast..."
 #~ msgstr "暴風にさらしています..."
+
 #~ msgid "Rendering Wind..."
 #~ msgstr "風を描いています..."
+
 #~ msgid "_Print"
 #~ msgstr "印刷(_P)"
+
 #~ msgid "PrintDlg failed: %d"
 #~ msgstr "PrintDlg 失敗: %d"
+
 #~ msgid "Printer doesn't support bitmaps"
 #~ msgstr "プリンタがビットマップをサポートしていません"
+
 #~ msgid "StartPage failed"
 #~ msgstr "StartPage 失敗"
+
 #~ msgid "Printing..."
 #~ msgstr "印刷しています..."
+
 #~ msgid "CreateDIBSection failed"
 #~ msgstr "CreateDIBSection 失敗"
+
 #~ msgid "SetStretchBltMode failed (warning only)"
 #~ msgstr "SetStretchBltMode 失敗 (警告)"
+
 #~ msgid ""
 #~ "StretchBlt (hDC, %d, %d, %d, %d, hdcMem, %d, 0, %d, 1, SRCCOPY) failed, "
 #~ "error = %d, y = %d"
 #~ msgstr ""
 #~ "StretchBlt (hDC, %d, %d, %d, %d, hdcMem, %d, 0, %d, 1, SRCCOPY) 失敗、"
 #~ "error = %d, y = %d"
+
 #~ msgid "EndPage failed"
 #~ msgstr "EndPage 失敗"
+
 #~ msgid "PageSetupDlg failed: %d"
 #~ msgstr "PageSetupDlg 失敗: %d"
+
 #~ msgid "Created with The GIMP"
 #~ msgstr "GIMP で作成しました"
+
 #~ msgid ""
 #~ "XWD-file %s has format %d, depth %d\n"
 #~ "and bits per pixel %d.\n"
@@ -13573,121 +13827,178 @@ msgstr "何も取り込まれませんでした"
 #~ "XWD-ファイル %s は形式 %d, 深度 %d\n"
 #~ "ピクセル当たり %d です。\n"
 #~ "現在この形式は利用できません。"
+
 #~ msgid "ZealousCropping(tm)..."
 #~ msgstr "最小枠で切り抜いています..."
+
 #~ msgid "Search by _Name"
 #~ msgstr "名前で検索(_N)"
+
 #~ msgid "Search by _Blurb"
 #~ msgstr "説明で検索(_B)"
+
 #~ msgid "_Search:"
 #~ msgstr "検索(_S):"
+
 #~ msgid "Searching by name - please wait"
 #~ msgstr "名前で検索中 - お待ち下さい"
+
 #~ msgid "Searching by blurb - please wait"
 #~ msgstr "説明で検索中 - お待ち下さい"
+
 #~ msgid "Searching - please wait"
 #~ msgstr "検索中 - お待ち下さい"
+
 #~ msgid "1 Procedure"
 #~ msgstr "1 個のプロシージャ"
+
 #~ msgid "%d Procedures"
 #~ msgstr "%d 個のプロシージャ"
+
 #~ msgid "Return Values"
 #~ msgstr "返り値"
+
 #~ msgid "Additional Information"
 #~ msgstr "追加情報"
+
 #~ msgid "Author:"
 #~ msgstr "作者:"
+
 #~ msgid "Date:"
 #~ msgstr "日付:"
+
 #~ msgid "Copyright:"
 #~ msgstr "著作権表示:"
+
 #~ msgid "Internal GIMP procedure"
 #~ msgstr "GIMP 内部プロシージャ"
+
 #~ msgid "GIMP Plug-In"
 #~ msgstr "GIMP プラグイン"
+
 #~ msgid "GIMP Extension"
 #~ msgstr "GIMP 拡張機能"
+
 #~ msgid "Temporary Procedure"
 #~ msgstr "テンポラリプロシージャ"
+
 #~ msgid "1 Plug-In Interface"
 #~ msgstr "1 個のプラグインインターフェース"
+
 #~ msgid "%d Plug-In Interfaces"
 #~ msgstr "%d 個のプラグインインターフェース"
+
 #~ msgid "Insertion Date"
 #~ msgstr "導入日時"
+
 #~ msgid "Menu Path/Name"
 #~ msgstr "メニューパス/名前"
+
 #~ msgid "BLANK/NaN Pixel Replacement"
 #~ msgstr "BLANK/NaN ピクセル置き換え"
+
 #~ msgid "Drawing Flame..."
 #~ msgstr "炎を描いています..."
+
 #~ msgid "Tool options"
 #~ msgstr "ツールオプション"
+
 #~ msgid "Gradient fill"
 #~ msgstr "グラデーションで塗りつぶす"
+
 #~ msgid "Load Gfig object collection"
 #~ msgstr "Gfig オブジェクトコレクションを読み込む"
+
 #~ msgid ""
 #~ "Error trying to save figure as a parasite: can't attach parasite to "
 #~ "drawable.\n"
 #~ msgstr ""
 #~ "図を付属物として保存中にエラー: 描画対象に付属物を付け加えられません。\n"
+
 #~ msgid "_GFlare..."
 #~ msgstr "グラデーションフレア(_G)..."
+
 #~ msgid "Gradient Flare..."
 #~ msgstr "グラデーションフレアを描いています..."
+
 #~ msgid "GFlare"
 #~ msgstr "グラデーションフレア"
+
 #~ msgid "Vector _Angle:"
 #~ msgstr "ベクトル角度(_A):"
+
 #~ msgid "Vector _Length:"
 #~ msgstr "ベクトル長(_L):"
+
 #~ msgid "_Max Depth:"
 #~ msgstr "最大深度(_M):"
+
 #~ msgid "New GFlare"
 #~ msgstr "新規 グラデーションフレア"
+
 #~ msgid "Copy GFlare"
 #~ msgstr "グラデーションフレア のコピー"
+
 #~ msgid "Delete GFlare"
 #~ msgstr "グラデーションフレア 削除"
+
 #~ msgid "GFlare Editor"
 #~ msgstr "グラデーションフレア エディタ"
+
 #~ msgid "Paint Mode:"
 #~ msgstr "描画モード:"
+
 #~ msgid "Radial Gradient:"
 #~ msgstr "半径方向グラデーション:"
+
 #~ msgid "Angular Gradient:"
 #~ msgstr "角度方向グラデーション:"
+
 #~ msgid "Angular Size Gradient:"
 #~ msgstr "角度方向大きさグラデーション:"
+
 #~ msgid "Hue Rotation:"
 #~ msgstr "色相回転:"
+
 #~ msgid "Spike Thickness:"
 #~ msgstr "尖りの太さ:"
+
 #~ msgid "Size Factor Gradient:"
 #~ msgstr "大きさ倍率グラデーション:"
+
 #~ msgid "Probability Gradient:"
 #~ msgstr "確率グラデーション:"
+
 #~ msgid "Random Seed:"
 #~ msgstr "乱数種:"
+
 #~ msgid "Drop Shadow"
 #~ msgstr "影を落す"
+
 #~ msgid "Painting..."
 #~ msgstr "描画しています..."
+
 #~ msgid "The GIMPressionist"
 #~ msgstr "The GIMPressionist"
+
 #~ msgid "Gimpressionist"
 #~ msgstr "Gimpressionist"
+
 #~ msgid "A_bout"
 #~ msgstr "このプラグインについて(_B)"
+
 #~ msgid "Centerize"
 #~ msgstr "中央寄せ"
+
 #~ msgid "The Gimpressionist Defaults"
 #~ msgstr "Gimpressionist デフォルト"
+
 #~ msgid "Save current..."
 #~ msgstr "現状保存..."
+
 #~ msgid "Update"
 #~ msgstr "更新"
+
 #~ msgid ""
 #~ "It is highly recommended to add\n"
 #~ " (gimpressionist-path \"%s\")\n"
@@ -13696,146 +14007,213 @@ msgstr "何も取り込まれませんでした"
 #~ "  (gimpressionist-path \"%s\")\n"
 #~ "のように gimprc に付け足すことを\n"
 #~ "強くお勧めします。"
+
 #~ msgid "GIMP Help browser"
 #~ msgstr "GIMP ヘルプブラウザ"
+
 #~ msgid "Scale Hue by:"
 #~ msgstr "色相倍率:"
+
 #~ msgid "Scale Value by:"
 #~ msgstr "明度倍率:"
+
 #~ msgid "Render options"
 #~ msgstr "描画オプション"
+
 #~ msgid "Max. Memory:"
 #~ msgstr "最大メモリ:"
+
 #~ msgid "Spot Radius:"
 #~ msgstr "スポット半径:"
+
 #~ msgid "Rendering IFS (%d/%d)..."
 #~ msgstr "IFS 描画しています (%d/%d)..."
+
 #~ msgid "Copying IFS to image (%d/%d)..."
 #~ msgstr "IFS を画像にコピーしています (%d/%d)..."
+
 #~ msgid "Save as IFS Fraktal file"
 #~ msgstr "IFS フラクタルファイルとして保存"
+
 #~ msgid "Open IFS Fraktal file"
 #~ msgstr "IFS フラクタルファイルを開く"
+
 #~ msgid "Imagemap plug-in 2.2"
 #~ msgstr "Imagemap plug-in 2.2"
+
 #~ msgid "Copyright(c) 1999-2004 by Maurits Rijk"
 #~ msgstr "Copyright(c) 1999-2004 by Maurits Rijk"
+
 #~ msgid "L_eft Border"
 #~ msgstr "左の縁(_E)"
+
 #~ msgid "_Right Border"
 #~ msgstr "右の縁(_R):"
+
 #~ msgid "_Upper Border"
 #~ msgstr "上の縁(_U)"
+
 #~ msgid "Lo_wer Border"
 #~ msgstr "下の縁(_W)"
+
 #~ msgid "_Left Start at:"
 #~ msgstr "左開始位置(_L):"
+
 #~ msgid "_Top Start at:"
 #~ msgstr "上開始位置(_T):"
+
 #~ msgid "_Horz. Spacing:"
 #~ msgstr "水平間隔(_H):"
+
 #~ msgid "_No. Across:"
 #~ msgstr "横の数(_N)"
+
 #~ msgid "_Vert. Spacing:"
 #~ msgstr "垂直間隔(_V):"
+
 #~ msgid "No. _Down:"
 #~ msgstr "縦の数(_D)"
+
 #~ msgid "Load Imagemap"
 #~ msgstr "イメージマップ読み込み"
+
 #~ msgid "File already exists"
 #~ msgstr "ファイルは既に存在します"
+
 #~ msgid "Do you really want to overwrite?"
 #~ msgstr "上書きしますか?"
+
 #~ msgid "Save Imagemap"
 #~ msgstr "イメージマップ保存"
+
 #~ msgid "_Snap-To Grid Enabled"
 #~ msgstr "グリッドに付ける(_S)"
+
 #~ msgid "_ImageMap..."
 #~ msgstr "イメージマップ(_I)..."
+
 #~ msgid "Open recent"
 #~ msgstr "最近使ったファイルを開く"
+
 #~ msgid "Select _all"
 #~ msgstr "すべてを選択(_A)"
+
 #~ msgid "Deselect _all"
 #~ msgstr "すべて選択解除(_A)"
+
 #~ msgid "Edit area info..."
 #~ msgstr "領域情報を編集..."
+
 #~ msgid "Area list"
 #~ msgstr "領域一覧"
+
 #~ msgid "Grayscale"
 #~ msgstr "グレースケール"
+
 #~ msgid "Zoom to"
 #~ msgstr "拡大率"
+
 #~ msgid "Select contiguous region"
 #~ msgstr "隣接領域を選択"
+
 #~ msgid "Grid settings..."
 #~ msgstr "グリッド設定..."
+
 #~ msgid "Use GIMP guides..."
 #~ msgstr "GIMP のガイドを使う..."
+
 #~ msgid "Create guides..."
 #~ msgstr "ガイドの作成..."
+
 #~ msgid "_About ImageMap"
 #~ msgstr "ImageMap について(_A)"
+
 #~ msgid "Edit Area Info..."
 #~ msgstr "領域情報を編集..."
+
 #~ msgid "Tools"
 #~ msgstr "ツール"
+
 #~ msgid "Guides..."
 #~ msgstr "ガイド..."
+
 #~ msgid "Number of _Undo levels (1 - 99):"
 #~ msgstr "最大アンドゥ数 (1 - 99)(_U):"
+
 #~ msgid "Edit"
 #~ msgstr "編集"
+
 #~ msgid "Map file format"
 #~ msgstr "マップファイル形式"
+
 #~ msgid "Edit map info"
 #~ msgstr "マップ情報を編集"
+
 #~ msgid "Fuzzy Select"
 #~ msgstr "あいまいな選択"
+
 #~ msgid "Select contiguous regions"
 #~ msgstr "隣接領域を選択"
+
 #~ msgid "Delete selected area"
 #~ msgstr "選択したフレームを削除"
+
 #~ msgid "Constructing maze using Prim's Algorithm..."
 #~ msgstr "Prim アルゴリズムで迷路を形成しています..."
+
 #~ msgid "Constructing tileable maze using Prim's Algorithm..."
 #~ msgstr "並べられる迷路を Prim アルゴリズムで形成しています..."
+
 #~ msgid "Drawing Maze..."
 #~ msgstr "迷路を描いています..."
+
 #~ msgid "Multiple (57):"
 #~ msgstr "倍数 (57):"
+
 #~ msgid "Offset (1):"
 #~ msgstr "オフセット (1)"
+
 #~ msgid "Page Curl..."
 #~ msgstr "ページをめくっています..."
+
 #~ msgid "Print Color Adjust"
 #~ msgstr "印刷色調整"
+
 #~ msgid "Brightness:"
 #~ msgstr "明るさ:"
+
 #~ msgid ""
 #~ "Set the brightness of the print.\n"
 #~ "0 is solid black, 2 is solid white"
 #~ msgstr ""
 #~ "印刷の明るさを設定します。\n"
 #~ "0 は真っ黒、 2 は真っ白になります"
+
 #~ msgid "Contrast:"
 #~ msgstr "コントラスト:"
+
 #~ msgid "Set the contrast of the print"
 #~ msgstr "印刷のコントラストを設定する"
+
 #~ msgid "Adjust the cyan balance of the print"
 #~ msgstr "印刷のシアンのバランスを調節する"
+
 #~ msgid "Adjust the magenta balance of the print"
 #~ msgstr "印刷のマゼンタのバランスを調節する"
+
 #~ msgid "Adjust the yellow balance of the print"
 #~ msgstr "印刷の黄色のバランスを調節する"
+
 #~ msgid ""
 #~ "Adjust the saturation (color balance) of the print\n"
 #~ "Use zero saturation to produce grayscale output using color and black inks"
 #~ msgstr ""
 #~ "印刷の彩度 (カラーバランス) を調整します\n"
 #~ "カラーおよび黒インクを使いグレースケールで出力するには、彩度をゼロにします"
+
 #~ msgid "Density:"
 #~ msgstr "濃度:"
+
 #~ msgid ""
 #~ "Adjust the density (amount of ink) of the print. Reduce the density if "
 #~ "the ink bleeds through the paper or smears; increase the density if black "
@@ -13844,6 +14222,7 @@ msgstr "何も取り込まれませんでした"
 #~ "印刷の濃度 (インク量) を調整します。インクが裏うつりしたり染みたりする場合"
 #~ "は、濃度を減らしてください。黒がベタにならない場合は濃度を増やしてくださ"
 #~ "い。"
+
 #~ msgid ""
 #~ "Adjust the gamma of the print. Larger values will produce a generally "
 #~ "brighter print, while smaller values will produce a generally darker "
@@ -13853,8 +14232,10 @@ msgstr "何も取り込まれませんでした"
 #~ "印刷のガンマを調整します。値を大きくすると全体的に明るい印刷になり、小さく"
 #~ "すると全体的に暗い印刷になります。明るさの調整とは異なり、白と黒は変わりま"
 #~ "せん。"
+
 #~ msgid "Dither Algorithm:"
 #~ msgstr "ディザリングアルゴリズム:"
+
 #~ msgid ""
 #~ "Choose the dither algorithm to be used.\n"
 #~ "Adaptive Hybrid usually produces the best all-around quality.\n"
@@ -13868,20 +14249,24 @@ msgstr "何も取り込まれませんでした"
 #~ "Ordered は速く、ほとんどの写真は良品質となります。\n"
 #~ "Fast および Very Fast はかなり速く、テキストや線画に向いています。\n"
 #~ "Hybrid Floyd-Steinberg は、通常は低品質の出力となります。"
+
 #~ msgid "%s -- Print v%s"
 #~ msgstr "%s -- 印刷 v%s"
+
 #~ msgid ""
 #~ "Save\n"
 #~ "Settings"
 #~ msgstr ""
 #~ "設定を\n"
 #~ "保存"
+
 #~ msgid ""
 #~ "Print and\n"
 #~ "Save Settings"
 #~ msgstr ""
 #~ "印刷と\n"
 #~ "設定保存"
+
 #~ msgid ""
 #~ "Position the image on the page.\n"
 #~ "Click and drag with the primary button to position the image.\n"
@@ -13903,58 +14288,84 @@ msgstr "何も取り込まれませんでした"
 #~ "shift キーを押しながらクリックやドラッグすると、画像の移動を水平または垂直"
 #~ "方向のみにします。\n"
 #~ "マウスのドラッグ中に別のボタンをクリックすると、画像は元の位置に戻ります。"
+
 #~ msgid "Auto"
 #~ msgstr "自動"
+
 #~ msgid "Portrait"
 #~ msgstr "縦置き"
+
 #~ msgid "Landscape"
 #~ msgstr "横置き"
+
 #~ msgid "Upside down"
 #~ msgstr "逆縦置き"
+
 #~ msgid "Seascape"
 #~ msgstr "逆横置き"
+
 #~ msgid ""
 #~ "Select the orientation: portrait, landscape, upside down, or seascape "
 #~ "(upside down landscape)"
 #~ msgstr "用紙の向きを選択してください: 縦置き、横置き、逆縦置き、逆横置き"
+
 #~ msgid "Distance from the left of the paper to the image"
 #~ msgstr "紙の左辺から画像までの距離"
+
 #~ msgid "Distance from the top of the paper to the image"
 #~ msgstr "紙の上辺から画像までの距離"
+
 #~ msgid "Distance from the left of the paper to the right of the image"
 #~ msgstr "紙の左辺から画像の右端までの距離"
+
 #~ msgid "Right Border:"
 #~ msgstr "右縁:"
+
 #~ msgid "Distance from the right of the paper to the image"
 #~ msgstr "紙の右辺から画像までの距離"
+
 #~ msgid "Distance from the top of the paper to the bottom of the image"
 #~ msgstr "紙の上辺から画像の下端までの距離"
+
 #~ msgid "Bottom Border:"
 #~ msgstr "下縁:"
+
 #~ msgid "Distance from the bottom of the paper to the image"
 #~ msgstr "紙の下辺から画像までの距離"
+
 #~ msgid "Center:"
 #~ msgstr "中央:"
+
 #~ msgid "Center the image vertically on the paper"
 #~ msgstr "画像を印刷用紙の垂直方向の中心に置く"
+
 #~ msgid "Center the image horizontally on the paper"
 #~ msgstr "画像を印刷用紙の水平方向の中心に置く"
+
 #~ msgid "Setup Printer"
 #~ msgstr "プリンタの設定"
+
 #~ msgid "Printer Model:"
 #~ msgstr "プリンタモデル:"
+
 #~ msgid "Select your printer model"
 #~ msgstr "プリンタのモデルを選択してください"
+
 #~ msgid "PPD File:"
 #~ msgstr "PPD ファイル:"
+
 #~ msgid "Enter the PPD filename for your printer"
 #~ msgstr "お使いのプリンタ用の PPD ファイルを入力してください"
+
 #~ msgid "Browse"
 #~ msgstr "場所を指定する"
+
 #~ msgid "Choose the PPD file for your printer"
 #~ msgstr "お使いのプリンタ用の PPD ファイルを選択してください"
+
 #~ msgid "Command:"
 #~ msgstr "コマンド:"
+
 #~ msgid ""
 #~ "Enter the command to print to your printer. Note: Please do not remove "
 #~ "the `-l' or `-oraw' from the command string, or printing will probably "
@@ -13962,18 +14373,25 @@ msgstr "何も取り込まれませんでした"
 #~ msgstr ""
 #~ "プリンタ用の印刷コマンドを入力してください。注: コマンドから `-l' や `-"
 #~ "oraw' は削除しないでください。さもないと印刷が失敗することがあります。"
+
 #~ msgid "Choose PPD File"
 #~ msgstr "PPD ファイル選択"
+
 #~ msgid "Define New Printer"
 #~ msgstr "新規プリンタを定義"
+
 #~ msgid "Printer name:"
 #~ msgstr "プリンタ名:"
+
 #~ msgid "Enter the name you wish to give this logical printer"
 #~ msgstr "この論理プリンタ用の名前を入力してください"
+
 #~ msgid "About Gimp-Print "
 #~ msgstr "Gimp-Print について "
+
 #~ msgid "Gimp-Print Version "
 #~ msgstr "Gimp-Print バージョン "
+
 #~ msgid ""
 #~ "\n"
 #~ "\n"
@@ -14017,180 +14435,255 @@ msgstr "何も取り込まれませんでした"
 #~ "いるはずです。そうでない場合は、Free Software Foundation,Inc., 59 "
 #~ "Temple \n"
 #~ "Place - Suite 330, Boston, MA 02111-1307, USA. へ手紙を書いてください。\n"
+
 #~ msgid "Printer Settings"
 #~ msgstr "プリンタ設定"
+
 #~ msgid ""
 #~ "Select the name of the printer (not the type, or model, of printer) that "
 #~ "you wish to print to"
 #~ msgstr ""
 #~ "印刷を行いたいプリンタの名前を選択してください(名前とはプリンタの型番やモ"
 #~ "デルのことではありません)"
+
 #~ msgid "Printer model:"
 #~ msgstr "プリンタモデル:"
+
 #~ msgid "Setup printer..."
 #~ msgstr "プリンタの設定..."
+
 #~ msgid ""
 #~ "Choose the printer model, PPD file, and command that is used to print to "
 #~ "this printer"
 #~ msgstr ""
 #~ "プリンタの機種、 PPD ファイル、および、このプリンタでの印刷コマンドを選ん"
 #~ "でください。"
+
 #~ msgid "New printer..."
 #~ msgstr "新規プリンタ..."
+
 #~ msgid ""
 #~ "Define a new logical printer. This can be used to name a collection of "
 #~ "settings that you wish to remember for future use."
 #~ msgstr ""
 #~ "新しい論理プリンタを定義します。一連の設定値に対して名前をつけておき、後で"
 #~ "使うことができます。"
+
 #~ msgid "Size of paper that you wish to print to"
 #~ msgstr "印刷したい紙のサイズ"
+
 #~ msgid "Media size:"
 #~ msgstr "用紙サイズ:"
+
 #~ msgid "Dimensions:"
 #~ msgstr "寸法"
+
 #~ msgid "Width of the paper that you wish to print to"
 #~ msgstr "印刷したい紙の横のサイズ"
+
 #~ msgid "Height of the paper that you wish to print to"
 #~ msgstr "印刷したい紙の縦のサイズ"
+
 #~ msgid "Type of media you're printing to"
 #~ msgstr "印刷しようとしている用紙の種類"
+
 #~ msgid "Media type:"
 #~ msgstr "用紙の種類:"
+
 #~ msgid "Source (input slot) of media you're printing to"
 #~ msgstr "印刷しようとしている用紙の給紙元"
+
 #~ msgid "Media source:"
 #~ msgstr "給紙方法:"
+
 #~ msgid "Type of ink in the printer"
 #~ msgstr "プリンタのインクの種類"
+
 #~ msgid "Ink type:"
 #~ msgstr "インクの種類:"
+
 #~ msgid "Resolution and quality of the print"
 #~ msgstr "印刷の解像度と質"
+
 #~ msgid "Scaling:"
 #~ msgstr "拡大縮小:"
+
 #~ msgid "Set the scale (size) of the image"
 #~ msgstr "画像の倍率(サイズ)を設定する"
+
 #~ msgid "Scale by:"
 #~ msgstr "拡大縮小方法:"
+
 #~ msgid ""
 #~ "Select whether scaling is measured as percent of available page size or "
 #~ "number of output dots per inch"
 #~ msgstr ""
 #~ "拡大縮小を、利用可能なページサイズのパーセントと、出力のドット毎インチの数"
 #~ "のどちらで行なうかを選択します"
+
 #~ msgid "Percent"
 #~ msgstr "パーセント"
+
 #~ msgid "Scale the print to the size of the page"
 #~ msgstr "ページサイズに合わせて印刷を拡大縮小します"
+
 #~ msgid "PPI"
 #~ msgstr "PPI"
+
 #~ msgid "Scale the print to the number of dots per inch"
 #~ msgstr "ドット毎インチに合わせて印刷を拡大縮小します"
+
 #~ msgid "Set the width of the print"
 #~ msgstr "印刷の幅を設定します"
+
 #~ msgid "Set the height of the print"
 #~ msgstr "印刷の高さを設定します"
+
 #~ msgid "Units:"
 #~ msgstr "単位:"
+
 #~ msgid "Select the base unit of measurement for printing"
 #~ msgstr "印刷用の基準単位を選択します"
+
 #~ msgid "Inch"
 #~ msgstr "インチ"
+
 #~ msgid "Set the base unit of measurement to inches"
 #~ msgstr "印刷用の基準単位をインチに設定します"
+
 #~ msgid "cm"
 #~ msgstr "cm"
+
 #~ msgid "Set the base unit of measurement to centimetres"
 #~ msgstr "印刷用の基準単位をセンチメートルに設定します"
+
 #~ msgid ""
 #~ "Use Original\n"
 #~ "Image Size"
 #~ msgstr ""
 #~ "元の画像\n"
 #~ "サイズを使用"
+
 #~ msgid "Set the print size to the size of the image"
 #~ msgstr "印刷サイズを画像のサイズに設定します"
+
 #~ msgid "Image / Output Settings"
 #~ msgstr "画像 / 出力設定"
+
 #~ msgid "Image type:"
 #~ msgstr "画像の種類:"
+
 #~ msgid "Optimize the output for the type of image being printed"
 #~ msgstr "印刷される画像の種類によって出力を最適化します"
+
 #~ msgid "Fastest and brightest color for text and line art"
 #~ msgstr "テキストや線画に適した、最も速くて明るい色"
+
 #~ msgid "Solid colors"
 #~ msgstr "ベタ塗り"
+
 #~ msgid "Best for images dominated by regions of solid color"
 #~ msgstr "ベタ塗り領域からなる画像に最適化"
+
 #~ msgid "Photograph"
 #~ msgstr "写真"
+
 #~ msgid ""
 #~ "Slowest, but most accurate and smoothest color for continuous tone images "
 #~ "and photographs"
 #~ msgstr "最も遅いが、階調つきの画像や写真に適した最も正確で滑らかな色"
+
 #~ msgid "Output type:"
 #~ msgstr "出力の種類:"
+
 #~ msgid "Select the desired output type"
 #~ msgstr "希望する出力形式を選択してください"
+
 #~ msgid "Color output"
 #~ msgstr "カラー出力"
+
 #~ msgid "Print in shades of gray using black ink"
 #~ msgstr "黒インクを使って灰色の影を印刷"
+
 #~ msgid "Black and white"
 #~ msgstr "白黒"
+
 #~ msgid "Print in black and white (no color, and no shades of gray)"
 #~ msgstr "白色と黒色で印刷 (灰色の影もなし)"
+
 #~ msgid "Adjust output..."
 #~ msgstr "出力の調整..."
+
 #~ msgid ""
 #~ "Adjust color balance, brightness, contrast, saturation, and dither "
 #~ "algorithm"
 #~ msgstr ""
 #~ "カラーバランス、明るさ、コントラスト、濃度、ディザリングアルゴリズムを調整"
 #~ "します"
+
 #~ msgid "Print to File"
 #~ msgstr "ファイルに出力"
+
 #~ msgid "File"
 #~ msgstr "ファイル"
+
 #~ msgid "Colormap _Rotation..."
 #~ msgstr "カラーマップ回転(_R)..."
+
 #~ msgid "Rotating the colormap..."
 #~ msgstr "カラーマップを回転しています..."
+
 #~ msgid "From"
 #~ msgstr "始め"
+
 #~ msgid "To"
 #~ msgstr "終り"
+
 #~ msgid "Colormap Rotation"
 #~ msgstr "カラーマップ回転"
+
 #~ msgid "Switch to clockwise"
 #~ msgstr "時計周りに変更"
+
 #~ msgid "Switch to c/clockwise"
 #~ msgstr "反時計周りに変更"
+
 #~ msgid "Change order of arrows"
 #~ msgstr "矢印の場所を変更"
+
 #~ msgid "Select all"
 #~ msgstr "すべてを選択"
+
 #~ msgid "Selection to Path..."
 #~ msgstr "選択領域からパス..."
+
 #~ msgid "Selection To Path Advanced Settings"
 #~ msgstr "選択領域からパスの詳細設定"
+
 #~ msgid "TWAIN (Dump)..."
 #~ msgstr "TWAIN (書き出し)..."
+
 #~ msgid "TWAIN (Read)..."
 #~ msgstr "TWAIN (読み込み)..."
+
 #~ msgid "_TWAIN..."
 #~ msgstr "_TWAIN..."
+
 #~ msgid "Transferring TWAIN data..."
 #~ msgstr "TWAIN データを転送しています..."
+
 #~ msgid "GIMP Windows Icon Plugin"
 #~ msgstr "GIMP Windows プラグイン"
+
 #~ msgid "Icon details"
 #~ msgstr "アイコン詳細"
+
 #~ msgid "Windows icons cannot be higher or wider than 255 pixels."
 #~ msgstr "Windows アイコンの高さと幅は 255 ピクセルを超えてはいけません。"
+
 #~ msgid "Convert the image to RGB first!"
 #~ msgstr "画像を RGB に変換してからにしてください!"
+
 #~ msgid "Before and After"
 #~ msgstr "使用前と使用後"
 
@@ -14201,28 +14694,38 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "TIFF images"
 #~ msgstr "TIFF チャンネル"
+
 #~ msgid "Paint"
 #~ msgstr "描画"
+
 #~ msgid "All"
 #~ msgstr "全て"
+
 #~ msgid "Clockwise"
 #~ msgstr "時計周り"
+
 #~ msgid "Anti-Clockwise"
 #~ msgstr "反時計周り"
 
 #, fuzzy
 #~ msgid "Ifs_Compose..."
 #~ msgstr "Ifs 合成"
+
 #~ msgid "IfsCompose: Target"
 #~ msgstr "Ifs合成: 変換後色"
+
 #~ msgid "IfsCompose: Red"
 #~ msgstr "Ifs 合成: 赤"
+
 #~ msgid "IfsCompose: Green"
 #~ msgstr "Ifs 合成: 緑"
+
 #~ msgid "IfsCompose: Blue"
 #~ msgstr "Ifs 合成: 青"
+
 #~ msgid "IfsCompose: Black"
 #~ msgstr "Ifs 合成: 黒"
+
 #~ msgid "IfsCompose"
 #~ msgstr "Ifs 合成"
 
@@ -14261,26 +14764,37 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Select All"
 #~ msgstr "すべて選択"
+
 #~ msgid "IfsCompose Options"
 #~ msgstr "Ifs 合成 オプション"
+
 #~ msgid "Opening %s"
 #~ msgstr "%s を開いています..."
+
 #~ msgid "See %s"
 #~ msgstr "%s を見て下さい"
+
 #~ msgid "Loading %s:"
 #~ msgstr "%s 読み込み中:"
+
 #~ msgid "Saving %s:"
 #~ msgstr "%s 保存中:"
+
 #~ msgid "Despeckling..."
 #~ msgstr "非斑化しています..."
+
 #~ msgid "Rendering %s"
 #~ msgstr "レンダリング中 %s"
+
 #~ msgid "Scale (log 2):"
 #~ msgstr "スケール (log 2):"
+
 #~ msgid "Bezier Settings"
 #~ msgstr "ベジエ設定"
+
 #~ msgid "Number of Sides/Points/Turns:"
 #~ msgstr "側面/ポイント/回転の数:"
+
 #~ msgid ""
 #~ "The requested document could not be found in your GIMP help path as shown "
 #~ "above. This means that the topic has not yet been written or your "
@@ -14403,10 +14917,13 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/File/Acquire"
 #~ msgstr "/ファイル/取り込み/TWAIN..."
+
 #~ msgid "Pos X:"
 #~ msgstr "位置 X:"
+
 #~ msgid "Pos Y:"
 #~ msgstr "位置 Y:"
+
 #~ msgid "Pos Z:"
 #~ msgstr "位置 Z:"
 
@@ -14437,18 +14954,25 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "_Plugin Details"
 #~ msgstr "プラグインの説明"
+
 #~ msgid "Details <<"
 #~ msgstr "詳細 <<"
+
 #~ msgid "Details >>"
 #~ msgstr "詳細 >>"
+
 #~ msgid "Name:"
 #~ msgstr "名称:"
+
 #~ msgid "Blurb:"
 #~ msgstr "説明:"
+
 #~ msgid "Help:"
 #~ msgstr "ヘルプ:"
+
 #~ msgid "Plugin Descriptions"
 #~ msgstr "プラグインの説明"
+
 #~ msgid "Search by Name"
 #~ msgstr "名前で検索"
 
@@ -14463,12 +14987,16 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "Image types"
 #~ msgstr "画像種"
+
 #~ msgid "Search:"
 #~ msgstr "検索:"
+
 #~ msgid "DB Browser"
 #~ msgstr "DB ブラウザ"
+
 #~ msgid "In:"
 #~ msgstr "入力:"
+
 #~ msgid "Out:"
 #~ msgstr "出力:"
 
@@ -14479,16 +15007,20 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "S_inusoidal"
 #~ msgstr "波状"
+
 #~ msgid "EOF encountered on "
 #~ msgstr "EOF が現れました "
+
 #~ msgid "No memory for mapping colors"
 #~ msgstr "色をマップするためのメモリが無い"
+
 #~ msgid "Selection:"
 #~ msgstr "選択:"
 
 #, fuzzy
 #~ msgid "E_nable antialiasing"
 #~ msgstr "アンチエイリアシングする(_N)"
+
 #~ msgid "T_hreshold:"
 #~ msgstr "しきい値(_H):"
 
@@ -14503,12 +15035,16 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "_Ambient:"
 #~ msgstr "飽和度:"
+
 #~ msgid "_Diffuse:"
 #~ msgstr "拡散(_D):"
+
 #~ msgid "D_iffuse:"
 #~ msgstr "拡散(_I):"
+
 #~ msgid "_Specular:"
 #~ msgstr "反射(_S):"
+
 #~ msgid "_Highlight:"
 #~ msgstr "ハイライト(_H):"
 
@@ -14517,12 +15053,16 @@ msgstr "何も取り込まれませんでした"
 #~ msgstr ""
 #~ "パラメータを '%s'\n"
 #~ "に保存しました"
+
 #~ msgid "'%s' is not a HRZ file"
 #~ msgstr "'%s' は不正なファイルです"
+
 #~ msgid "Brush"
 #~ msgstr "ブラシ"
+
 #~ msgid "Airbrush"
 #~ msgstr "エアブラシ"
+
 #~ msgid "Pencil"
 #~ msgstr "鉛筆"
 
@@ -14535,8 +15075,10 @@ msgstr "何も取り込まれませんでした"
 #~ "絵筆やエアブラシ等で画像に対して描画します。パターンを選択すると現在選択さ"
 #~ "れているブラシとパターンで描画します。円/楕円を近似するトグルが設定されて"
 #~ "いる時だけ円/楕円にも適用されます。"
+
 #~ msgid "New"
 #~ msgstr "新規"
+
 #~ msgid "Multiple"
 #~ msgstr "多構成"
 
@@ -14546,8 +15088,10 @@ msgstr "何も取り込まれませんでした"
 #~ msgstr ""
 #~ "すべてのオブジェクトを一つのレイヤー (オリジナルまたは新規に) 描くかまたは"
 #~ "レイヤー毎に一つのオブジェクトを描く"
+
 #~ msgid "Draw on:"
 #~ msgstr "描画:"
+
 #~ msgid "Selection+Fill"
 #~ msgstr "選択+塗りつぶし"
 
@@ -14558,36 +15102,44 @@ msgstr "何も取り込まれませんでした"
 #~ msgstr ""
 #~ "描画種。ブラシか選択領域のどちらか。オプションについてはブラシページか選択"
 #~ "領域ページを見て下さい"
+
 #~ msgid "Using:"
 #~ msgstr "使用:"
 
 #, fuzzy
 #~ msgid "Reverse line"
 #~ msgstr "逆順で線引き"
+
 #~ msgid "Draw lines in reverse order"
 #~ msgstr "反対の順序で線を引く"
 
 #, fuzzy
 #~ msgid "Scale to image"
 #~ msgstr "画像の拡大縮小"
+
 #~ msgid "Scale drawings to images size"
 #~ msgstr "画像サイズを拡大縮小して描く"
 
 #, fuzzy
 #~ msgid "Approx. circles/ellipses"
 #~ msgstr "円/楕円を近似する"
+
 #~ msgid ""
 #~ "Approx. circles & ellipses using lines. Allows the use of brush fading "
 #~ "with these types of objects."
 #~ msgstr ""
 #~ "円と楕円を直線で近似します。これらのオブジェクトに対してブラシで描画するよ"
 #~ "うになります。"
+
 #~ msgid "Gfig Brush Selection"
 #~ msgstr "Gfig ブラシ選択"
+
 #~ msgid "Fade out:"
 #~ msgstr "フェードアウト:"
+
 #~ msgid "Gradient:"
 #~ msgstr "グラデーション:"
+
 #~ msgid "Pressure:"
 #~ msgstr "圧力:"
 
@@ -14598,16 +15150,20 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "Set brush..."
 #~ msgstr "ブラシ設定..."
+
 #~ msgid "Add"
 #~ msgstr "追加"
+
 #~ msgid "Subtract"
 #~ msgstr "減算"
+
 #~ msgid "Intersect"
 #~ msgstr "交わり"
 
 #, fuzzy
 #~ msgid "Fill type:"
 #~ msgstr "塗り種:"
+
 #~ msgid "Fill Opacity:"
 #~ msgstr "塗り不透明度:"
 
@@ -14618,34 +15174,45 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "All selections"
 #~ msgstr "すべての選択領域"
+
 #~ msgid "Fill after:"
 #~ msgstr "塗った後:"
+
 #~ msgid "Segment"
 #~ msgstr "セグメント"
+
 #~ msgid "Sector"
 #~ msgstr "セクタ"
+
 #~ msgid "Arc as:"
 #~ msgstr "円弧:"
 
 #, fuzzy
 #~ msgid "Lock on grid"
 #~ msgstr "格子固定"
+
 #~ msgid "Object"
 #~ msgstr "オブジェクト"
+
 #~ msgid "Create a new Gfig object collection for editing"
 #~ msgstr "編集のための新規 Gfig オブジェクトコレクションを作成する"
+
 #~ msgid "Load a single Gfig object collection"
 #~ msgstr "一つの Gfig オブジェクトコレクションを読み込む"
+
 #~ msgid "Edit Gfig object collection"
 #~ msgstr "Gfig オブジェクトコレクションを編集する"
+
 #~ msgid "_Merge"
 #~ msgstr "結合(_M)"
 
 #, fuzzy
 #~ msgid "Merge Gfig Ooject collection into the current edit session"
 #~ msgstr "Gfig オブジェクトコレクションを現在編集しているセッションと結合する"
+
 #~ msgid "Delete currently selected Gfig Object collection"
 #~ msgstr "現在選択中の Gfig オブジェクトコレクションを削除する"
+
 #~ msgid "Select folder and rescan Gfig object collections"
 #~ msgstr "ディレクトリを選んで Gfig オブジェクトコレクションを再スキャンする"
 
@@ -14670,34 +15237,43 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "Add Gfig path"
 #~ msgstr "Gfig パス追加"
+
 #~ msgid "Error in copy layer for onlayers"
 #~ msgstr "オンレイヤーのレイヤーコピー中にエラー発生"
+
 #~ msgid "About Gfig"
 #~ msgstr "GFig について"
+
 #~ msgid "Gfig - GIMP plug-in"
 #~ msgstr "Gfig - GIMP プラグイン"
 
 #, fuzzy
 #~ msgid "Release 2.0"
 #~ msgstr "リリース 1.3"
+
 #~ msgid "New Gfig Object"
 #~ msgstr "新規 gfig オブジェクト"
 
 #, fuzzy
 #~ msgid "Delete Gfig drawing"
 #~ msgstr "Gfig 画像削除"
+
 #~ msgid "%s copy"
 #~ msgstr "%s コピー"
+
 #~ msgid "Collection Details"
 #~ msgstr "コレクション詳細"
 
 #, fuzzy
 #~ msgid "Draw name:"
 #~ msgstr "描画名:"
+
 #~ msgid "(none)"
 #~ msgstr "(なし)"
+
 #~ msgid ""
 #~ msgstr "<なし>"
+
 #~ msgid "Curl Opacity"
 #~ msgstr "曲がった部分の不透明度"
 
@@ -14712,76 +15288,104 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "_Blur..."
 #~ msgstr "ぼかしています..."
+
 #~ msgid "R_andomization %:"
 #~ msgstr "乱数度(_A) %:"
+
 #~ msgid "You must specify either horizontal or vertical (or both)"
 #~ msgstr "水平または垂直のどちらかはかならず指定してください。"
+
 #~ msgid "Blur Horizontally"
 #~ msgstr "水平方向にぼかす"
+
 #~ msgid "Blur Vertically"
 #~ msgstr "垂直方向にぼかす"
+
 #~ msgid "Blur Radius:"
 #~ msgstr "ぼかし半径:"
 
 #, fuzzy
 #~ msgid "Gaussian Blur(_RLE)..."
 #~ msgstr "/フィルタ/ぼかし/ガウシアンぼかし (RLE)..."
+
 #~ msgid "RLE Gaussian Blur"
 #~ msgstr "RLE ガウシアンぼかし"
+
 #~ msgid "Image Preview"
 #~ msgstr "画像プレビュー"
+
 #~ msgid "Force baseline JPEG (Readable by all decoders)"
 #~ msgstr "ベースライン JPEG を強制 (すべてのプログラムで読み込み可能)"
+
 #~ msgid "DCT method (Speed/quality tradeoff):"
 #~ msgstr "DCT 法 (スピードと品質のトレードオフ):"
+
 #~ msgid "Save Background Color"
 #~ msgstr "背景色を保存"
+
 #~ msgid "Save Gamma"
 #~ msgstr "ガンマ値を保存"
+
 #~ msgid "Save Resolution"
 #~ msgstr "解像度を保存"
+
 #~ msgid "Save Creation Time"
 #~ msgstr "製作日時を保存"
+
 #~ msgid "Tile _Height:"
 #~ msgstr "タイル高(_H):"
+
 #~ msgid "C_ell Size:"
 #~ msgstr "セルサイズ(_E):"
 
 #, fuzzy
 #~ msgid "_Noisify..."
 #~ msgstr "ノイズ追加"
+
 #~ msgid "Noisify"
 #~ msgstr "ノイズ追加"
+
 #~ msgid "Random _Seed:"
 #~ msgstr "乱数種(_S):"
+
 #~ msgid "Save _Background Color"
 #~ msgstr "背景色を保存(_B)"
+
 #~ msgid "Save _Gamma"
 #~ msgstr "ガンマ値を保存(_G)"
+
 #~ msgid "Save _Resolution"
 #~ msgstr "解像度を保存(_R)"
+
 #~ msgid "Save Creation _Time"
 #~ msgstr "製作日時を保存(_T)"
+
 #~ msgid "_X Offset:"
 #~ msgstr "_X オフセット:"
+
 #~ msgid "_Y Offset:"
 #~ msgstr "_Y オフセット:"
+
 #~ msgid "_Random Seed:"
 #~ msgstr "乱数種(_R):"
+
 #~ msgid "R_andom Seed:"
 #~ msgstr "乱数種(_A):"
 
 #, fuzzy
 #~ msgid "Show Grid"
 #~ msgstr "格子に付ける"
+
 #~ msgid "Snap to Grid"
 #~ msgstr "格子に付ける"
 
 #, fuzzy
 #~ msgid "Select Contiguous Region"
 #~ msgstr "領域選択"
+
 #~ msgid "RLE Compression"
 #~ msgstr "RLE 圧縮"
+
 #~ msgid "Save: No filename given"
 #~ msgstr "保存: ファイル名が指定されていません"
 
@@ -14804,85 +15408,116 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Map/Map _Object..."
 #~ msgstr "/フィルタ/マップ/マップオブジェクト..."
+
 #~ msgid "Save Options"
 #~ msgstr "保存オプション"
 
 #, fuzzy
 #~ msgid "/Filters/Colors/Map/_Alien Map..."
 #~ msgstr "/フィルタ/色/マップ/エイリアンマップ..."
+
 #~ msgid "AlienMap: Transforming..."
 #~ msgstr "エイリアンマップ: 変換しています..."
+
 #~ msgid "AlienMap"
 #~ msgstr "エイリアンマップ"
+
 #~ msgid "Change intensity of the red channel"
 #~ msgstr "赤チャンネルの強度を変える"
+
 #~ msgid "Change intensity of the green channel"
 #~ msgstr "緑チャンネルの強度を変える"
+
 #~ msgid "Change intensity of the blue channel"
 #~ msgstr "青チャンネルの強度を変える"
+
 #~ msgid "Cos_ine"
 #~ msgstr "Cos(_I)"
+
 #~ msgid "Use sine-function for red component."
 #~ msgstr "赤の要素に対して Sin 関数を使用する。"
+
 #~ msgid "Use cosine-function for red component."
 #~ msgstr "赤の要素に対して Cos 関数を使用する。"
+
 #~ msgid ""
 #~ "Red channel: use linear mapping instead of any trigonometrical function"
 #~ msgstr "赤チャンネル: 三角関数ではなく線形マッピングを使用する"
+
 #~ msgid "Use sine-function for green component."
 #~ msgstr "緑の要素に対して Sin 関数を使用する。"
+
 #~ msgid "Use cosine-function for green component."
 #~ msgstr "緑の要素に対して Cos 関数を使用する。"
+
 #~ msgid ""
 #~ "Green channel: use linear mapping instead of any trigonometrical function"
 #~ msgstr "緑チャンネル: 三角関数ではなく線形マッピングを使用する"
+
 #~ msgid "Use sine-function for blue component."
 #~ msgstr "青の要素に対して Sin 関数を使用する。"
+
 #~ msgid "Use cosine-function for blue component."
 #~ msgstr "青の要素に対して Cos 関数を使用する。"
+
 #~ msgid ""
 #~ "Blue channel: use linear mapping instead of any trigonometrical function"
 #~ msgstr "青チャンネル: 三角関数ではなく線形マッピングを使用する"
+
 #~ msgid "About AlienMap"
 #~ msgstr "エイリアンマップについて"
 
 #, fuzzy
 #~ msgid "/Filters/Colors/Map/Alien Map _2..."
 #~ msgstr "/フィルタ/色/マップ/エイリアンマップ 2..."
+
 #~ msgid "Change frequency of the red/hue channel"
 #~ msgstr "赤/色相-チャンネルの振動数を変える"
+
 #~ msgid "Change angle of the red/hue channel"
 #~ msgstr "赤/色相-チャンネルの回転角を変える"
+
 #~ msgid "Change frequency of the green/saturation channel"
 #~ msgstr "緑/彩度-チャンネルの周波数を変える"
+
 #~ msgid "Change angle of the green/saturation channel"
 #~ msgstr "緑/彩度チャンネルの回転角を変える"
+
 #~ msgid "Change frequency of the blue/luminance channel"
 #~ msgstr "青/発光-チャンネルの振動数を変える"
+
 #~ msgid "Change angle of the blue/luminance channel"
 #~ msgstr "青/発光-チャンネルの回転角を変える"
+
 #~ msgid "Use function for red/hue component"
 #~ msgstr "赤/色相-要素に対して関数を適用する"
+
 #~ msgid "Use function for green/saturation component"
 #~ msgstr "緑/彩度-要素に対して関数を適用する"
+
 #~ msgid "Use function for blue/luminance component"
 #~ msgstr "青/発光-要素に対して関数を適用する"
+
 #~ msgid "About AlienMap2"
 #~ msgstr "エイリアンマップ 2 について"
 
 #, fuzzy
 #~ msgid "/Filters/Render/Pattern/CML _Explorer..."
 #~ msgstr "/フィルタ/下塗り/パターン/CML エクスプローラ..."
+
 #~ msgid "NULL"
 #~ msgstr "NULL"
+
 #~ msgid "The Graph"
 #~ msgstr "グラフ"
+
 #~ msgid "CML File Operation Warning"
 #~ msgstr "CML ファイル操作警告"
 
 #, fuzzy
 #~ msgid "/Layer/Align _Visible Layers..."
 #~ msgstr "/レイヤー/可視レイヤーの整列..."
+
 #~ msgid "Parameter Settings"
 #~ msgstr "パラメータ設定"
 
@@ -14917,18 +15552,23 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Colors/_Border Average..."
 #~ msgstr "/フィルタ/色/縁平均..."
+
 #~ msgid "1 (nonsense?)"
 #~ msgstr "1 (無意味?)"
+
 #~ msgid "256 (nonsense?)"
 #~ msgstr "256 (無意味?)"
 
 #, fuzzy
 #~ msgid "/Filters/Map/_Bump Map..."
 #~ msgstr "/フィルタ/マップ/バンプマップ..."
+
 #~ msgid "_Linear Map"
 #~ msgstr "線形マップ(_L)"
+
 #~ msgid "_Spherical Map"
 #~ msgstr "球面マップ(_S)"
+
 #~ msgid "S_inuosidal Map"
 #~ msgstr "波型マップ(_I)"
 
@@ -14999,6 +15639,7 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Map/_Displace..."
 #~ msgstr "/フィルタ/マップ/ずらし..."
+
 #~ msgid "Displace Options"
 #~ msgstr "ずらしオプション"
 
@@ -15017,6 +15658,7 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Colors/Map/_Color Exchange..."
 #~ msgstr "/フィルタ/色/マップ/色交換..."
+
 #~ msgid "_Selection"
 #~ msgstr "選択(_S)"
 
@@ -15031,12 +15673,16 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Toys/Gee-_Slime"
 #~ msgstr "/フィルタ/おもちゃ/Gee-スライム"
+
 #~ msgid "GEE-ZOOM: The Plug-In Formerly Known As \"The GIMP E'er Egg\""
 #~ msgstr "GEE-万華鏡: 以前は \"The GIMP E'er Egg\" だったプラグイン"
+
 #~ msgid "Save as GIcon"
 #~ msgstr "GIcon 形式で保存"
+
 #~ msgid "Icon Name:"
 #~ msgstr "アイコン名:"
+
 #~ msgid "Milliseconds"
 #~ msgstr "ミリ秒"
 
@@ -15067,6 +15713,7 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Render/Pattern/_Jigsaw..."
 #~ msgstr "/フィルタ/下塗り/パターン/ジグソーパズル..."
+
 #~ msgid "Image comments"
 #~ msgstr "画像コメント"
 
@@ -15125,10 +15772,13 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Distorts/P_olar Coords..."
 #~ msgstr "/フィルタ/歪み/極座標..."
+
 #~ msgid "write error occured"
 #~ msgstr "書き出しエラー発生"
+
 #~ msgid "_X-Offset:"
 #~ msgstr "_X オフセット:"
+
 #~ msgid "_Y-Offset:"
 #~ msgstr "_Y オフセット:"
 
@@ -15151,6 +15801,7 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Noise/S_catter HSV..."
 #~ msgstr "/フィルタ/ノイズ/HSV 散乱..."
+
 #~ msgid "Preview (1:4) - Right Click to Jump"
 #~ msgstr "プレビュー (1:4) - 右クリックでジャンプします"
 
@@ -15209,6 +15860,7 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "Ratio _X:"
 #~ msgstr "回転:"
+
 #~ msgid "Targa Options"
 #~ msgstr "Targa オプション"
 
@@ -15219,10 +15871,13 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Map/_Small Tiles..."
 #~ msgstr "/フィルタ/マップ/小さくして並べる..."
+
 #~ msgid "Flipping"
 #~ msgstr "ひっくり返し"
+
 #~ msgid "Applied to Tile"
 #~ msgstr "適用するタイル"
+
 #~ msgid "Segment Setting"
 #~ msgstr "分割設定"
 
@@ -15249,8 +15904,10 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Generic/_Dilate"
 #~ msgstr "/フィルタ/汎用/Gfig..."
+
 #~ msgid "Secondary Options"
 #~ msgstr "二次オプション"
+
 #~ msgid "Use Mag Map"
 #~ msgstr "強度マップを使う"
 
@@ -15261,8 +15918,10 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Distorts/W_hirl and Pinch..."
 #~ msgstr "/フィルタ/歪み/ぐるぐるひねる..."
+
 #~ msgid "/File/Acquire/From Clipboard"
 #~ msgstr "/ファイル/取り込み/クリップボードから..."
+
 #~ msgid "/File/Page Setup"
 #~ msgstr "/ファイル/印刷設定"
 
@@ -15273,32 +15932,44 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Colors/_Filter Pack..."
 #~ msgstr "/フィルタ/色/フィルタパック..."
+
 #~ msgid "Display"
 #~ msgstr "ディスプレイ"
+
 #~ msgid "CirclePalette"
 #~ msgstr "環状パレット"
+
 #~ msgid "Lighter And Darker"
 #~ msgstr "明るく暗く"
+
 #~ msgid "Miscellaneous Options"
 #~ msgstr "その他のオプション"
+
 #~ msgid "With BG of:"
 #~ msgstr "背景:"
+
 #~ msgid "Selection Type:"
 #~ msgstr "選択種:"
+
 #~ msgid "none"
 #~ msgstr "なし"
+
 #~ msgid "Not found \"%s\": used \"%s\" instead"
 #~ msgstr "\"%s\" が見つかりません: \"%s\" を使用します"
+
 #~ msgid "Brush Preview:"
 #~ msgstr "ブラシプレビュー:"
 
 #, fuzzy
 #~ msgid "/Filters/Artistic/_GIMPressionist..."
 #~ msgstr "/フィルタ/芸術的効果/GIMPressionist..."
+
 #~ msgid "Paper Preview:"
 #~ msgstr "紙プレビュー:"
+
 #~ msgid "(Desc)"
 #~ msgstr "(説明)"
+
 #~ msgid ""
 #~ "\n"
 #~ "If you come up with some nice Presets,\n"
@@ -15315,14 +15986,17 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Render/Nature/Ifs_Compose..."
 #~ msgstr "/フィルタ/下塗り/自然/Ifs合成..."
+
 #~ msgid "lpeek.mrijk@consunet.nl"
 #~ msgstr "lpeek.mrijk@consunet.nl"
+
 #~ msgid "File exists!"
 #~ msgstr "ファイルが存在します!"
 
 #, fuzzy
 #~ msgid "Draws a maze."
 #~ msgstr "描画名:"
+
 #~ msgid "Selection is %dx%d"
 #~ msgstr "選択は %dx%d"
 
@@ -15337,16 +16011,22 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Filters/Colors/Map/Colormap _Rotation..."
 #~ msgstr "/フィルタ/色/マップ/カラーマップ回転..."
+
 #~ msgid "What is Gray?"
 #~ msgstr "グレーとは?"
+
 #~ msgid "Main"
 #~ msgstr "メイン"
+
 #~ msgid "M_inimum Height:"
 #~ msgstr "最小の高さ(_I):"
+
 #~ msgid "Minimum height for bumps"
 #~ msgstr "バンプマップの最小の高さ:"
+
 #~ msgid "Auto_stretch to Fit Value Range"
 #~ msgstr "明度域を自動的に調整する(_S)"
+
 #~ msgid "Fit into value range"
 #~ msgstr "明度域を合わせる"
 
@@ -15355,22 +16035,27 @@ msgstr "何も取り込まれませんでした"
 #~ "Failed to open help files:\n"
 #~ "%s"
 #~ msgstr "GFlare ファイル '%s' のオープンに失敗: %s"
+
 #~ msgid "About..."
 #~ msgstr "プラグインについて..."
+
 #~ msgid "Only an indexed-alpha image can be saved in CEL format"
 #~ msgstr "インデックスアルファ画像のみ CEL 形式で保存できます"
 
 #, fuzzy
 #~ msgid "Image dimensions: %dx%d"
 #~ msgstr "画像寸法: %d x %d"
+
 #~ msgid ""
 #~ "Can't open '%s':\n"
 #~ "%s"
 #~ msgstr ""
 #~ "'%s' が開けません:\n"
 #~ "%s"
+
 #~ msgid "Cannot operate on unknown image types or alpha images"
 #~ msgstr "不明な画像種や透明度を持った画像に対しては使用できません"
+
 #~ msgid "Not enough memory to allocate buffers for optimization.\n"
 #~ msgstr "最適化に必要なメモリが確保できません。\n"
 
@@ -15381,120 +16066,166 @@ msgstr "何も取り込まれませんでした"
 #~ msgstr ""
 #~ "ファイル '%s' への書き込みに失敗:\n"
 #~ "%s"
+
 #~ msgid "gauss_iir: you must specify either horizontal or vertical (or both)"
 #~ msgstr "gauss_iir: 横または縦のどちらかはかならず指定してください。"
+
 #~ msgid "Width: "
 #~ msgstr "幅: "
+
 #~ msgid "Spacing: "
 #~ msgstr "間隔: "
+
 #~ msgid "Offset: "
 #~ msgstr "オフセット: "
+
 #~ msgid ""
 #~ "Color Mapping / Adjust FG/BG:\n"
 #~ "Cannot operate on gray/indexed images"
 #~ msgstr ""
 #~ "色マッピング / 前景/背景調整:\n"
 #~ "グレースケールやインデックス画像には適用できません"
+
 #~ msgid ""
 #~ "'%s':\n"
 #~ "PNG error. File corrupted?"
 #~ msgstr ""
 #~ "'%s':\n"
 #~ "PNG エラー。ファイルが壊れているようです。"
+
 #~ msgid ""
 #~ "'%s':\n"
 #~ "Unknown PNG color model"
 #~ msgstr ""
 #~ "'%s':\n"
 #~ "不明な PNG 色モデル"
+
 #~ msgid ""
 #~ "'%s':\n"
 #~ "PNG error. Couldn't save image"
 #~ msgstr ""
 #~ "'%s':\n"
 #~ "PNG エラー。画像を保存できませんでした"
+
 #~ msgid "Can't interpret file"
 #~ msgstr "ファイルが解釈できません"
+
 #~ msgid "_after"
 #~ msgstr "取り込みは(_A)"
+
 #~ msgid "sel_gauss: Cannot operate on indexed color images"
 #~ msgstr "sel_gauss: インデックス画像には適用できません"
+
 #~ msgid "Interpreting %s:"
 #~ msgstr "%s を解釈しています:"
+
 #~ msgid "Can't open file as XWD file"
 #~ msgstr "XWD ファイル形式のファイルが開けません"
+
 #~ msgid "XWD save cannot handle images with alpha channels"
 #~ msgstr "XWD による保存はアルファチャンネルを持った画像を取り扱えません"
+
 #~ msgid "cannot operate on unknown image types"
 #~ msgstr "不明な画像種は扱えません"
+
 #~ msgid "Saving '%s':"
 #~ msgstr "'%s' 保存中:"
+
 #~ msgid "Can't open '%s': %s"
 #~ msgstr "'%s' を開けません: %s"
+
 #~ msgid "GFlare: cannot operate on indexed color images"
 #~ msgstr "GFlare: インデックス画像には適用できません"
+
 #~ msgid "untitled"
 #~ msgstr "名称未設定"
+
 #~ msgid ""
 #~ "Cannot save file '%s'.\n"
 #~ "Check the path and permissions."
 #~ msgstr ""
 #~ "ファイル '%s' を保存できません。\n"
 #~ "パスとアクセス権限を確認してください。"
+
 #~ msgid "Load failed"
 #~ msgstr "読み込みに失敗しました"
+
 #~ msgid "Load IFS file"
 #~ msgstr "IFS ファイル読み込み"
+
 #~ msgid "Help"
 #~ msgstr "ヘルプ"
+
 #~ msgid "/File/Acquire/Screen Shot..."
 #~ msgstr "/ファイル/取り込み/画面取り込み..."
+
 #~ msgid "Can't open (write): %s"
 #~ msgstr "書き込みのための %s が開けません"
+
 #~ msgid "xjt: cannot operate on unknown image types"
 #~ msgstr "xjt: 不明な画像種は取り扱えません"
+
 #~ msgid "Can't open: %s"
 #~ msgstr "%s が開けません"
+
 #~ msgid "Can't open (read): %s"
 #~ msgstr "%s が開けません"
+
 #~ msgid "Align Visible Layers: there are too few layers."
 #~ msgstr "可視レイヤーの整列: レイヤー数が少なすぎます。"
+
 #~ msgid "** From GRADIENT **"
 #~ msgstr "** グラデーションから **"
+
 #~ msgid "** From INVERSE GRADIENT **"
 #~ msgstr "** 反転グラデーションから **"
+
 #~ msgid "Display Grid"
 #~ msgstr "格子表示"
+
 #~ msgid "Save As..."
 #~ msgstr "別名で保存..."
+
 #~ msgid "A_bout..."
 #~ msgstr "Gimpressionist について(_B)..."
+
 #~ msgid "Click here to load your file"
 #~ msgstr "個人ファイルを読み込みます"
+
 #~ msgid "Click here to cancel load procedure"
 #~ msgstr "読み込みをキャンセルします"
+
 #~ msgid "Click here to save your file"
 #~ msgstr "個人ファイルに保存します"
+
 #~ msgid "Click here to cancel save procedure"
 #~ msgstr "保存をキャンセルします"
 
 #, fuzzy
 #~ msgid "/Filters/Render/_Sinus..."
 #~ msgstr "/フィルタ/下塗り/Sin 曲線..."
+
 #~ msgid "/Xtns/Web Browser/Open URL..."
 #~ msgstr "/拡張/Web ブラウザ/URL 指定..."
+
 #~ msgid "Open URL"
 #~ msgstr "URL を指定して開く"
+
 #~ msgid "URL:"
 #~ msgstr "URL:"
+
 #~ msgid "Window:"
 #~ msgstr "ウインドウ:"
+
 #~ msgid "Current"
 #~ msgstr "現在"
+
 #~ msgid "Can't open bzip2ed file without a sensible extension"
 #~ msgstr "bzip2 圧縮されたファイルは正しい拡張子無しでは開けません"
+
 #~ msgid "With _Decorations"
 #~ msgstr "ウィンドウ飾りも含める(_D)"
+
 #~ msgid ""
 #~ "GIMP Help Browser Error.\n"
 #~ "\n"
@@ -15505,92 +16236,126 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "GIMP_HELP_ROOT HTML ディレクトリが見つかりません。\n"
 #~ "(%s)"
+
 #~ msgid "/Select/To Path"
 #~ msgstr "/選択/パスに変換"
+
 #~ msgid "Your comment string is too long."
 #~ msgstr "コメント文が長すぎます。"
 
 #, fuzzy
 #~ msgid "Error reading GFlare folder '%s'"
 #~ msgstr "GFlare ディレクトリ \"%s\" 読み込み中にエラー発生"
+
 #~ msgid "Could not save."
 #~ msgstr "保存できません。"
+
 #~ msgid "Failed to write file\n"
 #~ msgstr "ファイル書き込み失敗\n"
+
 #~ msgid "%s: can't open \"%s\""
 #~ msgstr "%s: \"%s\" を開けない"
+
 #~ msgid "Can't open %s"
 #~ msgstr "%s が開けません"
+
 #~ msgid ""
 #~ "%s\n"
 #~ "is not present or is unreadable"
 #~ msgstr ""
 #~ "%s\n"
 #~ "は存在しないか読み込み禁止になっています"
+
 #~ msgid ""
 #~ "CEL Couldn't write image to\n"
 #~ "%s"
 #~ msgstr ""
 #~ "CEL %s\n"
 #~ "に保存できません"
+
 #~ msgid "Error: could not open \"%s\""
 #~ msgstr "エラー: \"%s\" が開けません"
+
 #~ msgid "Unable to open %s"
 #~ msgstr "%s が開けません"
+
 #~ msgid "GIF: can't open %s\n"
 #~ msgstr "GIF: %s が開けない\n"
+
 #~ msgid "can't open \"%s\"\n"
 #~ msgstr "\"%s\" が開けない\n"
+
 #~ msgid "Max RGB: Scanning..."
 #~ msgstr "RGB 値最大: 走査しています..."
+
 #~ msgid "Newsprintifing..."
 #~ msgstr "新聞印刷しています..."
+
 #~ msgid ""
 #~ "%s\n"
 #~ "Couldn't create file"
 #~ msgstr ""
 #~ "%s\n"
 #~ "ファイルが作成できませんでした"
+
 #~ msgid "PNM: Can't open file %s."
 #~ msgstr "PNM: %s が開けません。"
+
 #~ msgid "PS: can't open file for reading"
 #~ msgstr "PS: 読み込みファイルが開けない"
+
 #~ msgid "Interpreting and Loading %s:"
 #~ msgstr "%s を解釈読み込み中:"
+
 #~ msgid "PS: cannot operate on unknown image types"
 #~ msgstr "PS: 不明な画像種は取り扱えない"
+
 #~ msgid "PS: can't open file for writing"
 #~ msgstr "PS: 書き出しファイルが開けない"
+
 #~ msgid "Scatter HSV: Scattering..."
 #~ msgstr "Scatter_HSV: 散乱させています..."
+
 #~ msgid "Can't open file for reading"
 #~ msgstr "読み込にファイルが開けない"
+
 #~ msgid "TGA: can't open \"%s\"\n"
 #~ msgstr "TGA: \"%s\" が開けません\n"
 
 #, fuzzy
 #~ msgid "TIFF: Can't open '%s'"
 #~ msgstr "GIF: %s が開けない\n"
+
 #~ msgid "XBM: cannot open \"%s\"\n"
 #~ msgstr "XBM: \"%s\" が開けない\n"
+
 #~ msgid "XBM: cannot create \"%s\"\n"
 #~ msgstr "XBM: \"%s\" が作れない\n"
+
 #~ msgid "can't open file for reading"
 #~ msgstr "読み込むファイルが開けない"
+
 #~ msgid "can't get memory for colormap"
 #~ msgstr "カラーマップのためのメモリが取得できない"
+
 #~ msgid "can't open file for writing"
 #~ msgstr "書き出しファイルが開けません"
+
 #~ msgid "Prev"
 #~ msgstr "プレビュー"
+
 #~ msgid "Ops"
 #~ msgstr "Ops"
+
 #~ msgid "Error in creating layer"
 #~ msgstr "レイヤー作成中にエラー発生"
+
 #~ msgid "FLI: Can't open \"%s\""
 #~ msgstr "FLI: \"%s\" を開けません"
+
 #~ msgid "Add >>"
 #~ msgstr "追加 >>"
+
 #~ msgid "Remove"
 #~ msgstr "削除"
 
@@ -15623,22 +16388,27 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "/Image/Transform/Rotate 270 degrees"
 #~ msgstr "/画像/変形/回転/270度回転"
+
 #~ msgid "/Image/Mode/Decompose..."
 #~ msgstr "/画像/モード/チャンネル分解..."
+
 #~ msgid "Dup"
 #~ msgstr "複製"
 
 #, fuzzy
 #~ msgid "Del"
 #~ msgstr "削除"
+
 #~ msgid "Load"
 #~ msgstr "読み込み"
+
 #~ msgid ""
 #~ "by Vidar Madsen\n"
 #~ "September 1999"
 #~ msgstr ""
 #~ "Vidar Madsen\n"
 #~ "1999 年 9月 作"
+
 #~ msgid ""
 #~ "No fractalexplorer-path in gimprc:\n"
 #~ "You need to add an entry like\n"
@@ -15654,18 +16424,23 @@ msgstr "何も取り込まれませんでした"
 #~ "fractalexplorer-path misconfigured - the following folders were not found:"
 #~ msgstr ""
 #~ "fractalexplorer-path が不正です - 以下のディレクトリが見付かりません"
+
 #~ msgid "Enable Tooltips"
 #~ msgstr "簡易説明を表示する"
+
 #~ msgid "Enable/disable tooltip messages"
 #~ msgstr "簡易説明の有効/無効"
 
 #, fuzzy
 #~ msgid "_Disable Tooltips"
 #~ msgstr "簡易説明をしない"
+
 #~ msgid "Toggle Tooltips on/off"
 #~ msgstr "簡易説明のオン/オフ"
+
 #~ msgid "Loading MPEG movie..."
 #~ msgstr "MPEG 動画を読み込んでいます..."
+
 #~ msgid "Unnamed channel"
 #~ msgstr "名前なしチャンネル"
 
@@ -15680,20 +16455,28 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "gfig-path misconfigured - the following folders were not found:"
 #~ msgstr "gfig-path は未設定です - 次のディレクトリが見付かりませんでした"
+
 #~ msgid "Show Tooltips"
 #~ msgstr "簡易説明を表示する"
+
 #~ msgid "Rescan"
 #~ msgstr "再スキャン"
+
 #~ msgid "Done"
 #~ msgstr "完了"
+
 #~ msgid "Enter Gfig Entry Name"
 #~ msgstr "Gfig エントリ名を入力"
+
 #~ msgid "Load Gfig obj"
 #~ msgstr "Gfig オブジェクト読み込み"
+
 #~ msgid "Email alt@picnic.demon.co.uk"
 #~ msgstr "Email alt@picnic.demon.co.uk"
+
 #~ msgid "Isometric grid By Rob Saunders"
 #~ msgstr "等幅グリッド By Rob Saunders"
+
 #~ msgid ""
 #~ "No gflare-path in gimprc:\n"
 #~ "You need to add an entry like\n"
@@ -15707,8 +16490,10 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "gflare-path misconfigured - the following folders were not found:"
 #~ msgstr "gflare-path が不正です - 以下のディレクトリが見つかりません"
+
 #~ msgid "Data changed"
 #~ msgstr "データが変更されました"
+
 #~ msgid ""
 #~ "Image size has changed.\n"
 #~ "Resize Area's?"
@@ -15719,52 +16504,74 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "_Apply"
 #~ msgstr "適用"
+
 #~ msgid "Abbr."
 #~ msgstr "省略形"
+
 #~ msgid "Don't Save Unit"
 #~ msgstr "単位を保存しない"
+
 #~ msgid "Don't save the currently selected unit before GIMP exits."
 #~ msgstr "GIMP が終了するまで現在選択中の単位を保存しない。"
+
 #~ msgid "Save Unit"
 #~ msgstr "単位を保存"
+
 #~ msgid "Save the currently selected unit before GIMP exits."
 #~ msgstr "GIMP 終了前に現在選択中の単位を保存する。"
+
 #~ msgid "Save as..."
 #~ msgstr "別名で保存..."
+
 #~ msgid "Specifies the amount of embossing to apply to each brush stroke"
 #~ msgstr "個々のブラシ描画に適用する浮き彫りの程度を指定する"
+
 #~ msgid "Quit the program"
 #~ msgstr "プログラム終了"
+
 #~ msgid "Show some information about program"
 #~ msgstr "プログラムに関する情報を表示する"
+
 #~ msgid "Run with the selected settings"
 #~ msgstr "選択された設定で実行"
+
 #~ msgid "How large an angle-span to use (360 = full circle)"
 #~ msgstr "使用する角度範囲 (360 が全円)"
+
 #~ msgid "Apply and exit the editor"
 #~ msgstr "適用して編集終了する"
+
 #~ msgid "Apply, but stay inside the editor"
 #~ msgstr "適用するが、編集を続ける"
+
 #~ msgid "Cancel all changes and exit"
 #~ msgstr "すべての変更を破棄して終了する"
+
 #~ msgid "Placement:"
 #~ msgstr "配置:"
+
 #~ msgid "Refresh"
 #~ msgstr "再読み込み"
+
 #~ msgid "Spot"
 #~ msgstr "スポット"
 
 #, fuzzy
 #~ msgid "_Update Preview"
 #~ msgstr "プレビュー更新"
+
 #~ msgid "rgb-compose"
 #~ msgstr "rgb-compose"
+
 #~ msgid "rgba-compose"
 #~ msgstr "rgba-compose"
+
 #~ msgid "hsv-compose"
 #~ msgstr "hsv-compose"
+
 #~ msgid "cmy-compose"
 #~ msgstr "cmy-compose"
+
 #~ msgid "cmyk-compose"
 #~ msgstr "cmyk-compose"
 
@@ -15773,50 +16580,71 @@ msgstr "何も取り込まれませんでした"
 #~ "PNG: Couldn't simply reduce colors further.\n"
 #~ "Saving as opaque.\n"
 #~ msgstr "GIF: これ以上単純には減色できません。不透明として保存します。\n"
+
 #~ msgid "not valid GFlare file: %s"
 #~ msgstr "不正な Gフレア ファイルです: %s"
+
 #~ msgid "Close"
 #~ msgstr "閉じる"
 
 #, fuzzy
 #~ msgid "Image preview"
 #~ msgstr "画像プレビュー"
+
 #~ msgid "Undo Zoom"
 #~ msgstr "拡大取り消し"
+
 #~ msgid "Redo Zoom"
 #~ msgstr "拡大やり直し"
+
 #~ msgid "Step In"
 #~ msgstr "拡大"
+
 #~ msgid "Step Out"
 #~ msgstr "縮小"
+
 #~ msgid "Antialiasing Options"
 #~ msgstr "アンチエイリアシングオプション"
+
 #~ msgid "Bumpmap Settings"
 #~ msgstr "バンプマップ設定"
+
 #~ msgid "Environment Settings"
 #~ msgstr "環境設定"
+
 #~ msgid "Depth:"
 #~ msgstr "深度:"
+
 #~ msgid "Length:"
 #~ msgstr "長さ:"
+
 #~ msgid "Material"
 #~ msgstr "物質"
+
 #~ msgid "Preview!"
 #~ msgstr "プレビュー!"
+
 #~ msgid "Hue Settings"
 #~ msgstr "色相設定"
+
 #~ msgid "Saturation Settings"
 #~ msgstr "彩度設定"
+
 #~ msgid "Value (Gray Image) Settings"
 #~ msgstr "明度(グレー画像)設定"
+
 #~ msgid "Other Parameter Settings"
 #~ msgstr "他のパラメータ設定"
+
 #~ msgid "Misc Operations"
 #~ msgstr "雑多な操作"
+
 #~ msgid "CopyInv"
 #~ msgstr "反転コピー"
+
 #~ msgid "SaveCurve"
 #~ msgstr "カーブ保存"
+
 #~ msgid "Rotate: "
 #~ msgstr "回転: "
 
@@ -15847,32 +16675,44 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "_Goodies"
 #~ msgstr "格子とガイド"
+
 #~ msgid "print_spline: strange degree (%d)"
 #~ msgstr "print_spline: 不正な角度 (%d)"
+
 #~ msgid "selection_to_path"
 #~ msgstr "選択領域からされたパス"
+
 #~ msgid "gimp_image_get_selection failed"
 #~ msgstr "gimp_image_get_selection 失敗"
+
 #~ msgid "Internal error. Selection bpp > 1"
 #~ msgstr "内部エラー。選択領域の bpp > 1"
+
 #~ msgid "Repeat:"
 #~ msgstr "繰り返し:"
+
 #~ msgid "Azimuth:"
 #~ msgstr "方向:"
 
 #, fuzzy
 #~ msgid "Check _Size:"
 #~ msgstr "格子の大きさ:"
+
 #~ msgid "Horizontal:"
 #~ msgstr "水平:"
+
 #~ msgid "Vertical:"
 #~ msgstr "垂直:"
+
 #~ msgid "Wind Strength must be greater than 0."
 #~ msgstr "風の強さは 0 より大きくなければいけません。"
+
 #~ msgid "DB Browser (init...)"
 #~ msgstr "DB ブラウザ (初期化しています...)"
+
 #~ msgid "DB Browser (please wait)"
 #~ msgstr "DB ブラウザ (お待ち下さい)"
+
 #~ msgid ""
 #~ "Directory not found
%s
Couldn't change to directory
%s
この話題のためのヘルプが"
 #~ "まだ書かれていないかあなたのインストールのどこかが間違っています。あなたが"
 #~ "これをバグとして報告する前に慎重に調べて下さい"
+
 #~ msgid ""
 #~ "GIMP Help Browser Error.\n"
 #~ "\n"
@@ -15897,6 +16738,7 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "ルート HTML ディレクトリが見つかりません。\n"
 #~ "(%s)"
+
 #~ msgid ""
 #~ "Imagemap plug-in 1.3\n"
 #~ "\n"
@@ -15911,80 +16753,118 @@ msgstr "何も取り込まれませんでした"
 #~ "lpeek.mrijk@consunet.nl \n"
 #~ "\n"
 #~ "GNU 一般公有使用許諾書に基づいて公開  "
+
 #~ msgid "Width"
 #~ msgstr "幅"
+
 #~ msgid "Height"
 #~ msgstr "高さ"
+
 #~ msgid "Comment about this area: (optional)"
 #~ msgstr "この領域に関するコメント: (オプション)"
+
 #~ msgid "Preferences..."
 #~ msgstr "環境設定..."
+
 #~ msgid "Quit"
 #~ msgstr "終了"
+
 #~ msgid "Zoom In"
 #~ msgstr "拡大表示"
+
 #~ msgid "Zoom Out"
 #~ msgstr "縮小表示"
+
 #~ msgid "In"
 #~ msgstr "拡大表示"
+
 #~ msgid "Out"
 #~ msgstr "縮小表示"
+
 #~ msgid "Tile Height:"
 #~ msgstr "タイル高:"
+
 #~ msgid "Reset to Defaults"
 #~ msgstr "初期値に戻す"
+
 #~ msgid "Center Image"
 #~ msgstr "中心に配置"
+
 #~ msgid "Scaling"
 #~ msgstr "拡大縮小"
+
 #~ msgid "Adjust Color"
 #~ msgstr "色調整"
+
 #~ msgid "B&W"
 #~ msgstr "白黒"
+
 #~ msgid "/Filters/Render/Pattern/Mosaic..."
 #~ msgstr "/フィルタ/下塗り/パターン/モザイク..."
+
 #~ msgid "/Layers/Rotate/90 degrees"
 #~ msgstr "/レイヤー/回転/90度回転"
+
 #~ msgid "/Layers/Rotate/180 degrees"
 #~ msgstr "/レイヤー/回転/180 度回転"
+
 #~ msgid "/Layers/Rotate/270 degrees"
 #~ msgstr "/レイヤー/回転/270度回転"
+
 #~ msgid "Sinusodial"
 #~ msgstr "Sin 曲線"
+
 #~ msgid "Value: "
 #~ msgstr "値: "
+
 #~ msgid "Press Button"
 #~ msgstr "押しボタン"
+
 #~ msgid "GAP Animated Filter apply"
 #~ msgstr "GAP 動画フィルタ適用"
+
 #~ msgid "Animated Filter apply (init)"
 #~ msgstr "動画フィルタ適用 (初期)"
+
 #~ msgid "Gen Code by name"
 #~ msgstr "名前で元コードを検索"
+
 #~ msgid "Animated Filter apply (by name - please wait)"
 #~ msgstr "動画フィルタ適用 (名前で - お待ち下さい)"
+
 #~ msgid "Animated Filter apply (by blurb - please wait)"
 #~ msgstr "動画フィルタ適用 (説明で - お待ち下さい)"
+
 #~ msgid "Animated Filter apply (please wait)"
 #~ msgstr "動画フィルタ適用 (お待ち下さい)"
+
 #~ msgid "Animated Filter apply"
 #~ msgstr "動画フィルタ適用"
+
 #~ msgid "/Video/Split Video to Frames"
 #~ msgstr "/動画/フレームに分割"
+
 #~ msgid "/Xtns/Split Video to Frames"
 #~ msgstr "/拡張/フレームに分割"
+
 #~ msgid "/Video/Split Video to Frames/MPEG1"
 #~ msgstr "/動画/フレームに分割/MPEG1"
+
 #~ msgid "/Xtns/Split Video to Frames/MPEG1"
 #~ msgstr "/拡張/フレームに分割/MPEG1"
+
 #~ msgid "Overwrite Frame"
 #~ msgstr "フレームを上書き"
+
 #~ msgid "Overwrite All"
 #~ msgstr "すべて上書き"
+
 #~ msgid "GAP Question"
 #~ msgstr "GAP 質問"
+
 #~ msgid "Decoding MPEG Movie..."
 #~ msgstr "MPEG 動画をデコードしています..."
+
 #~ msgid ""
 #~ "Name of the MPEG1 videofile to READ.\n"
 #~ "Frames are extracted from the videofile\n"
@@ -15995,20 +16875,26 @@ msgstr "何も取り込まれませんでした"
 #~ "動画ファイルから各フレームを取り出して\n"
 #~ "個々にディスク上のファイルに書き出します。\n"
 #~ "動画ファイル中の音声トラックは無視されます。"
+
 #~ msgid "Framenumber of 1st frame to extract"
 #~ msgstr "最初に取り出すフレーム番号"
+
 #~ msgid "Framenumber of last frame to extract"
 #~ msgstr "最後に取り出すフレーム番号"
+
 #~ msgid "Framenames:"
 #~ msgstr "フレーム名:"
+
 #~ msgid ""
 #~ "Basename for the AnimFrames to write on disk\n"
 #~ "(framenumber and .xcf is added)"
 #~ msgstr ""
 #~ "ディスクに書く動画フレームの Basename\n"
 #~ "(フレーム番号と .xcf が付けられます)"
+
 #~ msgid "Open the 1st one of the extracted frames"
 #~ msgstr "取り出されたフレームの最初のものを開く"
+
 #~ msgid ""
 #~ "\n"
 #~ "WARNING: Do not attempt to split other files than MPEG1 videos.\n"
@@ -16017,32 +16903,44 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "警告: MPEG1 動画以外のファイルを分割しないで下さい。\n"
 #~ "続行する前に作業中のすべての画像を保存して下さい。"
+
 #~ msgid "Split MPEG1 Video to Frames"
 #~ msgstr "MPEG1 動画をフレームに分割"
+
 #~ msgid "Select Frame Range"
 #~ msgstr "フレーム範囲選択"
+
 #~ msgid "Conditions to run the xanim based video split"
 #~ msgstr "xanim による画像分割に必要な設定"
+
 #~ msgid "1.) xanim 2.80.0 exporting edition (the loki version)"
 #~ msgstr "1.) xanim 2.80.0 国際版 (loki バージョン)"
+
 #~ msgid "    must be installed somewhere in your PATH"
 #~ msgstr "    が PATH の通ったところにインストールされていること"
+
 #~ msgid "    you can get xanim exporting edition at"
 #~ msgstr "    国際版の xanim は以下の場所で手に入れられます"
+
 #~ msgid ""
 #~ "2.) if your xanim exporting edition is not in your PATH or is not named "
 #~ "xanim"
 #~ msgstr ""
 #~ "2.) xanim が国際版でなかったり PATH が通ってなかったり xanim という名前で"
 #~ "はない場合"
+
 #~ msgid "    you have to set Environment variable GAP_XANIM_PROG "
 #~ msgstr "    環境変数 GAP_XANIM_PROG が国際版 xanim を指すようにして"
+
 #~ msgid "    to your xanim exporting program and restart gimp"
 #~ msgstr "    gimp を再起動して下さい"
+
 #~ msgid "An ERROR occured while trying to call xanim:"
 #~ msgstr "xanim 呼び出し中にエラー発生"
+
 #~ msgid "XANIM Information"
 #~ msgstr "XANIM 情報"
+
 #~ msgid "Video:"
 #~ msgstr "動画:"
 
@@ -16057,46 +16955,57 @@ msgstr "何も取り込まれませんでした"
 #~ "各フレームを xanim を用いて読みだし、\n"
 #~ "それぞれ別のファイルに書き出します。\n"
 #~ "xanim は国際版でなければなりません。"
+
 #~ msgid ""
 #~ "Basename for the AnimFrames to write on disk\n"
 #~ "(framenumber and extension is added)"
 #~ msgstr ""
 #~ "ディスクに書き出す動画フレームの Basename です。\n"
 #~ "(フレーム番号と拡張子が付け加えられます)"
+
 #~ msgid ""
 #~ "Fileformat for the extracted AnimFrames\n"
 #~ "(xcf is extracted as ppm and converted to xcf)"
 #~ msgstr ""
 #~ "抽出する動画のファイル形式です。\n"
 #~ "(xcf を指定すると ppm で抽出して xcf に変換します)"
+
 #~ msgid "Extract Frames"
 #~ msgstr "フレーム抽出"
+
 #~ msgid "Enable extraction of Frames"
 #~ msgstr "フレーム取り出しを有効にする"
+
 #~ msgid "Extract Audio"
 #~ msgstr "音声抽出"
+
 #~ msgid ""
 #~ "Enable extraction of audio to raw audiofile\n"
 #~ "(frame range limits are ignored for audio)"
 #~ msgstr ""
 #~ "音声を raw 音声ファイルに取り出します\n"
 #~ "(フレーム範囲指定は無視されます)"
+
 #~ msgid "Jpeg Quality:"
 #~ msgstr "JPEG 品質:"
+
 #~ msgid ""
 #~ "Quality for resulting Jpeg frames\n"
 #~ "(is ignored when other formats are used)"
 #~ msgstr ""
 #~ "出力 JPEG フレームの品質です\n"
 #~ "(他の形式の場合は無視されます)"
+
 #~ msgid "Run asynchronously"
 #~ msgstr "非同期実行"
+
 #~ msgid ""
 #~ "Run xanim asynchronously and delete unwanted frames\n"
 #~ "(out of the specified range) while xanim is still running"
 #~ msgstr ""
 #~ "xanim を非同期実行し xanim が実行中でも指定した\n"
 #~ "範囲外の不要なフレームを削除する。"
+
 #~ msgid ""
 #~ "\n"
 #~ "Warning: xanim 2.80 has only limited MPEG support.\n"
@@ -16105,8 +17014,10 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "警告: xanim 2.80 は限定された MPEG サポートしか行いません。\n"
 #~ "P や B タイプのフレームは無視されます。"
+
 #~ msgid "Split any Xanim readable Video to Frames"
 #~ msgstr "Xanim で読める動画ファイルをフレームに分割する"
+
 #~ msgid ""
 #~ "can't find any extracted frames,\n"
 #~ "%s\n"
@@ -16115,92 +17026,122 @@ msgstr "何も取り込まれませんでした"
 #~ "抽出したフレーム %s\n"
 #~ "が見つかりません。\n"
 #~ "xanim が転んだかキャンセルされた可能性があります"
+
 #~ msgid "frames are not extracted, because overwrite of %s was cancelled"
 #~ msgstr "%s の上書きがキャンセルされたため、フレームは抽出されませんでした。"
+
 #~ msgid "failed to overwrite %s (check permissions ?)"
 #~ msgstr "%s の上書き失敗 (許可されていますか?)"
+
 #~ msgid "failed to write %s (check permissions ?)"
 #~ msgstr "%s の書き込み失敗 (許可されていますか?)"
+
 #~ msgid "could not execute %s (check if xanim is installed)"
 #~ msgstr "%s を実行できません (xanim は導入されていますか?)"
+
 #~ msgid "%s does not look like xanim"
 #~ msgstr "%s は xanim ではないようです"
+
 #~ msgid ""
 #~ "The xanim program on your system \"%s\"\n"
 #~ "does not support the exporting options Ea, Ee, Eq"
 #~ msgstr ""
 #~ "あなたのシステムの xanim である \"%s\" は\n"
 #~ "エクスポートオプション Ea, Ee, Eq が使えないようです。"
+
 #~ msgid ""
 #~ "The xanim program on your system \"%s\"\n"
 #~ "does not support exporting of single frames"
 #~ msgstr ""
 #~ "あなたのシステムの xanim である \"%s\" は\n"
 #~ "単一フレームのエクスポートができないようです。"
+
 #~ msgid "videofile %s not existent or empty\n"
 #~ msgstr "動画ファイル %s は存在しないか空のようです\n"
+
 #~ msgid ""
 #~ "could not create %s directory\n"
 #~ "(that is required for xanim frame export)"
 #~ msgstr ""
 #~ "xanim によるフレーム抽出に必要な\n"
 #~ "%s ディレクトリが作れません"
+
 #~ msgid "extracting frames..."
 #~ msgstr "フレームを抽出しています..."
+
 #~ msgid ""
 #~ "could not start xanim process\n"
 #~ "(program=%s)"
 #~ msgstr ""
 #~ "xanim プロセスを開始できません\n"
 #~ "(プログラム=%s) "
+
 #~ msgid ""
 #~ "can't find any extracted frames,\n"
 #~ "xanim has failed or was cancelled"
 #~ msgstr ""
 #~ "抽出したフレームが見つかりません、\n"
 #~ "xanim の実行に失敗したかキャンセルされました。"
+
 #~ msgid "renaming frames..."
 #~ msgstr "フレーム名を変更しています..."
+
 #~ msgid "converting frames..."
 #~ msgstr "フレームを変換しています..."
+
 #~ msgid "backup to file"
 #~ msgstr "ファイルにバックアップ"
+
 #~ msgid "Make backup of the image after each step"
 #~ msgstr "各過程の毎にバックアップ画像を作る"
+
 #~ msgid "Continue"
 #~ msgstr "続ける"
+
 #~ msgid ""
 #~ "2nd call of %s\n"
 #~ "(define end-settings)"
 #~ msgstr ""
 #~ "%s の2度目の呼び出し\n"
 #~ "(終了設定の定義)"
+
 #~ msgid ""
 #~ "Non-Interactive call of %s\n"
 #~ "(for all layers in between)"
 #~ msgstr ""
 #~ "%s の非インタラクティブ呼び出し\n"
 #~ "(すべての中間レイヤーに対して)"
+
 #~ msgid "Applying Filter to all Layers..."
 #~ msgstr "すべてのレイヤーにフィルタを適用しています..."
+
 #~ msgid "Select Filter for Animated apply"
 #~ msgstr "変化させつつ適用するフィルタを選択"
+
 #~ msgid "Apply Constant"
 #~ msgstr "一様に適用"
+
 #~ msgid "Apply Varying"
 #~ msgstr "変化させつつ適用"
+
 #~ msgid "/Filters/Filter all Layers..."
 #~ msgstr "/フィルタ/全レイヤーに適用..."
+
 #~ msgid "/Video/Split Video to Frames/Any XANIM readable..."
 #~ msgstr "/動画/フレームに分割/XANIM で読み込めるものすべて..."
+
 #~ msgid "/Xtns/Split Video to Frames/Any XANIM readable..."
 #~ msgstr "/拡張/フレームに分割/XANIM で読み込めるものすべて..."
+
 #~ msgid "/Video/Encode/MPEG1..."
 #~ msgstr "/動画/エンコード/MPEG1..."
+
 #~ msgid "/Video/Encode/MPEG2..."
 #~ msgstr "/動画/エンコード/MPEG2..."
+
 #~ msgid "GAP Message"
 #~ msgstr "GAP メッセージ"
+
 #~ msgid ""
 #~ "OPERATION CANCELLED.\n"
 #~ "Current frame changed while dialog was open."
@@ -16219,6 +17160,7 @@ msgstr "何も取り込まれませんでした"
 #~ "GAP-プラグインは _0001.xcf で終わる\n"
 #~ "ファイル名に対してのみ動作します。\n"
 #~ "==> ファイル名を変更してからやり直して下さい。"
+
 #~ msgid ""
 #~ "You are using a file format != xcf\n"
 #~ "Save Operations may result\n"
@@ -16227,126 +17169,181 @@ msgstr "何も取り込まれませんでした"
 #~ "xcf ではないファイル形式を選択しています\n"
 #~ "保存した場合にレイヤー情報が失われる\n"
 #~ "可能性があります"
+
 #~ msgid "Save Flattened"
 #~ msgstr "統合して保存"
+
 #~ msgid "Save As Is"
 #~ msgstr "そのまま保存"
+
 #~ msgid "Error: could not rename frame %ld to %ld"
 #~ msgstr "エラー: フレーム %ld から %ld を名称変更できません"
 
 #, fuzzy
 #~ msgid "Error: could not save frame %s"
 #~ msgstr "エラー: フレーム %ld から %ld を名称変更できません"
+
 #~ msgid "Duplicating frames..."
 #~ msgstr "フレームを複製しています..."
+
 #~ msgid "Renumber Framesequence..."
 #~ msgstr "フレームを並べ直しています..."
+
 #~ msgid "Goto Frame (%ld/%ld)"
 #~ msgstr "指定フレームへ移動 (%ld/%ld)"
+
 #~ msgid "Destination Frame Number (%ld  - %ld)"
 #~ msgstr "宛先フレーム番号 (%ld - %ld)"
+
 #~ msgid "Number:"
 #~ msgstr "番号:"
+
 #~ msgid "Delete Frames (%ld/%ld)"
 #~ msgstr "フレーム削除 (%ld/%ld)"
+
 #~ msgid "Delete Frames from %ld to (number)"
 #~ msgstr "削除するフレームは %ld から"
+
 #~ msgid "Duplicate Frames (%ld/%ld)"
 #~ msgstr "フレーム複製 (%ld/%ld)"
+
 #~ msgid "Source Range starts at this framenumber"
 #~ msgstr "元範囲はこのフレームから開始"
+
 #~ msgid "Source Range ends at this framenumber"
 #~ msgstr "元範囲がこのフレームで終り"
+
 #~ msgid "N times:"
 #~ msgstr "回数:"
+
 #~ msgid ""
 #~ "Copy selected Range n-times  \n"
 #~ "(you may type in Values > 99)"
 #~ msgstr ""
 #~ "選択範囲を n 回コピー  \n"
 #~ "(99 より大きい回数)"
+
 #~ msgid "Duplicate Frame Range"
 #~ msgstr "複製するフレーム範囲"
+
 #~ msgid "Exchange current Frame (%ld)"
 #~ msgstr "現在のフレーム (%ld) と交換"
+
 #~ msgid "With Frame (number)"
 #~ msgstr "するフレーム番号は"
+
 #~ msgid "Framesequence Shift (%ld/%ld)"
 #~ msgstr "フレーム並びずらし (%ld/%ld)"
+
 #~ msgid "Affected Range starts at this framenumber"
 #~ msgstr "適用する範囲はこのフレームから開始"
+
 #~ msgid "Affected Range ends at this framenumber"
 #~ msgstr "適用する範囲はこのフレームで終り"
+
 #~ msgid "N-Shift:"
 #~ msgstr "ずらす量:"
+
 #~ msgid ""
 #~ "Renumber the affected framesequence     \n"
 #~ "(numbers are shifted in circle by N)"
 #~ msgstr ""
 #~ "適用部分のフレーム並びを再割り付け    \n"
 #~ "(番号はずらし量分ずれる)"
+
 #~ msgid "Framesequence shift"
 #~ msgstr "フレーム並びずらし"
+
 #~ msgid "/Video/Goto/Next Frame"
 #~ msgstr "/動画/移動/次のフレーム"
+
 #~ msgid "/Video/Goto/Previous Frame"
 #~ msgstr "/動画/移動/前のフレーム"
+
 #~ msgid "/Video/Goto/First Frame"
 #~ msgstr "/動画/移動/最初のフレーム"
+
 #~ msgid "/Video/Goto/Last Frame"
 #~ msgstr "/動画/移動/最後のフレーム"
+
 #~ msgid "/Video/Goto/Any Frame..."
 #~ msgstr "/動画/移動/指定したフレーム..."
+
 #~ msgid "/Video/Delete Frames..."
 #~ msgstr "/動画/フレーム削除..."
+
 #~ msgid "/Video/Duplicate Frames..."
 #~ msgstr "/動画/フレーム複製..."
+
 #~ msgid "/Video/Exchange Frame..."
 #~ msgstr "/動画/フレーム交換..."
+
 #~ msgid "/Video/Move Path..."
 #~ msgstr "/動画/パス移動..."
+
 #~ msgid "/Video/Frames to Image..."
 #~ msgstr "/動画/フレームを画像に..."
+
 #~ msgid "/Video/Frames Flatten..."
 #~ msgstr "/動画/フレーム統合..."
+
 #~ msgid "/Video/Frames LayerDel..."
 #~ msgstr "/動画/フレームレイヤー削除..."
+
 #~ msgid "/Video/Frames Convert..."
 #~ msgstr "/動画/フレーム変換..."
+
 #~ msgid "/Video/Frames Resize..."
 #~ msgstr "/動画/フレームサイズ変更..."
+
 #~ msgid "/Video/Frames Crop..."
 #~ msgstr "/動画/フレーム切り抜き..."
+
 #~ msgid "/Video/Frames Scale..."
 #~ msgstr "/動画/フレーム拡大縮小..."
+
 #~ msgid "/Video/Split Image to Frames..."
 #~ msgstr "/動画/画像をフレームに分割..."
+
 #~ msgid "/Video/Framesequence Shift..."
 #~ msgstr "/動画/フレーム並びずらし..."
+
 #~ msgid "/Video/Frames Modify..."
 #~ msgstr "/動画/フレーム修正..."
+
 #~ msgid "Pattern is equal to LayerName"
 #~ msgstr "パターンはレイヤー名に等しい"
+
 #~ msgid "Pattern is Start of LayerName"
 #~ msgstr "パターンはレイヤー名で始まる"
+
 #~ msgid "Pattern is End of Layername"
 #~ msgstr "パターンはレイヤー名で終わる"
+
 #~ msgid "Pattern is a Part of LayerName"
 #~ msgstr "パターンはレイヤー名の一部分"
+
 #~ msgid "Pattern is LayerstackNumber List"
 #~ msgstr "パターンはレイヤースタック番号リスト"
+
 #~ msgid "Pattern is REVERSE-stack List"
 #~ msgstr "パターンは逆転スタックリスト"
+
 #~ msgid "All Visible (ignore Pattern)"
 #~ msgstr "可視レイヤーすべて (パターン無視)"
+
 #~ msgid "Select all Layers where Layername is equal to Pattern"
 #~ msgstr "レイヤー名がパターンと等しいすべてのレイヤーを選ぶ"
+
 #~ msgid "Select all Layers where Layername starts with Pattern"
 #~ msgstr "レイヤー名がパターンから始まるすべてのレイヤーを選ぶ"
+
 #~ msgid "Select all Layers where Layername ends up with Pattern"
 #~ msgstr "レイヤー名がパターンで終わるすべてのレイヤーを選ぶ"
+
 #~ msgid "Select all Layers where Layername contains Pattern"
 #~ msgstr "レイヤー名がパターンを含むすべてのレイヤーを選ぶ"
+
 #~ msgid ""
 #~ "Select Layerstack positions.\n"
 #~ "0, 4-5, 8\n"
@@ -16355,6 +17352,7 @@ msgstr "何も取り込まれませんでした"
 #~ "レイヤースタック位置を選ぶ..\n"
 #~ "0, 4-5, 8\n"
 #~ "0 == 最上層レイヤー"
+
 #~ msgid ""
 #~ "Select Layerstack positions.\n"
 #~ "0, 4-5, 8\n"
@@ -16363,50 +17361,71 @@ msgstr "何も取り込まれませんでした"
 #~ "レイヤースタック位置を選ぶ。\n"
 #~ "0, 4-5, 8\n"
 #~ "0 == 背景レイヤー"
+
 #~ msgid "Select all visible Layers"
 #~ msgstr "可視レイヤーをすべて選ぶ"
+
 #~ msgid "Set Layer(s) visible"
 #~ msgstr "レイヤーを可視状態に"
+
 #~ msgid "Set Layer(s) invisible"
 #~ msgstr "レイヤーを不可視状態に"
+
 #~ msgid "Set Layer(s) linked"
 #~ msgstr "レイヤーをリンクする"
+
 #~ msgid "Set Layer(s) unlinked"
 #~ msgstr "レイヤをリンクしない"
+
 #~ msgid "Raise Layer(s)"
 #~ msgstr "レイヤーを上げる"
+
 #~ msgid "Lower Layer(s)"
 #~ msgstr "レイヤーを下げる"
+
 #~ msgid "Merge Layer(s) expand as necessary"
 #~ msgstr "必要に応じて拡大したレイヤーを結合"
+
 #~ msgid "Merge Layer(s) clipped to image"
 #~ msgstr "画像に切り取られたレイヤーを結合"
+
 #~ msgid "Merge Layer(s) clipped to bg-layer"
 #~ msgstr "背景に切り取られたレイヤーを結合"
+
 #~ msgid "Apply filter on Layer(s)"
 #~ msgstr "レイヤーにフィルタを適用"
+
 #~ msgid "Duplicate Layer(s)"
 #~ msgstr "レイヤーを複製する"
+
 #~ msgid "Rename Layer(s)"
 #~ msgstr "レイヤーの名称変更"
+
 #~ msgid ""
 #~ "Perform function on one or more Layer(s)\n"
 #~ "in all frames of the selected frame range\n"
 #~ msgstr ""
 #~ "選択されたフレーム範囲内のすべてのフレームで\n"
 #~ "一つ以上のレイヤーに対して機能を実行する\n"
+
 #~ msgid "From Frame:"
 #~ msgstr "元フレーム:"
+
 #~ msgid "first handled frame"
 #~ msgstr "最初に扱われるフレーム"
+
 #~ msgid "To Frame:"
 #~ msgstr "宛フレーム:"
+
 #~ msgid "last handled frame"
 #~ msgstr "最後に扱われるフレーム"
+
 #~ msgid "Select Layer(s):"
 #~ msgstr "レイヤー選択:"
+
 #~ msgid "Select Pattern:"
 #~ msgstr "パターン選択:"
+
 #~ msgid ""
 #~ "String to identify layer names    \n"
 #~ "or layerstack position numbers\n"
@@ -16415,20 +17434,28 @@ msgstr "何も取り込まれませんでした"
 #~ "レイヤーの名前を区別する文字列    \n"
 #~ "またはレイヤースタック位置の番号\n"
 #~ "0,3-5"
+
 #~ msgid "Case sensitive"
 #~ msgstr "大文字と小文字を区別する"
+
 #~ msgid "Lowercase and UPPERCASE letters are considered as different"
 #~ msgstr "小文字と大文字の文字は異なる物だとみなす"
+
 #~ msgid "Invert Selection"
 #~ msgstr "選択領域反転"
+
 #~ msgid "Perform actions on all unselected Layers"
 #~ msgstr "すべての非選択レイヤーにアクションを行う"
+
 #~ msgid "Function:"
 #~ msgstr "機能:"
+
 #~ msgid "Function to be performed on all selected layers"
 #~ msgstr "すべての選択したレイヤーに実行される機能"
+
 #~ msgid "New Layername:"
 #~ msgstr "新規レイヤー名"
+
 #~ msgid ""
 #~ "New Layername for all handled layers \n"
 #~ "[####] is replaced by frame number\n"
@@ -16437,251 +17464,352 @@ msgstr "何も取り込まれませんでした"
 #~ "取り扱う全レイヤーのための新規レイヤー名\n"
 #~ "[####] はフレーム番号によって置きかえられる\n"
 #~ "(名前変更だけのための機能として使われる)"
+
 #~ msgid "Frames Modify"
 #~ msgstr "フレーム修正"
+
 #~ msgid ""
 #~ "Non-Interactive call of %s\n"
 #~ "(for all selected layers)"
 #~ msgstr ""
 #~ "ノンインタラクティブは %s を呼び出しました\n"
 #~ "(すべての非選択レイヤーのために)"
+
 #~ msgid "Select Filter for Animated frames-apply"
 #~ msgstr "動画フレームに適用するフィルタの選択"
+
 #~ msgid "GAP Modify: No layer selected in last handled frame"
 #~ msgstr "GAP 修正: 選択した最後に扱うフレームにはレイヤーがありません"
+
 #~ msgid "Modifying Frames/Layer(s)..."
 #~ msgstr "フレーム/レイヤーの修正中..."
+
 #~ msgid "No selected Layer in start frame"
 #~ msgstr "開始フレームのレイヤーが選択されていません"
+
 #~ msgid "Dissolve"
 #~ msgstr "消算"
+
 #~ msgid "Multiply"
 #~ msgstr "乗算"
+
 #~ msgid "Darken Only"
 #~ msgstr "比較(暗)"
+
 #~ msgid "Lighten Only"
 #~ msgstr "比較(明)"
+
 #~ msgid "Left  Top"
 #~ msgstr "左上"
+
 #~ msgid "Left  Bottom"
 #~ msgstr "左"
+
 #~ msgid "Right Top"
 #~ msgstr "左下"
+
 #~ msgid "Right Bottom"
 #~ msgstr "右"
+
 #~ msgid "Loop Reverse"
 #~ msgstr "逆ループ"
+
 #~ msgid "Once"
 #~ msgstr "一回"
+
 #~ msgid "OnceReverse"
 #~ msgstr "逆一回"
+
 #~ msgid "PingPong"
 #~ msgstr "双方向"
+
 #~ msgid "Frame Loop"
 #~ msgstr "フレームループ"
+
 #~ msgid "Frame Loop Reverse"
 #~ msgstr "逆フレームループ"
+
 #~ msgid "Frame Once"
 #~ msgstr "一フレーム"
+
 #~ msgid "Frame OnceReverse"
 #~ msgstr "フレームを逆に一回"
+
 #~ msgid "Frame PingPong"
 #~ msgstr "フレームピンポン"
+
 #~ msgid "Frame None"
 #~ msgstr "フレーム無し"
+
 #~ msgid "Move Path"
 #~ msgstr "パス移動"
+
 #~ msgid "Show PreviewFrame with Selected SrcLayer at current Controlpoint"
 #~ msgstr ""
 #~ "現在のコントロールポイントがある元レイヤーでプレビューフレームを表示"
+
 #~ msgid "Anim Preview"
 #~ msgstr "動画プレビュー"
+
 #~ msgid "Generate Animated Preview as multilayer image"
 #~ msgstr "複数枚レイヤー画像として動画プレビューを生成する"
+
 #~ msgid "Copy moving source-layer(s) into frames"
 #~ msgstr "移動するソースレイヤーをフレームにコピー"
+
 #~ msgid "Start Frame:"
 #~ msgstr "開始フレーム"
+
 #~ msgid "First handled frame"
 #~ msgstr "最初に扱うフレーム"
+
 #~ msgid "End Frame:"
 #~ msgstr "終了フレーム"
+
 #~ msgid "Last handled frame"
 #~ msgstr "最後に扱うフレーム"
+
 #~ msgid "Preview Frame:"
 #~ msgstr "プレビューフレーム:"
+
 #~ msgid "Frame to show when UpdPreview button is pressed"
 #~ msgstr "プレビュー更新ボタンが押された時に表示するフレーム"
+
 #~ msgid "Layerstack:"
 #~ msgstr "レイヤースタック:"
+
 #~ msgid ""
 #~ "How to insert SrcLayer into the Dst. Frame's Layerstack\n"
 #~ "0 means on top i.e. in front"
 #~ msgstr ""
 #~ "元レイヤーを Dst に挿入する方法。フレームのレイヤースタック\n"
 #~ "0 というのは一番上、つまり最前面です"
+
 #~ msgid "Object on empty frames"
 #~ msgstr "空フレームオブジェクト"
+
 #~ msgid "Object on one frame"
 #~ msgstr "一つのフレームオブジェクト"
+
 #~ msgid "Exact Object on frames"
 #~ msgstr "フレームは正確なオブジェクト"
+
 #~ msgid "Anim Preview Mode"
 #~ msgstr "動画プレビューモード"
+
 #~ msgid "Scale Preview"
 #~ msgstr "縮小プレビュー"
+
 #~ msgid "Scale down size of the generated animated preview (in %)"
 #~ msgstr "作成する動画プレビューのサイズを縮小する (% で)"
+
 #~ msgid "Framerate"
 #~ msgstr "フレームレート"
+
 #~ msgid "Framerate to use in the animated preview in frames/sec"
 #~ msgstr "動画プレビューで フレーム/秒 として使われるフレームレート"
+
 #~ msgid "Copy to Video Buffer"
 #~ msgstr "ビデオバッファにコピー"
+
 #~ msgid ""
 #~ "Save all single frames of animated preview to video buffer\n"
 #~ "(configured in gimprc by video-paste-dir and video-paste-basename)"
 #~ msgstr ""
 #~ "すべての動画プレビューのフレームそれぞれをビデオバッファに保存する\n"
 #~ "(video-paste-dir と video-paste-basename によって gimprc で設定される)"
+
 #~ msgid "Move Path Animated Preview"
 #~ msgstr "パス移動動画プレビュー"
+
 #~ msgid "Generate Animated Preview failed\n"
 #~ msgstr "最適動画プレビュー生成失敗\n"
+
 #~ msgid "Load Path Points from file"
 #~ msgstr "ファイルからパス端点の読み込み"
+
 #~ msgid "Save Path Points to file"
 #~ msgstr "ファイルにパス端点を保存"
+
 #~ msgid "Current Point: [ %3d ] of [ %3d ]"
 #~ msgstr "現在の端点 : [ %3d ] 中 [ %3d ]"
+
 #~ msgid "Source Select"
 #~ msgstr "元選択"
+
 #~ msgid "Source Object to insert into Frame Range"
 #~ msgstr "フレーム間に挿入する元オブジェクト"
+
 #~ msgid "Mode:"
 #~ msgstr "モード:"
+
 #~ msgid "Paintmode"
 #~ msgstr "描画モード"
+
 #~ msgid "Stepmode:"
 #~ msgstr "ステップモード:"
+
 #~ msgid "How to fetch the next SrcLayer at the next handled frame"
 #~ msgstr "次に扱うフレームが次の元レイヤーを取ってくる方法"
+
 #~ msgid "Handle:"
 #~ msgstr "扱い:"
+
 #~ msgid "How to place the SrcLayer at Controlpoint Coordinates"
 #~ msgstr "元レイヤーのコントロールポイント座標の配置方法"
+
 #~ msgid "Move Path Preview"
 #~ msgstr "パス移動プレビュー"
+
 #~ msgid "X Coordinate"
 #~ msgstr "X 座標"
+
 #~ msgid "Y Coordinate"
 #~ msgstr "Y 座標"
+
 #~ msgid "Scale Source Layer's Width in percent"
 #~ msgstr "元レイヤーの幅を %% で拡大縮小"
+
 #~ msgid "Scale SrcLayer's Height in percent"
 #~ msgstr "元レイヤーの高さを %% で拡大縮小"
+
 #~ msgid "SrcLayer's Opacity in percent"
 #~ msgstr "%% で元レイヤーの不透明度"
+
 #~ msgid "Rotate SrcLayer (in degree)"
 #~ msgstr "元レイヤーの回転 (角度)"
+
 #~ msgid "Keyframe:"
 #~ msgstr "キーフレーム:"
+
 #~ msgid ""
 #~ "Fix Controlpoint to Keyframe number\n"
 #~ "(0 == No Keyframe)"
 #~ msgstr ""
 #~ "コントロールポイントをキーフレーム番号で修正\n"
 #~ "(0 == キーフレーム無し)"
+
 #~ msgid "Add Point"
 #~ msgstr "端点追加"
+
 #~ msgid ""
 #~ "Add Controlpoint at end\n"
 #~ "(the last Point is duplicated)"
 #~ msgstr ""
 #~ "最後にコントロールポイントを追加します\n"
 #~ "(最後の端点が複製される)"
+
 #~ msgid "Show Path"
 #~ msgstr "パス表示"
+
 #~ msgid ""
 #~ "Show Path Lines and enable pick/drag with left button or move with right "
 #~ "button"
 #~ msgstr ""
 #~ "パス線を表示して左ボタンで選択/ドラッグまたは右ボタンで移動できるようにし"
 #~ "ます"
+
 #~ msgid ""
 #~ "Insert Controlpoint\n"
 #~ "(the current Point is duplicated)"
 #~ msgstr ""
 #~ "コントロールポイントを挿入します\n"
 #~ "(現在の端点が複製される)"
+
 #~ msgid "Delete current Controlpoint"
 #~ msgstr "現在のコントロールポイントを削除します"
+
 #~ msgid "Prev Point"
 #~ msgstr "前の端点"
+
 #~ msgid "Show Previous Controlpoint"
 #~ msgstr "前のコントロールポイントを表示します"
+
 #~ msgid "Next Point"
 #~ msgstr "次の端点"
+
 #~ msgid "Show Next Controlpoint"
 #~ msgstr "次のコントロールポイントを表示します"
+
 #~ msgid "First Point"
 #~ msgstr "先頭の端点"
+
 #~ msgid "Show First Controlpoint"
 #~ msgstr "最初のコントロールポイントを表示します"
+
 #~ msgid "Last Point"
 #~ msgstr "最後の端点"
+
 #~ msgid "Show Last Controlpoint"
 #~ msgstr "最後のコントロールポイントを表示します"
+
 #~ msgid "Clear Point"
 #~ msgstr "端点クリア"
+
 #~ msgid "Reset the current Controlpoint to default Values"
 #~ msgstr "現在のコントロールポイントを標準値にリセットします"
+
 #~ msgid "Clear All Points"
 #~ msgstr "全端点クリア"
+
 #~ msgid ""
 #~ "Reset all Controlpoints to default Values but dont change the path (X/Y "
 #~ "Values)"
 #~ msgstr ""
 #~ "すべてのコントロールポイントを標準値にリセットしますがパス (X/Y 値) は変え"
 #~ "ません"
+
 #~ msgid "Delete All Points"
 #~ msgstr "全端点の削除"
+
 #~ msgid "Delete all Controlpoints"
 #~ msgstr "すべてのコントロールポイントを削除します"
+
 #~ msgid "Load Points"
 #~ msgstr "端点読み込み"
+
 #~ msgid "Load Controlpoints from file"
 #~ msgstr "コントロールポイントをファイルから読み込みます"
+
 #~ msgid "Save Points"
 #~ msgstr "端点保存"
+
 #~ msgid "Save Controlpoints to file"
 #~ msgstr "コントロールポイントをファイルに保存します"
+
 #~ msgid ""
 #~ "Can't operate with current Controlpoint\n"
 #~ "or Keyframe settings"
 #~ msgstr ""
 #~ "現在のコントロールポイントかキーフレームの設定では\n"
 #~ "操作することができません"
+
 #~ msgid "Reset Keyframes"
 #~ msgstr "キーフレームリセット"
+
 #~ msgid "Errors:"
 #~ msgstr "エラー:"
+
 #~ msgid ""
 #~ "No Source Image was selected.\n"
 #~ "Please open a 2nd Image of the same type before opening Move Path."
 #~ msgstr ""
 #~ "元画像が選択されていません。\n"
 #~ "パス移動を開く前に同じ型の 2 番目の画像を開いて下さい。"
+
 #~ msgid "Copying Layers into Frames..."
 #~ msgstr "レイヤーをフレームにコピーしています..."
+
 #~ msgid "Generating Animated Preview..."
 #~ msgstr "動画プレビューを生成しています..."
+
 #~ msgid ""
 #~ "\n"
 #~ "Error: Keyframe %d at point [%d] higher or equal than last handled frame"
 #~ msgstr ""
 #~ "\n"
 #~ "エラー: キーフレーム %d の端点 [%d] は最終フレームよりも高過ぎるか同等です"
+
 #~ msgid ""
 #~ "\n"
 #~ "Error: Keyframe %d at point [%d] leaves not enough space (frames)\n"
@@ -16690,18 +17818,21 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "エラー: キーフレーム %d の端点 [%d] には前のコントロールポイントのための\n"
 #~ "十分な空間 (フレーム) がありません"
+
 #~ msgid ""
 #~ "\n"
 #~ "Error: Keyframe %d is not in sequence at point [%d]"
 #~ msgstr ""
 #~ "\n"
 #~ "エラー: キーフレーム %d は連続した端点 [%d] ではありません"
+
 #~ msgid ""
 #~ "\n"
 #~ "Error: controlpoint [%d] is out of handled framerange"
 #~ msgstr ""
 #~ "\n"
 #~ "エラー: コントロールポイント [%d] フレーム範囲の扱いを超えています"
+
 #~ msgid ""
 #~ "\n"
 #~ "Error: more controlpoints (%d) than handled frames (%d)\n"
@@ -16710,288 +17841,394 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "エラー:  コントロールポイント (%d) が扱うフレーム (%d) よりも多いので\n"
 #~ "コントロールポイントを減らすかもっと多くのフレームを選んで下さい"
+
 #~ msgid "Conditions to run mpeg_encode 1.5:"
 #~ msgstr "mpeg_encode 1.5 を実行するには:"
+
 #~ msgid "Conditions to run mpeg2encode 1.2:"
 #~ msgstr "mpeg2encode 1.2 を実行するには:"
+
 #~ msgid "1.) mpeg_encode 1.5 must be installed"
 #~ msgstr "1.) mpeg_encode 1.5 がインストール済みである"
+
 #~ msgid "1.) mpeg2encode 1.2 must be installed"
 #~ msgstr "1.) mpeg2encode 1.2 がインストール済みである"
+
 #~ msgid "    you can get mpeg_encode at"
 #~ msgstr "    mpeg_encode はここで入手可能"
+
 #~ msgid "    you can get mpeg2encode at http://www.mpeg.org/MSSG"
 #~ msgstr "    mpeg2encode はここで入手可能 http://www.mpeg.org/MSSG"
+
 #~ msgid "    ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/bmt1r1.tar.gz"
 #~ msgstr "    ftp://mm-ftp.cs.berkeley.edu/pub/multimedia/mpeg/bmt1r1.tar.gz"
+
 #~ msgid "   or at ftp://ftp.mpeg.org/pub/mpeg/mssg "
 #~ msgstr "    または ftp://ftp.mpeg.org/pub/mpeg/mssg "
+
 #~ msgid "2.) You need a series of single Images on disk (AnimFrames)"
 #~ msgstr "2.) ディスクに一続きの画像 (動画フレーム) が必要"
+
 #~ msgid "    all with fileformat JPEG (or YUV or PNM or PPM)"
 #~ msgstr "    すべてのファイル形式が JPRG (または YUV か PNM か PPM)"
+
 #~ msgid "   all with fileformat PPM (or YUV)"
 #~ msgstr "    すべてのファイル形式が PPM (または YUV)"
+
 #~ msgid "    (use 'Frames Convert' from the Video Menu"
 #~ msgstr "    (動画メニューの 'フレーム変換' を使うか"
+
 #~ msgid "    or 'Split Image to Frames' from the Video Menu)"
 #~ msgstr "    動画メニューの '画像をフレームに分割' を使う)"
+
 #~ msgid "3.) All Images must have the same size,"
 #~ msgstr "3.) すべての画像は同じサイズである必要があり、"
+
 #~ msgid "    width and height must be a multiple of 16"
 #~ msgstr "    幅と高さが 16 の倍数である必要があります"
+
 #~ msgid "    (use Scale or Crop from the Video Menu)"
 #~ msgstr "    (動画メニューの拡大縮小か切り抜きを使う)"
+
 #~ msgid "MPEG_ENCODE Information"
 #~ msgstr "MPEG エンコード情報"
+
 #~ msgid "generate MPEG1 (ISO/IEC 11172-2) stream"
 #~ msgstr "MPEG1 (ISO/IEC 11172-2) ストリームの生成"
+
 #~ msgid "generate MPEG2 (ISO/IEC DIS 13818-2) stream"
 #~ msgstr "MPEG2 (ISO/IEC DIS 13818-2) ストリームの生成"
+
 #~ msgid "GenParams"
 #~ msgstr "パラメータ生成"
+
 #~ msgid "Gen + Encode"
 #~ msgstr "生成 + エンコード"
+
 #~ msgid "To   Frame:"
 #~ msgstr "宛フレーム:"
+
 #~ msgid "Framerate :"
 #~ msgstr "フレームレート :"
+
 #~ msgid "framerate in frames/second"
 #~ msgstr "フレーム/秒のフレームレート"
+
 #~ msgid "Bitrate:"
 #~ msgstr "ビットレート:"
+
 #~ msgid ""
 #~ "used for constant bitrates (bit/sec)                  \n"
 #~ "(low rate gives good compression + bad quality)"
 #~ msgstr ""
 #~ "一定のビットレートを使用する (ビット/秒)              \n"
 #~ "(低いレートは圧縮良好 + 低品質を与える)"
+
 #~ msgid "Outputfile:"
 #~ msgstr "出力ファイル:"
+
 #~ msgid "Name of the resulting MPEG outputfile"
 #~ msgstr "生成する MPEG 出力ファイルの名前"
+
 #~ msgid "Paramfile:"
 #~ msgstr "パラメータファイル:"
+
 #~ msgid ""
 #~ "Name of the Encoder-Parameterfile\n"
 #~ "(is generated)"
 #~ msgstr ""
 #~ "エンコーダーパラメータファイルの名前\n"
 #~ "(が生成される)"
+
 #~ msgid "Startscript:"
 #~ msgstr "開始スクリプト:"
+
 #~ msgid ""
 #~ "Name of the Startscript           \n"
 #~ "(is generated/executed)"
 #~ msgstr ""
 #~ "開始スクリプトの名前              \n"
 #~ "(が生成される/実行される)"
+
 #~ msgid ""
 #~ "Generate parameterfile for mpeg_encode 1.5\n"
 #~ "(the freely distributed Berkeley MPEG-1 Video  Encoder.)\n"
 #~ msgstr ""
 #~ "mpeg_encode 1.5 のためのパラメータファイルの生成\n"
 #~ "(配布フリーな Berkeley MPEG-1 動画エンコーダー.)\n"
+
 #~ msgid "Constant Bitrate :"
 #~ msgstr "固定ビットレート :"
+
 #~ msgid "Iqnore I/P/QSCALE values and use constant bit-rate)"
 #~ msgstr "I/P/Q 拡大縮小値を無視して固定ビットレートを使う"
+
 #~ msgid "Pattern:"
 #~ msgstr "パターン:"
+
 #~ msgid "How to encode MPEG framesequence (I/P/B frames)"
 #~ msgstr "MPEG フレームシーケンスのエンコード方法 (I/P/B フレーム)"
+
 #~ msgid "IQSCALE:"
 #~ msgstr "I 品質拡大縮小:"
+
 #~ msgid ""
 #~ "Quality scale for I-Frames                       \n"
 #~ "(1 = best quality, 31 = best comression)"
 #~ msgstr ""
 #~ "I-フレームの品質拡大縮小                         \n"
 #~ "(1 = 最高品質、31 = 圧縮最大)"
+
 #~ msgid "PQSCALE:"
 #~ msgstr "P 品質拡大縮小:"
+
 #~ msgid ""
 #~ "Quality scale for P-Frames                  \n"
 #~ "(1 = best quality, 31 = best comression)"
 #~ msgstr ""
 #~ "P-フレームの品質拡大縮小                    \n"
 #~ "(1 = 最高品質、31 = 圧縮最大)"
+
 #~ msgid "BQSCALE:"
 #~ msgstr "B 品質拡大縮小:"
+
 #~ msgid ""
 #~ "Quality scale for B-Frames                  \n"
 #~ "(1 = best quality, 31 = best comression)"
 #~ msgstr ""
 #~ "B-フレームの品質拡大縮小                    \n"
 #~ "(1 = 最高品質、31 = 圧縮最大)"
+
 #~ msgid "P-Search :"
 #~ msgstr "P-検索 :"
+
 #~ msgid "Search Algorithmus used for P-frames"
 #~ msgstr "P-フレームで使われるアルゴリズムの検索"
+
 #~ msgid "B-Search :"
 #~ msgstr "B-検索 :"
+
 #~ msgid "Search Algorithmus used for B-frames"
 #~ msgstr "B-フレームで使われるアルゴリズムの検索"
+
 #~ msgid "Gen MPEG_ENCODE Parameters"
 #~ msgstr "MPEG_ENCODE パラメータ生成"
+
 #~ msgid "Encode Values"
 #~ msgstr "エンコード値"
+
 #~ msgid ""
 #~ "Generate parameterfile for mpeg2encode 1.2\n"
 #~ "(MPEG-2 Video  Encoder.)\n"
 #~ msgstr ""
 #~ "mpeg2encode 1.2 のためのパラメータファイルの生成\n"
 #~ "(MPEG-2 動画エンコーダー。)\n"
+
 #~ msgid "MPEG-type :"
 #~ msgstr "MPEG 種:"
+
 #~ msgid "Videoformat :"
 #~ msgstr "動画形式 :"
+
 #~ msgid "Videoformat"
 #~ msgstr "動画形式"
+
 #~ msgid "Gen MPEG2ENCODE Parameters"
 #~ msgstr "MPEG2ENCODE パラメータ生成"
+
 #~ msgid ""
 #~ "\n"
 #~ "WARNING: mpeg_encode does not support Fileformat "
 #~ msgstr ""
 #~ "\n"
 #~ "警告: mpeg_encode が 対応しないファイル形式 "
+
 #~ msgid ""
 #~ "\n"
 #~ "ERROR: width not a multiple of 16"
 #~ msgstr ""
 #~ "\n"
 #~ "エラー: 幅が 16 の倍数ではありません"
+
 #~ msgid ""
 #~ "\n"
 #~ "ERROR: height not a multiple of 16"
 #~ msgstr ""
 #~ "\n"
 #~ "エラー: 高さが 16 の倍数ではありません"
+
 #~ msgid ""
 #~ "\n"
 #~ "WARNING: mpeg2encode does not support Fileformat "
 #~ msgstr ""
 #~ "\n"
 #~ "警告: mpeg2encode が対応しないファイル形式 "
+
 #~ msgid ""
 #~ "\n"
 #~ "ERROR: invoked from a single image, animframe required"
 #~ msgstr ""
 #~ "\n"
 #~ "エラー: 一枚の画像が呼び出されました、動画フレームが必要です"
+
 #~ msgid ""
 #~ "Playback         \n"
 #~ " optimized"
 #~ msgstr ""
 #~ "プレイバック     \n"
 #~ " 最適化"
+
 #~ msgid ""
 #~ "Smart Update .xvpics\n"
 #~ " forced upd"
 #~ msgstr ""
 #~ "すぐに .xvpics を更新\n"
 #~ " で強制更新"
+
 #~ msgid "Duplicate selected Frames"
 #~ msgstr "選択したフレームを複製"
+
 #~ msgid "Delete selected Frames"
 #~ msgstr "選択したフレームを削除"
+
 #~ msgid "Goto 1st Frame"
 #~ msgstr "最初のフレームへ"
+
 #~ msgid "Goto last Frame"
 #~ msgstr "最後のフレームへ"
+
 #~ msgid "/Video/VCR Navigator..."
 #~ msgstr "/動画/VCR ナビゲータ..."
+
 #~ msgid "Cant open two or more Video Navigator Windows."
 #~ msgstr "2 つ以上のビデオナビゲータウィンドウは開けません。"
+
 #~ msgid "Paste before"
 #~ msgstr "前にペースト"
+
 #~ msgid "Paste after"
 #~ msgstr "後ろにペースト"
+
 #~ msgid "Paste replace"
 #~ msgstr "置き換えてペースト"
+
 #~ msgid "Clear Video Buffer"
 #~ msgstr "ビデオバッファのクリア"
+
 #~ msgid "Videoframes:"
 #~ msgstr "ビデオフレーム:"
+
 #~ msgid "Framerate:"
 #~ msgstr "フレームレート:"
+
 #~ msgid "Timezoom:"
 #~ msgstr "時間ズーム:"
+
 #~ msgid "Video Navigator"
 #~ msgstr "動画ナビゲータ"
+
 #~ msgid "New Width:"
 #~ msgstr "新しい幅:"
+
 #~ msgid "New Height:"
 #~ msgstr "新しい高さ:"
+
 #~ msgid "Offset X:"
 #~ msgstr "X オフセット:"
+
 #~ msgid "Offset Y:"
 #~ msgstr "Y オフセット:"
+
 #~ msgid "Crop AnimFrames (all)"
 #~ msgstr "動画フレーム切り抜き (全部)"
+
 #~ msgid "Crop (original %dx%d)"
 #~ msgstr "切り抜き (原画 %dx%d)"
+
 #~ msgid "Resize AnimFrames (all)"
 #~ msgstr "動画フレームサイズ変更 (全部)"
+
 #~ msgid "Resize (original %dx%d)"
 #~ msgstr "サイズ変更 (原画 %dx%d)"
+
 #~ msgid "Scale AnimFrames (all)"
 #~ msgstr "動画フレーム拡大縮小 (全部)"
+
 #~ msgid "Scale (original %dx%d)"
 #~ msgstr "拡大縮小 (原画 %dx%d)"
+
 #~ msgid "Generate Optimal Palette"
 #~ msgstr "最適パレットを生成する"
+
 #~ msgid "Use Custom Palette"
 #~ msgstr "カスタムパレットを使う"
+
 #~ msgid "Use Black/White (1-Bit) Palette"
 #~ msgstr "白黒 (1-ビット) パレットを使う"
+
 #~ msgid "Floyd-Steinberg Color Dithering (Normal)"
 #~ msgstr "フロイド・スタインバーグ色ディザリング (普通)"
+
 #~ msgid "Floyd-Steinberg Color Dithering (Reduced Color Bleeding)"
 #~ msgstr "フロイド・スタインバーグ色ディザリング (色混合減少)"
+
 #~ msgid "Positioned Color Dithering"
 #~ msgstr "ポジション色ディザリング"
+
 #~ msgid "No Color Dithering"
 #~ msgstr "色ディザリング無し"
+
 #~ msgid "Custom Palette"
 #~ msgstr "カスタムパレット"
+
 #~ msgid ""
 #~ "Name of a cutom palette\n"
 #~ "(is ignored if Palette Type is not custom)"
 #~ msgstr ""
 #~ "カスタムパレットの名前\n"
 #~ "(パレット型がカスタムではないと無視される)"
+
 #~ msgid "Remove Unused"
 #~ msgstr "未使用の色を取り除く"
+
 #~ msgid ""
 #~ "Remove unused or double colors\n"
 #~ "(is ignored if Palette Type is not custom)"
 #~ msgstr ""
 #~ "未使用か重複している色を取り除く\n"
 #~ "(パレット型がカスタムではないと無視される)"
+
 #~ msgid ""
 #~ "Number of resulting Colors\t\t \n"
 #~ "(ignored if Palette Type is not Generate optimal palette)"
 #~ msgstr ""
 #~ "最終的な色の数\t\t \n"
 #~ "(パレット型が一般的な最適パレットではないと無視される)"
+
 #~ msgid "Dither Options"
 #~ msgstr "ディザリングオプション"
+
 #~ msgid "Enable transparency"
 #~ msgstr "透明有効"
+
 #~ msgid "Enable dithering of transparency"
 #~ msgstr "透明のディザリングを有効にする"
+
 #~ msgid "Convert Frames to Indexed"
 #~ msgstr "フレームをインデックスに変換"
+
 #~ msgid "Keep Type"
 #~ msgstr "そのまま"
+
 #~ msgid "Convert to RGB"
 #~ msgstr "RGB 画像に変換:"
+
 #~ msgid "Convert to Gray"
 #~ msgstr "グレースケール画像に変換:"
+
 #~ msgid "Convert to Indexed"
 #~ msgstr "インデックス画像に変換:"
+
 #~ msgid ""
 #~ "\n"
 #~ "Select destination fileformat by extension\n"
@@ -17000,74 +18237,95 @@ msgstr "何も取り込まれませんでした"
 #~ "\n"
 #~ "画像型変換オプションとして拡張子に\n"
 #~ "よって目当てのファイル形式を選びます\n"
+
 #~ msgid "Basename:"
 #~ msgstr "ベース名:"
+
 #~ msgid ""
 #~ "basename of the resulting frames       \n"
 #~ "(0001.ext is added)"
 #~ msgstr ""
 #~ "生成フレームのベース名                 \n"
 #~ "(0001.ext が追加される)"
+
 #~ msgid "Extension:"
 #~ msgstr "拡張子:"
+
 #~ msgid ""
 #~ "extension of resulting frames       \n"
 #~ "(is also used to define Fileformat)"
 #~ msgstr ""
 #~ "生成フレームの拡張子                \n"
 #~ "(ファイル形式を定義するためにも使われる)"
+
 #~ msgid ""
 #~ "Convert to, or keep imagetype           \n"
 #~ "(most fileformats can't handle all types)"
 #~ msgstr ""
 #~ "変換するか、画像種をそのままに          \n"
 #~ "(ほとんどのファイル形式はすべての型を扱えない)"
+
 #~ msgid "Flatten:"
 #~ msgstr "統合:"
+
 #~ msgid ""
 #~ "Flatten all resulting frames               \n"
 #~ "(most fileformats need flattened frames)"
 #~ msgstr ""
 #~ "生成フレームすべてを統合する                 \n"
 #~ "(ほとんどのファイル形式は統合されたフレームが必要)"
+
 #~ msgid "Convert Frames to other Formats"
 #~ msgstr "フレームを他形式に変換"
+
 #~ msgid "Convert Settings"
 #~ msgstr "変換設定"
+
 #~ msgid "Expand as necessary"
 #~ msgstr "必要に応じて拡大"
+
 #~ msgid "Clipped to bottom layer"
 #~ msgstr "最下レイヤーの切り抜き"
+
 #~ msgid "Flattened image"
 #~ msgstr "画像統合"
+
 #~ msgid ""
 #~ "Resulting Layer Size is made of the outline-rectangle \n"
 #~ "of all visible layers (may differ from frame to frame)"
 #~ msgstr ""
 #~ "レイヤーサイズは全可視レイヤーの輪郭を変えたもの\n"
 #~ "(フレームからフレーム間で違っているかもしれない)"
+
 #~ msgid "Resulting Layer Size is the frame size"
 #~ msgstr "レイヤーサイズはフレームサイズになる"
+
 #~ msgid ""
 #~ "Resulting Layer Size is the size of the bottom layer\n"
 #~ "(may differ from frame to frame)"
 #~ msgstr ""
 #~ "レイヤーサイズは一番下のレイヤの大きさになる\n"
 #~ "(フレームからフレーム間で違っているかもしれない)"
+
 #~ msgid ""
 #~ "Resulting Layer Size is the frame size     \n"
 #~ "transparent parts are filled with BG color"
 #~ msgstr ""
 #~ "レイヤーサイズは透明な部分が背景色で塗りつ\n"
 #~ "ぶされたフレームサイズになる"
+
 #~ msgid "select all Layers where Layername is equal to Pattern"
 #~ msgstr "レイヤー名がパターンに等しいすべてのレイヤーを選ぶ"
+
 #~ msgid "select all Layers where Layername starts with Pattern"
 #~ msgstr "レイヤー名がパターンで始まるすべてのレイヤーを選ぶ"
+
 #~ msgid "select all Layers where Layername ends up with Pattern"
 #~ msgstr "レイヤー名がパターンで終わるすべてのレイヤーを選ぶ"
+
 #~ msgid "select all Layers where Layername contains Pattern"
 #~ msgstr "レイヤー名がパターンを含むすべてのレイヤーを選ぶ"
+
 #~ msgid ""
 #~ "select Layerstack positions.\n"
 #~ "0, 4-5, 8\n"
@@ -17076,6 +18334,7 @@ msgstr "何も取り込まれませんでした"
 #~ "レイヤースタック位置で選ぶ。\n"
 #~ "0, 4-5, 8\n"
 #~ "0 == 最上層レイヤー"
+
 #~ msgid ""
 #~ "select Layerstack positions.\n"
 #~ "0, 4-5, 8\n"
@@ -17084,20 +18343,26 @@ msgstr "何も取り込まれませんでした"
 #~ "レイヤースタック位置で選ぶ。\n"
 #~ "0, 4-5, 8\n"
 #~ "0 == 背景レイヤー"
+
 #~ msgid "select all visible Layers"
 #~ msgstr "すべての可視レイヤーを選択"
+
 #~ msgid "Layer Basename:"
 #~ msgstr "レイヤー基本名:"
+
 #~ msgid ""
 #~ "Basename for all Layers    \n"
 #~ "[####] is replaced by frame number"
 #~ msgstr ""
 #~ "すべてのレイヤーの基本名     \n"
 #~ "[####] はフレーム番号で置き換えられる"
+
 #~ msgid "Layer Mergemode:"
 #~ msgstr "レイヤー結合モード:"
+
 #~ msgid "Exclude BG-Layer"
 #~ msgstr "背景レイヤーを除く"
+
 #~ msgid ""
 #~ "Exclude the BG-Layers    \n"
 #~ "in all handled frames\n"
@@ -17106,18 +18371,25 @@ msgstr "何も取り込まれませんでした"
 #~ "選択とは無関係に         \n"
 #~ "全対象フレームの\n"
 #~ "背景を取り除く"
+
 #~ msgid "Use all unselected Layers"
 #~ msgstr "すべての非選択レイヤーを使う"
+
 #~ msgid "Creating Layer-Animated Image..."
 #~ msgstr "レイヤー-動画画像の作成中..."
+
 #~ msgid "Frames to Image"
 #~ msgstr "フレームを画像に"
+
 #~ msgid "Create Multilayer-Image from Frames"
 #~ msgstr "フレームから複数画像を作成する"
+
 #~ msgid "Flattening Frames..."
 #~ msgstr "フレームを統合しています..."
+
 #~ msgid "Converting Frames..."
 #~ msgstr "フレームを変換しています..."
+
 #~ msgid ""
 #~ "Convert Frames: SAVE operation FAILED.\n"
 #~ "Desired save plugin can't handle type\n"
@@ -17126,22 +18398,31 @@ msgstr "何も取り込まれませんでした"
 #~ "フレーム変換: 保存操作は失敗しました。\n"
 #~ "要求した保存プラグインがこの型を扱えないか\n"
 #~ "要求した保存プラグインが利用可能ではありません。"
+
 #~ msgid "Cropping all Animation Frames..."
 #~ msgstr "全動画フレームを切り抜いています..."
+
 #~ msgid "Resizing all Animation Frames..."
 #~ msgstr "全動画フレームの大きさを変更しています..."
+
 #~ msgid "Scaling all Animation Frames..."
 #~ msgstr "全動画フレームを拡大縮小しています..."
+
 #~ msgid "Flatten Frames"
 #~ msgstr "フレーム統合"
+
 #~ msgid "Removing Layer (pos:%ld) from Frames..."
 #~ msgstr "フレームからレイヤー (位置:%ld) を取り除いています..."
+
 #~ msgid "Delete Layers in Frames"
 #~ msgstr "フレームのレイヤー削除"
+
 #~ msgid "Select Frame Range & Position"
 #~ msgstr "フレーム範囲 & 位置の選択"
+
 #~ msgid "Splitting into Frames..."
 #~ msgstr "フレームに分割しています..."
+
 #~ msgid ""
 #~ "Split Frames: SAVE operation FAILED.\n"
 #~ "desired save plugin can't handle type\n"
@@ -17150,6 +18431,7 @@ msgstr "何も取り込まれませんでした"
 #~ "フレーム分割: 保存操作は失敗しました。\n"
 #~ "要求された保存プラグインがこの型を扱えないか\n"
 #~ "要求された保存プラグインが利用可能でありません。"
+
 #~ msgid ""
 #~ "%s\n"
 #~ "%s\n"
@@ -17158,26 +18440,35 @@ msgstr "何も取り込まれませんでした"
 #~ "%s\n"
 #~ "%s\n"
 #~ "(%s_0001.%s)\n"
+
 #~ msgid "Make a frame (diskfile) from each Layer"
 #~ msgstr "それぞれのレイヤーからフレーム (ディスクファイル) を作成"
+
 #~ msgid "frames are named: base_nr.extension"
 #~ msgstr "フレームの名前は: 基本名_番号.拡張子"
+
 #~ msgid "extension of resulting frames (is also used to define Fileformat)"
 #~ msgstr "生成フレームの拡張子 (ファイル形式の定義のためにも使われる)"
+
 #~ msgid "Inverse Order:"
 #~ msgstr "逆順:"
+
 #~ msgid "Start frame 0001 at Top Layer"
 #~ msgstr "001 フレームを最上層レイヤーとして始める"
+
 #~ msgid ""
 #~ "Remove Alpha Channel in resulting Frames. Transparent parts are filled "
 #~ "with BG color."
 #~ msgstr ""
 #~ "生成フレームからアルファチャンネルを取り除く。透明な部分は背景色で塗りつぶ"
 #~ "される。"
+
 #~ msgid "Split Image into Frames"
 #~ msgstr "画像をフレームに分割"
+
 #~ msgid "Split Settings"
 #~ msgstr "分割設定"
+
 #~ msgid ""
 #~ "OPERATION CANCELLED.\n"
 #~ "This image is already an AnimFrame.\n"
@@ -17186,133 +18477,184 @@ msgstr "何も取り込まれませんでした"
 #~ "操作は取り消されました。\n"
 #~ "画像は既に動画フレームになっています。\n"
 #~ "複製してからもう一度試して下さい (画像/複製)。"
+
 #~ msgid "Scale"
 #~ msgstr "拡大縮小"
+
 #~ msgid "New width:"
 #~ msgstr "新しい幅:"
+
 #~ msgid "New height:"
 #~ msgstr "新しい高さ:"
+
 #~ msgid "Char: %c, %d, 0x%02x"
 #~ msgstr "文字: %c, %d, 0x%02x"
+
 #~ msgid "Insert the selected char at the cursor position"
 #~ msgstr "カーソル位置に選択された文字を挿入"
+
 #~ msgid "points"
 #~ msgstr "ポイント"
 
 #, fuzzy
 #~ msgid "/Filters/Text/Dynamic Text..."
 #~ msgstr "/フィルタ/下塗り/ダイナミック文字..."
+
 #~ msgid ""
 #~ " Current layer isn't a GDynText layer or it has no alpha channel. Forcing "
 #~ "new layer creation."
 #~ msgstr ""
 #~ " 現在のレイヤーは GDynText レイヤーでないかアルファチャンネルがありませ"
 #~ "ん。強制的に新規レイヤーを作成します。"
+
 #~ msgid "GDynText Layer"
 #~ msgstr "GDynText レイヤー"
+
 #~ msgid "GIMP Dynamic Text"
 #~ msgstr "GIMP ダイナミック文字"
+
 #~ msgid "GDynText: Messages Window"
 #~ msgstr "GDynText メッセージ窓"
+
 #~ msgid "GDynText: About ..."
 #~ msgstr "GDynText: GDynText について..."
+
 #~ msgid "bottom-center"
 #~ msgstr "中央下"
+
 #~ msgid "bottom-right"
 #~ msgstr "右下"
+
 #~ msgid "middle-left"
 #~ msgstr "中央左"
+
 #~ msgid "middle-right"
 #~ msgstr "中央右"
+
 #~ msgid "top-left"
 #~ msgstr "左上"
+
 #~ msgid "top-center"
 #~ msgstr "中央上"
+
 #~ msgid "top-right"
 #~ msgstr "右上"
+
 #~ msgid "GDynText"
 #~ msgstr "GDynText"
+
 #~ msgid "Toggle creation of a new layer"
 #~ msgstr "新規レイヤー作成切替え"
+
 #~ msgid "Load text from file"
 #~ msgstr "テキストをファイルから読み込む"
+
 #~ msgid "GDynText: Select Color"
 #~ msgstr "GDynText: 色選択"
+
 #~ msgid "Text color"
 #~ msgstr "文字色"
+
 #~ msgid "Toggle anti-aliased text"
 #~ msgstr "アンチエイリアス切替え"
+
 #~ msgid "Left aligned text"
 #~ msgstr "左揃え"
+
 #~ msgid "Centered text"
 #~ msgstr "中央寄せ"
+
 #~ msgid "Right aligned text"
 #~ msgstr "右揃え"
+
 #~ msgid "Toggle text font preview"
 #~ msgstr "文字フォントプレビュー切替え"
+
 #~ msgid "Toggle CharMap window"
 #~ msgstr "CharMap ウィンドウ切替え"
+
 #~ msgid ""
 #~ "Layer\n"
 #~ "Alignment"
 #~ msgstr ""
 #~ "レイヤー\n"
 #~ "整列"
+
 #~ msgid "Set layer alignment"
 #~ msgstr "レイヤー整列方法の指定"
+
 #~ msgid ""
 #~ "Line\n"
 #~ "Spacing"
 #~ msgstr "行間隔"
+
 #~ msgid "Set text rotation (degrees)"
 #~ msgstr "文字回転設定 (度)"
+
 #~ msgid "Editable text sample"
 #~ msgstr "編集可能文字サンプル"
+
 #~ msgid "Clear preview"
 #~ msgstr "プレビュー消去"
+
 #~ msgid "Preview default text sample"
 #~ msgstr "デフォルト文字サンプルをプレビュー"
+
 #~ msgid ""
 #~ "Holding the Shift key while pressing this button will force GDynText in "
 #~ "changing the layer name as done in GIMP 1.0."
 #~ msgstr ""
 #~ "Shift キーを押しながらこのボタンを押すと GDynText は GIMP 1.0 のようにレイ"
 #~ "ヤー名を強制的に変更します。"
+
 #~ msgid "GDynText: Load text"
 #~ msgstr "GDynText: テキスト読み込み"
+
 #~ msgid ""
 #~ "Warning file \"%s\" is larger than the maximum allowed text length (%d).\n"
 #~ msgstr "警告 ファイル \"%s\" は最大文字数 (%d) を越えています。\n"
+
 #~ msgid "Error opening \"%s\"!\n"
 #~ msgstr "\"%s\" を開く際にエラー発生!\n"
+
 #~ msgid ""
 #~ " WARNING: GDynText is too old! A newer version is required to handle this "
 #~ "layer. Get it from %s"
 #~ msgstr ""
 #~ "警告: GDynText が古すぎます! このレイヤーを編集するには新しい版が必要で"
 #~ "す。%s から取得して下さい"
+
 #~ msgid " Upgrading old GDynText layer to %s."
 #~ msgstr "古い GDynText レイヤー を %s にアップグレードしています。"
+
 #~ msgid "Dismiss"
 #~ msgstr "閉じる"
+
 #~ msgid "Back"
 #~ msgstr "戻る"
+
 #~ msgid "Forward"
 #~ msgstr "進む"
+
 #~ msgid "OK"
 #~ msgstr "了解"
+
 #~ msgid "Cancel"
 #~ msgstr "取消"
 
 #, fuzzy
 #~ msgid "Enable/disable jagged edges removal(antialiasing)"
 #~ msgstr "ギザギザした縁を滑らかにするかどうか (アンチエイリアシング)"
+
 #~ msgid "/File/Print (Gtk)..."
 #~ msgstr "/ファイル/印刷 (Gtk)..."
+
 #~ msgid "/File/Print (Gimp)..."
 #~ msgstr "/ファイル/印刷 (Gimp)..."
+
 #~ msgid "(unknown!?)"
 #~ msgstr "(不明!?)"
+
 #~ msgid "GEE!  The GIMP E'er Egg!"
 #~ msgstr "GEE! The GIMP E'er Egg!"
 
@@ -17331,6 +18673,7 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "Normal Scale"
 #~ msgstr "拡大スケール:"
+
 #~ msgid "Experimental Linear Scale"
 #~ msgstr "実験中の線形拡大縮小"
 
@@ -17361,60 +18704,88 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "Set line spacing"
 #~ msgstr "行間隔"
+
 #~ msgid "HP DeskJet 500, 520"
 #~ msgstr "HP DeskJet 500, 520"
+
 #~ msgid "HP DeskJet 500C, 540C"
 #~ msgstr "HP DeskJet 500C, 540C"
+
 #~ msgid "HP DeskJet 550C, 560C"
 #~ msgstr "HP DeskJet 550C, 560C"
+
 #~ msgid "HP DeskJet 600 series"
 #~ msgstr "HP DeskJet 600 シリーズ"
+
 #~ msgid "HP DeskJet 800 series"
 #~ msgstr "HP DeskJet 800 シリーズ"
+
 #~ msgid "HP DeskJet 1100C, 1120C"
 #~ msgstr "HP DeskJet 1100C, 1120C"
+
 #~ msgid "HP DeskJet 1200C, 1600C"
 #~ msgstr "HP DeskJet 1200C, 1600C"
+
 #~ msgid "HP LaserJet II series"
 #~ msgstr "HP LaserJet II シリーズ"
+
 #~ msgid "HP LaserJet III series"
 #~ msgstr "HP LaserJet III シリーズ"
+
 #~ msgid "HP LaserJet 4 series"
 #~ msgstr "HP LaserJet 4 シリーズ"
+
 #~ msgid "HP LaserJet 4V, 4Si"
 #~ msgstr "HP LaserJet 4V, 4Si"
+
 #~ msgid "HP LaserJet 5 series"
 #~ msgstr "HP LaserJet 5 シリーズ"
+
 #~ msgid "HP LaserJet 5Si"
 #~ msgstr "HP LaserJet 5Si"
+
 #~ msgid "HP LaserJet 6 series"
 #~ msgstr "HP LaserJet 6 シリーズ"
+
 #~ msgid "EPSON Stylus Color"
 #~ msgstr "EPSON Stylus Color"
+
 #~ msgid "EPSON Stylus Color Pro"
 #~ msgstr "EPSON Stylus Color Pro"
+
 #~ msgid "EPSON Stylus Color Pro XL"
 #~ msgstr "EPSON Stylus Color Pro XL"
+
 #~ msgid "EPSON Stylus Color 1500"
 #~ msgstr "EPSON Stylus Color 1500"
+
 #~ msgid "EPSON Stylus Color 400"
 #~ msgstr "EPSON MJ-400"
+
 #~ msgid "EPSON Stylus Color 500"
 #~ msgstr "EPSON MJ-500C"
+
 #~ msgid "EPSON Stylus Color 600"
 #~ msgstr "EPSON PM-600C"
+
 #~ msgid "EPSON Stylus Color 800"
 #~ msgstr "EPSON MJ-800C"
+
 #~ msgid "EPSON Stylus Color 1520"
 #~ msgstr "EPSON Stylus Color 1520"
+
 #~ msgid "EPSON Stylus Color 3000"
 #~ msgstr "EPSON MJ-3000C"
+
 #~ msgid "EPSON Stylus Photo 700"
 #~ msgstr "EPSON PM-700C"
+
 #~ msgid "EPSON Stylus Photo EX"
 #~ msgstr "EPSON Stylus Photo EX"
+
 #~ msgid "EPSON Stylus Photo"
 #~ msgstr "EPSON Stylus Photo"
+
 #~ msgid ""
 #~ "Can't execute more than 1 Video Function\n"
 #~ "on the same AnimFrame Image at the same time\n"
@@ -17423,138 +18794,195 @@ msgstr "何も取り込まれませんでした"
 #~ "同一の動画フレーム画像について同時に多数の\n"
 #~ "動画機能をあてはめることは出来ません\n"
 #~ "LOCK ID:%s\n"
+
 #~ msgid "Force visibility"
 #~ msgstr "強制的に表示する"
+
 #~ msgid "Force visibility for all copied Src-Layers"
 #~ msgstr "コピーされた元レイヤーをすべて強制的に表示する"
+
 #~ msgid "Clip To Frame"
 #~ msgstr "フレームにクリップ"
+
 #~ msgid "Clip all copied Src-Layers at Frame Boundaries"
 #~ msgstr "コピーされた元レイヤーすべてをフレーム境界にクリップ"
+
 #~ msgid ""
 #~ "No Source Image was selected\n"
 #~ "(Please open a 2nd Image of the same type before opening Move Path)"
 #~ msgstr ""
 #~ "元画像が選択されていません\n"
 #~ "(パス移動を開く前に同じ種類の画像をもう一つ開いてください)"
+
 #~ msgid "Rotate Follow"
 #~ msgstr "回転追跡"
+
 #~ msgid ""
 #~ "Set Rotation for all Controlpoints to follow the shape of the path.\n"
 #~ "(Shift: use Rotation of contolpoint 1 as offset)"
 #~ msgstr ""
 #~ "すべてのコントロールポイントがパスの形状に添うようにします。\n"
 #~ "(Shift: コントロールポイント 1 の回転をオフセットとして使います)"
+
 #~ msgid "Move Path Controlpointcheck"
 #~ msgstr "パス移動コントロールポイントチェック"
+
 #~ msgid ""
 #~ "Goto prev Frame\n"
 #~ " use timezoom stepsize"
 #~ msgstr ""
 #~ "前のフレームに移動\n"
 #~ " 時間拡大ステップサイズを使用"
+
 #~ msgid ""
 #~ "Goto next Frame\n"
 #~ " use timezoom stepsize"
 #~ msgstr ""
 #~ "次のフレームに移動\n"
 #~ " 時間拡大ステップサイズを使用<"
+
 #~ msgid "bottom-left"
 #~ msgstr "左下"
+
 #~ msgid "GDynText: CharMap"
 #~ msgstr "GDynText: キャラクタマップ"
+
 #~ msgid "Cannot operate on grayscale images with alpha channel."
 #~ msgstr ""
 #~ "グレースケール画像ではアルファチャンネルを持った画像を取り扱えません"
+
 #~ msgid "Save Parameters To"
 #~ msgstr "パラメータを保存"
+
 #~ msgid "Load Parameters From"
 #~ msgstr "パラメータ読み込み"
+
 #~ msgid "Selective Load From"
 #~ msgstr "選択的読み込み"
+
 #~ msgid "Save (middle transform) as QBE File"
 #~ msgstr "変形経過を QBE ファイルとして保存"
+
 #~ msgid "Adjusting FG-BG"
 #~ msgstr "前景/背景色を調整しています"
+
 #~ msgid "_Use intensity"
 #~ msgstr "強度を使用する(_U)"
+
 #~ msgid "Polarizing"
 #~ msgstr "極座標に変換しています"
+
 #~ msgid "A_ntialiasing"
 #~ msgstr "アンチエイリアシング(_N)"
+
 #~ msgid "_Grab"
 #~ msgstr "取り込む(_G)"
+
 #~ msgid "W_ait"
 #~ msgstr "待ち時間(_A)"
+
 #~ msgid "seconds before grabbing"
 #~ msgstr "秒後に取り込み"
+
 #~ msgid ""
 #~ "The number of seconds to wait after selecting the window or region and "
 #~ "actually taking the screenshot."
 #~ msgstr ""
 #~ "ウィンドウや領域を選択後、指定した秒数待ってから画面を取り込みます。"
+
 #~ msgid "Value Propagating"
 #~ msgstr "明度を伝搬させています"
+
 #~ msgid "Copying IFS to image (%d/%d)"
 #~ msgstr "IFS を画像にコピーしています (%d/%d)"
+
 #~ msgid "Property"
 #~ msgstr "属性"
+
 #~ msgid "Description"
 #~ msgstr "説明"
+
 #~ msgid "Image _title:"
 #~ msgstr "画像のタイトル(_T):"
+
 #~ msgid "_Author:"
 #~ msgstr "作者(_A):"
+
 #~ msgid "Description _writer:"
 #~ msgstr "説明の著者(_W):"
+
 #~ msgid "Empty"
 #~ msgstr "何もありません"
+
 #~ msgid "Copyright"
 #~ msgstr "著作権表示:"
+
 #~ msgid "Camera 1"
 #~ msgstr "カメラ 1"
+
 #~ msgid "Camera 2"
 #~ msgstr "カメラ 2"
+
 #~ msgid "Thumbnail"
 #~ msgstr "サムネイル"
+
 #~ msgid "Advanced"
 #~ msgstr "詳細"
+
 #~ msgid "Import XMP from File"
 #~ msgstr "XMP をファイルからインポート"
+
 #~ msgid "Cannot create file"
 #~ msgstr "ファイルが作成できませんでした"
+
 #~ msgid "Some error occurred while saving"
 #~ msgstr "保存中にエラー発生"
+
 #~ msgid "Could not close the file"
 #~ msgstr "ファイルがクローズできませんでした"
+
 #~ msgid "Export XMP to File"
 #~ msgstr "XMP をファイルにエクスポート"
+
 #~ msgid "Image Properties"
 #~ msgstr "画像属性"
+
 #~ msgid "_Import XMP..."
 #~ msgstr "XMP 読み込み(_I)..."
+
 #~ msgid "_Export XMP..."
 #~ msgstr "XMP 書き出し(_E)..."
+
 #~ msgid "Propert_ies"
 #~ msgstr "属性(_I)"
+
 #~ msgid "Dither algorithm:"
 #~ msgstr "ディザリングアルゴリズム:"
+
 #~ msgid "Right border:"
 #~ msgstr "右縁:"
+
 #~ msgid "Bottom border:"
 #~ msgstr "下縁:"
+
 #~ msgid "Setup Printer..."
 #~ msgstr "プリンタの設定..."
+
 #~ msgid "New Printer..."
 #~ msgstr "新規プリンタ..."
+
 #~ msgid "Adjust Output..."
 #~ msgstr "出力の調整..."
+
 #~ msgid "Take a screenshot of your _desktop"
 #~ msgstr "デスクトップを取り込む(_D)"
+
 #~ msgid "Transferring TWAIN data"
 #~ msgstr "TWAIN データを転送しています"
+
 #~ msgid "Palette Map..."
 #~ msgstr "パレットマップしています..."
+
 #~ msgid "Load PDF"
 #~ msgstr "PDF 読み込み"
 
@@ -17605,4 +19033,3 @@ msgstr "何も取り込まれませんでした"
 #, fuzzy
 #~ msgid "Searching by type - please wait"
 #~ msgstr "名前で検索中 - お待ち下さい"
-
diff --git a/po-plug-ins/nn.po b/po-plug-ins/nn.po
index 463f8f3f05..efde48deb6 100644
--- a/po-plug-ins/nn.po
+++ b/po-plug-ins/nn.po
@@ -1,2075 +1,515 @@
-#  Kolbjørn Stuestøl 
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp 2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-12 15:26+0100\n"
-"PO-Revision-Date: 2008-03-05 21:56+0100\n"
-"Last-Translator: Kolbjørn Stuestøl \n"
-"Language-Team: Kolbjørn Stuestøl \n"
+"Project-Id-Version: GIMP 2.6\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n"
+"POT-Creation-Date: 2009-03-24 12:34+0000\n"
+"PO-Revision-Date: 2009-09-12 17:18+0100\n"
+"Last-Translator: Kolbjørn Stuestøl \n"
+"Language-Team: Norwegian nynorsk \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Norwegian Nynorsk\n"
-"X-Poedit-Country: NORWAY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plug-ins/FractalExplorer/Dialogs.c:547
-#: ../plug-ins/gfig/gfig-dialog.c:274 ../plug-ins/gflare/gflare.c:883
-#: ../plug-ins/gimpressionist/utils.c:143
-#, c-format
-msgid ""
-"No %s in gimprc:\n"
-"You need to add an entry like\n"
-"(%s \"%s\")\n"
-"to your %s file."
-msgstr ""
-"%s finst ikkje i gimprc:\n"
-"Du må skrive inn noe liknande\n"
-"(%s «%s»)\n"
-"i %s-fila di."
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:638
-msgid "Realtime preview"
-msgstr "Førehandsvising i sanntid"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:646
-msgid "If enabled the preview will be redrawn automatically"
-msgstr ""
-"Dersom du aktiviserer denne, vil førehandsvisinga bli oppdatert automatisk."
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:649
-msgid "R_edraw preview"
-msgstr "_Oppdater forhåndsvisning"
-
-#. Zoom Options
-#: ../plug-ins/FractalExplorer/Dialogs.c:657
-msgid "Zoom"
-msgstr "Zoom"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:693
-msgid "Undo last zoom change"
-msgstr "Angre siste zoomendringa"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:703
-msgid "Redo last zoom change"
-msgstr "Gjenta siste zoomendringa"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:718
-msgid "_Parameters"
-msgstr "_Parametrar"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:721
-msgid "Fractal Parameters"
-msgstr "Fraktalparametrar"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:734
-#: ../plug-ins/MapObject/mapobject_ui.c:1099
-msgid "Left:"
-msgstr "Venstre:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:743
-#: ../plug-ins/MapObject/mapobject_ui.c:1099
-msgid "Right:"
-msgstr "Høgre:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:752
-#: ../plug-ins/MapObject/mapobject_ui.c:1098
-msgid "Top:"
-msgstr "Topp:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:761
-#: ../plug-ins/MapObject/mapobject_ui.c:1098
-msgid "Bottom:"
-msgstr "Botn:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:770 ../plug-ins/common/warp.c:433
-#: ../plug-ins/ifscompose/ifscompose.c:1210
-msgid "Iterations:"
-msgstr "Gjentakingar:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:773
-msgid ""
-"The higher the number of iterations, the more details will be calculated"
-msgstr ""
-"Dess fleire gjentakingar (høgare verdi), dess fleire detaljar blir rekna ut"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:781
-msgid "CX:"
-msgstr "CX:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:784
-#: ../plug-ins/FractalExplorer/Dialogs.c:794
-msgid "Changes aspect of fractal"
-msgstr "Endrar utsjånaden til fraktalen"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:791
-msgid "CY:"
-msgstr "CY:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:809
-msgid "Load a fractal from file"
-msgstr "Last fraktal frå fil"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:817
-msgid "Reset parameters to default values"
-msgstr "Sett tilbake til standardverdiane"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:826
-msgid "Save active fractal to file"
-msgstr "Lagra aktiv fraktal frå fil"
-
-#. Fractal type toggle box
-#: ../plug-ins/FractalExplorer/Dialogs.c:829
-msgid "Fractal Type"
-msgstr "Fraktaltype"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:842
-msgid "Mandelbrot"
-msgstr "Mandelbrot"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:844
-msgid "Julia"
-msgstr "Julia"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:846
-msgid "Barnsley 1"
-msgstr "Barnsley 1"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:848
-msgid "Barnsley 2"
-msgstr "Barnsley 2"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:850
-msgid "Barnsley 3"
-msgstr "Barnsley 3"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:852
-msgid "Spider"
-msgstr "Spinne"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:854
-msgid "Man'o'war"
-msgstr "Man'o'war"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:856
-msgid "Lambda"
-msgstr "Lambda"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:858
-msgid "Sierpinski"
-msgstr "Sierpinski"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:904 ../plug-ins/common/sinus.c:886
-msgid "Co_lors"
-msgstr "_Fargar"
-
-#. Number of Colors frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:908
-#: ../plug-ins/common/borderaverage.c:415
-msgid "Number of Colors"
-msgstr "Talet på fargar"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:920
-msgid "Number of colors:"
-msgstr "Talet på fargar:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:923
-msgid "Change the number of colors in the mapping"
-msgstr "Endra talet på fargar i avbildinga"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:930
-msgid "Use loglog smoothing"
-msgstr "Bruk loglog utglatting"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:937
-msgid "Use log log smoothing to eliminate \"banding\" in the result"
-msgstr "Bruk loglog utglatting for å eliminera  «striping» på biletet"
-
-#. Color Density frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:941
-msgid "Color Density"
-msgstr "Fargedekning"
-
-#. These values are translated for the GUI but also used internally
-#. to figure out which button the user pushed, etc.
-#. Not my design, please don't blame me -- njl
-#: ../plug-ins/FractalExplorer/Dialogs.c:953 ../plug-ins/common/fp.c:220
-msgid "Red:"
-msgstr "Raud:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:956
-msgid "Change the intensity of the red channel"
-msgstr "Endra intensiteten for den raude kanalen"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:963 ../plug-ins/common/fp.c:221
-msgid "Green:"
-msgstr "Grøn:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:966
-msgid "Change the intensity of the green channel"
-msgstr "Endra intensiteten for den grøne kanalen"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:973 ../plug-ins/common/fp.c:222
-msgid "Blue:"
-msgstr "Blå:"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:976
-msgid "Change the intensity of the blue channel"
-msgstr "Endra intensiteten for den blå kanalen"
-
-#. Color Function frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:982
-msgid "Color Function"
-msgstr "Fargefunksjon"
-
-#. Redmode radio frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:991
-#: ../plug-ins/common/channel_mixer.c:537 ../plug-ins/common/decompose.c:174
-msgid "Red"
-msgstr "Raud"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:995
-#: ../plug-ins/FractalExplorer/Dialogs.c:1036
-#: ../plug-ins/FractalExplorer/Dialogs.c:1077
-msgid "Sine"
-msgstr "Sinus"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:997
-#: ../plug-ins/FractalExplorer/Dialogs.c:1038
-#: ../plug-ins/FractalExplorer/Dialogs.c:1079
-msgid "Cosine"
-msgstr "Kosinus"
-
-#. if and how to center the image on the page
-#: ../plug-ins/FractalExplorer/Dialogs.c:999
-#: ../plug-ins/FractalExplorer/Dialogs.c:1040
-#: ../plug-ins/FractalExplorer/Dialogs.c:1081
-#: ../plug-ins/Lighting/lighting_ui.c:415
-#: ../plug-ins/common/CML_explorer.c:166 ../plug-ins/common/align_layers.c:422
-#: ../plug-ins/common/align_layers.c:453 ../plug-ins/common/postscript.c:3230
-#: ../plug-ins/common/postscript.c:3242 ../plug-ins/common/psp.c:418
-#: ../plug-ins/fits/fits.c:1026 ../plug-ins/print/print-page-layout.c:449
-msgid "None"
-msgstr "Ingen"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1004
-#: ../plug-ins/FractalExplorer/Dialogs.c:1045
-#: ../plug-ins/FractalExplorer/Dialogs.c:1086
-msgid "Use sine-function for this color component"
-msgstr "Bruk sinusfunksjon for denne fargekomponenten"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1007
-#: ../plug-ins/FractalExplorer/Dialogs.c:1048
-#: ../plug-ins/FractalExplorer/Dialogs.c:1089
-msgid "Use cosine-function for this color component"
-msgstr "Bruk kosinusfunksjon for denne fargekomponenten"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1010
-#: ../plug-ins/FractalExplorer/Dialogs.c:1051
-#: ../plug-ins/FractalExplorer/Dialogs.c:1092
-msgid ""
-"Use linear mapping instead of any trigonometrical function for this color "
-"channel"
-msgstr ""
-"Bruk lineær avbilding i staden for triginometriske funksjonar for denne "
-"fargekanalen"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1019
-#: ../plug-ins/FractalExplorer/Dialogs.c:1060
-#: ../plug-ins/FractalExplorer/Dialogs.c:1101
-msgid "Inversion"
-msgstr "Inversjon"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1027
-#: ../plug-ins/FractalExplorer/Dialogs.c:1068
-#: ../plug-ins/FractalExplorer/Dialogs.c:1109
-msgid ""
-"If you enable this option higher color values will be swapped with lower "
-"ones and vice versa"
-msgstr ""
-"Slår du på dette alternativet vil høgere fargeverdiar bli bytta om med "
-"lågare og motsett"
-
-#. Greenmode radio frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:1032
-#: ../plug-ins/common/channel_mixer.c:542 ../plug-ins/common/decompose.c:175
-msgid "Green"
-msgstr "Grøn"
-
-#. Bluemode radio frame
-#: ../plug-ins/FractalExplorer/Dialogs.c:1073
-#: ../plug-ins/common/channel_mixer.c:547 ../plug-ins/common/decompose.c:176
-msgid "Blue"
-msgstr "Blå"
-
-#. Colormode toggle box
-#: ../plug-ins/FractalExplorer/Dialogs.c:1114
-msgid "Color Mode"
-msgstr "Fargemodus"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1123
-msgid "As specified above"
-msgstr "Som spesifisert ovanfor"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1135
-msgid ""
-"Create a color-map with the options you specified above (color density/"
-"function). The result is visible in the preview image"
-msgstr ""
-"Lag eit fargekart med dei innstillingane du spesifiserte ovanfor  "
-"(fargetettleik/funksjon). Resultatet er synleg i førehandsvisinga."
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1145
-msgid "Apply active gradient to final image"
-msgstr "Legg aktiv fargeovergang til det ferdige biletet"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1157
-msgid "Create a color-map using a gradient from the gradient editor"
-msgstr ""
-"Opprett eit fargekart ved å bruke ein fargeovergang frå "
-"fargeovergangsbehandlaren"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1168
-msgid "FractalExplorer Gradient"
-msgstr "Fraktalutforskarovergang"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1198
-msgid "_Fractals"
-msgstr "_Fraktalar"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1546
-#: ../plug-ins/Lighting/lighting_ui.c:1210 ../plug-ins/bmp/bmpwrite.c:294
-#: ../plug-ins/common/CEL.c:568 ../plug-ins/common/CML_explorer.c:2004
-#: ../plug-ins/common/channel_mixer.c:1059 ../plug-ins/common/compressor.c:410
-#: ../plug-ins/common/compressor.c:473 ../plug-ins/common/compressor.c:563
-#: ../plug-ins/common/compressor.c:632 ../plug-ins/common/curve_bend.c:817
-#: ../plug-ins/common/dicom.c:708 ../plug-ins/common/gbr.c:616
-#: ../plug-ins/common/gif-save.c:986 ../plug-ins/common/gih.c:1258
-#: ../plug-ins/common/gtm.c:225 ../plug-ins/common/mng.c:561
-#: ../plug-ins/common/mng.c:950 ../plug-ins/common/pat.c:447
-#: ../plug-ins/common/pcx.c:645 ../plug-ins/common/pix.c:508
-#: ../plug-ins/common/png.c:1244 ../plug-ins/common/pnm.c:958
-#: ../plug-ins/common/postscript.c:1196 ../plug-ins/common/psd-save.c:1557
-#: ../plug-ins/common/raw.c:528 ../plug-ins/common/raw.c:555
-#: ../plug-ins/common/spheredesigner.c:2120 ../plug-ins/common/sunras.c:544
-#: ../plug-ins/common/tga.c:1133 ../plug-ins/common/tiff-save.c:671
-#: ../plug-ins/common/xbm.c:1016 ../plug-ins/common/xwd.c:598
-#: ../plug-ins/fits/fits.c:457 ../plug-ins/flame/flame.c:442
-#: ../plug-ins/gfig/gfig.c:794 ../plug-ins/gfli/gfli.c:715
-#: ../plug-ins/ifscompose/ifscompose.c:2376 ../plug-ins/jpeg/jpeg-save.c:325
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:282
-#: ../plug-ins/winicon/icosave.c:1020 ../plug-ins/xjt/xjt.c:1280
-#: ../plug-ins/xjt/xjt.c:1714
-#, c-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "Kan ikkje opna «%s» for skriving: %s"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1560
-#, c-format
-msgid "Could not write '%s': %s"
-msgstr "Kunne ikkje skriva til «%s»: %s"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1635
-msgid "Load Fractal Parameters"
-msgstr "Hent fraktalparametrar"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1673
-msgid "Save Fractal Parameters"
-msgstr "Lagra fraktalparametrar"
-
-#. Do not rely on librsvg setting GError on failure!
-#. stat error (file does not exist)
-#: ../plug-ins/FractalExplorer/Dialogs.c:1863
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:933
-#: ../plug-ins/Lighting/lighting_ui.c:1353 ../plug-ins/bmp/bmpread.c:149
-#: ../plug-ins/common/CEL.c:299 ../plug-ins/common/CML_explorer.c:2177
-#: ../plug-ins/common/channel_mixer.c:981 ../plug-ins/common/compressor.c:464
-#: ../plug-ins/common/compressor.c:622 ../plug-ins/common/curve_bend.c:869
-#: ../plug-ins/common/dicom.c:296 ../plug-ins/common/gbr.c:348
-#: ../plug-ins/common/gif-load.c:309 ../plug-ins/common/gih.c:649
-#: ../plug-ins/common/mng.c:1121 ../plug-ins/common/pat.c:317
-#: ../plug-ins/common/pcx.c:344 ../plug-ins/common/pix.c:329
-#: ../plug-ins/common/png.c:703 ../plug-ins/common/pnm.c:480
-#: ../plug-ins/common/poppler.c:527 ../plug-ins/common/postscript.c:1023
-#: ../plug-ins/common/postscript.c:3031 ../plug-ins/common/psp.c:1432
-#: ../plug-ins/common/raw.c:243 ../plug-ins/common/raw.c:645
-#: ../plug-ins/common/spheredesigner.c:2010 ../plug-ins/common/sunras.c:378
-#: ../plug-ins/common/svg.c:321 ../plug-ins/common/svg.c:702
-#: ../plug-ins/common/tga.c:423 ../plug-ins/common/tiff-load.c:288
-#: ../plug-ins/common/xbm.c:720 ../plug-ins/common/xwd.c:420
-#: ../plug-ins/faxg3/faxg3.c:219 ../plug-ins/fits/fits.c:345
-#: ../plug-ins/flame/flame.c:411 ../plug-ins/gfig/gfig.c:434
-#: ../plug-ins/gfli/gfli.c:429 ../plug-ins/gfli/gfli.c:464
-#: ../plug-ins/help/gimphelplocale.c:193 ../plug-ins/jpeg/jpeg-load.c:111
-#: ../plug-ins/jpeg/jpeg-load.c:821 ../plug-ins/psd/psd-load.c:125
-#: ../plug-ins/psd/psd-thumb-load.c:78
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:271
-#: ../plug-ins/uri/uri-backend-libcurl.c:186 ../plug-ins/winicon/icoload.c:651
-#: ../plug-ins/winicon/icoload.c:728 ../plug-ins/xjt/xjt.c:2545
-#: ../plug-ins/xjt/xjt.c:2553
-#, c-format
-msgid "Could not open '%s' for reading: %s"
-msgstr "Kunne ikkje opna «%s» for lesing: %s"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1871
-#, c-format
-msgid "'%s' is not a FractalExplorer file"
-msgstr "«%s» er ikkje ei Fraktalutforskarfil"
-
-#: ../plug-ins/FractalExplorer/Dialogs.c:1877
-#, c-format
-msgid "'%s' is corrupt. Line %d Option section incorrect"
-msgstr "Feil i «%s». Innstillingane i %d er feil"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:243
-msgid "Render fractal art"
-msgstr "Teiknar fraktalkunst"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:248
-msgid "_Fractal Explorer..."
-msgstr "_Fraktalutforskaren..."
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:378
-msgid "Rendering fractal"
-msgstr "Teiknar fraktal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:760
-#: ../plug-ins/gflare/gflare.c:3154
-#, c-format
-msgid "Are you sure you want to delete \"%s\" from the list and from disk?"
-msgstr "Er du sikker på at du vil slette \"%s\" frå lista og frå disken?"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:764
-msgid "Delete Fractal"
-msgstr "Slett fraktal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:954
-#, c-format
-msgid "File '%s' is not a FractalExplorer file"
-msgstr "Fila «%s» er ikkje ei Fraktalutforskar-fil"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:963
-#, c-format
-msgid ""
-"File '%s' is corrupt.\n"
-"Line %d Option section incorrect"
-msgstr ""
-"Fila «%s» er skada.\n"
-"Linje %d innstillingssektionen er feil"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1007
-msgid "My first fractal"
-msgstr "Min første fraktal"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1071
-msgid "Select folder and rescan collection"
-msgstr "Vel mappe og skan samlinga på nytt"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1083
-msgid "Apply currently selected fractal"
-msgstr "Bruk den valde fraktalen"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1095
-msgid "Delete currently selected fractal"
-msgstr "Slett den valde fraktalen"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1118
-msgid "Rescan for Fractals"
-msgstr "Les inn fraktalar på nytt"
-
-#: ../plug-ins/FractalExplorer/FractalExplorer.c:1137
-msgid "Add FractalExplorer Path"
-msgstr "Legg til stig for fraktalutforskaren"
-
-#: ../plug-ins/Lighting/lighting_apply.c:104
-#: ../plug-ins/Lighting/lighting_ui.c:1018
-msgid "Lighting Effects"
-msgstr "Lyseffektar"
-
-#: ../plug-ins/Lighting/lighting_main.c:195
-msgid "Apply various lighting effects to an image"
-msgstr "Bruk fleire lyseffektar i biletet"
-
-#: ../plug-ins/Lighting/lighting_main.c:200
-msgid "_Lighting Effects..."
-msgstr "_Lyseffektar..."
-
-#. General options
-#: ../plug-ins/Lighting/lighting_ui.c:294
-#: ../plug-ins/MapObject/mapobject_ui.c:472
-msgid "General Options"
-msgstr "Generelle innstillingar"
-
-#: ../plug-ins/Lighting/lighting_ui.c:302
-msgid "T_ransparent background"
-msgstr "_Gjennomsiktig bakgrunn"
-
-#: ../plug-ins/Lighting/lighting_ui.c:312
-msgid "Make destination image transparent where bump height is zero"
-msgstr "Gjer målbiletet gennemsigtig når humphøgda er null"
-
-#: ../plug-ins/Lighting/lighting_ui.c:315
-msgid "Cre_ate new image"
-msgstr "Lag n_ytt bilete"
-
-#: ../plug-ins/Lighting/lighting_ui.c:325
-#: ../plug-ins/MapObject/mapobject_ui.c:541
-msgid "Create a new image when applying filter"
-msgstr ""
-"Lager eit nytt bilete og bruker filteret i dette. Originalbiletet er "
-"uforandra"
-
-#: ../plug-ins/Lighting/lighting_ui.c:327
-msgid "High _quality preview"
-msgstr "Førehandsvising i høg _kvalitet"
-
-#: ../plug-ins/Lighting/lighting_ui.c:337
-msgid "Enable/disable high quality preview"
-msgstr "Slå førehandsvising i høg _kvalitet av/på"
-
-#: ../plug-ins/Lighting/lighting_ui.c:344
-msgid "Distance:"
-msgstr "Avstand:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:377
-#: ../plug-ins/MapObject/mapobject_ui.c:619
-msgid "Light Settings"
-msgstr "Lyssettingar"
-
-#: ../plug-ins/Lighting/lighting_ui.c:390
-msgid "Light 1"
-msgstr "Lys 1"
-
-#: ../plug-ins/Lighting/lighting_ui.c:391
-msgid "Light 2"
-msgstr "Lys 2"
-
-#: ../plug-ins/Lighting/lighting_ui.c:392
-msgid "Light 3"
-msgstr "Lys 3"
-
-#: ../plug-ins/Lighting/lighting_ui.c:393
-msgid "Light 4"
-msgstr "Lys 4"
-
-#: ../plug-ins/Lighting/lighting_ui.c:394
-msgid "Light 5"
-msgstr "Lys 5"
-
-#: ../plug-ins/Lighting/lighting_ui.c:395
-msgid "Light 6"
-msgstr "Lys 6"
-
-#. row labels
-#: ../plug-ins/Lighting/lighting_ui.c:404
-#: ../plug-ins/common/spheredesigner.c:2706
-msgid "Type:"
-msgstr "Type:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:409
-msgid "Color:"
-msgstr "Farge:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:416
-msgid "Directional"
-msgstr "Retta"
-
-#: ../plug-ins/Lighting/lighting_ui.c:417
-msgid "Point"
-msgstr "Punkt"
-
-#: ../plug-ins/Lighting/lighting_ui.c:431
-#: ../plug-ins/MapObject/mapobject_ui.c:642
-msgid "Type of light source to apply"
-msgstr "Lyskjeldetype som skal leggjast til"
-
-#: ../plug-ins/Lighting/lighting_ui.c:433
-#: ../plug-ins/MapObject/mapobject_ui.c:644
-msgid "Select lightsource color"
-msgstr "Farge på lyskjelde"
-
-#: ../plug-ins/Lighting/lighting_ui.c:447
-#: ../plug-ins/MapObject/mapobject_ui.c:657
-msgid "Set light source color"
-msgstr "Sett farge for lyskjelde"
-
-#: ../plug-ins/Lighting/lighting_ui.c:455
-msgid "_Intensity:"
-msgstr "_Intensitet:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:463
-msgid "Light intensity"
-msgstr "Lysintensitet"
-
-#: ../plug-ins/Lighting/lighting_ui.c:466
-#: ../plug-ins/MapObject/mapobject_ui.c:659
-#: ../plug-ins/MapObject/mapobject_ui.c:986
-#: ../plug-ins/print/print-page-layout.c:343
-msgid "Position"
-msgstr "Posisjon"
-
-#: ../plug-ins/Lighting/lighting_ui.c:476 ../plug-ins/common/flarefx.c:772
-#: ../plug-ins/common/mblur.c:1094 ../plug-ins/common/nova.c:463
-#: ../plug-ins/common/papertile.c:282 ../plug-ins/flame/flame.c:1227
-#: ../plug-ins/gflare/gflare.c:2679
-msgid "_X:"
-msgstr "_X:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:484
-#: ../plug-ins/MapObject/mapobject_ui.c:683
-msgid "Light source X position in XYZ space"
-msgstr "X-koordinata for lyskjelda i XYZ-rommet"
-
-#: ../plug-ins/Lighting/lighting_ui.c:491 ../plug-ins/common/flarefx.c:777
-#: ../plug-ins/common/mblur.c:1099 ../plug-ins/common/nova.c:468
-#: ../plug-ins/common/papertile.c:291 ../plug-ins/flame/flame.c:1241
-#: ../plug-ins/gflare/gflare.c:2683
-msgid "_Y:"
-msgstr "_Y:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:499
-#: ../plug-ins/MapObject/mapobject_ui.c:697
-msgid "Light source Y position in XYZ space"
-msgstr "Y-koordinata for lyskjelda i XYZ-rommet"
-
-#: ../plug-ins/Lighting/lighting_ui.c:506
-msgid "_Z:"
-msgstr "_Z:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:514
-#: ../plug-ins/MapObject/mapobject_ui.c:711
-msgid "Light source Z position in XYZ space"
-msgstr "Z-koordinata for lyskjelda i XYZ-rommet"
-
-#. *****************************************************
-#. radio buttons for choosing LEFT or RIGHT
-#. *************************************************
-#: ../plug-ins/Lighting/lighting_ui.c:517 ../plug-ins/common/struc.c:1292
-#: ../plug-ins/common/wind.c:943
-msgid "Direction"
-msgstr "Retning"
-
-#. X
-#: ../plug-ins/Lighting/lighting_ui.c:526
-#: ../plug-ins/MapObject/mapobject_ui.c:675
-#: ../plug-ins/MapObject/mapobject_ui.c:729
-#: ../plug-ins/MapObject/mapobject_ui.c:997
-#: ../plug-ins/MapObject/mapobject_ui.c:1046
-#: ../plug-ins/ifscompose/ifscompose.c:525
-msgid "X:"
-msgstr "X:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:534
-#: ../plug-ins/MapObject/mapobject_ui.c:737
-msgid "Light source X direction in XYZ space"
-msgstr "X-retningskomponenten for lyskjelda i XYZ-rommet"
-
-#. Y
-#: ../plug-ins/Lighting/lighting_ui.c:540
-#: ../plug-ins/MapObject/mapobject_ui.c:689
-#: ../plug-ins/MapObject/mapobject_ui.c:742
-#: ../plug-ins/MapObject/mapobject_ui.c:1010
-#: ../plug-ins/MapObject/mapobject_ui.c:1057
-#: ../plug-ins/MapObject/mapobject_ui.c:1155
-#: ../plug-ins/ifscompose/ifscompose.c:539
-msgid "Y:"
-msgstr "Y:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:548
-#: ../plug-ins/MapObject/mapobject_ui.c:750
-msgid "Light source Y direction in XYZ space"
-msgstr "Y-retningskomponenten for lyskjelda i XYZ-rommet"
-
-#: ../plug-ins/Lighting/lighting_ui.c:554
-#: ../plug-ins/MapObject/mapobject_ui.c:703
-#: ../plug-ins/MapObject/mapobject_ui.c:755
-#: ../plug-ins/MapObject/mapobject_ui.c:1023
-#: ../plug-ins/MapObject/mapobject_ui.c:1068
-#: ../plug-ins/MapObject/mapobject_ui.c:1167
-msgid "Z:"
-msgstr "Z:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:562
-#: ../plug-ins/MapObject/mapobject_ui.c:763
-msgid "Light source Z direction in XYZ space"
-msgstr "Z-retningskomponenten for lyskjelda i XYZ-rommet"
-
-#: ../plug-ins/Lighting/lighting_ui.c:565
-msgid "I_solate"
-msgstr "I_soler"
-
-#: ../plug-ins/Lighting/lighting_ui.c:574
-msgid "Lighting preset:"
-msgstr "Belysningsforval:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:620
-msgid "Material Properties"
-msgstr "Materialinnstillingar"
-
-#: ../plug-ins/Lighting/lighting_ui.c:638
-msgid "_Glowing:"
-msgstr "_Glød:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:657
-#: ../plug-ins/MapObject/mapobject_ui.c:824
-msgid "Amount of original color to show where no direct light falls"
-msgstr "Mengda av originalfarge som skal synast der det ikkje er direktelys"
-
-#: ../plug-ins/Lighting/lighting_ui.c:671
-msgid "_Bright:"
-msgstr "_Lysmengd:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:690
-#: ../plug-ins/MapObject/mapobject_ui.c:853
-msgid "Intensity of original color when lit by a light source"
-msgstr "Intensiteten på originalfargen når han blir opplyst av ei lyskjelde"
-
-#: ../plug-ins/Lighting/lighting_ui.c:704
-msgid "_Shiny:"
-msgstr "_Glans:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:723
-#: ../plug-ins/MapObject/mapobject_ui.c:925
-msgid "Controls how intense the highlights will be"
-msgstr "Kontrollerar intensiteten til høglysa"
-
-#: ../plug-ins/Lighting/lighting_ui.c:736
-msgid "_Polished:"
-msgstr "_Polert:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:755
-#: ../plug-ins/MapObject/mapobject_ui.c:954
-msgid "Higher values makes the highlights more focused"
-msgstr "Dess høgare verdi dess høgare glans i høglysa"
-
-#. Metallic
-#: ../plug-ins/Lighting/lighting_ui.c:765
-msgid "_Metallic"
-msgstr "_Metallisk"
-
-#: ../plug-ins/Lighting/lighting_ui.c:802
-msgid "E_nable bump mapping"
-msgstr "_aktiver avbildinga"
-
-#: ../plug-ins/Lighting/lighting_ui.c:816
-msgid "Enable/disable bump-mapping (image depth)"
-msgstr "Slå biletpunktkopling av/på (biletdjupn)"
-
-#: ../plug-ins/Lighting/lighting_ui.c:838
-msgid "Bumpm_ap image:"
-msgstr "Mønsterbiletet:"
-
-#. Map type menu
-#: ../plug-ins/Lighting/lighting_ui.c:841 ../plug-ins/common/bumpmap.c:835
-#: ../plug-ins/flame/flame.c:746
-msgid "Linear"
-msgstr "Lineær"
-
-#: ../plug-ins/Lighting/lighting_ui.c:842
-msgid "Logarithmic"
-msgstr "Logarithmisk"
-
-#: ../plug-ins/Lighting/lighting_ui.c:843 ../plug-ins/common/bumpmap.c:837
-#: ../plug-ins/flame/flame.c:747
-msgid "Sinusoidal"
-msgstr "Sinusforma"
-
-#: ../plug-ins/Lighting/lighting_ui.c:844 ../plug-ins/common/bumpmap.c:836
-#: ../plug-ins/flame/flame.c:748
-msgid "Spherical"
-msgstr "Kuleforma"
-
-#: ../plug-ins/Lighting/lighting_ui.c:854
-msgid "Cu_rve:"
-msgstr "Ku_rve:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:859
-msgid "Ma_ximum height:"
-msgstr "Ma_ksimal høgde:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:869
-msgid "Maximum height for bumps"
-msgstr "Maksimal høgde for humpane"
-
-#: ../plug-ins/Lighting/lighting_ui.c:893
-msgid "E_nable environment mapping"
-msgstr "_Aktiver kopling til omgivnadane"
-
-#: ../plug-ins/Lighting/lighting_ui.c:907
-msgid "Enable/disable environment-mapping (reflection)"
-msgstr "Slå kopling til omgivnadane av/på (refleksjon)"
-
-#: ../plug-ins/Lighting/lighting_ui.c:924
-msgid "En_vironment image:"
-msgstr "_Omgivnadsbilete:"
-
-#: ../plug-ins/Lighting/lighting_ui.c:927
-msgid "Environment image to use"
-msgstr "Omgivnadsbilete som skal brukast"
-
-#: ../plug-ins/Lighting/lighting_ui.c:949
-msgid "Op_tions"
-msgstr "_Innstillingar"
-
-#: ../plug-ins/Lighting/lighting_ui.c:953
-#: ../plug-ins/MapObject/mapobject_ui.c:1291
-msgid "_Light"
-msgstr "_Lys"
-
-#: ../plug-ins/Lighting/lighting_ui.c:957
-#: ../plug-ins/MapObject/mapobject_ui.c:1295
-msgid "_Material"
-msgstr "_Materiale"
-
-#: ../plug-ins/Lighting/lighting_ui.c:961
-msgid "_Bump Map"
-msgstr "_Avbilding"
-
-#: ../plug-ins/Lighting/lighting_ui.c:965
-msgid "_Environment Map"
-msgstr "_Omgivnadskopling"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1074
-#: ../plug-ins/gimpressionist/preview.c:174
-#: ../plug-ins/gimpressionist/repaint.c:1184
-#: ../plug-ins/imagemap/imap_polygon.c:515
-msgid "_Update"
-msgstr "_Oppdater"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1081
-#: ../plug-ins/MapObject/mapobject_ui.c:1397
-msgid "Recompute preview image"
-msgstr "Oppdater førehandsvisinga"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1083
-msgid "I_nteractive"
-msgstr "I_nteraktiv"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1097
-msgid "Enable/disable real time preview of changes"
-msgstr "Sanntidsoppdatering av førehandsvising av/på"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1136
-msgid "Save Lighting Preset"
-msgstr "Lagra førehandsinnstillingane for lys"
-
-#: ../plug-ins/Lighting/lighting_ui.c:1280
-msgid "Load Lighting Preset"
-msgstr "Opna førehandsinnstillingane for lys"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:275
-msgid "Map to plane"
-msgstr "Avbild på plan"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:278
-msgid "Map to sphere"
-msgstr "Avbild på kule"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:281
-msgid "Map to box"
-msgstr "Avbild på boks"
-
-#: ../plug-ins/MapObject/mapobject_apply.c:284
-msgid "Map to cylinder"
-msgstr "Avbildt på sylinder"
-
-#: ../plug-ins/MapObject/mapobject_main.c:196
-msgid "Map the image to an object (plane, sphere, box or cylinder)"
-msgstr "Overfør biletet til eit objekt (plan, kule, boks eller sylinder)."
-
-#: ../plug-ins/MapObject/mapobject_main.c:201
-msgid "Map _Object..."
-msgstr "Avbild på _objekt..."
-
-#: ../plug-ins/MapObject/mapobject_ui.c:248
-#: ../plug-ins/MapObject/mapobject_ui.c:1305
-msgid "_Box"
-msgstr "_Boks"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:266
-#: ../plug-ins/MapObject/mapobject_ui.c:1311
-msgid "C_ylinder"
-msgstr "S_ylinder"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:484
-msgid "Map to:"
-msgstr "Avbild på:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:488
-msgid "Plane"
-msgstr "Plan"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:489
-msgid "Sphere"
-msgstr "Kule"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:490
-msgid "Box"
-msgstr "Boks"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:491
-msgid "Cylinder"
-msgstr "Sylinder"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:501
-msgid "Type of object to map to"
-msgstr "Type objekt å avbilda på"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:503
-msgid "Transparent background"
-msgstr "Gjennomsiktig bakgrunn"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:514
-msgid "Make image transparent outside object"
-msgstr "Lag biletet gjennomsiktig utanfor objektet"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:516
-msgid "Tile source image"
-msgstr "Flislegg kjeldebiletet"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:527
-msgid "Tile source image: useful for infinite planes"
-msgstr "Flislegg kjeldebiletet: Nyttig for store flater"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:530
-msgid "Create new image"
-msgstr "Lag nytt bilete "
-
-#: ../plug-ins/MapObject/mapobject_ui.c:549
-msgid "Enable _antialiasing"
-msgstr "Aktiviser _kantutjamning"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:560
-msgid "Enable/disable jagged edges removal (antialiasing)"
-msgstr "Slå fjerning av trappekant av/på (kantutglatting)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:573 ../plug-ins/common/bumpmap.c:916
-#: ../plug-ins/common/emboss.c:523 ../plug-ins/common/fractaltrace.c:796
-#: ../plug-ins/common/struc.c:1324
-msgid "_Depth:"
-msgstr "_Djupn:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:576
-msgid "Antialiasing quality. Higher is better, but slower"
-msgstr "Kvaliteten på kantutjamninga. Høg er best, men seinast"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:585 ../plug-ins/common/redeye.c:173
-#: ../plug-ins/common/unsharp.c:704 ../plug-ins/common/wind.c:1006
-#: ../plug-ins/imagemap/imap_preferences.c:441
-msgid "_Threshold:"
-msgstr "_Terskelverdi:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:593
-msgid "Stop when pixel differences are smaller than this value"
-msgstr "Stopp når pikseldifferansen er mindre enn denne verdien"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:628
-msgid "Point light"
-msgstr "Punktlys"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:629
-msgid "Directional light"
-msgstr "Retningsbestemt lys"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:630
-msgid "No light"
-msgstr "Ikkje lys"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:635
-msgid "Lightsource type:"
-msgstr "Type lyskjelde:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:649
-msgid "Lightsource color:"
-msgstr "Lyskjeldefarge:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:714
-msgid "Direction Vector"
-msgstr "Retningsvektor"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:790
-msgid "Intensity Levels"
-msgstr "Intensitetsnivå"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:809
-msgid "Ambient:"
-msgstr "Bakgrunnslys:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:838
-#: ../plug-ins/MapObject/mapobject_ui.c:881
-msgid "Diffuse:"
-msgstr "Diffusjon:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:862
-msgid "Reflectivity"
-msgstr "Reflektivitet"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:896
-msgid "Higher values makes the object reflect more light (appear lighter)"
-msgstr ""
-"Dess høgare verdi dess meir lys blir reflektert frå objektet og gjer at det "
-"ser lysare ut"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:910
-msgid "Specular:"
-msgstr "Spegling:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:939
-msgid "Highlight:"
-msgstr "Høgglans:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1000
-msgid "Object X position in XYZ space"
-msgstr "X-koordinata for objektet i XYZ-rommet"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1013
-msgid "Object Y position in XYZ space"
-msgstr "Y-koordinata for objektet i XYZ-rommet"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1026
-msgid "Object Z position in XYZ space"
-msgstr "Z-koordinata for objektet i XYZ-rommet"
-
-#. Rotation
-#: ../plug-ins/MapObject/mapobject_ui.c:1035
-#: ../plug-ins/common/postscript.c:3428
-msgid "Rotation"
-msgstr "Rotasjon"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1049
-msgid "Rotation angle about X axis"
-msgstr "Rotasjonsvinkel om X-aksen"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1060
-msgid "Rotation angle about Y axis"
-msgstr "Rotasjonsvinkel om Y-aksen"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1071
-msgid "Rotation angle about Z axis"
-msgstr "Rotasjonsvinkel om Z-aksen"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1097
-msgid "Front:"
-msgstr "Front:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1097
-msgid "Back:"
-msgstr "Bak:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1105
-msgid "Map Images to Box Faces"
-msgstr "Bilete til bokssidene"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1143
-#: ../plug-ins/common/spheredesigner.c:2800
-msgid "Scale X:"
-msgstr "Skalering X:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1146
-msgid "X scale (size)"
-msgstr "X-skalering (storleik)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1158
-msgid "Y scale (size)"
-msgstr "Y-skalering (storleik)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1170
-msgid "Z scale (size)"
-msgstr "Z-skalering (storleik)"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1193
-#: ../plug-ins/print/print-page-layout.c:402
-msgid "_Top:"
-msgstr "_Topp:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1193
-#: ../plug-ins/print/print-page-layout.c:421
-msgid "_Bottom:"
-msgstr "_Botn:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1198
-msgid "Images for the Cap Faces"
-msgstr "Bilete for endeflatene"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1227
-#: ../plug-ins/print/print-page-layout.c:219
-msgid "Size"
-msgstr "Storleik"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1238
-msgid "R_adius:"
-msgstr "R_adius:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1242
-msgid "Cylinder radius"
-msgstr "Sylinderradius"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1252 ../plug-ins/common/mblur.c:1125
-msgid "L_ength:"
-msgstr "Le_ngde:"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1256
-msgid "Cylinder length"
-msgstr "Sylinderlengd"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1287
-msgid "O_ptions"
-msgstr "_Innstillingar"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1299
-msgid "O_rientation"
-msgstr "O_rientiering"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1335
-msgid "Map to Object"
-msgstr "Avbild på objektet"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1388
-#: ../plug-ins/common/diffraction.c:477
-msgid "_Preview!"
-msgstr "_Førehandsvis!"
-
-#: ../plug-ins/MapObject/mapobject_ui.c:1415
-msgid "Show preview _wireframe"
-msgstr "Vis _rutenett"
-
-#: ../plug-ins/bmp/bmp.c:124 ../plug-ins/bmp/bmp.c:143
-msgid "Windows BMP image"
-msgstr "Microsoft Windows BMP-bilete"
-
-#: ../plug-ins/bmp/bmpread.c:85
-msgid "Bad colormap"
-msgstr "Feil fargekart"
-
-#. max. rows allocated
-#. column, highest column ever used
-#. -1  assume fsel is not available (and not attached to any drawable)
-#. -1  assume there is no floating selection
-#: ../plug-ins/bmp/bmpread.c:154 ../plug-ins/common/CEL.c:304
-#: ../plug-ins/common/dicom.c:301 ../plug-ins/common/gbr.c:353
-#: ../plug-ins/common/gif-load.c:314 ../plug-ins/common/gih.c:654
-#: ../plug-ins/common/pat.c:322 ../plug-ins/common/pcx.c:349
-#: ../plug-ins/common/pix.c:334 ../plug-ins/common/png.c:710
-#: ../plug-ins/common/pnm.c:485 ../plug-ins/common/poppler.c:572
-#: ../plug-ins/common/postscript.c:1029 ../plug-ins/common/raw.c:650
-#: ../plug-ins/common/sunras.c:470 ../plug-ins/common/tga.c:428
-#: ../plug-ins/common/tiff-load.c:569 ../plug-ins/common/wmf.c:992
-#: ../plug-ins/common/xbm.c:725 ../plug-ins/common/xpm.c:343
-#: ../plug-ins/common/xwd.c:506 ../plug-ins/faxg3/faxg3.c:204
-#: ../plug-ins/gfli/gfli.c:469 ../plug-ins/jpeg/jpeg-load.c:117
-#: ../plug-ins/psd/psd-load.c:130 ../plug-ins/sgi/sgi.c:318
-#: ../plug-ins/winicon/icoload.c:645 ../plug-ins/xjt/xjt.c:3344
-#, c-format
-msgid "Opening '%s'"
-msgstr "Opnar «%s».."
-
-#: ../plug-ins/bmp/bmpread.c:164 ../plug-ins/bmp/bmpread.c:173
-#: ../plug-ins/bmp/bmpread.c:179 ../plug-ins/bmp/bmpread.c:187
-#: ../plug-ins/bmp/bmpread.c:201 ../plug-ins/bmp/bmpread.c:382
-#, c-format
-msgid "'%s' is not a valid BMP file"
-msgstr "«%s» er ikkje ei gyldig BMP-fil"
-
-#: ../plug-ins/bmp/bmpread.c:214 ../plug-ins/bmp/bmpread.c:240
-#: ../plug-ins/bmp/bmpread.c:266 ../plug-ins/bmp/bmpread.c:329
-#: ../plug-ins/bmp/bmpread.c:353 ../plug-ins/bmp/bmpread.c:375
-#: ../plug-ins/bmp/bmpread.c:388 ../plug-ins/bmp/bmpread.c:394
-#, c-format
-msgid "Error reading BMP file header from '%s'"
-msgstr "Feil ved lesing av header for BMP-fila «%s»"
-
-#: ../plug-ins/bmp/bmpread.c:502
-msgid "Unrecognized or invalid BMP compression format."
-msgstr "Ukjent eller ugyldig komprimeringingsformat for BMP."
-
-#: ../plug-ins/bmp/bmpread.c:544
-msgid "Unsupported or invalid bitdepth."
-msgstr "Ukjent eller ugyldig fargedjupn."
-
-#: ../plug-ins/bmp/bmpread.c:550 ../plug-ins/common/pcx.c:376
-#: ../plug-ins/psd/psd-load.c:295
-#, c-format
-msgid "Unsupported or invalid image width: %d"
-msgstr "Ugyldig biletbreidde: %d"
-
-#: ../plug-ins/bmp/bmpread.c:555 ../plug-ins/common/pcx.c:381
-#: ../plug-ins/psd/psd-load.c:287
-#, c-format
-msgid "Unsupported or invalid image height: %d"
-msgstr "Ugyldig bilethøgde: %d"
-
-#.
-#. * Create the "background" layer to hold the image...
-#.
-#: ../plug-ins/bmp/bmpread.c:559 ../plug-ins/common/CEL.c:349
-#: ../plug-ins/common/CEL.c:352 ../plug-ins/common/blinds.c:277
-#: ../plug-ins/common/compose.c:931 ../plug-ins/common/decompose.c:723
-#: ../plug-ins/common/dicom.c:503 ../plug-ins/common/film.c:746
-#: ../plug-ins/common/gif-load.c:879 ../plug-ins/common/pcx.c:393
-#: ../plug-ins/common/pcx.c:399 ../plug-ins/common/pix.c:368
-#: ../plug-ins/common/png.c:831 ../plug-ins/common/pnm.c:571
-#: ../plug-ins/common/raw.c:691 ../plug-ins/common/smooth_palette.c:257
-#: ../plug-ins/common/sunras.c:956 ../plug-ins/common/tga.c:1029
-#: ../plug-ins/common/tiff-load.c:952 ../plug-ins/common/tile.c:267
-#: ../plug-ins/common/xbm.c:880 ../plug-ins/faxg3/faxg3.c:464
-#: ../plug-ins/fits/fits.c:511 ../plug-ins/gfig/gfig-dialog.c:1284
-#: ../plug-ins/gimpressionist/general.c:140 ../plug-ins/jpeg/jpeg-load.c:249
-#: ../plug-ins/jpeg/jpeg-load.c:752 ../plug-ins/psd/psd-image-res-load.c:995
-#: ../plug-ins/psd/psd-load.c:1510 ../plug-ins/sgi/sgi.c:369
-#: ../plug-ins/twain/twain.c:571 ../plug-ins/winsnap/winsnap.c:1155
-msgid "Background"
-msgstr "Bakgrunn"
-
-#: ../plug-ins/bmp/bmpread.c:730 ../plug-ins/bmp/bmpread.c:771
-#: ../plug-ins/bmp/bmpread.c:821
-msgid "The bitmap ends unexpectedly."
-msgstr "Punktgrafikken slutta uventa."
-
-#: ../plug-ins/bmp/bmpwrite.c:187 ../plug-ins/bmp/bmpwrite.c:209
-msgid "Cannot save indexed image with transparency in BMP file format."
-msgstr "Kan ikkje lagra indekserte bilete med gjennomsikt i BMP-format."
-
-#: ../plug-ins/bmp/bmpwrite.c:189 ../plug-ins/bmp/bmpwrite.c:211
-msgid "Alpha channel will be ignored."
-msgstr "Alfakanalen blir ignorerte."
-
-#. And let's begin the progress
-#. init the progress meter
-#: ../plug-ins/bmp/bmpwrite.c:305 ../plug-ins/common/CEL.c:573
-#: ../plug-ins/common/gbr.c:621 ../plug-ins/common/gif-save.c:993
-#: ../plug-ins/common/gih.c:1263 ../plug-ins/common/gtm.c:245
-#: ../plug-ins/common/pat.c:452 ../plug-ins/common/pcx.c:607
-#: ../plug-ins/common/pix.c:513 ../plug-ins/common/png.c:1251
-#: ../plug-ins/common/pnm.c:963 ../plug-ins/common/postscript.c:1201
-#: ../plug-ins/common/psd-save.c:1562 ../plug-ins/common/sunras.c:549
-#: ../plug-ins/common/tga.c:1138 ../plug-ins/common/tiff-save.c:681
-#: ../plug-ins/common/xbm.c:1021 ../plug-ins/common/xpm.c:623
-#: ../plug-ins/common/xwd.c:603 ../plug-ins/fits/fits.c:462
-#: ../plug-ins/gfli/gfli.c:684 ../plug-ins/jpeg/jpeg-save.c:283
-#: ../plug-ins/sgi/sgi.c:537 ../plug-ins/winicon/icosave.c:1015
-#: ../plug-ins/xjt/xjt.c:1697
-#, c-format
-msgid "Saving '%s'"
-msgstr "Lagrar «%s»..."
-
-#: ../plug-ins/bmp/bmpwrite.c:791
-msgid "Save as BMP"
-msgstr "Lagra som BMP"
-
-#: ../plug-ins/bmp/bmpwrite.c:814
-msgid "_Run-Length Encoded"
-msgstr "Bruk _1 Byte Run-Length-Encoding"
-
-#: ../plug-ins/bmp/bmpwrite.c:826 ../plug-ins/jpeg/jpeg-save.c:892
-msgid "_Advanced Options"
-msgstr "_Avanserte innstillingar"
-
-#: ../plug-ins/bmp/bmpwrite.c:841
-msgid "16 bits"
-msgstr "16 bits"
-
-#: ../plug-ins/bmp/bmpwrite.c:877
-msgid "24 bits"
-msgstr "24 bits"
-
-#: ../plug-ins/bmp/bmpwrite.c:894
-msgid "32 bits"
-msgstr "32 bits"
-
-#: ../plug-ins/common/AlienMap2.c:140
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:118
+msgid "Original"
+msgstr "Original"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:136
+msgid "Rotated"
+msgstr "Rotert"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:154
+msgid "Continuous update"
+msgstr "Oppdater kontinuerleg"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:167
+msgid "Area:"
+msgstr "Område:"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:171
+msgid "Entire Layer"
+msgstr "Heile laget"
+
+#. Create selection
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:172
+#: ../plug-ins/common/film.c:965
+#: ../plug-ins/imagemap/imap_selection.c:366
+#: ../plug-ins/selection-to-path/selection-to-path.c:432
+msgid "Selection"
+msgstr "Utval"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:173
+msgid "Context"
+msgstr "Samanhang"
+
+#. spinbutton 1
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:298
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:376
+#: ../plug-ins/common/color-to-alpha.c:409
+#: ../plug-ins/file-fli/fli-gimp.c:874
+#: ../plug-ins/file-fli/fli-gimp.c:944
+msgid "From:"
+msgstr "Frå:"
+
+#. spinbutton 2
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:324
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:377
+#: ../plug-ins/file-fli/fli-gimp.c:883
+#: ../plug-ins/file-fli/fli-gimp.c:953
+msgid "To:"
+msgstr "Til:"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:418
+#: ../plug-ins/common/file-ps.c:3227
+#: ../plug-ins/imagemap/imap_menu.c:213
+msgid "Gray"
+msgstr "Grå"
+
+#. Gray: Circle: Spinbutton 1
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:466
+msgid "Hue:"
+msgstr "Kulør:"
+
+#. Gray: Circle: Spinbutton 2
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:493
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:555
+msgid "Saturation:"
+msgstr "Metning:"
+
+#. * Gray: Operation-Mode *
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:513
+msgid "Gray Mode"
+msgstr "Gråmodus:"
+
+#. Gray: Operation-Mode: two radio buttons
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:522
+msgid "Treat as this"
+msgstr "Behandla som denne"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:534
+msgid "Change to this"
+msgstr "Endra til denne"
+
+#. * Gray: What is gray? *
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:547
+msgid "Gray Threshold"
+msgstr "Grågrense"
+
+#. * Misc: Used unit selection *
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:587
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:697
+msgid "Units"
+msgstr "Einingar"
+
+#. Misc: Used unit selection: 3 radio buttons
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:596
+msgid "Radians"
+msgstr "Radian"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:608
+msgid "Radians/Pi"
+msgstr "Radian/Pi"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:620
+msgid "Degrees"
+msgstr "Grader"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:651
+msgid "Rotate Colors"
+msgstr "Roter fargane"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:691
+msgid "Main Options"
+msgstr "Hovudinnstillingar"
+
+#: ../plug-ins/color-rotate/color-rotate-dialog.c:694
+msgid "Gray Options"
+msgstr "Gråinnstillingar"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:34
+msgid "Switch to Clockwise"
+msgstr "Bytt til medsols"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:36
+msgid "Switch to C/Clockwise"
+msgstr "Bytt til motsols"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:38
+msgid "Change Order of Arrows"
+msgstr "Endra rekkefølgja for pilene"
+
+#: ../plug-ins/color-rotate/color-rotate-stock.c:40
+#: ../plug-ins/imagemap/imap_cmd_select_all.c:50
+msgid "Select All"
+msgstr "Vel alle"
+
+#: ../plug-ins/color-rotate/color-rotate.c:98
+msgid "Replace a range of colors with another"
+msgstr "Flytter fargane på fargesirkelen"
+
+#: ../plug-ins/color-rotate/color-rotate.c:105
+msgid "_Rotate Colors..."
+msgstr "_Roter fargane …"
+
+#: ../plug-ins/color-rotate/color-rotate.c:139
+msgid "Rotating the colors"
+msgstr "Roterer fargane"
+
+#: ../plug-ins/common/alien-map.c:139
 msgid "_Modify red channel"
 msgstr "_Endra raudkanalen"
 
-#: ../plug-ins/common/AlienMap2.c:140
+#: ../plug-ins/common/alien-map.c:139
 msgid "_Modify hue channel"
 msgstr "_Endra kulørkanalen"
 
-#: ../plug-ins/common/AlienMap2.c:141
+#: ../plug-ins/common/alien-map.c:140
 msgid "Mo_dify green channel"
 msgstr "E_ndra grønkanalen"
 
-#: ../plug-ins/common/AlienMap2.c:141
+#: ../plug-ins/common/alien-map.c:140
 msgid "Mo_dify saturation channel"
 msgstr "E_ndra metningskanalen"
 
-#: ../plug-ins/common/AlienMap2.c:142
+#: ../plug-ins/common/alien-map.c:141
 msgid "Mod_ify blue channel"
 msgstr "En_dra blåkanalen"
 
-#: ../plug-ins/common/AlienMap2.c:142
+#: ../plug-ins/common/alien-map.c:141
 msgid "Mod_ify luminosity channel"
 msgstr "En_dra fargeglødkanalen"
 
-#: ../plug-ins/common/AlienMap2.c:147
+#: ../plug-ins/common/alien-map.c:146
 msgid "Red _frequency:"
 msgstr "Raud_frekvens:"
 
-#: ../plug-ins/common/AlienMap2.c:147
+#: ../plug-ins/common/alien-map.c:146
 msgid "Hue _frequency:"
 msgstr "Kulør_frekvens:"
 
-#: ../plug-ins/common/AlienMap2.c:148
+#: ../plug-ins/common/alien-map.c:147
 msgid "Green fr_equency:"
 msgstr "Grønfr_ekvens:"
 
-#: ../plug-ins/common/AlienMap2.c:148
+#: ../plug-ins/common/alien-map.c:147
 msgid "Saturation fr_equency:"
 msgstr "Metningsfr_ekvens:"
 
-#: ../plug-ins/common/AlienMap2.c:149
+#: ../plug-ins/common/alien-map.c:148
 msgid "Blue freq_uency:"
 msgstr "Blåfrek_vens:"
 
-#: ../plug-ins/common/AlienMap2.c:149
+#: ../plug-ins/common/alien-map.c:148
 msgid "Luminosity freq_uency:"
 msgstr "Fargeglødfrek_vens:"
 
-#: ../plug-ins/common/AlienMap2.c:151
+#: ../plug-ins/common/alien-map.c:150
 msgid "Red _phaseshift:"
 msgstr "_Faseforskyving for raud:"
 
-#: ../plug-ins/common/AlienMap2.c:151
+#: ../plug-ins/common/alien-map.c:150
 msgid "Hue _phaseshift:"
 msgstr "_Faseforskyving for kulør:"
 
-#: ../plug-ins/common/AlienMap2.c:152
+#: ../plug-ins/common/alien-map.c:151
 msgid "Green ph_aseshift:"
 msgstr "F_aseforskyving for grøn:"
 
-#: ../plug-ins/common/AlienMap2.c:152
+#: ../plug-ins/common/alien-map.c:151
 msgid "Saturation ph_aseshift:"
 msgstr "F_aseforskyving for metning:"
 
-#: ../plug-ins/common/AlienMap2.c:153
+#: ../plug-ins/common/alien-map.c:152
 msgid "Blue pha_seshift:"
 msgstr "Fa_seforskyving for blå:"
 
-#: ../plug-ins/common/AlienMap2.c:153
+#: ../plug-ins/common/alien-map.c:152
 msgid "Luminosity pha_seshift:"
 msgstr "Fa_seforskyving for fargeglød:"
 
-#: ../plug-ins/common/AlienMap2.c:183
+#: ../plug-ins/common/alien-map.c:182
 msgid "Alter colors in various psychedelic ways"
 msgstr "Skifter fargane på ulike psykedeliske måtar"
 
-#: ../plug-ins/common/AlienMap2.c:188
+#: ../plug-ins/common/alien-map.c:187
 msgid "_Alien Map..."
-msgstr "_Alien Map..."
+msgstr "_Alien Map …"
 
-#: ../plug-ins/common/AlienMap2.c:320
+#: ../plug-ins/common/alien-map.c:319
 msgid "Alien Map: Transforming"
 msgstr "Alien Map: Omforming"
 
-#: ../plug-ins/common/AlienMap2.c:393
+#: ../plug-ins/common/alien-map.c:392
 msgid "Alien Map"
 msgstr "Alien Map"
 
-#: ../plug-ins/common/AlienMap2.c:440 ../plug-ins/common/AlienMap2.c:464
-#: ../plug-ins/common/AlienMap2.c:488
+#: ../plug-ins/common/alien-map.c:440
+#: ../plug-ins/common/alien-map.c:464
+#: ../plug-ins/common/alien-map.c:488
 msgid "Number of cycles covering full value range"
 msgstr "Talet på syklusar som skal dekka heile verdiområdet"
 
-#: ../plug-ins/common/AlienMap2.c:452 ../plug-ins/common/AlienMap2.c:476
-#: ../plug-ins/common/AlienMap2.c:500
+#: ../plug-ins/common/alien-map.c:452
+#: ../plug-ins/common/alien-map.c:476
+#: ../plug-ins/common/alien-map.c:500
 msgid "Phase angle, range 0-360"
 msgstr "Fasevinkel, område 0° til 360°"
 
 #. Propagate Mode
-#: ../plug-ins/common/AlienMap2.c:514 ../plug-ins/common/hot.c:595
-#: ../plug-ins/common/vpropagate.c:1096 ../plug-ins/common/waves.c:276
+#: ../plug-ins/common/alien-map.c:514
+#: ../plug-ins/common/hot.c:610
+#: ../plug-ins/common/value-propagate.c:1119
+#: ../plug-ins/common/waves.c:277
 msgid "Mode"
 msgstr "Modus"
 
-#: ../plug-ins/common/AlienMap2.c:518
+#: ../plug-ins/common/alien-map.c:518
 msgid "_RGB color model"
 msgstr "_RGB-fargemodell"
 
-#: ../plug-ins/common/AlienMap2.c:519
+#: ../plug-ins/common/alien-map.c:519
 msgid "_HSL color model"
 msgstr "_HSL-fargemodell"
 
-#: ../plug-ins/common/CEL.c:109 ../plug-ins/common/CEL.c:127
-msgid "KISS CEL"
-msgstr "KISS CEL"
-
-#: ../plug-ins/common/CEL.c:188
-msgid "Load KISS Palette"
-msgstr "Opnar KISS-paletten"
-
-#: ../plug-ins/common/CEL.c:341
-msgid "Can't create a new image"
-msgstr "Kan ikkje laga nytt bilete"
-
-#: ../plug-ins/common/CEL.c:430
-#, c-format
-msgid "Unsupported bit depth (%d)!"
-msgstr "Støtter ikkje denne fargedjupna (%d)!"
-
-#: ../plug-ins/common/CML_explorer.c:129
-msgid "Keep image's values"
-msgstr "Behald biletverdiane"
-
-#: ../plug-ins/common/CML_explorer.c:130
-msgid "Keep the first value"
-msgstr "Behald første verdien"
-
-#: ../plug-ins/common/CML_explorer.c:131
-msgid "Fill with parameter k"
-msgstr "Fyll med parameter k"
-
-#: ../plug-ins/common/CML_explorer.c:132
-msgid "k{x(1-x)}^p"
-msgstr "k{x(1-x)}^p"
-
-#: ../plug-ins/common/CML_explorer.c:133
-msgid "k{x(1-x)}^p stepped"
-msgstr "k{x(1-x)}^p stegvis"
-
-#: ../plug-ins/common/CML_explorer.c:134
-msgid "kx^p"
-msgstr "kx^p"
-
-#: ../plug-ins/common/CML_explorer.c:135
-msgid "kx^p stepped"
-msgstr "kx^p schrittweise"
-
-#: ../plug-ins/common/CML_explorer.c:136
-msgid "k(1-x^p)"
-msgstr "k(1-x^p)"
-
-#: ../plug-ins/common/CML_explorer.c:137
-msgid "k(1-x^p) stepped"
-msgstr "k(1-x^p) stegvis"
-
-#: ../plug-ins/common/CML_explorer.c:138
-msgid "Delta function"
-msgstr "Deltafunksjon"
-
-#: ../plug-ins/common/CML_explorer.c:139
-msgid "Delta function stepped"
-msgstr "Deltafunksjon stegvis"
-
-#: ../plug-ins/common/CML_explorer.c:140
-msgid "sin^p-based function"
-msgstr "sin^p-basert funksjon"
-
-#: ../plug-ins/common/CML_explorer.c:141
-msgid "sin^p, stepped"
-msgstr "sin^p stegvis"
-
-#: ../plug-ins/common/CML_explorer.c:167
-msgid "Max (x, -)"
-msgstr "Max (x, -)"
-
-#: ../plug-ins/common/CML_explorer.c:168
-msgid "Max (x+d, -)"
-msgstr "Max (x+d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:169
-msgid "Max (x-d, -)"
-msgstr "Max (x-d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:170
-msgid "Min (x, -)"
-msgstr "Min (x, -)"
-
-#: ../plug-ins/common/CML_explorer.c:171
-msgid "Min (x+d, -)"
-msgstr "Min (x+d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:172
-msgid "Min (x-d, -)"
-msgstr "Min (x-d, -)"
-
-#: ../plug-ins/common/CML_explorer.c:173
-msgid "Max (x+d, -), (x < 0.5)"
-msgstr "Max (x+d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:174
-msgid "Max (x+d, -), (0.5 < x)"
-msgstr "Max (x+d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:175
-msgid "Max (x-d, -), (x < 0.5)"
-msgstr "Max (x-d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:176
-msgid "Max (x-d, -), (0.5 < x)"
-msgstr "Max (x-d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:177
-msgid "Min (x+d, -), (x < 0.5)"
-msgstr "Min (x+d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:178
-msgid "Min (x+d, -), (0.5 < x)"
-msgstr "Min (x+d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:179
-msgid "Min (x-d, -), (x < 0.5)"
-msgstr "Min (x-d, -), (x < 0.5)"
-
-#: ../plug-ins/common/CML_explorer.c:180
-msgid "Min (x-d, -), (0.5 < x)"
-msgstr "Min (x-d, -), (0.5 < x)"
-
-#: ../plug-ins/common/CML_explorer.c:200 ../plug-ins/common/sunras.c:1632
-msgid "Standard"
-msgstr "Standard"
-
-#: ../plug-ins/common/CML_explorer.c:201
-msgid "Use average value"
-msgstr "Bruk gjennomsnittsverdi"
-
-#: ../plug-ins/common/CML_explorer.c:202
-msgid "Use reverse value"
-msgstr "Bruk omvendte verdiar"
-
-#: ../plug-ins/common/CML_explorer.c:203
-msgid "With random power (0,10)"
-msgstr "Med tilfeldig eksponent (0,10)"
-
-#: ../plug-ins/common/CML_explorer.c:204
-msgid "With random power (0,1)"
-msgstr "Med tilfeldig eksponent (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:205
-msgid "With gradient power (0,1)"
-msgstr "Med gradert eksponent (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:206
-msgid "Multiply rand. value (0,1)"
-msgstr "Multipl. tilfeldig verdi (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:207
-msgid "Multiply rand. value (0,2)"
-msgstr "Multipl. tilfeldig verdi (0,2)"
-
-#: ../plug-ins/common/CML_explorer.c:208
-msgid "Multiply gradient (0,1)"
-msgstr "Multipl. fargeovergang (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:209
-msgid "With p and random (0,1)"
-msgstr "Med p og tilfeldig tal (0,1)"
-
-#: ../plug-ins/common/CML_explorer.c:223
-msgid "All black"
-msgstr "Alt svart"
-
-#: ../plug-ins/common/CML_explorer.c:224
-msgid "All gray"
-msgstr "Alt grått"
-
-#: ../plug-ins/common/CML_explorer.c:225
-msgid "All white"
-msgstr "Alt kvitt"
-
-#: ../plug-ins/common/CML_explorer.c:226
-msgid "The first row of the image"
-msgstr "Den første linja i biletet"
-
-#: ../plug-ins/common/CML_explorer.c:227
-msgid "Continuous gradient"
-msgstr "Kontinuerleg fargeovergang"
-
-#: ../plug-ins/common/CML_explorer.c:228
-msgid "Continuous grad. w/o gap"
-msgstr "Kont. fargeovergang u/ mellomrom"
-
-#: ../plug-ins/common/CML_explorer.c:229
-msgid "Random, ch. independent"
-msgstr "Tilfeldig, kanaluavh."
-
-#: ../plug-ins/common/CML_explorer.c:230
-msgid "Random shared"
-msgstr "Tilfeldig, delt"
-
-#: ../plug-ins/common/CML_explorer.c:231
-msgid "Randoms from seed"
-msgstr "Tilfeldig frå frø"
-
-#: ../plug-ins/common/CML_explorer.c:232
-msgid "Randoms from seed (shared)"
-msgstr "Tilfeldig frå frø (delt)"
-
-#: ../plug-ins/common/CML_explorer.c:300 ../plug-ins/common/CML_explorer.c:308
-#: ../plug-ins/common/decompose.c:188
-#: ../plug-ins/gimpressionist/orientation.c:180
-#: ../plug-ins/gimpressionist/size.c:183
-msgid "Hue"
-msgstr "Kulør"
-
-#: ../plug-ins/common/CML_explorer.c:301 ../plug-ins/common/CML_explorer.c:309
-#: ../plug-ins/common/decompose.c:189
-msgid "Saturation"
-msgstr "Metning"
-
-#: ../plug-ins/common/CML_explorer.c:302 ../plug-ins/common/CML_explorer.c:310
-#: ../plug-ins/common/decompose.c:190
-#: ../plug-ins/gimpressionist/orientation.c:156
-#: ../plug-ins/gimpressionist/size.c:159
-msgid "Value"
-msgstr "Lysverdi"
-
-#: ../plug-ins/common/CML_explorer.c:307
-msgid "(None)"
-msgstr "(Ingen)"
-
-#: ../plug-ins/common/CML_explorer.c:455
-msgid "Create abstract Coupled-Map Lattice patterns"
-msgstr "Lag Coupled-Map-Lattice mønster"
-
-#: ../plug-ins/common/CML_explorer.c:466
-msgid "CML _Explorer..."
-msgstr "CML _behandlaren..."
-
-#: ../plug-ins/common/CML_explorer.c:756
-msgid "CML Explorer: evoluting"
-msgstr "CML_behandlar: utvikling"
-
-#: ../plug-ins/common/CML_explorer.c:1177
-msgid "Coupled-Map-Lattice Explorer"
-msgstr "Samankopla avbildingsgitter "
-
-#: ../plug-ins/common/CML_explorer.c:1224
-msgid "New Seed"
-msgstr "_Nytt frø"
-
-#: ../plug-ins/common/CML_explorer.c:1235
-msgid "Fix Seed"
-msgstr "Fast frø"
-
-#: ../plug-ins/common/CML_explorer.c:1246
-msgid "Random Seed"
-msgstr "Tilfeldig frø:"
-
-#: ../plug-ins/common/CML_explorer.c:1288 ../plug-ins/common/fp.c:700
-#: ../plug-ins/common/lic.c:671
-msgid "_Hue"
-msgstr "_Kulør"
-
-#: ../plug-ins/common/CML_explorer.c:1292
-msgid "Sat_uration"
-msgstr "M_etning"
-
-#: ../plug-ins/common/CML_explorer.c:1296 ../plug-ins/common/fp.c:708
-msgid "_Value"
-msgstr "_Verdi"
-
-#: ../plug-ins/common/CML_explorer.c:1300
-msgid "_Advanced"
-msgstr "_Utvida"
-
-#: ../plug-ins/common/CML_explorer.c:1315
-msgid "Channel Independent Parameters"
-msgstr "Kanaluavhengige parametrar"
-
-#: ../plug-ins/common/CML_explorer.c:1337
-msgid "Initial value:"
-msgstr "Startverdi:"
-
-#: ../plug-ins/common/CML_explorer.c:1343
-msgid "Zoom scale:"
-msgstr "Zoomfaktor:"
-
-#: ../plug-ins/common/CML_explorer.c:1352
-msgid "Start offset:"
-msgstr "Startforskyving:"
-
-#: ../plug-ins/common/CML_explorer.c:1361
-msgid "Seed of Random (only for \"From Seed\" Modes)"
-msgstr "Startverdi. (Bare for «Frå frø» modus)"
-
-#: ../plug-ins/common/CML_explorer.c:1372 ../plug-ins/maze/maze_face.c:267
-msgid "Seed:"
-msgstr "Frø:"
-
-#: ../plug-ins/common/CML_explorer.c:1385
-msgid "Switch to \"From seed\" With the Last Seed"
-msgstr "Bytt til «Frå frø» med siste frø"
-
-#: ../plug-ins/common/CML_explorer.c:1397
-msgid ""
-"\"Fix seed\" button is an alias of me.\n"
-"The same seed produces the same image, if (1) the widths of images are same "
-"(this is the reason why image on drawable is different from preview), and "
-"(2) all mutation rates equal to zero."
-msgstr ""
-"Det same frøet lager det same biletet dersom\n"
-"1. bileta er like breie (Dette er grunnen til at det endelege biletet er "
-"anleis enn førehandsvisinga).\n"
-"2. alle mutasjonsratene er sett til null."
-
-#: ../plug-ins/common/CML_explorer.c:1405
-msgid "O_thers"
-msgstr "_Andre"
-
-#: ../plug-ins/common/CML_explorer.c:1420
-msgid "Copy Settings"
-msgstr "Innstillingar for kopiering"
-
-#: ../plug-ins/common/CML_explorer.c:1439
-msgid "Source channel:"
-msgstr "Kjeldelkanal:"
-
-#: ../plug-ins/common/CML_explorer.c:1454
-#: ../plug-ins/common/CML_explorer.c:1502
-msgid "Destination channel:"
-msgstr "Målkanal:"
-
-#: ../plug-ins/common/CML_explorer.c:1458
-msgid "Copy Parameters"
-msgstr "Kopier parametra"
-
-#: ../plug-ins/common/CML_explorer.c:1467
-msgid "Selective Load Settings"
-msgstr "Selektive opningsinnstillingar"
-
-#: ../plug-ins/common/CML_explorer.c:1487
-msgid "Source channel in file:"
-msgstr "Kjeldekanal i fil:"
-
-#: ../plug-ins/common/CML_explorer.c:1508
-msgid "_Misc Ops."
-msgstr "_Ymse innst."
-
-#: ../plug-ins/common/CML_explorer.c:1557
-msgid "Function type:"
-msgstr "Funksjonstype:"
-
-#: ../plug-ins/common/CML_explorer.c:1573
-msgid "Composition:"
-msgstr "Komposisjon:"
-
-#: ../plug-ins/common/CML_explorer.c:1587
-msgid "Misc arrange:"
-msgstr "Ymse oppstillingar:"
-
-#: ../plug-ins/common/CML_explorer.c:1591
-msgid "Use cyclic range"
-msgstr "Bruk sykliske område"
-
-#: ../plug-ins/common/CML_explorer.c:1601
-msgid "Mod. rate:"
-msgstr "Endringsgrad:"
-
-#: ../plug-ins/common/CML_explorer.c:1610
-msgid "Env. sensitivity:"
-msgstr "Omgivnadsfølsemd:"
-
-#: ../plug-ins/common/CML_explorer.c:1619
-msgid "Diffusion dist.:"
-msgstr "Diffusjonsavstand:"
-
-#: ../plug-ins/common/CML_explorer.c:1628
-msgid "# of subranges:"
-msgstr "Talet på underområde:"
-
-#: ../plug-ins/common/CML_explorer.c:1637
-msgid "P(ower factor):"
-msgstr "Eksponentfaktor (p):"
-
-#: ../plug-ins/common/CML_explorer.c:1646
-msgid "Parameter k:"
-msgstr "Parameter k:"
-
-#: ../plug-ins/common/CML_explorer.c:1655
-msgid "Range low:"
-msgstr "Nedre grense:"
-
-#: ../plug-ins/common/CML_explorer.c:1664
-msgid "Range high:"
-msgstr "Øvre grense:"
-
-#: ../plug-ins/common/CML_explorer.c:1676
-msgid "Plot a Graph of the Settings"
-msgstr "Vis innstillingane grafisk"
-
-#: ../plug-ins/common/CML_explorer.c:1721
-msgid "Ch. sensitivity:"
-msgstr "Kanalfølsemd:"
-
-#: ../plug-ins/common/CML_explorer.c:1731
-msgid "Mutation rate:"
-msgstr "Mutasjonsrate:"
-
-#: ../plug-ins/common/CML_explorer.c:1741
-msgid "Mutation dist.:"
-msgstr "Mutasjonsavstand:"
-
-#: ../plug-ins/common/CML_explorer.c:1818
-msgid "Graph of the Current Settings"
-msgstr "Graf for dei gjeldande innstillingane"
-
-#: ../plug-ins/common/CML_explorer.c:1889
-msgid "Warning: the source and the destination are the same channel."
-msgstr "Åtvaring: Kjelde- og målkanalen er den same"
-
-#: ../plug-ins/common/CML_explorer.c:1948
-msgid "Save CML Explorer Parameters"
-msgstr "Lagra parametra for CML-utforskaren"
-
-#: ../plug-ins/common/CML_explorer.c:2059
-#: ../plug-ins/common/channel_mixer.c:1067
-#, c-format
-msgid "Parameters were saved to '%s'"
-msgstr "Parametra blei lagra i «%s»"
-
-#: ../plug-ins/common/CML_explorer.c:2081
-msgid "Load CML Explorer Parameters"
-msgstr "Opna parametra for CML-utforskaren"
-
-#: ../plug-ins/common/CML_explorer.c:2199
-msgid "Error: it's not CML parameter file."
-msgstr "Feil: Dette er ikkje ei CML-parameter-fil"
-
-#: ../plug-ins/common/CML_explorer.c:2206
-#, c-format
-msgid "Warning: '%s' is an old format file."
-msgstr "Åtvaring: «%s» er ei fil i gammalt format."
-
-#: ../plug-ins/common/CML_explorer.c:2210
-#, c-format
-msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
-msgstr "Åtvaring: «%s» er ei parameterfil for nyare CML-utforskar enn denne."
-
-#: ../plug-ins/common/CML_explorer.c:2273
-msgid "Error: failed to load parameters"
-msgstr "Feil: Kunne ikkje opna parametra"
-
-#: ../plug-ins/common/aa.c:98
-msgid "ASCII art"
-msgstr "ASCII-kunst"
-
-#. Create the actual window.
-#: ../plug-ins/common/aa.c:349
-msgid "Save as Text"
-msgstr "Lagra som tekst"
-
-#: ../plug-ins/common/aa.c:371
-msgid "_Format:"
-msgstr "_Format:"
-
-#: ../plug-ins/common/align_layers.c:128
+#: ../plug-ins/common/align-layers.c:127
 msgid "Align all visible layers of the image"
 msgstr "Rett inn alle synlege lag i biletet."
 
-#: ../plug-ins/common/align_layers.c:133
+#: ../plug-ins/common/align-layers.c:132
 msgid "Align Visi_ble Layers..."
-msgstr "Innrett _synlege lag"
+msgstr "Innrett _synlege lag …"
 
-#: ../plug-ins/common/align_layers.c:171
+#: ../plug-ins/common/align-layers.c:172
 msgid "There are not enough layers to align."
 msgstr "Det er ikkje nok lag til å kunne gjere ei innretting"
 
-#: ../plug-ins/common/align_layers.c:398
+#: ../plug-ins/common/align-layers.c:399
 msgid "Align Visible Layers"
 msgstr "Innrett synlege lag"
 
-#: ../plug-ins/common/align_layers.c:423 ../plug-ins/common/align_layers.c:454
+#. if and how to center the image on the page
+#: ../plug-ins/common/align-layers.c:423
+#: ../plug-ins/common/align-layers.c:454
+#: ../plug-ins/common/cml-explorer.c:165
+#: ../plug-ins/common/file-ps.c:3243
+#: ../plug-ins/common/file-ps.c:3255
+#: ../plug-ins/common/file-psp.c:660
+#: ../plug-ins/file-fits/fits.c:1044
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:998
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1039
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1080
+#: ../plug-ins/lighting/lighting-ui.c:415
+#: ../plug-ins/print/print-page-layout.c:461
+msgid "None"
+msgstr "Ingen"
+
+#: ../plug-ins/common/align-layers.c:424
+#: ../plug-ins/common/align-layers.c:455
 msgid "Collect"
 msgstr "Samla"
 
-#: ../plug-ins/common/align_layers.c:424
+#: ../plug-ins/common/align-layers.c:425
 msgid "Fill (left to right)"
 msgstr "Fyll (frå venstre til høgre)"
 
-#: ../plug-ins/common/align_layers.c:425
+#: ../plug-ins/common/align-layers.c:426
 msgid "Fill (right to left)"
 msgstr "Fyll (frå høgre til venstre)"
 
-#: ../plug-ins/common/align_layers.c:426 ../plug-ins/common/align_layers.c:457
+#: ../plug-ins/common/align-layers.c:427
+#: ../plug-ins/common/align-layers.c:458
 msgid "Snap to grid"
 msgstr "Fest til rutenettet"
 
-#: ../plug-ins/common/align_layers.c:435
+#: ../plug-ins/common/align-layers.c:436
 msgid "_Horizontal style:"
 msgstr "_Horsontal stil:"
 
-#: ../plug-ins/common/align_layers.c:439
+#: ../plug-ins/common/align-layers.c:440
 msgid "Left edge"
 msgstr "Venstre kant"
 
-#: ../plug-ins/common/align_layers.c:440 ../plug-ins/common/align_layers.c:470
-#: ../plug-ins/gflare/gflare.c:2667
+#: ../plug-ins/common/align-layers.c:441
+#: ../plug-ins/common/align-layers.c:471
+#: ../plug-ins/gradient-flare/gradient-flare.c:2712
 msgid "Center"
 msgstr "Sentrum"
 
-#: ../plug-ins/common/align_layers.c:441
+#: ../plug-ins/common/align-layers.c:442
 msgid "Right edge"
 msgstr "Høgre kant"
 
-#: ../plug-ins/common/align_layers.c:450
+#: ../plug-ins/common/align-layers.c:451
 msgid "Ho_rizontal base:"
 msgstr "Ho_risontal basis:"
 
-#: ../plug-ins/common/align_layers.c:455
+#: ../plug-ins/common/align-layers.c:456
 msgid "Fill (top to bottom)"
 msgstr "Fyll (frå topp til botn)"
 
-#: ../plug-ins/common/align_layers.c:456
+#: ../plug-ins/common/align-layers.c:457
 msgid "Fill (bottom to top)"
 msgstr "Fyll (frå botn til topp)"
 
-#: ../plug-ins/common/align_layers.c:466
+#: ../plug-ins/common/align-layers.c:467
 msgid "_Vertical style:"
 msgstr "_Vertikal stil:"
 
-#: ../plug-ins/common/align_layers.c:469
+#: ../plug-ins/common/align-layers.c:470
 msgid "Top edge"
 msgstr "Toppkant"
 
-#: ../plug-ins/common/align_layers.c:471
+#: ../plug-ins/common/align-layers.c:472
 msgid "Bottom edge"
 msgstr "Botnkant"
 
-#: ../plug-ins/common/align_layers.c:480
+#: ../plug-ins/common/align-layers.c:481
 msgid "Ver_tical base:"
 msgstr "Ver_tikal basis:"
 
-#: ../plug-ins/common/align_layers.c:484
+#: ../plug-ins/common/align-layers.c:485
 msgid "_Grid size:"
 msgstr "_Ruteavstand:"
 
-#: ../plug-ins/common/align_layers.c:493
+#: ../plug-ins/common/align-layers.c:494
 msgid "_Ignore the bottom layer even if visible"
 msgstr "Ignorer det nederste laget sjølv om det er synleg"
 
-#: ../plug-ins/common/align_layers.c:503
+#: ../plug-ins/common/align-layers.c:504
 msgid "_Use the (invisible) bottom layer as the base"
 msgstr "Bruk det _usynlege botnlaget som basis"
 
-#: ../plug-ins/common/animationplay.c:163
-msgid "Preview a GIMP layer-based animation"
-msgstr "Førehandsvis ein GIMP lagbasert animasjon"
-
-#: ../plug-ins/common/animationplay.c:168
-msgid "_Playback..."
-msgstr "Spel av _animasjonen..."
-
-#: ../plug-ins/common/animationplay.c:443
-msgid "_Step"
-msgstr "_Steg"
-
-#: ../plug-ins/common/animationplay.c:443
-msgid "Step to next frame"
-msgstr "Gå til neste ramme"
-
-#: ../plug-ins/common/animationplay.c:447
-msgid "Rewind the animation"
-msgstr "Spol animasjonen tilbake"
-
-#: ../plug-ins/common/animationplay.c:465
-msgid "Faster"
-msgstr "Fortare"
-
-#: ../plug-ins/common/animationplay.c:465
-msgid "Increase the speed of the animation"
-msgstr "Aukar animasjonsfarten"
-
-#: ../plug-ins/common/animationplay.c:470
-msgid "Slower"
-msgstr "Seinare"
-
-#: ../plug-ins/common/animationplay.c:470
-msgid "Decrease the speed of the animation"
-msgstr "Minsker animasjonsfarten"
-
-#: ../plug-ins/common/animationplay.c:475
-msgid "Reset speed"
-msgstr "Tilbakestill farten"
-
-#: ../plug-ins/common/animationplay.c:475
-msgid "Reset the speed of the animation"
-msgstr "Tilbakestill animasjonsfarten"
-
-#: ../plug-ins/common/animationplay.c:483
-#: ../plug-ins/common/animationplay.c:1440
-msgid "Start playback"
-msgstr "Spel av"
-
-#: ../plug-ins/common/animationplay.c:487
-msgid "Detach"
-msgstr "Løy_s fane"
-
-#: ../plug-ins/common/animationplay.c:488
-msgid "Detach the animation from the dialog window"
-msgstr "Fjern animasjonen frå dialogvindauget"
-
-#: ../plug-ins/common/animationplay.c:580
-msgid "Animation Playback:"
-msgstr "Spel av animasjonen:"
-
-#: ../plug-ins/common/animationplay.c:659
-msgid "Playback speed"
-msgstr "Avspelingssfart"
-
-#: ../plug-ins/common/animationplay.c:797
-msgid "Tried to display an invalid layer."
-msgstr "Prøvde å vise eit ugyldig lag."
-
-#: ../plug-ins/common/animationplay.c:1317
-#, c-format
-msgid "Frame %d of %d"
-msgstr "Ramme %d av %d"
-
-#: ../plug-ins/common/animationplay.c:1440
-msgid "Stop playback"
-msgstr "Stopp avspelinga"
-
-#: ../plug-ins/common/animoptimize.c:133
+#: ../plug-ins/common/animation-optimize.c:132
 msgid "Modify image to reduce size when saved as GIF animation"
-msgstr ""
-"Modifiserer biletet for å redusere storleiken når det blir lagra som GIF-"
-"animasjon"
+msgstr "Modifiserer biletet for å redusere storleiken når det blir lagra som GIF-animasjon"
 
-#: ../plug-ins/common/animoptimize.c:145
+#: ../plug-ins/common/animation-optimize.c:144
 msgid "Optimize (for _GIF)"
 msgstr "Optimer (for _GIF)"
 
-#: ../plug-ins/common/animoptimize.c:153
+#: ../plug-ins/common/animation-optimize.c:152
 msgid "Reduce file size where combining layers is possible"
 msgstr "Reduserer filstorleiken ved å slå saman lag dersom det er mogleg"
 
-#: ../plug-ins/common/animoptimize.c:163
+#: ../plug-ins/common/animation-optimize.c:162
 msgid "_Optimize (Difference)"
 msgstr "_Optimer (Differanse)"
 
-#: ../plug-ins/common/animoptimize.c:171
+#: ../plug-ins/common/animation-optimize.c:170
 msgid "Remove optimization to make editing easier"
 msgstr "Fjern optimaliseringa for å gjere redigeringa enklare"
 
-#: ../plug-ins/common/animoptimize.c:178
+#: ../plug-ins/common/animation-optimize.c:177
 msgid "_Unoptimize"
 msgstr "_Deoptimer"
 
-#: ../plug-ins/common/animoptimize.c:198
+#: ../plug-ins/common/animation-optimize.c:197
 msgid "_Remove Backdrop"
 msgstr "_Fjern bakgrunn"
 
-#: ../plug-ins/common/animoptimize.c:214
+#: ../plug-ins/common/animation-optimize.c:213
 msgid "_Find Backdrop"
 msgstr "_Finn bakgrunn"
 
-#: ../plug-ins/common/animoptimize.c:427
+#: ../plug-ins/common/animation-optimize.c:426
 msgid "Unoptimizing animation"
 msgstr "Deoptimer animasjonen"
 
-#: ../plug-ins/common/animoptimize.c:430
+#: ../plug-ins/common/animation-optimize.c:429
 msgid "Removing animation background"
 msgstr "Fjerner animasjonsbakgrunnen"
 
-#: ../plug-ins/common/animoptimize.c:433
+#: ../plug-ins/common/animation-optimize.c:432
 msgid "Finding animation background"
 msgstr "Ser etter animasjonsbakgrunn"
 
-#: ../plug-ins/common/animoptimize.c:437
+#: ../plug-ins/common/animation-optimize.c:436
 msgid "Optimizing animation"
 msgstr "Optimerer animasjonen"
 
+#: ../plug-ins/common/animation-play.c:162
+msgid "Preview a GIMP layer-based animation"
+msgstr "Førehandsvis ein GIMP lagbasert animasjon"
+
+#: ../plug-ins/common/animation-play.c:167
+msgid "_Playback..."
+msgstr "Spel av _animasjonen …"
+
+#: ../plug-ins/common/animation-play.c:446
+msgid "_Step"
+msgstr "_Steg"
+
+#: ../plug-ins/common/animation-play.c:446
+msgid "Step to next frame"
+msgstr "Gå til neste ramme"
+
+#: ../plug-ins/common/animation-play.c:450
+msgid "Rewind the animation"
+msgstr "Spol animasjonen tilbake"
+
+#: ../plug-ins/common/animation-play.c:468
+msgid "Faster"
+msgstr "Fortare"
+
+#: ../plug-ins/common/animation-play.c:468
+msgid "Increase the speed of the animation"
+msgstr "Aukar animasjonsfarten"
+
+#: ../plug-ins/common/animation-play.c:473
+msgid "Slower"
+msgstr "Seinare"
+
+#: ../plug-ins/common/animation-play.c:473
+msgid "Decrease the speed of the animation"
+msgstr "Minsker animasjonsfarten"
+
+#: ../plug-ins/common/animation-play.c:478
+msgid "Reset speed"
+msgstr "Tilbakestill farten"
+
+#: ../plug-ins/common/animation-play.c:478
+msgid "Reset the speed of the animation"
+msgstr "Tilbakestill animasjonsfarten"
+
+#: ../plug-ins/common/animation-play.c:486
+#: ../plug-ins/common/animation-play.c:1445
+msgid "Start playback"
+msgstr "Spel av"
+
+#: ../plug-ins/common/animation-play.c:490
+msgid "Detach"
+msgstr "Løy_s fane"
+
+#: ../plug-ins/common/animation-play.c:491
+msgid "Detach the animation from the dialog window"
+msgstr "Fjern animasjonen frå dialogvindauget"
+
+#: ../plug-ins/common/animation-play.c:583
+msgid "Animation Playback:"
+msgstr "Spel av animasjonen:"
+
+#: ../plug-ins/common/animation-play.c:662
+msgid "Playback speed"
+msgstr "Avspelingssfart"
+
+#: ../plug-ins/common/animation-play.c:802
+msgid "Tried to display an invalid layer."
+msgstr "Prøvde å vise eit ugyldig lag."
+
+#: ../plug-ins/common/animation-play.c:1322
+msgid "Frame %d of %d"
+msgstr "Ramme %d av %d"
+
+#: ../plug-ins/common/animation-play.c:1445
+msgid "Stop playback"
+msgstr "Stopp avspelinga"
+
 #: ../plug-ins/common/antialias.c:84
 msgid "Antialias using the Scale3X edge-extrapolation algorithm"
 msgstr "Kantutjamning v.h.a. kant-ekstrapoleringsalgoritmen 3X"
@@ -2080,890 +520,1761 @@ msgstr "_Kantutjamning"
 
 #: ../plug-ins/common/antialias.c:147
 msgid "Antialiasing..."
-msgstr "Jamnar ut kantane"
+msgstr "Jamnar ut kantane …"
 
-#: ../plug-ins/common/apply_lens.c:108
-msgid "Simulate an elliptical lens over the image"
-msgstr "Simulerer ei elliptisk linse over biletet"
+#: ../plug-ins/common/apply-canvas.c:1139
+msgid "Add a canvas texture to the image"
+msgstr "Legg ein lerretstekstur til biletet"
 
-#: ../plug-ins/common/apply_lens.c:114
-msgid "Apply _Lens..."
-msgstr "_Lupeeffekt..."
+#: ../plug-ins/common/apply-canvas.c:1144
+msgid "_Apply Canvas..."
+msgstr "_Lerret …"
 
-#: ../plug-ins/common/apply_lens.c:181
-msgid "Applying lens"
-msgstr "Legg til lupeeffekten"
+#: ../plug-ins/common/apply-canvas.c:1225
+msgid "Applying canvas"
+msgstr "Legg til lerret"
 
-#: ../plug-ins/common/apply_lens.c:393
-msgid "Lens Effect"
-msgstr "Lupeeffekt"
+#: ../plug-ins/common/apply-canvas.c:1262
+msgid "Apply Canvas"
+msgstr "Lerret"
 
-#: ../plug-ins/common/apply_lens.c:426
-msgid "_Keep original surroundings"
-msgstr "_Behald originalomgivnadane"
+#. *****************************************************
+#. radio buttons for choosing LEFT or RIGHT
+#. *************************************************
+#: ../plug-ins/common/apply-canvas.c:1291
+#: ../plug-ins/common/wind.c:944
+#: ../plug-ins/lighting/lighting-ui.c:517
+msgid "Direction"
+msgstr "Retning"
 
-#: ../plug-ins/common/apply_lens.c:441
-msgid "_Set surroundings to index 0"
-msgstr "_Sett omgivnadsindeksen til 0"
+#: ../plug-ins/common/apply-canvas.c:1295
+msgid "_Top-right"
+msgstr "Oppe, _høgre"
 
-#: ../plug-ins/common/apply_lens.c:442
-msgid "_Set surroundings to background color"
-msgstr "_Sett omgivnadane til bakgrunnsfargen"
+#: ../plug-ins/common/apply-canvas.c:1296
+msgid "Top-_left"
+msgstr "Oppe, _venstre"
 
-#: ../plug-ins/common/apply_lens.c:457
-msgid "_Make surroundings transparent"
-msgstr "_Lag omgivnadane gjennomsiktige"
+#: ../plug-ins/common/apply-canvas.c:1297
+msgid "_Bottom-left"
+msgstr "_Nede, venstre"
 
-#: ../plug-ins/common/apply_lens.c:474
-msgid "_Lens refraction index:"
-msgstr "_Brytningsindeks for linsa:"
+#: ../plug-ins/common/apply-canvas.c:1298
+msgid "Bottom-_right"
+msgstr "N_edre, høgre"
 
-#: ../plug-ins/common/autocrop.c:85
-msgid "Remove empty borders from the image"
-msgstr "Fjernar tomme kantar frå laget"
+#: ../plug-ins/common/apply-canvas.c:1323
+#: ../plug-ins/common/bump-map.c:915
+#: ../plug-ins/common/emboss.c:523
+#: ../plug-ins/common/fractal-trace.c:795
+#: ../plug-ins/map-object/map-object-ui.c:573
+msgid "_Depth:"
+msgstr "_Djupn:"
 
-#: ../plug-ins/common/autocrop.c:90
-msgid "Autocrop Imag_e"
-msgstr "Auto_beskjer biletet"
-
-#: ../plug-ins/common/autocrop.c:99
-msgid "Remove empty borders from the layer"
-msgstr "Fjern tomme kantar frå laget"
-
-#: ../plug-ins/common/autocrop.c:104
-msgid "Autocrop Lay_er"
-msgstr "Auto_beskjer laget"
-
-#: ../plug-ins/common/autocrop.c:151
-msgid "Cropping"
-msgstr "Beskjerer"
-
-#: ../plug-ins/common/autostretch_hsv.c:68
-msgid "Stretch image contrast to cover the maximum possible range"
-msgstr "Strekker biletkontrasten for å dekke størst mogleg område"
-
-#: ../plug-ins/common/autostretch_hsv.c:81
-msgid "Stretch _HSV"
-msgstr "Strekk _HSV"
-
-#: ../plug-ins/common/autostretch_hsv.c:116
-msgid "Auto-Stretching HSV"
-msgstr "Strekk _HSV automatisk..."
-
-#: ../plug-ins/common/autostretch_hsv.c:192
-msgid "autostretch_hsv: cmap was NULL!  Quitting...\n"
-msgstr "autostrekking_hsv: cmap var NULL! Avbrote...\n"
-
-#: ../plug-ins/common/blinds.c:116
+#: ../plug-ins/common/blinds.c:112
 msgid "Simulate an image painted on window blinds"
-msgstr "Simulerer eit bilete teikna på vindaugesjalusi"
+msgstr "Simulerer eit bilete sett gjennom eit vindaugesjalusi"
 
-#: ../plug-ins/common/blinds.c:121
+#: ../plug-ins/common/blinds.c:117
 msgid "_Blinds..."
-msgstr "_Persienne..."
+msgstr "_Persienne …"
 
-#: ../plug-ins/common/blinds.c:188
+#: ../plug-ins/common/blinds.c:184
 msgid "Adding blinds"
-msgstr "Utvid persienne..."
+msgstr "Utvid persienne"
 
-#: ../plug-ins/common/blinds.c:226
+#: ../plug-ins/common/blinds.c:222
 msgid "Blinds"
 msgstr "Persienne"
 
 #. Orientation toggle box
-#: ../plug-ins/common/blinds.c:259 ../plug-ins/common/ripple.c:538
+#: ../plug-ins/common/blinds.c:256
+#: ../plug-ins/common/ripple.c:553
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../plug-ins/common/blinds.c:263 ../plug-ins/common/ripple.c:542
-#: ../plug-ins/common/tileit.c:426 ../plug-ins/pagecurl/pagecurl.c:534
+#: ../plug-ins/common/blinds.c:260
+#: ../plug-ins/common/ripple.c:557
+#: ../plug-ins/common/tile-small.c:425
+#: ../plug-ins/pagecurl/pagecurl.c:533
 msgid "_Horizontal"
 msgstr "_Horisontal"
 
-#: ../plug-ins/common/blinds.c:264 ../plug-ins/common/ripple.c:543
-#: ../plug-ins/common/tileit.c:436 ../plug-ins/pagecurl/pagecurl.c:533
+#: ../plug-ins/common/blinds.c:263
+#: ../plug-ins/common/ripple.c:560
+#: ../plug-ins/common/tile-small.c:435
+#: ../plug-ins/pagecurl/pagecurl.c:532
 msgid "_Vertical"
 msgstr "_Vertikal"
 
-#: ../plug-ins/common/blinds.c:281 ../plug-ins/common/fractaltrace.c:738
-#: ../plug-ins/common/papertile.c:384
+#.
+#. * Create the "background" layer to hold the image...
+#.
+#: ../plug-ins/common/blinds.c:277
+#: ../plug-ins/common/compose.c:934
+#: ../plug-ins/common/decompose.c:722
+#: ../plug-ins/common/file-cel.c:361
+#: ../plug-ins/common/file-cel.c:364
+#: ../plug-ins/common/file-dicom.c:556
+#: ../plug-ins/common/file-gif-load.c:927
+#: ../plug-ins/common/file-pcx.c:411
+#: ../plug-ins/common/file-pcx.c:417
+#: ../plug-ins/common/file-pix.c:381
+#: ../plug-ins/common/file-png.c:851
+#: ../plug-ins/common/file-pnm.c:584
+#: ../plug-ins/common/file-raw.c:711
+#: ../plug-ins/common/file-sunras.c:974
+#: ../plug-ins/common/file-tga.c:1063
+#: ../plug-ins/common/file-tiff-load.c:997
+#: ../plug-ins/common/file-xbm.c:896
+#: ../plug-ins/common/film.c:745
+#: ../plug-ins/common/smooth-palette.c:256
+#: ../plug-ins/common/tile.c:266
+#: ../plug-ins/file-bmp/bmp-read.c:589
+#: ../plug-ins/file-faxg3/faxg3.c:477
+#: ../plug-ins/file-fits/fits.c:529
+#: ../plug-ins/file-jpeg/jpeg-load.c:248
+#: ../plug-ins/file-jpeg/jpeg-load.c:760
+#: ../plug-ins/file-psd/psd-image-res-load.c:994
+#: ../plug-ins/file-psd/psd-load.c:1525
+#: ../plug-ins/file-sgi/sgi.c:383
+#: ../plug-ins/gfig/gfig-dialog.c:1283
+#: ../plug-ins/gimpressionist/general.c:139
+#: ../plug-ins/twain/twain.c:567
+#: ../plug-ins/win-snap/winsnap.c:1154
+msgid "Background"
+msgstr "Bakgrunn"
+
+#: ../plug-ins/common/blinds.c:281
+#: ../plug-ins/common/fractal-trace.c:737
+#: ../plug-ins/common/tile-paper.c:383
 msgid "_Transparent"
 msgstr "_Gjennomsiktig"
 
 #: ../plug-ins/common/blinds.c:307
 msgid "_Displacement:"
-msgstr "For_skyving:"
+msgstr "V_riding:"
 
 #: ../plug-ins/common/blinds.c:319
 msgid "_Number of segments:"
 msgstr "_Talet på element:"
 
-#: ../plug-ins/common/blur.c:125
+#: ../plug-ins/common/blur-gauss-selective.c:103
+msgid "Blur neighboring pixels, but only in low-contrast areas"
+msgstr "Slør nabopikslar, men bare i område med låg kontrast"
+
+#: ../plug-ins/common/blur-gauss-selective.c:114
+msgid "_Selective Gaussian Blur..."
+msgstr "_Selektiv gaussisk sløring …"
+
+#: ../plug-ins/common/blur-gauss-selective.c:194
+#: ../plug-ins/common/blur-gauss-selective.c:231
+msgid "Selective Gaussian Blur"
+msgstr "Selektiv gaussisk sløring"
+
+#: ../plug-ins/common/blur-gauss-selective.c:210
+#: ../plug-ins/common/blur-gauss.c:447
+#: ../plug-ins/common/cartoon.c:231
+#: ../plug-ins/common/edge-dog.c:266
+#: ../plug-ins/common/edge-neon.c:227
+#: ../plug-ins/common/edge-sobel.c:211
+#: ../plug-ins/common/photocopy.c:243
+#: ../plug-ins/common/pixelize.c:292
+#: ../plug-ins/common/softglow.c:223
+#: ../plug-ins/file-sgi/sgi.c:535
+#: ../plug-ins/file-xjt/xjt.c:1698
+#: ../plug-ins/gradient-flare/gradient-flare.c:965
+msgid "Cannot operate on indexed color images."
+msgstr "Kan ikkje arbeide på indekserte bilete."
+
+#: ../plug-ins/common/blur-gauss-selective.c:270
+msgid "_Blur radius:"
+msgstr "Slørings_radius:"
+
+#: ../plug-ins/common/blur-gauss-selective.c:280
+msgid "_Max. delta:"
+msgstr "_Maks. delta:"
+
+#: ../plug-ins/common/blur-gauss.c:158
+msgid "Simplest, most commonly used way of blurring"
+msgstr "Den enklaste og mest brukte måten for sløring"
+
+#: ../plug-ins/common/blur-gauss.c:171
+msgid "_Gaussian Blur..."
+msgstr "_Gaussisk sløring …"
+
+#: ../plug-ins/common/blur-gauss.c:178
+#: ../plug-ins/common/blur-gauss.c:198
+#: ../plug-ins/common/blur-gauss.c:218
+#: ../plug-ins/common/blur-gauss.c:238
+msgid "Apply a gaussian blur"
+msgstr "Legg til gaussisk sløring"
+
+#: ../plug-ins/common/blur-gauss.c:427
+#: ../plug-ins/common/blur-gauss.c:477
+msgid "Gaussian Blur"
+msgstr "Gaussisk sløring"
+
+#. parameter settings
+#: ../plug-ins/common/blur-gauss.c:507
+msgid "Blur Radius"
+msgstr "Radius"
+
+#: ../plug-ins/common/blur-gauss.c:521
+#: ../plug-ins/common/jigsaw.c:2456
+#: ../plug-ins/common/noise-spread.c:383
+msgid "_Horizontal:"
+msgstr "_Horisontal:"
+
+#: ../plug-ins/common/blur-gauss.c:525
+#: ../plug-ins/common/jigsaw.c:2473
+#: ../plug-ins/common/noise-spread.c:387
+msgid "_Vertical:"
+msgstr "_Vertikal:"
+
+#: ../plug-ins/common/blur-gauss.c:548
+msgid "Blur Method"
+msgstr "Metode"
+
+#: ../plug-ins/common/blur-gauss.c:552
+msgid "_IIR"
+msgstr "_IIR"
+
+#: ../plug-ins/common/blur-gauss.c:553
+msgid "_RLE"
+msgstr "_RLE"
+
+#: ../plug-ins/common/blur-motion.c:156
+#: ../plug-ins/common/blur-motion.c:170
+msgid "Simulate movement using directional blur"
+msgstr "Simulerer rørsle ved å bruke retningsbestemt sløring"
+
+#: ../plug-ins/common/blur-motion.c:163
+#: ../plug-ins/common/blur-motion.c:176
+msgid "_Motion Blur..."
+msgstr "F_artssløring …"
+
+#: ../plug-ins/common/blur-motion.c:909
+msgid "Motion blurring"
+msgstr "Lager fartssløringa"
+
+#: ../plug-ins/common/blur-motion.c:1011
+msgid "Motion Blur"
+msgstr "Fartssløring"
+
+#: ../plug-ins/common/blur-motion.c:1044
+msgid "Blur Type"
+msgstr "Sløringstype"
+
+#: ../plug-ins/common/blur-motion.c:1048
+msgctxt "blur-type"
+msgid "_Linear"
+msgstr "_Lineær"
+
+#: ../plug-ins/common/blur-motion.c:1049
+msgctxt "blur-type"
+msgid "_Radial"
+msgstr "_Radial"
+
+#: ../plug-ins/common/blur-motion.c:1050
+msgctxt "blur-type"
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../plug-ins/common/blur-motion.c:1057
+msgid "Blur Center"
+msgstr "Sløringssentrum"
+
+#: ../plug-ins/common/blur-motion.c:1093
+#: ../plug-ins/common/lens-flare.c:771
+#: ../plug-ins/common/nova.c:462
+#: ../plug-ins/common/tile-paper.c:281
+#: ../plug-ins/flame/flame.c:1250
+#: ../plug-ins/gradient-flare/gradient-flare.c:2724
+#: ../plug-ins/lighting/lighting-ui.c:476
+msgid "_X:"
+msgstr "_X:"
+
+#: ../plug-ins/common/blur-motion.c:1098
+#: ../plug-ins/common/lens-flare.c:776
+#: ../plug-ins/common/nova.c:467
+#: ../plug-ins/common/tile-paper.c:290
+#: ../plug-ins/flame/flame.c:1264
+#: ../plug-ins/gradient-flare/gradient-flare.c:2728
+#: ../plug-ins/lighting/lighting-ui.c:491
+msgid "_Y:"
+msgstr "_Y:"
+
+#: ../plug-ins/common/blur-motion.c:1100
+msgid "Blur _outward"
+msgstr "Slør _utover"
+
+#: ../plug-ins/common/blur-motion.c:1113
+msgid "Blur Parameters"
+msgstr "Utjamningsparameter"
+
+#: ../plug-ins/common/blur-motion.c:1124
+#: ../plug-ins/map-object/map-object-ui.c:1252
+msgid "L_ength:"
+msgstr "Le_ngde:"
+
+#: ../plug-ins/common/blur-motion.c:1137
+#: ../plug-ins/common/newsprint.c:1000
+msgid "_Angle:"
+msgstr "_Vinkel:"
+
+#: ../plug-ins/common/blur.c:124
 msgid "Simple blur, fast but not very strong"
 msgstr "Enkel sløring. Rask men liten verknad"
 
-#: ../plug-ins/common/blur.c:134
+#: ../plug-ins/common/blur.c:133
 msgid "_Blur"
-msgstr "_Sløring"
+msgstr "S_løring"
 
-#: ../plug-ins/common/blur.c:178 ../plug-ins/common/unsharp.c:439
+#: ../plug-ins/common/blur.c:177
+#: ../plug-ins/common/unsharp-mask.c:583
 msgid "Blurring"
-msgstr "Slører..."
+msgstr "Slører"
 
-#: ../plug-ins/common/borderaverage.c:99
+#: ../plug-ins/common/border-average.c:98
 msgid "Set foreground to the average color of the image border"
 msgstr "Sett forgrunnsfargen til gjennomsnittet av fargane på biletramma."
 
-#: ../plug-ins/common/borderaverage.c:104
+#: ../plug-ins/common/border-average.c:103
 msgid "_Border Average..."
-msgstr "_Kantgjennomsnitt"
+msgstr "_Kantgjennomsnitt …"
 
-#: ../plug-ins/common/borderaverage.c:171
+#: ../plug-ins/common/border-average.c:170
 msgid "Border Average"
 msgstr "Kantgjennomsnitt"
 
-#: ../plug-ins/common/borderaverage.c:351
+#: ../plug-ins/common/border-average.c:350
 msgid "Borderaverage"
 msgstr "Kantgjennomsnitt"
 
-#: ../plug-ins/common/borderaverage.c:372
+#: ../plug-ins/common/border-average.c:371
 msgid "Border Size"
 msgstr "Kantbreidde"
 
-#: ../plug-ins/common/borderaverage.c:380
+#: ../plug-ins/common/border-average.c:379
 msgid "_Thickness:"
 msgstr "_Tjukkleik:"
 
-#: ../plug-ins/common/borderaverage.c:423
+#. Number of Colors frame
+#: ../plug-ins/common/border-average.c:414
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:907
+msgid "Number of Colors"
+msgstr "Talet på fargar"
+
+#: ../plug-ins/common/border-average.c:422
 msgid "_Bucket size:"
 msgstr "_Bøttestorleik:"
 
-#: ../plug-ins/common/bumpmap.c:257
+#: ../plug-ins/common/bump-map.c:256
 msgid "Create an embossing effect using a bump map"
 msgstr "Lager ein relieffverknad ved hjelp av eit strukturfilter"
 
-#: ../plug-ins/common/bumpmap.c:267
+#: ../plug-ins/common/bump-map.c:266
 msgid "_Bump Map..."
-msgstr "_Avbilding frå kart..."
+msgstr "_Avbilding frå kart …"
 
-#: ../plug-ins/common/bumpmap.c:415
+#: ../plug-ins/common/bump-map.c:414
 msgid "Bump-mapping"
 msgstr "Genererer avbildinga frå strukturfilteret."
 
-#: ../plug-ins/common/bumpmap.c:766
+#: ../plug-ins/common/bump-map.c:765
 msgid "Bump Map"
 msgstr "Avbilding"
 
-#: ../plug-ins/common/bumpmap.c:832
+#: ../plug-ins/common/bump-map.c:831
 msgid "_Bump map:"
 msgstr "_Strukturkart:"
 
-#: ../plug-ins/common/bumpmap.c:844
+#. Map type menu
+#: ../plug-ins/common/bump-map.c:834
+#: ../plug-ins/flame/flame.c:747
+#: ../plug-ins/lighting/lighting-ui.c:841
+msgid "Linear"
+msgstr "Lineær"
+
+#: ../plug-ins/common/bump-map.c:835
+#: ../plug-ins/flame/flame.c:749
+#: ../plug-ins/lighting/lighting-ui.c:844
+msgid "Spherical"
+msgstr "Kuleforma"
+
+#: ../plug-ins/common/bump-map.c:836
+#: ../plug-ins/flame/flame.c:748
+#: ../plug-ins/lighting/lighting-ui.c:843
+msgid "Sinusoidal"
+msgstr "Sinusforma"
+
+#: ../plug-ins/common/bump-map.c:843
 msgid "_Map type:"
 msgstr "_Koplingstype"
 
 #. Compensate darkening
-#: ../plug-ins/common/bumpmap.c:849
+#: ../plug-ins/common/bump-map.c:848
 msgid "Co_mpensate for darkening"
 msgstr "Ko_mpenser for formørkinga"
 
 #. Invert bumpmap
-#: ../plug-ins/common/bumpmap.c:863
+#: ../plug-ins/common/bump-map.c:862
 msgid "I_nvert bumpmap"
 msgstr "Inverter strukturkartet"
 
 #. Tile bumpmap
-#: ../plug-ins/common/bumpmap.c:877
+#: ../plug-ins/common/bump-map.c:876
 msgid "_Tile bumpmap"
 msgstr "_Flislegg strukturkartet"
 
-#: ../plug-ins/common/bumpmap.c:892 ../plug-ins/common/emboss.c:499
+#: ../plug-ins/common/bump-map.c:891
+#: ../plug-ins/common/emboss.c:499
 msgid "_Azimuth:"
 msgstr "_Asimut:"
 
-#: ../plug-ins/common/bumpmap.c:904
+#: ../plug-ins/common/bump-map.c:903
 msgid "_Elevation:"
 msgstr "_Elevasjon:"
 
-#: ../plug-ins/common/bumpmap.c:930 ../plug-ins/common/postscript.c:3381
+#: ../plug-ins/common/bump-map.c:929
+#: ../plug-ins/common/file-ps.c:3394
 msgid "_X offset:"
 msgstr "_X-forskyving:"
 
-#: ../plug-ins/common/bumpmap.c:933 ../plug-ins/common/bumpmap.c:947
-msgid ""
-"The offset can be adjusted by dragging the preview using the middle mouse "
-"button."
+#: ../plug-ins/common/bump-map.c:932
+#: ../plug-ins/common/bump-map.c:946
+msgid "The offset can be adjusted by dragging the preview using the middle mouse button."
 msgstr "Du kan også justera forskyvinga ved hjelp av den midtre museknappen."
 
-#: ../plug-ins/common/bumpmap.c:944 ../plug-ins/common/postscript.c:3390
+#: ../plug-ins/common/bump-map.c:943
+#: ../plug-ins/common/file-ps.c:3403
 msgid "_Y offset:"
 msgstr "_Y-forskyving:"
 
-#: ../plug-ins/common/bumpmap.c:958
+#: ../plug-ins/common/bump-map.c:957
 msgid "_Waterlevel:"
 msgstr "_Havnivå:"
 
-#: ../plug-ins/common/bumpmap.c:970
+#: ../plug-ins/common/bump-map.c:969
 msgid "A_mbient:"
 msgstr "_Bakgrunnslys:"
 
-#: ../plug-ins/common/c_astretch.c:68
-msgid "Stretch contrast to cover the maximum possible range"
-msgstr "Strekker kontrasten for å dekke størst mogleg område"
-
-#: ../plug-ins/common/c_astretch.c:79
-msgid "_Stretch Contrast"
-msgstr "Strekk _kontrast..."
-
-#: ../plug-ins/common/c_astretch.c:113
-msgid "Auto-stretching contrast"
-msgstr "Automatisk _kontraststrekking..."
-
-#: ../plug-ins/common/c_astretch.c:152
-msgid "c_astretch: cmap was NULL!  Quitting...\n"
-msgstr "c_astretch: cmap var NULL!  Avbrote...\n"
-
-#: ../plug-ins/common/cartoon.c:142
+#: ../plug-ins/common/cartoon.c:141
 msgid "Simulate a cartoon by enhancing edges"
 msgstr "Simulerer ei strekteikning ved å forsterke kantane"
 
-#: ../plug-ins/common/cartoon.c:147
+#: ../plug-ins/common/cartoon.c:146
 msgid "Ca_rtoon..."
-msgstr "Teikneserie..."
+msgstr "Teikne_serie …"
 
-#: ../plug-ins/common/cartoon.c:229 ../plug-ins/common/dog.c:251
-#: ../plug-ins/common/gauss.c:445 ../plug-ins/common/neon.c:225
-#: ../plug-ins/common/photocopy.c:241 ../plug-ins/common/sel_gauss.c:211
-#: ../plug-ins/common/softglow.c:221 ../plug-ins/gflare/gflare.c:965
-#: ../plug-ins/sgi/sgi.c:520 ../plug-ins/xjt/xjt.c:1688
-msgid "Cannot operate on indexed color images."
-msgstr "Kan ikkje arbeida på indekserte bilete."
-
-#: ../plug-ins/common/cartoon.c:809
+#: ../plug-ins/common/cartoon.c:810
 msgid "Cartoon"
-msgstr "_Teikneserie"
+msgstr "Teikneserie"
 
-#: ../plug-ins/common/cartoon.c:846 ../plug-ins/common/photocopy.c:874
+#: ../plug-ins/common/cartoon.c:847
+#: ../plug-ins/common/photocopy.c:875
 msgid "_Mask radius:"
 msgstr "_Maskeradius:"
 
-#: ../plug-ins/common/cartoon.c:860
+#: ../plug-ins/common/cartoon.c:861
 msgid "_Percent black:"
 msgstr "Svartandel (%):"
 
-#: ../plug-ins/common/ccanalyze.c:106
-msgid "Analyze the set of colors in the image"
-msgstr "Analyser fargesettet i biletet"
-
-#: ../plug-ins/common/ccanalyze.c:112
-msgid "Colorcube A_nalysis..."
-msgstr "Fargerom_analyse..."
-
-#: ../plug-ins/common/ccanalyze.c:200 ../plug-ins/common/ccanalyze.c:356
-msgid "Colorcube Analysis"
-msgstr "Fargeromanalyse"
-
-#. output results
-#: ../plug-ins/common/ccanalyze.c:384
-#: ../plug-ins/imagemap/imap_cmd_guides.c:231
-#, c-format
-msgid "Image dimensions: %d × %d"
-msgstr "Biletstorleik: %d x %d"
-
-#: ../plug-ins/common/ccanalyze.c:387
-msgid "No colors"
-msgstr "Ingen fargar"
-
-#: ../plug-ins/common/ccanalyze.c:389
-msgid "Only one unique color"
-msgstr "Bare ein farge"
-
-#: ../plug-ins/common/ccanalyze.c:391
-#, c-format
-msgid "Number of unique colors: %d"
-msgstr "Talet på unike fargar: %d"
-
-#: ../plug-ins/common/channel_mixer.c:175
+#: ../plug-ins/common/channel-mixer.c:174
 msgid "Alter colors by mixing RGB Channels"
 msgstr "Endre fargane ved å blande RGB-kanalane"
 
-#: ../plug-ins/common/channel_mixer.c:180
+#: ../plug-ins/common/channel-mixer.c:179
 msgid "Channel Mi_xer..."
-msgstr "_Kanalmi_ksar..."
+msgstr "_Kanalmi_ksar …"
 
 #. printf("Channel Mixer:: Mode:%d  r %f  g %f  b %f\n ",
 #. param[3].data.d_int32, mix.black.red_gain,
 #. mix.black.green_gain, mix.black.blue_gain);
-#: ../plug-ins/common/channel_mixer.c:271
-#: ../plug-ins/common/channel_mixer.c:492
+#: ../plug-ins/common/channel-mixer.c:270
+#: ../plug-ins/common/channel-mixer.c:491
 msgid "Channel Mixer"
 msgstr "Kanalmiksar"
 
-#: ../plug-ins/common/channel_mixer.c:528
+#: ../plug-ins/common/channel-mixer.c:528
 msgid "O_utput channel:"
 msgstr "_Utkanal:"
 
-#: ../plug-ins/common/channel_mixer.c:582 ../plug-ins/common/compose.c:190
-#: ../plug-ins/common/compose.c:201 ../plug-ins/common/diffraction.c:501
-#: ../plug-ins/common/diffraction.c:539 ../plug-ins/common/diffraction.c:577
-#: ../plug-ins/common/exchange.c:398 ../plug-ins/common/noisify.c:530
-#: ../plug-ins/common/noisify.c:537
+#. Redmode radio frame
+#: ../plug-ins/common/channel-mixer.c:537
+#: ../plug-ins/common/decompose.c:173
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:990
+msgid "Red"
+msgstr "Raud"
+
+#. Greenmode radio frame
+#: ../plug-ins/common/channel-mixer.c:542
+#: ../plug-ins/common/decompose.c:174
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1031
+msgid "Green"
+msgstr "Grøn"
+
+#. Bluemode radio frame
+#: ../plug-ins/common/channel-mixer.c:547
+#: ../plug-ins/common/decompose.c:175
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1072
+msgid "Blue"
+msgstr "Blå"
+
+#: ../plug-ins/common/channel-mixer.c:582
+#: ../plug-ins/common/color-exchange.c:397
+#: ../plug-ins/common/compose.c:189
+#: ../plug-ins/common/compose.c:200
+#: ../plug-ins/common/diffraction.c:500
+#: ../plug-ins/common/diffraction.c:538
+#: ../plug-ins/common/diffraction.c:576
+#: ../plug-ins/common/noise-rgb.c:530
+#: ../plug-ins/common/noise-rgb.c:537
 msgid "_Red:"
 msgstr "_Raud:"
 
-#: ../plug-ins/common/channel_mixer.c:600 ../plug-ins/common/compose.c:191
-#: ../plug-ins/common/compose.c:202 ../plug-ins/common/diffraction.c:510
-#: ../plug-ins/common/diffraction.c:548 ../plug-ins/common/diffraction.c:586
-#: ../plug-ins/common/exchange.c:458 ../plug-ins/common/noisify.c:531
-#: ../plug-ins/common/noisify.c:538
+#: ../plug-ins/common/channel-mixer.c:600
+#: ../plug-ins/common/color-exchange.c:457
+#: ../plug-ins/common/compose.c:190
+#: ../plug-ins/common/compose.c:201
+#: ../plug-ins/common/diffraction.c:509
+#: ../plug-ins/common/diffraction.c:547
+#: ../plug-ins/common/diffraction.c:585
+#: ../plug-ins/common/noise-rgb.c:531
+#: ../plug-ins/common/noise-rgb.c:538
 msgid "_Green:"
 msgstr "_Grøn:"
 
-#: ../plug-ins/common/channel_mixer.c:619 ../plug-ins/common/compose.c:192
-#: ../plug-ins/common/compose.c:203 ../plug-ins/common/diffraction.c:519
-#: ../plug-ins/common/diffraction.c:557 ../plug-ins/common/diffraction.c:595
-#: ../plug-ins/common/exchange.c:519 ../plug-ins/common/noisify.c:532
-#: ../plug-ins/common/noisify.c:539
+#: ../plug-ins/common/channel-mixer.c:619
+#: ../plug-ins/common/color-exchange.c:518
+#: ../plug-ins/common/compose.c:191
+#: ../plug-ins/common/compose.c:202
+#: ../plug-ins/common/diffraction.c:518
+#: ../plug-ins/common/diffraction.c:556
+#: ../plug-ins/common/diffraction.c:594
+#: ../plug-ins/common/noise-rgb.c:532
+#: ../plug-ins/common/noise-rgb.c:539
 msgid "_Blue:"
 msgstr "_Blå:"
 
-#: ../plug-ins/common/channel_mixer.c:635
+#: ../plug-ins/common/channel-mixer.c:635
 msgid "_Monochrome"
 msgstr "_Monokrom"
 
-#: ../plug-ins/common/channel_mixer.c:648
+#: ../plug-ins/common/channel-mixer.c:648
 msgid "Preserve _luminosity"
 msgstr "Behald farge_glød"
 
-#: ../plug-ins/common/channel_mixer.c:877
+#: ../plug-ins/common/channel-mixer.c:877
 msgid "Load Channel Mixer Settings"
 msgstr "Opna innstillingane for kanalmiksaren"
 
-#: ../plug-ins/common/channel_mixer.c:1004
+#. stat error (file does not exist)
+#: ../plug-ins/common/channel-mixer.c:981
+#: ../plug-ins/common/cml-explorer.c:2177
+#: ../plug-ins/common/curve-bend.c:884
+#: ../plug-ins/common/file-cel.c:311
+#: ../plug-ins/common/file-compressor.c:497
+#: ../plug-ins/common/file-compressor.c:665
+#: ../plug-ins/common/file-dicom.c:324
+#: ../plug-ins/common/file-gbr.c:360
+#: ../plug-ins/common/file-gif-load.c:355
+#: ../plug-ins/common/file-gih.c:643
+#: ../plug-ins/common/file-mng.c:1072
+#: ../plug-ins/common/file-pat.c:329
+#: ../plug-ins/common/file-pcx.c:360
+#: ../plug-ins/common/file-pdf.c:550
+#: ../plug-ins/common/file-pix.c:342
+#: ../plug-ins/common/file-png.c:720
+#: ../plug-ins/common/file-pnm.c:493
+#: ../plug-ins/common/file-ps.c:1037
+#: ../plug-ins/common/file-ps.c:3044
+#: ../plug-ins/common/file-psp.c:1750
+#: ../plug-ins/common/file-raw.c:248
+#: ../plug-ins/common/file-raw.c:665
+#: ../plug-ins/common/file-sunras.c:390
+#: ../plug-ins/common/file-svg.c:332
+#: ../plug-ins/common/file-svg.c:717
+#: ../plug-ins/common/file-tga.c:441
+#: ../plug-ins/common/file-tiff-load.c:291
+#: ../plug-ins/common/file-xbm.c:736
+#: ../plug-ins/common/file-xwd.c:432
+#: ../plug-ins/common/sphere-designer.c:2001
+#: ../plug-ins/file-bmp/bmp-read.c:153
+#: ../plug-ins/file-faxg3/faxg3.c:232
+#: ../plug-ins/file-fits/fits.c:357
+#: ../plug-ins/file-fli/fli-gimp.c:459
+#: ../plug-ins/file-fli/fli-gimp.c:496
+#: ../plug-ins/file-ico/ico-load.c:652
+#: ../plug-ins/file-ico/ico-load.c:731
+#: ../plug-ins/file-jpeg/jpeg-load.c:108
+#: ../plug-ins/file-jpeg/jpeg-load.c:830
+#: ../plug-ins/file-psd/psd-load.c:130
+#: ../plug-ins/file-psd/psd-thumb-load.c:79
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:189
+#: ../plug-ins/file-xjt/xjt.c:2540
+#: ../plug-ins/file-xjt/xjt.c:2548
+#: ../plug-ins/flame/flame.c:411
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1862
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:928
+#: ../plug-ins/gfig/gfig.c:433
+#: ../plug-ins/help/gimphelplocale.c:222
+#: ../plug-ins/help/gimphelplocale.c:238
+#: ../plug-ins/lighting/lighting-ui.c:1353
+msgid "Could not open '%s' for reading: %s"
+msgstr "Kunne ikkje opna «%s» for lesing: %s"
+
+#: ../plug-ins/common/channel-mixer.c:1004
 msgid "Save Channel Mixer Settings"
 msgstr "Lagra innstillingane for kanalmiksaren"
 
-#: ../plug-ins/common/checkerboard.c:89
+#: ../plug-ins/common/channel-mixer.c:1059
+#: ../plug-ins/common/cml-explorer.c:2004
+#: ../plug-ins/common/curve-bend.c:832
+#: ../plug-ins/common/file-cel.c:582
+#: ../plug-ins/common/file-compressor.c:425
+#: ../plug-ins/common/file-compressor.c:507
+#: ../plug-ins/common/file-compressor.c:589
+#: ../plug-ins/common/file-compressor.c:676
+#: ../plug-ins/common/file-csource.c:405
+#: ../plug-ins/common/file-dicom.c:800
+#: ../plug-ins/common/file-gbr.c:634
+#: ../plug-ins/common/file-gif-save.c:761
+#: ../plug-ins/common/file-gih.c:1276
+#: ../plug-ins/common/file-html-table.c:235
+#: ../plug-ins/common/file-mng.c:574
+#: ../plug-ins/common/file-mng.c:908
+#: ../plug-ins/common/file-pat.c:461
+#: ../plug-ins/common/file-pcx.c:665
+#: ../plug-ins/common/file-pix.c:523
+#: ../plug-ins/common/file-png.c:1269
+#: ../plug-ins/common/file-pnm.c:976
+#: ../plug-ins/common/file-ps.c:1214
+#: ../plug-ins/common/file-raw.c:545
+#: ../plug-ins/common/file-raw.c:573
+#: ../plug-ins/common/file-sunras.c:562
+#: ../plug-ins/common/file-tga.c:1169
+#: ../plug-ins/common/file-tiff-save.c:683
+#: ../plug-ins/common/file-xbm.c:1034
+#: ../plug-ins/common/file-xwd.c:613
+#: ../plug-ins/common/sphere-designer.c:2111
+#: ../plug-ins/file-bmp/bmp-write.c:295
+#: ../plug-ins/file-fits/fits.c:475
+#: ../plug-ins/file-fli/fli-gimp.c:749
+#: ../plug-ins/file-ico/ico-save.c:1007
+#: ../plug-ins/file-jpeg/jpeg-save.c:329
+#: ../plug-ins/file-psd/psd-save.c:1637
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:162
+#: ../plug-ins/file-xjt/xjt.c:1291
+#: ../plug-ins/file-xjt/xjt.c:1726
+#: ../plug-ins/flame/flame.c:442
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1545
+#: ../plug-ins/gfig/gfig.c:793
+#: ../plug-ins/ifs-compose/ifs-compose.c:2374
+#: ../plug-ins/lighting/lighting-ui.c:1210
+msgid "Could not open '%s' for writing: %s"
+msgstr "Kan ikkje opna «%s» for skriving: %s"
+
+#: ../plug-ins/common/channel-mixer.c:1067
+#: ../plug-ins/common/cml-explorer.c:2059
+msgid "Parameters were saved to '%s'"
+msgstr "Parametra blei lagra i «%s»"
+
+#: ../plug-ins/common/checkerboard.c:88
 msgid "Create a checkerboard pattern"
 msgstr "Lag eit sjakkbrettmønster"
 
-#: ../plug-ins/common/checkerboard.c:94
+#: ../plug-ins/common/checkerboard.c:93
 msgid "_Checkerboard..."
-msgstr "_Sjakkbrett..."
+msgstr "Sjakk_brett …"
 
-#: ../plug-ins/common/checkerboard.c:161
+#: ../plug-ins/common/checkerboard.c:160
 msgid "Adding checkerboard"
 msgstr "Legg til sjakkbrett"
 
-#: ../plug-ins/common/checkerboard.c:346
+#: ../plug-ins/common/checkerboard.c:345
 msgid "Checkerboard"
 msgstr "Sjakkbrett"
 
-#: ../plug-ins/common/checkerboard.c:412
-#: ../plug-ins/gimpressionist/sizemap.c:511
+#: ../plug-ins/common/checkerboard.c:411
+#: ../plug-ins/gimpressionist/sizemap.c:510
 msgid "_Size:"
 msgstr "_Storleik:"
 
-#: ../plug-ins/common/checkerboard.c:421
+#: ../plug-ins/common/checkerboard.c:420
 msgid "_Psychobilly"
 msgstr "_Krumming"
 
-#: ../plug-ins/common/color_enhance.c:69
+#: ../plug-ins/common/cml-explorer.c:128
+msgid "Keep image's values"
+msgstr "Behald biletverdiane"
+
+#: ../plug-ins/common/cml-explorer.c:129
+msgid "Keep the first value"
+msgstr "Behald første verdien"
+
+#: ../plug-ins/common/cml-explorer.c:130
+msgid "Fill with parameter k"
+msgstr "Fyll med parameter k"
+
+#: ../plug-ins/common/cml-explorer.c:131
+msgid "k{x(1-x)}^p"
+msgstr "k{x(1-x)}^p"
+
+#: ../plug-ins/common/cml-explorer.c:132
+msgid "k{x(1-x)}^p stepped"
+msgstr "k{x(1-x)}^p stegvis"
+
+#: ../plug-ins/common/cml-explorer.c:133
+msgid "kx^p"
+msgstr "kx^p"
+
+#: ../plug-ins/common/cml-explorer.c:134
+msgid "kx^p stepped"
+msgstr "kx^p schrittweise"
+
+#: ../plug-ins/common/cml-explorer.c:135
+msgid "k(1-x^p)"
+msgstr "k(1-x^p)"
+
+#: ../plug-ins/common/cml-explorer.c:136
+msgid "k(1-x^p) stepped"
+msgstr "k(1-x^p) stegvis"
+
+#: ../plug-ins/common/cml-explorer.c:137
+msgid "Delta function"
+msgstr "Deltafunksjon"
+
+#: ../plug-ins/common/cml-explorer.c:138
+msgid "Delta function stepped"
+msgstr "Deltafunksjon stegvis"
+
+#: ../plug-ins/common/cml-explorer.c:139
+msgid "sin^p-based function"
+msgstr "sin^p-basert funksjon"
+
+#: ../plug-ins/common/cml-explorer.c:140
+msgid "sin^p, stepped"
+msgstr "sin^p stegvis"
+
+#: ../plug-ins/common/cml-explorer.c:166
+msgid "Max (x, -)"
+msgstr "Max (x, -)"
+
+#: ../plug-ins/common/cml-explorer.c:167
+msgid "Max (x+d, -)"
+msgstr "Max (x+d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:168
+msgid "Max (x-d, -)"
+msgstr "Max (x-d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:169
+msgid "Min (x, -)"
+msgstr "Min (x, -)"
+
+#: ../plug-ins/common/cml-explorer.c:170
+msgid "Min (x+d, -)"
+msgstr "Min (x+d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:171
+msgid "Min (x-d, -)"
+msgstr "Min (x-d, -)"
+
+#: ../plug-ins/common/cml-explorer.c:172
+msgid "Max (x+d, -), (x < 0.5)"
+msgstr "Max (x+d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:173
+msgid "Max (x+d, -), (0.5 < x)"
+msgstr "Max (x+d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:174
+msgid "Max (x-d, -), (x < 0.5)"
+msgstr "Max (x-d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:175
+msgid "Max (x-d, -), (0.5 < x)"
+msgstr "Max (x-d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:176
+msgid "Min (x+d, -), (x < 0.5)"
+msgstr "Min (x+d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:177
+msgid "Min (x+d, -), (0.5 < x)"
+msgstr "Min (x+d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:178
+msgid "Min (x-d, -), (x < 0.5)"
+msgstr "Min (x-d, -), (x < 0.5)"
+
+#: ../plug-ins/common/cml-explorer.c:179
+msgid "Min (x-d, -), (0.5 < x)"
+msgstr "Min (x-d, -), (0.5 < x)"
+
+#: ../plug-ins/common/cml-explorer.c:199
+#: ../plug-ins/common/file-sunras.c:1650
+msgid "Standard"
+msgstr "Standard"
+
+#: ../plug-ins/common/cml-explorer.c:200
+msgid "Use average value"
+msgstr "Bruk gjennomsnittsverdi"
+
+#: ../plug-ins/common/cml-explorer.c:201
+msgid "Use reverse value"
+msgstr "Bruk omvendte verdiar"
+
+#: ../plug-ins/common/cml-explorer.c:202
+msgid "With random power (0,10)"
+msgstr "Med tilfeldig eksponent (0,10)"
+
+#: ../plug-ins/common/cml-explorer.c:203
+msgid "With random power (0,1)"
+msgstr "Med tilfeldig eksponent (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:204
+msgid "With gradient power (0,1)"
+msgstr "Med gradert eksponent (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:205
+msgid "Multiply rand. value (0,1)"
+msgstr "Multipl. tilfeldig verdi (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:206
+msgid "Multiply rand. value (0,2)"
+msgstr "Multipl. tilfeldig verdi (0,2)"
+
+#: ../plug-ins/common/cml-explorer.c:207
+msgid "Multiply gradient (0,1)"
+msgstr "Multipl. fargeovergang (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:208
+msgid "With p and random (0,1)"
+msgstr "Med p og tilfeldig tal (0,1)"
+
+#: ../plug-ins/common/cml-explorer.c:222
+msgid "All black"
+msgstr "Alt svart"
+
+#: ../plug-ins/common/cml-explorer.c:223
+msgid "All gray"
+msgstr "Alt grått"
+
+#: ../plug-ins/common/cml-explorer.c:224
+msgid "All white"
+msgstr "Alt kvitt"
+
+#: ../plug-ins/common/cml-explorer.c:225
+msgid "The first row of the image"
+msgstr "Den første linja i biletet"
+
+#: ../plug-ins/common/cml-explorer.c:226
+msgid "Continuous gradient"
+msgstr "Kontinuerleg fargeovergang"
+
+#: ../plug-ins/common/cml-explorer.c:227
+msgid "Continuous grad. w/o gap"
+msgstr "Kont. fargeovergang u/ mellomrom"
+
+#: ../plug-ins/common/cml-explorer.c:228
+msgid "Random, ch. independent"
+msgstr "Tilfeldig, kanaluavh."
+
+#: ../plug-ins/common/cml-explorer.c:229
+msgid "Random shared"
+msgstr "Tilfeldig, delt"
+
+#: ../plug-ins/common/cml-explorer.c:230
+msgid "Randoms from seed"
+msgstr "Tilfeldig frå frø"
+
+#: ../plug-ins/common/cml-explorer.c:231
+msgid "Randoms from seed (shared)"
+msgstr "Tilfeldig frå frø (delt)"
+
+#: ../plug-ins/common/cml-explorer.c:299
+#: ../plug-ins/common/cml-explorer.c:307
+#: ../plug-ins/common/decompose.c:187
+#: ../plug-ins/gimpressionist/orientation.c:179
+#: ../plug-ins/gimpressionist/size.c:182
+msgid "Hue"
+msgstr "Kulør"
+
+#: ../plug-ins/common/cml-explorer.c:300
+#: ../plug-ins/common/cml-explorer.c:308
+#: ../plug-ins/common/decompose.c:188
+msgid "Saturation"
+msgstr "Metning"
+
+#: ../plug-ins/common/cml-explorer.c:301
+#: ../plug-ins/common/cml-explorer.c:309
+#: ../plug-ins/common/decompose.c:189
+#: ../plug-ins/gimpressionist/orientation.c:155
+#: ../plug-ins/gimpressionist/size.c:158
+msgid "Value"
+msgstr "Lysverdi"
+
+#: ../plug-ins/common/cml-explorer.c:306
+msgid "(None)"
+msgstr "(Ingen)"
+
+#: ../plug-ins/common/cml-explorer.c:454
+msgid "Create abstract Coupled-Map Lattice patterns"
+msgstr "Lag Coupled-Map-Lattice mønster"
+
+#: ../plug-ins/common/cml-explorer.c:465
+msgid "CML _Explorer..."
+msgstr "_CML behandlaren …"
+
+#: ../plug-ins/common/cml-explorer.c:755
+msgid "CML Explorer: evoluting"
+msgstr "CML_behandlar: utvikling"
+
+#: ../plug-ins/common/cml-explorer.c:1176
+msgid "Coupled-Map-Lattice Explorer"
+msgstr "Samankopla avbildingsgitter "
+
+#: ../plug-ins/common/cml-explorer.c:1223
+msgid "New Seed"
+msgstr "_Nytt frø"
+
+#: ../plug-ins/common/cml-explorer.c:1234
+msgid "Fix Seed"
+msgstr "Fast frø"
+
+#: ../plug-ins/common/cml-explorer.c:1245
+msgid "Random Seed"
+msgstr "Tilfeldig frø:"
+
+#: ../plug-ins/common/cml-explorer.c:1287
+#: ../plug-ins/common/filter-pack.c:699
+#: ../plug-ins/common/van-gogh-lic.c:670
+msgid "_Hue"
+msgstr "_Kulør"
+
+#: ../plug-ins/common/cml-explorer.c:1291
+msgid "Sat_uration"
+msgstr "M_etning"
+
+#: ../plug-ins/common/cml-explorer.c:1295
+#: ../plug-ins/common/filter-pack.c:707
+msgid "_Value"
+msgstr "_Verdi"
+
+#: ../plug-ins/common/cml-explorer.c:1299
+msgid "_Advanced"
+msgstr "_Utvida"
+
+#: ../plug-ins/common/cml-explorer.c:1314
+msgid "Channel Independent Parameters"
+msgstr "Kanaluavhengige parametrar"
+
+#: ../plug-ins/common/cml-explorer.c:1336
+msgid "Initial value:"
+msgstr "Startverdi:"
+
+#: ../plug-ins/common/cml-explorer.c:1342
+msgid "Zoom scale:"
+msgstr "Zoomfaktor:"
+
+#: ../plug-ins/common/cml-explorer.c:1351
+msgid "Start offset:"
+msgstr "Startforskyving:"
+
+#: ../plug-ins/common/cml-explorer.c:1360
+msgid "Seed of Random (only for \"From Seed\" Modes)"
+msgstr "Startverdi. (Bare for «Frå frø» modus)"
+
+#: ../plug-ins/common/cml-explorer.c:1371
+#: ../plug-ins/maze/maze-dialog.c:260
+msgid "Seed:"
+msgstr "Frø:"
+
+#: ../plug-ins/common/cml-explorer.c:1384
+msgid "Switch to \"From seed\" With the Last Seed"
+msgstr "Bytt til «Frå frø» med siste frø"
+
+#: ../plug-ins/common/cml-explorer.c:1396
+msgid ""
+"\"Fix seed\" button is an alias of me.\n"
+"The same seed produces the same image, if (1) the widths of images are same (this is the reason why image on drawable is different from preview), and (2) all mutation rates equal to zero."
+msgstr ""
+"Det same frøet lager det same biletet dersom\n"
+"1. bileta er like breie (Dette er grunnen til at det endelege biletet er anleis enn førehandsvisinga).\n"
+"2. alle mutasjonsratene er sett til null."
+
+#: ../plug-ins/common/cml-explorer.c:1404
+msgid "O_thers"
+msgstr "_Andre"
+
+#: ../plug-ins/common/cml-explorer.c:1419
+msgid "Copy Settings"
+msgstr "Innstillingar for kopiering"
+
+#: ../plug-ins/common/cml-explorer.c:1438
+msgid "Source channel:"
+msgstr "Kjeldelkanal:"
+
+#: ../plug-ins/common/cml-explorer.c:1453
+#: ../plug-ins/common/cml-explorer.c:1501
+msgid "Destination channel:"
+msgstr "Målkanal:"
+
+#: ../plug-ins/common/cml-explorer.c:1457
+msgid "Copy Parameters"
+msgstr "Kopier parametra"
+
+#: ../plug-ins/common/cml-explorer.c:1466
+msgid "Selective Load Settings"
+msgstr "Selektive opningsinnstillingar"
+
+#: ../plug-ins/common/cml-explorer.c:1486
+msgid "Source channel in file:"
+msgstr "Kjeldekanal i fil:"
+
+#: ../plug-ins/common/cml-explorer.c:1507
+msgid "_Misc Ops."
+msgstr "_Ymse innst."
+
+#: ../plug-ins/common/cml-explorer.c:1556
+msgid "Function type:"
+msgstr "Funksjonstype:"
+
+#: ../plug-ins/common/cml-explorer.c:1572
+msgid "Composition:"
+msgstr "Komposisjon:"
+
+#: ../plug-ins/common/cml-explorer.c:1586
+msgid "Misc arrange:"
+msgstr "Ymse oppstillingar:"
+
+#: ../plug-ins/common/cml-explorer.c:1590
+msgid "Use cyclic range"
+msgstr "Bruk sykliske område"
+
+#: ../plug-ins/common/cml-explorer.c:1600
+msgid "Mod. rate:"
+msgstr "Endringsgrad:"
+
+#: ../plug-ins/common/cml-explorer.c:1609
+msgid "Env. sensitivity:"
+msgstr "Omgivnadsfølsemd:"
+
+#: ../plug-ins/common/cml-explorer.c:1618
+msgid "Diffusion dist.:"
+msgstr "Diffusjonsavstand:"
+
+#: ../plug-ins/common/cml-explorer.c:1627
+msgid "# of subranges:"
+msgstr "Talet på underområde:"
+
+#: ../plug-ins/common/cml-explorer.c:1636
+msgid "P(ower factor):"
+msgstr "Eksponentfaktor (p):"
+
+#: ../plug-ins/common/cml-explorer.c:1645
+msgid "Parameter k:"
+msgstr "Parameter k:"
+
+#: ../plug-ins/common/cml-explorer.c:1654
+msgid "Range low:"
+msgstr "Nedre grense:"
+
+#: ../plug-ins/common/cml-explorer.c:1663
+msgid "Range high:"
+msgstr "Øvre grense:"
+
+#: ../plug-ins/common/cml-explorer.c:1675
+msgid "Plot a Graph of the Settings"
+msgstr "Vis innstillingane grafisk"
+
+#: ../plug-ins/common/cml-explorer.c:1720
+msgid "Ch. sensitivity:"
+msgstr "Kanalfølsemd:"
+
+#: ../plug-ins/common/cml-explorer.c:1730
+msgid "Mutation rate:"
+msgstr "Mutasjonsrate:"
+
+#: ../plug-ins/common/cml-explorer.c:1740
+msgid "Mutation dist.:"
+msgstr "Mutasjonsavstand:"
+
+#: ../plug-ins/common/cml-explorer.c:1818
+msgid "Graph of the Current Settings"
+msgstr "Graf for dei gjeldande innstillingane"
+
+#: ../plug-ins/common/cml-explorer.c:1889
+msgid "Warning: the source and the destination are the same channel."
+msgstr "Åtvaring: Kjelde- og målkanalen er den same"
+
+#: ../plug-ins/common/cml-explorer.c:1948
+msgid "Save CML Explorer Parameters"
+msgstr "Lagra parametra for CML-utforskaren"
+
+#: ../plug-ins/common/cml-explorer.c:2081
+msgid "Load CML Explorer Parameters"
+msgstr "Opna parametra for CML-utforskaren"
+
+#: ../plug-ins/common/cml-explorer.c:2199
+msgid "Error: it's not CML parameter file."
+msgstr "Feil: Dette er ikkje ei CML-parameter-fil"
+
+#: ../plug-ins/common/cml-explorer.c:2206
+msgid "Warning: '%s' is an old format file."
+msgstr "Åtvaring: «%s» er ei fil i gammalt format."
+
+#: ../plug-ins/common/cml-explorer.c:2210
+msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
+msgstr "Åtvaring: «%s» er ei parameterfil for nyare CML-utforskar enn denne."
+
+#: ../plug-ins/common/cml-explorer.c:2273
+msgid "Error: failed to load parameters"
+msgstr "Feil: Kunne ikkje opna parametra"
+
+#: ../plug-ins/common/color-cube-analyze.c:105
+msgid "Analyze the set of colors in the image"
+msgstr "Analyser fargesettet i biletet"
+
+#: ../plug-ins/common/color-cube-analyze.c:111
+msgid "Colorcube A_nalysis..."
+msgstr "Fargerom_analyse …"
+
+#: ../plug-ins/common/color-cube-analyze.c:199
+#: ../plug-ins/common/color-cube-analyze.c:355
+msgid "Colorcube Analysis"
+msgstr "Fargeromanalyse"
+
+#. output results
+#: ../plug-ins/common/color-cube-analyze.c:383
+#: ../plug-ins/imagemap/imap_cmd_guides.c:230
+msgid "Image dimensions: %d × %d"
+msgstr "Biletstorleik: %d x %d"
+
+#: ../plug-ins/common/color-cube-analyze.c:386
+msgid "No colors"
+msgstr "Ingen fargar"
+
+#: ../plug-ins/common/color-cube-analyze.c:388
+msgid "Only one unique color"
+msgstr "Bare ein farge"
+
+#: ../plug-ins/common/color-cube-analyze.c:390
+msgid "Number of unique colors: %d"
+msgstr "Talet på unike fargar: %d"
+
+#: ../plug-ins/common/color-enhance.c:68
 msgid "Stretch color saturation to cover maximum possible range"
 msgstr "Strekker biletmetning for å dekke størst mogleg område"
 
-#: ../plug-ins/common/color_enhance.c:81
+#: ../plug-ins/common/color-enhance.c:80
 msgid "_Color Enhance"
-msgstr "_Fargeforsterkning..."
+msgstr "_Fargeforsterkning"
 
-#: ../plug-ins/common/color_enhance.c:115
+#: ../plug-ins/common/color-enhance.c:114
 msgid "Color Enhance"
 msgstr "Fargeforbetring"
 
-#: ../plug-ins/common/colorify.c:102
-msgid "Replace all colors with shades of a specified color"
-msgstr "Bytt ut alle fargane med ulike toner av ein spesifisert farge"
+#: ../plug-ins/common/color-exchange.c:121
+msgid "Swap one color with another"
+msgstr "Byter ein farge med ein annan"
 
-#: ../plug-ins/common/colorify.c:108
-msgid "Colorif_y..."
-msgstr "Farge_legg frå mal..."
+#: ../plug-ins/common/color-exchange.c:127
+msgid "_Color Exchange..."
+msgstr "Bytt _farge …"
 
-#: ../plug-ins/common/colorify.c:169
-msgid "Colorifying"
-msgstr "Fargelegg"
+#: ../plug-ins/common/color-exchange.c:212
+#: ../plug-ins/common/color-exchange.c:286
+msgid "Color Exchange"
+msgstr "Byter ut ein farge med ein annan"
 
-#: ../plug-ins/common/colorify.c:255
-msgid "Colorify"
-msgstr "Fargelegg"
+#: ../plug-ins/common/color-exchange.c:308
+msgid "Middle-Click Inside Preview to Pick \"From Color\""
+msgstr "Klikk i førehandsvisinga med midtre musebrytaren for å velje «frå-farge»"
 
-#: ../plug-ins/common/colorify.c:289
-msgid "Custom color:"
-msgstr "Definer farge:"
+#: ../plug-ins/common/color-exchange.c:346
+msgid "To Color"
+msgstr "Tilfarge"
 
-#: ../plug-ins/common/colorify.c:294
-msgid "Colorify Custom Color"
-msgstr "Fargelegg med brukardefinert farge"
+#: ../plug-ins/common/color-exchange.c:346
+msgid "From Color"
+msgstr "Fråfarge"
 
-#: ../plug-ins/common/colormap-remap.c:97
-msgid "Rearrange the colormap"
-msgstr "Ordne fargekartet på nytt"
+#: ../plug-ins/common/color-exchange.c:364
+msgid "Color Exchange: To Color"
+msgstr "Fargeutveksling: tilfarge"
 
-#: ../plug-ins/common/colormap-remap.c:104
-msgid "R_earrange Colormap..."
-msgstr "_Ordne fargekartet på nytt..."
+#: ../plug-ins/common/color-exchange.c:365
+msgid "Color Exchange: From Color"
+msgstr "Fargeutveksling: fråfarge"
 
-#: ../plug-ins/common/colormap-remap.c:116
-msgid "Swap two colors in the colormap"
-msgstr "Bytt to fargar i fargekartet"
+#: ../plug-ins/common/color-exchange.c:423
+msgid "R_ed threshold:"
+msgstr "_Raud terskel:"
 
-#: ../plug-ins/common/colormap-remap.c:123
-msgid "_Swap Colors"
-msgstr "Bytt fargane"
+#: ../plug-ins/common/color-exchange.c:483
+msgid "G_reen threshold:"
+msgstr "_Grøn terskel:"
 
-#: ../plug-ins/common/colormap-remap.c:286
-#: ../plug-ins/common/colormap-remap.c:297
-#: ../plug-ins/common/colormap-remap.c:308
-msgid "Invalid remap array was passed to remap function"
-msgstr ""
+#: ../plug-ins/common/color-exchange.c:544
+msgid "B_lue threshold:"
+msgstr "_Blå terskel:"
 
-#: ../plug-ins/common/colormap-remap.c:332
-msgid "Rearranging the colormap"
-msgstr "Ordner fargekartet på nytt"
+#: ../plug-ins/common/color-exchange.c:572
+msgid "Lock _thresholds"
+msgstr "_Lås tersklane"
 
-#: ../plug-ins/common/colormap-remap.c:481
-msgid "Sort on Hue"
-msgstr "Sorter etter kulør"
-
-#: ../plug-ins/common/colormap-remap.c:485
-msgid "Sort on Saturation"
-msgstr "Sorter etter metning"
-
-#: ../plug-ins/common/colormap-remap.c:489
-msgid "Sort on Value"
-msgstr "Sorter etter verdi"
-
-#: ../plug-ins/common/colormap-remap.c:493
-msgid "Reverse Order"
-msgstr "Omvendt rekkefølgje"
-
-#: ../plug-ins/common/colormap-remap.c:497
-msgid "Reset Order"
-msgstr "Tilbakestill rekkefølgje"
-
-#: ../plug-ins/common/colormap-remap.c:596
-msgid "Rearrange Colormap"
-msgstr "Ordne fargekartet på nytt"
-
-#: ../plug-ins/common/colormap-remap.c:699
-msgid ""
-"Drag and drop colors to rearrange the colormap.  The numbers shown are the "
-"original indices.  Right-click for a menu with sort options."
-msgstr ""
-"Dra-og-slepp fargane for å omorganisere fargekartet. Tala som blir viste er "
-"den opphavlege ordninga. Høgreklikk for å få opp ein meny med ulike "
-"sorteringsmåtar."
-
-#: ../plug-ins/common/colortoalpha.c:94
+#: ../plug-ins/common/color-to-alpha.c:93
 msgid "Convert a specified color to transparency"
 msgstr "Omformar ein spesifisert farge til gjennomsikt"
 
-#: ../plug-ins/common/colortoalpha.c:101
+#: ../plug-ins/common/color-to-alpha.c:100
 msgid "Color to _Alpha..."
-msgstr "Farge til _alfa..."
+msgstr "Farge til _alfa …"
 
-#: ../plug-ins/common/colortoalpha.c:184
+#: ../plug-ins/common/color-to-alpha.c:183
 msgid "Removing color"
 msgstr "Fjerner farge"
 
-#: ../plug-ins/common/colortoalpha.c:377
+#: ../plug-ins/common/color-to-alpha.c:376
 msgid "Color to Alpha"
 msgstr "Farge til alfa"
 
-#. spinbutton 1
-#: ../plug-ins/common/colortoalpha.c:409 ../plug-ins/gfli/gfli.c:840
-#: ../plug-ins/gfli/gfli.c:910 ../plug-ins/rcm/rcm_dialog.c:299
-#: ../plug-ins/rcm/rcm_dialog.c:377
-msgid "From:"
-msgstr "Frå:"
-
-#: ../plug-ins/common/colortoalpha.c:413
+#: ../plug-ins/common/color-to-alpha.c:413
 msgid "Color to Alpha Color Picker"
 msgstr "Farge til alfa fargehentar"
 
-#: ../plug-ins/common/colortoalpha.c:428
+#: ../plug-ins/common/color-to-alpha.c:428
 msgid "to alpha"
 msgstr "til alfa"
 
-#: ../plug-ins/common/compose.c:189 ../plug-ins/common/decompose.c:170
-#: ../plug-ins/common/raw.c:1002
+#: ../plug-ins/common/colorify.c:101
+msgid "Replace all colors with shades of a specified color"
+msgstr "Bytt ut alle fargane med ulike toner av ein spesifisert farge"
+
+#: ../plug-ins/common/colorify.c:107
+msgid "Colorif_y..."
+msgstr "Farge_legg frå mal …"
+
+#: ../plug-ins/common/colorify.c:168
+msgid "Colorifying"
+msgstr "Fargelegg"
+
+#: ../plug-ins/common/colorify.c:254
+msgid "Colorify"
+msgstr "Fargelegg"
+
+#: ../plug-ins/common/colorify.c:288
+msgid "Custom color:"
+msgstr "Definer farge:"
+
+#: ../plug-ins/common/colorify.c:293
+msgid "Colorify Custom Color"
+msgstr "Fargelegg med brukardefinert farge"
+
+#: ../plug-ins/common/colormap-remap.c:96
+msgid "Rearrange the colormap"
+msgstr "Ordne fargekartet på nytt"
+
+#: ../plug-ins/common/colormap-remap.c:103
+msgid "R_earrange Colormap..."
+msgstr "_Ordne fargekartet på nytt …"
+
+#: ../plug-ins/common/colormap-remap.c:115
+msgid "Swap two colors in the colormap"
+msgstr "Bytt to fargar i fargekartet"
+
+#: ../plug-ins/common/colormap-remap.c:122
+msgid "_Swap Colors"
+msgstr "Bytt fargane"
+
+#: ../plug-ins/common/colormap-remap.c:285
+#: ../plug-ins/common/colormap-remap.c:296
+#: ../plug-ins/common/colormap-remap.c:307
+msgid "Invalid remap array was passed to remap function"
+msgstr "Ein ugyldig fargetabell blei overført til innfargingsfunksjonen"
+
+#: ../plug-ins/common/colormap-remap.c:331
+msgid "Rearranging the colormap"
+msgstr "Ordner fargekartet på nytt"
+
+#: ../plug-ins/common/colormap-remap.c:480
+msgid "Sort on Hue"
+msgstr "Sorter etter kulør"
+
+#: ../plug-ins/common/colormap-remap.c:484
+msgid "Sort on Saturation"
+msgstr "Sorter etter metning"
+
+#: ../plug-ins/common/colormap-remap.c:488
+msgid "Sort on Value"
+msgstr "Sorter etter verdi"
+
+#: ../plug-ins/common/colormap-remap.c:492
+msgid "Reverse Order"
+msgstr "Omvendt rekkefølgje"
+
+#: ../plug-ins/common/colormap-remap.c:496
+msgid "Reset Order"
+msgstr "Tilbakestill rekkefølgje"
+
+#: ../plug-ins/common/colormap-remap.c:595
+msgid "Rearrange Colormap"
+msgstr "Ordne fargekartet på nytt"
+
+#: ../plug-ins/common/colormap-remap.c:698
+msgid "Drag and drop colors to rearrange the colormap.  The numbers shown are the original indices.  Right-click for a menu with sort options."
+msgstr "Dra-og-slepp fargane for å omorganisere fargekartet. Tala som blir viste er den opphavlege ordninga. Høgreklikk for å få opp ein meny med ulike sorteringsmåtar."
+
+#: ../plug-ins/common/compose.c:188
+#: ../plug-ins/common/decompose.c:169
+#: ../plug-ins/common/file-raw.c:1022
 msgid "RGB"
 msgstr "RGB"
 
-#: ../plug-ins/common/compose.c:200 ../plug-ins/common/decompose.c:178
+#: ../plug-ins/common/compose.c:199
+#: ../plug-ins/common/decompose.c:177
 msgid "RGBA"
 msgstr "RGBA"
 
-#: ../plug-ins/common/compose.c:204 ../plug-ins/common/noisify.c:525
-#: ../plug-ins/common/noisify.c:540
+#: ../plug-ins/common/compose.c:203
+#: ../plug-ins/common/noise-rgb.c:525
+#: ../plug-ins/common/noise-rgb.c:540
 msgid "_Alpha:"
 msgstr "_Alfa:"
 
-#: ../plug-ins/common/compose.c:211 ../plug-ins/common/decompose.c:184
+#: ../plug-ins/common/compose.c:210
+#: ../plug-ins/common/decompose.c:183
 msgid "HSV"
 msgstr "HSV"
 
-#: ../plug-ins/common/compose.c:212 ../plug-ins/common/compose.c:220
+#: ../plug-ins/common/compose.c:211
+#: ../plug-ins/common/compose.c:219
 msgid "_Hue:"
 msgstr "_Kulør:"
 
-#: ../plug-ins/common/compose.c:213 ../plug-ins/common/compose.c:221
-#: ../plug-ins/common/scatter_hsv.c:421
+#: ../plug-ins/common/compose.c:212
+#: ../plug-ins/common/compose.c:220
+#: ../plug-ins/common/noise-hsv.c:423
 msgid "_Saturation:"
 msgstr "_Metning:"
 
-#: ../plug-ins/common/compose.c:214 ../plug-ins/common/scatter_hsv.c:433
+#: ../plug-ins/common/compose.c:213
+#: ../plug-ins/common/noise-hsv.c:435
 msgid "_Value:"
 msgstr "_Lysverdi:"
 
-#: ../plug-ins/common/compose.c:219 ../plug-ins/common/decompose.c:193
+#: ../plug-ins/common/compose.c:218
+#: ../plug-ins/common/decompose.c:192
 msgid "HSL"
 msgstr "HSL"
 
-#: ../plug-ins/common/compose.c:222
+#: ../plug-ins/common/compose.c:221
 msgid "_Lightness:"
 msgstr "_Lysverdi:"
 
-#: ../plug-ins/common/compose.c:227 ../plug-ins/common/decompose.c:202
+#: ../plug-ins/common/compose.c:226
+#: ../plug-ins/common/decompose.c:201
 msgid "CMY"
 msgstr "CMY"
 
-#: ../plug-ins/common/compose.c:228 ../plug-ins/common/compose.c:236
+#: ../plug-ins/common/compose.c:227
+#: ../plug-ins/common/compose.c:235
 msgid "_Cyan:"
 msgstr "_Cyanblå:"
 
-#: ../plug-ins/common/compose.c:229 ../plug-ins/common/compose.c:237
+#: ../plug-ins/common/compose.c:228
+#: ../plug-ins/common/compose.c:236
 msgid "_Magenta:"
 msgstr "_Magentaraud:"
 
-#: ../plug-ins/common/compose.c:230 ../plug-ins/common/compose.c:238
+#: ../plug-ins/common/compose.c:229
+#: ../plug-ins/common/compose.c:237
 msgid "_Yellow:"
 msgstr "_Gul:"
 
-#: ../plug-ins/common/compose.c:235 ../plug-ins/common/decompose.c:211
+#: ../plug-ins/common/compose.c:234
+#: ../plug-ins/common/decompose.c:210
 msgid "CMYK"
 msgstr "CMYK"
 
-#: ../plug-ins/common/compose.c:239
+#: ../plug-ins/common/compose.c:238
 msgid "_Black:"
 msgstr "_Svart:"
 
-#: ../plug-ins/common/compose.c:243 ../plug-ins/common/decompose.c:224
+#: ../plug-ins/common/compose.c:242
+#: ../plug-ins/common/decompose.c:223
 msgid "LAB"
 msgstr "LAB"
 
-#: ../plug-ins/common/compose.c:252
+#: ../plug-ins/common/compose.c:251
 msgid "_Luma y470:"
 msgstr "Luminans _y470:"
 
-#: ../plug-ins/common/compose.c:253
+#: ../plug-ins/common/compose.c:252
 msgid "_Blueness cb470:"
 msgstr "Blå_cb470:"
 
-#: ../plug-ins/common/compose.c:254
+#: ../plug-ins/common/compose.c:253
 msgid "_Redness cr470:"
 msgstr "Raud_cr470:"
 
-#: ../plug-ins/common/compose.c:260
+#: ../plug-ins/common/compose.c:259
 msgid "_Luma y709:"
 msgstr "Luminans_y709:"
 
-#: ../plug-ins/common/compose.c:261
+#: ../plug-ins/common/compose.c:260
 msgid "_Blueness cb709:"
 msgstr "Blå_cb709:"
 
-#: ../plug-ins/common/compose.c:262
+#: ../plug-ins/common/compose.c:261
 msgid "_Redness cr709:"
 msgstr "Raud_cr709:"
 
-#: ../plug-ins/common/compose.c:268
+#: ../plug-ins/common/compose.c:267
 msgid "_Luma y470f:"
 msgstr "Luminans_y470f:"
 
-#: ../plug-ins/common/compose.c:269
+#: ../plug-ins/common/compose.c:268
 msgid "_Blueness cb470f:"
 msgstr "Blå_cb470f:"
 
-#: ../plug-ins/common/compose.c:270
+#: ../plug-ins/common/compose.c:269
 msgid "_Redness cr470f:"
 msgstr "Raud_cr470f:"
 
-#: ../plug-ins/common/compose.c:276
+#: ../plug-ins/common/compose.c:275
 msgid "_Luma y709f:"
 msgstr "Luminans_y709f:"
 
-#: ../plug-ins/common/compose.c:277
+#: ../plug-ins/common/compose.c:276
 msgid "_Blueness cb709f:"
 msgstr "Blå_cb709f:"
 
-#: ../plug-ins/common/compose.c:278
+#: ../plug-ins/common/compose.c:277
 msgid "_Redness cr709f:"
 msgstr "Raud_cr709f:"
 
-#: ../plug-ins/common/compose.c:404
+#: ../plug-ins/common/compose.c:403
 msgid "Create an image using multiple gray images as color channels"
 msgstr "Lager eit bilete ved å bruke fleire bilete i gråtone som fargekanalar"
 
-#: ../plug-ins/common/compose.c:410
+#: ../plug-ins/common/compose.c:409
 msgid "C_ompose..."
-msgstr "_Sett saman..."
+msgstr "_Sett saman …"
 
-#: ../plug-ins/common/compose.c:434
+#: ../plug-ins/common/compose.c:433
 msgid "Recompose an image that was previously decomposed"
 msgstr "Set saman igjen eit tidlegare separert bilete"
 
-#: ../plug-ins/common/compose.c:442
+#: ../plug-ins/common/compose.c:441
 msgid "R_ecompose"
 msgstr "Sett saman på nytt"
 
-#: ../plug-ins/common/compose.c:488
-msgid ""
-"You can only run 'Recompose' if the active image was originally produced by "
-"'Decompose'."
-msgstr ""
-"Du kan bare bruke «Sett saman på nytt» når det aktive biletet er laga ved "
-"hjelp av «Separer»."
+#: ../plug-ins/common/compose.c:487
+msgid "You can only run 'Recompose' if the active image was originally produced by 'Decompose'."
+msgstr "Du kan bare bruke «Sett saman på nytt» når det aktive biletet er laga ved hjelp av «Separer»."
 
-#: ../plug-ins/common/compose.c:512
+#: ../plug-ins/common/compose.c:511
 msgid "Error scanning 'decompose-data' parasite: too few layers found"
 msgstr "Feil ved skanning av «separer-data» parasitt: Fann ikkje nok lag"
 
-#: ../plug-ins/common/compose.c:545
-#, c-format
+#: ../plug-ins/common/compose.c:544
 msgid "Could not get layers for image %d"
 msgstr "Fann ingen lag i biletet%d"
 
-#: ../plug-ins/common/compose.c:612
+#: ../plug-ins/common/compose.c:611
 msgid "Composing"
-msgstr "Set saman kanalane..."
+msgstr "Set saman kanalane"
 
-#: ../plug-ins/common/compose.c:697 ../plug-ins/common/compose.c:1731
+#: ../plug-ins/common/compose.c:696
+#: ../plug-ins/common/compose.c:1734
 msgid "At least one image is needed to compose"
 msgstr "Du må ha minst eitt bilete for å kunne komponera"
 
-#: ../plug-ins/common/compose.c:708 ../plug-ins/common/compose.c:721
-#, c-format
+#: ../plug-ins/common/compose.c:707
+#: ../plug-ins/common/compose.c:721
 msgid "Specified layer %d not found"
 msgstr "Fann ikkje laget%d"
 
-#: ../plug-ins/common/compose.c:728
+#: ../plug-ins/common/compose.c:729
 msgid "Drawables have different size"
 msgstr "Teikneområda har ulike storleikar"
 
-#: ../plug-ins/common/compose.c:753
+#: ../plug-ins/common/compose.c:754
 msgid "Images have different size"
 msgstr "Bileta har ulike storleikar"
 
-#: ../plug-ins/common/compose.c:770
+#: ../plug-ins/common/compose.c:772
 msgid "Error in getting layer IDs"
 msgstr "Feil: Fann ikkje ID for laget"
 
-#: ../plug-ins/common/compose.c:791
-#, c-format
+#: ../plug-ins/common/compose.c:795
 msgid "Image is not a gray image (bpp=%d)"
 msgstr "Biletet er ikkje eit gråskalabile (bpp=%d)"
 
-#: ../plug-ins/common/compose.c:818
+#: ../plug-ins/common/compose.c:823
 msgid "Unable to recompose, source layer not found"
 msgstr "Finn ikkje kjeldelaget. Kan difor ikkje setje saman vidare."
 
-#: ../plug-ins/common/compose.c:1484
+#: ../plug-ins/common/compose.c:1487
 msgid "Compose"
 msgstr "Set saman"
 
 #. Compose type combo
-#: ../plug-ins/common/compose.c:1511
+#: ../plug-ins/common/compose.c:1514
 msgid "Compose Channels"
 msgstr "Set saman kanalane"
 
-#: ../plug-ins/common/compose.c:1521 ../plug-ins/common/decompose.c:1515
+#: ../plug-ins/common/compose.c:1524
+#: ../plug-ins/common/decompose.c:1514
 msgid "Color _model:"
 msgstr "_Fargemodell:"
 
 #. Channel representation table
-#: ../plug-ins/common/compose.c:1553
+#: ../plug-ins/common/compose.c:1556
 msgid "Channel Representations"
 msgstr "Kanalrepresentasjon"
 
-#: ../plug-ins/common/compose.c:1616
+#: ../plug-ins/common/compose.c:1619
 msgid "Mask value"
 msgstr "Maskeverdi"
 
-#: ../plug-ins/common/compressor.c:158
-msgid "gzip archive"
-msgstr "gzip-arkiv"
+#: ../plug-ins/common/contrast-normalize.c:79
+msgid "Stretch brightness values to cover the full range"
+msgstr "Strekk lysverdien over heile området"
 
-#: ../plug-ins/common/compressor.c:179
-msgid "bzip archive"
-msgstr "bzip-arkiv"
+#: ../plug-ins/common/contrast-normalize.c:91
+#: ../plug-ins/common/edge-dog.c:358
+msgid "_Normalize"
+msgstr "_Normaliser"
 
-#: ../plug-ins/common/compressor.c:373
-msgid "No sensible file extension, saving as compressed XCF."
-msgstr "Ingen fornuftig filtype. Lagrar som komprimert XCF"
+#: ../plug-ins/common/contrast-normalize.c:125
+msgid "Normalizing"
+msgstr "Normaliserer"
 
-#: ../plug-ins/common/compressor.c:536
-msgid "No sensible file extension, attempting to load with file magic."
-msgstr "Ukjent filtype. Prøver å opna ved hjelp av «filmagi»."
+#: ../plug-ins/common/contrast-retinex.c:155
+msgid "Enhance contrast using the Retinex method"
+msgstr "Forbetrar kontrasten ved å bruke den såkalla retinex-metoden"
 
-#: ../plug-ins/common/convmatrix.c:64
+#: ../plug-ins/common/contrast-retinex.c:165
+msgid "Retine_x..."
+msgstr "Retine_x …"
+
+#: ../plug-ins/common/contrast-retinex.c:249
+msgid "Retinex"
+msgstr "Retinex"
+
+#: ../plug-ins/common/contrast-retinex.c:285
+msgid "Retinex Image Enhancement"
+msgstr "Retinex fargeforbetring"
+
+#: ../plug-ins/common/contrast-retinex.c:320
+msgid "Uniform"
+msgstr "Einsarta"
+
+#: ../plug-ins/common/contrast-retinex.c:321
+msgid "Low"
+msgstr "Lågt"
+
+#: ../plug-ins/common/contrast-retinex.c:322
+msgid "High"
+msgstr "Høgt"
+
+#: ../plug-ins/common/contrast-retinex.c:333
+msgid "_Level:"
+msgstr "_Nivå:"
+
+#: ../plug-ins/common/contrast-retinex.c:338
+msgid "_Scale:"
+msgstr "_Skalering:"
+
+#: ../plug-ins/common/contrast-retinex.c:353
+msgid "Scale _division:"
+msgstr "_Gjentakingar:"
+
+#: ../plug-ins/common/contrast-retinex.c:368
+msgid "Dy_namic:"
+msgstr "Dy_namisk:"
+
+#: ../plug-ins/common/contrast-retinex.c:641
+msgid "Retinex: filtering"
+msgstr "Retinex: filtrering"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:67
+msgid "Stretch image contrast to cover the maximum possible range"
+msgstr "Strekker biletkontrasten for å dekke størst mogleg område"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:80
+msgid "Stretch _HSV"
+msgstr "Strekk _HSV"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:115
+msgid "Auto-Stretching HSV"
+msgstr "Strekker HSV automatisk"
+
+#: ../plug-ins/common/contrast-stretch-hsv.c:191
+msgid "autostretch_hsv: cmap was NULL!  Quitting...\n"
+msgstr "autostrekking_hsv: cmap var NULL! Bryt av...\n"
+
+#: ../plug-ins/common/contrast-stretch.c:67
+msgid "Stretch contrast to cover the maximum possible range"
+msgstr "Strekker kontrasten for å dekke størst mogleg område"
+
+#: ../plug-ins/common/contrast-stretch.c:78
+msgid "_Stretch Contrast"
+msgstr "Strekk _kontrast"
+
+#: ../plug-ins/common/contrast-stretch.c:112
+msgid "Auto-stretching contrast"
+msgstr "Automatisk kontraststrekking"
+
+#: ../plug-ins/common/contrast-stretch.c:151
+msgid "c_astretch: cmap was NULL!  Quitting...\n"
+msgstr "c_astretch: cmap var NULL!  Bryt av...\n"
+
+#: ../plug-ins/common/convolution-matrix.c:63
 msgid "Gr_ey"
 msgstr "G_rå"
 
-#: ../plug-ins/common/convmatrix.c:65
+#: ../plug-ins/common/convolution-matrix.c:64
 msgid "Re_d"
 msgstr "Ra_ud"
 
-#: ../plug-ins/common/convmatrix.c:66 ../plug-ins/common/newsprint.c:353
+#: ../plug-ins/common/convolution-matrix.c:65
+#: ../plug-ins/common/newsprint.c:352
 msgid "_Green"
 msgstr "_Grøn"
 
-#: ../plug-ins/common/convmatrix.c:67 ../plug-ins/common/newsprint.c:361
+#: ../plug-ins/common/convolution-matrix.c:66
+#: ../plug-ins/common/newsprint.c:360
 msgid "_Blue"
 msgstr "_Blå"
 
-#: ../plug-ins/common/convmatrix.c:68
+#: ../plug-ins/common/convolution-matrix.c:67
 msgid "_Alpha"
 msgstr "_Alfa"
 
-#: ../plug-ins/common/convmatrix.c:73
+#: ../plug-ins/common/convolution-matrix.c:72
 msgid "E_xtend"
 msgstr "_Utvid"
 
-#: ../plug-ins/common/convmatrix.c:74 ../plug-ins/common/displace.c:472
-#: ../plug-ins/common/edge.c:708 ../plug-ins/common/fractaltrace.c:736
-#: ../plug-ins/common/ripple.c:563
+#: ../plug-ins/common/convolution-matrix.c:73
+#: ../plug-ins/common/displace.c:471
+#: ../plug-ins/common/edge.c:708
+#: ../plug-ins/common/fractal-trace.c:735
+#: ../plug-ins/common/ripple.c:581
 msgid "_Wrap"
 msgstr "_Linjebryting"
 
-#: ../plug-ins/common/convmatrix.c:75
+#: ../plug-ins/common/convolution-matrix.c:74
 msgid "Cro_p"
 msgstr "_Beskjer"
 
-#: ../plug-ins/common/convmatrix.c:201
+#: ../plug-ins/common/convolution-matrix.c:200
 msgid "Apply a generic 5x5 convolution matrix"
 msgstr "Legg til ei generisk 5x5 konvolusjonsmatrise"
 
-#: ../plug-ins/common/convmatrix.c:206
+#: ../plug-ins/common/convolution-matrix.c:205
 msgid "_Convolution Matrix..."
-msgstr "_Konturutjamningsmatrise..."
+msgstr "_Konturutjamningsmatrise …"
 
-#: ../plug-ins/common/convmatrix.c:241
+#: ../plug-ins/common/convolution-matrix.c:240
 msgid "Convolution does not work on layers smaller than 3x3 pixels."
-msgstr ""
-"Konturutjamningsmatrisa kan ikkje arbeida på biletlag med mindre enn 3x3 "
-"pikslar."
+msgstr "Konturutjamningsmatrisa kan ikkje arbeida på biletlag med mindre enn 3x3 pikslar."
 
-#: ../plug-ins/common/convmatrix.c:314
+#: ../plug-ins/common/convolution-matrix.c:313
 msgid "Applying convolution"
 msgstr "Legg til konturutjamning"
 
-#: ../plug-ins/common/convmatrix.c:906
+#: ../plug-ins/common/convolution-matrix.c:905
 msgid "Convolution Matrix"
 msgstr "Konturutjamningsmatrise"
 
-#: ../plug-ins/common/convmatrix.c:943
+#: ../plug-ins/common/convolution-matrix.c:943
 msgid "Matrix"
 msgstr "Matrise"
 
-#: ../plug-ins/common/convmatrix.c:981
+#: ../plug-ins/common/convolution-matrix.c:981
 msgid "D_ivisor:"
 msgstr "D_ivisor:"
 
-#: ../plug-ins/common/convmatrix.c:1007 ../plug-ins/common/depthmerge.c:767
-#: ../plug-ins/common/raw.c:1022
+#: ../plug-ins/common/convolution-matrix.c:1007
+#: ../plug-ins/common/depth-merge.c:768
+#: ../plug-ins/common/file-raw.c:1042
 msgid "O_ffset:"
 msgstr "_Forskyving:"
 
-#: ../plug-ins/common/convmatrix.c:1036
+#: ../plug-ins/common/convolution-matrix.c:1036
 msgid "N_ormalise"
 msgstr "N_ormaliser"
 
-#: ../plug-ins/common/convmatrix.c:1048
+#: ../plug-ins/common/convolution-matrix.c:1048
 msgid "A_lpha-weighting"
 msgstr "A_lfa-vekting"
 
-#: ../plug-ins/common/convmatrix.c:1067
+#: ../plug-ins/common/convolution-matrix.c:1067
 msgid "Border"
 msgstr "Kant"
 
-#: ../plug-ins/common/convmatrix.c:1094
+#: ../plug-ins/common/convolution-matrix.c:1094
 msgid "Channels"
 msgstr "Kanalar"
 
-#: ../plug-ins/common/csource.c:110
-msgid "C source code"
-msgstr "C Kjeldekode"
+#: ../plug-ins/common/crop-auto.c:84
+msgid "Remove empty borders from the image"
+msgstr "Fjernar tomme kantar frå laget"
 
-#: ../plug-ins/common/csource.c:637
-msgid "Save as C-Source"
-msgstr "Lagra som C-kjeldekode"
+#: ../plug-ins/common/crop-auto.c:89
+msgid "Autocrop Imag_e"
+msgstr "Auto_beskjer biletet"
 
-#: ../plug-ins/common/csource.c:668
-msgid "_Prefixed name:"
-msgstr "Namn med _prefiks:"
+#: ../plug-ins/common/crop-auto.c:98
+msgid "Remove empty borders from the layer"
+msgstr "Fjern tomme kantar frå laget"
 
-#: ../plug-ins/common/csource.c:677
-msgid "Co_mment:"
-msgstr "_Kommentar:"
+#: ../plug-ins/common/crop-auto.c:103
+msgid "Autocrop Lay_er"
+msgstr "Auto_beskjer laget"
 
-#. Use Comment
-#.
-#: ../plug-ins/common/csource.c:684
-msgid "_Save comment to file"
-msgstr "_Lagra kommentar i fil"
+#: ../plug-ins/common/crop-auto.c:150
+msgid "Cropping"
+msgstr "Beskjerer"
 
-#. GLib types
-#.
-#: ../plug-ins/common/csource.c:696
-msgid "_Use GLib types (guint8*)"
-msgstr "_Bruk GLib-type (guint8*)"
+#: ../plug-ins/common/crop-zealous.c:84
+msgid "Autocrop unused space from edges and middle"
+msgstr "Skjer bort ubrukte område frå kantane og inne i biletet"
 
-#. Use Macros
-#.
-#: ../plug-ins/common/csource.c:708
-msgid "Us_e macros instead of struct"
-msgstr "Bruk _makroar i staden for struktur"
+#: ../plug-ins/common/crop-zealous.c:89
+msgid "_Zealous Crop"
+msgstr "_Hard autobeskjering"
 
-#. Use RLE
-#.
-#: ../plug-ins/common/csource.c:720
-msgid "Use _1 byte Run-Length-Encoding"
-msgstr "Bruk _1 Byte Run-Length-Encoding"
+#: ../plug-ins/common/crop-zealous.c:137
+msgid "Zealous cropping"
+msgstr "_Hard autobeskjering"
 
-#. Alpha
-#.
-#: ../plug-ins/common/csource.c:732
-msgid "Sa_ve alpha channel (RGBA/RGB)"
-msgstr "Lagra _Alfakanal (RGBA/RGB)"
+#: ../plug-ins/common/crop-zealous.c:238
+msgid "Nothing to crop."
+msgstr "Ingenting å beskjere."
 
-#: ../plug-ins/common/csource.c:750
-msgid "Op_acity:"
-msgstr "_Dekkevne:"
-
-#: ../plug-ins/common/cubism.c:150
+#: ../plug-ins/common/cubism.c:149
 msgid "Convert the image into randomly rotated square blobs"
 msgstr "Omform biletet til tilfeldig roterte firkanta bitar"
 
-#: ../plug-ins/common/cubism.c:155
+#: ../plug-ins/common/cubism.c:154
 msgid "_Cubism..."
-msgstr "_Kubisme..."
+msgstr "_Kubisme …"
 
-#: ../plug-ins/common/cubism.c:268
+#: ../plug-ins/common/cubism.c:267
 msgid "Cubism"
 msgstr "Kubisme"
 
 #: ../plug-ins/common/cubism.c:304
 msgid "_Tile size:"
-msgstr "_Flisstorleik:"
+msgstr "Flis_storleik:"
 
 #: ../plug-ins/common/cubism.c:317
 msgid "T_ile saturation:"
@@ -2975,486 +2286,508 @@ msgstr "Bruk _bakgrunnsfargen"
 
 #: ../plug-ins/common/cubism.c:418
 msgid "Cubistic transformation"
-msgstr "Kubistisk omformimg..."
+msgstr "Kubistisk omformimg"
 
-#: ../plug-ins/common/curve_bend.c:520
+#: ../plug-ins/common/curve-bend.c:519
 msgid "Bend the image using two control curves"
 msgstr "Bøy biletet ved hjelp av to kontrollkurver"
 
-#: ../plug-ins/common/curve_bend.c:541
+#: ../plug-ins/common/curve-bend.c:540
 msgid "_Curve Bend..."
-msgstr "Bø_y..."
+msgstr "Bø_y …"
 
-#: ../plug-ins/common/curve_bend.c:675
+#: ../plug-ins/common/curve-bend.c:676
+#: ../plug-ins/common/edge-dog.c:175
 msgid "Can operate on layers only (but was called on channel or mask)."
 msgstr "Kan bare arbeida i lag. (Blei brukt på ein kanal eller ei maske)."
 
-#: ../plug-ins/common/curve_bend.c:683
+#: ../plug-ins/common/curve-bend.c:686
 msgid "Cannot operate on layers with masks."
 msgstr "Kan ikkje brukast på lag med masker."
 
-#. could not float the selection because selection rectangle
-#. * is completely empty return GIMP_PDB_EXECUTION_ERROR
-#.
-#: ../plug-ins/common/curve_bend.c:694
+#: ../plug-ins/common/curve-bend.c:698
 msgid "Cannot operate on empty selections."
 msgstr "Kan ikkje arbeide på ei tom markering."
 
+#: ../plug-ins/common/curve-bend.c:894
+msgid "Error while reading '%s': %s"
+msgstr "Feil ved lesing av «%s». Er fila skada?"
+
 #. Possibly retrieve data from a previous run
 #. The shell and main vbox
-#: ../plug-ins/common/curve_bend.c:1195 ../plug-ins/common/curve_bend.c:2915
+#: ../plug-ins/common/curve-bend.c:1216
+#: ../plug-ins/common/curve-bend.c:2937
 msgid "Curve Bend"
 msgstr "Bøying"
 
 #. Preview area, top of column
 #. preview
-#: ../plug-ins/common/curve_bend.c:1231
-#: ../plug-ins/gimpressionist/orientmap.c:592
-#: ../plug-ins/gimpressionist/sizemap.c:461
-#: ../plug-ins/print/print-page-layout.c:159
+#: ../plug-ins/common/curve-bend.c:1252
+#: ../plug-ins/gimpressionist/orientmap.c:591
+#: ../plug-ins/gimpressionist/sizemap.c:460
+#: ../plug-ins/print/print-page-layout.c:171
 msgid "Preview"
-msgstr "Forhåndsvis"
+msgstr "Førehandsvising"
 
 #. The preview button
-#: ../plug-ins/common/curve_bend.c:1260
+#: ../plug-ins/common/curve-bend.c:1281
 msgid "_Preview Once"
 msgstr "_Førehandsvis ei gong"
 
 #. The preview toggle
-#: ../plug-ins/common/curve_bend.c:1269
+#: ../plug-ins/common/curve-bend.c:1290
 msgid "Automatic pre_view"
 msgstr "A_utomatisk førehandsvising"
 
 #. Options area, bottom of column
 #. Options section
-#: ../plug-ins/common/curve_bend.c:1279 ../plug-ins/common/ripple.c:504
-#: ../plug-ins/gfig/gfig-dialog.c:1207
+#: ../plug-ins/common/curve-bend.c:1300
+#: ../plug-ins/common/ripple.c:519
+#: ../plug-ins/gfig/gfig-dialog.c:1206
 msgid "Options"
 msgstr "Innstillingar"
 
 #. Rotate spinbutton
-#: ../plug-ins/common/curve_bend.c:1293
+#: ../plug-ins/common/curve-bend.c:1314
 msgid "Rotat_e:"
 msgstr "_Roter:"
 
 #. The smoothing toggle
-#: ../plug-ins/common/curve_bend.c:1312
+#: ../plug-ins/common/curve-bend.c:1333
 msgid "Smoo_thing"
-msgstr "_Glatt ut"
+msgstr "Glatt _ut"
 
 #. The antialiasing toggle
-#: ../plug-ins/common/curve_bend.c:1322 ../plug-ins/common/gqbist.c:853
-#: ../plug-ins/common/mosaic.c:728 ../plug-ins/common/ripple.c:513
+#: ../plug-ins/common/curve-bend.c:1343
+#: ../plug-ins/common/mosaic.c:726
+#: ../plug-ins/common/qbist.c:852
+#: ../plug-ins/common/ripple.c:528
 msgid "_Antialiasing"
-msgstr "K_antutjamning"
+msgstr "Ka_ntutjamning"
 
 #. The work_on_copy toggle
-#: ../plug-ins/common/curve_bend.c:1332
+#: ../plug-ins/common/curve-bend.c:1353
 msgid "Work on cop_y"
-msgstr "Arbeid på ko_pi"
+msgstr "_Arbeid på kopi"
 
 #. The curves graph
-#: ../plug-ins/common/curve_bend.c:1342
+#: ../plug-ins/common/curve-bend.c:1363
 msgid "Modify Curves"
 msgstr "Arbeid på kurvene"
 
-#: ../plug-ins/common/curve_bend.c:1370
+#: ../plug-ins/common/curve-bend.c:1391
 msgid "Curve for Border"
-msgstr "_Kantkurver"
+msgstr "Kantkurver"
 
-#: ../plug-ins/common/curve_bend.c:1374
+#: ../plug-ins/common/curve-bend.c:1395
 msgid "_Upper"
 msgstr "_Øvre"
 
-#: ../plug-ins/common/curve_bend.c:1375
+#: ../plug-ins/common/curve-bend.c:1396
 msgid "_Lower"
 msgstr "_Nedre"
 
-#: ../plug-ins/common/curve_bend.c:1385
+#: ../plug-ins/common/curve-bend.c:1406
 msgid "Curve Type"
-msgstr "Kurve_type"
+msgstr "Kurvetype"
 
-#: ../plug-ins/common/curve_bend.c:1389
+#: ../plug-ins/common/curve-bend.c:1410
 msgid "Smoot_h"
-msgstr "Gla_tt"
+msgstr "_Glatt"
 
-#: ../plug-ins/common/curve_bend.c:1390
+#: ../plug-ins/common/curve-bend.c:1411
 msgid "_Free"
 msgstr "_Fri"
 
 #. The Copy button
-#: ../plug-ins/common/curve_bend.c:1405
+#: ../plug-ins/common/curve-bend.c:1426
 msgid "_Copy"
 msgstr "_Kopier"
 
-#: ../plug-ins/common/curve_bend.c:1410
+#: ../plug-ins/common/curve-bend.c:1431
 msgid "Copy the active curve to the other border"
 msgstr "Kopier den aktive kurva til den andre kanten"
 
 #. The CopyInv button
-#: ../plug-ins/common/curve_bend.c:1417
+#: ../plug-ins/common/curve-bend.c:1438
 msgid "_Mirror"
 msgstr "_Spegle"
 
-#: ../plug-ins/common/curve_bend.c:1422
+#: ../plug-ins/common/curve-bend.c:1443
 msgid "Mirror the active curve to the other border"
 msgstr "Speglar den aktive kurva til den andre kanten"
 
 #. The Swap button
-#: ../plug-ins/common/curve_bend.c:1430
+#: ../plug-ins/common/curve-bend.c:1451
 msgid "S_wap"
 msgstr "_Bytt"
 
-#: ../plug-ins/common/curve_bend.c:1435
+#: ../plug-ins/common/curve-bend.c:1456
 msgid "Swap the two curves"
 msgstr "Bytt kurvene"
 
-#: ../plug-ins/common/curve_bend.c:1447
+#: ../plug-ins/common/curve-bend.c:1468
 msgid "Reset the active curve"
 msgstr "Resett den aktive kurven"
 
-#: ../plug-ins/common/curve_bend.c:1464
+#: ../plug-ins/common/curve-bend.c:1485
 msgid "Load the curves from a file"
 msgstr "Hent kurvene frå ei fil"
 
-#: ../plug-ins/common/curve_bend.c:1476
+#: ../plug-ins/common/curve-bend.c:1497
 msgid "Save the curves to a file"
 msgstr "Lagra kurvene i ei fil"
 
-#: ../plug-ins/common/curve_bend.c:2013
+#: ../plug-ins/common/curve-bend.c:2035
 msgid "Load Curve Points from File"
 msgstr "Hent kurvepunkta frå ei fil"
 
-#: ../plug-ins/common/curve_bend.c:2048
+#: ../plug-ins/common/curve-bend.c:2070
 msgid "Save Curve Points to File"
 msgstr "Lagra kurvepunkta i ei fil"
 
-#: ../plug-ins/common/decompose.c:170 ../plug-ins/common/decompose.c:174
-#: ../plug-ins/common/decompose.c:178
+#: ../plug-ins/common/decompose.c:169
+#: ../plug-ins/common/decompose.c:173
+#: ../plug-ins/common/decompose.c:177
 msgid "red"
 msgstr "Raud"
 
-#: ../plug-ins/common/decompose.c:171 ../plug-ins/common/decompose.c:175
-#: ../plug-ins/common/decompose.c:179
+#: ../plug-ins/common/decompose.c:170
+#: ../plug-ins/common/decompose.c:174
+#: ../plug-ins/common/decompose.c:178
 msgid "green"
 msgstr "Grøn"
 
-#: ../plug-ins/common/decompose.c:172 ../plug-ins/common/decompose.c:176
-#: ../plug-ins/common/decompose.c:180
+#: ../plug-ins/common/decompose.c:171
+#: ../plug-ins/common/decompose.c:175
+#: ../plug-ins/common/decompose.c:179
 msgid "blue"
 msgstr "Blå"
 
-#: ../plug-ins/common/decompose.c:181 ../plug-ins/common/decompose.c:221
+#: ../plug-ins/common/decompose.c:180
+#: ../plug-ins/common/decompose.c:220
 msgid "alpha"
 msgstr "Alfa"
 
-#: ../plug-ins/common/decompose.c:184 ../plug-ins/common/decompose.c:188
+#: ../plug-ins/common/decompose.c:183
+#: ../plug-ins/common/decompose.c:187
 msgid "hue"
 msgstr "Kulør"
 
-#: ../plug-ins/common/decompose.c:185 ../plug-ins/common/decompose.c:189
+#: ../plug-ins/common/decompose.c:184
+#: ../plug-ins/common/decompose.c:188
 msgid "saturation"
 msgstr "Metning"
 
-#: ../plug-ins/common/decompose.c:186 ../plug-ins/common/decompose.c:190
+#: ../plug-ins/common/decompose.c:185
+#: ../plug-ins/common/decompose.c:189
 msgid "value"
 msgstr "Lysverdi"
 
-#: ../plug-ins/common/decompose.c:193 ../plug-ins/common/decompose.c:197
+#: ../plug-ins/common/decompose.c:192
+#: ../plug-ins/common/decompose.c:196
 msgid "hue_l"
 msgstr "kulør"
 
-#: ../plug-ins/common/decompose.c:194 ../plug-ins/common/decompose.c:198
+#: ../plug-ins/common/decompose.c:193
+#: ../plug-ins/common/decompose.c:197
 msgid "saturation_l"
 msgstr "metning"
 
-#: ../plug-ins/common/decompose.c:195 ../plug-ins/common/decompose.c:199
+#: ../plug-ins/common/decompose.c:194
+#: ../plug-ins/common/decompose.c:198
 msgid "lightness"
 msgstr "Lysheit"
 
-#: ../plug-ins/common/decompose.c:197
+#: ../plug-ins/common/decompose.c:196
 msgid "Hue (HSL)"
 msgstr "Kulør (HSL)"
 
-#: ../plug-ins/common/decompose.c:198
+#: ../plug-ins/common/decompose.c:197
 msgid "Saturation (HSL)"
 msgstr "Metning (HSL)"
 
-#: ../plug-ins/common/decompose.c:199
+#: ../plug-ins/common/decompose.c:198
 msgid "Lightness"
-msgstr "Legg ein slagskygge til det valde området (eller alfa)"
+msgstr "Lysverdi"
 
-#: ../plug-ins/common/decompose.c:202 ../plug-ins/common/decompose.c:206
+#: ../plug-ins/common/decompose.c:201
+#: ../plug-ins/common/decompose.c:205
 msgid "cyan"
 msgstr "Cyanblå"
 
-#: ../plug-ins/common/decompose.c:203 ../plug-ins/common/decompose.c:207
+#: ../plug-ins/common/decompose.c:202
+#: ../plug-ins/common/decompose.c:206
 msgid "magenta"
 msgstr "Magentaraud"
 
-#: ../plug-ins/common/decompose.c:204 ../plug-ins/common/decompose.c:208
+#: ../plug-ins/common/decompose.c:203
+#: ../plug-ins/common/decompose.c:207
 msgid "yellow"
 msgstr "Gul"
 
-#: ../plug-ins/common/decompose.c:206
+#: ../plug-ins/common/decompose.c:205
 msgid "Cyan"
 msgstr "Cyanblå"
 
-#: ../plug-ins/common/decompose.c:207
+#: ../plug-ins/common/decompose.c:206
 msgid "Magenta"
 msgstr "Magentaraud"
 
-#: ../plug-ins/common/decompose.c:208
+#: ../plug-ins/common/decompose.c:207
 msgid "Yellow"
 msgstr "Gul"
 
-#: ../plug-ins/common/decompose.c:211 ../plug-ins/common/decompose.c:216
+#: ../plug-ins/common/decompose.c:210
+#: ../plug-ins/common/decompose.c:215
 msgid "cyan-k"
 msgstr "cyan-k"
 
-#: ../plug-ins/common/decompose.c:212 ../plug-ins/common/decompose.c:217
+#: ../plug-ins/common/decompose.c:211
+#: ../plug-ins/common/decompose.c:216
 msgid "magenta-k"
 msgstr "magenta-k"
 
-#: ../plug-ins/common/decompose.c:213 ../plug-ins/common/decompose.c:218
+#: ../plug-ins/common/decompose.c:212
+#: ../plug-ins/common/decompose.c:217
 msgid "yellow-k"
 msgstr "gul-k"
 
-#: ../plug-ins/common/decompose.c:214
+#: ../plug-ins/common/decompose.c:213
 msgid "black"
 msgstr "Svart"
 
-#: ../plug-ins/common/decompose.c:216
+#: ../plug-ins/common/decompose.c:215
 msgid "Cyan_K"
 msgstr "Cyan_K"
 
-#: ../plug-ins/common/decompose.c:217
+#: ../plug-ins/common/decompose.c:216
 msgid "Magenta_K"
 msgstr "Magenta_K"
 
-#: ../plug-ins/common/decompose.c:218
+#: ../plug-ins/common/decompose.c:217
 msgid "Yellow_K"
 msgstr "Gul_K"
 
-#: ../plug-ins/common/decompose.c:221
+#: ../plug-ins/common/decompose.c:220
 msgid "Alpha"
-msgstr "Alpha"
+msgstr "Alfa"
 
-#: ../plug-ins/common/decompose.c:229
+#: ../plug-ins/common/decompose.c:228
 msgid "luma-y470"
 msgstr "luma-y470"
 
-#: ../plug-ins/common/decompose.c:230
+#: ../plug-ins/common/decompose.c:229
 msgid "blueness-cb470"
 msgstr "blå-cb470:"
 
-#: ../plug-ins/common/decompose.c:231
+#: ../plug-ins/common/decompose.c:230
 msgid "redness-cr470"
 msgstr "raud-cr470"
 
-#: ../plug-ins/common/decompose.c:233
+#: ../plug-ins/common/decompose.c:232
 msgid "luma-y709"
 msgstr "luma-y709"
 
-#: ../plug-ins/common/decompose.c:234
+#: ../plug-ins/common/decompose.c:233
 msgid "blueness-cb709"
 msgstr "blå-cb709"
 
-#: ../plug-ins/common/decompose.c:235
+#: ../plug-ins/common/decompose.c:234
 msgid "redness-cr709"
 msgstr "raud-cr709"
 
-#: ../plug-ins/common/decompose.c:237
+#: ../plug-ins/common/decompose.c:236
 msgid "luma-y470f"
 msgstr "luma-y470f"
 
-#: ../plug-ins/common/decompose.c:238
+#: ../plug-ins/common/decompose.c:237
 msgid "blueness-cb470f"
 msgstr "blå-cb470f"
 
-#: ../plug-ins/common/decompose.c:239
+#: ../plug-ins/common/decompose.c:238
 msgid "redness-cr470f"
 msgstr "raud-cr470f"
 
-#: ../plug-ins/common/decompose.c:241
+#: ../plug-ins/common/decompose.c:240
 msgid "luma-y709f"
 msgstr "luma-y709f"
 
-#: ../plug-ins/common/decompose.c:242
+#: ../plug-ins/common/decompose.c:241
 msgid "blueness-cb709f"
 msgstr "blå-cb709f"
 
-#: ../plug-ins/common/decompose.c:243
+#: ../plug-ins/common/decompose.c:242
 msgid "redness-cr709f"
 msgstr "raud-cr709f"
 
-#: ../plug-ins/common/decompose.c:312 ../plug-ins/common/decompose.c:326
+#: ../plug-ins/common/decompose.c:311
+#: ../plug-ins/common/decompose.c:325
 msgid "Decompose an image into separate colorspace components"
 msgstr "Bryt opp biletet i einskilde fargeromskomponentar"
 
-#: ../plug-ins/common/decompose.c:318 ../plug-ins/common/decompose.c:336
+#: ../plug-ins/common/decompose.c:317
+#: ../plug-ins/common/decompose.c:335
 msgid "_Decompose..."
-msgstr "_Separer..."
+msgstr "_Separer …"
 
-#: ../plug-ins/common/decompose.c:429
+#: ../plug-ins/common/decompose.c:428
 msgid "Decomposing"
 msgstr "Separer"
 
-#: ../plug-ins/common/decompose.c:1480
+#: ../plug-ins/common/decompose.c:1479
 msgid "Decompose"
 msgstr "Separer"
 
-#: ../plug-ins/common/decompose.c:1503
+#: ../plug-ins/common/decompose.c:1502
 msgid "Extract Channels"
 msgstr "Trekk ut kanalane"
 
-#: ../plug-ins/common/decompose.c:1550
+#: ../plug-ins/common/decompose.c:1549
 msgid "_Decompose to layers"
 msgstr "Separer til _lag"
 
-#: ../plug-ins/common/decompose.c:1561
+#: ../plug-ins/common/decompose.c:1560
 msgid "_Foreground as registration color"
 msgstr "Bruk _forgrunnen som registreringsfarge"
 
-#: ../plug-ins/common/decompose.c:1562
-msgid ""
-"Pixels in the foreground color will appear black in all output images.  This "
-"can be used for things like crop marks that have to show up on all channels."
-msgstr ""
-"Pikslar med forgrunnsfargen vil visast svarte i alle utgåande bilete. Dette "
-"kan brukast t.d. for å lage beskjeringsmerke synleg i alle kanalane. "
+#: ../plug-ins/common/decompose.c:1561
+msgid "Pixels in the foreground color will appear black in all output images.  This can be used for things like crop marks that have to show up on all channels."
+msgstr "Pikslar med forgrunnsfargen vil visast svarte i alle utgåande bilete. Dette kan brukast t.d. for å lage beskjeringsmerke synleg i alle kanalane. "
 
-#: ../plug-ins/common/deinterlace.c:91
+#: ../plug-ins/common/deinterlace.c:90
 msgid "Fix images where every other row is missing"
 msgstr "Reparer bilete der annakvar rad manglar. (Videobilete)."
 
-#: ../plug-ins/common/deinterlace.c:100
+#: ../plug-ins/common/deinterlace.c:99
 msgid "_Deinterlace..."
-msgstr "_Teikna annakvar linje..."
+msgstr "_Teikna annakvar linje …"
 
-#: ../plug-ins/common/deinterlace.c:157 ../plug-ins/common/deinterlace.c:325
+#: ../plug-ins/common/deinterlace.c:156
+#: ../plug-ins/common/deinterlace.c:324
 msgid "Deinterlace"
 msgstr "Teikna annakvar linje"
 
-#: ../plug-ins/common/deinterlace.c:357
+#: ../plug-ins/common/deinterlace.c:356
 msgid "Keep o_dd fields"
-msgstr "Behald o_dde felt"
+msgstr "Behald _odde felt"
 
-#: ../plug-ins/common/deinterlace.c:358
+#: ../plug-ins/common/deinterlace.c:357
 msgid "Keep _even fields"
 msgstr "Behald _like felt"
 
-#: ../plug-ins/common/depthmerge.c:183
+#: ../plug-ins/common/depth-merge.c:184
 msgid "Combine two images using depth maps (z-buffers)"
 msgstr "Kombiner to bilete med bruk av djupnekart (z-bufferar)"
 
-#: ../plug-ins/common/depthmerge.c:192
+#: ../plug-ins/common/depth-merge.c:193
 msgid "_Depth Merge..."
-msgstr "Djupfletting..."
+msgstr "_Djupfletting …"
 
-#: ../plug-ins/common/depthmerge.c:386
+#: ../plug-ins/common/depth-merge.c:387
 msgid "Depth-merging"
 msgstr "Djupfletter"
 
-#: ../plug-ins/common/depthmerge.c:643
+#: ../plug-ins/common/depth-merge.c:644
 msgid "Depth Merge"
 msgstr "Djupfletting"
 
-#: ../plug-ins/common/depthmerge.c:695
+#: ../plug-ins/common/depth-merge.c:696
 msgid "Source 1:"
 msgstr "Kjelde 1:"
 
-#: ../plug-ins/common/depthmerge.c:710 ../plug-ins/common/depthmerge.c:740
+#: ../plug-ins/common/depth-merge.c:711
+#: ../plug-ins/common/depth-merge.c:741
 msgid "Depth map:"
 msgstr "Djupnkart:"
 
-#: ../plug-ins/common/depthmerge.c:725
+#: ../plug-ins/common/depth-merge.c:726
 msgid "Source 2:"
 msgstr "Kjelde 2:"
 
-#: ../plug-ins/common/depthmerge.c:757
+#: ../plug-ins/common/depth-merge.c:758
 msgid "O_verlap:"
 msgstr "O_verlapping:"
 
-#: ../plug-ins/common/depthmerge.c:777
+#: ../plug-ins/common/depth-merge.c:778
 msgid "Sc_ale 1:"
 msgstr "Sk_alering 1:"
 
-#: ../plug-ins/common/depthmerge.c:787
+#: ../plug-ins/common/depth-merge.c:788
 msgid "Sca_le 2:"
 msgstr "Ska_lering 2:"
 
-#: ../plug-ins/common/desktop-link.c:82
-msgid "Desktop Link"
-msgstr "Skrivebordlenke"
-
-#: ../plug-ins/common/desktop-link.c:163
-#, c-format
-msgid "Error loading desktop file '%s': %s"
-msgstr "Feil ved opning av skrivebordsfila «%s»: %s"
-
-#: ../plug-ins/common/despeckle.c:147
+#: ../plug-ins/common/despeckle.c:141
 msgid "Remove speckle noise from the image"
 msgstr "Fjernar støvflekkar frå biletet"
 
-#: ../plug-ins/common/despeckle.c:153
+#: ../plug-ins/common/despeckle.c:147
 msgid "Des_peckle..."
-msgstr "_Støvfjernar..."
+msgstr "_Støvfjernar …"
 
-#: ../plug-ins/common/despeckle.c:394 ../plug-ins/common/despeckle.c:614
+#: ../plug-ins/common/despeckle.c:424
+#: ../plug-ins/common/despeckle.c:644
 msgid "Despeckle"
 msgstr "Støvfjerning"
 
-#: ../plug-ins/common/despeckle.c:423
+#: ../plug-ins/common/despeckle.c:453
 msgid "Median"
 msgstr "Median"
 
-#: ../plug-ins/common/despeckle.c:431
+#: ../plug-ins/common/despeckle.c:461
 msgid "_Adaptive"
-msgstr "Tilp_assa"
+msgstr "_Tilpassa"
 
-#: ../plug-ins/common/despeckle.c:441
+#: ../plug-ins/common/despeckle.c:471
 msgid "R_ecursive"
 msgstr "Re_kursiv"
 
-#: ../plug-ins/common/despeckle.c:462 ../plug-ins/common/neon.c:730
-#: ../plug-ins/common/nlfilt.c:1088 ../plug-ins/common/nova.c:366
-#: ../plug-ins/common/unsharp.c:678 ../plug-ins/common/whirlpinch.c:588
-#: ../plug-ins/gflare/gflare.c:2712 ../plug-ins/imagemap/imap_circle.c:278
+#: ../plug-ins/common/despeckle.c:492
+#: ../plug-ins/common/edge-neon.c:731
+#: ../plug-ins/common/nl-filter.c:1089
+#: ../plug-ins/common/nova.c:365
+#: ../plug-ins/common/unsharp-mask.c:865
+#: ../plug-ins/common/whirl-pinch.c:588
+#: ../plug-ins/gradient-flare/gradient-flare.c:2757
+#: ../plug-ins/imagemap/imap_circle.c:277
 msgid "_Radius:"
 msgstr "_Radius:"
 
-#: ../plug-ins/common/despeckle.c:478
+#: ../plug-ins/common/despeckle.c:508
 msgid "_Black level:"
 msgstr "_Svartnivå:"
 
-#: ../plug-ins/common/despeckle.c:494
+#: ../plug-ins/common/despeckle.c:524
 msgid "_White level:"
 msgstr "_Kvitnivå:"
 
-#: ../plug-ins/common/destripe.c:103
+#: ../plug-ins/common/destripe.c:102
 msgid "Remove vertical stripe artifacts from the image"
 msgstr "Fjerner loddrette støystriper frå biletet"
 
-#: ../plug-ins/common/destripe.c:109
+#: ../plug-ins/common/destripe.c:108
 msgid "Des_tripe..."
-msgstr "_Fjern striper..."
+msgstr "_Fjern striper …"
 
-#: ../plug-ins/common/destripe.c:272
+#: ../plug-ins/common/destripe.c:271
 msgid "Destriping"
-msgstr "Fjerner striper..."
+msgstr "Fjerner stripene"
 
-#: ../plug-ins/common/destripe.c:438
+#: ../plug-ins/common/destripe.c:437
 msgid "Destripe"
 msgstr "Fjerner striper"
 
-#: ../plug-ins/common/destripe.c:472 ../plug-ins/common/gtm.c:584
-#: ../plug-ins/common/papertile.c:302 ../plug-ins/common/postscript.c:3154
-#: ../plug-ins/common/postscript.c:3363 ../plug-ins/common/raw.c:1035
-#: ../plug-ins/common/smooth_palette.c:436 ../plug-ins/common/tile.c:431
-#: ../plug-ins/imagemap/imap_cmd_guides.c:165
-#: ../plug-ins/imagemap/imap_rectangle.c:403
-#: ../plug-ins/print/print-page-layout.c:252
+#: ../plug-ins/common/destripe.c:472
+#: ../plug-ins/common/file-html-table.c:594
+#: ../plug-ins/common/file-ps.c:3167
+#: ../plug-ins/common/file-ps.c:3376
+#: ../plug-ins/common/file-raw.c:1055
+#: ../plug-ins/common/smooth-palette.c:435
+#: ../plug-ins/common/tile-paper.c:301
+#: ../plug-ins/common/tile.c:430
+#: ../plug-ins/imagemap/imap_cmd_guides.c:164
+#: ../plug-ins/imagemap/imap_rectangle.c:402
+#: ../plug-ins/print/print-page-layout.c:264
 msgid "_Width:"
 msgstr "_Breidde:"
 
@@ -3462,188 +2795,238 @@ msgstr "_Breidde:"
 msgid "Create _histogram"
 msgstr "Lag _histogramm"
 
-#: ../plug-ins/common/dicom.c:141
-msgid "DICOM image"
-msgstr "DICOM-bilete"
-
-#: ../plug-ins/common/dicom.c:166
-msgid "Digital Imaging and Communications in Medicine image"
-msgstr "«Digital Imaging and Communications in Medicine» - bilete (DICOM)"
-
-#: ../plug-ins/common/dicom.c:322
-#, c-format
-msgid "'%s' is not a DICOM file."
-msgstr "«%s» er ikkje ei DICOM-fil"
-
-#: ../plug-ins/common/dicom.c:678 ../plug-ins/common/pcx.c:639
-#: ../plug-ins/common/pnm.c:949
-msgid "Cannot save images with alpha channel."
-msgstr "Kan ikkje lagra bilete som inneheld alfakanal"
-
-#: ../plug-ins/common/dicom.c:693 ../plug-ins/common/postscript.c:1187
-#: ../plug-ins/common/xwd.c:589 ../plug-ins/fits/fits.c:448
-#: ../plug-ins/xjt/xjt.c:1692
-msgid "Cannot operate on unknown image types."
-msgstr "Kan ikkje arbeida med ukjente biletformat."
-
-#: ../plug-ins/common/diffraction.c:167
+#: ../plug-ins/common/diffraction.c:166
 msgid "Generate diffraction patterns"
 msgstr "Lag diffraksjonsmønster"
 
-#: ../plug-ins/common/diffraction.c:172
+#: ../plug-ins/common/diffraction.c:171
 msgid "_Diffraction Patterns..."
-msgstr "_Diffraksjonsmønster..."
+msgstr "_Diffraksjonsmønster …"
 
-#: ../plug-ins/common/diffraction.c:330
+#: ../plug-ins/common/diffraction.c:329
 msgid "Creating diffraction pattern"
 msgstr "Lager diffraksjonsmønster"
 
-#: ../plug-ins/common/diffraction.c:434
+#: ../plug-ins/common/diffraction.c:433
 msgid "Diffraction Patterns"
 msgstr "Diffraksjonsmønster"
 
-#: ../plug-ins/common/diffraction.c:527
+#: ../plug-ins/common/diffraction.c:476
+#: ../plug-ins/map-object/map-object-ui.c:1388
+msgid "_Preview!"
+msgstr "_Førehandsvis!"
+
+#: ../plug-ins/common/diffraction.c:526
 msgid "Frequencies"
 msgstr "Frekvensar"
 
-#: ../plug-ins/common/diffraction.c:565
+#: ../plug-ins/common/diffraction.c:564
 msgid "Contours"
 msgstr "Kantar"
 
-#: ../plug-ins/common/diffraction.c:603
+#: ../plug-ins/common/diffraction.c:602
 msgid "Sharp Edges"
 msgstr "Skarpe kantar"
 
-#: ../plug-ins/common/diffraction.c:615 ../plug-ins/common/softglow.c:681
-#: ../plug-ins/flame/flame.c:1057
+#: ../plug-ins/common/diffraction.c:614
+#: ../plug-ins/common/softglow.c:682
+#: ../plug-ins/flame/flame.c:1080
 msgid "_Brightness:"
 msgstr "_Lysstyrke:"
 
-#: ../plug-ins/common/diffraction.c:624
+#: ../plug-ins/common/diffraction.c:623
 msgid "Sc_attering:"
 msgstr "S_preiing:"
 
-#: ../plug-ins/common/diffraction.c:633
+#: ../plug-ins/common/diffraction.c:632
 msgid "Po_larization:"
 msgstr "Po_larisasjon:"
 
-#: ../plug-ins/common/diffraction.c:641
+#: ../plug-ins/common/diffraction.c:640
 msgid "Other Options"
 msgstr "Andre innstillingar"
 
-#: ../plug-ins/common/displace.c:142
+#: ../plug-ins/common/displace.c:141
 msgid "_X displacement"
 msgstr "_X-forskyving"
 
-#: ../plug-ins/common/displace.c:142
+#: ../plug-ins/common/displace.c:141
 msgid "_Pinch"
 msgstr "_Knip"
 
-#: ../plug-ins/common/displace.c:143
+#: ../plug-ins/common/displace.c:142
 msgid "_Y displacement"
 msgstr "_Y-forskyving"
 
-#: ../plug-ins/common/displace.c:143
+#: ../plug-ins/common/displace.c:142
 msgid "_Whirl"
 msgstr "_Drei"
 
-#: ../plug-ins/common/displace.c:169
+#: ../plug-ins/common/displace.c:168
 msgid "Displace pixels as indicated by displacement maps"
 msgstr "Forskyv pikslane som indikert i forskyvingskartet"
 
-#: ../plug-ins/common/displace.c:179
+#: ../plug-ins/common/displace.c:178
 msgid "_Displace..."
-msgstr "_Forskyv..."
+msgstr "_Forskyv …"
 
-#: ../plug-ins/common/displace.c:290
+#: ../plug-ins/common/displace.c:289
 msgid "Displacing"
 msgstr "Forskyver"
 
-#: ../plug-ins/common/displace.c:326
+#: ../plug-ins/common/displace.c:325
 msgid "Displace"
 msgstr "Forskyv"
 
 #. X options
-#: ../plug-ins/common/displace.c:362
+#: ../plug-ins/common/displace.c:361
 msgid "_X displacement:"
 msgstr "_X-forskyving:"
 
 #. Y Options
-#: ../plug-ins/common/displace.c:409
+#: ../plug-ins/common/displace.c:408
 msgid "_Y displacement:"
 msgstr "_Y-forskyving:"
 
-#: ../plug-ins/common/displace.c:459
+#: ../plug-ins/common/displace.c:458
 msgid "Displacement Mode"
 msgstr "Forskyvingsmodus"
 
-#: ../plug-ins/common/displace.c:462
+#: ../plug-ins/common/displace.c:461
 msgid "_Cartesian"
 msgstr "_Kartesisk"
 
-#: ../plug-ins/common/displace.c:463
+#: ../plug-ins/common/displace.c:462
 msgid "_Polar"
 msgstr "_Polar"
 
-#: ../plug-ins/common/displace.c:468
+#: ../plug-ins/common/displace.c:467
 msgid "Edge Behavior"
 msgstr "Kanthandtering"
 
-#: ../plug-ins/common/displace.c:474 ../plug-ins/common/edge.c:721
-#: ../plug-ins/common/ripple.c:564 ../plug-ins/common/waves.c:280
+#: ../plug-ins/common/displace.c:473
+#: ../plug-ins/common/edge.c:721
+#: ../plug-ins/common/ripple.c:582
+#: ../plug-ins/common/waves.c:281
 msgid "_Smear"
-msgstr "_Smøre"
+msgstr "Smør _ut"
 
-#: ../plug-ins/common/displace.c:476 ../plug-ins/common/edge.c:734
-#: ../plug-ins/common/fractaltrace.c:740 ../plug-ins/common/newsprint.c:398
+#: ../plug-ins/common/displace.c:475
+#: ../plug-ins/common/edge.c:734
+#: ../plug-ins/common/fractal-trace.c:739
+#: ../plug-ins/common/newsprint.c:397
 msgid "_Black"
 msgstr "_Svart"
 
-#: ../plug-ins/common/dog.c:133
+#: ../plug-ins/common/edge-dog.c:132
 msgid "Edge detection with control of edge thickness"
 msgstr "Kantfinning med kontroll av kantbreidda"
 
-#: ../plug-ins/common/dog.c:140
+#: ../plug-ins/common/edge-dog.c:139
 msgid "_Difference of Gaussians..."
-msgstr "DoG kantfinning..."
+msgstr "_DoG kantfinning …"
 
-#: ../plug-ins/common/dog.c:231 ../plug-ins/common/dog.c:278
+#: ../plug-ins/common/edge-dog.c:242
+#: ../plug-ins/common/edge-dog.c:299
 msgid "DoG Edge Detect"
 msgstr "DoG kantfinning"
 
-#: ../plug-ins/common/dog.c:306
+#: ../plug-ins/common/edge-dog.c:328
 msgid "Smoothing Parameters"
 msgstr "Utglattingsparametra"
 
-#: ../plug-ins/common/dog.c:320
+#: ../plug-ins/common/edge-dog.c:342
 msgid "_Radius 1:"
 msgstr "_Radius 1:"
 
-#: ../plug-ins/common/dog.c:324
+#: ../plug-ins/common/edge-dog.c:346
 msgid "R_adius 2:"
 msgstr "R_adius 2:"
 
-#: ../plug-ins/common/dog.c:336 ../plug-ins/common/normalize.c:92
-msgid "_Normalize"
-msgstr "_Normaliser"
-
-#: ../plug-ins/common/dog.c:347 ../plug-ins/gimpressionist/paper.c:167
+#: ../plug-ins/common/edge-dog.c:369
+#: ../plug-ins/gimpressionist/paper.c:166
 msgid "_Invert"
 msgstr "_Inverter"
 
-#: ../plug-ins/common/edge.c:152
+#: ../plug-ins/common/edge-laplace.c:74
+msgid "High-resolution edge detection"
+msgstr "Høgoppløysings retningsbestemt kantfinning"
+
+#: ../plug-ins/common/edge-laplace.c:84
+msgid "_Laplace"
+msgstr "_Laplace"
+
+#: ../plug-ins/common/edge-laplace.c:242
+#: ../plug-ins/common/edge.c:672
+msgid "Laplace"
+msgstr "Laplace"
+
+#: ../plug-ins/common/edge-laplace.c:320
+msgid "Cleanup"
+msgstr "Rydd opp"
+
+#: ../plug-ins/common/edge-neon.c:133
+msgid "Simulate the glowing boundary of a neon light"
+msgstr "Simulerer den glødande koronaen til eit neonlys"
+
+#: ../plug-ins/common/edge-neon.c:138
+msgid "_Neon..."
+msgstr "_Neon …"
+
+#: ../plug-ins/common/edge-neon.c:210
+msgid "Neon"
+msgstr "Neon"
+
+#: ../plug-ins/common/edge-neon.c:694
+msgid "Neon Detection"
+msgstr "Neon kantfinnar"
+
+#: ../plug-ins/common/edge-neon.c:746
+#: ../plug-ins/common/unsharp-mask.c:878
+msgid "_Amount:"
+msgstr "_Mengde:"
+
+#: ../plug-ins/common/edge-sobel.c:107
+msgid "Specialized direction-dependent edge detection"
+msgstr "Spesialisert retningsbestemt kantfinning"
+
+#: ../plug-ins/common/edge-sobel.c:120
+msgid "_Sobel..."
+msgstr "_Sobelrelieff …"
+
+#: ../plug-ins/common/edge-sobel.c:230
+msgid "Sobel Edge Detection"
+msgstr "Sobel kantgjenkjenning"
+
+#: ../plug-ins/common/edge-sobel.c:259
+msgid "Sobel _horizontally"
+msgstr "Sobel _horisontalt"
+
+#: ../plug-ins/common/edge-sobel.c:271
+msgid "Sobel _vertically"
+msgstr "Sobel _vertikalt"
+
+#: ../plug-ins/common/edge-sobel.c:283
+msgid "_Keep sign of result (one direction only)"
+msgstr "_Behald resultatforteiknet (bare i ei retning)"
+
+#: ../plug-ins/common/edge-sobel.c:369
+msgid "Sobel edge detecting"
+msgstr "Sobel kantgjenkjenning"
+
+#: ../plug-ins/common/edge.c:151
 msgid "Several simple methods for detecting edges"
 msgstr "Fleire enkle metodar for å finne kantar"
 
-#: ../plug-ins/common/edge.c:157
+#: ../plug-ins/common/edge.c:156
 msgid "_Edge..."
-msgstr "_Kant..."
+msgstr "_Kant …"
 
-#: ../plug-ins/common/edge.c:229
+#: ../plug-ins/common/edge.c:228
 msgid "Edge detection"
 msgstr "Kantfinning"
 
-#: ../plug-ins/common/edge.c:633
+#: ../plug-ins/common/edge.c:632
 msgid "Edge Detection"
 msgstr "Finn kantane"
 
@@ -3655,7 +3038,8 @@ msgstr "Sobel"
 msgid "Prewitt compass"
 msgstr "Prewitt compass"
 
-#: ../plug-ins/common/edge.c:669 ../plug-ins/common/sinus.c:904
+#: ../plug-ins/common/edge.c:669
+#: ../plug-ins/common/sinus.c:903
 msgid "Gradient"
 msgstr "Fargeovergang"
 
@@ -3667,10 +3051,6 @@ msgstr "Roberts"
 msgid "Differential"
 msgstr "Differensiell"
 
-#: ../plug-ins/common/edge.c:672 ../plug-ins/common/laplace.c:243
-msgid "Laplace"
-msgstr "Laplace"
-
 #: ../plug-ins/common/edge.c:681
 msgid "_Algorithm:"
 msgstr "Algo_ritme:"
@@ -3685,9 +3065,10 @@ msgstr "Simulerer bilete utført i opphøgd stil (embosering)"
 
 #: ../plug-ins/common/emboss.c:130
 msgid "_Emboss..."
-msgstr "_Relieff..."
+msgstr "_Relieff …"
 
-#: ../plug-ins/common/emboss.c:384 ../plug-ins/common/emboss.c:446
+#: ../plug-ins/common/emboss.c:384
+#: ../plug-ins/common/emboss.c:446
 msgid "Emboss"
 msgstr "Relieff"
 
@@ -3697,7 +3078,7 @@ msgstr "Funksjon"
 
 #: ../plug-ins/common/emboss.c:478
 msgid "_Bumpmap"
-msgstr "_Avbilding"
+msgstr "Av_bilding"
 
 #: ../plug-ins/common/emboss.c:479
 msgid "_Emboss"
@@ -3705,31 +3086,36 @@ msgstr "_Relieff"
 
 #: ../plug-ins/common/emboss.c:511
 msgid "E_levation:"
-msgstr "E_levasjon:"
+msgstr "_Elevasjon:"
 
-#: ../plug-ins/common/engrave.c:101
+#: ../plug-ins/common/engrave.c:100
 msgid "Simulate an antique engraving"
 msgstr "Simulerer antikk gravering"
 
-#: ../plug-ins/common/engrave.c:106
+#: ../plug-ins/common/engrave.c:105
 msgid "En_grave..."
-msgstr "_Gravyr..."
+msgstr "_Gravyr …"
 
-#: ../plug-ins/common/engrave.c:180
+#: ../plug-ins/common/engrave.c:179
 msgid "Engraving"
-msgstr "Graverer..."
+msgstr "Graverer …"
 
-#: ../plug-ins/common/engrave.c:209
+#: ../plug-ins/common/engrave.c:208
 msgid "Engrave"
 msgstr "Gravyr"
 
-#: ../plug-ins/common/engrave.c:243 ../plug-ins/common/film.c:1003
-#: ../plug-ins/common/gtm.c:600 ../plug-ins/common/papertile.c:313
-#: ../plug-ins/common/postscript.c:3164 ../plug-ins/common/postscript.c:3372
-#: ../plug-ins/common/raw.c:1048 ../plug-ins/common/smooth_palette.c:441
-#: ../plug-ins/common/tile.c:435 ../plug-ins/imagemap/imap_cmd_guides.c:175
-#: ../plug-ins/imagemap/imap_rectangle.c:410
-#: ../plug-ins/print/print-page-layout.c:254
+#: ../plug-ins/common/engrave.c:243
+#: ../plug-ins/common/file-html-table.c:610
+#: ../plug-ins/common/file-ps.c:3177
+#: ../plug-ins/common/file-ps.c:3385
+#: ../plug-ins/common/file-raw.c:1068
+#: ../plug-ins/common/film.c:1002
+#: ../plug-ins/common/smooth-palette.c:440
+#: ../plug-ins/common/tile-paper.c:312
+#: ../plug-ins/common/tile.c:434
+#: ../plug-ins/imagemap/imap_cmd_guides.c:174
+#: ../plug-ins/imagemap/imap_rectangle.c:409
+#: ../plug-ins/print/print-page-layout.c:266
 msgid "_Height:"
 msgstr "_Høgde:"
 
@@ -3737,861 +3123,460 @@ msgstr "_Høgde:"
 msgid "_Limit line width"
 msgstr "_Avgrens linjebreidda"
 
-#: ../plug-ins/common/exchange.c:122
-msgid "Swap one color with another"
-msgstr "Byter ein farge med ein annan"
-
-#: ../plug-ins/common/exchange.c:128
-msgid "_Color Exchange..."
-msgstr "Bytt _farge..."
-
-#: ../plug-ins/common/exchange.c:213 ../plug-ins/common/exchange.c:287
-msgid "Color Exchange"
-msgstr "Byter ut ein farge med ein annan"
-
-#: ../plug-ins/common/exchange.c:309
-msgid "Middle-Click Inside Preview to Pick \"From Color\""
-msgstr ""
-"Klikk i førehandsvisinga med midtre musebrytaren for å velje «frå-farge»"
-
-#: ../plug-ins/common/exchange.c:347
-msgid "To Color"
-msgstr "Tilfarge"
-
-#: ../plug-ins/common/exchange.c:347
-msgid "From Color"
-msgstr "Fråfarge"
-
-#: ../plug-ins/common/exchange.c:365
-msgid "Color Exchange: To Color"
-msgstr "Fargeutveksling: tilfarge"
-
-#: ../plug-ins/common/exchange.c:366
-msgid "Color Exchange: From Color"
-msgstr "Fargeutveksling: fråfarge"
-
-#: ../plug-ins/common/exchange.c:424
-msgid "R_ed threshold:"
-msgstr "_Raud terskel:"
-
-#: ../plug-ins/common/exchange.c:484
-msgid "G_reen threshold:"
-msgstr "_Grøn terskel:"
-
-#: ../plug-ins/common/exchange.c:545
-msgid "B_lue threshold:"
-msgstr "_Blå terskel:"
-
-#: ../plug-ins/common/exchange.c:573
-msgid "Lock _thresholds"
-msgstr "_Lås tersklane"
-
-#: ../plug-ins/common/film.c:217
-msgid "Combine several images on a film strip"
-msgstr "Set saman fleire bilete til ei filmstripe"
-
-#: ../plug-ins/common/film.c:222
-msgid "_Filmstrip..."
-msgstr "_Filmstripe..."
-
-#: ../plug-ins/common/film.c:307
-msgid "Composing images"
-msgstr "Komponerer bileta"
-
-#: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:185
-#: ../plug-ins/helpbrowser/dialog.c:1144
-msgid "Untitled"
-msgstr "Utan namn"
-
-#: ../plug-ins/common/film.c:879
-msgid "Available images:"
-msgstr "Tilgjengelege bilete:"
-
-#: ../plug-ins/common/film.c:880
-msgid "On film:"
-msgstr "På filmen:"
-
-#. Create selection
-#: ../plug-ins/common/film.c:966 ../plug-ins/imagemap/imap_selection.c:367
-#: ../plug-ins/rcm/rcm_dialog.c:173 ../plug-ins/sel2path/sel2path.c:430
-msgid "Selection"
-msgstr "Utval"
-
-#. Film height/colour
-#: ../plug-ins/common/film.c:976 ../plug-ins/common/film.c:1248
-msgid "Filmstrip"
-msgstr "Filmstripe"
-
-#. Keep maximum image height
-#: ../plug-ins/common/film.c:985
-msgid "_Fit height to images"
-msgstr "Til_pass høgda etter bileta"
-
-#. Film color
-#: ../plug-ins/common/film.c:1021
-msgid "Select Film Color"
-msgstr "Vel filmfarge"
-
-#: ../plug-ins/common/film.c:1026 ../plug-ins/common/film.c:1076
-#: ../plug-ins/common/nova.c:353
-msgid "Co_lor:"
-msgstr "_Farge:"
-
-#. Film numbering: Startindex/Font/colour
-#: ../plug-ins/common/film.c:1035
-msgid "Numbering"
-msgstr "Nummerering"
-
-#: ../plug-ins/common/film.c:1053
-msgid "Start _index:"
-msgstr "_Starttal:"
-
-#: ../plug-ins/common/film.c:1066
-msgid "_Font:"
-msgstr "Skrift_type:"
-
-#. Numbering color
-#: ../plug-ins/common/film.c:1071
-msgid "Select Number Color"
-msgstr "Vel talfarge"
-
-#: ../plug-ins/common/film.c:1086
-msgid "At _bottom"
-msgstr "_Nederst"
-
-#: ../plug-ins/common/film.c:1087
-msgid "At _top"
-msgstr "_Øverst"
-
-#. ** The right frame keeps the image selection **
-#: ../plug-ins/common/film.c:1100
-msgid "Image Selection"
-msgstr "Biletutval"
-
-#: ../plug-ins/common/film.c:1128
-msgid "All Values are Fractions of the Strip Height"
-msgstr "Alle verdiane er relaterte til filmhøgda"
-
-#: ../plug-ins/common/film.c:1131
-msgid "Ad_vanced"
-msgstr "_Avansert"
-
-#: ../plug-ins/common/film.c:1150
-msgid "Image _height:"
-msgstr "Bilet_høgde:"
-
-#: ../plug-ins/common/film.c:1161
-msgid "Image spac_ing:"
-msgstr "Bilet_avstand:"
-
-#: ../plug-ins/common/film.c:1172
-msgid "_Hole offset:"
-msgstr "Hol_forskyving:"
-
-#: ../plug-ins/common/film.c:1183
-msgid "Ho_le width:"
-msgstr "Hol_breidde:"
-
-#: ../plug-ins/common/film.c:1194
-msgid "Hol_e height:"
-msgstr "Holh_øgde:"
-
-#: ../plug-ins/common/film.c:1205
-msgid "Hole sp_acing:"
-msgstr "Hola_vstand:"
-
-#: ../plug-ins/common/film.c:1216
-msgid "_Number height:"
-msgstr "_Talhøgde:"
-
-#: ../plug-ins/common/flarefx.c:188
-msgid "Add a lens flare effect"
-msgstr "Legg til ein linserefleks"
-
-#: ../plug-ins/common/flarefx.c:195
-msgid "Lens _Flare..."
-msgstr "_Linserefleks..."
-
-#: ../plug-ins/common/flarefx.c:270
-msgid "Render lens flare"
-msgstr "Lager linserefleksen"
-
-#: ../plug-ins/common/flarefx.c:306
-msgid "Lens Flare"
-msgstr "Linserefleks"
-
-#: ../plug-ins/common/flarefx.c:753
-msgid "Center of Flare Effect"
-msgstr "Sentrum for refleksen"
-
-#: ../plug-ins/common/flarefx.c:793 ../plug-ins/common/nova.c:484
-msgid "Show _position"
-msgstr "Vis posisjonen"
-
-#: ../plug-ins/common/fp.c:223
-msgid "Cyan:"
-msgstr "Cyanblå:"
-
-#: ../plug-ins/common/fp.c:224
-msgid "Yellow:"
-msgstr "Gul:"
-
-#: ../plug-ins/common/fp.c:225
-msgid "Magenta:"
-msgstr "Magentaraud:"
-
-#: ../plug-ins/common/fp.c:227
-msgid "Darker:"
-msgstr "Mørkare:"
-
-#: ../plug-ins/common/fp.c:228
-msgid "Lighter:"
-msgstr "Lysare:"
-
-#: ../plug-ins/common/fp.c:230
-msgid "More Sat:"
-msgstr "Meir metning.:"
-
-#: ../plug-ins/common/fp.c:231
-msgid "Less Sat:"
-msgstr "Mindre metning:"
-
-#: ../plug-ins/common/fp.c:233 ../plug-ins/common/fp.c:532
-msgid "Current:"
-msgstr "Nåverande:"
-
-#: ../plug-ins/common/fp.c:317
-msgid "Interactively modify the image colors"
-msgstr "Modifiser biletetfargane interaktivt"
-
-#: ../plug-ins/common/fp.c:322
-msgid "_Filter Pack..."
-msgstr "_Filterpakke..."
-
-#: ../plug-ins/common/fp.c:372
-msgid "FP can only be used on RGB images."
-msgstr "FP kan bare brukast på RGB-bilete."
-
-#: ../plug-ins/common/fp.c:382
-msgid "FP can only be run interactively."
-msgstr "FP kan bare nyttast interaktivt.."
-
-#: ../plug-ins/common/fp.c:400
-msgid "Applying filter pack"
-msgstr "Bruker filterpakka..."
-
-#: ../plug-ins/common/fp.c:524
-msgid "Original:"
-msgstr "Original:"
-
-#: ../plug-ins/common/fp.c:576
-msgid "Hue Variations"
-msgstr "Variasjonar i kulør:"
-
-#: ../plug-ins/common/fp.c:631
-msgid "Roughness"
-msgstr "Steglengde"
-
-#: ../plug-ins/common/fp.c:674 ../plug-ins/common/fp.c:1317
-msgid "Affected Range"
-msgstr "Påverka område"
-
-#: ../plug-ins/common/fp.c:678
-msgid "Sha_dows"
-msgstr "_Skyggar"
-
-#: ../plug-ins/common/fp.c:679
-msgid "_Midtones"
-msgstr "_Midttone"
-
-#: ../plug-ins/common/fp.c:680
-msgid "H_ighlights"
-msgstr "_Høglys"
-
-#: ../plug-ins/common/fp.c:694
-msgid "Windows"
-msgstr "Vindauge"
-
-#: ../plug-ins/common/fp.c:704 ../plug-ins/common/lic.c:672
-msgid "_Saturation"
-msgstr "_Metning"
-
-#: ../plug-ins/common/fp.c:712
-msgid "A_dvanced"
-msgstr "_Avansert"
-
-#: ../plug-ins/common/fp.c:732
-msgid "Value Variations"
-msgstr "Lysverdivariasjonar"
-
-#: ../plug-ins/common/fp.c:777
-msgid "Saturation Variations"
-msgstr "Metningsvariasjonar"
-
-#: ../plug-ins/common/fp.c:830
-msgid "Select Pixels By"
-msgstr "Vel piksel etter"
-
-#: ../plug-ins/common/fp.c:835
-msgid "H_ue"
-msgstr "_Kulør"
-
-#: ../plug-ins/common/fp.c:836
-msgid "Satu_ration"
-msgstr "_Metning"
-
-#: ../plug-ins/common/fp.c:837
-msgid "V_alue"
-msgstr "_Lysverdi"
-
-#: ../plug-ins/common/fp.c:863
-msgid "Show"
-msgstr "Vis"
-
-#: ../plug-ins/common/fp.c:868
-msgid "_Entire image"
-msgstr "_Heile biletet"
-
-#: ../plug-ins/common/fp.c:869
-msgid "Se_lection only"
-msgstr "_Bare utvalet"
-
-#: ../plug-ins/common/fp.c:870
-msgid "Selec_tion in context"
-msgstr "_Utval i biletet"
-
-#: ../plug-ins/common/fp.c:1201
-msgid "Filter Pack Simulation"
-msgstr "Filterpakke simulering"
-
-#: ../plug-ins/common/fp.c:1290
-msgid "Shadows:"
-msgstr "Skyggar:"
-
-#: ../plug-ins/common/fp.c:1291
-msgid "Midtones:"
-msgstr "Midttoner:"
-
-#: ../plug-ins/common/fp.c:1292
-msgid "Highlights:"
-msgstr "Høglys:"
-
-#: ../plug-ins/common/fp.c:1305
-msgid "Advanced Filter Pack Options"
-msgstr "Avanserte innstillingar for filterpakka"
-
-#. ****************** MISC OPTIONS **************************
-#: ../plug-ins/common/fp.c:1417
-msgid "Preview Size"
-msgstr "Storleik på førehandsvisinga "
-
-#: ../plug-ins/common/fractaltrace.c:116
-msgid "Transform image with the Mandelbrot Fractal"
-msgstr "Transformer biletet med Mandelbrotfraktalen"
-
-#: ../plug-ins/common/fractaltrace.c:121
-msgid "_Fractal Trace..."
-msgstr "_Fraktal..."
-
-#: ../plug-ins/common/fractaltrace.c:460 ../plug-ins/common/fractaltrace.c:691
-msgid "Fractal Trace"
-msgstr "Fraktal"
-
-#. Settings
-#: ../plug-ins/common/fractaltrace.c:731
-msgid "Outside Type"
-msgstr ""
-"Rammetype\n"
-"Bytter ein farge mot ein annan farge. Du kan bestemma grenseverdiane for kor "
-"mykje som skal forandrast."
-
-#: ../plug-ins/common/fractaltrace.c:742
-msgid "_White"
-msgstr "_Kvit"
-
-#: ../plug-ins/common/fractaltrace.c:749
-msgid "Mandelbrot Parameters"
-msgstr "Mandelbrotparameter"
-
-#: ../plug-ins/common/fractaltrace.c:760
-msgid "X_1:"
-msgstr "X_1:"
-
-#: ../plug-ins/common/fractaltrace.c:769
-msgid "X_2:"
-msgstr "X_2:"
-
-#: ../plug-ins/common/fractaltrace.c:778
-msgid "Y_1:"
-msgstr "Y_1:"
-
-#: ../plug-ins/common/fractaltrace.c:787
-msgid "Y_2:"
-msgstr "Y_2:"
-
-#: ../plug-ins/common/gauss.c:159
-msgid "Simplest, most commonly used way of blurring"
-msgstr "Den enklaste og mest brukte måten for sløring"
-
-#: ../plug-ins/common/gauss.c:172
-msgid "_Gaussian Blur..."
-msgstr "_Gaussisk sløring..."
-
-#: ../plug-ins/common/gauss.c:179 ../plug-ins/common/gauss.c:199
-#: ../plug-ins/common/gauss.c:219 ../plug-ins/common/gauss.c:239
-msgid "Apply a gaussian blur"
-msgstr "Legg til gaussisk sløring"
-
-#: ../plug-ins/common/gauss.c:428 ../plug-ins/common/gauss.c:476
-msgid "Gaussian Blur"
-msgstr "Gaussisk sløring"
-
-#. parameter settings
-#: ../plug-ins/common/gauss.c:506
-msgid "Blur Radius"
-msgstr "Radius"
-
-#: ../plug-ins/common/gauss.c:520 ../plug-ins/common/jigsaw.c:2456
-#: ../plug-ins/common/spread.c:384
-msgid "_Horizontal:"
-msgstr "_Horisontal:"
-
-#: ../plug-ins/common/gauss.c:524 ../plug-ins/common/jigsaw.c:2473
-#: ../plug-ins/common/spread.c:388
-msgid "_Vertical:"
-msgstr "_Vertikal:"
-
-#: ../plug-ins/common/gauss.c:547
-msgid "Blur Method"
-msgstr "Metode"
-
-#: ../plug-ins/common/gauss.c:551
-msgid "_IIR"
-msgstr "_IIR"
-
-#: ../plug-ins/common/gauss.c:552
-msgid "_RLE"
-msgstr "_RLE"
-
-#: ../plug-ins/common/gbr.c:152 ../plug-ins/common/gbr.c:173
+#: ../plug-ins/common/file-aa.c:97
+msgid "ASCII art"
+msgstr "ASCII-kunst"
+
+#. Create the actual window.
+#: ../plug-ins/common/file-aa.c:348
+msgid "Save as Text"
+msgstr "Lagra som tekst"
+
+#: ../plug-ins/common/file-aa.c:370
+msgid "_Format:"
+msgstr "_Format:"
+
+#: ../plug-ins/common/file-cel.c:110
+#: ../plug-ins/common/file-cel.c:128
+msgid "KISS CEL"
+msgstr "KISS CEL"
+
+#: ../plug-ins/common/file-cel.c:190
+msgid "Load KISS Palette"
+msgstr "Opnar KISS-paletten"
+
+#. max. rows allocated
+#. column, highest column ever used
+#. -1  assume fsel is not available (and not attached to any drawable)
+#. -1  assume there is no floating selection
+#: ../plug-ins/common/file-cel.c:316
+#: ../plug-ins/common/file-dicom.c:329
+#: ../plug-ins/common/file-gbr.c:365
+#: ../plug-ins/common/file-gif-load.c:360
+#: ../plug-ins/common/file-gih.c:648
+#: ../plug-ins/common/file-pat.c:334
+#: ../plug-ins/common/file-pcx.c:365
+#: ../plug-ins/common/file-pdf.c:595
+#: ../plug-ins/common/file-pix.c:347
+#: ../plug-ins/common/file-png.c:727
+#: ../plug-ins/common/file-pnm.c:498
+#: ../plug-ins/common/file-ps.c:1043
+#: ../plug-ins/common/file-raw.c:670
+#: ../plug-ins/common/file-sunras.c:485
+#: ../plug-ins/common/file-tga.c:446
+#: ../plug-ins/common/file-tiff-load.c:603
+#: ../plug-ins/common/file-wmf.c:993
+#: ../plug-ins/common/file-xbm.c:741
+#: ../plug-ins/common/file-xpm.c:351
+#: ../plug-ins/common/file-xwd.c:519
+#: ../plug-ins/file-bmp/bmp-read.c:158
+#: ../plug-ins/file-faxg3/faxg3.c:216
+#: ../plug-ins/file-fli/fli-gimp.c:501
+#: ../plug-ins/file-ico/ico-load.c:645
+#: ../plug-ins/file-jpeg/jpeg-load.c:114
+#: ../plug-ins/file-psd/psd-load.c:135
+#: ../plug-ins/file-sgi/sgi.c:330
+#: ../plug-ins/file-xjt/xjt.c:3343
+msgid "Opening '%s'"
+msgstr "Opnar «%s».."
+
+#: ../plug-ins/common/file-cel.c:353
+msgid "Can't create a new image"
+msgstr "Kan ikkje laga nytt bilete"
+
+#: ../plug-ins/common/file-cel.c:442
+msgid "Unsupported bit depth (%d)!"
+msgstr "Støtter ikkje denne fargedjupna (%d)!"
+
+#. init the progress meter
+#. And let's begin the progress
+#: ../plug-ins/common/file-cel.c:587
+#: ../plug-ins/common/file-gbr.c:639
+#: ../plug-ins/common/file-gif-save.c:768
+#: ../plug-ins/common/file-gih.c:1281
+#: ../plug-ins/common/file-html-table.c:255
+#: ../plug-ins/common/file-pat.c:466
+#: ../plug-ins/common/file-pcx.c:626
+#: ../plug-ins/common/file-pix.c:528
+#: ../plug-ins/common/file-png.c:1276
+#: ../plug-ins/common/file-pnm.c:981
+#: ../plug-ins/common/file-ps.c:1219
+#: ../plug-ins/common/file-sunras.c:567
+#: ../plug-ins/common/file-tga.c:1174
+#: ../plug-ins/common/file-tiff-save.c:693
+#: ../plug-ins/common/file-xbm.c:1039
+#: ../plug-ins/common/file-xpm.c:636
+#: ../plug-ins/common/file-xwd.c:618
+#: ../plug-ins/file-bmp/bmp-write.c:306
+#: ../plug-ins/file-fits/fits.c:480
+#: ../plug-ins/file-fli/fli-gimp.c:717
+#: ../plug-ins/file-ico/ico-save.c:1001
+#: ../plug-ins/file-jpeg/jpeg-save.c:286
+#: ../plug-ins/file-psd/psd-save.c:1642
+#: ../plug-ins/file-sgi/sgi.c:553
+#: ../plug-ins/file-xjt/xjt.c:1707
+msgid "Saving '%s'"
+msgstr "Lagrar «%s»"
+
+#: ../plug-ins/common/file-compressor.c:159
+msgid "gzip archive"
+msgstr "gzip-arkiv"
+
+#: ../plug-ins/common/file-compressor.c:180
+msgid "bzip archive"
+msgstr "bzip-arkiv"
+
+#: ../plug-ins/common/file-compressor.c:389
+msgid "No sensible file extension, saving as compressed XCF."
+msgstr "Ingen fornuftig filtype. Lagrar som komprimert XCF"
+
+#: ../plug-ins/common/file-compressor.c:571
+msgid "No sensible file extension, attempting to load with file magic."
+msgstr "Ukjent filtype. Prøver å opna ved hjelp av «filmagi»."
+
+#: ../plug-ins/common/file-csource.c:111
+msgid "C source code"
+msgstr "C Kjeldekode"
+
+#: ../plug-ins/common/file-csource.c:659
+msgid "Save as C-Source"
+msgstr "Lagra som C-kjeldekode"
+
+#: ../plug-ins/common/file-csource.c:690
+msgid "_Prefixed name:"
+msgstr "Namn med _prefiks:"
+
+#: ../plug-ins/common/file-csource.c:699
+msgid "Co_mment:"
+msgstr "_Kommentar:"
+
+#. Use Comment
+#.
+#: ../plug-ins/common/file-csource.c:706
+msgid "_Save comment to file"
+msgstr "_Lagra kommentar i fil"
+
+#. GLib types
+#.
+#: ../plug-ins/common/file-csource.c:718
+msgid "_Use GLib types (guint8*)"
+msgstr "_Bruk GLib-type (guint8*)"
+
+#. Use Macros
+#.
+#: ../plug-ins/common/file-csource.c:730
+msgid "Us_e macros instead of struct"
+msgstr "Bruk _makroar i staden for struktur"
+
+#. Use RLE
+#.
+#: ../plug-ins/common/file-csource.c:742
+msgid "Use _1 byte Run-Length-Encoding"
+msgstr "Bruk _1 Byte Run-Length-Encoding"
+
+#. Alpha
+#.
+#: ../plug-ins/common/file-csource.c:754
+msgid "Sa_ve alpha channel (RGBA/RGB)"
+msgstr "Lagra _Alfakanal (RGBA/RGB)"
+
+#: ../plug-ins/common/file-csource.c:772
+msgid "Op_acity:"
+msgstr "_Dekkevne:"
+
+#: ../plug-ins/common/file-desktop-link.c:82
+msgid "Desktop Link"
+msgstr "Skrivebordlenke"
+
+#: ../plug-ins/common/file-desktop-link.c:174
+msgid "Error loading desktop file '%s': %s"
+msgstr "Feil ved opning av skrivebordsfila «%s»: %s"
+
+#: ../plug-ins/common/file-dicom.c:145
+msgid "DICOM image"
+msgstr "DICOM-bilete"
+
+#: ../plug-ins/common/file-dicom.c:170
+msgid "Digital Imaging and Communications in Medicine image"
+msgstr "«Digital Imaging and Communications in Medicine» - bilete (DICOM)"
+
+#: ../plug-ins/common/file-dicom.c:351
+msgid "'%s' is not a DICOM file."
+msgstr "«%s» er ikkje ei DICOM-fil"
+
+#: ../plug-ins/common/file-dicom.c:768
+#: ../plug-ins/common/file-pcx.c:658
+#: ../plug-ins/common/file-pnm.c:966
+msgid "Cannot save images with alpha channel."
+msgstr "Kan ikkje lagra bilete som inneheld alfakanal"
+
+#: ../plug-ins/common/file-dicom.c:783
+#: ../plug-ins/common/file-ps.c:1204
+#: ../plug-ins/common/file-xwd.c:603
+#: ../plug-ins/file-fits/fits.c:465
+#: ../plug-ins/file-xjt/xjt.c:1702
+msgid "Cannot operate on unknown image types."
+msgstr "Kan ikkje arbeida med ukjente biletformat."
+
+#: ../plug-ins/common/file-gbr.c:153
+#: ../plug-ins/common/file-gbr.c:174
 msgid "GIMP brush"
 msgstr "GIMP-pensel"
 
-#: ../plug-ins/common/gbr.c:388 ../plug-ins/common/gbr.c:400
+#: ../plug-ins/common/file-gbr.c:400
+#: ../plug-ins/common/file-gbr.c:412
 msgid "Unsupported brush format"
 msgstr "Ugyldig penselformat"
 
-#: ../plug-ins/common/gbr.c:411
-#, c-format
+#: ../plug-ins/common/file-gbr.c:424
 msgid "Error in GIMP brush file '%s'"
 msgstr "Feil i GIMP-penselfila «%s»"
 
-#: ../plug-ins/common/gbr.c:419
-#, c-format
+#: ../plug-ins/common/file-gbr.c:432
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "Ugyldig UTF-8-kode i penselfila «%s»"
 
-#: ../plug-ins/common/gbr.c:425 ../plug-ins/common/gih.c:499
-#: ../plug-ins/common/gih.c:1158 ../plug-ins/gflare/gflare.c:3017
+#: ../plug-ins/common/file-gbr.c:438
+#: ../plug-ins/common/file-gih.c:491
+#: ../plug-ins/common/file-gih.c:1155
+#: ../plug-ins/gradient-flare/gradient-flare.c:3062
 msgid "Unnamed"
 msgstr "Utan namn"
 
-#: ../plug-ins/common/gbr.c:607
+#: ../plug-ins/common/file-gbr.c:624
 msgid "GIMP brushes are either GRAYSCALE or RGBA"
-msgstr "GIMP-pensel er anten GRÅSKALA eller RGBA"
+msgstr "GIMP-penslane må vere anten RGBA eller GRÅSKALA med kvit bakgrunn"
 
-#: ../plug-ins/common/gbr.c:704
+#: ../plug-ins/common/file-gbr.c:731
 msgid "Save as Brush"
 msgstr "Lagra som pensel"
 
 #. attach labels
-#: ../plug-ins/common/gbr.c:731 ../plug-ins/common/grid.c:790
+#: ../plug-ins/common/file-gbr.c:758
+#: ../plug-ins/common/grid.c:789
 msgid "Spacing:"
-msgstr "Mellomrom:"
+msgstr "Avstand:"
 
-#: ../plug-ins/common/gbr.c:742 ../plug-ins/common/gih.c:910
-#: ../plug-ins/common/pat.c:541 ../plug-ins/gimpressionist/presets.c:664
+#: ../plug-ins/common/file-gbr.c:769
+#: ../plug-ins/common/file-gih.c:906
+#: ../plug-ins/common/file-pat.c:555
+#: ../plug-ins/gimpressionist/presets.c:665
 msgid "Description:"
-msgstr "Beskriving:"
+msgstr "Penselnamn:"
 
-#: ../plug-ins/common/gee.c:99 ../plug-ins/common/gee_zoom.c:121
-msgid "A big hello from the GIMP team!"
-msgstr "Eit stort hallo frå GIMP-teamet!"
-
-#: ../plug-ins/common/gee.c:104 ../plug-ins/common/gee.c:160
-msgid "Gee Slime"
-msgstr "GEE-SLIME"
-
-#: ../plug-ins/common/gee.c:166 ../plug-ins/common/gee_zoom.c:192
-msgid "Thank You for Choosing GIMP"
-msgstr "Takk for at du valde GIMP"
-
-#: ../plug-ins/common/gee.c:173
-#, c-format
-msgid "A less obsolete creation by %s"
-msgstr "Ein forelda kreasjon av %s"
-
-#: ../plug-ins/common/gee_zoom.c:126 ../plug-ins/common/gee_zoom.c:186
-msgid "Gee Zoom"
-msgstr "GEE-ZOOM"
-
-#: ../plug-ins/common/gee_zoom.c:200
-#, c-format
-msgid "An obsolete creation by %s"
-msgstr "Ein forelda kreasjon av %s"
-
-#: ../plug-ins/common/gif-load.c:141 ../plug-ins/common/gif-save.c:410
+#: ../plug-ins/common/file-gif-load.c:148
+#: ../plug-ins/common/file-gif-save.c:168
 msgid "GIF image"
 msgstr "GIF-bilete"
 
-#: ../plug-ins/common/gif-load.c:325
+#: ../plug-ins/common/file-gif-load.c:372
 msgid "This is not a GIF file"
 msgstr "Dette er ikkje ei GIF-fil"
 
-#: ../plug-ins/common/gif-load.c:364
+#: ../plug-ins/common/file-gif-load.c:411
 msgid "Non-square pixels.  Image might look squashed."
 msgstr "Pikslane er ikkje kvadratiske. Biletet kan sjå noe pressa ut."
 
-#: ../plug-ins/common/gif-load.c:881
-#, c-format
+#: ../plug-ins/common/file-gif-load.c:929
 msgid "Background (%d%s)"
 msgstr "Bakgrunn (%d%s)"
 
-#: ../plug-ins/common/gif-load.c:904
-#, c-format
+#: ../plug-ins/common/file-gif-load.c:952
 msgid "Opening '%s' (frame %d)"
 msgstr "Opnar «%s» (ramme %d)"
 
-#: ../plug-ins/common/gif-load.c:933 ../plug-ins/common/iwarp.c:791
-#: ../plug-ins/common/iwarp.c:826
-#, c-format
+#: ../plug-ins/common/file-gif-load.c:981
+#: ../plug-ins/common/iwarp.c:793
+#: ../plug-ins/common/iwarp.c:828
 msgid "Frame %d"
 msgstr "Ramme %d"
 
-#: ../plug-ins/common/gif-load.c:935
-#, c-format
+#: ../plug-ins/common/file-gif-load.c:983
 msgid "Frame %d (%d%s)"
 msgstr "Ramme %d (%d%s)"
 
-#: ../plug-ins/common/gif-load.c:966
-#, c-format
-msgid ""
-"GIF: Undocumented GIF composite type %d is not handled.  Animation might not "
-"play or re-save perfectly."
-msgstr ""
-"GIF: Udokumentert samansettingstype %d kan ikkje handterast. Det kan hende "
-"animasjonen ikkje spelar skikkeleg eller ikkje kan lagrast på nytt."
+#: ../plug-ins/common/file-gif-load.c:1014
+msgid "GIF: Undocumented GIF composite type %d is not handled.  Animation might not play or re-save perfectly."
+msgstr "GIF: Udokumentert samansettingstype %d kan ikkje handterast. Det kan hende animasjonen ikkje spelar skikkeleg eller ikkje kan lagrast på nytt."
 
-#: ../plug-ins/common/gif-save.c:683
+#: ../plug-ins/common/file-gif-save.c:447
 msgid "Couldn't simply reduce colors further. Saving as opaque."
 msgstr "Kunne ikkje redusera fargane meir. Blir lagra som ugjennomsiktig."
 
-#: ../plug-ins/common/gif-save.c:899
-msgid ""
-"The GIF format only supports comments in 7bit ASCII encoding. No comment is "
-"saved."
-msgstr ""
-"GIF-formatet godtar bare kommentarar i 7-bit ASCII-kode. Ingen kommentarer "
-"er lagra."
+#: ../plug-ins/common/file-gif-save.c:562
+msgid "Unable to save '%s'.  The GIF file format does not support images that are more than %d pixels wide or tall."
+msgstr "Kan ikkje lagra «%s». GIF-formatet støtter ikkje bilete som er meir enn %d pikslar høge eller breie."
 
-#: ../plug-ins/common/gif-save.c:958
-msgid ""
-"Cannot save RGB color images. Convert to indexed color or grayscale first."
-msgstr ""
-"Kan ikkje lagra RGB-bilete. Konverter biletet til indeksert eller gråskala."
+#: ../plug-ins/common/file-gif-save.c:673
+msgid "The GIF format only supports comments in 7bit ASCII encoding. No comment is saved."
+msgstr "GIF-formatet godtar bare kommentarar i 7-bit ASCII-kode. Ingen kommentarer er lagra."
 
-#: ../plug-ins/common/gif-save.c:1135
+#: ../plug-ins/common/file-gif-save.c:732
+msgid "Cannot save RGB color images. Convert to indexed color or grayscale first."
+msgstr "Kan ikkje lagra RGB-bilete. Konverter biletet til indeksert eller gråskala."
+
+#: ../plug-ins/common/file-gif-save.c:910
 msgid "Delay inserted to prevent evil CPU-sucking animation."
 msgstr "Er lagt inn forsinkingar for å unngå unødig prosessorbelastning."
 
-#: ../plug-ins/common/gif-save.c:1175
-msgid ""
-"The image you are trying to save as a GIF contains layers which extend "
-"beyond the actual borders of the image."
-msgstr ""
-"Biletet du ønskjer å lagra som GIF inneheld lag som går utanfor kanten av "
-"biletet."
+#: ../plug-ins/common/file-gif-save.c:950
+msgid "The image you are trying to save as a GIF contains layers which extend beyond the actual borders of the image."
+msgstr "Biletet du ønskjer å lagra som GIF inneheld lag som går utanfor kanten av biletet."
 
-#: ../plug-ins/common/gif-save.c:1192
-msgid ""
-"The GIF file format does not allow this.  You may choose whether to crop all "
-"of the layers to the image borders, or cancel this save."
-msgstr ""
-"Filformatet tillet ikkje dette. Du må anten beskjere alle laga til "
-"biletstorleiken eller la vere å lagre dette biletet som GIF."
+#: ../plug-ins/common/file-gif-save.c:967
+msgid "The GIF file format does not allow this.  You may choose whether to crop all of the layers to the image borders, or cancel this save."
+msgstr "Filformatet tillet ikkje dette. Du må anten beskjere alle laga til biletstorleiken eller la vere å lagre dette biletet som GIF."
 
-#: ../plug-ins/common/gif-save.c:1233
+#: ../plug-ins/common/file-gif-save.c:1008
 msgid "Save as GIF"
 msgstr "Lagra som GIF-fil"
 
 #. regular gif parameter settings
-#: ../plug-ins/common/gif-save.c:1255
+#: ../plug-ins/common/file-gif-save.c:1030
 msgid "GIF Options"
 msgstr "GIF-innstillingar"
 
-#: ../plug-ins/common/gif-save.c:1261
+#: ../plug-ins/common/file-gif-save.c:1036
 msgid "I_nterlace"
-msgstr "I_nterlace"
+msgstr "Li_njevis"
 
-#: ../plug-ins/common/gif-save.c:1277
+#: ../plug-ins/common/file-gif-save.c:1052
 msgid "_GIF comment:"
 msgstr "_GIF-kommentar:"
 
 #. additional animated gif parameter settings
-#: ../plug-ins/common/gif-save.c:1334
+#: ../plug-ins/common/file-gif-save.c:1110
 msgid "Animated GIF Options"
 msgstr "Innstillingar for GIF-animasjon"
 
-#: ../plug-ins/common/gif-save.c:1340
+#: ../plug-ins/common/file-gif-save.c:1116
 msgid "_Loop forever"
 msgstr "_Uendeleg sløyfe"
 
-#: ../plug-ins/common/gif-save.c:1353
+#: ../plug-ins/common/file-gif-save.c:1129
 msgid "_Delay between frames where unspecified:"
 msgstr "_Pause mellom rammene når uspesifisert:"
 
-#: ../plug-ins/common/gif-save.c:1368 ../plug-ins/common/mng.c:1539
+#: ../plug-ins/common/file-gif-save.c:1144
+#: ../plug-ins/common/file-mng.c:1473
 msgid "milliseconds"
 msgstr "Millisekund"
 
-#: ../plug-ins/common/gif-save.c:1378
+#: ../plug-ins/common/file-gif-save.c:1154
 msgid "_Frame disposal where unspecified:"
 msgstr "_Rammeovergang når uspesifisert:"
 
-#: ../plug-ins/common/gif-save.c:1382
+#: ../plug-ins/common/file-gif-save.c:1158
 msgid "I don't care"
 msgstr "Det er meg likegyldig"
 
-#: ../plug-ins/common/gif-save.c:1384
+#: ../plug-ins/common/file-gif-save.c:1160
 msgid "Cumulative layers (combine)"
 msgstr "Kumulative lag (kombinere)"
 
-#: ../plug-ins/common/gif-save.c:1386
+#: ../plug-ins/common/file-gif-save.c:1162
 msgid "One frame per layer (replace)"
 msgstr "Ei ramme per lag (erstatt)"
 
 #. The "Always use default values" toggles
-#: ../plug-ins/common/gif-save.c:1402
+#: ../plug-ins/common/file-gif-save.c:1178
 msgid "_Use delay entered above for all frames"
 msgstr "_Bruk forsinkinga ovanfor for alle rammene"
 
-#: ../plug-ins/common/gif-save.c:1412
+#: ../plug-ins/common/file-gif-save.c:1188
 msgid "U_se disposal entered above for all frames"
 msgstr "_Bruk rammeovergangen ovanfor for alle rammene"
 
-#: ../plug-ins/common/gif-save.c:2565
+#: ../plug-ins/common/file-gif-save.c:2341
 msgid "Error writing output file."
 msgstr "Feil ved skriving av utdata."
 
-#: ../plug-ins/common/gif-save.c:2635
-#, c-format
+#: ../plug-ins/common/file-gif-save.c:2411
 msgid "The default comment is limited to %d characters."
 msgstr "Standardkommentar er avgrensa til %d teikn."
 
-#: ../plug-ins/common/gih.c:207 ../plug-ins/common/gih.c:228
+#: ../plug-ins/common/file-gih.c:208
+#: ../plug-ins/common/file-gih.c:229
 msgid "GIMP brush (animated)"
 msgstr "GIMP-mønsterpensel"
 
-#: ../plug-ins/common/gih.c:321
-#, c-format
-msgid "Layer %s doesn't have an alpha channel, skipped"
-msgstr "Laget %s har ingen alfakanal. Ignorert."
-
-#: ../plug-ins/common/gih.c:492
+#: ../plug-ins/common/file-gih.c:484
 msgid "Error in GIMP brush pipe file."
 msgstr "Feil i GIMPs mønsterpenselfil."
 
-#: ../plug-ins/common/gih.c:558
+#: ../plug-ins/common/file-gih.c:550
 msgid "GIMP brush file appears to be corrupted."
 msgstr "Det ser ut til at GIMP si penselfil er øydelagt."
 
-#: ../plug-ins/common/gih.c:703
+#: ../plug-ins/common/file-gih.c:699
 msgid "Couldn't load one brush in the pipe, giving up."
 msgstr "Kunne ikkje lasta ein mønsterpensel. Gir opp."
 
-#: ../plug-ins/common/gih.c:866
+#: ../plug-ins/common/file-gih.c:862
 msgid "Save as Brush Pipe"
 msgstr "Lagra som mønsterpensel"
 
-#: ../plug-ins/common/gih.c:896
+#: ../plug-ins/common/file-gih.c:892
 msgid "Spacing (percent):"
 msgstr "Avstand (prosent):"
 
-#: ../plug-ins/common/gih.c:963
+#: ../plug-ins/common/file-gih.c:959
 msgid "Pixels"
 msgstr "Pikslar"
 
-#: ../plug-ins/common/gih.c:968
+#: ../plug-ins/common/file-gih.c:964
 msgid "Cell size:"
 msgstr "Cellestorleik:"
 
-#: ../plug-ins/common/gih.c:980
+#: ../plug-ins/common/file-gih.c:976
 msgid "Number of cells:"
 msgstr "Talet på celler:"
 
-#: ../plug-ins/common/gih.c:1005
+#: ../plug-ins/common/file-gih.c:1001
 msgid " Rows of "
 msgstr " Rad(er) med"
 
-#: ../plug-ins/common/gih.c:1017
+#: ../plug-ins/common/file-gih.c:1013
 msgid " Columns on each layer"
 msgstr " kolonne(r) i kvart lag"
 
-#: ../plug-ins/common/gih.c:1021
+#: ../plug-ins/common/file-gih.c:1017
 msgid " (Width Mismatch!) "
 msgstr " (Breidda passar ikkje!) "
 
-#: ../plug-ins/common/gih.c:1025
+#: ../plug-ins/common/file-gih.c:1021
 msgid " (Height Mismatch!) "
 msgstr " (Høgda passar ikkje!) "
 
-#: ../plug-ins/common/gih.c:1030
+#: ../plug-ins/common/file-gih.c:1026
 msgid "Display as:"
 msgstr "Vis som:"
 
-#: ../plug-ins/common/gih.c:1039
+#: ../plug-ins/common/file-gih.c:1035
 msgid "Dimension:"
 msgstr "Dimensjon:"
 
-#: ../plug-ins/common/gih.c:1114
+#: ../plug-ins/common/file-gih.c:1110
 msgid "Ranks:"
 msgstr "Rangering:"
 
-#: ../plug-ins/common/glasstile.c:124
-msgid "Simulate distortion caused by square glass tiles"
-msgstr "Biletet blir sett gjennom firkanta glasfliser"
+#: ../plug-ins/common/file-header.c:76
+msgid "C source code header"
+msgstr "Header for kjeldeteksten i C-kode"
 
-#: ../plug-ins/common/glasstile.c:130
-msgid "_Glass Tile..."
-msgstr "_Glasfliser..."
-
-#: ../plug-ins/common/glasstile.c:210 ../plug-ins/common/glasstile.c:250
-msgid "Glass Tile"
-msgstr "Glasfliser"
-
-#: ../plug-ins/common/glasstile.c:288
-msgid "Tile _width:"
-msgstr "Flis_breidde:"
-
-#: ../plug-ins/common/glasstile.c:302 ../plug-ins/common/mosaic.c:661
-msgid "Tile _height:"
-msgstr "Flis_høgde:"
-
-#: ../plug-ins/common/gqbist.c:402
-msgid "Generate a huge variety of abstract patterns"
-msgstr "Genererer mange ulike former for abstrakte mønster"
-
-#: ../plug-ins/common/gqbist.c:410
-msgid "_Qbist..."
-msgstr "_Qbist ..."
-
-#: ../plug-ins/common/gqbist.c:511
-msgid "Qbist"
-msgstr "Qbist"
-
-#: ../plug-ins/common/gqbist.c:707
-msgid "Load QBE File"
-msgstr "Opna QBE-fil"
-
-#: ../plug-ins/common/gqbist.c:749
-msgid "Save as QBE File"
-msgstr "Lagra som QBE-fil"
-
-#: ../plug-ins/common/gqbist.c:803
-msgid "G-Qbist"
-msgstr "G-Qbist"
-
-#: ../plug-ins/common/gradmap.c:84
-msgid "Recolor the image using colors from the active gradient"
-msgstr "Farg biletet på nytt med fargar frå den gjeldande fargeovergangen"
-
-#: ../plug-ins/common/gradmap.c:97
-msgid "_Gradient Map"
-msgstr "_Fargelegg frå fargeovergang"
-
-#: ../plug-ins/common/gradmap.c:106
-msgid "Recolor the image using colors from the active palette"
-msgstr "Farg biletet på nytt med fargar frå den gjeldande paletten"
-
-#: ../plug-ins/common/gradmap.c:119
-msgid "_Palette Map"
-msgstr "Fargelegg frå _palett"
-
-#: ../plug-ins/common/gradmap.c:162
-msgid "Gradient Map"
-msgstr "Fargeovergangskart"
-
-#: ../plug-ins/common/gradmap.c:167
-msgid "Palette Map"
-msgstr "Palettkart"
-
-#: ../plug-ins/common/grid.c:142
-msgid "Draw a grid on the image"
-msgstr "Teikan eit rutemønster på biletet"
-
-#: ../plug-ins/common/grid.c:148
-msgid "_Grid..."
-msgstr "_Rutenett..."
-
-#: ../plug-ins/common/grid.c:241
-msgid "Drawing grid"
-msgstr "Teiknar nettet"
-
-#: ../plug-ins/common/grid.c:635 ../plug-ins/gfig/gfig-dialog.c:1355
-#: ../plug-ins/imagemap/imap_menu.c:209
-msgid "Grid"
-msgstr "Rutenett"
-
-#. attach labels
-#: ../plug-ins/common/grid.c:717
-msgid "Horizontal"
-msgstr "Horisontal"
-
-#: ../plug-ins/common/grid.c:719
-msgid "Vertical"
-msgstr "Vertikal"
-
-#: ../plug-ins/common/grid.c:721
-msgid "Intersection"
-msgstr "Krysspunkt"
-
-#. Width and Height
-#: ../plug-ins/common/grid.c:724 ../plug-ins/common/svg.c:777
-#: ../plug-ins/common/wmf.c:562
-msgid "Width:"
-msgstr "Breidde:"
-
-#. attach labels
-#: ../plug-ins/common/grid.c:857
-msgid "Offset:"
-msgstr "Forskyving:"
-
-#. attach color selectors
-#: ../plug-ins/common/grid.c:896
-msgid "Horizontal Color"
-msgstr "Horisontal farge"
-
-#: ../plug-ins/common/grid.c:914
-msgid "Vertical Color"
-msgstr "Vertikal farge"
-
-#: ../plug-ins/common/grid.c:932
-msgid "Intersection Color"
-msgstr "Farge på krysspunktet"
-
-#: ../plug-ins/common/gtm.c:155
+#: ../plug-ins/common/file-html-table.c:155
 msgid "HTML table"
 msgstr "HTML-tabell"
 
-#: ../plug-ins/common/gtm.c:398
+#: ../plug-ins/common/file-html-table.c:408
 msgid "Save as HTML table"
 msgstr "Lagra som HTML-tabell"
 
-#: ../plug-ins/common/gtm.c:425
+#: ../plug-ins/common/file-html-table.c:435
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: ../plug-ins/common/gtm.c:436
+#: ../plug-ins/common/file-html-table.c:446
 msgid ""
 "You are about to create a huge\n"
 "HTML file which will most likely\n"
@@ -4602,302 +3587,1851 @@ msgstr ""
 "nettlesaren din."
 
 #. HTML Page Options
-#: ../plug-ins/common/gtm.c:445
+#: ../plug-ins/common/file-html-table.c:455
 msgid "HTML Page Options"
 msgstr "HTML sideinnstillingar"
 
-#: ../plug-ins/common/gtm.c:452
+#: ../plug-ins/common/file-html-table.c:462
 msgid "_Generate full HTML document"
 msgstr "Lag eit fullstendig HTML-dokument"
 
-#: ../plug-ins/common/gtm.c:458
-msgid ""
-"If checked GTM will output a full HTML document with , , etc. "
-"tags instead of just the table html."
-msgstr ""
-"Dersom denne er aktivert, vil GIMP lage eit fullstendig HTML-dokument med "
-",  osv. i staden for bare ein tabell."
+#: ../plug-ins/common/file-html-table.c:468
+msgid "If checked GTM will output a full HTML document with , , etc. tags instead of just the table html."
+msgstr "Dersom denne er aktivert, vil GIMP lage eit fullstendig HTML-dokument med ,  osv. i staden for bare ein tabell."
 
 #. HTML Table Creation Options
-#: ../plug-ins/common/gtm.c:471
+#: ../plug-ins/common/file-html-table.c:481
 msgid "Table Creation Options"
 msgstr "Innstillingar for å lage tabellen"
 
-#: ../plug-ins/common/gtm.c:479
+#: ../plug-ins/common/file-html-table.c:489
 msgid "_Use cellspan"
 msgstr "Bruk «_Cellspan»"
 
-#: ../plug-ins/common/gtm.c:485
-msgid ""
-"If checked GTM will replace any rectangular sections of identically colored "
-"blocks with one large cell with ROWSPAN and COLSPAN values."
-msgstr ""
-"Dersom denne er aktivert, vil GTM bytte ut alle rektangulære markeringar "
-"eller einsfarga blokker med verdiar for ROWSPAN og COLSPAN."
+#: ../plug-ins/common/file-html-table.c:495
+msgid "If checked GTM will replace any rectangular sections of identically colored blocks with one large cell with ROWSPAN and COLSPAN values."
+msgstr "Dersom denne er aktivert, vil GTM bytte ut alle rektangulære markeringar eller einsfarga blokker med verdiar for ROWSPAN og COLSPAN."
 
-#: ../plug-ins/common/gtm.c:494
+#: ../plug-ins/common/file-html-table.c:504
 msgid "Co_mpress TD tags"
 msgstr "Ko_mprimer TD- tags"
 
-#: ../plug-ins/common/gtm.c:500
-msgid ""
-"Checking this tag will cause GTM to leave no whitespace between the TD tags "
-"and the cellcontent.  This is only necessary for pixel level positioning "
-"control."
-msgstr ""
-"Dette valet gjer at GTM ikkje set inn blankteikn mellom TD-taggane og "
-"celleinnhaldet. Dette er bare nødvendig for kontroll på pikselnivå."
+#: ../plug-ins/common/file-html-table.c:510
+msgid "Checking this tag will cause GTM to leave no whitespace between the TD tags and the cellcontent.  This is only necessary for pixel level positioning control."
+msgstr "Dette valet gjer at GTM ikkje set inn blankteikn mellom TD-taggane og celleinnhaldet. Dette er bare nødvendig for kontroll på pikselnivå."
 
-#: ../plug-ins/common/gtm.c:510
+#: ../plug-ins/common/file-html-table.c:520
 msgid "C_aption"
 msgstr "_Bilettekst"
 
-#: ../plug-ins/common/gtm.c:516
+#: ../plug-ins/common/file-html-table.c:526
 msgid "Check if you would like to have the table captioned."
 msgstr "Klikk her dersom du vil ha ein bilettekst for tabellen."
 
-#: ../plug-ins/common/gtm.c:531
+#: ../plug-ins/common/file-html-table.c:541
 msgid "The text for the table caption."
 msgstr "Biletteksten for tabellen."
 
-#: ../plug-ins/common/gtm.c:544
+#: ../plug-ins/common/file-html-table.c:554
 msgid "C_ell content:"
 msgstr "C_elleinnhald:"
 
-#: ../plug-ins/common/gtm.c:548
+#: ../plug-ins/common/file-html-table.c:558
 msgid "The text to go into each cell."
 msgstr "Teksten som skal inn i kvar celle."
 
 #. HTML Table Options
-#: ../plug-ins/common/gtm.c:558
+#: ../plug-ins/common/file-html-table.c:568
 msgid "Table Options"
 msgstr "Tabellinnstillingar"
 
-#: ../plug-ins/common/gtm.c:569
+#: ../plug-ins/common/file-html-table.c:579
 msgid "_Border:"
 msgstr "_Kant:"
 
-#: ../plug-ins/common/gtm.c:573
+#: ../plug-ins/common/file-html-table.c:583
 msgid "The number of pixels in the table border."
 msgstr "Talet på pikslar i tabellkanten."
 
-#: ../plug-ins/common/gtm.c:588
+#: ../plug-ins/common/file-html-table.c:598
 msgid "The width for each table cell.  Can be a number or a percent."
 msgstr "Breidda for kvar tabellcelle. Kan vere eit fast tal eller i prosent."
 
-#: ../plug-ins/common/gtm.c:604
+#: ../plug-ins/common/file-html-table.c:614
 msgid "The height for each table cell.  Can be a number or a percent."
 msgstr "Høgda for kvar tabellcelle. Kan vere eit fast tal eller i prosent."
 
-#: ../plug-ins/common/gtm.c:615
+#: ../plug-ins/common/file-html-table.c:625
 msgid "Cell-_padding:"
 msgstr "Celle_utfylling:"
 
-#: ../plug-ins/common/gtm.c:619
+#: ../plug-ins/common/file-html-table.c:629
 msgid "The amount of cellpadding."
 msgstr "Graden av celleutfylling."
 
-#: ../plug-ins/common/gtm.c:628
+#: ../plug-ins/common/file-html-table.c:638
 msgid "Cell-_spacing:"
 msgstr "Celle_avstand:"
 
-#: ../plug-ins/common/gtm.c:632
+#: ../plug-ins/common/file-html-table.c:642
 msgid "The amount of cellspacing."
 msgstr "Avstand mellom cellene."
 
-#: ../plug-ins/common/guillotine.c:69
+#. Inform the user that we couldn't losslessly save the
+#. * transparency & just use the full palette
+#: ../plug-ins/common/file-mng.c:497
+#: ../plug-ins/common/file-png.c:1759
+msgid "Couldn't losslessly save transparency, saving opacity instead."
+msgstr "Kunne ikkje lagra gjennomsikt utan tap. Lagra dekkevne i staden."
+
+#: ../plug-ins/common/file-mng.c:1253
+msgid "Save as MNG"
+msgstr "Lagra som MNG"
+
+#: ../plug-ins/common/file-mng.c:1273
+msgid "MNG Options"
+msgstr "MNG-innstillingar"
+
+#: ../plug-ins/common/file-mng.c:1279
+msgid "Interlace"
+msgstr "Flett saman"
+
+#: ../plug-ins/common/file-mng.c:1291
+msgid "Save background color"
+msgstr "Lagra bakgrunnsfarge"
+
+#: ../plug-ins/common/file-mng.c:1302
+msgid "Save gamma"
+msgstr "Lagra gamma"
+
+#: ../plug-ins/common/file-mng.c:1312
+msgid "Save resolution"
+msgstr "Lagra oppløysing"
+
+#: ../plug-ins/common/file-mng.c:1323
+msgid "Save creation time"
+msgstr "Lagra tid for oppretting"
+
+#: ../plug-ins/common/file-mng.c:1342
+msgid "PNG"
+msgstr "PNG"
+
+#: ../plug-ins/common/file-mng.c:1343
+msgid "JNG"
+msgstr "JNG"
+
+#: ../plug-ins/common/file-mng.c:1346
+msgid "PNG + delta PNG"
+msgstr "PNG + delta PNG"
+
+#: ../plug-ins/common/file-mng.c:1347
+msgid "JNG + delta PNG"
+msgstr "JNG + delta PNG"
+
+#: ../plug-ins/common/file-mng.c:1348
+msgid "All PNG"
+msgstr "Alle PNG"
+
+#: ../plug-ins/common/file-mng.c:1349
+msgid "All JNG"
+msgstr "Alle JNG"
+
+#: ../plug-ins/common/file-mng.c:1361
+msgid "Default chunks type:"
+msgstr "Standard einingstype:"
+
+#: ../plug-ins/common/file-mng.c:1364
+msgid "Combine"
+msgstr "Kombiner"
+
+#: ../plug-ins/common/file-mng.c:1365
+msgid "Replace"
+msgstr "Bytt ut"
+
+#: ../plug-ins/common/file-mng.c:1376
+msgid "Default frame disposal:"
+msgstr "Standard rammeovergang:"
+
+#: ../plug-ins/common/file-mng.c:1388
+msgid "PNG compression level:"
+msgstr "PNG-kompresjon:"
+
+#: ../plug-ins/common/file-mng.c:1396
+#: ../plug-ins/common/file-png.c:1907
+msgid "Choose a high compression level for small file size"
+msgstr "Vel høg kompresjon for å lage små filer."
+
+#: ../plug-ins/common/file-mng.c:1410
+msgid "JPEG compression quality:"
+msgstr "JPEG-kompressjonskvalitet:"
+
+#: ../plug-ins/common/file-mng.c:1427
+msgid "JPEG smoothing factor:"
+msgstr "JPEG utglatting:"
+
+#: ../plug-ins/common/file-mng.c:1437
+msgid "Animated MNG Options"
+msgstr "Innstillingar for animerte MNG"
+
+#: ../plug-ins/common/file-mng.c:1443
+msgid "Loop"
+msgstr "Sløyfe"
+
+#: ../plug-ins/common/file-mng.c:1457
+msgid "Default frame delay:"
+msgstr "Standard rammeforseinking:"
+
+#: ../plug-ins/common/file-mng.c:1530
+msgid "MNG animation"
+msgstr "MNG-animasjon"
+
+#: ../plug-ins/common/file-pat.c:122
+#: ../plug-ins/common/file-pat.c:144
+msgid "GIMP pattern"
+msgstr "GIMP-mønster"
+
+#: ../plug-ins/common/file-pat.c:370
+msgid "Invalid UTF-8 string in pattern file '%s'."
+msgstr "Ugyldig UTF-8-streng i mønsterfila «%s»."
+
+#: ../plug-ins/common/file-pat.c:527
+msgid "Save as Pattern"
+msgstr "Lagra som mønster"
+
+#: ../plug-ins/common/file-pcx.c:132
+#: ../plug-ins/common/file-pcx.c:151
+msgid "ZSoft PCX image"
+msgstr "ZSoft-PCX-bilete"
+
+#: ../plug-ins/common/file-pcx.c:371
+msgid "Could not read header from '%s'"
+msgstr "Kan ikkje lese header i «%s»"
+
+#: ../plug-ins/common/file-pcx.c:381
+msgid "'%s' is not a PCX file"
+msgstr "«%s» er ikkje ei PCX-fil"
+
+#: ../plug-ins/common/file-pcx.c:394
+#: ../plug-ins/file-bmp/bmp-read.c:578
+#: ../plug-ins/file-psd/psd-load.c:301
+msgid "Unsupported or invalid image width: %d"
+msgstr "Ugyldig biletbreidde: %d"
+
+#: ../plug-ins/common/file-pcx.c:399
+#: ../plug-ins/file-bmp/bmp-read.c:584
+#: ../plug-ins/file-psd/psd-load.c:293
+msgid "Unsupported or invalid image height: %d"
+msgstr "Ugyldig bilethøgde: %d"
+
+#: ../plug-ins/common/file-pcx.c:404
+msgid "Invalid number of bytes per line in PCX header"
+msgstr "Ugyldig tal for byte per linje i PCX-header"
+
+#: ../plug-ins/common/file-pcx.c:452
+msgid "Unusual PCX flavour, giving up"
+msgstr "Uvanleg PCX-variant, gir opp"
+
+#: ../plug-ins/common/file-pcx.c:675
+msgid "Invalid X offset: %d"
+msgstr "Ugyldig X-forskyving: %d"
+
+#: ../plug-ins/common/file-pcx.c:681
+msgid "Invalid Y offset: %d"
+msgstr "Ugyldig Y-forskyving: %d"
+
+#: ../plug-ins/common/file-pcx.c:687
+msgid "Right border out of bounds (must be < %d): %d"
+msgstr "Høgre kant utanfor grensene (må vere mindre enn %d): %d"
+
+#: ../plug-ins/common/file-pcx.c:694
+msgid "Bottom border out of bounds (must be < %d): %d"
+msgstr "Nedre kant utanfor grensene (må vere mindre enn %d): %d"
+
+#: ../plug-ins/common/file-pcx.c:751
+msgid "Writing to file '%s' failed: %s"
+msgstr "Klarte ikkje å skrive til  fila «%s»: %s"
+
+#: ../plug-ins/common/file-pdf.c:289
+msgid "Portable Document Format"
+msgstr "Portable Document Format"
+
+#: ../plug-ins/common/file-pdf.c:629
+msgid "%s-%s"
+msgstr "%s-%s"
+
+#: ../plug-ins/common/file-pdf.c:631
+#: ../plug-ins/common/file-ps.c:1126
+msgid "%s-pages"
+msgstr "%s-sider"
+
+#: ../plug-ins/common/file-pdf.c:817
+msgid "Import from PDF"
+msgstr "Importer frå PDF"
+
+#: ../plug-ins/common/file-pdf.c:822
+#: ../plug-ins/common/file-ps.c:3096
+#: ../plug-ins/common/file-tiff-load.c:483
+msgid "_Import"
+msgstr "_Importer"
+
+#: ../plug-ins/common/file-pdf.c:888
+msgid "_Width (pixels):"
+msgstr "_Breidde (pikslar):"
+
+#: ../plug-ins/common/file-pdf.c:889
+msgid "_Height (pixels):"
+msgstr "Høgde (pikslar):"
+
+#: ../plug-ins/common/file-pdf.c:891
+msgid "_Resolution:"
+msgstr "_Oppløysing:"
+
+#: ../plug-ins/common/file-pdf.c:1165
+msgid "pixels/%s"
+msgstr "pikslar/%s"
+
+#: ../plug-ins/common/file-pix.c:141
+#: ../plug-ins/common/file-pix.c:158
+msgid "Alias Pix image"
+msgstr "Alias|Wavefront-PIX-bilete"
+
+#: ../plug-ins/common/file-png.c:262
+#: ../plug-ins/common/file-png.c:283
+#: ../plug-ins/common/file-png.c:303
+#: ../plug-ins/common/file-png.c:320
+msgid "PNG image"
+msgstr "PNG-bilete"
+
+#: ../plug-ins/common/file-png.c:627
+msgid "Error loading PNG file: %s"
+msgstr "Feil ved opning av PNG-fila: %s"
+
+#: ../plug-ins/common/file-png.c:702
+msgid "Error while reading '%s'. File corrupted?"
+msgstr "Feil ved lesing av «%s». Er fila skada?"
+
+#: ../plug-ins/common/file-png.c:833
+msgid "Unknown color model in PNG file '%s'."
+msgstr "Ukjent fargemodell i PNG-fila «%s»."
+
+#: ../plug-ins/common/file-png.c:888
+msgid "The PNG file specifies an offset that caused the layer to be positioned outside the image."
+msgstr "PNG-fila har ei forskyving som gjer at laga blir plasserte utanfor biletet."
+
+#: ../plug-ins/common/file-png.c:1253
+msgid "Error while saving '%s'. Could not save image."
+msgstr "Feil ved lagringa av «%s». Biletet kan ikkje lagrast."
+
+#: ../plug-ins/common/file-png.c:1784
+msgid "Save as PNG"
+msgstr "Lagra som PNG"
+
+#: ../plug-ins/common/file-png.c:1816
+msgid "_Interlacing (Adam7)"
+msgstr "_Flett saman (Adam7)"
+
+#: ../plug-ins/common/file-png.c:1827
+msgid "Save _background color"
+msgstr "Lagra _bakgrunnsfarge"
+
+#: ../plug-ins/common/file-png.c:1835
+msgid "Save _gamma"
+msgstr "Lagra _gamma"
+
+#: ../plug-ins/common/file-png.c:1845
+msgid "Save layer o_ffset"
+msgstr "Lagra _lagforskyving"
+
+#: ../plug-ins/common/file-png.c:1854
+msgid "Save _resolution"
+msgstr "Lagra _oppløysing"
+
+#: ../plug-ins/common/file-png.c:1864
+msgid "Save creation _time"
+msgstr "Lagra _tid for oppretting"
+
+#: ../plug-ins/common/file-png.c:1873
+msgid "Save comme_nt"
+msgstr "Lagra _kommentarane"
+
+#: ../plug-ins/common/file-png.c:1889
+msgid "Save color _values from transparent pixels"
+msgstr "Lagra farge_verdiar frå gjennomsiktige pikslar"
+
+#: ../plug-ins/common/file-png.c:1903
+msgid "Co_mpression level:"
+msgstr "_Komprimering:"
+
+#: ../plug-ins/common/file-png.c:1921
+#: ../plug-ins/file-jpeg/jpeg-save.c:1190
+msgid "_Load Defaults"
+msgstr "_Opna standardverdiane"
+
+#: ../plug-ins/common/file-png.c:1929
+msgid "S_ave Defaults"
+msgstr "_Lagra standardverdiane"
+
+#: ../plug-ins/common/file-pnm.c:247
+msgid "PNM Image"
+msgstr "PNM-bilete"
+
+#: ../plug-ins/common/file-pnm.c:267
+msgid "PNM image"
+msgstr "PNM-bilete"
+
+#: ../plug-ins/common/file-pnm.c:279
+msgid "PBM image"
+msgstr "PBM-bilete"
+
+#: ../plug-ins/common/file-pnm.c:291
+msgid "PGM image"
+msgstr "PGM-bilete"
+
+#: ../plug-ins/common/file-pnm.c:303
+msgid "PPM image"
+msgstr "PPM-bilete"
+
+#: ../plug-ins/common/file-pnm.c:527
+#: ../plug-ins/common/file-pnm.c:549
+#: ../plug-ins/common/file-pnm.c:558
+#: ../plug-ins/common/file-pnm.c:569
+#: ../plug-ins/common/file-pnm.c:657
+#: ../plug-ins/common/file-pnm.c:727
+msgid "Premature end of file."
+msgstr "Uventa filslutt."
+
+#: ../plug-ins/common/file-pnm.c:529
+msgid "Invalid file."
+msgstr "Ugyldig fil."
+
+#: ../plug-ins/common/file-pnm.c:543
+msgid "File not in a supported format."
+msgstr "Fila har eit ugyldig format."
+
+#: ../plug-ins/common/file-pnm.c:552
+msgid "Invalid X resolution."
+msgstr "Ugyldig X-oppløysing."
+
+#: ../plug-ins/common/file-pnm.c:554
+msgid "Image width is larger than GIMP can handle."
+msgstr "Biletet er breiare enn GIMP kan handtere"
+
+#: ../plug-ins/common/file-pnm.c:561
+msgid "Invalid Y resolution."
+msgstr "Ugyldig X-oppløysing."
+
+#: ../plug-ins/common/file-pnm.c:563
+msgid "Image height is larger than GIMP can handle."
+msgstr "Biletet er høgare enn GIMP kan handtere"
+
+#: ../plug-ins/common/file-pnm.c:575
+msgid "Unsupported maximum value."
+msgstr "Ugyldig maksimalverdi."
+
+#: ../plug-ins/common/file-pnm.c:780
+msgid "Error reading file."
+msgstr "Feil ved lesing av fil"
+
+#: ../plug-ins/common/file-pnm.c:1184
+msgid "Save as PNM"
+msgstr "Lagra som PNM"
+
+#. file save type
+#: ../plug-ins/common/file-pnm.c:1201
+msgid "Data formatting"
+msgstr "Dataformatering"
+
+#: ../plug-ins/common/file-pnm.c:1205
+msgid "Raw"
+msgstr "Raw"
+
+#: ../plug-ins/common/file-pnm.c:1206
+msgid "Ascii"
+msgstr "Ascii"
+
+#: ../plug-ins/common/file-ps.c:600
+#: ../plug-ins/common/file-ps.c:692
+msgid "PostScript document"
+msgstr "Postscript-dokument"
+
+#: ../plug-ins/common/file-ps.c:619
+#: ../plug-ins/common/file-ps.c:708
+msgid "Encapsulated PostScript image"
+msgstr "Innekapsla PostScript-bilete"
+
+#: ../plug-ins/common/file-ps.c:639
+msgid "PDF document"
+msgstr "PDF-dokument"
+
+#: ../plug-ins/common/file-ps.c:1051
+msgid "Could not interpret Postscript file '%s'"
+msgstr "Kunne ikkje tolka Postscriptfila «%s»"
+
+#: ../plug-ins/common/file-ps.c:1193
+msgid "PostScript save cannot handle images with alpha channels"
+msgstr "Bilete med alfa-kanal kan ikkje lagrast i PostScript."
+
+#: ../plug-ins/common/file-ps.c:1731
+#: ../plug-ins/common/file-ps.c:1764
+msgid ""
+"Error starting Ghostscript. Make sure that Ghostscript is installed and - if necessary - use the environment variable GS_PROG to tell GIMP about its location.\n"
+"(%s)"
+msgstr ""
+"Feil ved oppstart av Ghostscript. Forsikra deg om at Ghostscript er installert og, dersom det er nødvendig, bruk omgivnadsvariabelen GS_PROG for å fortelje GIMP kvar det er plassert.\n"
+"(%s)"
+
+#: ../plug-ins/common/file-ps.c:1931
+#: ../plug-ins/common/file-tiff-load.c:999
+msgid "Page %d"
+msgstr "Side %d"
+
+#: ../plug-ins/common/file-ps.c:2600
+#: ../plug-ins/common/file-ps.c:2732
+#: ../plug-ins/common/file-ps.c:2882
+#: ../plug-ins/common/file-ps.c:3007
+#: ../plug-ins/common/file-sunras.c:1503
+#: ../plug-ins/common/file-sunras.c:1611
+#: ../plug-ins/file-fits/fits.c:849
+#: ../plug-ins/file-fits/fits.c:973
+msgid "Write error occurred"
+msgstr "Det oppsto ein skrivefeil"
+
+#: ../plug-ins/common/file-ps.c:3091
+msgid "Import from PostScript"
+msgstr "Importer frå PostScript"
+
+#. Rendering
+#: ../plug-ins/common/file-ps.c:3134
+msgid "Rendering"
+msgstr "Teikna"
+
+#. Resolution
+#: ../plug-ins/common/file-ps.c:3150
+#: ../plug-ins/common/file-svg.c:915
+#: ../plug-ins/common/file-wmf.c:691
+msgid "Resolution:"
+msgstr "Oppløysing:"
+
+#: ../plug-ins/common/file-ps.c:3189
+msgid "Pages:"
+msgstr "Sider:"
+
+#: ../plug-ins/common/file-ps.c:3196
+msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
+msgstr "Sider som skal opnast (t.d. 1-4 eller 1,3,5-7)"
+
+#: ../plug-ins/common/file-ps.c:3200
+#: ../plug-ins/common/sphere-designer.c:2642
+msgid "Layers"
+msgstr "Lag"
+
+#: ../plug-ins/common/file-ps.c:3202
+msgid "Images"
+msgstr "Bilete"
+
+#: ../plug-ins/common/file-ps.c:3205
+msgid "Open as"
+msgstr "Opna som"
+
+#: ../plug-ins/common/file-ps.c:3209
+msgid "Try Bounding Box"
+msgstr "Prøv BoundingBox"
+
+#. Colouring
+#: ../plug-ins/common/file-ps.c:3222
+msgid "Coloring"
+msgstr "Fargelegg"
+
+#: ../plug-ins/common/file-ps.c:3226
+msgid "B/W"
+msgstr "S&K"
+
+#: ../plug-ins/common/file-ps.c:3228
+#: ../plug-ins/common/file-xpm.c:478
+#: ../plug-ins/gimpressionist/color.c:65
+#: ../plug-ins/gimpressionist/general.c:169
+#: ../plug-ins/imagemap/imap_menu.c:212
+msgid "Color"
+msgstr "Farge"
+
+#: ../plug-ins/common/file-ps.c:3229
+#: ../plug-ins/file-fits/fits.c:1032
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: ../plug-ins/common/file-ps.c:3239
+msgid "Text antialiasing"
+msgstr "Kantutjamning av teksten"
+
+#: ../plug-ins/common/file-ps.c:3244
+#: ../plug-ins/common/file-ps.c:3256
+msgid "Weak"
+msgstr "Svak"
+
+#: ../plug-ins/common/file-ps.c:3245
+#: ../plug-ins/common/file-ps.c:3257
+msgid "Strong"
+msgstr "Sterk"
+
+#: ../plug-ins/common/file-ps.c:3251
+msgid "Graphic antialiasing"
+msgstr "Kantutjamning av grafikk"
+
+#: ../plug-ins/common/file-ps.c:3329
+msgid "Save as PostScript"
+msgstr "Lagra som Postscript"
+
+#. Image Size
+#: ../plug-ins/common/file-ps.c:3360
+msgid "Image Size"
+msgstr "Biletstorleik"
+
+#: ../plug-ins/common/file-ps.c:3409
+msgid "_Keep aspect ratio"
+msgstr "_Behald forholdet mellom sidene"
+
+#: ../plug-ins/common/file-ps.c:3415
+msgid "When toggled, the resulting image will be scaled to fit into the given size without changing the aspect ratio."
+msgstr "Skaler biletet til papirstorleiken utan å endra forholdet mellom sidene."
+
+#. Unit
+#: ../plug-ins/common/file-ps.c:3425
+msgid "Unit"
+msgstr "Eining"
+
+#: ../plug-ins/common/file-ps.c:3429
+msgid "_Inch"
+msgstr "_Tomme"
+
+#: ../plug-ins/common/file-ps.c:3430
+msgid "_Millimeter"
+msgstr "__Millimeter"
+
+#. Rotation
+#: ../plug-ins/common/file-ps.c:3441
+#: ../plug-ins/map-object/map-object-ui.c:1035
+msgid "Rotation"
+msgstr "Rotasjon"
+
+#. Format
+#: ../plug-ins/common/file-ps.c:3456
+msgid "Output"
+msgstr "Utdata"
+
+#: ../plug-ins/common/file-ps.c:3462
+msgid "_PostScript level 2"
+msgstr "_Postscript Level 2"
+
+#: ../plug-ins/common/file-ps.c:3471
+msgid "_Encapsulated PostScript"
+msgstr "_Encapsulated PostScript"
+
+#: ../plug-ins/common/file-ps.c:3480
+msgid "P_review"
+msgstr "_Førehandsvising"
+
+#: ../plug-ins/common/file-ps.c:3501
+msgid "Preview _size:"
+msgstr "_Storleiken på førehandsvisinga:"
+
+#: ../plug-ins/common/file-psp.c:598
+#: ../plug-ins/common/file-psp.c:622
+msgid "Paint Shop Pro image"
+msgstr "Paint-Shop-Pro-bilete"
+
+#: ../plug-ins/common/file-psp.c:639
+msgid "Save as PSP"
+msgstr "Lagra som PSP"
+
+#. file save type
+#: ../plug-ins/common/file-psp.c:656
+msgid "Data Compression"
+msgstr "Kompressjonsgrad"
+
+#: ../plug-ins/common/file-psp.c:661
+msgid "RLE"
+msgstr "RLE"
+
+#: ../plug-ins/common/file-psp.c:662
+msgid "LZ77"
+msgstr "LZ77"
+
+#: ../plug-ins/common/file-raw.c:181
+#: ../plug-ins/common/file-raw.c:196
+msgid "Raw image data"
+msgstr "Raw biletdata"
+
+#: ../plug-ins/common/file-raw.c:979
+msgid "Load Image from Raw Data"
+msgstr "Last biletet frå Raw Data"
+
+#: ../plug-ins/common/file-raw.c:1012
+msgid "Image"
+msgstr "Bilete"
+
+#: ../plug-ins/common/file-raw.c:1023
+msgid "RGB Alpha"
+msgstr "RGB-alfa"
+
+#: ../plug-ins/common/file-raw.c:1024
+msgid "Planar RGB"
+msgstr "Planar RGB"
+
+#: ../plug-ins/common/file-raw.c:1025
+msgid "Indexed"
+msgstr "Indeksert"
+
+#: ../plug-ins/common/file-raw.c:1026
+msgid "Indexed Alpha"
+msgstr "Indeksert alfa"
+
+#: ../plug-ins/common/file-raw.c:1031
+msgid "Image _Type:"
+msgstr "Bilet_type:"
+
+#: ../plug-ins/common/file-raw.c:1081
+msgid "Palette"
+msgstr "Palett"
+
+#: ../plug-ins/common/file-raw.c:1091
+#: ../plug-ins/common/file-raw.c:1190
+msgid "R, G, B (normal)"
+msgstr "R, G, B (normal)"
+
+#: ../plug-ins/common/file-raw.c:1092
+#: ../plug-ins/common/file-raw.c:1192
+msgid "B, G, R, X (BMP style)"
+msgstr "B, G, R, X (BMP-stil)"
+
+#: ../plug-ins/common/file-raw.c:1097
+msgid "_Palette Type:"
+msgstr "_Palettype:"
+
+#: ../plug-ins/common/file-raw.c:1108
+msgid "Off_set:"
+msgstr "For_skyving:"
+
+#: ../plug-ins/common/file-raw.c:1120
+msgid "Select Palette File"
+msgstr "Vel palettfil"
+
+#: ../plug-ins/common/file-raw.c:1126
+msgid "Pal_ette File:"
+msgstr "Pal_ettfil:"
+
+#: ../plug-ins/common/file-raw.c:1154
+msgid "Raw Image Save"
+msgstr "Lagra raw biletdata"
+
+#: ../plug-ins/common/file-raw.c:1176
+msgid "RGB Save Type"
+msgstr "RGB-lagringstype"
+
+#: ../plug-ins/common/file-raw.c:1180
+msgid "Standard (R,G,B)"
+msgstr "Standard (R,G,B)"
+
+#: ../plug-ins/common/file-raw.c:1181
+msgid "Planar (RRR,GGG,BBB)"
+msgstr "Planar (RRR,GGG,BBB)"
+
+#: ../plug-ins/common/file-raw.c:1186
+msgid "Indexed Palette Type"
+msgstr "Indeksert palett"
+
+#: ../plug-ins/common/file-sunras.c:216
+#: ../plug-ins/common/file-sunras.c:236
+msgid "SUN Rasterfile image"
+msgstr "SUN-Rasterfile-bilete"
+
+#: ../plug-ins/common/file-sunras.c:401
+msgid "Could not open '%s' as SUN-raster-file"
+msgstr "Kunne ikkje opna «%s» som SUN-raster-fil"
+
+#: ../plug-ins/common/file-sunras.c:411
+msgid "The type of this SUN-rasterfile is not supported"
+msgstr "Støtter ikkje denne typen av SUN-rasterfil"
+
+#: ../plug-ins/common/file-sunras.c:440
+msgid "Could not read color entries from '%s'"
+msgstr "Kunne ikkje lese fargeinnslaga frå «%s»"
+
+#: ../plug-ins/common/file-sunras.c:448
+msgid "Type of colormap not supported"
+msgstr "Støtter ikkje denne typen fargekart"
+
+#: ../plug-ins/common/file-sunras.c:455
+#: ../plug-ins/common/file-xbm.c:826
+#: ../plug-ins/common/file-xwd.c:488
+msgid ""
+"'%s':\n"
+"No image width specified"
+msgstr ""
+"«%s»:\n"
+"Biletbreidda ikkje oppgitt"
+
+#: ../plug-ins/common/file-sunras.c:463
+#: ../plug-ins/common/file-xbm.c:833
+#: ../plug-ins/common/file-xwd.c:497
+msgid ""
+"'%s':\n"
+"Image width is larger than GIMP can handle"
+msgstr ""
+"'%s':\n"
+"Biletbreidda er større enn det GIMP kan handtere"
+
+#: ../plug-ins/common/file-sunras.c:471
+#: ../plug-ins/common/file-xbm.c:840
+#: ../plug-ins/common/file-xwd.c:505
+msgid ""
+"'%s':\n"
+"No image height specified"
+msgstr ""
+"«%s»:\n"
+"Bilethøgde ikkje oppgitt"
+
+#: ../plug-ins/common/file-sunras.c:479
+#: ../plug-ins/common/file-xbm.c:847
+#: ../plug-ins/common/file-xwd.c:513
+msgid ""
+"'%s':\n"
+"Image height is larger than GIMP can handle"
+msgstr ""
+"'%s':\n"
+"Bilethøgda er større enn det GIMP kan handtere"
+
+#: ../plug-ins/common/file-sunras.c:517
+msgid "This image depth is not supported"
+msgstr "Støtter ikkje denne typen fargedjupn"
+
+#: ../plug-ins/common/file-sunras.c:541
+msgid "SUNRAS save cannot handle images with alpha channels"
+msgstr "SUNRAS kan ikkje lagra bilete med alfakanal"
+
+#: ../plug-ins/common/file-sunras.c:552
+msgid "Can't operate on unknown image types"
+msgstr "Kan ikkje arbeida med ukjente bilettypar"
+
+#: ../plug-ins/common/file-sunras.c:1081
+#: ../plug-ins/common/file-sunras.c:1172
+#: ../plug-ins/common/file-sunras.c:1253
+#: ../plug-ins/common/file-sunras.c:1348
+#: ../plug-ins/common/file-xwd.c:1347
+#: ../plug-ins/common/file-xwd.c:1448
+#: ../plug-ins/common/file-xwd.c:1606
+#: ../plug-ins/common/file-xwd.c:1806
+#: ../plug-ins/common/file-xwd.c:2063
+#: ../plug-ins/file-fits/fits.c:696
+msgid "EOF encountered on reading"
+msgstr "fann EOF ved lesinga"
+
+#: ../plug-ins/common/file-sunras.c:1628
+msgid "Save as SUNRAS"
+msgstr "Lagra som SUNRAS"
+
+#. file save type
+#: ../plug-ins/common/file-sunras.c:1645
+msgid "Data Formatting"
+msgstr "Dataformatering"
+
+#: ../plug-ins/common/file-sunras.c:1649
+msgid "RunLength Encoded"
+msgstr "RunLength-koding"
+
+#: ../plug-ins/common/file-svg.c:139
+msgid "SVG image"
+msgstr "SVG-bilete"
+
+#: ../plug-ins/common/file-svg.c:334
+#: ../plug-ins/common/file-svg.c:719
+msgid "Unknown reason"
+msgstr "Ukjent årsak"
+
+#: ../plug-ins/common/file-svg.c:340
+msgid "Rendering SVG"
+msgstr "Lager SVG"
+
+#: ../plug-ins/common/file-svg.c:352
+msgid "Rendered SVG"
+msgstr "Teikna SVG"
+
+#: ../plug-ins/common/file-svg.c:566
+#: ../plug-ins/common/file-wmf.c:357
+msgid "%d × %d"
+msgstr "%d × %d"
+
+#: ../plug-ins/common/file-svg.c:574
+msgid ""
+"SVG file does not\n"
+"specify a size!"
+msgstr ""
+"SVG-fila spesifiserer\n"
+"ikkje storleik!"
+
+#. Scalable Vector Graphics is SVG, should perhaps not be translated
+#: ../plug-ins/common/file-svg.c:728
+msgid "Render Scalable Vector Graphics"
+msgstr "Lager skalerbar vektorgrafikk (SVG)"
+
+#. Width and Height
+#: ../plug-ins/common/file-svg.c:794
+#: ../plug-ins/common/file-wmf.c:570
+#: ../plug-ins/common/grid.c:723
+msgid "Width:"
+msgstr "Breidde:"
+
+#: ../plug-ins/common/file-svg.c:800
+#: ../plug-ins/common/file-wmf.c:576
+msgid "Height:"
+msgstr "Høgde:"
+
+#: ../plug-ins/common/file-svg.c:874
+#: ../plug-ins/common/file-wmf.c:650
+msgid "_X ratio:"
+msgstr "_X-andel:"
+
+#: ../plug-ins/common/file-svg.c:896
+#: ../plug-ins/common/file-wmf.c:672
+msgid "_Y ratio:"
+msgstr "_Y-andel:"
+
+#: ../plug-ins/common/file-svg.c:910
+#: ../plug-ins/common/file-wmf.c:686
+msgid "Constrain aspect ratio"
+msgstr "Inskrenk sideforholdet"
+
+#: ../plug-ins/common/file-svg.c:921
+#: ../plug-ins/common/file-wmf.c:697
+#: ../plug-ins/print/print-page-layout.c:285
+msgid "pixels/%a"
+msgstr "Pikslar/%a"
+
+#. Path Import
+#: ../plug-ins/common/file-svg.c:941
+msgid "Import _paths"
+msgstr "_Importer stigar"
+
+#: ../plug-ins/common/file-svg.c:947
+msgid "Import path elements of the SVG so they can be used with the GIMP path tool"
+msgstr "Importer SVG stigelement slik at desse kan bli behandla med stigverktøyet i GIMP"
+
+#: ../plug-ins/common/file-svg.c:960
+msgid "Merge imported paths"
+msgstr "Føy saman dei importerte stigane"
+
+#: ../plug-ins/common/file-tga.c:244
+#: ../plug-ins/common/file-tga.c:263
+msgid "TarGA image"
+msgstr "TarGA-bilete"
+
+#: ../plug-ins/common/file-tga.c:454
+msgid "Cannot read footer from '%s'"
+msgstr "Kan ikkje lese botnteksten frå «%s»"
+
+#: ../plug-ins/common/file-tga.c:472
+msgid "Cannot read extension from '%s'"
+msgstr "Kan ikkje leseutviding frå «%s»"
+
+#: ../plug-ins/common/file-tga.c:484
+msgid "Cannot read header from '%s'"
+msgstr "Kan ikkje lese header frå «%s»"
+
+#: ../plug-ins/common/file-tga.c:1367
+msgid "Save as TGA"
+msgstr "Lagra som TGA"
+
+#. rle
+#: ../plug-ins/common/file-tga.c:1390
+msgid "_RLE compression"
+msgstr "_RLE-komprimering"
+
+#: ../plug-ins/common/file-tga.c:1404
+msgid "Or_igin:"
+msgstr "_Opphav:"
+
+#: ../plug-ins/common/file-tga.c:1408
+msgid "Bottom left"
+msgstr "Nede, venstre"
+
+#: ../plug-ins/common/file-tga.c:1409
+msgid "Top left"
+msgstr "Oppe, venstre"
+
+#: ../plug-ins/common/file-tiff-load.c:240
+#: ../plug-ins/common/file-tiff-save.c:182
+#: ../plug-ins/common/file-tiff-save.c:199
+msgid "TIFF image"
+msgstr "TIFF-bilete"
+
+#: ../plug-ins/common/file-tiff-load.c:310
+msgid "TIFF '%s' does not contain any directories"
+msgstr "TIFF «%s» inneheld ingen mapper"
+
+#: ../plug-ins/common/file-tiff-load.c:478
+msgid "Import from TIFF"
+msgstr "Importer frå TIFF"
+
+#: ../plug-ins/common/file-tiff-load.c:780
+msgid "%s-%d-of-%d-pages"
+msgstr "%s-%d-av-%d-sider"
+
+#: ../plug-ins/common/file-tiff-load.c:1015
+msgid "TIFF Channel"
+msgstr "TIFF-kanal"
+
+#: ../plug-ins/common/file-tiff-load.c:1024
+#: ../plug-ins/file-psd/psd-load.c:324
+msgid ""
+"Warning:\n"
+"The image you are loading has 16 bits per channel. GIMP can only handle 8 bit, so it will be converted for you. Information will be lost because of this conversion."
+msgstr ""
+"Åtvaring:\n"
+"Biletet du ønskjer å opna har 16 bit per kanal. GIMP kan bare behandla 8 bit, så det vil bli konvertert til dette formatet. Du kan miste informasjon på grunn av denne konverteringa."
+
+#: ../plug-ins/common/file-tiff-save.c:887
+msgid ""
+"The TIFF format only supports comments in\n"
+"7bit ASCII encoding. No comment is saved."
+msgstr ""
+"TIFF-formatet godtar bare kommentarar i\n"
+"7 bit ASCII-kode. Ingen kommentarar er lagra."
+
+#: ../plug-ins/common/file-tiff-save.c:1061
+msgid "Save as TIFF"
+msgstr "Lagra som TIFF"
+
+#. compression
+#: ../plug-ins/common/file-tiff-save.c:1083
+msgid "Compression"
+msgstr "Komprimering"
+
+#: ../plug-ins/common/file-tiff-save.c:1087
+msgid "_None"
+msgstr "Inge_n"
+
+#: ../plug-ins/common/file-tiff-save.c:1088
+msgid "_LZW"
+msgstr "_LZW"
+
+#: ../plug-ins/common/file-tiff-save.c:1089
+msgid "_Pack Bits"
+msgstr "Pakk _Bits"
+
+#: ../plug-ins/common/file-tiff-save.c:1090
+msgid "_Deflate"
+msgstr "_Deflate"
+
+#: ../plug-ins/common/file-tiff-save.c:1091
+msgid "_JPEG"
+msgstr "_JPEG"
+
+#: ../plug-ins/common/file-tiff-save.c:1092
+msgid "CCITT Group _3 fax"
+msgstr "CCITT Grupe _3 faks"
+
+#: ../plug-ins/common/file-tiff-save.c:1093
+msgid "CCITT Group _4 fax"
+msgstr "CCITT Grupe _4 faks"
+
+#: ../plug-ins/common/file-tiff-save.c:1115
+msgid "Save _color values from transparent pixels"
+msgstr "Lagra _fargeverdiar frå gjennomsiktige pikslar"
+
+#: ../plug-ins/common/file-tiff-save.c:1131
+#: ../plug-ins/common/file-xbm.c:1246
+msgid "Comment:"
+msgstr "Kommentar:"
+
+#: ../plug-ins/common/file-wmf.c:128
+msgid "Microsoft WMF file"
+msgstr "Microsoft-WMF-fil"
+
+#: ../plug-ins/common/file-wmf.c:351
+msgid ""
+"WMF file does not\n"
+"specify a size!"
+msgstr ""
+"WMF-fil spesifiserer\n"
+"ikkje storleik!"
+
+#: ../plug-ins/common/file-wmf.c:499
+msgid "Render Windows Metafile"
+msgstr "Lager Windows-Metafile"
+
+#: ../plug-ins/common/file-wmf.c:962
+msgid "Could not open '%s' for reading"
+msgstr "Kunne ikkje opna for lesing frå «%s»."
+
+#: ../plug-ins/common/file-wmf.c:1002
+msgid "Rendered WMF"
+msgstr "Teikna WMF"
+
+#: ../plug-ins/common/file-xbm.c:176
+#: ../plug-ins/common/file-xbm.c:194
+msgid "X BitMap image"
+msgstr "X-BitMap-bilete"
+
+#: ../plug-ins/common/file-xbm.c:819
+msgid ""
+"'%s':\n"
+"Could not read header (ftell == %ld)"
+msgstr ""
+"«%s»:\n"
+"Kan ikkje lesa header (ftell == %ld)"
+
+#: ../plug-ins/common/file-xbm.c:854
+msgid ""
+"'%s':\n"
+"No image data type specified"
+msgstr ""
+"'%s':\n"
+"Manglar data for bilettype"
+
+#. The image is not black-and-white.
+#: ../plug-ins/common/file-xbm.c:997
+msgid ""
+"The image which you are trying to save as an XBM contains more than two colors.\n"
+"\n"
+"Please convert it to a black and white (1-bit) indexed image and try again."
+msgstr ""
+"Biletet som du prøver å lagra som XBM inneheld meir enn to fargar.\n"
+"\n"
+"Omform biletet til eit svart/kvit indeksert bilete (1-bits) og prøv igjen."
+
+#: ../plug-ins/common/file-xbm.c:1008
+msgid ""
+"You cannot save a cursor mask for an image\n"
+"which has no alpha channel."
+msgstr ""
+"Du kan ikkje lagra ei markørmaske for\n"
+"eit bilete utan alfakanal."
+
+#: ../plug-ins/common/file-xbm.c:1185
+msgid "Save as XBM"
+msgstr "Lagra som XBM"
+
+#. parameter settings
+#: ../plug-ins/common/file-xbm.c:1202
+msgid "XBM Options"
+msgstr "XBM innstillingar"
+
+#. X10 format
+#: ../plug-ins/common/file-xbm.c:1212
+msgid "_X10 format bitmap"
+msgstr "_X10 format punktgrafikk"
+
+#: ../plug-ins/common/file-xbm.c:1232
+msgid "_Identifier prefix:"
+msgstr "Identifikatorprefiks:"
+
+#. hotspot toggle
+#: ../plug-ins/common/file-xbm.c:1254
+msgid "_Write hot spot values"
+msgstr "_Skriv koordinata for lenkeområde"
+
+#: ../plug-ins/common/file-xbm.c:1276
+msgid "Hot spot _X:"
+msgstr "Verdi _X:"
+
+#: ../plug-ins/common/file-xbm.c:1286
+msgid "Hot spot _Y:"
+msgstr "Verdi _X:"
+
+#. mask file
+#: ../plug-ins/common/file-xbm.c:1293
+msgid "Mask File"
+msgstr "Maskefil"
+
+#: ../plug-ins/common/file-xbm.c:1303
+msgid "W_rite extra mask file"
+msgstr "Skriv ei e_kstra maskefil"
+
+#: ../plug-ins/common/file-xbm.c:1316
+msgid "_Mask file extension:"
+msgstr "_Maskefilutviding:"
+
+#: ../plug-ins/common/file-xpm.c:173
+#: ../plug-ins/common/file-xpm.c:198
+msgid "X PixMap image"
+msgstr "X-PixMap-bilete"
+
+#: ../plug-ins/common/file-xpm.c:362
+#: ../plug-ins/common/file-xpm.c:772
+msgid "Error opening file '%s'"
+msgstr "Feil ved opning av fila «%s»"
+
+#: ../plug-ins/common/file-xpm.c:368
+#: ../plug-ins/common/file-xpm.c:778
+msgid "XPM file invalid"
+msgstr "Ugyldig XPM-fil"
+
+#: ../plug-ins/common/file-xpm.c:804
+msgid "Save as XPM"
+msgstr "Lagra som XPM"
+
+#: ../plug-ins/common/file-xpm.c:828
+msgid "_Alpha threshold:"
+msgstr "_Alfa-grense:"
+
+#: ../plug-ins/common/file-xwd.c:277
+#: ../plug-ins/common/file-xwd.c:297
+msgid "X window dump"
+msgstr "X-Window-dump"
+
+#: ../plug-ins/common/file-xwd.c:441
+msgid "Could not read XWD header from '%s'"
+msgstr "Kunne ikkje lesa XWD-header frå «%s»"
+
+#: ../plug-ins/common/file-xwd.c:479
+msgid "Can't read color entries"
+msgstr "Kunne ikkje lesa fargedata"
+
+#: ../plug-ins/common/file-xwd.c:569
+msgid "XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is not supported."
+msgstr "XWD-fila %s har formatet %d, djupn %d med %d bits per piksel. Denne kombinasjonen er førebels ikkje gyldig."
+
+#: ../plug-ins/common/file-xwd.c:592
+msgid "Cannot save images with alpha channels."
+msgstr "Kan ikkje lagra bilete med alfakanalar."
+
+#: ../plug-ins/common/file-xwd.c:2194
+msgid "Error during writing indexed/gray image"
+msgstr "Feil ved skriving til indeksert bilete eller gråtonebilete."
+
+#: ../plug-ins/common/file-xwd.c:2292
+msgid "Error during writing rgb image"
+msgstr "Feil under skriving av RGB-bilete"
+
+#: ../plug-ins/common/film.c:216
+msgid "Combine several images on a film strip"
+msgstr "Set saman fleire bilete til ei filmstripe"
+
+#: ../plug-ins/common/film.c:221
+msgid "_Filmstrip..."
+msgstr "_Filmstripe …"
+
+#: ../plug-ins/common/film.c:306
+msgid "Composing images"
+msgstr "Komponerer bileta"
+
+#: ../plug-ins/common/film.c:424
+#: ../plug-ins/common/guillotine.c:215
+#: ../plug-ins/help-browser/dialog.c:1132
+msgid "Untitled"
+msgstr "Utan namn"
+
+#: ../plug-ins/common/film.c:878
+msgid "Available images:"
+msgstr ""
+"Tilgjengelege \n"
+"bilete:"
+
+#: ../plug-ins/common/film.c:879
+msgid "On film:"
+msgstr ""
+"Ligg på \n"
+"filmen:"
+
+#. Film height/colour
+#: ../plug-ins/common/film.c:975
+#: ../plug-ins/common/film.c:1247
+msgid "Filmstrip"
+msgstr "Filmstripe"
+
+#. Keep maximum image height
+#: ../plug-ins/common/film.c:984
+msgid "_Fit height to images"
+msgstr "Til_pass høgda etter bileta"
+
+#. Film color
+#: ../plug-ins/common/film.c:1020
+msgid "Select Film Color"
+msgstr "Vel filmfarge"
+
+#: ../plug-ins/common/film.c:1025
+#: ../plug-ins/common/film.c:1075
+#: ../plug-ins/common/nova.c:352
+msgid "Co_lor:"
+msgstr "_Farge:"
+
+#. Film numbering: Startindex/Font/colour
+#: ../plug-ins/common/film.c:1034
+msgid "Numbering"
+msgstr "Nummerering"
+
+#: ../plug-ins/common/film.c:1052
+msgid "Start _index:"
+msgstr "_Starttal:"
+
+#: ../plug-ins/common/film.c:1065
+msgid "_Font:"
+msgstr "Skrift_type:"
+
+#. Numbering color
+#: ../plug-ins/common/film.c:1070
+msgid "Select Number Color"
+msgstr "Vel talfarge"
+
+#: ../plug-ins/common/film.c:1085
+msgid "At _bottom"
+msgstr "_Nedst"
+
+#: ../plug-ins/common/film.c:1086
+msgid "At _top"
+msgstr "_Øvst"
+
+#. ** The right frame keeps the image selection **
+#: ../plug-ins/common/film.c:1099
+msgid "Image Selection"
+msgstr "Biletutval"
+
+#: ../plug-ins/common/film.c:1127
+msgid "All Values are Fractions of the Strip Height"
+msgstr "Alle verdiane er relaterte til filmhøgda"
+
+#: ../plug-ins/common/film.c:1130
+msgid "Ad_vanced"
+msgstr "_Avansert"
+
+#: ../plug-ins/common/film.c:1149
+msgid "Image _height:"
+msgstr "Bilet_høgde:"
+
+#: ../plug-ins/common/film.c:1160
+msgid "Image spac_ing:"
+msgstr "Bilet_avstand:"
+
+#: ../plug-ins/common/film.c:1171
+msgid "_Hole offset:"
+msgstr "Hol_forskyving:"
+
+#: ../plug-ins/common/film.c:1182
+msgid "Ho_le width:"
+msgstr "Hol_breidde:"
+
+#: ../plug-ins/common/film.c:1193
+msgid "Hol_e height:"
+msgstr "Holh_øgde:"
+
+#: ../plug-ins/common/film.c:1204
+msgid "Hole sp_acing:"
+msgstr "Hola_vstand:"
+
+#: ../plug-ins/common/film.c:1215
+msgid "_Number height:"
+msgstr "_Talhøgde:"
+
+#. These values are translated for the GUI but also used internally
+#. to figure out which button the user pushed, etc.
+#. Not my design, please don't blame me -- njl
+#: ../plug-ins/common/filter-pack.c:219
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:952
+msgid "Red:"
+msgstr "Raud:"
+
+#: ../plug-ins/common/filter-pack.c:220
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:962
+msgid "Green:"
+msgstr "Grøn:"
+
+#: ../plug-ins/common/filter-pack.c:221
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:972
+msgid "Blue:"
+msgstr "Blå:"
+
+#: ../plug-ins/common/filter-pack.c:222
+msgid "Cyan:"
+msgstr "Cyanblå:"
+
+#: ../plug-ins/common/filter-pack.c:223
+msgid "Yellow:"
+msgstr "Gul:"
+
+#: ../plug-ins/common/filter-pack.c:224
+msgid "Magenta:"
+msgstr "Magentaraud:"
+
+#: ../plug-ins/common/filter-pack.c:226
+msgid "Darker:"
+msgstr "Mørkare:"
+
+#: ../plug-ins/common/filter-pack.c:227
+msgid "Lighter:"
+msgstr "Lysare:"
+
+#: ../plug-ins/common/filter-pack.c:229
+msgid "More Sat:"
+msgstr "Meir metning.:"
+
+#: ../plug-ins/common/filter-pack.c:230
+msgid "Less Sat:"
+msgstr "Mindre metning:"
+
+#: ../plug-ins/common/filter-pack.c:232
+#: ../plug-ins/common/filter-pack.c:531
+msgid "Current:"
+msgstr "Nåverande:"
+
+#: ../plug-ins/common/filter-pack.c:316
+msgid "Interactively modify the image colors"
+msgstr "Modifiser biletetfargane interaktivt"
+
+#: ../plug-ins/common/filter-pack.c:321
+msgid "_Filter Pack..."
+msgstr "_Filterpakke …"
+
+#: ../plug-ins/common/filter-pack.c:371
+msgid "FP can only be used on RGB images."
+msgstr "FP kan bare brukast på RGB-bilete."
+
+#: ../plug-ins/common/filter-pack.c:381
+msgid "FP can only be run interactively."
+msgstr "FP kan bare nyttast interaktivt.."
+
+#: ../plug-ins/common/filter-pack.c:399
+msgid "Applying filter pack"
+msgstr "Legg til filterpakka"
+
+#: ../plug-ins/common/filter-pack.c:523
+msgid "Original:"
+msgstr "Original:"
+
+#: ../plug-ins/common/filter-pack.c:575
+msgid "Hue Variations"
+msgstr "Variasjonar i kulør:"
+
+#: ../plug-ins/common/filter-pack.c:630
+msgid "Roughness"
+msgstr "Ujamning"
+
+#: ../plug-ins/common/filter-pack.c:673
+#: ../plug-ins/common/filter-pack.c:1316
+msgid "Affected Range"
+msgstr "Påverka område"
+
+#: ../plug-ins/common/filter-pack.c:677
+msgid "Sha_dows"
+msgstr "_Skyggar"
+
+#: ../plug-ins/common/filter-pack.c:678
+msgid "_Midtones"
+msgstr "_Midttone"
+
+#: ../plug-ins/common/filter-pack.c:679
+msgid "H_ighlights"
+msgstr "_Høglys"
+
+#: ../plug-ins/common/filter-pack.c:693
+msgid "Windows"
+msgstr "Vindauge"
+
+#: ../plug-ins/common/filter-pack.c:703
+#: ../plug-ins/common/van-gogh-lic.c:671
+msgid "_Saturation"
+msgstr "_Metning"
+
+#: ../plug-ins/common/filter-pack.c:711
+msgid "A_dvanced"
+msgstr "_Avansert"
+
+#: ../plug-ins/common/filter-pack.c:731
+msgid "Value Variations"
+msgstr "Lysverdivariasjonar"
+
+#: ../plug-ins/common/filter-pack.c:776
+msgid "Saturation Variations"
+msgstr "Metningsvariasjonar"
+
+#: ../plug-ins/common/filter-pack.c:829
+msgid "Select Pixels By"
+msgstr "Vel piksel etter"
+
+#: ../plug-ins/common/filter-pack.c:834
+msgid "H_ue"
+msgstr "_Kulør"
+
+#: ../plug-ins/common/filter-pack.c:835
+msgid "Satu_ration"
+msgstr "_Metning"
+
+#: ../plug-ins/common/filter-pack.c:836
+msgid "V_alue"
+msgstr "_Lysverdi"
+
+#: ../plug-ins/common/filter-pack.c:862
+msgid "Show"
+msgstr "Vis"
+
+#: ../plug-ins/common/filter-pack.c:867
+msgid "_Entire image"
+msgstr "_Heile biletet"
+
+#: ../plug-ins/common/filter-pack.c:868
+msgid "Se_lection only"
+msgstr "_Bare utvalet"
+
+#: ../plug-ins/common/filter-pack.c:869
+msgid "Selec_tion in context"
+msgstr "_Utval i biletet"
+
+#: ../plug-ins/common/filter-pack.c:1200
+msgid "Filter Pack Simulation"
+msgstr "Filterpakke simulering"
+
+#: ../plug-ins/common/filter-pack.c:1289
+msgid "Shadows:"
+msgstr "Skyggar:"
+
+#: ../plug-ins/common/filter-pack.c:1290
+msgid "Midtones:"
+msgstr "Midttoner:"
+
+#: ../plug-ins/common/filter-pack.c:1291
+msgid "Highlights:"
+msgstr "Høglys:"
+
+#: ../plug-ins/common/filter-pack.c:1304
+msgid "Advanced Filter Pack Options"
+msgstr "Avanserte innstillingar for filterpakka"
+
+#. ****************** MISC OPTIONS **************************
+#: ../plug-ins/common/filter-pack.c:1416
+msgid "Preview Size"
+msgstr "Storleik på førehandsvisinga "
+
+#: ../plug-ins/common/fractal-trace.c:115
+msgid "Transform image with the Mandelbrot Fractal"
+msgstr "Transformer biletet med Mandelbrotfraktalen"
+
+#: ../plug-ins/common/fractal-trace.c:120
+msgid "_Fractal Trace..."
+msgstr "Fraktal_spor …"
+
+#: ../plug-ins/common/fractal-trace.c:459
+#: ../plug-ins/common/fractal-trace.c:690
+msgid "Fractal Trace"
+msgstr "Fraktal"
+
+#. Settings
+#: ../plug-ins/common/fractal-trace.c:730
+msgid "Outside Type"
+msgstr "Rammehandtering"
+
+#: ../plug-ins/common/fractal-trace.c:741
+msgid "_White"
+msgstr "_Kvit"
+
+#: ../plug-ins/common/fractal-trace.c:748
+msgid "Mandelbrot Parameters"
+msgstr "Mandelbrotparameter"
+
+#: ../plug-ins/common/fractal-trace.c:759
+msgid "X_1:"
+msgstr "X_1:"
+
+#: ../plug-ins/common/fractal-trace.c:768
+msgid "X_2:"
+msgstr "X_2:"
+
+#: ../plug-ins/common/fractal-trace.c:777
+msgid "Y_1:"
+msgstr "Y_1:"
+
+#: ../plug-ins/common/fractal-trace.c:786
+msgid "Y_2:"
+msgstr "Y_2:"
+
+#: ../plug-ins/common/gee-zoom.c:131
+#: ../plug-ins/common/gee.c:98
+msgid "A big hello from the GIMP team!"
+msgstr "Eit stort hallo frå GIMP-teamet!"
+
+#: ../plug-ins/common/gee-zoom.c:136
+#: ../plug-ins/common/gee-zoom.c:196
+msgid "Gee Zoom"
+msgstr "GEE-ZOOM"
+
+#: ../plug-ins/common/gee-zoom.c:202
+#: ../plug-ins/common/gee.c:165
+msgid "Thank You for Choosing GIMP"
+msgstr "Takk for at du valde GIMP"
+
+#: ../plug-ins/common/gee-zoom.c:210
+msgid "An obsolete creation by %s"
+msgstr "Ein forelda kreasjon av %s"
+
+#: ../plug-ins/common/gee.c:103
+#: ../plug-ins/common/gee.c:159
+msgid "Gee Slime"
+msgstr "GEE-SLIME"
+
+#: ../plug-ins/common/gee.c:172
+msgid "A less obsolete creation by %s"
+msgstr "Ein forelda kreasjon av %s"
+
+#: ../plug-ins/common/gradient-map.c:83
+msgid "Recolor the image using colors from the active gradient"
+msgstr "Farg biletet på nytt med fargar frå den gjeldande fargeovergangen"
+
+#: ../plug-ins/common/gradient-map.c:96
+msgid "_Gradient Map"
+msgstr "_Fargelegg frå fargeovergang"
+
+#: ../plug-ins/common/gradient-map.c:105
+msgid "Recolor the image using colors from the active palette"
+msgstr "Farg biletet på nytt med fargar frå den gjeldande paletten"
+
+#: ../plug-ins/common/gradient-map.c:118
+msgid "_Palette Map"
+msgstr "Fargelegg frå _palett"
+
+#: ../plug-ins/common/gradient-map.c:161
+msgid "Gradient Map"
+msgstr "Fargeovergangskart"
+
+#: ../plug-ins/common/gradient-map.c:166
+msgid "Palette Map"
+msgstr "Palettkart"
+
+#: ../plug-ins/common/grid.c:141
+msgid "Draw a grid on the image"
+msgstr "Teikan eit rutemønster på biletet"
+
+#: ../plug-ins/common/grid.c:147
+msgid "_Grid..."
+msgstr "_Rutenett …"
+
+#: ../plug-ins/common/grid.c:240
+msgid "Drawing grid"
+msgstr "Teiknar nettet"
+
+#: ../plug-ins/common/grid.c:634
+#: ../plug-ins/gfig/gfig-dialog.c:1354
+#: ../plug-ins/imagemap/imap_menu.c:208
+msgid "Grid"
+msgstr "Rutenett"
+
+#. attach labels
+#: ../plug-ins/common/grid.c:716
+msgid "Horizontal"
+msgstr "Horisontal"
+
+#: ../plug-ins/common/grid.c:718
+msgid "Vertical"
+msgstr "Vertikal"
+
+#: ../plug-ins/common/grid.c:720
+msgid "Intersection"
+msgstr "Krysspunkt"
+
+#. attach labels
+#: ../plug-ins/common/grid.c:856
+msgid "Offset:"
+msgstr "Forskyving:"
+
+#. attach color selectors
+#: ../plug-ins/common/grid.c:895
+msgid "Horizontal Color"
+msgstr "Horisontal farge"
+
+#: ../plug-ins/common/grid.c:913
+msgid "Vertical Color"
+msgstr "Vertikal farge"
+
+#: ../plug-ins/common/grid.c:931
+msgid "Intersection Color"
+msgstr "Farge på krysspunktet"
+
+#: ../plug-ins/common/guillotine.c:74
 msgid "Slice the image into subimages using guides"
 msgstr "Deler biletet opp i bitar ved hjelp av hjelpelinjene"
 
-#: ../plug-ins/common/guillotine.c:74
+#: ../plug-ins/common/guillotine.c:81
 msgid "_Guillotine"
 msgstr "_Giljotin"
 
-#: ../plug-ins/common/guillotine.c:106
+#: ../plug-ins/common/guillotine.c:119
 msgid "Guillotine"
-msgstr "Giljotin..."
+msgstr "Giljotin"
 
-#: ../plug-ins/common/header.c:77
-msgid "C source code header"
-msgstr "Header for kjeldeteksten i C-kode"
-
-#: ../plug-ins/common/hot.c:207
+#: ../plug-ins/common/hot.c:206
 msgid "Find and fix pixels that may be unsafely bright"
 msgstr "Finn og fiks pikslar som er farleg lyse"
 
-#: ../plug-ins/common/hot.c:217
+#: ../plug-ins/common/hot.c:216
 msgid "_Hot..."
-msgstr "_Heit..."
+msgstr "_TV-filter …"
 
-#: ../plug-ins/common/hot.c:379 ../plug-ins/common/hot.c:570
+#: ../plug-ins/common/hot.c:386
+#: ../plug-ins/common/hot.c:585
 msgid "Hot"
 msgstr "Heit"
 
-#: ../plug-ins/common/hot.c:607
+#: ../plug-ins/common/hot.c:622
 msgid "Create _new layer"
 msgstr "Opprett _nytt lag"
 
-#: ../plug-ins/common/hot.c:616
+#: ../plug-ins/common/hot.c:631
 msgid "Action"
 msgstr "Handling"
 
-#: ../plug-ins/common/hot.c:620
+#: ../plug-ins/common/hot.c:635
 msgid "Reduce _Luminance"
 msgstr "Reduser _lysstyrke"
 
-#: ../plug-ins/common/hot.c:621
+#: ../plug-ins/common/hot.c:636
 msgid "Reduce _Saturation"
 msgstr "Reduser _metning"
 
-#: ../plug-ins/common/hot.c:622 ../plug-ins/common/waves.c:281
+#: ../plug-ins/common/hot.c:637
+#: ../plug-ins/common/waves.c:282
 msgid "_Blacken"
 msgstr "_Svert"
 
-#: ../plug-ins/common/illusion.c:91
+#: ../plug-ins/common/illusion.c:90
 msgid "Superimpose many altered copies of the image"
-msgstr "Legg oppå mange endra kopiar av biletet"
+msgstr "Del biletet opp i bitar og legg bitane inn i biletet. (Kaleidoskopliknande)."
 
-#: ../plug-ins/common/illusion.c:96
+#: ../plug-ins/common/illusion.c:95
 msgid "_Illusion..."
-msgstr "_Illusjon..."
+msgstr "_Illusjon …"
 
-#: ../plug-ins/common/illusion.c:168 ../plug-ins/common/illusion.c:350
+#: ../plug-ins/common/illusion.c:167
+#: ../plug-ins/common/illusion.c:349
 msgid "Illusion"
 msgstr "Illusjon"
 
-#: ../plug-ins/common/illusion.c:388
+#: ../plug-ins/common/illusion.c:387
 msgid "_Divisions:"
 msgstr "_Deling:"
 
-#: ../plug-ins/common/illusion.c:398
+#: ../plug-ins/common/illusion.c:397
 msgid "Mode _1"
 msgstr "Modus _1"
 
-#: ../plug-ins/common/illusion.c:413
+#: ../plug-ins/common/illusion.c:412
 msgid "Mode _2"
 msgstr "Modus _2"
 
-#: ../plug-ins/common/iwarp.c:262
+#: ../plug-ins/common/iwarp.c:264
 msgid "Use mouse control to warp image areas"
 msgstr "Bruk musekontrollen for å deformere deler av biletet"
 
-#: ../plug-ins/common/iwarp.c:267
+#: ../plug-ins/common/iwarp.c:269
 msgid "_IWarp..."
-msgstr "_Interaktiv deformasjon..."
+msgstr "_Interaktiv deformasjon …"
 
-#: ../plug-ins/common/iwarp.c:697
+#: ../plug-ins/common/iwarp.c:699
 msgid "Warping"
-msgstr "Deformerer..."
+msgstr "Deformerer"
 
-#: ../plug-ins/common/iwarp.c:802
-#, c-format
+#: ../plug-ins/common/iwarp.c:804
 msgid "Warping Frame %d"
 msgstr "Deformerer ramme nr. %d"
 
-#: ../plug-ins/common/iwarp.c:814
+#: ../plug-ins/common/iwarp.c:816
 msgid "Ping pong"
 msgstr "Ping-Pong"
 
-#: ../plug-ins/common/iwarp.c:1020
+#: ../plug-ins/common/iwarp.c:1022
 msgid "A_nimate"
 msgstr "Ani_masjon"
 
-#: ../plug-ins/common/iwarp.c:1039
+#: ../plug-ins/common/iwarp.c:1041
 msgid "Number of _frames:"
 msgstr "Talet på rammer:"
 
-#: ../plug-ins/common/iwarp.c:1048
+#: ../plug-ins/common/iwarp.c:1050
 msgid "R_everse"
 msgstr "_Reverser"
 
-#: ../plug-ins/common/iwarp.c:1057
+#: ../plug-ins/common/iwarp.c:1059
 msgid "_Ping pong"
 msgstr "Ping-Pong"
 
-#: ../plug-ins/common/iwarp.c:1070
+#: ../plug-ins/common/iwarp.c:1072
 msgid "_Animate"
 msgstr "A_nimasjon"
 
-#: ../plug-ins/common/iwarp.c:1091
+#: ../plug-ins/common/iwarp.c:1093
 msgid "Deform Mode"
 msgstr "Deformasjonsmodus"
 
-#: ../plug-ins/common/iwarp.c:1104
+#: ../plug-ins/common/iwarp.c:1106
 msgid "_Move"
 msgstr "Fl_ytt"
 
-#: ../plug-ins/common/iwarp.c:1105
+#: ../plug-ins/common/iwarp.c:1107
 msgid "_Grow"
 msgstr "_Gjer større"
 
-#: ../plug-ins/common/iwarp.c:1106
+#: ../plug-ins/common/iwarp.c:1108
 msgid "S_wirl CCW"
 msgstr "Drei _mot klokka"
 
-#: ../plug-ins/common/iwarp.c:1107
+#: ../plug-ins/common/iwarp.c:1109
 msgid "Remo_ve"
 msgstr "_Fjern"
 
-#: ../plug-ins/common/iwarp.c:1108
+#: ../plug-ins/common/iwarp.c:1110
 msgid "S_hrink"
 msgstr "_Krymp"
 
-#: ../plug-ins/common/iwarp.c:1109
+#: ../plug-ins/common/iwarp.c:1111
 msgid "Sw_irl CW"
 msgstr "Drei med _klokka"
 
-#: ../plug-ins/common/iwarp.c:1138
+#: ../plug-ins/common/iwarp.c:1140
 msgid "_Deform radius:"
 msgstr "De_formasjonsradius:"
 
-#: ../plug-ins/common/iwarp.c:1148
+#: ../plug-ins/common/iwarp.c:1150
 msgid "D_eform amount:"
 msgstr "_Deformasjonsgrad:"
 
-#: ../plug-ins/common/iwarp.c:1157
+#: ../plug-ins/common/iwarp.c:1159
 msgid "_Bilinear"
 msgstr "_Bilineær"
 
-#: ../plug-ins/common/iwarp.c:1171
+#: ../plug-ins/common/iwarp.c:1173
 msgid "Adaptive s_upersample"
 msgstr "Adaptiv super_utjamning"
 
-#: ../plug-ins/common/iwarp.c:1191
+#: ../plug-ins/common/iwarp.c:1193
 msgid "Ma_x depth:"
 msgstr "Ma_ks djupn:"
 
-#: ../plug-ins/common/iwarp.c:1201
+#: ../plug-ins/common/iwarp.c:1203
 msgid "Thresho_ld:"
 msgstr "_Grenseverdi:"
 
-#: ../plug-ins/common/iwarp.c:1214 ../plug-ins/common/sinus.c:771
-#: ../plug-ins/gflare/gflare.c:2821
+#: ../plug-ins/common/iwarp.c:1216
+#: ../plug-ins/common/sinus.c:770
+#: ../plug-ins/gradient-flare/gradient-flare.c:2866
 msgid "_Settings"
 msgstr "_Innstillingar"
 
-#: ../plug-ins/common/iwarp.c:1263
+#: ../plug-ins/common/iwarp.c:1274
 msgid "IWarp"
 msgstr "Interaktiv deformasjon"
 
-#: ../plug-ins/common/iwarp.c:1299
-msgid ""
-"Click and drag in the preview to define the distortions to apply to the "
-"image."
+#: ../plug-ins/common/iwarp.c:1312
+msgid "Click and drag in the preview to define the distortions to apply to the image."
 msgstr "Klikk og dra på førehandsvisinga for å legge inn  forvrengningane."
 
-#: ../plug-ins/common/jigsaw.c:356
+#: ../plug-ins/common/jigsaw.c:355
 msgid "Add a jigsaw-puzzle pattern to the image"
 msgstr "Legg eit puslespelmønster inn i biletet"
 
-#: ../plug-ins/common/jigsaw.c:361
+#: ../plug-ins/common/jigsaw.c:360
 msgid "_Jigsaw..."
-msgstr "_Puslespel..."
+msgstr "_Puslespel …"
 
-#: ../plug-ins/common/jigsaw.c:414
+#: ../plug-ins/common/jigsaw.c:413
 msgid "Assembling jigsaw"
-msgstr "Puslar saman..."
+msgstr "Puslar saman"
 
-#: ../plug-ins/common/jigsaw.c:2416
+#: ../plug-ins/common/jigsaw.c:2415
 msgid "Jigsaw"
 msgstr "Puslespel"
 
@@ -4954,52 +5488,39 @@ msgstr "Kvar del har rette kantar"
 msgid "Each piece has curved sides"
 msgstr "Kvar del har boga kantar"
 
-#: ../plug-ins/common/laplace.c:75
-msgid "High-resolution edge detection"
-msgstr "Høgoppløysings retningsbestemt kantfinning"
-
-#: ../plug-ins/common/laplace.c:85
-msgid "_Laplace"
-msgstr "_Laplace"
-
-#: ../plug-ins/common/laplace.c:321
-msgid "Cleanup"
-msgstr "Rydd opp"
-
-#: ../plug-ins/common/lcms.c:222
+#: ../plug-ins/common/lcms.c:217
 msgid "Set a color profile on the image"
 msgstr "Sett ein fargeprofil for biletet"
 
-#: ../plug-ins/common/lcms.c:229
+#: ../plug-ins/common/lcms.c:224
 msgid "_Assign Color Profile..."
-msgstr "Set farge_profil..."
+msgstr "Set farge_profil …"
 
-#: ../plug-ins/common/lcms.c:245
+#: ../plug-ins/common/lcms.c:240
 msgid "Assign default RGB Profile"
 msgstr "Bruk til førehandsinnstilt RGB-profil"
 
-#: ../plug-ins/common/lcms.c:252
+#: ../plug-ins/common/lcms.c:247
 msgid "Apply a color profile on the image"
 msgstr "Legg ein fargeprofil til biletet"
 
-#: ../plug-ins/common/lcms.c:262
+#: ../plug-ins/common/lcms.c:257
 msgid "_Convert to Color Profile..."
-msgstr "_Konverter til fargeprofil..."
+msgstr "_Konverter til fargeprofil …"
 
-#: ../plug-ins/common/lcms.c:280
+#: ../plug-ins/common/lcms.c:275
 msgid "Convert to default RGB Profile"
 msgstr "Konverter til førehandsinnstilt RGB-profil"
 
-#: ../plug-ins/common/lcms.c:294
+#: ../plug-ins/common/lcms.c:289
 msgid "Image Color Profile Information"
 msgstr "Informasjon om fargeprofilen i biletet"
 
-#: ../plug-ins/common/lcms.c:308
+#: ../plug-ins/common/lcms.c:303
 msgid "Color Profile Information"
 msgstr "Informasjon om fargeprofil"
 
 #: ../plug-ins/common/lcms.c:571
-#, c-format
 msgid "Color profile '%s' is not for RGB color space."
 msgstr "Fargeprofilen «%s» er ikkje for RGB-fargerommet"
 
@@ -5007,600 +5528,413 @@ msgstr "Fargeprofilen «%s» er ikkje for RGB-fargerommet"
 msgid "Default RGB working space"
 msgstr "Førehandsinnstilt RGB fargeområde"
 
-#: ../plug-ins/common/lcms.c:766
-msgid ""
-"Data attached as 'icc-profile' does not appear to be an ICC color profile"
-msgstr ""
-"Data oppførte som «icc-profile» ser ikkje ut til å vere ein ICC-fargeprofil"
+#: ../plug-ins/common/lcms.c:774
+msgid "Data attached as 'icc-profile' does not appear to be an ICC color profile"
+msgstr "Data oppførte som «icc-profile» ser ikkje ut til å vere ein ICC-fargeprofil"
 
-#: ../plug-ins/common/lcms.c:816
-#, c-format
+#: ../plug-ins/common/lcms.c:824
 msgid "'%s' does not appear to be an ICC color profile"
 msgstr "«%s» ser ikkje ut til å vere ein ICC fargeprofil"
 
 #. ICC color profile conversion
-#: ../plug-ins/common/lcms.c:874
-#, c-format
+#: ../plug-ins/common/lcms.c:884
 msgid "Converting from '%s' to '%s'"
 msgstr "Konverterer frå «%s» til «%s»"
 
-#: ../plug-ins/common/lcms.c:1119
-#, c-format
+#: ../plug-ins/common/lcms.c:1128
 msgid "Could not load ICC profile from '%s'"
 msgstr "Kan ikkje laste ICC fargeprofil frå «%s»"
 
-#: ../plug-ins/common/lcms.c:1141
-#, c-format
+#: ../plug-ins/common/lcms.c:1150
 msgid "The image '%s' has an embedded color profile:"
 msgstr "Biletet «%s» har ein innebygd fargeprofil:"
 
-#: ../plug-ins/common/lcms.c:1185
-#, c-format
+#: ../plug-ins/common/lcms.c:1194
 msgid "Convert the image to the RGB working space (%s)?"
 msgstr "Konverter biletet til RGB fargerom (%s)"
 
-#: ../plug-ins/common/lcms.c:1216
+#: ../plug-ins/common/lcms.c:1225
 msgid "Convert to RGB working space?"
 msgstr "Konverter til RGB fargerom?"
 
-#: ../plug-ins/common/lcms.c:1221
+#: ../plug-ins/common/lcms.c:1230
 msgid "_Keep"
 msgstr "Behald"
 
-#: ../plug-ins/common/lcms.c:1226
+#: ../plug-ins/common/lcms.c:1235
 msgid "_Convert"
 msgstr "_Konvertér"
 
-#: ../plug-ins/common/lcms.c:1253 ../plug-ins/jpeg/jpeg-exif.c:372
+#: ../plug-ins/common/lcms.c:1262
+#: ../plug-ins/file-jpeg/jpeg-exif.c:376
 msgid "_Don't ask me again"
 msgstr "_Ikkje spør igjen"
 
-#: ../plug-ins/common/lcms.c:1317
+#: ../plug-ins/common/lcms.c:1326
 msgid "Select destination profile"
 msgstr "Vel målprofilen"
 
-#: ../plug-ins/common/lcms.c:1344
+#: ../plug-ins/common/lcms.c:1353
 msgid "All files (*.*)"
 msgstr "Alle filer (*.*)"
 
-#: ../plug-ins/common/lcms.c:1349
+#: ../plug-ins/common/lcms.c:1358
 msgid "ICC color profile (*.icc, *.icm)"
 msgstr "ICC-fargeprofil (*.icc, *.icm)"
 
-#: ../plug-ins/common/lcms.c:1392
-#, c-format
+#: ../plug-ins/common/lcms.c:1401
 msgid "RGB workspace (%s)"
 msgstr "RGB-fargeområde (%s)"
 
-#: ../plug-ins/common/lcms.c:1442
+#: ../plug-ins/common/lcms.c:1451
 msgid "Convert to ICC Color Profile"
 msgstr "Omform til ICC fargeprofil"
 
-#: ../plug-ins/common/lcms.c:1443
+#: ../plug-ins/common/lcms.c:1452
 msgid "Assign ICC Color Profile"
 msgstr "Tildel ICC-fargeprofil"
 
-#: ../plug-ins/common/lcms.c:1451
+#: ../plug-ins/common/lcms.c:1460
 msgid "_Assign"
 msgstr "_Tilordne"
 
-#: ../plug-ins/common/lcms.c:1468
+#: ../plug-ins/common/lcms.c:1477
 msgid "Current Color Profile"
 msgstr "Gjeldande fargeprofil"
 
-#: ../plug-ins/common/lcms.c:1483
+#: ../plug-ins/common/lcms.c:1492
 msgid "Convert to"
 msgstr "Konverter til "
 
-#: ../plug-ins/common/lcms.c:1483
+#: ../plug-ins/common/lcms.c:1492
 msgid "Assign"
 msgstr "Tilordne"
 
-#: ../plug-ins/common/lcms.c:1507
+#: ../plug-ins/common/lcms.c:1516
 msgid "_Rendering Intent:"
 msgstr "_Fargetilpassing:"
 
-#: ../plug-ins/common/lcms.c:1523
+#: ../plug-ins/common/lcms.c:1532
 msgid "_Black Point Compensation"
 msgstr "_Svartpunktkompensering"
 
-#: ../plug-ins/common/lcms.c:1565
+#: ../plug-ins/common/lcms.c:1574
 msgid "Destination profile is not for RGB color space."
 msgstr "Målprofilen er ikkje for RGB-fargeområdet."
 
-#: ../plug-ins/common/lens.c:115
+#: ../plug-ins/common/lens-apply.c:107
+msgid "Simulate an elliptical lens over the image"
+msgstr "Simulerer ei elliptisk linse over biletet"
+
+#: ../plug-ins/common/lens-apply.c:113
+msgid "Apply _Lens..."
+msgstr "L_upeeffekt …"
+
+#: ../plug-ins/common/lens-apply.c:180
+msgid "Applying lens"
+msgstr "Legg til lupeeffekten"
+
+#: ../plug-ins/common/lens-apply.c:392
+msgid "Lens Effect"
+msgstr "Lupeeffekt"
+
+#: ../plug-ins/common/lens-apply.c:426
+msgid "_Keep original surroundings"
+msgstr "_Behald originalomgivnadane"
+
+#: ../plug-ins/common/lens-apply.c:441
+msgid "_Set surroundings to index 0"
+msgstr "_Sett omgivnadsindeksen til 0"
+
+#: ../plug-ins/common/lens-apply.c:442
+msgid "_Set surroundings to background color"
+msgstr "_Sett omgivnadane til bakgrunnsfargen"
+
+#: ../plug-ins/common/lens-apply.c:457
+msgid "_Make surroundings transparent"
+msgstr "_Lag omgivnadane gjennomsiktige"
+
+#: ../plug-ins/common/lens-apply.c:474
+msgid "_Lens refraction index:"
+msgstr "_Brytningsindeks for linsa:"
+
+#: ../plug-ins/common/lens-distortion.c:114
 msgid "Corrects lens distortion"
 msgstr "Korrigerar linsefeil"
 
-#: ../plug-ins/common/lens.c:120
+#: ../plug-ins/common/lens-distortion.c:119
 msgid "Lens Distortion..."
-msgstr "Linsefeil..."
+msgstr "Linsefeil …"
 
-#: ../plug-ins/common/lens.c:383
+#: ../plug-ins/common/lens-distortion.c:382
 msgid "Lens distortion"
 msgstr "Linsefeil"
 
-#: ../plug-ins/common/lens.c:483
+#: ../plug-ins/common/lens-distortion.c:482
 msgid "Lens Distortion"
 msgstr "Linsefeil"
 
-#: ../plug-ins/common/lens.c:520
+#: ../plug-ins/common/lens-distortion.c:520
 msgid "_Main:"
 msgstr "_Hovudeffekt:"
 
-#: ../plug-ins/common/lens.c:534
+#: ../plug-ins/common/lens-distortion.c:534
 msgid "_Edge:"
 msgstr "_Kant:"
 
-#: ../plug-ins/common/lens.c:548 ../plug-ins/flame/flame.c:1213
+#: ../plug-ins/common/lens-distortion.c:548
+#: ../plug-ins/flame/flame.c:1236
 msgid "_Zoom:"
 msgstr "_Zoom:"
 
-#: ../plug-ins/common/lens.c:562
+#: ../plug-ins/common/lens-distortion.c:562
 msgid "_Brighten:"
 msgstr "Gjer _lysare:"
 
-#: ../plug-ins/common/lens.c:576
+#: ../plug-ins/common/lens-distortion.c:576
 msgid "_X shift:"
 msgstr "_X-forskyving:"
 
-#: ../plug-ins/common/lens.c:590
+#: ../plug-ins/common/lens-distortion.c:590
 msgid "_Y shift:"
 msgstr "_Y-forskyving:"
 
-#: ../plug-ins/common/lic.c:566 ../plug-ins/common/lic.c:641
-msgid "Van Gogh (LIC)"
-msgstr "Van Gogh (LIC)"
+#: ../plug-ins/common/lens-flare.c:187
+msgid "Add a lens flare effect"
+msgstr "Legg til ein linserefleks"
 
-#: ../plug-ins/common/lic.c:666
-msgid "Effect Channel"
-msgstr "Effektkanal"
+#: ../plug-ins/common/lens-flare.c:194
+msgid "Lens _Flare..."
+msgstr "_Linserefleks …"
 
-#: ../plug-ins/common/lic.c:673
-msgid "_Brightness"
-msgstr "_Lysstyrke"
+#: ../plug-ins/common/lens-flare.c:269
+msgid "Render lens flare"
+msgstr "Lager linserefleksen"
 
-#: ../plug-ins/common/lic.c:679
-msgid "Effect Operator"
-msgstr "Effektoperatør"
+#: ../plug-ins/common/lens-flare.c:305
+msgid "Lens Flare"
+msgstr "Linserefleks"
 
-#: ../plug-ins/common/lic.c:684
-msgid "_Derivative"
-msgstr "_Avleidd"
+#: ../plug-ins/common/lens-flare.c:752
+msgid "Center of Flare Effect"
+msgstr "Sentrum for refleksen"
 
-#: ../plug-ins/common/lic.c:685
-msgid "_Gradient"
-msgstr "_Fargeovergang"
+#: ../plug-ins/common/lens-flare.c:792
+#: ../plug-ins/common/nova.c:483
+msgid "Show _position"
+msgstr "_Vis posisjonen"
 
-#: ../plug-ins/common/lic.c:691
-msgid "Convolve"
-msgstr "Konturutjamning"
-
-#: ../plug-ins/common/lic.c:696
-msgid "_With white noise"
-msgstr "_Med kvit støy"
-
-#: ../plug-ins/common/lic.c:697
-msgid "W_ith source image"
-msgstr "M_ed kjeldebiletet"
-
-#: ../plug-ins/common/lic.c:716
-msgid "_Effect image:"
-msgstr "_Effektbilete:"
-
-#: ../plug-ins/common/lic.c:727
-msgid "_Filter length:"
-msgstr "_Filterlengde:"
-
-#: ../plug-ins/common/lic.c:736
-msgid "_Noise magnitude:"
-msgstr "_Støymengdel:"
-
-#: ../plug-ins/common/lic.c:745
-msgid "In_tegration steps:"
-msgstr "In_tegrasjonssteg:"
-
-#: ../plug-ins/common/lic.c:754
-msgid "_Minimum value:"
-msgstr "_Minimumverdi:"
-
-#: ../plug-ins/common/lic.c:763
-msgid "M_aximum value:"
-msgstr "M_aksimumverdi:"
-
-#: ../plug-ins/common/lic.c:809
-msgid "Special effects that nobody understands"
-msgstr "Spesialeffektar som ingen forstår"
-
-#: ../plug-ins/common/lic.c:814
-msgid "_Van Gogh (LIC)..."
-msgstr "_Van Gogh (LIC)..."
-
-#: ../plug-ins/common/mail.c:188
+#: ../plug-ins/common/mail.c:187
 msgid "Send the image by email"
 msgstr "Send biletet med e-post"
 
-#: ../plug-ins/common/mail.c:194
+#: ../plug-ins/common/mail.c:193
 msgid "Send by E_mail..."
-msgstr "Send som e-post..."
+msgstr "Send som e-post …"
 
-#: ../plug-ins/common/mail.c:408
-#, fuzzy
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
-msgstr "Send som e-post..."
+msgstr "Send som e-post"
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "_Send"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "_Filnamn:"
 
-#: ../plug-ins/common/mail.c:457
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
 msgstr "_Til:"
 
-#: ../plug-ins/common/mail.c:471
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
 msgstr "_Frå:"
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "_Emne:"
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "Mangel på eller feil ved filutvidinga"
 
-#: ../plug-ins/common/mail.c:726
-#, c-format
+#: ../plug-ins/common/mail.c:725
 msgid "Could not start sendmail (%s)"
 msgstr "Fekk ikkje starta sendmail (%s)"
 
-#: ../plug-ins/common/max_rgb.c:90
+#: ../plug-ins/common/max-rgb.c:89
 msgid "Reduce image to pure red, green, and blue"
 msgstr "Reduserer biletet til rein raud, grøn og blå"
 
-#: ../plug-ins/common/max_rgb.c:95
+#: ../plug-ins/common/max-rgb.c:94
 msgid "Maxim_um RGB..."
-msgstr "Maksim_um RGB..."
+msgstr "Maksim_um RGB …"
 
-#: ../plug-ins/common/max_rgb.c:134 ../plug-ins/common/scatter_hsv.c:158
+#: ../plug-ins/common/max-rgb.c:133
+#: ../plug-ins/common/noise-hsv.c:157
 msgid "Can only operate on RGB drawables."
 msgstr "Kan bare arbeide med RGB-bilete."
 
-#: ../plug-ins/common/max_rgb.c:234
+#: ../plug-ins/common/max-rgb.c:233
 msgid "Max RGB"
 msgstr "Maks RGB"
 
-#: ../plug-ins/common/max_rgb.c:259
+#: ../plug-ins/common/max-rgb.c:258
 msgid "Maximum RGB Value"
 msgstr "Maksimum RGB-verdiPNM: Ugyldig maksimalverdi."
 
-#: ../plug-ins/common/max_rgb.c:291
+#: ../plug-ins/common/max-rgb.c:291
 msgid "_Hold the maximal channels"
 msgstr "_Behald maksimumskanalen"
 
-#: ../plug-ins/common/max_rgb.c:294
+#: ../plug-ins/common/max-rgb.c:294
 msgid "Ho_ld the minimal channels"
 msgstr "B_ehald minimumskanalen"
 
-#: ../plug-ins/common/mblur.c:157 ../plug-ins/common/mblur.c:171
-msgid "Simulate movement using directional blur"
-msgstr "Simulerer rørsle ved å bruke retningsbestemt sløring"
-
-#: ../plug-ins/common/mblur.c:164 ../plug-ins/common/mblur.c:177
-msgid "_Motion Blur..."
-msgstr "_Fartssløring..."
-
-#: ../plug-ins/common/mblur.c:910
-msgid "Motion blurring"
-msgstr "Lager fartssløringa..."
-
-#: ../plug-ins/common/mblur.c:1012
-msgid "Motion Blur"
-msgstr "Fartssløring"
-
-#: ../plug-ins/common/mblur.c:1045
-msgid "Blur Type"
-msgstr "Sløringstype"
-
-#: ../plug-ins/common/mblur.c:1049
-msgid "_Linear"
-msgstr "_Lineær"
-
-#: ../plug-ins/common/mblur.c:1050
-msgid "_Radial"
-msgstr "_Radial"
-
-#: ../plug-ins/common/mblur.c:1051 ../plug-ins/imagemap/imap_menu.c:203
-msgid "_Zoom"
-msgstr "_Zoom"
-
-#: ../plug-ins/common/mblur.c:1058
-msgid "Blur Center"
-msgstr "Sløringssentrum"
-
-#: ../plug-ins/common/mblur.c:1101
-msgid "Blur _outward"
-msgstr "Slør _utover"
-
-#: ../plug-ins/common/mblur.c:1114
-msgid "Blur Parameters"
-msgstr "Utjamningsparameter"
-
-#: ../plug-ins/common/mblur.c:1138 ../plug-ins/common/newsprint.c:1001
-msgid "_Angle:"
-msgstr "_Vinkel:"
-
-#. Inform the user that we couldn't losslessly save the
-#. * transparency & just use the full palette
-#: ../plug-ins/common/mng.c:499 ../plug-ins/common/png.c:1734
-msgid "Couldn't losslessly save transparency, saving opacity instead."
-msgstr "Kunne ikkje lagra gjennomsikt utan tap. Lagra dekkevne i staden."
-
-#: ../plug-ins/common/mng.c:1319
-msgid "Save as MNG"
-msgstr "Lagra som MNG"
-
-#: ../plug-ins/common/mng.c:1339
-msgid "MNG Options"
-msgstr "MNG-innstillingar"
-
-#: ../plug-ins/common/mng.c:1345
-msgid "Interlace"
-msgstr "Flett saman"
-
-#: ../plug-ins/common/mng.c:1357
-msgid "Save background color"
-msgstr "Lagra bakgrunnsfarge"
-
-#: ../plug-ins/common/mng.c:1368
-msgid "Save gamma"
-msgstr "Lagra gamma"
-
-#: ../plug-ins/common/mng.c:1378
-msgid "Save resolution"
-msgstr "Lagra oppløysing"
-
-#: ../plug-ins/common/mng.c:1389
-msgid "Save creation time"
-msgstr "Lagra tid for oppretting"
-
-#: ../plug-ins/common/mng.c:1408
-msgid "PNG"
-msgstr "PNG"
-
-#: ../plug-ins/common/mng.c:1409
-msgid "JNG"
-msgstr "JNG"
-
-#: ../plug-ins/common/mng.c:1412
-msgid "PNG + delta PNG"
-msgstr "PNG + delta PNG"
-
-#: ../plug-ins/common/mng.c:1413
-msgid "JNG + delta PNG"
-msgstr "JNG + delta PNG"
-
-#: ../plug-ins/common/mng.c:1414
-msgid "All PNG"
-msgstr "Alle PNG"
-
-#: ../plug-ins/common/mng.c:1415
-msgid "All JNG"
-msgstr "Alle JNG"
-
-#: ../plug-ins/common/mng.c:1427
-#, fuzzy
-msgid "Default chunks type:"
-msgstr "Standard einingstype:"
-
-#: ../plug-ins/common/mng.c:1430
-msgid "Combine"
-msgstr "Kombiner"
-
-#: ../plug-ins/common/mng.c:1431
-msgid "Replace"
-msgstr "Bytt ut"
-
-#: ../plug-ins/common/mng.c:1442
-msgid "Default frame disposal:"
-msgstr "Standard rammeovergang:"
-
-#: ../plug-ins/common/mng.c:1454
-msgid "PNG compression level:"
-msgstr "PNG-kompresjon:"
-
-#: ../plug-ins/common/mng.c:1462 ../plug-ins/common/png.c:1881
-msgid "Choose a high compression level for small file size"
-msgstr "Vel høg kompresjon for å lage små filer."
-
-#: ../plug-ins/common/mng.c:1476
-msgid "JPEG compression quality:"
-msgstr "JPEG-kompressjonskvalitet:"
-
-#: ../plug-ins/common/mng.c:1493
-msgid "JPEG smoothing factor:"
-msgstr "JPEG utglatting:"
-
-#: ../plug-ins/common/mng.c:1503
-msgid "Animated MNG Options"
-msgstr "Innstillingar for animerte MNG"
-
-#: ../plug-ins/common/mng.c:1509
-msgid "Loop"
-msgstr "Sløyfe"
-
-#: ../plug-ins/common/mng.c:1523
-msgid "Default frame delay:"
-msgstr "Standard rammeforseinking:"
-
-#: ../plug-ins/common/mng.c:1596
-msgid "MNG animation"
-msgstr "MNG-animasjon"
-
-#: ../plug-ins/common/mosaic.c:359
+#: ../plug-ins/common/mosaic.c:358
 msgid "Convert the image into irregular tiles"
-msgstr "Konverter biletet til irregulære fliser"
+msgstr "Konverter biletet til irregulære mosaikkfliser"
 
-#: ../plug-ins/common/mosaic.c:364
+#: ../plug-ins/common/mosaic.c:363
 msgid "_Mosaic..."
-msgstr "_Mosaikk..."
+msgstr "_Mosaikk …"
 
 #. progress bar for gradient finding
-#: ../plug-ins/common/mosaic.c:503
+#: ../plug-ins/common/mosaic.c:501
 msgid "Finding edges"
 msgstr "Finn kantane"
 
 #. Progress bar for rendering tiles
-#: ../plug-ins/common/mosaic.c:557
+#: ../plug-ins/common/mosaic.c:555
 msgid "Rendering tiles"
-msgstr "Lager flisene..."
+msgstr "Lager flisene"
 
-#: ../plug-ins/common/mosaic.c:590
+#: ../plug-ins/common/mosaic.c:588
 msgid "Mosaic"
 msgstr "Mosaikk"
 
-#: ../plug-ins/common/mosaic.c:630
+#: ../plug-ins/common/mosaic.c:628
 msgid "Squares"
-msgstr "Kvadrat"
+msgstr "Ruter"
 
-#: ../plug-ins/common/mosaic.c:631
+#: ../plug-ins/common/mosaic.c:629
 msgid "Hexagons"
-msgstr "Sekskanta"
+msgstr "Heksagon"
 
-#: ../plug-ins/common/mosaic.c:632
+#: ../plug-ins/common/mosaic.c:630
 msgid "Octagons & squares"
 msgstr "Åttekantar og kvadrat"
 
-#: ../plug-ins/common/mosaic.c:633
+#: ../plug-ins/common/mosaic.c:631
 msgid "Triangles"
 msgstr "Trekanta"
 
-#: ../plug-ins/common/mosaic.c:641
+#: ../plug-ins/common/mosaic.c:639
 msgid "_Tiling primitives:"
-msgstr "Flisform:"
+msgstr "Flisfor_m:"
 
-#: ../plug-ins/common/mosaic.c:649
+#: ../plug-ins/common/mosaic.c:647
 msgid "Tile _size:"
-msgstr "_Flisstorleik:"
+msgstr "Flis_storleik:"
 
-#: ../plug-ins/common/mosaic.c:674
+#: ../plug-ins/common/mosaic.c:659
+#: ../plug-ins/common/tile-glass.c:302
+msgid "Tile _height:"
+msgstr "Flis_høgde:"
+
+#: ../plug-ins/common/mosaic.c:672
 msgid "Til_e spacing:"
 msgstr "Fuge_breidde"
 
-#: ../plug-ins/common/mosaic.c:686
+#: ../plug-ins/common/mosaic.c:684
 msgid "Tile _neatness:"
 msgstr "Flis_ordning:"
 
-#: ../plug-ins/common/mosaic.c:699
+#: ../plug-ins/common/mosaic.c:697
 msgid "Light _direction:"
 msgstr "_Lysretning:"
 
-#: ../plug-ins/common/mosaic.c:711
+#: ../plug-ins/common/mosaic.c:709
 msgid "Color _variation:"
 msgstr "Farge_variasjon:"
 
-#: ../plug-ins/common/mosaic.c:740
+#: ../plug-ins/common/mosaic.c:738
 msgid "Co_lor averaging"
-msgstr "_Fargegjennomsnitt"
+msgstr "Far_gegjennomsnitt"
 
-#: ../plug-ins/common/mosaic.c:753
+#: ../plug-ins/common/mosaic.c:751
 msgid "Allo_w tile splitting"
 msgstr "Tillat _deling av fliser"
 
-#: ../plug-ins/common/mosaic.c:766
+#: ../plug-ins/common/mosaic.c:764
 msgid "_Pitted surfaces"
 msgstr "_Ruglete overflate"
 
-#: ../plug-ins/common/mosaic.c:779
+#: ../plug-ins/common/mosaic.c:777
 msgid "_FG/BG lighting"
-msgstr "_FG/BG-belysning"
+msgstr "FG/BG-b_elysning"
 
-#: ../plug-ins/common/mosaic.c:2685
-#, c-format
-msgid "Unable to add additional point.\n"
-msgstr "Kunne ikkje legge til fleire punkt.\n"
-
-#: ../plug-ins/common/neon.c:134
-msgid "Simulate the glowing boundary of a neon light"
-msgstr "Simulerer den glødande koronaen til eit neonlys"
-
-#: ../plug-ins/common/neon.c:139
-msgid "_Neon..."
-msgstr "_Neon..."
-
-#: ../plug-ins/common/neon.c:211
-msgid "Neon"
-msgstr "Neon"
-
-#: ../plug-ins/common/neon.c:693
-msgid "Neon Detection"
-msgstr "Neon kantfinnar"
-
-#: ../plug-ins/common/neon.c:745 ../plug-ins/common/unsharp.c:691
-msgid "_Amount:"
-msgstr "_Mengde:"
-
-#: ../plug-ins/common/newsprint.c:127
+#: ../plug-ins/common/newsprint.c:126
 msgid "Round"
 msgstr "Rund"
 
-#: ../plug-ins/common/newsprint.c:136
+#: ../plug-ins/common/newsprint.c:135
 msgid "Line"
 msgstr "Linje"
 
-#: ../plug-ins/common/newsprint.c:145
+#: ../plug-ins/common/newsprint.c:144
+#: ../plug-ins/flame/flame.c:759
 msgid "Diamond"
 msgstr "Rombe"
 
-#: ../plug-ins/common/newsprint.c:153
+#: ../plug-ins/common/newsprint.c:152
 msgid "PS Square (Euclidean Dot)"
 msgstr "PS kvadrat (Euklidsk punkt)"
 
-#: ../plug-ins/common/newsprint.c:162
+#: ../plug-ins/common/newsprint.c:161
 msgid "PS Diamond"
 msgstr "PS Rombe"
 
-#: ../plug-ins/common/newsprint.c:332
+#: ../plug-ins/common/newsprint.c:331
 msgid "_Grey"
 msgstr "_Grå"
 
-#: ../plug-ins/common/newsprint.c:345
+#: ../plug-ins/common/newsprint.c:344
 msgid "R_ed"
 msgstr "R_aud"
 
-#: ../plug-ins/common/newsprint.c:374
+#: ../plug-ins/common/newsprint.c:373
 msgid "C_yan"
 msgstr "C_yanblå"
 
-#: ../plug-ins/common/newsprint.c:382
+#: ../plug-ins/common/newsprint.c:381
 msgid "Magen_ta"
 msgstr "Magen_taraud"
 
-#: ../plug-ins/common/newsprint.c:390
+#: ../plug-ins/common/newsprint.c:389
 msgid "_Yellow"
 msgstr "Gu_l"
 
-#: ../plug-ins/common/newsprint.c:411
+#: ../plug-ins/common/newsprint.c:410
 msgid "Luminance"
 msgstr "Luminans"
 
-#: ../plug-ins/common/newsprint.c:517
+#: ../plug-ins/common/newsprint.c:516
 msgid "Halftone the image to give newspaper-like effect"
 msgstr "Raster biletet for å lage ein effekt som minner om avistrykk"
 
-#: ../plug-ins/common/newsprint.c:526
+#: ../plug-ins/common/newsprint.c:525
 msgid "Newsprin_t..."
-msgstr "_Avistrykk..."
+msgstr "_Avistrykk …"
 
-#: ../plug-ins/common/newsprint.c:627 ../plug-ins/common/newsprint.c:1188
+#: ../plug-ins/common/newsprint.c:626
+#: ../plug-ins/common/newsprint.c:1187
 msgid "Newsprint"
 msgstr "Avistrykk"
 
-#: ../plug-ins/common/newsprint.c:1031
+#: ../plug-ins/common/newsprint.c:1030
 msgid "_Spot function:"
 msgstr "_Punktfunksjon:"
 
@@ -5622,7 +5956,8 @@ msgid "C_ell size:"
 msgstr "_Cellestorleik:"
 
 #. screen settings
-#: ../plug-ins/common/newsprint.c:1298 ../plug-ins/gflare/gflare.c:555
+#: ../plug-ins/common/newsprint.c:1298
+#: ../plug-ins/gradient-flare/gradient-flare.c:553
 msgid "Screen"
 msgstr "Skjerm"
 
@@ -5655,7 +5990,8 @@ msgid "_Factory Defaults"
 msgstr "_Normalinnstillingar"
 
 #. anti-alias control
-#: ../plug-ins/common/newsprint.c:1441 ../plug-ins/gfig/gfig-dialog.c:1256
+#: ../plug-ins/common/newsprint.c:1441
+#: ../plug-ins/gfig/gfig-dialog.c:1255
 msgid "Antialiasing"
 msgstr "Utjamning"
 
@@ -5663,358 +5999,345 @@ msgstr "Utjamning"
 msgid "O_versample:"
 msgstr "Utjamnings_mengde:"
 
-#: ../plug-ins/common/nlfilt.c:118
+#: ../plug-ins/common/nl-filter.c:118
 msgid "Nonlinear swiss army knife filter"
 msgstr "Ulineært alt mogleg filter"
 
-#: ../plug-ins/common/nlfilt.c:124
+#: ../plug-ins/common/nl-filter.c:124
 msgid "_NL Filter..."
-msgstr "_NL Filter..."
+msgstr "_NL Filter …"
 
-#: ../plug-ins/common/nlfilt.c:952 ../plug-ins/common/nlfilt.c:1015
+#: ../plug-ins/common/nl-filter.c:952
+#: ../plug-ins/common/nl-filter.c:1015
 msgid "NL Filter"
 msgstr "NL Filter"
 
-#: ../plug-ins/common/nlfilt.c:1043
+#: ../plug-ins/common/nl-filter.c:1044
 msgid "Filter"
 msgstr "Filter"
 
-#: ../plug-ins/common/nlfilt.c:1047
+#: ../plug-ins/common/nl-filter.c:1048
 msgid "_Alpha trimmed mean"
-msgstr "_Alfabasert middelverdi"
+msgstr "Alfabasert _middelverdi"
 
-#: ../plug-ins/common/nlfilt.c:1049
+#: ../plug-ins/common/nl-filter.c:1050
 msgid "Op_timal estimation"
-msgstr "Op_timalt overslag"
+msgstr "_Optimalt overslag"
 
-#: ../plug-ins/common/nlfilt.c:1051
+#: ../plug-ins/common/nl-filter.c:1052
 msgid "_Edge enhancement"
 msgstr "_Kantforsterking"
 
-#: ../plug-ins/common/nlfilt.c:1076
+#: ../plug-ins/common/nl-filter.c:1077
 msgid "A_lpha:"
-msgstr "A_lfa:"
+msgstr "_Alfa:"
 
-#: ../plug-ins/common/noisify.c:144
+#: ../plug-ins/common/noise-hsv.c:102
+msgid "Randomize hue/saturation/value independently"
+msgstr "Gjer kulør, metning og verdi tilfeldige kvar for seg"
+
+#: ../plug-ins/common/noise-hsv.c:107
+msgid "HSV Noise..."
+msgstr "_HSV-støy …"
+
+#: ../plug-ins/common/noise-hsv.c:214
+#: ../plug-ins/common/noise-hsv.c:363
+msgid "HSV Noise"
+msgstr "HSV-støy"
+
+#: ../plug-ins/common/noise-hsv.c:399
+msgid "_Holdness:"
+msgstr "_Hald:"
+
+#: ../plug-ins/common/noise-hsv.c:411
+msgid "H_ue:"
+msgstr "_Kulør:"
+
+#: ../plug-ins/common/noise-randomize.c:101
+msgid "Random Hurl"
+msgstr "Tilfeldig fargekasting"
+
+#: ../plug-ins/common/noise-randomize.c:102
+msgid "Random Pick"
+msgstr "Tilfeldig plukk"
+
+#: ../plug-ins/common/noise-randomize.c:103
+msgid "Random Slur"
+msgstr "Tilfeldig pletting"
+
+#: ../plug-ins/common/noise-randomize.c:201
+msgid "Completely randomize a fraction of pixels"
+msgstr "Sprei ein del av pikslane tilfeldig utover"
+
+#: ../plug-ins/common/noise-randomize.c:203
+msgid "Randomly interchange some pixels with neighbors"
+msgstr "Bytt ein del pikslar tilfeldig med nabopikslar"
+
+#: ../plug-ins/common/noise-randomize.c:205
+msgid "Randomly slide some pixels downward (similar to melting)"
+msgstr "Flytt noen tilfeldige pikslar nedover. Simulerer smelting."
+
+#: ../plug-ins/common/noise-randomize.c:232
+msgid "_Hurl..."
+msgstr "_Fargekast …"
+
+#: ../plug-ins/common/noise-randomize.c:244
+msgid "_Pick..."
+msgstr "Fargeplu_kk …"
+
+#: ../plug-ins/common/noise-randomize.c:256
+msgid "_Slur..."
+msgstr "_Pletting …"
+
+#: ../plug-ins/common/noise-randomize.c:770
+#: ../plug-ins/common/noise-solid.c:601
+msgid "_Random seed:"
+msgstr "Tilfeldig _frø:"
+
+#: ../plug-ins/common/noise-randomize.c:779
+msgid "R_andomization (%):"
+msgstr "Slump_mengde (%):"
+
+#: ../plug-ins/common/noise-randomize.c:782
+msgid "Percentage of pixels to be filtered"
+msgstr "Mengda av pikslar som skal filtrerast (%)"
+
+#: ../plug-ins/common/noise-randomize.c:794
+msgid "R_epeat:"
+msgstr "G_jenta:"
+
+#: ../plug-ins/common/noise-randomize.c:797
+msgid "Number of times to apply filter"
+msgstr "Kor ofte filteret skal brukast"
+
+#: ../plug-ins/common/noise-rgb.c:143
 msgid "Distort colors by random amounts"
 msgstr "Forvreng fargane tilfeldig"
 
-#: ../plug-ins/common/noisify.c:154
+#: ../plug-ins/common/noise-rgb.c:153
 msgid "_RGB Noise..."
-msgstr "RGB-støy..."
+msgstr "_RGB-støy …"
 
-#: ../plug-ins/common/noisify.c:282
+#: ../plug-ins/common/noise-rgb.c:281
 msgid "Adding noise"
 msgstr "Legg til støy"
 
-#: ../plug-ins/common/noisify.c:448
+#: ../plug-ins/common/noise-rgb.c:448
 msgid "RGB Noise"
-msgstr "RGB-støy"
+msgstr "_RGB-støy"
 
-#: ../plug-ins/common/noisify.c:481
+#: ../plug-ins/common/noise-rgb.c:481
 msgid "Co_rrelated noise"
 msgstr "_Korrelatert støy"
 
-#: ../plug-ins/common/noisify.c:496
+#: ../plug-ins/common/noise-rgb.c:496
 msgid "_Independent RGB"
 msgstr "_Uavhegig RGB"
 
-#: ../plug-ins/common/noisify.c:520 ../plug-ins/common/noisify.c:524
+#: ../plug-ins/common/noise-rgb.c:520
+#: ../plug-ins/common/noise-rgb.c:524
 msgid "_Gray:"
 msgstr "_Grå:"
 
-#: ../plug-ins/common/noisify.c:550
-#, c-format
+#: ../plug-ins/common/noise-rgb.c:550
 msgid "Channel #%d:"
 msgstr "Kanal #%d:"
 
-#: ../plug-ins/common/normalize.c:80
-msgid "Stretch brightness values to cover the full range"
-msgstr "Strekk lysverdien over heile området"
+#: ../plug-ins/common/noise-solid.c:175
+msgid "Create a random cloud-like texture"
+msgstr "Lager ein tilfeldig sky-liknande tekstur"
 
-#: ../plug-ins/common/normalize.c:126
-msgid "Normalizing"
-msgstr "Normaliserer"
+#: ../plug-ins/common/noise-solid.c:181
+msgid "_Solid Noise..."
+msgstr "_Massiv støy …"
 
-#: ../plug-ins/common/nova.c:168
+#. Dialog initialization
+#: ../plug-ins/common/noise-solid.c:314
+#: ../plug-ins/common/noise-solid.c:562
+msgid "Solid Noise"
+msgstr "Massiv støy"
+
+#: ../plug-ins/common/noise-solid.c:614
+msgid "_Detail:"
+msgstr "_Detaljar:"
+
+#. Turbulent
+#: ../plug-ins/common/noise-solid.c:624
+msgid "T_urbulent"
+msgstr "T_urbulens"
+
+#. Tilable
+#: ../plug-ins/common/noise-solid.c:638
+msgid "T_ilable"
+msgstr "_Flisbar"
+
+#: ../plug-ins/common/noise-solid.c:653
+msgid "_X size:"
+msgstr "_X-storleik:"
+
+#: ../plug-ins/common/noise-solid.c:666
+msgid "_Y size:"
+msgstr "_Y-storleik:"
+
+#: ../plug-ins/common/noise-spread.c:88
+msgid "Move pixels around randomly"
+msgstr "Flytt pikslane tilfeldig rundt om på biletet"
+
+#: ../plug-ins/common/noise-spread.c:97
+msgid "Sp_read..."
+msgstr "_Sprei …"
+
+#: ../plug-ins/common/noise-spread.c:180
+msgid "Spreading"
+msgstr "Spreier"
+
+#: ../plug-ins/common/noise-spread.c:343
+msgid "Spread"
+msgstr "Spreiing"
+
+#: ../plug-ins/common/noise-spread.c:368
+msgid "Spread Amount"
+msgstr "Spreiingsmengde"
+
+#: ../plug-ins/common/nova.c:167
 msgid "Add a starburst to the image"
 msgstr "Legg eit stjerneutbrot i biletet"
 
-#: ../plug-ins/common/nova.c:177
+#: ../plug-ins/common/nova.c:176
 msgid "Super_nova..."
-msgstr "Super_nova..."
+msgstr "Super_nova …"
 
-#: ../plug-ins/common/nova.c:261
+#: ../plug-ins/common/nova.c:260
 msgid "Rendering supernova"
-msgstr "Lager supernova..."
+msgstr "Lager supernova"
 
-#: ../plug-ins/common/nova.c:304
+#: ../plug-ins/common/nova.c:303
 msgid "Supernova"
 msgstr "Supernova"
 
-#: ../plug-ins/common/nova.c:349
+#: ../plug-ins/common/nova.c:348
 msgid "Supernova Color Picker"
 msgstr "Supernova fargeplukkar"
 
-#: ../plug-ins/common/nova.c:378
+#: ../plug-ins/common/nova.c:377
 msgid "_Spokes:"
 msgstr "_Stråler:"
 
-#: ../plug-ins/common/nova.c:393
+#: ../plug-ins/common/nova.c:392
 msgid "R_andom hue:"
 msgstr "Tilfeldig _kulør:"
 
-#: ../plug-ins/common/nova.c:446
+#: ../plug-ins/common/nova.c:445
 msgid "Center of Nova"
 msgstr "Sentrum for novaen"
 
-#: ../plug-ins/common/oilify.c:119 ../plug-ins/common/oilify.c:134
+#: ../plug-ins/common/oilify.c:118
+#: ../plug-ins/common/oilify.c:133
 msgid "Smear colors to simulate an oil painting"
 msgstr "Smører ut fargane for å etterlikne oljemaling"
 
-#: ../plug-ins/common/oilify.c:125
+#: ../plug-ins/common/oilify.c:124
 msgid "Oili_fy..."
-msgstr "_Oljemaling..."
+msgstr "_Oljemaling …"
 
-#: ../plug-ins/common/oilify.c:247
+#: ../plug-ins/common/oilify.c:246
 msgid "Oil painting"
 msgstr "Oljemaling"
 
-#: ../plug-ins/common/oilify.c:777
+#: ../plug-ins/common/oilify.c:776
 msgid "Oilify"
 msgstr "Oljemaling"
 
-#: ../plug-ins/common/oilify.c:815
+#: ../plug-ins/common/oilify.c:814
 msgid "_Mask size:"
 msgstr "_Penselbreidde:"
 
 #.
 #. * Mask-size map check button
 #.
-#: ../plug-ins/common/oilify.c:830
+#: ../plug-ins/common/oilify.c:829
 msgid "Use m_ask-size map:"
 msgstr "Bruk kart for m_askestorleik:"
 
-#: ../plug-ins/common/oilify.c:867 ../plug-ins/common/sinus.c:922
+#: ../plug-ins/common/oilify.c:866
+#: ../plug-ins/common/sinus.c:921
 msgid "_Exponent:"
 msgstr "_Eksponent:"
 
 #.
 #. * Exponent map check button
 #.
-#: ../plug-ins/common/oilify.c:882
+#: ../plug-ins/common/oilify.c:881
 msgid "Use e_xponent map:"
 msgstr "Bruk _eksponentkart:"
 
 #.
 #. * Intensity algorithm check button
 #.
-#: ../plug-ins/common/oilify.c:918
+#: ../plug-ins/common/oilify.c:917
 msgid "_Use intensity algorithm"
 msgstr "_Bruk intensitetsalgoritme"
 
-#: ../plug-ins/common/papertile.c:243 ../plug-ins/common/papertile.c:556
-msgid "Paper Tile"
-msgstr "Papirfliser"
-
-#: ../plug-ins/common/papertile.c:269
-msgid "Division"
-msgstr "Deling"
-
-#: ../plug-ins/common/papertile.c:319
-msgid "Fractional Pixels"
-msgstr "Restpikslar"
-
-#: ../plug-ins/common/papertile.c:324
-msgid "_Background"
-msgstr "_Bakgrunn"
-
-#: ../plug-ins/common/papertile.c:326
-msgid "_Ignore"
-msgstr "_Ignorer"
-
-#: ../plug-ins/common/papertile.c:328
-msgid "_Force"
-msgstr "_Tving"
-
-#: ../plug-ins/common/papertile.c:335
-msgid "C_entering"
-msgstr "_Sentrer"
-
-#: ../plug-ins/common/papertile.c:350
-msgid "Movement"
-msgstr "Flytting"
-
-#: ../plug-ins/common/papertile.c:363
-msgid "_Max (%):"
-msgstr "_Maks (%):"
-
-#: ../plug-ins/common/papertile.c:369
-msgid "_Wrap around"
-msgstr "_Linjebryting"
-
-#: ../plug-ins/common/papertile.c:379
-msgid "Background Type"
-msgstr "Bakgrunn"
-
-#: ../plug-ins/common/papertile.c:386
-msgid "I_nverted image"
-msgstr "I_nvertert bilete"
-
-#: ../plug-ins/common/papertile.c:388
-msgid "Im_age"
-msgstr "_Biletet"
-
-#: ../plug-ins/common/papertile.c:390
-msgid "Fo_reground color"
-msgstr "_Forgrunnsfargen"
-
-#: ../plug-ins/common/papertile.c:392
-msgid "Bac_kground color"
-msgstr "_Bakgrunnsfargen"
-
-#: ../plug-ins/common/papertile.c:394
-msgid "S_elect here:"
-msgstr "_Vel farge her:"
-
-#: ../plug-ins/common/papertile.c:401
-msgid "Background Color"
-msgstr "Bakgrunnsfarge"
-
-#: ../plug-ins/common/papertile.c:846
-msgid "Cut image into paper tiles, and slide them"
-msgstr "Klipp biletet opp i papirbitar og forskyv bitane"
-
-#: ../plug-ins/common/papertile.c:851
-msgid "September 31, 1999"
-msgstr "31. September 1999"
-
-#: ../plug-ins/common/papertile.c:852
-msgid "_Paper Tile..."
-msgstr "_Papirfliser..."
-
-#: ../plug-ins/common/pat.c:121 ../plug-ins/common/pat.c:143
-msgid "GIMP pattern"
-msgstr "GIMP-mønster"
-
-#: ../plug-ins/common/pat.c:358
-#, c-format
-msgid "Invalid UTF-8 string in pattern file '%s'."
-msgstr "Ugyldig UTF-8-streng i mønsterfila «%s»."
-
-#: ../plug-ins/common/pat.c:513
-msgid "Save as Pattern"
-msgstr "Lagra som mønster"
-
-#: ../plug-ins/common/pcx.c:129 ../plug-ins/common/pcx.c:148
-msgid "ZSoft PCX image"
-msgstr "ZSoft-PCX-bilete"
-
-#: ../plug-ins/common/pcx.c:354
-#, c-format
-msgid "Could not read header from '%s'"
-msgstr "Kan ikkje lese header i «%s»"
-
-#: ../plug-ins/common/pcx.c:363
-#, c-format
-msgid "'%s' is not a PCX file"
-msgstr "«%s» er ikkje ei PCX-fil"
-
-#: ../plug-ins/common/pcx.c:386
-msgid "Invalid number of bytes per line in PCX header"
-msgstr "Ugyldig tal for byte per linje i PCX-header"
-
-#: ../plug-ins/common/pcx.c:434
-msgid "Unusual PCX flavour, giving up"
-msgstr "Uvanleg PCX-variant, gir opp"
-
-#: ../plug-ins/common/pcx.c:655
-#, c-format
-msgid "Invalid X offset: %d"
-msgstr "Ugyldig X-forskyving: %d"
-
-#: ../plug-ins/common/pcx.c:661
-#, c-format
-msgid "Invalid Y offset: %d"
-msgstr "Ugyldig Y-forskyving: %d"
-
-#: ../plug-ins/common/pcx.c:667
-#, c-format
-msgid "Right border out of bounds (must be < %d): %d"
-msgstr "Høgre kant utanfor grensene (må vere mindre enn %d): %d"
-
-#: ../plug-ins/common/pcx.c:674
-#, c-format
-msgid "Bottom border out of bounds (must be < %d): %d"
-msgstr "Nedre kant utanfor grensene (må vere mindre enn %d): %d"
-
-#: ../plug-ins/common/pcx.c:730
-#, c-format
-msgid "Writing to file '%s' failed: %s"
-msgstr "Klarte ikkje å skrive til  fila «%s»: %s"
-
-#: ../plug-ins/common/photocopy.c:153
+#: ../plug-ins/common/photocopy.c:152
 msgid "Simulate color distortion produced by a copy machine"
 msgstr "Simulerer fargeforstyrringane i ein kopimaskin"
 
-#: ../plug-ins/common/photocopy.c:158
+#: ../plug-ins/common/photocopy.c:157
 msgid "_Photocopy..."
-msgstr "_Fotokopi..."
+msgstr "_Fotokopi …"
 
-#: ../plug-ins/common/photocopy.c:837
+#: ../plug-ins/common/photocopy.c:838
 msgid "Photocopy"
 msgstr "Fotokopi"
 
-#: ../plug-ins/common/photocopy.c:888 ../plug-ins/common/sharpen.c:511
-#: ../plug-ins/common/softglow.c:695
+#: ../plug-ins/common/photocopy.c:889
+#: ../plug-ins/common/sharpen.c:508
+#: ../plug-ins/common/softglow.c:696
 msgid "_Sharpness:"
-msgstr "_Skarpleik:"
+msgstr "Skar_pleik:"
 
-#: ../plug-ins/common/photocopy.c:902
+#: ../plug-ins/common/photocopy.c:903
 msgid "Percent _black:"
 msgstr "_Svart (%):"
 
-#: ../plug-ins/common/photocopy.c:916
+#: ../plug-ins/common/photocopy.c:917
 msgid "Percent _white:"
 msgstr "_Kvit (%):"
 
-#: ../plug-ins/common/pix.c:140 ../plug-ins/common/pix.c:157
-msgid "Alias Pix image"
-msgstr "Alias|Wavefront-PIX-bilete"
-
-#: ../plug-ins/common/pixelize.c:164
+#: ../plug-ins/common/pixelize.c:163
 msgid "Simplify image into an array of solid-colored squares"
 msgstr "Forenkla biletet til ein tabell med einsfarga ruter"
 
-#: ../plug-ins/common/pixelize.c:171
+#: ../plug-ins/common/pixelize.c:170
 msgid "_Pixelize..."
-msgstr "_Gjer om til pikslar..."
+msgstr "Gjer om til _pikslar …"
 
-#: ../plug-ins/common/pixelize.c:273
+#: ../plug-ins/common/pixelize.c:272
 msgid "Pixelizing"
 msgstr "Gjer om til pikslar"
 
-#: ../plug-ins/common/pixelize.c:314
+#: ../plug-ins/common/pixelize.c:315
 msgid "Pixelize"
-msgstr "Lag til piksler"
+msgstr "Pikseliser"
 
-#: ../plug-ins/common/pixelize.c:350
+#: ../plug-ins/common/pixelize.c:351
 msgid "Pixel _width:"
 msgstr "Piksel_breidde:"
 
-#: ../plug-ins/common/pixelize.c:355
+#: ../plug-ins/common/pixelize.c:356
 msgid "Pixel _height:"
 msgstr "Piksel_høgde:"
 
-#: ../plug-ins/common/plasma.c:176
+#: ../plug-ins/common/plasma.c:175
 msgid "Create a random plasma texture"
 msgstr "Lager ein tilfeldig plasmatekstur"
 
-#: ../plug-ins/common/plasma.c:181
+#: ../plug-ins/common/plasma.c:180
 msgid "_Plasma..."
-msgstr "_Plasma..."
+msgstr "_Plasma …"
 
-#: ../plug-ins/common/plasma.c:263 ../plug-ins/common/plasma.c:300
+#: ../plug-ins/common/plasma.c:262
+#: ../plug-ins/common/plasma.c:299
 msgid "Plasma"
 msgstr "Plasma"
 
@@ -6026,2254 +6349,1499 @@ msgstr "_Tilfeldig frø:"
 msgid "T_urbulence:"
 msgstr "T_urbulens:"
 
-#: ../plug-ins/common/plugin-browser.c:134
+#: ../plug-ins/common/plugin-browser.c:133
 msgid "Display information about plug-ins"
 msgstr "Vis informasjon om programtillegga"
 
-#: ../plug-ins/common/plugin-browser.c:144
+#: ../plug-ins/common/plugin-browser.c:143
 msgid "_Plug-In Browser"
 msgstr "_Lesar for programtillegg"
 
-#: ../plug-ins/common/plugin-browser.c:372
+#: ../plug-ins/common/plugin-browser.c:371
 msgid "Searching by name"
 msgstr "Søker på namn"
 
-#: ../plug-ins/common/plugin-browser.c:386
+#: ../plug-ins/common/plugin-browser.c:385
 #, c-format
 msgid "%d plug-in"
 msgid_plural "%d plug-ins"
 msgstr[0] "%d programtillegg"
 msgstr[1] "%d programtillegg"
 
-#: ../plug-ins/common/plugin-browser.c:395
+#: ../plug-ins/common/plugin-browser.c:394
 msgid "No matches for your query"
-msgstr "Ingen treff"
+msgstr "Ingen treff på søket"
 
-#: ../plug-ins/common/plugin-browser.c:398
+#: ../plug-ins/common/plugin-browser.c:397
 #, c-format
 msgid "%d plug-in matches your query"
 msgid_plural "%d plug-ins match your query"
 msgstr[0] "Fann %d programtillegg som passa spørringa"
 msgstr[1] "Fann %d programtillegg som passa spørringa"
 
-#: ../plug-ins/common/plugin-browser.c:529
+#: ../plug-ins/common/plugin-browser.c:528
 msgid "No matches"
 msgstr "Ingen treff"
 
-#: ../plug-ins/common/plugin-browser.c:554
+#: ../plug-ins/common/plugin-browser.c:553
 msgid "Plug-In Browser"
 msgstr "Lesar for programtillegg"
 
-#: ../plug-ins/common/plugin-browser.c:597
+#: ../plug-ins/common/plugin-browser.c:596
 msgid "Name"
 msgstr "Namn"
 
-#: ../plug-ins/common/plugin-browser.c:605
-#: ../plug-ins/common/plugin-browser.c:668
+#: ../plug-ins/common/plugin-browser.c:604
+#: ../plug-ins/common/plugin-browser.c:667
 msgid "Menu Path"
 msgstr "Menystig"
 
-#: ../plug-ins/common/plugin-browser.c:613
-#: ../plug-ins/common/plugin-browser.c:677
+#: ../plug-ins/common/plugin-browser.c:612
+#: ../plug-ins/common/plugin-browser.c:676
 msgid "Image Types"
 msgstr "Bilettype"
 
-#: ../plug-ins/common/plugin-browser.c:623
-#: ../plug-ins/common/plugin-browser.c:686
+#: ../plug-ins/common/plugin-browser.c:622
+#: ../plug-ins/common/plugin-browser.c:685
 msgid "Installation Date"
 msgstr "Installasjonsdato"
 
-#: ../plug-ins/common/plugin-browser.c:647
+#: ../plug-ins/common/plugin-browser.c:646
 msgid "List View"
 msgstr "Listeform"
 
-#: ../plug-ins/common/plugin-browser.c:709
+#: ../plug-ins/common/plugin-browser.c:708
 msgid "Tree View"
 msgstr "Trevising"
 
-#: ../plug-ins/common/png.c:261 ../plug-ins/common/png.c:282
-#: ../plug-ins/common/png.c:302 ../plug-ins/common/png.c:319
-msgid "PNG image"
-msgstr "PNG-bilete"
-
-#: ../plug-ins/common/png.c:613
-#, c-format
-msgid "Error loading PNG file: %s"
-msgstr "Feil ved opning av PNG-fila: %s"
-
-#: ../plug-ins/common/png.c:686
-#, c-format
-msgid "Error while reading '%s'. File corrupted?"
-msgstr "Feil ved lesing av «%s». Er fila skada?"
-
-#. Aie! Unknown type
-#: ../plug-ins/common/png.c:814
-#, c-format
-msgid "Unknown color model in PNG file '%s'."
-msgstr "Ukjent fargemodell i PNG-fila «%s»."
-
-#: ../plug-ins/common/png.c:868
-msgid ""
-"The PNG file specifies an offset that caused the layer to be positioned "
-"outside the image."
-msgstr ""
-"PNG-fila har ei forskyving som gjer at laga blir plasserte utanfor biletet."
-
-#: ../plug-ins/common/png.c:1229
-#, c-format
-msgid "Error while saving '%s'. Could not save image."
-msgstr "Feil ved lagringa av «%s». Biletet kan ikkje lagrast."
-
-#: ../plug-ins/common/png.c:1759
-msgid "Save as PNG"
-msgstr "Lagra som PNG"
-
-#: ../plug-ins/common/png.c:1790
-msgid "_Interlacing (Adam7)"
-msgstr "_Flett saman (Adam7)"
-
-#: ../plug-ins/common/png.c:1801
-msgid "Save _background color"
-msgstr "Lagra _bakgrunnsfarge"
-
-#: ../plug-ins/common/png.c:1809
-msgid "Save _gamma"
-msgstr "Lagra _gamma"
-
-#: ../plug-ins/common/png.c:1819
-msgid "Save layer o_ffset"
-msgstr "Lagra _lagforskyving"
-
-#: ../plug-ins/common/png.c:1828
-msgid "Save _resolution"
-msgstr "Lagra _oppløysing"
-
-#: ../plug-ins/common/png.c:1838
-msgid "Save creation _time"
-msgstr "Lagra _tid for oppretting"
-
-#: ../plug-ins/common/png.c:1847
-msgid "Save comme_nt"
-msgstr "Lagra _kommentarane"
-
-#: ../plug-ins/common/png.c:1863
-msgid "Save color _values from transparent pixels"
-msgstr "Lagra farge_verdiar frå gjennomsiktige pikslar"
-
-#: ../plug-ins/common/png.c:1877
-msgid "Co_mpression level:"
-msgstr "_Komprimering:"
-
-#: ../plug-ins/common/png.c:1895 ../plug-ins/jpeg/jpeg-save.c:1164
-msgid "_Load Defaults"
-msgstr "_Opna standardverdiane"
-
-#: ../plug-ins/common/png.c:1903 ../plug-ins/jpeg/jpeg-save.c:1173
-msgid "S_ave Defaults"
-msgstr "_Lagra standardverdiane"
-
-#: ../plug-ins/common/pnm.c:245
-msgid "PNM Image"
-msgstr "PNM-bilete"
-
-#: ../plug-ins/common/pnm.c:265
-msgid "PNM image"
-msgstr "PNM-bilete"
-
-#: ../plug-ins/common/pnm.c:277
-msgid "PBM image"
-msgstr "PBM-bilete"
-
-#: ../plug-ins/common/pnm.c:289
-msgid "PGM image"
-msgstr "PGM-bilete"
-
-#: ../plug-ins/common/pnm.c:301
-msgid "PPM image"
-msgstr "PPM-bilete"
-
-#: ../plug-ins/common/pnm.c:514 ../plug-ins/common/pnm.c:536
-#: ../plug-ins/common/pnm.c:545 ../plug-ins/common/pnm.c:556
-#: ../plug-ins/common/pnm.c:644 ../plug-ins/common/pnm.c:714
-msgid "Premature end of file."
-msgstr "Uventa filslutt."
-
-#: ../plug-ins/common/pnm.c:516
-msgid "Invalid file."
-msgstr "Ugyldig fil."
-
-#: ../plug-ins/common/pnm.c:530
-msgid "File not in a supported format."
-msgstr "Fila har eit ugyldig format."
-
-#: ../plug-ins/common/pnm.c:539
-msgid "Invalid X resolution."
-msgstr "Ugyldig X-oppløysing."
-
-#: ../plug-ins/common/pnm.c:541
-msgid "Image width is larger than GIMP can handle."
-msgstr "Biletet er breiare enn GIMP kan handtere"
-
-#: ../plug-ins/common/pnm.c:548
-msgid "Invalid Y resolution."
-msgstr "Ugyldig X-oppløysing."
-
-#: ../plug-ins/common/pnm.c:550
-msgid "Image height is larger than GIMP can handle."
-msgstr "Biletet er høgare enn GIMP kan handtere"
-
-#: ../plug-ins/common/pnm.c:562
-msgid "Invalid maximum value."
-msgstr "Ugyldig maksimalverdi."
-
-#: ../plug-ins/common/pnm.c:767
-msgid "Error reading file."
-msgstr "Feil ved lesing av fil"
-
-#: ../plug-ins/common/pnm.c:1133
-msgid "Save as PNM"
-msgstr "Lagra som PNM"
-
-#. file save type
-#: ../plug-ins/common/pnm.c:1150
-msgid "Data formatting"
-msgstr "Dataformatering"
-
-#: ../plug-ins/common/pnm.c:1154
-msgid "Raw"
-msgstr "Raw"
-
-#: ../plug-ins/common/pnm.c:1155
-msgid "Ascii"
-msgstr "Ascii"
-
-#: ../plug-ins/common/polar.c:156
+#: ../plug-ins/common/polar-coords.c:155
 msgid "Convert image to or from polar coordinates"
 msgstr "Omform biletet til eller frå polarkoordinata"
 
-#: ../plug-ins/common/polar.c:163
+#: ../plug-ins/common/polar-coords.c:162
 msgid "P_olar Coordinates..."
-msgstr "P_olarkoordinat..."
+msgstr "P_olarkoordinat …"
 
-#: ../plug-ins/common/polar.c:360
+#: ../plug-ins/common/polar-coords.c:359
 msgid "Polar coordinates"
 msgstr "Polarkoordinat"
 
-#: ../plug-ins/common/polar.c:592
+#: ../plug-ins/common/polar-coords.c:591
 msgid "Polar Coordinates"
 msgstr "Polarkoordinat"
 
-#: ../plug-ins/common/polar.c:630
+#: ../plug-ins/common/polar-coords.c:630
 msgid "Circle _depth in percent:"
-msgstr "Sirkelform i prosent:"
+msgstr "Sirkel_djupne i prosent:"
 
-#: ../plug-ins/common/polar.c:642
+#: ../plug-ins/common/polar-coords.c:642
 msgid "Offset _angle:"
-msgstr "Forskyvingsvinkel:"
+msgstr "F_orskyvingsvinkel:"
 
-#: ../plug-ins/common/polar.c:657
+#: ../plug-ins/common/polar-coords.c:657
 msgid "_Map backwards"
-msgstr "_Avbild bakover"
+msgstr "Avbild _bakover"
 
-#: ../plug-ins/common/polar.c:663
-msgid ""
-"If checked the mapping will begin at the right side, as opposed to beginning "
-"at the left."
-msgstr ""
-"Dette valet gjer at avbildinga byrjar på høgre sida i staden for frå venstre "
-"sida."
+#: ../plug-ins/common/polar-coords.c:663
+msgid "If checked the mapping will begin at the right side, as opposed to beginning at the left."
+msgstr "Dette valet gjer at avbildinga byrjar på høgre sida i staden for frå venstre sida."
 
-#: ../plug-ins/common/polar.c:674
+#: ../plug-ins/common/polar-coords.c:674
 msgid "Map from _top"
 msgstr "Avbild frå _toppen"
 
-#: ../plug-ins/common/polar.c:680
-msgid ""
-"If unchecked the mapping will put the bottom row in the middle and the top "
-"row on the outside.  If checked it will be the opposite."
-msgstr ""
-"Normalt blir den nedste rada avbilda i midten og topprada på utsida. Dersom "
-"du kryssar av her, blir det omvendt."
+#: ../plug-ins/common/polar-coords.c:680
+msgid "If unchecked the mapping will put the bottom row in the middle and the top row on the outside.  If checked it will be the opposite."
+msgstr "Normalt blir den nedste rada avbilda i midten og topprada på utsida. Dersom du kryssar av her, blir det omvendt."
 
-#: ../plug-ins/common/polar.c:692
+#: ../plug-ins/common/polar-coords.c:692
 msgid "To _polar"
 msgstr "Til _polar"
 
-#: ../plug-ins/common/polar.c:698
-msgid ""
-"If unchecked the image will be circularly mapped onto a rectangle.  If "
-"checked the image will be mapped onto a circle."
-msgstr ""
-"Dersom denne er merka, vil biletet bli teikna sirkulært. Elles blir biletet "
-"teikna sirkulært i eit rektangel."
+#: ../plug-ins/common/polar-coords.c:698
+msgid "If unchecked the image will be circularly mapped onto a rectangle.  If checked the image will be mapped onto a circle."
+msgstr "Dersom denne er merka, vil biletet bli teikna sirkulært. Elles blir biletet teikna sirkulært i eit rektangel."
 
-#: ../plug-ins/common/poppler.c:285
-msgid "Portable Document Format"
-msgstr "Portable Document Format"
-
-#: ../plug-ins/common/poppler.c:606
-#, c-format
-msgid "%s-%s"
-msgstr "%s-%s"
-
-#: ../plug-ins/common/poppler.c:608 ../plug-ins/common/postscript.c:1111
-#, c-format
-msgid "%s-pages"
-msgstr "%s-sider"
-
-#: ../plug-ins/common/poppler.c:786
-msgid "Import from PDF"
-msgstr "Importer frå PDF"
-
-#: ../plug-ins/common/poppler.c:791 ../plug-ins/common/postscript.c:3083
-#: ../plug-ins/common/tiff-load.c:451
-msgid "_Import"
-msgstr "_Importer"
-
-#: ../plug-ins/common/poppler.c:857
-msgid "_Width (pixels):"
-msgstr "_Breidde (pikslar):"
-
-#: ../plug-ins/common/poppler.c:858
-msgid "_Height (pixels):"
-msgstr "Høgde (pikslar):"
-
-#: ../plug-ins/common/poppler.c:860
-msgid "_Resolution:"
-msgstr "_Oppløysing:"
-
-#: ../plug-ins/common/poppler.c:1134
-#, c-format
-msgid "pixels/%s"
-msgstr "pikslar/%s"
-
-#: ../plug-ins/common/postscript.c:597 ../plug-ins/common/postscript.c:689
-msgid "PostScript document"
-msgstr "Postscript-dokument"
-
-#: ../plug-ins/common/postscript.c:616 ../plug-ins/common/postscript.c:705
-msgid "Encapsulated PostScript image"
-msgstr "Innekapsla PostScript-bilete"
-
-#: ../plug-ins/common/postscript.c:636
-msgid "PDF document"
-msgstr "PDF-dokument"
-
-#: ../plug-ins/common/postscript.c:1036
-#, c-format
-msgid "Could not interpret '%s'"
-msgstr "Kunne ikkje tolka «%s»."
-
-#: ../plug-ins/common/postscript.c:1176
-msgid "PostScript save cannot handle images with alpha channels"
-msgstr "Bilete med alfa-kanal kan ikkje lagrast i PostScript."
-
-#: ../plug-ins/common/postscript.c:1713 ../plug-ins/common/postscript.c:1746
-#, c-format
-msgid ""
-"Error starting Ghostscript. Make sure that Ghostscript is installed and - if "
-"necessary - use the environment variable GS_PROG to tell GIMP about its "
-"location.\n"
-"(%s)"
-msgstr ""
-"Feil ved oppstart av Ghostscript. Forsikra deg om at Ghostscript er "
-"installert og, dersom det er nødvendig, bruk omgivnadsvariabelen GS_PROG for "
-"å fortelje GIMP kvar det er plassert.\n"
-"(%s)"
-
-#: ../plug-ins/common/postscript.c:1913 ../plug-ins/common/tiff-load.c:954
-#, c-format
-msgid "Page %d"
-msgstr "Side %d"
-
-#: ../plug-ins/common/postscript.c:2583 ../plug-ins/common/postscript.c:2716
-#: ../plug-ins/common/postscript.c:2868 ../plug-ins/common/postscript.c:2994
-#: ../plug-ins/common/sunras.c:1485 ../plug-ins/common/sunras.c:1593
-#: ../plug-ins/fits/fits.c:831 ../plug-ins/fits/fits.c:955
-msgid "Write error occurred"
-msgstr "Det oppsto ein skrivefeil"
-
-#: ../plug-ins/common/postscript.c:3078
-msgid "Import from PostScript"
-msgstr "Importer frå PostScript"
-
-#. Rendering
-#: ../plug-ins/common/postscript.c:3121
-msgid "Rendering"
-msgstr "Teikna"
-
-#. Resolution
-#: ../plug-ins/common/postscript.c:3137 ../plug-ins/common/svg.c:898
-#: ../plug-ins/common/wmf.c:683
-msgid "Resolution:"
-msgstr "Oppløysing:"
-
-#: ../plug-ins/common/postscript.c:3176
-msgid "Pages:"
-msgstr "Sider:"
-
-#: ../plug-ins/common/postscript.c:3183
-msgid "Pages to load (e.g.: 1-4 or 1,3,5-7)"
-msgstr "Sider som skal opnast (t.d. 1-4 eller 1,3,5-7)"
-
-#: ../plug-ins/common/postscript.c:3187
-#: ../plug-ins/common/spheredesigner.c:2650
-msgid "Layers"
-msgstr "Lag"
-
-#: ../plug-ins/common/postscript.c:3189
-msgid "Images"
-msgstr "Bilete"
-
-#: ../plug-ins/common/postscript.c:3192
-msgid "Open as"
-msgstr "Opna som"
-
-#: ../plug-ins/common/postscript.c:3196
-msgid "Try Bounding Box"
-msgstr "Prøv BoundingBox"
-
-#. Colouring
-#: ../plug-ins/common/postscript.c:3209
-msgid "Coloring"
-msgstr "Fargelegg"
-
-#: ../plug-ins/common/postscript.c:3213
-msgid "B/W"
-msgstr "S&K"
-
-#: ../plug-ins/common/postscript.c:3214 ../plug-ins/imagemap/imap_menu.c:214
-#: ../plug-ins/rcm/rcm_dialog.c:419
-msgid "Gray"
-msgstr "Grå"
-
-#: ../plug-ins/common/postscript.c:3215 ../plug-ins/common/xpm.c:468
-#: ../plug-ins/gimpressionist/color.c:66
-#: ../plug-ins/gimpressionist/general.c:170
-#: ../plug-ins/imagemap/imap_menu.c:213
-msgid "Color"
-msgstr "Farge"
-
-#: ../plug-ins/common/postscript.c:3216 ../plug-ins/fits/fits.c:1014
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: ../plug-ins/common/postscript.c:3226
-msgid "Text antialiasing"
-msgstr "Kantutjamning av teksten"
-
-#: ../plug-ins/common/postscript.c:3231 ../plug-ins/common/postscript.c:3243
-msgid "Weak"
-msgstr "Svak"
-
-#: ../plug-ins/common/postscript.c:3232 ../plug-ins/common/postscript.c:3244
-msgid "Strong"
-msgstr "Sterk"
-
-#: ../plug-ins/common/postscript.c:3238
-msgid "Graphic antialiasing"
-msgstr "Kantutjamning av grafikk"
-
-#: ../plug-ins/common/postscript.c:3316
-msgid "Save as PostScript"
-msgstr "Lagra som Postscript"
-
-#. Image Size
-#: ../plug-ins/common/postscript.c:3347
-msgid "Image Size"
-msgstr "Biletstorleik"
-
-#: ../plug-ins/common/postscript.c:3396
-msgid "_Keep aspect ratio"
-msgstr "_Behald forholdet mellom sidene"
-
-#: ../plug-ins/common/postscript.c:3402
-msgid ""
-"When toggled, the resulting image will be scaled to fit into the given size "
-"without changing the aspect ratio."
-msgstr ""
-"Skaler biletet til papirstorleiken utan å endra forholdet mellom sidene."
-
-#. Unit
-#: ../plug-ins/common/postscript.c:3412
-msgid "Unit"
-msgstr "Eining"
-
-#: ../plug-ins/common/postscript.c:3416
-msgid "_Inch"
-msgstr "_Tomme"
-
-#: ../plug-ins/common/postscript.c:3417
-msgid "_Millimeter"
-msgstr "__Millimeter"
-
-#. Format
-#: ../plug-ins/common/postscript.c:3443
-msgid "Output"
-msgstr "Utdata"
-
-#: ../plug-ins/common/postscript.c:3449
-msgid "_PostScript level 2"
-msgstr "_Postscript Level 2"
-
-#: ../plug-ins/common/postscript.c:3458
-msgid "_Encapsulated PostScript"
-msgstr "_Encapsulated PostScript"
-
-#: ../plug-ins/common/postscript.c:3467
-msgid "P_review"
-msgstr "_Førehandsvising"
-
-#: ../plug-ins/common/postscript.c:3488
-msgid "Preview _size:"
-msgstr "_Storleiken på førehandsvisinga:"
-
-#: ../plug-ins/common/procedure-browser.c:83
+#: ../plug-ins/common/procedure-browser.c:82
 msgid "List available procedures in the PDB"
-msgstr "List tilgjengelege prosedyrar i PDB"
+msgstr "List prosedyrar som er tilgjengelege i PDB"
 
-#: ../plug-ins/common/procedure-browser.c:88
+#: ../plug-ins/common/procedure-browser.c:87
 msgid "Procedure _Browser"
-msgstr "Prosedyre_lesar"
+msgstr "_Prosedyrelesar"
 
-#: ../plug-ins/common/procedure-browser.c:126
+#: ../plug-ins/common/procedure-browser.c:125
 msgid "Procedure Browser"
 msgstr "Prosedyrelesar"
 
-#: ../plug-ins/common/psd-save.c:222 ../plug-ins/psd/psd.c:114
-#: ../plug-ins/psd/psd.c:153
-msgid "Photoshop image"
-msgstr "Photoshop-bilete"
+#: ../plug-ins/common/qbist.c:401
+msgid "Generate a huge variety of abstract patterns"
+msgstr "Genererer mange ulike former for abstrakte mønster"
 
-#: ../plug-ins/common/psd-save.c:353
-#, c-format
-msgid ""
-"Unable to save layer with mode '%s'.  Either the PSD file format or the save "
-"plug-in does not support that, using normal mode instead."
-msgstr ""
-"Kunne ikkje lagra lag i modus «%s». Anten PDS-filformatet eller "
-"programtillegget har ikkje støtte for dette. Bruker normalmodus i staden"
+#: ../plug-ins/common/qbist.c:409
+msgid "_Qbist..."
+msgstr "_Qbist …"
 
-#: ../plug-ins/common/psd-save.c:608
-msgid "Error: Can't convert GIMP base imagetype to PSD mode"
-msgstr "Feil: Kan ikkje omforma GIMP bilettype til PDS-modus"
+#: ../plug-ins/common/qbist.c:510
+msgid "Qbist"
+msgstr "Qbist"
 
-#: ../plug-ins/common/psd-save.c:1533
-#, c-format
-msgid ""
-"Unable to save '%s'.  The psd file format does not support images that are "
-"more than 30000 pixels wide or tall."
-msgstr ""
-"Kan ikkje lagra «%s». PSD-formatet støtter ikkje bilete som er over 30.000 "
-"pikslar høge eller breie."
+#: ../plug-ins/common/qbist.c:706
+msgid "Load QBE File"
+msgstr "Opna QBE-fil"
 
-#: ../plug-ins/common/psd-save.c:1545
-#, c-format
-msgid ""
-"Unable to save '%s'.  The psd file format does not support images with "
-"layers that are more than 30000 pixels wide or tall."
-msgstr ""
-"Kan ikkje lagra «%s». PSD-formatet støtter ikkje bilete med lag som er over "
-"30.000 pikslar høge eller breie."
+#: ../plug-ins/common/qbist.c:748
+msgid "Save as QBE File"
+msgstr "Lagra som QBE-fil"
 
-#: ../plug-ins/common/psp.c:356 ../plug-ins/common/psp.c:380
-msgid "Paint Shop Pro image"
-msgstr "Paint-Shop-Pro-bilete"
+#: ../plug-ins/common/qbist.c:802
+msgid "G-Qbist"
+msgstr "G-Qbist"
 
-#: ../plug-ins/common/psp.c:397
-msgid "Save as PSP"
-msgstr "Lagra som PSP"
-
-#. file save type
-#: ../plug-ins/common/psp.c:414
-msgid "Data Compression"
-msgstr "Kompressjonsgrad"
-
-#: ../plug-ins/common/psp.c:419
-msgid "RLE"
-msgstr "RLE"
-
-#: ../plug-ins/common/psp.c:420
-msgid "LZ77"
-msgstr "LZ77"
-
-#: ../plug-ins/common/randomize.c:102
-msgid "Random Hurl"
-msgstr "Tilfeldig fargekasting"
-
-#: ../plug-ins/common/randomize.c:103
-msgid "Random Pick"
-msgstr "Tilfeldig plukk"
-
-#: ../plug-ins/common/randomize.c:104
-msgid "Random Slur"
-msgstr "Tilfeldig pletting"
-
-#: ../plug-ins/common/randomize.c:202
-msgid "Completely randomize a fraction of pixels"
-msgstr ""
-
-#: ../plug-ins/common/randomize.c:204
-msgid "Randomly interchange some pixels with neighbors"
-msgstr "Bytt ein del pikslar tilfeldig med nabopikslar"
-
-#: ../plug-ins/common/randomize.c:206
-msgid "Randomly slide some pixels downward (similar to melting)"
-msgstr "Flytt noen tilfeldige pikslar nedover. Simulerer smelting."
-
-#: ../plug-ins/common/randomize.c:233
-msgid "_Hurl..."
-msgstr "_Fargekast..."
-
-#: ../plug-ins/common/randomize.c:245
-msgid "_Pick..."
-msgstr "Farge_plukk..."
-
-#: ../plug-ins/common/randomize.c:257
-msgid "_Slur..."
-msgstr "_Pletting..."
-
-#: ../plug-ins/common/randomize.c:771 ../plug-ins/common/snoise.c:601
-msgid "_Random seed:"
-msgstr "Tilfeldig _frø:"
-
-#: ../plug-ins/common/randomize.c:780
-msgid "R_andomization (%):"
-msgstr "_Slumpmengde (%):"
-
-#: ../plug-ins/common/randomize.c:783
-msgid "Percentage of pixels to be filtered"
-msgstr "Mengda av pikslar som skal filtrerast (%)"
-
-#: ../plug-ins/common/randomize.c:795
-msgid "R_epeat:"
-msgstr "G_jenta:"
-
-#: ../plug-ins/common/randomize.c:798
-msgid "Number of times to apply filter"
-msgstr "Kor ofte filteret skal brukast"
-
-#: ../plug-ins/common/raw.c:179 ../plug-ins/common/raw.c:194
-msgid "Raw image data"
-msgstr "Raw biletdata"
-
-#: ../plug-ins/common/raw.c:959
-msgid "Load Image from Raw Data"
-msgstr "Last biletet frå Raw Data"
-
-#: ../plug-ins/common/raw.c:992
-msgid "Image"
-msgstr "Bilete"
-
-#: ../plug-ins/common/raw.c:1003
-msgid "RGB Alpha"
-msgstr "RGB-alfa"
-
-#: ../plug-ins/common/raw.c:1004
-msgid "Planar RGB"
-msgstr "Planar RGB"
-
-#: ../plug-ins/common/raw.c:1005
-msgid "Indexed"
-msgstr "Indeksert"
-
-#: ../plug-ins/common/raw.c:1006
-msgid "Indexed Alpha"
-msgstr "Indeksert alfa"
-
-#: ../plug-ins/common/raw.c:1011
-msgid "Image _Type:"
-msgstr "Bilet_type:"
-
-#: ../plug-ins/common/raw.c:1061
-msgid "Palette"
-msgstr "Palett"
-
-#: ../plug-ins/common/raw.c:1071 ../plug-ins/common/raw.c:1170
-msgid "R, G, B (normal)"
-msgstr "R, G, B (normal)"
-
-#: ../plug-ins/common/raw.c:1072 ../plug-ins/common/raw.c:1172
-msgid "B, G, R, X (BMP style)"
-msgstr "B, G, R, X (BMP-stil)"
-
-#: ../plug-ins/common/raw.c:1077
-msgid "_Palette Type:"
-msgstr "_Palettype:"
-
-#: ../plug-ins/common/raw.c:1088
-msgid "Off_set:"
-msgstr "For_skyving:"
-
-#: ../plug-ins/common/raw.c:1100
-msgid "Select Palette File"
-msgstr "Vel palettfil"
-
-#: ../plug-ins/common/raw.c:1106
-msgid "Pal_ette File:"
-msgstr "Pal_ettfil:"
-
-#: ../plug-ins/common/raw.c:1134
-msgid "Raw Image Save"
-msgstr "Lagra raw biletdata"
-
-#: ../plug-ins/common/raw.c:1156
-msgid "RGB Save Type"
-msgstr "RGB-lagringstype"
-
-#: ../plug-ins/common/raw.c:1160
-msgid "Standard (R,G,B)"
-msgstr "Standard (R,G,B)"
-
-#: ../plug-ins/common/raw.c:1161
-msgid "Planar (RRR,GGG,BBB)"
-msgstr "Planar (RRR,GGG,BBB)"
-
-#: ../plug-ins/common/raw.c:1166
-msgid "Indexed Palette Type"
-msgstr "Indeksert palett"
-
-#: ../plug-ins/common/redeye.c:107
+#: ../plug-ins/common/red-eye-removal.c:104
 msgid "Remove the red eye effect caused by camera flashes"
 msgstr "Gjer den raude blitsrefleksen i auge om til naturleg svart"
 
-#: ../plug-ins/common/redeye.c:118
+#: ../plug-ins/common/red-eye-removal.c:115
 msgid "_Red Eye Removal..."
-msgstr "Fjern _raude auge..."
+msgstr "Fjern _raude auge …"
 
-#: ../plug-ins/common/redeye.c:145
+#: ../plug-ins/common/red-eye-removal.c:141
 msgid "Red Eye Removal"
 msgstr "Fjern raude auge"
 
-#: ../plug-ins/common/redeye.c:179
+#: ../plug-ins/common/red-eye-removal.c:169
+#: ../plug-ins/common/unsharp-mask.c:891
+#: ../plug-ins/common/wind.c:1007
+#: ../plug-ins/imagemap/imap_preferences.c:440
+#: ../plug-ins/map-object/map-object-ui.c:585
+msgid "_Threshold:"
+msgstr "_Terskelverdi:"
+
+#: ../plug-ins/common/red-eye-removal.c:175
 msgid "Threshold for the red eye color to remove."
 msgstr "Terskelverdi for den raude fargen som skal byttast ut"
 
-#: ../plug-ins/common/redeye.c:184
+#: ../plug-ins/common/red-eye-removal.c:180
 msgid "Manually selecting the eyes may improve the results."
 msgstr ""
 "Du kan i noen tilfelle forbetra resultatet \n"
-"ved å markere auge manuelt "
+"ved å markere auget manuelt med eit \n"
+"av utvalsverktøya."
 
-#: ../plug-ins/common/redeye.c:317
+#: ../plug-ins/common/red-eye-removal.c:300
 msgid "Removing red eye"
 msgstr "Fjerner raude auge"
 
-#: ../plug-ins/common/retinex.c:156
-msgid "Enhance contrast using the Retinex method"
-msgstr "Forbetrar kontrasten ved å bruke den såkalla retinex-metoden"
-
-#: ../plug-ins/common/retinex.c:166
-msgid "Retine_x..."
-msgstr "Retine_x"
-
-#: ../plug-ins/common/retinex.c:250
-msgid "Retinex"
-msgstr "Retinex..."
-
-#: ../plug-ins/common/retinex.c:286
-msgid "Retinex Image Enhancement"
-msgstr "Retinex fargeforbetring"
-
-#: ../plug-ins/common/retinex.c:321
-#, fuzzy
-msgid "Uniform"
-msgstr "Likt"
-
-#: ../plug-ins/common/retinex.c:322
-#, fuzzy
-msgid "Low"
-msgstr "Låg"
-
-#: ../plug-ins/common/retinex.c:323
-#, fuzzy
-msgid "High"
-msgstr "Høg"
-
-#: ../plug-ins/common/retinex.c:334
-#, fuzzy
-msgid "_Level:"
-msgstr "Grad:"
-
-#: ../plug-ins/common/retinex.c:339
-msgid "_Scale:"
-msgstr "_Skalering:"
-
-#: ../plug-ins/common/retinex.c:354
-#, fuzzy
-msgid "Scale _division:"
-msgstr "_Oppdeling:"
-
-#: ../plug-ins/common/retinex.c:369
-#, fuzzy
-msgid "Dy_namic:"
-msgstr "Dy_namisk:"
-
-#: ../plug-ins/common/retinex.c:642
-msgid "Retinex: filtering"
-msgstr "Retinex: filtrering"
-
-#: ../plug-ins/common/ripple.c:129
+#: ../plug-ins/common/ripple.c:125
 msgid "Displace pixels in a ripple pattern"
 msgstr "Flytter pikslane i eit krusningsmønster"
 
-#: ../plug-ins/common/ripple.c:136
+#: ../plug-ins/common/ripple.c:132
 msgid "_Ripple..."
-msgstr "_Krusning..."
+msgstr "_Krusning …"
 
-#: ../plug-ins/common/ripple.c:226
+#: ../plug-ins/common/ripple.c:222
 msgid "Rippling"
 msgstr "Krusningar"
 
-#: ../plug-ins/common/ripple.c:468
+#: ../plug-ins/common/ripple.c:482
 msgid "Ripple"
 msgstr "Krusning"
 
-#: ../plug-ins/common/ripple.c:525
+#: ../plug-ins/common/ripple.c:540
 msgid "_Retain tilability"
-msgstr "_Behald flislegginga"
+msgstr "Behald f_lislegginga"
 
 #. Edges toggle box
-#: ../plug-ins/common/ripple.c:559
+#: ../plug-ins/common/ripple.c:577
 msgid "Edges"
 msgstr "Kantar"
 
-#: ../plug-ins/common/ripple.c:565
+#: ../plug-ins/common/ripple.c:583
 msgid "_Blank"
 msgstr "_Blank"
 
 #. Wave toggle box
-#: ../plug-ins/common/ripple.c:587
+#: ../plug-ins/common/ripple.c:605
 msgid "Wave Type"
 msgstr "Bølgetype"
 
-#: ../plug-ins/common/ripple.c:591
+#: ../plug-ins/common/ripple.c:609
 msgid "Saw_tooth"
 msgstr "Sagt_ann"
 
-#: ../plug-ins/common/ripple.c:592
+#: ../plug-ins/common/ripple.c:610
 msgid "S_ine"
 msgstr "S_inus"
 
-#: ../plug-ins/common/ripple.c:615
+#: ../plug-ins/common/ripple.c:633
 msgid "_Period:"
 msgstr "_Periode:"
 
-#: ../plug-ins/common/ripple.c:628
+#: ../plug-ins/common/ripple.c:646
 msgid "A_mplitude:"
-msgstr "A_mplityde:"
+msgstr "A_mplitude:"
 
-#: ../plug-ins/common/ripple.c:641
+#: ../plug-ins/common/ripple.c:659
 msgid "Phase _shift:"
-msgstr "_Faseforskyving:"
+msgstr "_Faseforsk_yving:"
 
-#: ../plug-ins/common/rotate.c:413
+#: ../plug-ins/common/rotate.c:412
 msgid "You can not rotate the whole image if there's a selection."
 msgstr "Du kan ikkje rotera heile biletet dersom det inneheld ei markering."
 
-#: ../plug-ins/common/rotate.c:420
+#: ../plug-ins/common/rotate.c:419
 msgid "You can not rotate the whole image if there's a floating selection."
-msgstr ""
-"Du kan ikkje rotera heile biletet dersom det inneheld ei flytande markering."
+msgstr "Du kan ikkje rotera heile biletet dersom det inneheld ei flytande markering."
 
-#: ../plug-ins/common/rotate.c:431
+#: ../plug-ins/common/rotate.c:430
 msgid "Sorry, channels and masks can not be rotated."
 msgstr "Du kan ikkje rotera kanaler og masker."
 
-#: ../plug-ins/common/rotate.c:437
+#: ../plug-ins/common/rotate.c:436
 msgid "Rotating"
 msgstr "Roterer"
 
-#: ../plug-ins/common/sample_colorize.c:298
+#: ../plug-ins/common/sample-colorize.c:297
 msgid "Colorize image using a sample image as a guide"
 msgstr "Fargelegg biletet ved å bruke eit utvald bilete som mønster"
 
-#: ../plug-ins/common/sample_colorize.c:303
+#: ../plug-ins/common/sample-colorize.c:302
 msgid "_Sample Colorize..."
-msgstr "Fargelegg frå _mal..."
+msgstr "Fargelegg frå _mal …"
 
-#: ../plug-ins/common/sample_colorize.c:1313
+#: ../plug-ins/common/sample-colorize.c:1317
 msgid "Sample Colorize"
 msgstr "Fargelegg"
 
-#: ../plug-ins/common/sample_colorize.c:1318
+#: ../plug-ins/common/sample-colorize.c:1322
 msgid "Get _Sample Colors"
 msgstr "Hent fargane frå _malen"
 
 #. layer combo_box (Dst)
-#: ../plug-ins/common/sample_colorize.c:1347
+#: ../plug-ins/common/sample-colorize.c:1351
 msgid "Destination:"
 msgstr "Mål:"
 
 #. layer combo_box (Sample)
-#: ../plug-ins/common/sample_colorize.c:1363
+#: ../plug-ins/common/sample-colorize.c:1367
 msgid "Sample:"
 msgstr "Kjelde:"
 
-#: ../plug-ins/common/sample_colorize.c:1373
+#: ../plug-ins/common/sample-colorize.c:1377
 msgid "From reverse gradient"
 msgstr "Frå omvendt fargeovergang"
 
-#: ../plug-ins/common/sample_colorize.c:1378
+#: ../plug-ins/common/sample-colorize.c:1382
 msgid "From gradient"
 msgstr "Frå fargeovergang"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1399
-#: ../plug-ins/common/sample_colorize.c:1426
+#: ../plug-ins/common/sample-colorize.c:1403
+#: ../plug-ins/common/sample-colorize.c:1430
 msgid "Show selection"
 msgstr "Vis markering"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1410
-#: ../plug-ins/common/sample_colorize.c:1437
+#: ../plug-ins/common/sample-colorize.c:1414
+#: ../plug-ins/common/sample-colorize.c:1441
 msgid "Show color"
 msgstr "Vis farge"
 
-#: ../plug-ins/common/sample_colorize.c:1550
+#: ../plug-ins/common/sample-colorize.c:1554
 msgid "Input levels:"
 msgstr "Kjeldeverdiar:"
 
-#: ../plug-ins/common/sample_colorize.c:1600
+#: ../plug-ins/common/sample-colorize.c:1604
 msgid "Output levels:"
 msgstr "Utverdiar:"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1640
+#: ../plug-ins/common/sample-colorize.c:1644
 msgid "Hold intensity"
 msgstr "Behald intensitet"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1651
+#: ../plug-ins/common/sample-colorize.c:1655
 msgid "Original intensity"
 msgstr "Original intensitet"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1669
+#: ../plug-ins/common/sample-colorize.c:1673
 msgid "Use subcolors"
 msgstr "Bruk underfarger"
 
 #. check button
-#: ../plug-ins/common/sample_colorize.c:1680
+#: ../plug-ins/common/sample-colorize.c:1684
 msgid "Smooth samples"
 msgstr "Mjuk samling"
 
-#: ../plug-ins/common/sample_colorize.c:2652
+#: ../plug-ins/common/sample-colorize.c:2656
 msgid "Sample analyze"
 msgstr "Samlingsanalyse"
 
-#: ../plug-ins/common/sample_colorize.c:3030
+#: ../plug-ins/common/sample-colorize.c:3034
 msgid "Remap colorized"
-msgstr "Fargelegg..."
+msgstr "Fargelegg"
 
-#: ../plug-ins/common/scatter_hsv.c:103
-msgid "Randomize hue/saturation/value independently"
-msgstr "Gjer kulør, metning og verdi tilfeldige kvar for seg"
-
-#: ../plug-ins/common/scatter_hsv.c:108
-msgid "HSV Noise..."
-msgstr "HSV-støy..."
-
-#: ../plug-ins/common/scatter_hsv.c:215 ../plug-ins/common/scatter_hsv.c:361
-msgid "HSV Noise"
-msgstr "HSV-støy"
-
-#: ../plug-ins/common/scatter_hsv.c:397
-msgid "_Holdness:"
-msgstr "_Hald:"
-
-#: ../plug-ins/common/scatter_hsv.c:409
-msgid "H_ue:"
-msgstr "_Kulør:"
-
-#: ../plug-ins/common/screenshot.c:240
+#: ../plug-ins/common/screenshot.c:239
 msgid "Create an image from an area of the screen"
-msgstr "Opprett eit nytt bilete frå eit skjermormråde"
+msgstr "Opprett eit nytt bilete frå eit ormråde av skjermen"
 
-#: ../plug-ins/common/screenshot.c:253
+#: ../plug-ins/common/screenshot.c:252
 msgid "_Screenshot..."
-msgstr "_Skjermdump..."
+msgstr "_Skjermenbilete …"
 
-#: ../plug-ins/common/screenshot.c:418
+#: ../plug-ins/common/screenshot.c:416
 msgid "Error selecting the window"
 msgstr "Feil ved markeringa av vindauget"
 
-#: ../plug-ins/common/screenshot.c:779
+#: ../plug-ins/common/screenshot.c:777
 msgid "Importing screenshot"
-msgstr "Importerer skjermdump"
+msgstr "Importerer eit bilete av skjermen"
 
-#: ../plug-ins/common/screenshot.c:805 ../plug-ins/common/screenshot.c:1061
+#: ../plug-ins/common/screenshot.c:803
+#: ../plug-ins/common/screenshot.c:1059
 msgid "Screenshot"
-msgstr "Skjermdump"
+msgstr "Skjermbilete"
 
-#: ../plug-ins/common/screenshot.c:846
+#: ../plug-ins/common/screenshot.c:844
 msgid "Mouse Pointer"
-msgstr "Peikarinformasjon"
+msgstr "Musepeikar"
 
-#: ../plug-ins/common/screenshot.c:950
+#: ../plug-ins/common/screenshot.c:948
 msgid "Specified window not found"
 msgstr "Fann ikkje det oppgitte vindauget"
 
-#: ../plug-ins/common/screenshot.c:976
+#: ../plug-ins/common/screenshot.c:974
 msgid "There was an error taking the screenshot."
-msgstr "Det oppsto ein feil under knipsinga av skjermdumpen"
+msgstr "Det oppsto ein feil under knipsinga av skjermbiletet"
 
-#: ../plug-ins/common/screenshot.c:1070
+#: ../plug-ins/common/screenshot.c:1068
 msgid "S_nap"
 msgstr "_Grip"
 
-#: ../plug-ins/common/screenshot.c:1100
+#: ../plug-ins/common/screenshot.c:1098
 msgid "After the delay, the screenshot is taken."
-msgstr "Skjermdumpen blir tatt etter pausen"
+msgstr "Biletet av skjermen blir knipsa etter pausen"
 
-#: ../plug-ins/common/screenshot.c:1102
-msgid ""
-"After the delay, drag your mouse to select the region for the screenshot."
-msgstr "Dra musepeikaren til det valde området for skjermdumpen etter pausen"
+#: ../plug-ins/common/screenshot.c:1100
+msgid "After the delay, drag your mouse to select the region for the screenshot."
+msgstr "Etter pausen kan du markere området med musepeikaren"
 
-#: ../plug-ins/common/screenshot.c:1105
+#: ../plug-ins/common/screenshot.c:1103
 msgid "At the end of the delay, click in a window to snap it."
 msgstr "Klikk i eit vindauge etter pausen for å lage bilete av det."
 
 #. Area
-#: ../plug-ins/common/screenshot.c:1111
+#: ../plug-ins/common/screenshot.c:1109
 msgid "Area"
 msgstr "Område"
 
-#: ../plug-ins/common/screenshot.c:1122
+#: ../plug-ins/common/screenshot.c:1120
 msgid "Take a screenshot of a single _window"
-msgstr "Lag ein skjermdump av eit enkelt vindauge"
+msgstr "Knips eit bilete av eit enkelt _vindauge"
 
-#: ../plug-ins/common/screenshot.c:1141
+#: ../plug-ins/common/screenshot.c:1139
 msgid "Include window _decoration"
 msgstr "Inkluder vindaugedekorasjonar"
 
-#: ../plug-ins/common/screenshot.c:1159
+#: ../plug-ins/common/screenshot.c:1157
 msgid "Take a screenshot of the entire _screen"
-msgstr "Lag ein skjermdump av heile _skjermen"
+msgstr "_skjermbilete"
 
-#: ../plug-ins/common/screenshot.c:1178
+#: ../plug-ins/common/screenshot.c:1176
 msgid "Include _mouse pointer"
-msgstr "Feil ved henting av musepeikaren"
+msgstr "Inkluder _musepeikaren"
 
-#: ../plug-ins/common/screenshot.c:1198
+#: ../plug-ins/common/screenshot.c:1196
 msgid "Select a _region to grab"
-msgstr "Vel område som det skal lagast skjermdump av"
+msgstr "Vel område som det skal hentast inn"
 
 #. Delay
-#: ../plug-ins/common/screenshot.c:1213
+#: ../plug-ins/common/screenshot.c:1211
 msgid "Delay"
 msgstr "Vent i"
 
 #. this is the unit label of a spinbutton
-#: ../plug-ins/common/screenshot.c:1235
+#: ../plug-ins/common/screenshot.c:1233
 msgid "seconds"
 msgstr "sekund"
 
-#: ../plug-ins/common/sel_gauss.c:104
-msgid "Blur neighboring pixels, but only in low-contrast areas"
-msgstr "Slør nabopikslar, men bare i område med låg kontrast"
-
-#: ../plug-ins/common/sel_gauss.c:115
-msgid "_Selective Gaussian Blur..."
-msgstr "_Selektiv gaussisk sløring..."
-
-#: ../plug-ins/common/sel_gauss.c:195 ../plug-ins/common/sel_gauss.c:232
-msgid "Selective Gaussian Blur"
-msgstr "Selektiv gaussisk sløring"
-
-#: ../plug-ins/common/sel_gauss.c:271
-msgid "_Blur radius:"
-msgstr "Slørings_radius:"
-
-#: ../plug-ins/common/sel_gauss.c:281
-msgid "_Max. delta:"
-msgstr "_Maks. delta:"
-
-#: ../plug-ins/common/semiflatten.c:68
+#: ../plug-ins/common/semi-flatten.c:67
 msgid "Replace partial transparency with the current background color"
 msgstr "Bytt delvis gjennomsikt med bakgrunnsfargen"
 
-#: ../plug-ins/common/semiflatten.c:75
+#: ../plug-ins/common/semi-flatten.c:74
 msgid "_Semi-Flatten"
 msgstr "_Halvutflating"
 
-#: ../plug-ins/common/semiflatten.c:118
+#: ../plug-ins/common/semi-flatten.c:117
 msgid "Semi-Flattening"
-msgstr "Halvutflating..."
+msgstr "Halvutflater"
 
-#: ../plug-ins/common/sharpen.c:113
+#: ../plug-ins/common/sharpen.c:110
 msgid "Make image sharper (less powerful than Unsharp Mask)"
 msgstr "Gjer biletet skarpare (mindre effektivt enn uskarpmaska)"
 
-#: ../plug-ins/common/sharpen.c:120
+#: ../plug-ins/common/sharpen.c:117
 msgid "_Sharpen..."
-msgstr "_Gjer skarpare..."
+msgstr "_Gjer skarpare …"
 
 #.
 #. * Let the user know what we're doing...
 #.
-#: ../plug-ins/common/sharpen.c:307
+#: ../plug-ins/common/sharpen.c:304
 msgid "Sharpening"
-msgstr "Gjer skarpare..."
+msgstr "Gjer skarpare"
 
-#: ../plug-ins/common/sharpen.c:476
+#: ../plug-ins/common/sharpen.c:473
 msgid "Sharpen"
 msgstr "Gjer skarpare"
 
-#: ../plug-ins/common/shift.c:101
+#: ../plug-ins/common/shift.c:100
 msgid "Shift each row of pixels by a random amount"
 msgstr "Forskyv biletet horisontalt eller vertikalt"
 
-#: ../plug-ins/common/shift.c:108
+#: ../plug-ins/common/shift.c:107
 msgid "_Shift..."
-msgstr "_Forskyv..."
+msgstr "_Forskyv …"
 
-#: ../plug-ins/common/shift.c:189
+#: ../plug-ins/common/shift.c:188
 msgid "Shifting"
 msgstr "Forskyver"
 
-#: ../plug-ins/common/shift.c:355
+#: ../plug-ins/common/shift.c:354
 msgid "Shift"
 msgstr "Forskyv"
 
-#: ../plug-ins/common/shift.c:386
+#: ../plug-ins/common/shift.c:387
 msgid "Shift _horizontally"
 msgstr "Forskyv _horisontalt"
 
-#: ../plug-ins/common/shift.c:389
+#: ../plug-ins/common/shift.c:390
 msgid "Shift _vertically"
 msgstr "Forskyv _vertikalt"
 
-#: ../plug-ins/common/shift.c:420
+#: ../plug-ins/common/shift.c:421
 msgid "Shift _amount:"
-msgstr "_Forskyvingsgrad:"
+msgstr "For_skyving:"
 
-#: ../plug-ins/common/sinus.c:186
+#: ../plug-ins/common/sinus.c:185
 msgid "Generate complex sinusoidal textures"
 msgstr "Genererer komplekse buktande teksturar"
 
-#: ../plug-ins/common/sinus.c:191
+#: ../plug-ins/common/sinus.c:190
 msgid "_Sinus..."
-msgstr "_Sinus"
+msgstr "_Sinus …"
 
-#: ../plug-ins/common/sinus.c:284
+#: ../plug-ins/common/sinus.c:283
 msgid "Sinus: rendering"
 msgstr "Sinus: teikning"
 
 #. Create Main window with a vbox
 #. ==============================
-#: ../plug-ins/common/sinus.c:648
+#: ../plug-ins/common/sinus.c:647
 msgid "Sinus"
 msgstr "Sinus"
 
-#: ../plug-ins/common/sinus.c:690
+#: ../plug-ins/common/sinus.c:689
 msgid "Drawing Settings"
 msgstr "Biletinnstillingane"
 
-#: ../plug-ins/common/sinus.c:700
+#: ../plug-ins/common/sinus.c:699
 msgid "_X scale:"
 msgstr "_X-skala:"
 
-#: ../plug-ins/common/sinus.c:709
+#: ../plug-ins/common/sinus.c:708
 msgid "_Y scale:"
 msgstr "_Y-skala:"
 
-#: ../plug-ins/common/sinus.c:718
+#: ../plug-ins/common/sinus.c:717
 msgid "Co_mplexity:"
 msgstr "Ko_mpleksitet:"
 
-#: ../plug-ins/common/sinus.c:728
+#: ../plug-ins/common/sinus.c:727
 msgid "Calculation Settings"
 msgstr "Berekningsinnstillingane"
 
-#: ../plug-ins/common/sinus.c:741
+#: ../plug-ins/common/sinus.c:740
 msgid "R_andom seed:"
 msgstr "_Tilfeldig starttal:"
 
-#: ../plug-ins/common/sinus.c:750
+#: ../plug-ins/common/sinus.c:749
 msgid "_Force tiling?"
 msgstr "Tvungen _flislegging?"
 
-#: ../plug-ins/common/sinus.c:763
+#: ../plug-ins/common/sinus.c:762
 msgid "_Ideal"
 msgstr "_Ideell"
 
-#: ../plug-ins/common/sinus.c:764
+#: ../plug-ins/common/sinus.c:763
 msgid "_Distorted"
 msgstr "_Fordreid"
 
-#: ../plug-ins/common/sinus.c:782 ../plug-ins/common/sinus.c:798
-#: ../plug-ins/imagemap/imap_preferences.c:422
+#: ../plug-ins/common/sinus.c:781
+#: ../plug-ins/common/sinus.c:797
+#: ../plug-ins/imagemap/imap_preferences.c:421
 msgid "Colors"
 msgstr "Fargar"
 
 #. if in grey scale, the colors are necessarily black and white
-#: ../plug-ins/common/sinus.c:791
+#: ../plug-ins/common/sinus.c:790
 msgid "The colors are white and black."
 msgstr "Fargane er svart og kvit"
 
-#: ../plug-ins/common/sinus.c:802
+#: ../plug-ins/common/sinus.c:801
 msgid "Bl_ack & white"
 msgstr "Svart/Kvit"
 
-#: ../plug-ins/common/sinus.c:804
+#: ../plug-ins/common/sinus.c:803
 msgid "_Foreground & background"
 msgstr "_Forgrunn og bakgrunn"
 
-#: ../plug-ins/common/sinus.c:806
+#: ../plug-ins/common/sinus.c:805
 msgid "C_hoose here:"
 msgstr "_Vel her:"
 
-#: ../plug-ins/common/sinus.c:819
+#: ../plug-ins/common/sinus.c:818
 msgid "First color"
 msgstr "Første farge"
 
-#: ../plug-ins/common/sinus.c:829
+#: ../plug-ins/common/sinus.c:828
 msgid "Second color"
 msgstr "Andre farge"
 
-#: ../plug-ins/common/sinus.c:842
+#: ../plug-ins/common/sinus.c:841
 msgid "Alpha Channels"
 msgstr "Alfakanalar"
 
-#: ../plug-ins/common/sinus.c:855
+#: ../plug-ins/common/sinus.c:854
 msgid "F_irst color:"
 msgstr "F_ørste farge:"
 
-#: ../plug-ins/common/sinus.c:870
+#: ../plug-ins/common/sinus.c:869
 msgid "S_econd color:"
 msgstr "_Andre farge:"
 
-#: ../plug-ins/common/sinus.c:895
+#: ../plug-ins/common/sinus.c:885
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:903
+msgid "Co_lors"
+msgstr "_Fargar"
+
+#: ../plug-ins/common/sinus.c:894
 msgid "Blend Settings"
 msgstr "Blandingsinnstillingane"
 
-#: ../plug-ins/common/sinus.c:908
+#: ../plug-ins/common/sinus.c:907
 msgid "L_inear"
 msgstr "L_inearæ"
 
-#: ../plug-ins/common/sinus.c:909
+#: ../plug-ins/common/sinus.c:908
 msgid "Bili_near"
 msgstr "Bili_neær"
 
-#: ../plug-ins/common/sinus.c:910
+#: ../plug-ins/common/sinus.c:909
 msgid "Sin_usoidal"
 msgstr "Sin_usforma"
 
-#: ../plug-ins/common/sinus.c:932
+#: ../plug-ins/common/sinus.c:931
 msgid "_Blend"
 msgstr "_Bland"
 
-#: ../plug-ins/common/sinus.c:1049
+#: ../plug-ins/common/sinus.c:1048
 msgid "Do _preview"
 msgstr "_Førehandsvis"
 
-#: ../plug-ins/common/smooth_palette.c:83
+#: ../plug-ins/common/smooth-palette.c:82
 msgid "Derive a smooth color palette from the image"
 msgstr "Lag ein mjuk fargepalett frå fargane i biletet"
 
-#: ../plug-ins/common/smooth_palette.c:88
+#: ../plug-ins/common/smooth-palette.c:87
 msgid "Smoo_th Palette..."
-msgstr "Palettutglatting..."
+msgstr "Palettutglatting …"
 
-#: ../plug-ins/common/smooth_palette.c:179
+#: ../plug-ins/common/smooth-palette.c:178
 msgid "Deriving smooth palette"
 msgstr "Avleier ein utglatta palett"
 
-#: ../plug-ins/common/smooth_palette.c:412
+#: ../plug-ins/common/smooth-palette.c:411
 msgid "Smooth Palette"
 msgstr "Palettutglatting"
 
-#: ../plug-ins/common/smooth_palette.c:452
+#: ../plug-ins/common/smooth-palette.c:451
 msgid "_Search depth:"
 msgstr "_Søkedjupn:"
 
-#: ../plug-ins/common/snoise.c:176
-msgid "Create a random cloud-like texture"
-msgstr "Lager ein tilfeldig sky-liknande tekstur"
-
-#: ../plug-ins/common/snoise.c:182
-msgid "_Solid Noise..."
-msgstr "_Massiv støy..."
-
-#. Dialog initialization
-#: ../plug-ins/common/snoise.c:315 ../plug-ins/common/snoise.c:563
-msgid "Solid Noise"
-msgstr "Massiv støy"
-
-#: ../plug-ins/common/snoise.c:614
-msgid "_Detail:"
-msgstr "_Detaljar:"
-
-#. Turbulent
-#: ../plug-ins/common/snoise.c:624
-msgid "T_urbulent"
-msgstr "T_urbulens"
-
-#. Tilable
-#: ../plug-ins/common/snoise.c:638
-msgid "T_ilable"
-msgstr "_Flisbar"
-
-#: ../plug-ins/common/snoise.c:653
-msgid "_X size:"
-msgstr "_X-storleik:"
-
-#: ../plug-ins/common/snoise.c:666
-msgid "_Y size:"
-msgstr "_Y-storleik:"
-
-#: ../plug-ins/common/sobel.c:108
-msgid "Specialized direction-dependent edge detection"
-msgstr "Spesialisert retningsbestemt kantfinning"
-
-#: ../plug-ins/common/sobel.c:121
-msgid "_Sobel..."
-msgstr "_Sobelrelieff..."
-
-#: ../plug-ins/common/sobel.c:229
-msgid "Sobel Edge Detection"
-msgstr "Sobel kantgjenkjenning"
-
-#: ../plug-ins/common/sobel.c:258
-msgid "Sobel _horizontally"
-msgstr "Sobel _horisontalt"
-
-#: ../plug-ins/common/sobel.c:270
-msgid "Sobel _vertically"
-msgstr "Sobel _vertikalt"
-
-#: ../plug-ins/common/sobel.c:282
-msgid "_Keep sign of result (one direction only)"
-msgstr "_Hald auge med resultatet (bare i ei retning)"
-
-#: ../plug-ins/common/sobel.c:368
-msgid "Sobel edge detecting"
-msgstr "Sobel kantgjenkjenning..."
-
-#: ../plug-ins/common/softglow.c:134
+#: ../plug-ins/common/softglow.c:133
 msgid "Simulate glow by making highlights intense and fuzzy"
 msgstr "Simulerer glød ved å lage høglysa meir intense og ullne"
 
-#: ../plug-ins/common/softglow.c:139
+#: ../plug-ins/common/softglow.c:138
 msgid "_Softglow..."
-msgstr "_Mjukglød"
+msgstr "_Mjukglød …"
 
-#: ../plug-ins/common/softglow.c:630
+#: ../plug-ins/common/softglow.c:631
 msgid "Softglow"
 msgstr "Mjukglød"
 
-#: ../plug-ins/common/softglow.c:667
+#: ../plug-ins/common/softglow.c:668
 msgid "_Glow radius:"
 msgstr "_Glødradius:"
 
-#: ../plug-ins/common/sparkle.c:178
+#: ../plug-ins/common/sparkle.c:177
 msgid "Turn bright spots into starry sparkles"
 msgstr "Gjer om lyse punkt til lysglimt"
 
-#: ../plug-ins/common/sparkle.c:186
+#: ../plug-ins/common/sparkle.c:185
 msgid "_Sparkle..."
-msgstr "Lys_glimt..."
+msgstr "Lysgli_mt …"
 
-#: ../plug-ins/common/sparkle.c:223
+#: ../plug-ins/common/sparkle.c:222
 msgid "Region selected for filter is empty"
 msgstr "Området vald for filteret er tomt"
 
-#: ../plug-ins/common/sparkle.c:299
+#: ../plug-ins/common/sparkle.c:298
 msgid "Sparkling"
 msgstr "Lager lysglimta"
 
-#: ../plug-ins/common/sparkle.c:337
+#: ../plug-ins/common/sparkle.c:336
 msgid "Sparkle"
 msgstr "Lysglimt"
 
-#: ../plug-ins/common/sparkle.c:373
+#: ../plug-ins/common/sparkle.c:372
 msgid "Luminosity _threshold:"
 msgstr "_Terskel for lysverdi:"
 
-#: ../plug-ins/common/sparkle.c:376
+#: ../plug-ins/common/sparkle.c:375
 msgid "Adjust the luminosity threshold"
 msgstr "Bestemmer kor lyse punkta må vere for å bli omdanna til lysglimt"
 
-#: ../plug-ins/common/sparkle.c:386
+#: ../plug-ins/common/sparkle.c:385
 msgid "F_lare intensity:"
 msgstr "Glimt_intensitet:"
 
-#: ../plug-ins/common/sparkle.c:389
+#: ../plug-ins/common/sparkle.c:388
 msgid "Adjust the flare intensity"
 msgstr "Bestemmer kor sterkt lysglimtet skal vere"
 
-#: ../plug-ins/common/sparkle.c:399
+#: ../plug-ins/common/sparkle.c:398
 msgid "_Spike length:"
 msgstr "_Strålelengde:"
 
-#: ../plug-ins/common/sparkle.c:402
+#: ../plug-ins/common/sparkle.c:401
 msgid "Adjust the spike length"
 msgstr "Still inn strålelengda"
 
-#: ../plug-ins/common/sparkle.c:412
+#: ../plug-ins/common/sparkle.c:411
 msgid "Sp_ike points:"
 msgstr "Talet på st_rålepunkt:"
 
-#: ../plug-ins/common/sparkle.c:415
+#: ../plug-ins/common/sparkle.c:414
 msgid "Adjust the number of spikes"
 msgstr "Sett talet på stråler"
 
-#: ../plug-ins/common/sparkle.c:425
+#: ../plug-ins/common/sparkle.c:424
 msgid "Spi_ke angle (-1: random):"
 msgstr "Strålevin_kel (-1: tilfeldig)"
 
-#: ../plug-ins/common/sparkle.c:428
+#: ../plug-ins/common/sparkle.c:427
 msgid "Adjust the spike angle (-1 causes a random angle to be chosen)"
-msgstr ""
-"Juster vinkel for stråle (-1 betyr at det blir vald ein tilfeldig vinkel)"
+msgstr "Juster vinkel for stråle (-1 betyr at det blir vald ein tilfeldig vinkel)"
 
-#: ../plug-ins/common/sparkle.c:439
+#: ../plug-ins/common/sparkle.c:438
 msgid "Spik_e density:"
 msgstr "Glimt_prosent:"
 
-#: ../plug-ins/common/sparkle.c:442
+#: ../plug-ins/common/sparkle.c:441
 msgid "Adjust the spike density"
 msgstr "Set kor mange prosent av moglege glimt som skal brukast"
 
-#: ../plug-ins/common/sparkle.c:452
+#: ../plug-ins/common/sparkle.c:451
 msgid "Tr_ansparency:"
 msgstr "_Gjennomsikt:"
 
-#: ../plug-ins/common/sparkle.c:455
+#: ../plug-ins/common/sparkle.c:454
 msgid "Adjust the opacity of the spikes"
 msgstr "Bestemmer kor gjennomsiktige strålane skal vere"
 
-#: ../plug-ins/common/sparkle.c:465
+#: ../plug-ins/common/sparkle.c:464
 msgid "_Random hue:"
-msgstr "Tilfeldig _farge:"
+msgstr "Tilfeldig kul_ør:"
 
-#: ../plug-ins/common/sparkle.c:468
+#: ../plug-ins/common/sparkle.c:467
 msgid "Adjust how much the hue should be changed randomly"
-msgstr "Verdi for kor mykje fargen skal forandre seg tilfeldig"
+msgstr "Verdi for kor mykje kuløren skal variera tilfeldig"
 
-#: ../plug-ins/common/sparkle.c:478
+#: ../plug-ins/common/sparkle.c:477
 msgid "Rando_m saturation:"
 msgstr "Tilfeldig _metning:"
 
-#: ../plug-ins/common/sparkle.c:481
+#: ../plug-ins/common/sparkle.c:480
 msgid "Adjust how much the saturation should be changed randomly"
 msgstr "Verdi for kor mykje metninga skal forandra seg tilfeldig"
 
-#: ../plug-ins/common/sparkle.c:498
+#: ../plug-ins/common/sparkle.c:497
 msgid "_Preserve luminosity"
 msgstr "_Behald lysverdi"
 
-#: ../plug-ins/common/sparkle.c:505
+#: ../plug-ins/common/sparkle.c:504
 msgid "Should the luminosity be preserved?"
-msgstr "Set det sentrale området av glimtet til den lysaste fargen i punktet."
+msgstr "Skal lysintesiteten bevarast?"
 
-#: ../plug-ins/common/sparkle.c:514
+#: ../plug-ins/common/sparkle.c:513
 msgid "In_verse"
 msgstr "In_verter"
 
-#: ../plug-ins/common/sparkle.c:520
+#: ../plug-ins/common/sparkle.c:519
 msgid "Should the effect be inversed?"
-msgstr "Set det sentrale området av glimtet til den mørkaste fargen i punktet."
+msgstr "Skal effekten reverserast?"
 
-#: ../plug-ins/common/sparkle.c:529
+#: ../plug-ins/common/sparkle.c:528
 msgid "A_dd border"
 msgstr "L_ag ramme"
 
-#: ../plug-ins/common/sparkle.c:535
+#: ../plug-ins/common/sparkle.c:534
 msgid "Draw a border of spikes around the image"
-msgstr ""
-"Lager ein kant av strålar rundt biletet i staden for mange lysglimt i biletet"
+msgstr "Lager ein kant av strålar rundt biletet i staden for mange lysglimt i biletet"
 
-#: ../plug-ins/common/sparkle.c:549
+#: ../plug-ins/common/sparkle.c:548
 msgid "_Natural color"
 msgstr "_Naturleg farge"
 
-#: ../plug-ins/common/sparkle.c:550
+#: ../plug-ins/common/sparkle.c:549
 msgid "_Foreground color"
 msgstr "F_orgrunnsfarge"
 
-#: ../plug-ins/common/sparkle.c:551
+#: ../plug-ins/common/sparkle.c:550
 msgid "_Background color"
 msgstr "B_akgrunnsfarge"
 
-#: ../plug-ins/common/sparkle.c:558
+#: ../plug-ins/common/sparkle.c:557
 msgid "Use the color of the image"
 msgstr "Bruk fargen i biletpunktet"
 
-#: ../plug-ins/common/sparkle.c:559
+#: ../plug-ins/common/sparkle.c:558
 msgid "Use the foreground color"
 msgstr "Bruk forgrunnsfagren"
 
-#: ../plug-ins/common/sparkle.c:560
+#: ../plug-ins/common/sparkle.c:559
 msgid "Use the background color"
 msgstr "Bruk bakgrunnsfagren"
 
-#: ../plug-ins/common/spheredesigner.c:291
-#: ../plug-ins/gimpressionist/general.c:166
+#: ../plug-ins/common/sphere-designer.c:290
+#: ../plug-ins/gimpressionist/general.c:165
 msgid "Solid"
-msgstr "Einsfarga"
+msgstr "Heiltrukke"
 
-#: ../plug-ins/common/spheredesigner.c:292
+#: ../plug-ins/common/sphere-designer.c:291
 msgid "Checker"
 msgstr "Sjakkbrett"
 
-#: ../plug-ins/common/spheredesigner.c:293
+#: ../plug-ins/common/sphere-designer.c:292
 msgid "Marble"
 msgstr "Marmor"
 
-#: ../plug-ins/common/spheredesigner.c:294
+#: ../plug-ins/common/sphere-designer.c:293
 msgid "Lizard"
 msgstr "Firfisle"
 
-#: ../plug-ins/common/spheredesigner.c:295
+#: ../plug-ins/common/sphere-designer.c:294
 msgid "Phong"
 msgstr "Phong"
 
-#: ../plug-ins/common/spheredesigner.c:296
+#: ../plug-ins/common/sphere-designer.c:295
+#: ../plug-ins/flame/flame.c:773
 msgid "Noise"
 msgstr "Støy"
 
-#: ../plug-ins/common/spheredesigner.c:297
+#: ../plug-ins/common/sphere-designer.c:296
 msgid "Wood"
 msgstr "Tre"
 
-#: ../plug-ins/common/spheredesigner.c:298
+#: ../plug-ins/common/sphere-designer.c:297
+#: ../plug-ins/flame/flame.c:757
 msgid "Spiral"
 msgstr "Spiralar"
 
-#: ../plug-ins/common/spheredesigner.c:299
+#: ../plug-ins/common/sphere-designer.c:298
 msgid "Spots"
 msgstr "Punkt"
 
-#: ../plug-ins/common/spheredesigner.c:1750
-#: ../plug-ins/common/spheredesigner.c:2697
+#: ../plug-ins/common/sphere-designer.c:1741
+#: ../plug-ins/common/sphere-designer.c:2689
 msgid "Texture"
 msgstr "Tekstur"
 
-#: ../plug-ins/common/spheredesigner.c:1752
+#: ../plug-ins/common/sphere-designer.c:1743
 msgid "Bumpmap"
 msgstr "Punktkopling"
 
-#: ../plug-ins/common/spheredesigner.c:1754
-#: ../plug-ins/common/spheredesigner.c:2699
+#: ../plug-ins/common/sphere-designer.c:1745
+#: ../plug-ins/common/sphere-designer.c:2691
 msgid "Light"
 msgstr "Lys"
 
-#: ../plug-ins/common/spheredesigner.c:2017
-#, c-format
+#: ../plug-ins/common/sphere-designer.c:2008
 msgid "File '%s' is not a valid save file."
 msgstr "Fila «%s» er ugyldig som lagringsfil"
 
-#: ../plug-ins/common/spheredesigner.c:2196
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Open File"
 msgstr "Opna fil"
 
-#: ../plug-ins/common/spheredesigner.c:2196
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Save File"
 msgstr "Lagra fil"
 
-#: ../plug-ins/common/spheredesigner.c:2551
+#: ../plug-ins/common/sphere-designer.c:2543
 msgid "Sphere Designer"
 msgstr "Kuledesigner"
 
-#: ../plug-ins/common/spheredesigner.c:2682
+#: ../plug-ins/common/sphere-designer.c:2674
 msgid "Properties"
 msgstr "Eigenskapar"
 
-#: ../plug-ins/common/spheredesigner.c:2698
+#: ../plug-ins/common/sphere-designer.c:2690
 msgid "Bump"
 msgstr "Buler"
 
-#: ../plug-ins/common/spheredesigner.c:2725
+#. row labels
+#: ../plug-ins/common/sphere-designer.c:2698
+#: ../plug-ins/lighting/lighting-ui.c:404
+msgid "Type:"
+msgstr "Type:"
+
+#: ../plug-ins/common/sphere-designer.c:2717
 msgid "Texture:"
 msgstr "Tekstur:"
 
-#: ../plug-ins/common/spheredesigner.c:2730
+#: ../plug-ins/common/sphere-designer.c:2722
 msgid "Colors:"
 msgstr "Fargar:"
 
-#: ../plug-ins/common/spheredesigner.c:2733
-#: ../plug-ins/common/spheredesigner.c:2744
+#: ../plug-ins/common/sphere-designer.c:2725
+#: ../plug-ins/common/sphere-designer.c:2736
 msgid "Color Selection Dialog"
 msgstr "Fargeveljardialog"
 
 #. Scale
-#: ../plug-ins/common/spheredesigner.c:2755
-#: ../plug-ins/gimpressionist/paper.c:194
-#: ../plug-ins/ifscompose/ifscompose.c:553
+#: ../plug-ins/common/sphere-designer.c:2747
+#: ../plug-ins/gimpressionist/paper.c:193
+#: ../plug-ins/ifs-compose/ifs-compose.c:553
 msgid "Scale:"
 msgstr "Skalering:"
 
-#: ../plug-ins/common/spheredesigner.c:2763
+#: ../plug-ins/common/sphere-designer.c:2755
 msgid "Turbulence:"
 msgstr "Turbulens:"
 
-#: ../plug-ins/common/spheredesigner.c:2770
+#: ../plug-ins/common/sphere-designer.c:2762
 msgid "Amount:"
 msgstr "Mengde:"
 
-#: ../plug-ins/common/spheredesigner.c:2777
+#: ../plug-ins/common/sphere-designer.c:2769
 msgid "Exp.:"
 msgstr "Eksp.:"
 
-#: ../plug-ins/common/spheredesigner.c:2784
+#: ../plug-ins/common/sphere-designer.c:2776
 msgid "Transformations"
 msgstr "Transformasjonar"
 
-#: ../plug-ins/common/spheredesigner.c:2807
+#: ../plug-ins/common/sphere-designer.c:2792
+#: ../plug-ins/map-object/map-object-ui.c:1143
+msgid "Scale X:"
+msgstr "Skalering X:"
+
+#: ../plug-ins/common/sphere-designer.c:2799
 msgid "Scale Y:"
 msgstr "Skalering Y:"
 
-#: ../plug-ins/common/spheredesigner.c:2813
+#: ../plug-ins/common/sphere-designer.c:2805
 msgid "Scale Z:"
 msgstr "Skalering Z:"
 
-#: ../plug-ins/common/spheredesigner.c:2820
+#: ../plug-ins/common/sphere-designer.c:2812
 msgid "Rotate X:"
 msgstr "Roter X:"
 
-#: ../plug-ins/common/spheredesigner.c:2827
+#: ../plug-ins/common/sphere-designer.c:2819
 msgid "Rotate Y:"
 msgstr "Roter Y:"
 
-#: ../plug-ins/common/spheredesigner.c:2834
+#: ../plug-ins/common/sphere-designer.c:2826
 msgid "Rotate Z:"
 msgstr "Roter Z:"
 
-#: ../plug-ins/common/spheredesigner.c:2841
+#: ../plug-ins/common/sphere-designer.c:2833
 msgid "Position X:"
 msgstr "Posisjon X:"
 
-#: ../plug-ins/common/spheredesigner.c:2848
+#: ../plug-ins/common/sphere-designer.c:2840
 msgid "Position Y:"
 msgstr "Posisjon Y:"
 
-#: ../plug-ins/common/spheredesigner.c:2855
+#: ../plug-ins/common/sphere-designer.c:2847
 msgid "Position Z:"
 msgstr "Posisjon Z:"
 
-#: ../plug-ins/common/spheredesigner.c:2970
+#: ../plug-ins/common/sphere-designer.c:2962
 msgid "Rendering sphere"
 msgstr "Bereknar kula"
 
-#: ../plug-ins/common/spheredesigner.c:3020
+#: ../plug-ins/common/sphere-designer.c:3012
 msgid "Create an image of a textured sphere"
 msgstr "Lager eit bilete av ei teksturert kule"
 
-#: ../plug-ins/common/spheredesigner.c:3027
+#: ../plug-ins/common/sphere-designer.c:3019
 msgid "Sphere _Designer..."
-msgstr "_Kuledesigner..."
+msgstr "Kule_designer …"
 
-#: ../plug-ins/common/spheredesigner.c:3081
+#: ../plug-ins/common/sphere-designer.c:3073
 msgid "Region selected for plug-in is empty"
 msgstr "Området du valde for programtillegg er tomt"
 
-#: ../plug-ins/common/spread.c:89
-msgid "Move pixels around randomly"
-msgstr "Flytt pikslane tilfeldig rundt om på biletet"
-
-#: ../plug-ins/common/spread.c:98
-msgid "Sp_read..."
-msgstr "S_prei..."
-
-#: ../plug-ins/common/spread.c:181
-msgid "Spreading"
-msgstr "Spreier"
-
-#: ../plug-ins/common/spread.c:344
-msgid "Spread"
-msgstr "Spreiing"
-
-#: ../plug-ins/common/spread.c:369
-msgid "Spread Amount"
-msgstr "Spreiingsmengde"
-
-#: ../plug-ins/common/struc.c:1140
-msgid "Add a canvas texture to the image"
-msgstr "Legg ein lerretstekstur til biletet"
-
-#: ../plug-ins/common/struc.c:1145
-msgid "_Apply Canvas..."
-msgstr "_Lerret..."
-
-#: ../plug-ins/common/struc.c:1226
-msgid "Applying canvas"
-msgstr "Legg til lerret..."
-
-#: ../plug-ins/common/struc.c:1263
-msgid "Apply Canvas"
-msgstr "Lerret"
-
-#: ../plug-ins/common/struc.c:1296
-msgid "_Top-right"
-msgstr "Oppe, _høgre"
-
-#: ../plug-ins/common/struc.c:1297
-msgid "Top-_left"
-msgstr "Oppe, _venstre"
-
-#: ../plug-ins/common/struc.c:1298
-msgid "_Bottom-left"
-msgstr "_Nede, venstre"
-
-#: ../plug-ins/common/struc.c:1299
-msgid "Bottom-_right"
-msgstr "N_edre, høgre"
-
-#: ../plug-ins/common/sunras.c:215 ../plug-ins/common/sunras.c:235
-msgid "SUN Rasterfile image"
-msgstr "SUN-Rasterfile-bilete"
-
-#: ../plug-ins/common/sunras.c:388
-#, c-format
-msgid "Could not open '%s' as SUN-raster-file"
-msgstr "Kunne ikkje opna «%s» som SUN-raster-fil"
-
-#: ../plug-ins/common/sunras.c:396
-msgid "The type of this SUN-rasterfile is not supported"
-msgstr "Støtter ikkje denne typen av SUN-rasterfil"
-
-#: ../plug-ins/common/sunras.c:425
-#, c-format
-msgid "Could not read color entries from '%s'"
-msgstr "Kunne ikkje lese fargeinnslaga frå «%s»"
-
-#: ../plug-ins/common/sunras.c:433
-msgid "Type of colormap not supported"
-msgstr "Støtter ikkje denne typen fargekart"
-
-#: ../plug-ins/common/sunras.c:440 ../plug-ins/common/xbm.c:810
-#: ../plug-ins/common/xwd.c:475
-#, c-format
-msgid ""
-"'%s':\n"
-"No image width specified"
-msgstr ""
-"«%s»:\n"
-"Biletbreidda ikkje oppgitt"
-
-#: ../plug-ins/common/sunras.c:448 ../plug-ins/common/xbm.c:817
-#: ../plug-ins/common/xwd.c:484
-#, c-format
-msgid ""
-"'%s':\n"
-"Image width is larger than GIMP can handle"
-msgstr ""
-"'%s':\n"
-"Biletbreidda er større enn det GIMP kan handtere"
-
-#: ../plug-ins/common/sunras.c:456 ../plug-ins/common/xbm.c:824
-#: ../plug-ins/common/xwd.c:492
-#, c-format
-msgid ""
-"'%s':\n"
-"No image height specified"
-msgstr ""
-"«%s»:\n"
-"Bilethøgde ikkje oppgitt"
-
-#: ../plug-ins/common/sunras.c:464 ../plug-ins/common/xbm.c:831
-#: ../plug-ins/common/xwd.c:500
-#, c-format
-msgid ""
-"'%s':\n"
-"Image height is larger than GIMP can handle"
-msgstr ""
-"'%s':\n"
-"Bilethøgda er større enn det GIMP kan handtere"
-
-#: ../plug-ins/common/sunras.c:502
-msgid "This image depth is not supported"
-msgstr "Støtter ikkje denne typen fargedjupn"
-
-#: ../plug-ins/common/sunras.c:524
-msgid "SUNRAS save cannot handle images with alpha channels"
-msgstr "SUNRAS kan ikkje lagra bilete med alfakanal"
-
-#: ../plug-ins/common/sunras.c:535
-msgid "Can't operate on unknown image types"
-msgstr "Kan ikkje arbeida med ukjente bilettypar"
-
-#: ../plug-ins/common/sunras.c:1063 ../plug-ins/common/sunras.c:1154
-#: ../plug-ins/common/sunras.c:1235 ../plug-ins/common/sunras.c:1330
-#: ../plug-ins/common/xwd.c:1332 ../plug-ins/common/xwd.c:1433
-#: ../plug-ins/common/xwd.c:1591 ../plug-ins/common/xwd.c:1791
-#: ../plug-ins/common/xwd.c:2048 ../plug-ins/fits/fits.c:678
-msgid "EOF encountered on reading"
-msgstr "fann EOF ved lesinga"
-
-#: ../plug-ins/common/sunras.c:1610
-msgid "Save as SUNRAS"
-msgstr "Lagra som SUNRAS"
-
-#. file save type
-#: ../plug-ins/common/sunras.c:1627
-msgid "Data Formatting"
-msgstr "Dataformatering"
-
-#: ../plug-ins/common/sunras.c:1631
-msgid "RunLength Encoded"
-msgstr "RunLength-koding"
-
-#: ../plug-ins/common/svg.c:138
-msgid "SVG image"
-msgstr "SVG-bilete"
-
-#: ../plug-ins/common/svg.c:323 ../plug-ins/common/svg.c:704
-msgid "Unknown reason"
-msgstr "Ukjent årsak"
-
-#: ../plug-ins/common/svg.c:327
-msgid "Rendering SVG"
-msgstr "Lager SVG..."
-
-#: ../plug-ins/common/svg.c:339
-msgid "Rendered SVG"
-msgstr "Teikna SVG"
-
-#: ../plug-ins/common/svg.c:553 ../plug-ins/common/wmf.c:349
-#, c-format
-msgid "%d × %d"
-msgstr "%d × %d"
-
-#: ../plug-ins/common/svg.c:561
-msgid ""
-"SVG file does not\n"
-"specify a size!"
-msgstr ""
-"SVG-fila spesifiserer\n"
-"ikkje storleik!"
-
-#. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/svg.c:711
-msgid "Render Scalable Vector Graphics"
-msgstr "Lager skalerbar vektorgrafikk (SVG)"
-
-#: ../plug-ins/common/svg.c:783 ../plug-ins/common/wmf.c:568
-msgid "Height:"
-msgstr "Høgde:"
-
-#: ../plug-ins/common/svg.c:857 ../plug-ins/common/wmf.c:642
-msgid "_X ratio:"
-msgstr "_X-andel:"
-
-#: ../plug-ins/common/svg.c:879 ../plug-ins/common/wmf.c:664
-msgid "_Y ratio:"
-msgstr "_Y-andel:"
-
-#: ../plug-ins/common/svg.c:893 ../plug-ins/common/wmf.c:678
-msgid "Constrain aspect ratio"
-msgstr "Inskrenk sideforholdet"
-
-#: ../plug-ins/common/svg.c:904 ../plug-ins/common/wmf.c:689
-#: ../plug-ins/print/print-page-layout.c:273
-#, c-format
-msgid "pixels/%a"
-msgstr "Pikslar/%a"
-
-#. Path Import
-#: ../plug-ins/common/svg.c:924
-msgid "Import _paths"
-msgstr "_Importer stigar"
-
-#: ../plug-ins/common/svg.c:930
-msgid ""
-"Import path elements of the SVG so they can be used with the GIMP path tool"
-msgstr ""
-"Importer SVG stigelement slik at desse kan bli behandla med stigverktøyet i "
-"GIMP"
-
-#: ../plug-ins/common/svg.c:943
-msgid "Merge imported paths"
-msgstr "Føy saman dei importerte stigane"
-
-#: ../plug-ins/common/tga.c:238 ../plug-ins/common/tga.c:257
-msgid "TarGA image"
-msgstr "TarGA-bilete"
-
-#: ../plug-ins/common/tga.c:434
-#, c-format
-msgid "Cannot read footer from '%s'"
-msgstr "Kan ikkje lese botnteksten frå «%s»"
-
-#: ../plug-ins/common/tga.c:450
-#, c-format
-msgid "Cannot read extension from '%s'"
-msgstr "Kan ikkje leseutviding frå «%s»"
-
-#: ../plug-ins/common/tga.c:1323
-msgid "Save as TGA"
-msgstr "Lagra som TGA"
-
-#. rle
-#: ../plug-ins/common/tga.c:1346
-msgid "_RLE compression"
-msgstr "_RLE-komprimering"
-
-#. origin
-#: ../plug-ins/common/tga.c:1356
-msgid "Or_igin at bottom left"
-msgstr "Ut_spring nede til venstre"
-
-#: ../plug-ins/common/threshold_alpha.c:85
+#: ../plug-ins/common/threshold-alpha.c:84
 msgid "Make transparency all-or-nothing"
 msgstr "Gjer alt eller ingenting gjennomsiktig"
 
-#: ../plug-ins/common/threshold_alpha.c:90
+#: ../plug-ins/common/threshold-alpha.c:89
 msgid "_Threshold Alpha..."
-msgstr "Grenseverdi for _alpha"
+msgstr "Grenseverdi for _alfa …"
 
-#: ../plug-ins/common/threshold_alpha.c:131
+#: ../plug-ins/common/threshold-alpha.c:130
 msgid "The layer has its alpha channel locked."
 msgstr "Alfakanalen er låst for dette laget."
 
-#: ../plug-ins/common/threshold_alpha.c:137
+#: ../plug-ins/common/threshold-alpha.c:136
 msgid "RGBA/GRAYA drawable is not selected."
 msgstr "Ingen RGBA/GRAYA er vald"
 
-#: ../plug-ins/common/threshold_alpha.c:165
+#: ../plug-ins/common/threshold-alpha.c:164
 msgid "Coloring transparency"
 msgstr "Farger gjennomsikt"
 
-#: ../plug-ins/common/threshold_alpha.c:248
+#: ../plug-ins/common/threshold-alpha.c:247
 msgid "Threshold Alpha"
 msgstr "Alpha-grenseverdi"
 
-#: ../plug-ins/common/threshold_alpha.c:283
+#: ../plug-ins/common/threshold-alpha.c:282
 msgid "Threshold:"
 msgstr "Grenseverdi:"
 
-#: ../plug-ins/common/tiff-load.c:239 ../plug-ins/common/tiff-save.c:181
-#: ../plug-ins/common/tiff-save.c:198
-msgid "TIFF image"
-msgstr "TIFF-bilete"
+#: ../plug-ins/common/tile-glass.c:123
+msgid "Simulate distortion caused by square glass tiles"
+msgstr "Biletet blir sett gjennom firkanta glasfliser"
 
-#: ../plug-ins/common/tiff-load.c:305
-#, c-format
-msgid "TIFF '%s' does not contain any directories"
-msgstr "TIFF «%s» inneheld ingen mapper"
+#: ../plug-ins/common/tile-glass.c:129
+msgid "_Glass Tile..."
+msgstr "Glas_fliser …"
 
-#: ../plug-ins/common/tiff-load.c:446
-msgid "Import from TIFF"
-msgstr "Importer frå TIFF"
+#: ../plug-ins/common/tile-glass.c:209
+#: ../plug-ins/common/tile-glass.c:249
+msgid "Glass Tile"
+msgstr "Glasfliser"
 
-#: ../plug-ins/common/tiff-load.c:970
-msgid "TIFF Channel"
-msgstr "TIFF-kanal"
+#: ../plug-ins/common/tile-glass.c:288
+msgid "Tile _width:"
+msgstr "Flis_breidde:"
 
-#: ../plug-ins/common/tiff-load.c:979
-msgid ""
-"Warning:\n"
-"The image you are loading has 16 bits per channel. GIMP can only handle 8 "
-"bit, so it will be converted for you. Information will be lost because of "
-"this conversion."
-msgstr ""
-"Åtvaring:\n"
-"Biletet du ønskjer å opna har 16 bit per kanal. GIMP kan bare behandla 8 "
-"bit, så det vil bli konvertert til dette formatet. Du kan miste informasjon "
-"på grunn av denne konverteringa."
+#: ../plug-ins/common/tile-paper.c:242
+#: ../plug-ins/common/tile-paper.c:555
+msgid "Paper Tile"
+msgstr "Papirfliser"
 
-#: ../plug-ins/common/tiff-save.c:873
-msgid ""
-"The TIFF format only supports comments in\n"
-"7bit ASCII encoding. No comment is saved."
-msgstr ""
-"TIFF-formatet godtar bare kommentarar i\n"
-"7 bit ASCII-kode. Ingen kommentarar er lagra."
+#: ../plug-ins/common/tile-paper.c:268
+msgid "Division"
+msgstr "Deling"
 
-#: ../plug-ins/common/tiff-save.c:1047
-msgid "Save as TIFF"
-msgstr "Lagra som TIFF"
+#: ../plug-ins/common/tile-paper.c:318
+msgid "Fractional Pixels"
+msgstr "Restpikslar"
 
-#. compression
-#: ../plug-ins/common/tiff-save.c:1069
-msgid "Compression"
-msgstr "Komprimering"
+#: ../plug-ins/common/tile-paper.c:323
+msgid "_Background"
+msgstr "_Bakgrunn"
 
-#: ../plug-ins/common/tiff-save.c:1073
-msgid "_None"
-msgstr "Inge_n"
+#: ../plug-ins/common/tile-paper.c:325
+msgid "_Ignore"
+msgstr "_Ignorer"
 
-#: ../plug-ins/common/tiff-save.c:1074
-msgid "_LZW"
-msgstr "_LZW"
+#: ../plug-ins/common/tile-paper.c:327
+msgid "_Force"
+msgstr "_Tving"
 
-#: ../plug-ins/common/tiff-save.c:1075
-msgid "_Pack Bits"
-msgstr "Pakk _Bits"
+#: ../plug-ins/common/tile-paper.c:334
+msgid "C_entering"
+msgstr "_Sentrer"
 
-#: ../plug-ins/common/tiff-save.c:1076
-msgid "_Deflate"
-msgstr "_Deflate"
+#: ../plug-ins/common/tile-paper.c:349
+msgid "Movement"
+msgstr "Flytting"
 
-#: ../plug-ins/common/tiff-save.c:1077
-msgid "_JPEG"
-msgstr "_JPEG"
+#: ../plug-ins/common/tile-paper.c:362
+msgid "_Max (%):"
+msgstr "_Maks (%):"
 
-#: ../plug-ins/common/tiff-save.c:1078
-msgid "CCITT Group _3 fax"
-msgstr "CCITT Grupe _3 faks"
+#: ../plug-ins/common/tile-paper.c:368
+msgid "_Wrap around"
+msgstr "_Linjebryting"
 
-#: ../plug-ins/common/tiff-save.c:1079
-msgid "CCITT Group _4 fax"
-msgstr "CCITT Grupe _4 faks"
+#: ../plug-ins/common/tile-paper.c:378
+msgid "Background Type"
+msgstr "Bakgrunn"
 
-#: ../plug-ins/common/tiff-save.c:1101
-msgid "Save _color values from transparent pixels"
-msgstr "Lagra _fargeverdiar frå gjennomsiktige pikslar"
+#: ../plug-ins/common/tile-paper.c:385
+msgid "I_nverted image"
+msgstr "I_nvertert bilete"
 
-#: ../plug-ins/common/tiff-save.c:1117 ../plug-ins/common/xbm.c:1227
-msgid "Comment:"
-msgstr "Kommentar:"
+#: ../plug-ins/common/tile-paper.c:387
+msgid "Im_age"
+msgstr "_Biletet"
 
-#: ../plug-ins/common/tile.c:101
-msgid "Create an array of copies of the image"
-msgstr "Lager ein tabell med kopiar av biletet"
+#: ../plug-ins/common/tile-paper.c:389
+msgid "Fo_reground color"
+msgstr "_Forgrunnsfargen"
 
-#: ../plug-ins/common/tile.c:111
-msgid "_Tile..."
-msgstr "_Flislegg..."
+#: ../plug-ins/common/tile-paper.c:391
+msgid "Bac_kground color"
+msgstr "_Bakgrunnsfargen"
 
-#. Set the tile cache size
-#: ../plug-ins/common/tile.c:190 ../plug-ins/common/tileit.c:321
-msgid "Tiling"
-msgstr "Flislegging"
+#: ../plug-ins/common/tile-paper.c:393
+msgid "S_elect here:"
+msgstr "_Vel farge her:"
 
-#: ../plug-ins/common/tile.c:401
-msgid "Tile"
-msgstr "Flis"
+#: ../plug-ins/common/tile-paper.c:400
+msgid "Background Color"
+msgstr "Bakgrunnsfarge"
 
-#: ../plug-ins/common/tile.c:422
-msgid "Tile to New Size"
-msgstr "Flislegg til nytt format"
+#: ../plug-ins/common/tile-paper.c:845
+msgid "Cut image into paper tiles, and slide them"
+msgstr "Klipp biletet opp i papirbitar og forskyv bitane"
 
-#: ../plug-ins/common/tile.c:444
-msgid "C_reate new image"
-msgstr "Lag n_ytt bilete"
+#: ../plug-ins/common/tile-paper.c:850
+msgid "September 31, 1999"
+msgstr "31. September 1999"
 
-#: ../plug-ins/common/tileit.c:215
+#: ../plug-ins/common/tile-paper.c:851
+msgid "_Paper Tile..."
+msgstr "_Papirfliser …"
+
+#: ../plug-ins/common/tile-seamless.c:66
+msgid "Alters edges to make the image seamlessly tileable"
+msgstr "Forandrer kantane slik at biletet kan flisleggast utan fuger"
+
+#: ../plug-ins/common/tile-seamless.c:72
+msgid "_Make Seamless"
+msgstr "Lag sau_mlause"
+
+#: ../plug-ins/common/tile-seamless.c:337
+msgid "Tiler"
+msgstr "Fliser"
+
+#: ../plug-ins/common/tile-small.c:214
 msgid "Tile image into smaller versions of the original"
 msgstr "Flislegg biletet i mindre versjonar av originalen"
 
-#: ../plug-ins/common/tileit.c:220
+#: ../plug-ins/common/tile-small.c:219
 msgid "_Small Tiles..."
-msgstr "S_må fliser..."
+msgstr "Små flise_r …"
 
-#: ../plug-ins/common/tileit.c:263
+#: ../plug-ins/common/tile-small.c:262
 msgid "Region selected for filter is empty."
 msgstr "Området du valde for filter er tomt."
 
+#. Set the tile cache size
+#: ../plug-ins/common/tile-small.c:320
+#: ../plug-ins/common/tile.c:189
+msgid "Tiling"
+msgstr "Flislegging"
+
 #. Get the preview image
-#: ../plug-ins/common/tileit.c:364
+#: ../plug-ins/common/tile-small.c:363
 msgid "Small Tiles"
-msgstr "S_må fliser..."
+msgstr "Små fliser"
 
 #. Area for buttons etc
 #. Flip
-#: ../plug-ins/common/tileit.c:414 ../plug-ins/ifscompose/ifscompose.c:609
+#: ../plug-ins/common/tile-small.c:413
+#: ../plug-ins/ifs-compose/ifs-compose.c:609
 msgid "Flip"
 msgstr "Spegelvend"
 
-#: ../plug-ins/common/tileit.c:462
+#: ../plug-ins/common/tile-small.c:461
 msgid "A_ll tiles"
 msgstr "A_lle flisene"
 
-#: ../plug-ins/common/tileit.c:476
+#: ../plug-ins/common/tile-small.c:475
 msgid "Al_ternate tiles"
 msgstr "_Annakvar flis"
 
-#: ../plug-ins/common/tileit.c:490
+#: ../plug-ins/common/tile-small.c:489
 msgid "_Explicit tile"
 msgstr "_Ei flis"
 
-#: ../plug-ins/common/tileit.c:496
+#: ../plug-ins/common/tile-small.c:495
 msgid "Ro_w:"
 msgstr "_Rad:"
 
-#: ../plug-ins/common/tileit.c:520
+#: ../plug-ins/common/tile-small.c:519
 msgid "Col_umn:"
 msgstr "_Kolonne:"
 
-#: ../plug-ins/common/tileit.c:572
+#: ../plug-ins/common/tile-small.c:571
 msgid "O_pacity:"
 msgstr "_Dekkevne:"
 
 #. Lower frame saying howmany segments
-#: ../plug-ins/common/tileit.c:581
+#: ../plug-ins/common/tile-small.c:580
 msgid "Number of Segments"
 msgstr "Talet på segment:"
 
-#: ../plug-ins/common/tiler.c:67
-msgid "Alters edges to make the image seamlessly tileable"
-msgstr "Forandrer kantane slik at biletet kan flisleggast utan fuger"
+#: ../plug-ins/common/tile.c:100
+msgid "Create an array of copies of the image"
+msgstr "Lager ein tabell med kopiar av biletet"
 
-#: ../plug-ins/common/tiler.c:73
-msgid "_Make Seamless"
-msgstr "Lag sau_mlause"
+#: ../plug-ins/common/tile.c:110
+msgid "_Tile..."
+msgstr "Flisle_gg …"
 
-#: ../plug-ins/common/tiler.c:338
-msgid "Tiler"
-msgstr "Fliser"
+#: ../plug-ins/common/tile.c:400
+msgid "Tile"
+msgstr "Flis"
 
-#: ../plug-ins/common/uniteditor.c:94
+#: ../plug-ins/common/tile.c:421
+msgid "Tile to New Size"
+msgstr "Flislegg til nytt format"
+
+#: ../plug-ins/common/tile.c:443
+msgid "C_reate new image"
+msgstr "Lag n_ytt bilete"
+
+#: ../plug-ins/common/unit-editor.c:93
 msgid "Saved"
 msgstr "Lagra"
 
-#: ../plug-ins/common/uniteditor.c:94
-msgid ""
-"A unit definition will only be saved before GIMP exits if this column is "
-"checked."
-msgstr ""
-"Dersom denne er avmerka, vil einingsdefinisjonen bli lagra når du avsluttar "
-"GIMP."
+#: ../plug-ins/common/unit-editor.c:93
+msgid "A unit definition will only be saved before GIMP exits if this column is checked."
+msgstr "Dersom denne er avmerka, vil einingsdefinisjonen bli lagra når du avsluttar GIMP."
 
-#: ../plug-ins/common/uniteditor.c:96
+#: ../plug-ins/common/unit-editor.c:95
 msgid "ID"
 msgstr "ID"
 
-#: ../plug-ins/common/uniteditor.c:96
-msgid ""
-"This string will be used to identify a unit in GIMP's configuration files."
-msgstr ""
-"Denne teksten blir nytta for å identifisera ei eining i konfigurasjonsfilene "
-"for GIMP."
+#: ../plug-ins/common/unit-editor.c:95
+msgid "This string will be used to identify a unit in GIMP's configuration files."
+msgstr "Denne teksten blir nytta for å identifisera ei eining i konfigurasjonsfilene for GIMP."
 
-#: ../plug-ins/common/uniteditor.c:98
+#: ../plug-ins/common/unit-editor.c:97
 msgid "Factor"
 msgstr "Faktor"
 
-#: ../plug-ins/common/uniteditor.c:98
+#: ../plug-ins/common/unit-editor.c:97
 msgid "How many units make up an inch."
 msgstr "Kor mange einingar er det i ein Inch."
 
-#: ../plug-ins/common/uniteditor.c:99
+#: ../plug-ins/common/unit-editor.c:98
 msgid "Digits"
 msgstr "Siffer"
 
-#: ../plug-ins/common/uniteditor.c:99
-msgid ""
-"This field is a hint for numerical input fields. It specifies how many "
-"decimal digits the input field should provide to get approximately the same "
-"accuracy as an \"inch\" input field with two decimal digits."
-msgstr ""
-"Dette feltet er ei tips for numeriske innskrivingsfelt. Det spesifiserer kor "
-"mange desimalar som må til for å bli omlag like nøyaktig som ei inch-"
-"innskriving med to desimalar. "
+#: ../plug-ins/common/unit-editor.c:98
+msgid "This field is a hint for numerical input fields. It specifies how many decimal digits the input field should provide to get approximately the same accuracy as an \"inch\" input field with two decimal digits."
+msgstr "Dette feltet er ei tips for numeriske innskrivingsfelt. Det spesifiserer kor mange desimalar som må til for å bli omlag like nøyaktig som ei inch-innskriving med to desimalar. "
 
-#: ../plug-ins/common/uniteditor.c:104
+#: ../plug-ins/common/unit-editor.c:103
 msgid "Symbol"
 msgstr "Symbol"
 
-#: ../plug-ins/common/uniteditor.c:104
-msgid ""
-"The unit's symbol if it has one (e.g. \"'\" for inches). The unit's "
-"abbreviation is used if doesn't have a symbol."
-msgstr ""
-"Symbol for eininga, dersom eit slik finst (t.d. «'» for Inch. Dersom det "
-"ikkje finst noe symbol, blir det brukt ei forkorting."
+#: ../plug-ins/common/unit-editor.c:103
+msgid "The unit's symbol if it has one (e.g. \" for inches). The unit's abbreviation is used if doesn't have a symbol."
+msgstr "Symbol for eininga, dersom eit slik finst (t.d. «'» for Inch. Dersom det ikkje finst noe symbol, blir det brukt ei forkorting."
 
-#: ../plug-ins/common/uniteditor.c:107
+#: ../plug-ins/common/unit-editor.c:106
 msgid "Abbreviation"
 msgstr "Forkorting"
 
-#: ../plug-ins/common/uniteditor.c:107
+#: ../plug-ins/common/unit-editor.c:106
 msgid "The unit's abbreviation (e.g. \"cm\" for centimeters)."
 msgstr "Forkorting for eininga, som t.d. «cm» for centimeter."
 
-#: ../plug-ins/common/uniteditor.c:109
+#: ../plug-ins/common/unit-editor.c:108
 msgid "Singular"
 msgstr "Singularis"
 
-#: ../plug-ins/common/uniteditor.c:109
+#: ../plug-ins/common/unit-editor.c:108
 msgid "The unit's singular form."
 msgstr "Eininga i eintal."
 
-#: ../plug-ins/common/uniteditor.c:110
+#: ../plug-ins/common/unit-editor.c:109
 msgid "Plural"
 msgstr "Pluralis"
 
-#: ../plug-ins/common/uniteditor.c:110
+#: ../plug-ins/common/unit-editor.c:109
 msgid "The unit's plural form."
 msgstr "Fleirtalsforma for eininga."
 
-#: ../plug-ins/common/uniteditor.c:121
+#: ../plug-ins/common/unit-editor.c:120
 msgid "Create a new unit from scratch"
 msgstr "Lag ei ny eining frå grunnen av."
 
-#: ../plug-ins/common/uniteditor.c:127
+#: ../plug-ins/common/unit-editor.c:126
 msgid "Create a new unit using the currently selected unit as template"
 msgstr "Lag ny eining med den valde eininga som mal."
 
-#: ../plug-ins/common/uniteditor.c:145
+#: ../plug-ins/common/unit-editor.c:144
 msgid "Create or alter units used in GIMP"
 msgstr "Opprett eller endra einingar brukte i GIMP"
 
-#: ../plug-ins/common/uniteditor.c:150
+#: ../plug-ins/common/unit-editor.c:149
 msgid "U_nits"
 msgstr "Einingar"
 
-#: ../plug-ins/common/uniteditor.c:209
+#: ../plug-ins/common/unit-editor.c:207
 msgid "Add a New Unit"
 msgstr "Legg til ei ny eining"
 
-#: ../plug-ins/common/uniteditor.c:238
+#: ../plug-ins/common/unit-editor.c:236
 msgid "_ID:"
 msgstr "_ID:"
 
-#: ../plug-ins/common/uniteditor.c:249
+#: ../plug-ins/common/unit-editor.c:247
 msgid "_Factor:"
 msgstr "_Faktor:"
 
-#: ../plug-ins/common/uniteditor.c:259
+#: ../plug-ins/common/unit-editor.c:257
 msgid "_Digits:"
 msgstr "_Tal:"
 
-#: ../plug-ins/common/uniteditor.c:271
+#: ../plug-ins/common/unit-editor.c:269
 msgid "_Symbol:"
 msgstr "_Symbol:"
 
-#: ../plug-ins/common/uniteditor.c:283
+#: ../plug-ins/common/unit-editor.c:281
 msgid "_Abbreviation:"
 msgstr "_Forkorting:"
 
-#: ../plug-ins/common/uniteditor.c:295
+#: ../plug-ins/common/unit-editor.c:293
 msgid "Si_ngular:"
 msgstr "Si_ngularis:"
 
-#: ../plug-ins/common/uniteditor.c:307
+#: ../plug-ins/common/unit-editor.c:305
 msgid "_Plural:"
 msgstr "_Pluralis:"
 
-#: ../plug-ins/common/uniteditor.c:350
+#: ../plug-ins/common/unit-editor.c:348
 msgid "Incomplete input"
 msgstr "Ufullstendig innskriving"
 
-#: ../plug-ins/common/uniteditor.c:353
+#: ../plug-ins/common/unit-editor.c:351
 msgid "Please fill in all text fields."
 msgstr "Fyll inn alle tekstfelta."
 
-#: ../plug-ins/common/uniteditor.c:410
+#: ../plug-ins/common/unit-editor.c:408
 msgid "Unit Editor"
 msgstr "Einingshandterar"
 
-#: ../plug-ins/common/unsharp.c:128
+#: ../plug-ins/common/unsharp-mask.c:130
 msgid "The most widely useful method for sharpening an image"
 msgstr "Den mest brukte metoden for å skjerpe bileta"
 
-#: ../plug-ins/common/unsharp.c:138
+#: ../plug-ins/common/unsharp-mask.c:140
 msgid "_Unsharp Mask..."
-msgstr "_Uskarpmaske..."
+msgstr "_Uskarpmaske …"
 
-#: ../plug-ins/common/unsharp.c:475
+#: ../plug-ins/common/unsharp-mask.c:685
 msgid "Merging"
 msgstr "Fletter"
 
-#: ../plug-ins/common/unsharp.c:642
+#: ../plug-ins/common/unsharp-mask.c:829
 msgid "Unsharp Mask"
 msgstr "Uskarpmaske"
 
+#: ../plug-ins/common/value-invert.c:89
+msgid "Invert the brightness of each pixel"
+msgstr "Inverter lysmengda for kvar piksel"
+
+#: ../plug-ins/common/value-invert.c:103
+msgid "_Value Invert"
+msgstr "_Inverter verdiar"
+
+#: ../plug-ins/common/value-invert.c:190
+msgid "Value Invert"
+msgstr "Inverter verdiane"
+
+#: ../plug-ins/common/value-propagate.c:188
+msgid "More _white (larger value)"
+msgstr "Meir _kvitt (større verdi)"
+
+#: ../plug-ins/common/value-propagate.c:191
+msgid "More blac_k (smaller value)"
+msgstr "Meir _svart (mindre verdi)"
+
+#: ../plug-ins/common/value-propagate.c:194
+msgid "_Middle value to peaks"
+msgstr "_Middelverdi i spissane"
+
+#: ../plug-ins/common/value-propagate.c:197
+msgid "_Foreground to peaks"
+msgstr "Forgrunn til s_pissane"
+
+#: ../plug-ins/common/value-propagate.c:200
+msgid "O_nly foreground"
+msgstr "_Bare forgrunn"
+
+#: ../plug-ins/common/value-propagate.c:203
+msgid "Only b_ackground"
+msgstr "B_are bakgrunn"
+
+#: ../plug-ins/common/value-propagate.c:206
+msgid "Mor_e opaque"
+msgstr "Mindr_e gjennomsiktig"
+
+#: ../plug-ins/common/value-propagate.c:209
+msgid "More t_ransparent"
+msgstr "Mei_r gjennomsiktig"
+
+#: ../plug-ins/common/value-propagate.c:232
+msgid "Propagate certain colors to neighboring pixels"
+msgstr "Utbrei bestemte fargar til nabopikslane"
+
+#: ../plug-ins/common/value-propagate.c:237
+msgid "_Value Propagate..."
+msgstr "_Verdiutbreiing …"
+
+#: ../plug-ins/common/value-propagate.c:244
+msgid "Shrink lighter areas of the image"
+msgstr "Krymp lysare område i biletet"
+
+#: ../plug-ins/common/value-propagate.c:249
+msgid "E_rode"
+msgstr "E_roder"
+
+#: ../plug-ins/common/value-propagate.c:256
+msgid "Grow lighter areas of the image"
+msgstr "Auk lysare område i biletet"
+
+#: ../plug-ins/common/value-propagate.c:261
+msgid "_Dilate"
+msgstr "_Utvid"
+
+#: ../plug-ins/common/value-propagate.c:472
+#: ../plug-ins/common/value-propagate.c:1085
+msgid "Value Propagate"
+msgstr "Verdiutbreiing"
+
+#. Parameter settings
+#: ../plug-ins/common/value-propagate.c:1151
+msgid "Propagate"
+msgstr "Utbreiing"
+
+#: ../plug-ins/common/value-propagate.c:1164
+msgid "Lower t_hreshold:"
+msgstr "N_edre grenseverdi:"
+
+#: ../plug-ins/common/value-propagate.c:1176
+msgid "_Upper threshold:"
+msgstr "_Øvre grenseverdi:"
+
+#: ../plug-ins/common/value-propagate.c:1188
+msgid "_Propagating rate:"
+msgstr "_Utbreiingsmengde:"
+
+#: ../plug-ins/common/value-propagate.c:1199
+msgid "To l_eft"
+msgstr "Til ve_nstre"
+
+#: ../plug-ins/common/value-propagate.c:1202
+msgid "To _right"
+msgstr "Til _høgre"
+
+#: ../plug-ins/common/value-propagate.c:1205
+msgid "To _top"
+msgstr "Til _toppen"
+
+#: ../plug-ins/common/value-propagate.c:1208
+msgid "To _bottom"
+msgstr "Til b_otnen"
+
+#: ../plug-ins/common/value-propagate.c:1217
+msgid "Propagating _alpha channel"
+msgstr "Utbrei _alfakanal"
+
+#: ../plug-ins/common/value-propagate.c:1228
+msgid "Propagating value channel"
+msgstr "Utbrei verdikanal"
+
+#: ../plug-ins/common/van-gogh-lic.c:565
+#: ../plug-ins/common/van-gogh-lic.c:640
+msgid "Van Gogh (LIC)"
+msgstr "Van Gogh (LIC)"
+
+#: ../plug-ins/common/van-gogh-lic.c:665
+msgid "Effect Channel"
+msgstr "Effektkanal"
+
+#: ../plug-ins/common/van-gogh-lic.c:672
+msgid "_Brightness"
+msgstr "_Lysstyrke"
+
+#: ../plug-ins/common/van-gogh-lic.c:678
+msgid "Effect Operator"
+msgstr "Effektoperatør"
+
+#: ../plug-ins/common/van-gogh-lic.c:683
+msgid "_Derivative"
+msgstr "_Avleidd"
+
+#: ../plug-ins/common/van-gogh-lic.c:684
+msgid "_Gradient"
+msgstr "_Fargeovergang"
+
+#: ../plug-ins/common/van-gogh-lic.c:690
+msgid "Convolve"
+msgstr "Konturutjamning"
+
+#: ../plug-ins/common/van-gogh-lic.c:695
+msgid "_With white noise"
+msgstr "_Med kvit støy"
+
+#: ../plug-ins/common/van-gogh-lic.c:696
+msgid "W_ith source image"
+msgstr "M_ed kjeldebiletet"
+
+#: ../plug-ins/common/van-gogh-lic.c:715
+msgid "_Effect image:"
+msgstr "_Effektbilete:"
+
+#: ../plug-ins/common/van-gogh-lic.c:726
+msgid "_Filter length:"
+msgstr "_Filterlengde:"
+
+#: ../plug-ins/common/van-gogh-lic.c:735
+msgid "_Noise magnitude:"
+msgstr "_Støymengdel:"
+
+#: ../plug-ins/common/van-gogh-lic.c:744
+msgid "In_tegration steps:"
+msgstr "In_tegrasjonssteg:"
+
+#: ../plug-ins/common/van-gogh-lic.c:753
+msgid "_Minimum value:"
+msgstr "_Minimumverdi:"
+
+#: ../plug-ins/common/van-gogh-lic.c:762
+msgid "M_aximum value:"
+msgstr "M_aksimumverdi:"
+
+#: ../plug-ins/common/van-gogh-lic.c:808
+msgid "Special effects that nobody understands"
+msgstr "Spesialeffektar som ingen forstår"
+
+#: ../plug-ins/common/van-gogh-lic.c:813
+msgid "_Van Gogh (LIC)..."
+msgstr "_Van Gogh (LIC) …"
+
 #: ../plug-ins/common/video.c:41
 msgid "_Staggered"
 msgstr "_Stopla"
@@ -8312,14 +7880,14 @@ msgstr "_Punkt"
 
 #: ../plug-ins/common/video.c:1806
 msgid "Simulate distortion produced by a fuzzy or low-res monitor"
-msgstr ""
-"Simulerar forstyrringar som kjem av ein uklar skjerm med dårleg oppløysing"
+msgstr "Simulerar forstyrringar som kjem av ein uklar skjerm med dårleg oppløysing"
 
 #: ../plug-ins/common/video.c:1813
 msgid "Vi_deo..."
-msgstr "Vi_deo..."
+msgstr "Vi_deo …"
 
-#: ../plug-ins/common/video.c:1885 ../plug-ins/common/video.c:2016
+#: ../plug-ins/common/video.c:1885
+#: ../plug-ins/common/video.c:2016
 msgid "Video"
 msgstr "Video"
 
@@ -8336,239 +7904,132 @@ msgstr "_Additiv"
 msgid "_Rotated"
 msgstr "_Rotert"
 
-#: ../plug-ins/common/vinvert.c:90
-msgid "Invert the brightness of each pixel"
-msgstr "Inverter lysmengda for kvar piksel"
-
-#: ../plug-ins/common/vinvert.c:104
-msgid "_Value Invert"
-msgstr "_Inverter verdiar"
-
-#: ../plug-ins/common/vinvert.c:191
-msgid "Value Invert"
-msgstr "Inverter verdiar..."
-
-#: ../plug-ins/common/vpropagate.c:189
-msgid "More _white (larger value)"
-msgstr "Meir _kvitt (større verdi)"
-
-#: ../plug-ins/common/vpropagate.c:192
-msgid "More blac_k (smaller value)"
-msgstr "Meir _svart (mindre verdi)"
-
-#: ../plug-ins/common/vpropagate.c:195
-msgid "_Middle value to peaks"
-msgstr "_Middelverdi i spissane"
-
-#: ../plug-ins/common/vpropagate.c:198
-msgid "_Foreground to peaks"
-msgstr "_Forgrunn til spissane"
-
-#: ../plug-ins/common/vpropagate.c:201
-msgid "O_nly foreground"
-msgstr "_Bare forgrunn"
-
-#: ../plug-ins/common/vpropagate.c:204
-msgid "Only b_ackground"
-msgstr "Bare _bakgrunn"
-
-#: ../plug-ins/common/vpropagate.c:207
-msgid "Mor_e opaque"
-msgstr "M_indre gjennomsiktig"
-
-#: ../plug-ins/common/vpropagate.c:210
-msgid "More t_ransparent"
-msgstr "Meir _gjennomsiktig"
-
-#: ../plug-ins/common/vpropagate.c:233
-msgid "Propagate certain colors to neighboring pixels"
-msgstr "Utbrei bestemte fargar til nabopikslane"
-
-#: ../plug-ins/common/vpropagate.c:238
-msgid "_Value Propagate..."
-msgstr "_Verdiutbreiing..."
-
-#: ../plug-ins/common/vpropagate.c:245
-#, fuzzy
-msgid "Shrink lighter areas of the image"
-msgstr "Krymp lysare område i biletet"
-
-#: ../plug-ins/common/vpropagate.c:250
-msgid "E_rode"
-msgstr "E_roder"
-
-#: ../plug-ins/common/vpropagate.c:257
-#, fuzzy
-msgid "Grow lighter areas of the image"
-msgstr "Auk lysare område i biletet"
-
-#: ../plug-ins/common/vpropagate.c:262
-msgid "_Dilate"
-msgstr "_Utvid"
-
-#: ../plug-ins/common/vpropagate.c:473 ../plug-ins/common/vpropagate.c:1063
-msgid "Value Propagate"
-msgstr "Verdiutbreiing"
-
-#. Parameter settings
-#: ../plug-ins/common/vpropagate.c:1128
-msgid "Propagate"
-msgstr "Utbreiing"
-
-#: ../plug-ins/common/vpropagate.c:1141
-msgid "Lower t_hreshold:"
-msgstr "_Nedre grenseverdi:"
-
-#: ../plug-ins/common/vpropagate.c:1153
-msgid "_Upper threshold:"
-msgstr "_Øvre grenseverdi:"
-
-#: ../plug-ins/common/vpropagate.c:1165
-msgid "_Propagating rate:"
-msgstr "_Utbreiingsmengde:"
-
-#: ../plug-ins/common/vpropagate.c:1176
-msgid "To l_eft"
-msgstr "Til _venstre"
-
-#: ../plug-ins/common/vpropagate.c:1179
-msgid "To _right"
-msgstr "Til _høgre"
-
-#: ../plug-ins/common/vpropagate.c:1182
-msgid "To _top"
-msgstr "Til _toppen"
-
-#: ../plug-ins/common/vpropagate.c:1185
-msgid "To _bottom"
-msgstr "Til _botnen"
-
-#: ../plug-ins/common/vpropagate.c:1194
-msgid "Propagating _alpha channel"
-msgstr "Utbrei _alfakanal"
-
-#: ../plug-ins/common/vpropagate.c:1205
-msgid "Propagating value channel"
-msgstr "Utbrei verdikanal"
-
-#: ../plug-ins/common/warp.c:233
+#: ../plug-ins/common/warp.c:232
 msgid "Twist or smear image in many different ways"
 msgstr "Vrir og smører utover bileta på mange ulike måtar"
 
-#: ../plug-ins/common/warp.c:241
+#: ../plug-ins/common/warp.c:240
 msgid "_Warp..."
-msgstr "_Deformering..."
+msgstr "_Deformering …"
 
-#: ../plug-ins/common/warp.c:376
+#: ../plug-ins/common/warp.c:375
 msgid "Warp"
 msgstr "Deformering"
 
-#: ../plug-ins/common/warp.c:397
+#: ../plug-ins/common/warp.c:396
 msgid "Basic Options"
 msgstr "Grunnleggjande innstillingar"
 
-#: ../plug-ins/common/warp.c:419
+#: ../plug-ins/common/warp.c:418
 msgid "Step size:"
 msgstr "Steglengde:"
 
+#: ../plug-ins/common/warp.c:432
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:769
+#: ../plug-ins/ifs-compose/ifs-compose.c:1211
+msgid "Iterations:"
+msgstr "Gjentakingar:"
+
 #. Displacement map menu
-#: ../plug-ins/common/warp.c:442
+#: ../plug-ins/common/warp.c:441
 msgid "Displacement map:"
 msgstr "Forskyvingskart:"
 
 #. =======================================================================
 #. Displacement Type
-#: ../plug-ins/common/warp.c:460
+#: ../plug-ins/common/warp.c:459
 msgid "On edges:"
 msgstr "Kanthandtering:"
 
-#: ../plug-ins/common/warp.c:471
+#: ../plug-ins/common/warp.c:470
 msgid "Wrap"
 msgstr "Bryt"
 
-#: ../plug-ins/common/warp.c:486
+#: ../plug-ins/common/warp.c:485
 msgid "Smear"
 msgstr "Smør ut"
 
-#: ../plug-ins/common/warp.c:501 ../plug-ins/fits/fits.c:1002
-#: ../plug-ins/flame/flame.c:1151 ../plug-ins/gfig/gfig-dialog.c:1460
+#: ../plug-ins/common/warp.c:500
+#: ../plug-ins/file-fits/fits.c:1020
+#: ../plug-ins/flame/flame.c:1174
+#: ../plug-ins/gfig/gfig-dialog.c:1459
 msgid "Black"
 msgstr "Svart"
 
-#: ../plug-ins/common/warp.c:516
+#: ../plug-ins/common/warp.c:515
 msgid "Foreground color"
 msgstr "Forgrunnsfarge"
 
 #. --------------------------------------------------------------------
 #. ---------    The secondary table         --------------------------
-#: ../plug-ins/common/warp.c:536
+#: ../plug-ins/common/warp.c:535
 msgid "Advanced Options"
 msgstr "Avanserte innstillingar"
 
-#: ../plug-ins/common/warp.c:552
+#: ../plug-ins/common/warp.c:551
 msgid "Dither size:"
 msgstr "Utjamningsstorleik:"
 
-#: ../plug-ins/common/warp.c:565
+#: ../plug-ins/common/warp.c:564
 msgid "Rotation angle:"
 msgstr "Rotasjonsvinkel:"
 
-#: ../plug-ins/common/warp.c:578
+#: ../plug-ins/common/warp.c:577
 msgid "Substeps:"
 msgstr "Mellomsteg:"
 
 #. Magnitude map menu
-#: ../plug-ins/common/warp.c:587
+#: ../plug-ins/common/warp.c:586
 msgid "Magnitude map:"
 msgstr "Vektleggingskart:"
 
-#: ../plug-ins/common/warp.c:609
+#: ../plug-ins/common/warp.c:608
 msgid "Use magnitude map"
 msgstr "Bruk vektleggingskart"
 
 #. --------------------------------------------------------------------
 #. ---------    The "other" table         --------------------------
-#: ../plug-ins/common/warp.c:622
+#: ../plug-ins/common/warp.c:621
 msgid "More Advanced Options"
 msgstr "Meir avanserte innstillingar"
 
-#: ../plug-ins/common/warp.c:639
+#: ../plug-ins/common/warp.c:638
 msgid "Gradient scale:"
 msgstr "Overgangsskala:"
 
-#: ../plug-ins/common/warp.c:658
+#: ../plug-ins/common/warp.c:657
 msgid "Gradient map selection menu"
 msgstr "Valmeny for overgangskart"
 
-#: ../plug-ins/common/warp.c:668
+#: ../plug-ins/common/warp.c:667
 msgid "Vector mag:"
 msgstr "Vektorforstørring:"
 
 #. Angle
-#: ../plug-ins/common/warp.c:683 ../plug-ins/ifscompose/ifscompose.c:567
+#: ../plug-ins/common/warp.c:682
+#: ../plug-ins/ifs-compose/ifs-compose.c:567
 msgid "Angle:"
 msgstr "Vinkel:"
 
-#: ../plug-ins/common/warp.c:702
+#: ../plug-ins/common/warp.c:701
 msgid "Fixed-direction-vector map selection menu"
 msgstr "Meny for vektor-kart med konstant retning"
 
 #. make sure layer is visible
-#: ../plug-ins/common/warp.c:1178
+#: ../plug-ins/common/warp.c:1177
 msgid "Smoothing X gradient"
 msgstr "Jamnar ut X-overgang"
 
-#: ../plug-ins/common/warp.c:1181
+#: ../plug-ins/common/warp.c:1180
 msgid "Smoothing Y gradient"
 msgstr "Jamnar ut X-overgang"
 
 #. calculate new X,Y Displacement image maps
-#: ../plug-ins/common/warp.c:1231
+#: ../plug-ins/common/warp.c:1230
 msgid "Finding XY gradient"
 msgstr "Finn XY-overgang"
 
-#: ../plug-ins/common/warp.c:1256
-#, c-format
+#: ../plug-ins/common/warp.c:1255
 msgid "Flow step %d"
 msgstr "Flytsteg %d"
 
@@ -8578,406 +8039,777 @@ msgstr "Legg inn bølgjer"
 
 #: ../plug-ins/common/waves.c:125
 msgid "_Waves..."
-msgstr "_Bølgjer..."
+msgstr "Bøl_gjer …"
 
 #: ../plug-ins/common/waves.c:248
+#: ../plug-ins/flame/flame.c:762
 msgid "Waves"
 msgstr "Bølgjer"
 
-#: ../plug-ins/common/waves.c:293
+#: ../plug-ins/common/waves.c:294
 msgid "_Reflective"
 msgstr "_Reflekterande"
 
-#: ../plug-ins/common/waves.c:312
+#: ../plug-ins/common/waves.c:313
 msgid "_Amplitude:"
-msgstr "_Amplityde:"
+msgstr "_Amplitude:"
 
-#: ../plug-ins/common/waves.c:324
+#: ../plug-ins/common/waves.c:325
 msgid "_Phase:"
-msgstr "_Fase:"
+msgstr "F_ase:"
 
-#: ../plug-ins/common/waves.c:336
+#: ../plug-ins/common/waves.c:337
 msgid "_Wavelength:"
 msgstr "_Bølgjelengde:"
 
-#: ../plug-ins/common/waves.c:447
+#: ../plug-ins/common/waves.c:448
 msgid "Waving"
 msgstr "Lager bølgjene"
 
-#: ../plug-ins/common/webbrowser.c:141
+#: ../plug-ins/common/web-browser.c:205
 msgid ""
 "Web browser not specified.\n"
-"Please specify a web browser using the Preferences Dialog."
+"Please specify a web browser using the Preferences dialog."
 msgstr ""
 "Nettlesar er ikkje spesifisert.\n"
 "Opna brukarinnstillingane og spesifiser ein nettlesar."
 
-#: ../plug-ins/common/webbrowser.c:161
-#, c-format
+#: ../plug-ins/common/web-browser.c:227
 msgid ""
-"Could not parse specified web browser command:\n"
+"Could not parse the web browser command specified in the Preferences dialog:\n"
+"\n"
 "%s"
 msgstr ""
-"Kunne ikkje tolka denne kommandoen for nettlesaren:\n"
+"Kunne ikkje tolka denne kommandoen for nettlesaren spesifisert i brukarinnstillingane:\n"
+"\n"
 "%s"
 
-#: ../plug-ins/common/webbrowser.c:174
-#, c-format
+#: ../plug-ins/common/web-browser.c:245
 msgid ""
-"Could not execute specified web browser:\n"
+"Could not execute the web browser specified in the Preferences dialog:\n"
+"\n"
 "%s"
 msgstr ""
-"Kunne ikkje starte den oppgitte nettlesaren:\n"
+"Kunne ikkje opna nettlesaren spesifisert i brukarinnstillingane:\n"
+"\n"
 "%s"
 
-#: ../plug-ins/common/whirlpinch.c:138
+#: ../plug-ins/common/whirl-pinch.c:137
 msgid "Distort an image by whirling and pinching"
 msgstr "Forvrenger biletet ved å dreie og knipe det inn"
 
-#: ../plug-ins/common/whirlpinch.c:149
+#: ../plug-ins/common/whirl-pinch.c:148
 msgid "W_hirl and Pinch..."
-msgstr "_Drei og knip..."
+msgstr "_Drei og knip …"
 
-#: ../plug-ins/common/whirlpinch.c:193
+#: ../plug-ins/common/whirl-pinch.c:192
 msgid "Region affected by plug-in is empty"
 msgstr "Området som blir berørt av programtillegget er tomt"
 
-#: ../plug-ins/common/whirlpinch.c:341
+#: ../plug-ins/common/whirl-pinch.c:340
 msgid "Whirling and pinching"
 msgstr "Dreier og knip"
 
-#: ../plug-ins/common/whirlpinch.c:528
+#: ../plug-ins/common/whirl-pinch.c:527
 msgid "Whirl and Pinch"
 msgstr "Drei og knip"
 
-#: ../plug-ins/common/whirlpinch.c:564
+#: ../plug-ins/common/whirl-pinch.c:564
 msgid "_Whirl angle:"
-msgstr "Dreie_vinkel:"
+msgstr "_Dreievinkel:"
 
-#: ../plug-ins/common/whirlpinch.c:576
+#: ../plug-ins/common/whirl-pinch.c:576
 msgid "_Pinch amount:"
 msgstr "_Kniping:"
 
-#: ../plug-ins/common/wind.c:175
+#: ../plug-ins/common/wind.c:174
 msgid "Smear image to give windblown effect"
 msgstr "Smør biletet for å gi inntrykk av blåst"
 
-#: ../plug-ins/common/wind.c:180
+#: ../plug-ins/common/wind.c:179
 msgid "Wi_nd..."
-msgstr "Vi_nd..."
+msgstr "Vi_nd …"
 
-#: ../plug-ins/common/wind.c:315
+#: ../plug-ins/common/wind.c:314
 msgid "Rendering blast"
 msgstr "Lager blåst"
 
-#: ../plug-ins/common/wind.c:447
+#: ../plug-ins/common/wind.c:446
 msgid "Rendering wind"
 msgstr "Lager vinden"
 
-#: ../plug-ins/common/wind.c:879
+#: ../plug-ins/common/wind.c:878
 msgid "Wind"
 msgstr "Vind"
 
 #. ********************************************************
 #. radio buttons for choosing wind rendering algorithm
 #. *****************************************************
-#: ../plug-ins/common/wind.c:919
+#: ../plug-ins/common/wind.c:920
 msgid "Style"
 msgstr "Stil"
 
-#: ../plug-ins/common/wind.c:923
+#: ../plug-ins/common/wind.c:924
 msgid "_Wind"
 msgstr "_Vind"
 
-#: ../plug-ins/common/wind.c:924
+#: ../plug-ins/common/wind.c:925
 msgid "_Blast"
 msgstr "_Blåst"
 
-#: ../plug-ins/common/wind.c:947
-msgid "_Left"
-msgstr "_Venstre"
-
 #: ../plug-ins/common/wind.c:948
+msgid "_Left"
+msgstr "Ve_nstre"
+
+#: ../plug-ins/common/wind.c:949
 msgid "_Right"
 msgstr "_Høgre"
 
 #. ****************************************************
 #. radio buttons for choosing BOTH, LEADING, TRAILING
 #. **************************************************
-#: ../plug-ins/common/wind.c:967
+#: ../plug-ins/common/wind.c:968
 msgid "Edge Affected"
 msgstr "Påverka kant"
 
-#: ../plug-ins/common/wind.c:971
+#: ../plug-ins/common/wind.c:972
 msgid "L_eading"
 msgstr "_Leiande"
 
-#: ../plug-ins/common/wind.c:972
-msgid "Tr_ailing"
-msgstr "_Hengande"
-
 #: ../plug-ins/common/wind.c:973
-msgid "Bot_h"
-msgstr "Be_gge"
+msgid "Tr_ailing"
+msgstr "H_engande"
 
-#: ../plug-ins/common/wind.c:1010
+#: ../plug-ins/common/wind.c:974
+msgid "Bot_h"
+msgstr "Beg_ge"
+
+#: ../plug-ins/common/wind.c:1011
 msgid "Higher values restrict the effect to fewer areas of the image"
 msgstr "Høgare verdi avgrensar effekten til færre område av biletet"
 
-#: ../plug-ins/common/wind.c:1025 ../plug-ins/gimpressionist/orientmap.c:694
+#: ../plug-ins/common/wind.c:1026
+#: ../plug-ins/gimpressionist/orientmap.c:693
 msgid "_Strength:"
 msgstr "_Styrke:"
 
-#: ../plug-ins/common/wind.c:1029
+#: ../plug-ins/common/wind.c:1030
 msgid "Higher values increase the magnitude of the effect"
 msgstr "Høgare verdi gir sterkare effekt"
 
-#: ../plug-ins/common/wmf.c:128
-msgid "Microsoft WMF file"
-msgstr "Microsoft-WMF-fil"
+#: ../plug-ins/file-bmp/bmp-read.c:85
+msgid "Bad colormap"
+msgstr "Feil fargekart"
 
-#: ../plug-ins/common/wmf.c:343
-msgid ""
-"WMF file does not\n"
-"specify a size!"
-msgstr ""
-"WMF-fil spesifiserer\n"
-"ikkje storleik!"
+#: ../plug-ins/file-bmp/bmp-read.c:169
+#: ../plug-ins/file-bmp/bmp-read.c:179
+#: ../plug-ins/file-bmp/bmp-read.c:186
+#: ../plug-ins/file-bmp/bmp-read.c:195
+#: ../plug-ins/file-bmp/bmp-read.c:210
+#: ../plug-ins/file-bmp/bmp-read.c:394
+#: ../plug-ins/file-bmp/bmp-read.c:402
+#: ../plug-ins/file-bmp/bmp-read.c:410
+#: ../plug-ins/file-bmp/bmp-read.c:418
+msgid "'%s' is not a valid BMP file"
+msgstr "«%s» er ikkje ei gyldig BMP-fil"
 
-#: ../plug-ins/common/wmf.c:491
-msgid "Render Windows Metafile"
-msgstr "Lager Windows-Metafile"
+#: ../plug-ins/file-bmp/bmp-read.c:224
+#: ../plug-ins/file-bmp/bmp-read.c:251
+#: ../plug-ins/file-bmp/bmp-read.c:279
+#: ../plug-ins/file-bmp/bmp-read.c:344
+#: ../plug-ins/file-bmp/bmp-read.c:370
+msgid "Error reading BMP file header from '%s'"
+msgstr "Feil ved lesing av header for BMP-fila «%s»"
 
-#: ../plug-ins/common/wmf.c:985
-#, c-format
-msgid "Could not open '%s' for reading"
-msgstr "Kunne ikkje opna for lesing frå «%s»."
+#: ../plug-ins/file-bmp/bmp-read.c:530
+msgid "Unrecognized or invalid BMP compression format."
+msgstr "Ukjent eller ugyldig komprimeringingsformat for BMP."
 
-#: ../plug-ins/common/wmf.c:1001
-msgid "Rendered WMF"
-msgstr "Teikna WMF"
+#: ../plug-ins/file-bmp/bmp-read.c:572
+msgid "Unsupported or invalid bitdepth."
+msgstr "Ukjent eller ugyldig fargedjupn."
 
-#: ../plug-ins/common/xbm.c:172 ../plug-ins/common/xbm.c:190
-msgid "X BitMap image"
-msgstr "X-BitMap-bilete"
+#: ../plug-ins/file-bmp/bmp-read.c:760
+#: ../plug-ins/file-bmp/bmp-read.c:801
+#: ../plug-ins/file-bmp/bmp-read.c:851
+msgid "The bitmap ends unexpectedly."
+msgstr "Punktgrafikken slutta uventa."
 
-#: ../plug-ins/common/xbm.c:803
-#, c-format
-msgid ""
-"'%s':\n"
-"Could not read header (ftell == %ld)"
-msgstr ""
-"«%s»:\n"
-"Kan ikkje lesa header (ftell == %ld)"
+#: ../plug-ins/file-bmp/bmp-write.c:187
+#: ../plug-ins/file-bmp/bmp-write.c:209
+msgid "Cannot save indexed image with transparency in BMP file format."
+msgstr "Kan ikkje lagra indekserte bilete med gjennomsikt i BMP-format."
 
-#: ../plug-ins/common/xbm.c:838
-#, c-format
-msgid ""
-"'%s':\n"
-"No image data type specified"
-msgstr ""
-"'%s':\n"
-"Manglar data for bilettype"
+#: ../plug-ins/file-bmp/bmp-write.c:189
+#: ../plug-ins/file-bmp/bmp-write.c:211
+msgid "Alpha channel will be ignored."
+msgstr "Alfakanalen blir ignorerte."
 
-#. The image is not black-and-white.
-#: ../plug-ins/common/xbm.c:980
-msgid ""
-"The image which you are trying to save as an XBM contains more than two "
-"colors.\n"
-"\n"
-"Please convert it to a black and white (1-bit) indexed image and try again."
-msgstr ""
-"Biletet som du prøver å lagra som XBM inneheld meir enn to fargar.\n"
-"\n"
-"Omform biletet til eit svart/kvit indeksert bilete (1-bits) og prøv igjen."
+#: ../plug-ins/file-bmp/bmp-write.c:792
+msgid "Save as BMP"
+msgstr "Lagra som BMP"
 
-#: ../plug-ins/common/xbm.c:991
-msgid ""
-"You cannot save a cursor mask for an image\n"
-"which has no alpha channel."
-msgstr ""
-"Du kan ikkje lagra ei markørmaske for\n"
-"eit bilete utan alfakanal."
+#: ../plug-ins/file-bmp/bmp-write.c:815
+msgid "_Run-Length Encoded"
+msgstr "Bruk _1 Byte Run-Length-Encoding"
 
-#: ../plug-ins/common/xbm.c:1166
-msgid "Save as XBM"
-msgstr "Lagra som XBM"
+#: ../plug-ins/file-bmp/bmp-write.c:827
+#: ../plug-ins/file-jpeg/jpeg-save.c:904
+msgid "_Advanced Options"
+msgstr "_Avanserte innstillingar"
 
-#. parameter settings
-#: ../plug-ins/common/xbm.c:1183
-msgid "XBM Options"
-msgstr "XBM innstillingar"
+#: ../plug-ins/file-bmp/bmp-write.c:842
+msgid "16 bits"
+msgstr "16 bits"
 
-#. X10 format
-#: ../plug-ins/common/xbm.c:1193
-msgid "_X10 format bitmap"
-msgstr "_X10 format punktgrafikk"
+#: ../plug-ins/file-bmp/bmp-write.c:878
+msgid "24 bits"
+msgstr "24 bits"
 
-#: ../plug-ins/common/xbm.c:1213
-#, fuzzy
-msgid "_Identifier prefix:"
-msgstr "Var_iabel utan utviding:"
+#: ../plug-ins/file-bmp/bmp-write.c:895
+msgid "32 bits"
+msgstr "32 bits"
 
-#. hotspot toggle
-#: ../plug-ins/common/xbm.c:1235
-msgid "_Write hot spot values"
-msgstr "_Skriv koordinata for lenkeområde"
+#: ../plug-ins/file-bmp/bmp.c:123
+#: ../plug-ins/file-bmp/bmp.c:142
+msgid "Windows BMP image"
+msgstr "Microsoft Windows BMP-bilete"
 
-#: ../plug-ins/common/xbm.c:1257
-msgid "Hot spot _X:"
-msgstr "Verdi _X:"
-
-#: ../plug-ins/common/xbm.c:1267
-msgid "Hot spot _Y:"
-msgstr "Verdi _X:"
-
-#. mask file
-#: ../plug-ins/common/xbm.c:1274
-msgid "Mask File"
-msgstr "Maskefil"
-
-#: ../plug-ins/common/xbm.c:1284
-msgid "W_rite extra mask file"
-msgstr "Skriv ei e_kstra maskefil"
-
-#: ../plug-ins/common/xbm.c:1297
-msgid "_Mask file extension:"
-msgstr "_Maskefilutviding:"
-
-#: ../plug-ins/common/xpm.c:173 ../plug-ins/common/xpm.c:198
-msgid "X PixMap image"
-msgstr "X-PixMap-bilete"
-
-#: ../plug-ins/common/xpm.c:353
-#, c-format
-msgid "Error opening file '%s'"
-msgstr "Feil ved opning av fila «%s»"
-
-#: ../plug-ins/common/xpm.c:358
-msgid "XPM file invalid"
-msgstr "Ugyldig XPM-fil"
-
-#: ../plug-ins/common/xpm.c:772
-msgid "Save as XPM"
-msgstr "Lagra som XPM"
-
-#: ../plug-ins/common/xpm.c:796
-msgid "_Alpha threshold:"
-msgstr "_Alfa-grense:"
-
-#: ../plug-ins/common/xwd.c:276 ../plug-ins/common/xwd.c:296
-msgid "X window dump"
-msgstr "X-Window-dump"
-
-#: ../plug-ins/common/xwd.c:428
-#, c-format
-msgid "Could not read XWD header from '%s'"
-msgstr "Kunne ikkje lesa XWD-header frå «%s»"
-
-#: ../plug-ins/common/xwd.c:466
-msgid "Can't read color entries"
-msgstr "Kunne ikkje lesa fargedata"
-
-#: ../plug-ins/common/xwd.c:555
-#, c-format
-msgid ""
-"XWD-file %s has format %d, depth %d and bits per pixel %d. Currently this is "
-"not supported."
-msgstr ""
-"XWD-fila %s har formatet %d, djupn %d med %d bits per piksel. Denne "
-"kombinasjonen er førebels ikkje gyldig."
-
-#: ../plug-ins/common/xwd.c:578
-msgid "Cannot save images with alpha channels."
-msgstr "Kan ikkje lagra bilete med alfakanalar."
-
-#: ../plug-ins/common/xwd.c:2179
-msgid "Error during writing indexed/gray image"
-msgstr "Feil ved skriving til indeksert bilete eller gråtonebilete."
-
-#: ../plug-ins/common/xwd.c:2277
-msgid "Error during writing rgb image"
-msgstr "Feil under skriving av RGB-bilete"
-
-#: ../plug-ins/common/zealouscrop.c:85
-msgid "Autocrop unused space from edges and middle"
-msgstr "Skjer bort ubrukte område frå kantane og inne i biletet"
-
-#: ../plug-ins/common/zealouscrop.c:90
-msgid "_Zealous Crop"
-msgstr "_Hard autobeskjering"
-
-#: ../plug-ins/common/zealouscrop.c:138
-msgid "Zealous cropping"
-msgstr "_Hard autobeskjering"
-
-#: ../plug-ins/common/zealouscrop.c:239
-msgid "Nothing to crop."
-msgstr "Ingenting å beskjere."
-
-#: ../plug-ins/faxg3/faxg3.c:102
+#: ../plug-ins/file-faxg3/faxg3.c:102
 msgid "G3 fax image"
 msgstr "G3-Fax-bilete"
 
-#: ../plug-ins/fits/fits.c:166 ../plug-ins/fits/fits.c:186
+#: ../plug-ins/file-fits/fits.c:167
+#: ../plug-ins/file-fits/fits.c:187
 msgid "Flexible Image Transport System"
 msgstr "Flexible Image Transport System"
 
-#: ../plug-ins/fits/fits.c:354
+#: ../plug-ins/file-fits/fits.c:367
 msgid "Error during open of FITS file"
 msgstr "Feil under opninga av FITS-fila"
 
-#: ../plug-ins/fits/fits.c:359
+#: ../plug-ins/file-fits/fits.c:373
 msgid "FITS file keeps no displayable images"
 msgstr "FITS-fila inneheld ingen bilete som kan visast"
 
-#: ../plug-ins/fits/fits.c:437
+#: ../plug-ins/file-fits/fits.c:454
 msgid "FITS save cannot handle images with alpha channels"
 msgstr "FITS kan ikkje behandla bilete med alfakanalar"
 
-#: ../plug-ins/fits/fits.c:974
+#: ../plug-ins/file-fits/fits.c:992
 msgid "Load FITS File"
 msgstr "Opnar FITS-fil"
 
-#: ../plug-ins/fits/fits.c:998
+#: ../plug-ins/file-fits/fits.c:1016
 msgid "Replacement for undefined pixels"
 msgstr "Erstatning for udefinerte pikslar"
 
-#: ../plug-ins/fits/fits.c:1003 ../plug-ins/gfig/gfig-dialog.c:1286
-#: ../plug-ins/gfig/gfig-dialog.c:1461
+#: ../plug-ins/file-fits/fits.c:1021
+#: ../plug-ins/gfig/gfig-dialog.c:1285
+#: ../plug-ins/gfig/gfig-dialog.c:1460
 msgid "White"
 msgstr "Kvit"
 
-#: ../plug-ins/fits/fits.c:1010
+#: ../plug-ins/file-fits/fits.c:1028
 msgid "Pixel value scaling"
 msgstr "Pikselverdiskalering"
 
-#: ../plug-ins/fits/fits.c:1015
+#: ../plug-ins/file-fits/fits.c:1033
 msgid "By DATAMIN/DATAMAX"
 msgstr "Med DATAMIN/DATAMAX"
 
-#: ../plug-ins/fits/fits.c:1022
+#: ../plug-ins/file-fits/fits.c:1040
 msgid "Image Composing"
 msgstr "Set saman biletet"
 
+#: ../plug-ins/file-fli/fli-gimp.c:165
+#: ../plug-ins/file-fli/fli-gimp.c:185
+msgid "AutoDesk FLIC animation"
+msgstr "AutoDesk-FLIC-animasjon"
+
+#: ../plug-ins/file-fli/fli-gimp.c:561
+msgid "Frame (%i)"
+msgstr "Ramme (%i)"
+
+#: ../plug-ins/file-fli/fli-gimp.c:713
+msgid "Sorry, I can save only INDEXED and GRAY images."
+msgstr "Diverre er det bare råd å lagra indekserte bilete og bilete i gråskala."
+
+#: ../plug-ins/file-fli/fli-gimp.c:845
+msgid "GFLI 1.3 - Load framestack"
+msgstr "GFLI 1.3 - Opna animasjon"
+
+#: ../plug-ins/file-fli/fli-gimp.c:913
+msgid "GFLI 1.3 - Save framestack"
+msgstr "GFLI 1.3 - Lagra animasjon"
+
+#: ../plug-ins/file-ico/ico-dialog.c:53
+msgid "Save as Windows Icon"
+msgstr "Lagra som Microsoft icon"
+
+#: ../plug-ins/file-ico/ico-dialog.c:85
+msgid "Icon Details"
+msgstr "Ikondetaljar"
+
+#: ../plug-ins/file-ico/ico-dialog.c:105
+msgid "Large icons and compression are not supported by all programs. Older applications may not open this file correctly."
+msgstr "Store ikon og komprimering blir ikkje støtta av alle program. Eldre utgåver kan kanskje ikkje opna desse filene rett."
+
+#: ../plug-ins/file-ico/ico-dialog.c:177
+msgid "1 bpp, 1-bit alpha, 2-slot palette"
+msgstr "1 bpp, 1-bit alfa, 2-slot palett"
+
+#: ../plug-ins/file-ico/ico-dialog.c:178
+msgid "4 bpp, 1-bit alpha, 16-slot palette"
+msgstr "4 bpp, 1-bit alfa, 16-slot palett"
+
+#: ../plug-ins/file-ico/ico-dialog.c:179
+msgid "8 bpp, 1-bit alpha, 256-slot palette"
+msgstr "8 bpp, 1-bit alfa, 256-slot palett"
+
+#: ../plug-ins/file-ico/ico-dialog.c:180
+msgid "24 bpp, 1-bit alpha, no palette"
+msgstr "32 bpp, 8-bit alfa, ingen palett"
+
+#: ../plug-ins/file-ico/ico-dialog.c:181
+msgid "32 bpp, 8-bit alpha, no palette"
+msgstr "32 bpp, 8-bit Alfa, ingen palett"
+
+#: ../plug-ins/file-ico/ico-dialog.c:195
+msgid "Compressed (PNG)"
+msgstr "Komprimert (PNG)"
+
+#. read successfully. add to image
+#: ../plug-ins/file-ico/ico-load.c:615
+msgid "Icon #%i"
+msgstr "Ikon Nr. %i"
+
+#: ../plug-ins/file-ico/ico-load.c:724
+#: ../plug-ins/file-jpeg/jpeg-load.c:632
+#: ../plug-ins/file-psd/psd-thumb-load.c:84
+msgid "Opening thumbnail for '%s'"
+msgstr "Opnar miniatyr for «%s»"
+
+#: ../plug-ins/file-ico/ico.c:102
+#: ../plug-ins/file-ico/ico.c:136
+msgid "Microsoft Windows icon"
+msgstr "Microsoft-Windows-ikon"
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:292
+msgid "Rotate Image?"
+msgstr "Rotere biletet?"
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:295
+msgid "_Keep Orientation"
+msgstr "_Behald orienteringa"
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:351
+msgid "According to the EXIF data, this image is rotated."
+msgstr "I følgje EXIF-data er biletet rotert."
+
+#: ../plug-ins/file-jpeg/jpeg-exif.c:366
+msgid "Would you like GIMP to rotate it into the standard orientation?"
+msgstr "Skal GIMP rotere biletet i standardretningen?"
+
+#: ../plug-ins/file-jpeg/jpeg-load.c:240
+msgid "JPEG preview"
+msgstr "JPEG førehandsvising"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:201
+msgid "File size: %s"
+msgstr "Filstorleik:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:686
+msgid "Calculating file size..."
+msgstr "Reknar ut filstorleik"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:778
+#: ../plug-ins/file-jpeg/jpeg-save.c:880
+msgid "File size: unknown"
+msgstr "Filstorleik: ukjent"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:831
+msgid "Save as JPEG"
+msgstr "Lagre som JPEG"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:866
+msgid "_Quality:"
+msgstr "_Kvalitet:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:870
+msgid "JPEG quality parameter"
+msgstr "JPEG-kvalitetsinnstillingane"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:889
+msgid "Enable preview to obtain the file size."
+msgstr "Sett førehandsvisinga til å halde på fillengda."
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:892
+msgid "Sho_w preview in image window"
+msgstr "_Vis førehandsvisinga i biletvindauget"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:933
+msgid "S_moothing:"
+msgstr "_Utjamning:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:946
+msgid "Frequency (rows):"
+msgstr "Frekvens (rader):"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:962
+msgid "Use _restart markers"
+msgstr "Bruk _omstartmarkeringar"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:978
+msgid "_Optimize"
+msgstr "_Optimaliser"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:992
+msgid "_Progressive"
+msgstr "_Progressiv"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1008
+msgid "Save _EXIF data"
+msgstr "Lagra _EXIF-data"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1025
+msgid "Save _thumbnail"
+msgstr "Lagra _miniatyr"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1042
+msgid "Save _XMP data"
+msgstr "Lagra _XMP-data"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1057
+msgid "_Use quality settings from original image"
+msgstr "Bruk _kvalitetsinnstillingane frå originalbiletet"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1063
+msgid "If the original image was loaded from a JPEG file using non-standard quality settings (quantization tables), enable this option to get almost the same quality and file size."
+msgstr "Dersom originalbiletet blei henta frå ei JPEG-fil med ustandard kvalitetsinnstilling (kvantiseringstabellar), bruk denne innstillinga for å få tilnærma same kvalitet og fillengde."
+
+#. Subsampling
+#: ../plug-ins/file-jpeg/jpeg-save.c:1087
+msgid "Su_bsampling:"
+msgstr "_Mellomsteg:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1094
+msgid "1x1,1x1,1x1 (best quality)"
+msgstr "1x1,1x1,1x1 (best kvalitet)"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1096
+msgid "2x1,1x1,1x1 (4:2:2)"
+msgstr "2x1,1x1,1x1 (4:2:2)"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1098
+msgid "1x2,1x1,1x1"
+msgstr "1x2,1x1,1x1"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1100
+msgid "2x2,1x1,1x1 (smallest file)"
+msgstr "2x2,1x1,1x1 (minst fil)"
+
+#. DCT method
+#: ../plug-ins/file-jpeg/jpeg-save.c:1130
+msgid "_DCT method:"
+msgstr "_DCT-metode:"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1136
+msgid "Fast Integer"
+msgstr "Raske heiltal"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1137
+msgid "Integer"
+msgstr "Heiltal"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1138
+msgid "Floating-Point"
+msgstr "Desimaltal"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1154
+msgid "Comment"
+msgstr "Kommentar"
+
+#: ../plug-ins/file-jpeg/jpeg-save.c:1199
+msgid "Sa_ve Defaults"
+msgstr "_Lagra standardverdiane"
+
+#: ../plug-ins/file-jpeg/jpeg.c:136
+#: ../plug-ins/file-jpeg/jpeg.c:174
+msgid "JPEG image"
+msgstr "JPEG-bilete"
+
+#: ../plug-ins/file-jpeg/jpeg.c:300
+msgid "Export Preview"
+msgstr "Export førehandsvising"
+
+#: ../plug-ins/file-psd/psd-load.c:214
+#: ../plug-ins/file-psd/psd-thumb-load.c:130
+msgid "Error loading PSD file: %s"
+msgstr "Feil ved opninga av PSD-fila: %s"
+
+#: ../plug-ins/file-psd/psd-load.c:269
+msgid "Not a valid photoshop document file"
+msgstr "Ugyldig photoshop dokumentfil"
+
+#: ../plug-ins/file-psd/psd-load.c:276
+msgid "Unsupported file format version: %d"
+msgstr "Har ikkje støtte for filformatversjonen: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:283
+msgid "Too many channels in file: %d"
+msgstr "For mange kanalar i fila %d"
+
+#: ../plug-ins/file-psd/psd-load.c:313
+msgid "Unsupported color mode: %s"
+msgstr "Har ikkje støtte for fargemodellen %s"
+
+#: ../plug-ins/file-psd/psd-load.c:340
+msgid "Unsupported bit depth: %d"
+msgstr "Har ikkje støtte for bitdjupna %d"
+
+#: ../plug-ins/file-psd/psd-load.c:374
+#: ../plug-ins/file-psd/psd-load.c:384
+#: ../plug-ins/file-psd/psd-load.c:603
+#: ../plug-ins/file-psd/psd-load.c:784
+msgid "The file is corrupt!"
+msgstr "Fila er øydelagt"
+
+#: ../plug-ins/file-psd/psd-load.c:544
+msgid "Too many channels in layer: %d"
+msgstr "For mange kanalar i laget %d"
+
+#: ../plug-ins/file-psd/psd-load.c:551
+msgid "Unsupported or invalid layer height: %d"
+msgstr "Ustøtta eller ugyldig laghøgde: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:558
+msgid "Unsupported or invalid layer width: %d"
+msgstr "Ustøtta eller ugyldig lagbreidde: %d"
+
+#: ../plug-ins/file-psd/psd-load.c:1152
+#: ../plug-ins/file-psd/psd-load.c:1501
+msgid "Unsupported compression mode: %d"
+msgstr "Har ikkje støtte for kompresjonsmodus %d"
+
+#: ../plug-ins/file-psd/psd-load.c:1594
+msgid "Extra"
+msgstr "Ekstra"
+
+#: ../plug-ins/file-psd/psd-save.c:227
+#: ../plug-ins/file-psd/psd.c:113
+#: ../plug-ins/file-psd/psd.c:152
+msgid "Photoshop image"
+msgstr "Photoshop-bilete"
+
+#: ../plug-ins/file-psd/psd-save.c:373
+msgid "Unable to save layer with mode '%s'.  Either the PSD file format or the save plug-in does not support that, using normal mode instead."
+msgstr "Kunne ikkje lagra lag i modus «%s». Anten PDS-filformatet eller programtillegget har ikkje støtte for dette. Bruker normalmodus i staden"
+
+#: ../plug-ins/file-psd/psd-save.c:633
+msgid "Error: Can't convert GIMP base imagetype to PSD mode"
+msgstr "Feil: Kan ikkje omforma GIMP bilettype til PDS-modus"
+
+#: ../plug-ins/file-psd/psd-save.c:1607
+msgid "Unable to save '%s'.  The PSD file format does not support images that are more than 30,000 pixels wide or tall."
+msgstr "Kan ikkje lagra «%s». PSD-formatet støtter ikkje bilete som er meir enn 30.000 pikslar høge eller breie."
+
+#: ../plug-ins/file-psd/psd-save.c:1622
+msgid "Unable to save '%s'.  The PSD file format does not support images with layers that are more than 30,000 pixels wide or tall."
+msgstr "Kan ikkje lagra «%s». PSD-formatet støtter ikkje bilete med lag som er meir enn 30.000 pikslar høge eller breie."
+
+#: ../plug-ins/file-psd/psd-util.c:50
+msgid "Unexpected end of file"
+msgstr "Uventa filslutt."
+
+#: ../plug-ins/file-sgi/sgi.c:120
+#: ../plug-ins/file-sgi/sgi.c:140
+msgid "Silicon Graphics IRIS image"
+msgstr "Silicon-Graphics-IRIS-bilete"
+
+#: ../plug-ins/file-sgi/sgi.c:325
+msgid "Could not open '%s' for reading."
+msgstr "Kunne ikkje opna for lesing frå «%s»."
+
+#: ../plug-ins/file-sgi/sgi.c:548
+msgid "Could not open '%s' for writing."
+msgstr "Kunne ikkje opna «%s» for skriving."
+
+#: ../plug-ins/file-sgi/sgi.c:628
+msgid "Save as SGI"
+msgstr "Lagra som SGI"
+
+#: ../plug-ins/file-sgi/sgi.c:644
+msgid "Compression type"
+msgstr "Kompressjonstype"
+
+#: ../plug-ins/file-sgi/sgi.c:648
+msgid "No compression"
+msgstr "Ingen kompresjon"
+
+#: ../plug-ins/file-sgi/sgi.c:650
+msgid "RLE compression"
+msgstr "RLE kompresjon"
+
+#: ../plug-ins/file-sgi/sgi.c:652
+msgid ""
+"Aggressive RLE\n"
+"(not supported by SGI)"
+msgstr ""
+"Agressiv RLE\n"
+"(ikkje støtta av SGI)"
+
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:198
+msgid "Downloading image (%s of %s)"
+msgstr "Lastar ned bilete (%s av %s)"
+
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:202
+msgid "Uploading image (%s of %s)"
+msgstr "Lastar opp biletet (%s of %s)"
+
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:224
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:135
+#: ../plug-ins/file-uri/uri-backend-wget.c:345
+msgid "Downloaded %s of image data"
+msgstr "%s av biletdata er lasta ned"
+
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:228
+msgid "Uploaded %s of image data"
+msgstr "%s av biletdata er lasta opp"
+
+#: ../plug-ins/file-uri/uri-backend-gvfs.c:295
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:157
+#: ../plug-ins/file-uri/uri-backend-wget.c:194
+msgid "Connecting to server"
+msgstr "Koplar til tenaren"
+
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:59
+msgid "Could not initialize libcurl"
+msgstr "Kunne ikkje initiere libcurl"
+
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:128
+#: ../plug-ins/file-uri/uri-backend-wget.c:302
+msgid "Downloading %s of image data"
+msgstr "Lastar ned %s av biletdata"
+
+#: ../plug-ins/file-uri/uri-backend-libcurl.c:201
+msgid "Opening '%s' for reading resulted in HTTP response code: %d"
+msgstr "Oninga av «%s» for lesing gav denne HTTP responskoden: %d"
+
+#: ../plug-ins/file-uri/uri-backend-wget.c:161
+#: ../plug-ins/file-uri/uri-backend-wget.c:181
+#: ../plug-ins/file-uri/uri-backend-wget.c:200
+#: ../plug-ins/file-uri/uri-backend-wget.c:223
+#: ../plug-ins/file-uri/uri-backend-wget.c:252
+msgid "wget exited abnormally on URI '%s'"
+msgstr "wget blei avbroten i URI «%s»"
+
+#. The third line is "Connecting to..."
+#: ../plug-ins/file-uri/uri-backend-wget.c:189
+#, c-format
+msgid "(timeout is %d second)"
+msgid_plural "(timeout is %d seconds)"
+msgstr[0] "(Tida er ute etter %d sekund)"
+msgstr[1] "(Tida er ute etter %d sekund)"
+
+#. The fourth line is either the network request or an error
+#: ../plug-ins/file-uri/uri-backend-wget.c:218
+msgid "Opening URI"
+msgstr "Opnar URI"
+
+#: ../plug-ins/file-uri/uri-backend-wget.c:229
+#: ../plug-ins/file-uri/uri-backend-wget.c:262
+msgid "A network error occurred: %s"
+msgstr "Nettverksfeil: %s"
+
+#: ../plug-ins/file-uri/uri-backend-wget.c:307
+msgid "Downloading unknown amount of image data"
+msgstr "Lastar ned ei ukjent mengde biletdata"
+
+#: ../plug-ins/file-uri/uri.c:118
+#: ../plug-ins/file-uri/uri.c:139
+msgid "URI"
+msgstr "URI"
+
+#: ../plug-ins/file-xjt/xjt.c:487
+#: ../plug-ins/file-xjt/xjt.c:505
+msgid "GIMP compressed XJT image"
+msgstr "XJT-bilete komprimert med GIMP"
+
+#: ../plug-ins/file-xjt/xjt.c:735
+msgid "XJT file contains unknown layermode %d"
+msgstr "XJT-fila inneheld ukjent lagmodus %d"
+
+#: ../plug-ins/file-xjt/xjt.c:772
+msgid "Warning: unsupported layermode %d saved to XJT"
+msgstr "Åtvaring: Ustøtta lagmodus %d lagra i XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:788
+msgid "XJT file contains unknown pathtype %d"
+msgstr "XJT-fila inneheld ukjent stigtype %d"
+
+#: ../plug-ins/file-xjt/xjt.c:804
+msgid "Warning: unsupported pathtype %d saved to XJT"
+msgstr "Åtvaring: Ustøtta stigtype %d lagra i XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:823
+msgid "XJT file contains unknown unittype %d"
+msgstr "XJT-fila inneheld ukjent eining %d"
+
+#: ../plug-ins/file-xjt/xjt.c:844
+msgid "Warning: unsupported unittype %d saved to XJT"
+msgstr "Åtvaring: Ustøtta eining %d lagra i XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:865
+msgid "Save as XJT"
+msgstr "Lagra som XJT"
+
+#: ../plug-ins/file-xjt/xjt.c:888
+msgid "Optimize"
+msgstr "Optimaliser"
+
+#: ../plug-ins/file-xjt/xjt.c:898
+msgid "Clear transparent"
+msgstr "Tøm gjennomsiktig"
+
+#: ../plug-ins/file-xjt/xjt.c:910
+msgid "Quality:"
+msgstr "Kvalitet:"
+
+#: ../plug-ins/file-xjt/xjt.c:919
+msgid "Smoothing:"
+msgstr "Utjamning:"
+
+#: ../plug-ins/file-xjt/xjt.c:1716
+#: ../plug-ins/file-xjt/xjt.c:3353
+msgid "Could not create working folder '%s': %s"
+msgstr "Kunne ikkje lage arbeidsmappa «%s»: %s"
+
+#: ../plug-ins/file-xjt/xjt.c:3219
+msgid "Error: Could not read XJT property file '%s'."
+msgstr "Feil: Kunne ikkje lese fila «%s» med XJT-eigenskapane."
+
+#: ../plug-ins/file-xjt/xjt.c:3226
+msgid "Error: XJT property file '%s' is empty."
+msgstr "Feil: Fila «%s» med XJT-eigenskapane er tom."
+
 #: ../plug-ins/flame/flame.c:128
 msgid "Create cosmic recursive fractal flames"
 msgstr "Lager kosmiske, rekursive fraktalflammer"
 
 #: ../plug-ins/flame/flame.c:133
 msgid "_Flame..."
-msgstr "_Flamme..."
+msgstr "_Flamme …"
 
 #: ../plug-ins/flame/flame.c:226
 msgid "Drawing flame"
-msgstr "Teiknar flamme..."
+msgstr "Teiknar flamme"
 
 #: ../plug-ins/flame/flame.c:318
 msgid "Flame works only on RGB drawables."
 msgstr "Flamme kan bare brukast på RGB-bilete"
 
 #: ../plug-ins/flame/flame.c:401
-#, c-format
 msgid "'%s' is not a regular file"
 msgstr "«%s» er ikkje ei vanleg fil"
 
@@ -9001,482 +8833,1483 @@ msgstr "_Fart:"
 msgid "_Randomize"
 msgstr "_Slump"
 
-#: ../plug-ins/flame/flame.c:744
+#: ../plug-ins/flame/flame.c:745
 msgid "Same"
 msgstr "Same"
 
-#: ../plug-ins/flame/flame.c:745 ../plug-ins/gimpressionist/orientation.c:164
-#: ../plug-ins/gimpressionist/size.c:167
+#: ../plug-ins/flame/flame.c:746
+#: ../plug-ins/gimpressionist/orientation.c:163
+#: ../plug-ins/gimpressionist/size.c:166
 msgid "Random"
 msgstr "Tilfeldig"
 
-#: ../plug-ins/flame/flame.c:749
+#: ../plug-ins/flame/flame.c:750
 msgid "Swirl"
 msgstr "Kvervel"
 
-#: ../plug-ins/flame/flame.c:750
+#: ../plug-ins/flame/flame.c:751
 msgid "Horseshoe"
 msgstr "Hestesko"
 
-#: ../plug-ins/flame/flame.c:751 ../plug-ins/gfig/gfig-dialog.c:1442
+#: ../plug-ins/flame/flame.c:752
+#: ../plug-ins/gfig/gfig-dialog.c:1441
 msgid "Polar"
 msgstr "Polar"
 
-#: ../plug-ins/flame/flame.c:752
+#: ../plug-ins/flame/flame.c:753
 msgid "Bent"
 msgstr "Bøyd"
 
+#: ../plug-ins/flame/flame.c:754
+msgid "Handkerchief"
+msgstr "Handklede"
+
+#: ../plug-ins/flame/flame.c:755
+msgid "Heart"
+msgstr "Hjarte"
+
+#: ../plug-ins/flame/flame.c:756
+msgid "Disc"
+msgstr "Skive"
+
+#: ../plug-ins/flame/flame.c:758
+msgid "Hyperbolic"
+msgstr "Hyperbolisk"
+
+#: ../plug-ins/flame/flame.c:760
+msgid "Ex"
+msgstr "Eks"
+
+#: ../plug-ins/flame/flame.c:761
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:843
+msgid "Julia"
+msgstr "Julia"
+
+#: ../plug-ins/flame/flame.c:763
+msgid "Fisheye"
+msgstr "Fiskeauge"
+
+#: ../plug-ins/flame/flame.c:764
+msgid "Popcorn"
+msgstr "Popkorn"
+
 #: ../plug-ins/flame/flame.c:765
+msgid "Exponential"
+msgstr " Eksponential"
+
+#: ../plug-ins/flame/flame.c:766
+msgid "Power"
+msgstr "Potens"
+
+#: ../plug-ins/flame/flame.c:767
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:996
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1037
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1078
+msgid "Cosine"
+msgstr "Kosinus"
+
+#: ../plug-ins/flame/flame.c:768
+msgid "Rings"
+msgstr "Ringar"
+
+#: ../plug-ins/flame/flame.c:769
+msgid "Fan"
+msgstr "Vifte"
+
+#: ../plug-ins/flame/flame.c:770
+msgid "Eyefish"
+msgstr "Augefisk"
+
+#: ../plug-ins/flame/flame.c:771
+msgid "Bubble"
+msgstr "Buble"
+
+#: ../plug-ins/flame/flame.c:772
+#: ../plug-ins/map-object/map-object-ui.c:491
+msgid "Cylinder"
+msgstr "Sylinder"
+
+#: ../plug-ins/flame/flame.c:774
+msgid "Blur"
+msgstr "Slør"
+
+#: ../plug-ins/flame/flame.c:775
+msgid "Gaussian"
+msgstr "Gaussisk sløring"
+
+#: ../plug-ins/flame/flame.c:788
 msgid "_Variation:"
 msgstr "_Variasjon:"
 
-#: ../plug-ins/flame/flame.c:787
+#: ../plug-ins/flame/flame.c:810
 msgid "Load Flame"
 msgstr "Opna Flamme"
 
-#: ../plug-ins/flame/flame.c:802
+#: ../plug-ins/flame/flame.c:825
 msgid "Save Flame"
 msgstr "Lagra Flamme"
 
-#: ../plug-ins/flame/flame.c:944
+#: ../plug-ins/flame/flame.c:967
 msgid "Flame"
 msgstr "Flamme"
 
-#: ../plug-ins/flame/flame.c:1045
+#: ../plug-ins/flame/flame.c:1068
 msgid "_Rendering"
 msgstr "_Teikning"
 
-#: ../plug-ins/flame/flame.c:1071
+#: ../plug-ins/flame/flame.c:1094
 msgid "Co_ntrast:"
 msgstr "Ko_ntrast:"
 
-#: ../plug-ins/flame/flame.c:1085
+#: ../plug-ins/flame/flame.c:1108
 msgid "_Gamma:"
 msgstr "_Gamma:"
 
-#: ../plug-ins/flame/flame.c:1099
+#: ../plug-ins/flame/flame.c:1122
 msgid "Sample _density:"
 msgstr "_Punkttettleik:"
 
-#: ../plug-ins/flame/flame.c:1110
+#: ../plug-ins/flame/flame.c:1133
 msgid "Spa_tial oversample:"
 msgstr "_Overteikning i rommet:"
 
-#: ../plug-ins/flame/flame.c:1121
+#: ../plug-ins/flame/flame.c:1144
 msgid "Spatial _filter radius:"
 msgstr " _Radius for romfilteret:"
 
-#: ../plug-ins/flame/flame.c:1140
+#: ../plug-ins/flame/flame.c:1163
 msgid "Color_map:"
 msgstr "Farge_kart:"
 
-#: ../plug-ins/flame/flame.c:1182
+#: ../plug-ins/flame/flame.c:1205
 msgid "Custom gradient"
 msgstr "Eigendefinert fargeovergang"
 
-#: ../plug-ins/flame/flame.c:1208
+#: ../plug-ins/flame/flame.c:1231
 msgid "C_amera"
 msgstr "K_amera"
 
-#: ../plug-ins/gfig/gfig-bezier.c:443
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:546
+#: ../plug-ins/gfig/gfig-dialog.c:273
+#: ../plug-ins/gimpressionist/utils.c:142
+#: ../plug-ins/gradient-flare/gradient-flare.c:880
+msgid ""
+"No %s in gimprc:\n"
+"You need to add an entry like\n"
+"(%s \"%s\")\n"
+"to your %s file."
+msgstr ""
+"%s finst ikkje i gimprc:\n"
+"Du må skrive inn noe liknande\n"
+"(%s «%s»)\n"
+"i %s-fila di."
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:637
+msgid "Realtime preview"
+msgstr "Førehandsvising i sanntid"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:645
+msgid "If enabled the preview will be redrawn automatically"
+msgstr "Dersom du aktiverer denne, vil førehandsvisinga bli oppdatert automatisk."
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:648
+msgid "R_edraw preview"
+msgstr "_Oppdater førheandsvisinga"
+
+#. Zoom Options
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:656
+msgid "Zoom"
+msgstr "Zoom"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:692
+msgid "Undo last zoom change"
+msgstr "Angre siste zoomendringa"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:702
+msgid "Redo last zoom change"
+msgstr "Gjenta siste zoomendringa"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:717
+msgid "_Parameters"
+msgstr "_Parametrar"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:720
+msgid "Fractal Parameters"
+msgstr "Fraktalparametrar"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:733
+#: ../plug-ins/map-object/map-object-ui.c:1099
+msgid "Left:"
+msgstr "Venstre:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:742
+#: ../plug-ins/map-object/map-object-ui.c:1099
+msgid "Right:"
+msgstr "Høgre:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:751
+#: ../plug-ins/map-object/map-object-ui.c:1098
+msgid "Top:"
+msgstr "Topp:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:760
+#: ../plug-ins/map-object/map-object-ui.c:1098
+msgid "Bottom:"
+msgstr "Botn:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:772
+msgid "The higher the number of iterations, the more details will be calculated"
+msgstr "Dess fleire gjentakingar (høgare verdi), dess fleire detaljar blir rekna ut"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:780
+msgid "CX:"
+msgstr "CX:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:783
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:793
+msgid "Changes aspect of fractal"
+msgstr "Endrar utsjånaden til fraktalen"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:790
+msgid "CY:"
+msgstr "CY:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:808
+msgid "Load a fractal from file"
+msgstr "Last fraktal frå fil"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:816
+msgid "Reset parameters to default values"
+msgstr "Sett tilbake til standardverdiane"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:825
+msgid "Save active fractal to file"
+msgstr "Lagra aktiv fraktal frå fil"
+
+#. Fractal type toggle box
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:828
+msgid "Fractal Type"
+msgstr "Fraktaltype"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:841
+msgid "Mandelbrot"
+msgstr "Mandelbrot"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:845
+msgid "Barnsley 1"
+msgstr "Barnsley 1"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:847
+msgid "Barnsley 2"
+msgstr "Barnsley 2"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:849
+msgid "Barnsley 3"
+msgstr "Barnsley 3"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:851
+msgid "Spider"
+msgstr "Spinne"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:853
+msgid "Man'o'war"
+msgstr "Man'o'war"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:855
+msgid "Lambda"
+msgstr "Lambda"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:857
+msgid "Sierpinski"
+msgstr "Sierpinski"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:919
+msgid "Number of colors:"
+msgstr "Talet på fargar:"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:922
+msgid "Change the number of colors in the mapping"
+msgstr "Endra talet på fargar i avbildinga"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:929
+msgid "Use loglog smoothing"
+msgstr "Bruk loglog utglatting"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:936
+msgid "Use log log smoothing to eliminate \"banding\" in the result"
+msgstr "Bruk loglog utglatting for å eliminera  «striping» på biletet"
+
+#. Color Density frame
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:940
+msgid "Color Density"
+msgstr "Fargedekning"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:955
+msgid "Change the intensity of the red channel"
+msgstr "Endra intensiteten for den raude kanalen"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:965
+msgid "Change the intensity of the green channel"
+msgstr "Endra intensiteten for den grøne kanalen"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:975
+msgid "Change the intensity of the blue channel"
+msgstr "Endra intensiteten for den blå kanalen"
+
+#. Color Function frame
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:981
+msgid "Color Function"
+msgstr "Fargefunksjon"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:994
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1035
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1076
+msgid "Sine"
+msgstr "Sinus"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1003
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1044
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1085
+msgid "Use sine-function for this color component"
+msgstr "Bruk sinusfunksjon for denne fargekomponenten"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1006
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1047
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1088
+msgid "Use cosine-function for this color component"
+msgstr "Bruk kosinusfunksjon for denne fargekomponenten"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1009
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1050
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1091
+msgid "Use linear mapping instead of any trigonometrical function for this color channel"
+msgstr "Bruk lineær avbilding i staden for triginometriske funksjonar for denne fargekanalen"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1018
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1059
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1100
+msgid "Inversion"
+msgstr "Inversjon"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1026
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1067
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1108
+msgid "If you enable this option higher color values will be swapped with lower ones and vice versa"
+msgstr "Dette alternativet fører til at høge fargeverdiar bli bytta om med låge verdiar, og omvendt"
+
+#. Colormode toggle box
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1113
+msgid "Color Mode"
+msgstr "Fargemodus"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1122
+msgid "As specified above"
+msgstr "Som spesifisert ovanfor"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1134
+msgid "Create a color-map with the options you specified above (color density/function). The result is visible in the preview image"
+msgstr "Lag eit fargekart med dei innstillingane du spesifiserte ovanfor  (fargetettleik/funksjon). Resultatet er synleg i førehandsvisinga."
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1144
+msgid "Apply active gradient to final image"
+msgstr "Legg aktiv fargeovergang til det ferdige biletet"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1156
+msgid "Create a color-map using a gradient from the gradient editor"
+msgstr "Opprett eit fargekart ved å bruke ein fargeovergang frå fargeovergangsbehandlaren"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1167
+msgid "FractalExplorer Gradient"
+msgstr "Fraktalutforskarovergang"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1197
+msgid "_Fractals"
+msgstr "_Fraktalar"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1559
+msgid "Could not write '%s': %s"
+msgstr "Kunne ikkje skriva til «%s»: %s"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1634
+msgid "Load Fractal Parameters"
+msgstr "Hent fraktalparametrar"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1672
+msgid "Save Fractal Parameters"
+msgstr "Lagra fraktalparametrar"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1870
+msgid "'%s' is not a FractalExplorer file"
+msgstr "«%s» er ikkje ei Fraktalutforskarfil"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1876
+msgid "'%s' is corrupt. Line %d Option section incorrect"
+msgstr "Feil i «%s». Innstillingane i %d er feil"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:238
+msgid "Render fractal art"
+msgstr "Teiknar fraktalkunst"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:243
+msgid "_Fractal Explorer..."
+msgstr "_Fraktalutforskaren …"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:373
+msgid "Rendering fractal"
+msgstr "Teiknar fraktal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:755
+#: ../plug-ins/gradient-flare/gradient-flare.c:3199
+msgid "Are you sure you want to delete \"%s\" from the list and from disk?"
+msgstr "Er du sikker på at du vil slette \"%s\" frå lista og frå disken?"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:759
+msgid "Delete Fractal"
+msgstr "Slett fraktal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:949
+msgid "File '%s' is not a FractalExplorer file"
+msgstr "Fila «%s» er ikkje ei Fraktalutforskar-fil"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:958
+msgid ""
+"File '%s' is corrupt.\n"
+"Line %d Option section incorrect"
+msgstr ""
+"Fila «%s» er skada.\n"
+"Linje %d innstillingssektionen er feil"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1002
+msgid "My first fractal"
+msgstr "Min første fraktal"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1066
+msgid "Select folder and rescan collection"
+msgstr "Vel mappe og skan samlinga på nytt"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1078
+msgid "Apply currently selected fractal"
+msgstr "Bruk den valde fraktalen"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1090
+msgid "Delete currently selected fractal"
+msgstr "Slett den valde fraktalen"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1113
+msgid "Rescan for Fractals"
+msgstr "Les inn fraktalar på nytt"
+
+#: ../plug-ins/fractal-explorer/fractal-explorer.c:1132
+msgid "Add FractalExplorer Path"
+msgstr "Legg til stig for fraktalutforskaren"
+
+#: ../plug-ins/gfig/gfig-bezier.c:442
 msgid "Closed"
 msgstr "Lukka"
 
-#: ../plug-ins/gfig/gfig-bezier.c:448
+#: ../plug-ins/gfig/gfig-bezier.c:447
 msgid "Close curve on completion"
 msgstr "Lukk kurven ved avslutning"
 
-#: ../plug-ins/gfig/gfig-bezier.c:453
+#: ../plug-ins/gfig/gfig-bezier.c:452
 msgid "Show Line Frame"
 msgstr "Vis linjeramme"
 
-#: ../plug-ins/gfig/gfig-bezier.c:458
+#: ../plug-ins/gfig/gfig-bezier.c:457
 msgid "Draws lines between the control points. Only during curve creation"
 msgstr "Teikna linjer mellom kontrollpunkta. Bare synleg under teikninga."
 
 #. Start building the dialog up
-#: ../plug-ins/gfig/gfig-dialog.c:286
+#: ../plug-ins/gfig/gfig-dialog.c:285
 msgid "Gfig"
 msgstr "Gfig"
 
 #. Tool options notebook
-#: ../plug-ins/gfig/gfig-dialog.c:337
+#: ../plug-ins/gfig/gfig-dialog.c:336
 msgid "Tool Options"
 msgstr "Verktøyinnstillingar"
 
-#: ../plug-ins/gfig/gfig-dialog.c:354
+#: ../plug-ins/gfig/gfig-dialog.c:353
 msgid "_Stroke"
-msgstr "_Strek"
+msgstr "_Strek opp"
 
 #. Fill frame on right side
-#: ../plug-ins/gfig/gfig-dialog.c:401
+#: ../plug-ins/gfig/gfig-dialog.c:400
 msgid "Fill"
 msgstr "Fyll"
 
-#: ../plug-ins/gfig/gfig-dialog.c:415
+#: ../plug-ins/gfig/gfig-dialog.c:414
 msgid "No fill"
 msgstr "Ikkje fyll"
 
-#: ../plug-ins/gfig/gfig-dialog.c:416
+#: ../plug-ins/gfig/gfig-dialog.c:415
 msgid "Color fill"
 msgstr "Farge"
 
-#: ../plug-ins/gfig/gfig-dialog.c:417
+#: ../plug-ins/gfig/gfig-dialog.c:416
 msgid "Pattern fill"
-msgstr "Mønsterfyll"
+msgstr "Mønsterelement"
 
-#: ../plug-ins/gfig/gfig-dialog.c:418
+#: ../plug-ins/gfig/gfig-dialog.c:417
 msgid "Shape gradient"
 msgstr "Form fargeovergang"
 
-#: ../plug-ins/gfig/gfig-dialog.c:419
+#: ../plug-ins/gfig/gfig-dialog.c:418
 msgid "Vertical gradient"
 msgstr "Vertikal fargeovergang"
 
-#: ../plug-ins/gfig/gfig-dialog.c:420
+#: ../plug-ins/gfig/gfig-dialog.c:419
 msgid "Horizontal gradient"
 msgstr "Horisontal fargeovergang"
 
 #. "show image" checkbutton at bottom of style frame
-#: ../plug-ins/gfig/gfig-dialog.c:480
+#: ../plug-ins/gfig/gfig-dialog.c:479
 msgid "Show image"
 msgstr "Vis biletet"
 
 #. "snap to grid" checkbutton at bottom of style frame
-#: ../plug-ins/gfig/gfig-dialog.c:493
-msgid "checkbutton|Snap to grid"
+#: ../plug-ins/gfig/gfig-dialog.c:492
+msgctxt "checkbutton"
+msgid "Snap to grid"
 msgstr "Fest til rutenettet"
 
 #. "show grid" checkbutton at bottom of style frame
-#: ../plug-ins/gfig/gfig-dialog.c:502
+#: ../plug-ins/gfig/gfig-dialog.c:501
 msgid "Show grid"
 msgstr "Vis rutenett"
 
-#: ../plug-ins/gfig/gfig-dialog.c:637
+#: ../plug-ins/gfig/gfig-dialog.c:636
 msgid "Load Gfig Object Collection"
 msgstr "Opna samlinga av Gfig-objekt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:686
+#: ../plug-ins/gfig/gfig-dialog.c:685
 msgid "Save Gfig Drawing"
 msgstr "Lagra Gfig-teikninga"
 
-#: ../plug-ins/gfig/gfig-dialog.c:831
+#: ../plug-ins/gfig/gfig-dialog.c:830
 msgid "First Gfig"
 msgstr "Første GFig"
 
-#: ../plug-ins/gfig/gfig-dialog.c:870
+#: ../plug-ins/gfig/gfig-dialog.c:869
 msgid "_Undo"
 msgstr "_Angra"
 
-#: ../plug-ins/gfig/gfig-dialog.c:874
+#: ../plug-ins/gfig/gfig-dialog.c:873
 msgid "_Clear"
 msgstr "_Tøm"
 
-#: ../plug-ins/gfig/gfig-dialog.c:878 ../plug-ins/imagemap/imap_menu.c:209
+#: ../plug-ins/gfig/gfig-dialog.c:877
+#: ../plug-ins/imagemap/imap_menu.c:208
 msgid "_Grid"
 msgstr "_Rutenett"
 
-#: ../plug-ins/gfig/gfig-dialog.c:886
+#: ../plug-ins/gfig/gfig-dialog.c:885
 msgid "Raise selected object"
 msgstr "Hev det valde objektet"
 
-#: ../plug-ins/gfig/gfig-dialog.c:890
+#: ../plug-ins/gfig/gfig-dialog.c:889
 msgid "Lower selected object"
 msgstr "Senk det valde objektet"
 
-#: ../plug-ins/gfig/gfig-dialog.c:894
+#: ../plug-ins/gfig/gfig-dialog.c:893
 msgid "Raise selected object to top"
 msgstr "Hev det valde objektet til toppen"
 
-#: ../plug-ins/gfig/gfig-dialog.c:898
+#: ../plug-ins/gfig/gfig-dialog.c:897
 msgid "Lower selected object to bottom"
 msgstr "Senk det valde objektet til botnen"
 
-#: ../plug-ins/gfig/gfig-dialog.c:902
+#: ../plug-ins/gfig/gfig-dialog.c:901
 msgid "Show previous object"
 msgstr "Vis førre objekt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:906
+#: ../plug-ins/gfig/gfig-dialog.c:905
 msgid "Show next object"
 msgstr "Vis neste objekt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:910 ../plug-ins/gfig/gfig-stock.c:53
+#: ../plug-ins/gfig/gfig-dialog.c:909
+#: ../plug-ins/gfig/gfig-stock.c:52
 msgid "Show all objects"
 msgstr "Vis alle objekta"
 
-#: ../plug-ins/gfig/gfig-dialog.c:916 ../plug-ins/gfig/gfig-stock.c:47
+#: ../plug-ins/gfig/gfig-dialog.c:915
+#: ../plug-ins/gfig/gfig-stock.c:46
 msgid "Create line"
 msgstr "Lag linje"
 
-#: ../plug-ins/gfig/gfig-dialog.c:919 ../plug-ins/gfig/gfig-stock.c:51
+#: ../plug-ins/gfig/gfig-dialog.c:918
+#: ../plug-ins/gfig/gfig-stock.c:50
 msgid "Create rectangle"
 msgstr "Lag rektangel"
 
-#: ../plug-ins/gfig/gfig-dialog.c:922 ../plug-ins/gfig/gfig-stock.c:42
+#: ../plug-ins/gfig/gfig-dialog.c:921
+#: ../plug-ins/gfig/gfig-stock.c:41
 msgid "Create circle"
 msgstr "Lag sirkel"
 
-#: ../plug-ins/gfig/gfig-dialog.c:925 ../plug-ins/gfig/gfig-stock.c:46
+#: ../plug-ins/gfig/gfig-dialog.c:924
+#: ../plug-ins/gfig/gfig-stock.c:45
 msgid "Create ellipse"
 msgstr "Lag ellipse"
 
-#: ../plug-ins/gfig/gfig-dialog.c:928 ../plug-ins/gfig/gfig-stock.c:44
+#: ../plug-ins/gfig/gfig-dialog.c:927
+#: ../plug-ins/gfig/gfig-stock.c:43
 msgid "Create arc"
 msgstr "Lag boge"
 
-#: ../plug-ins/gfig/gfig-dialog.c:931 ../plug-ins/gfig/gfig-stock.c:50
+#: ../plug-ins/gfig/gfig-dialog.c:930
+#: ../plug-ins/gfig/gfig-stock.c:49
 msgid "Create reg polygon"
 msgstr "Lag regulær mangekant"
 
-#: ../plug-ins/gfig/gfig-dialog.c:934 ../plug-ins/gfig/gfig-stock.c:55
+#: ../plug-ins/gfig/gfig-dialog.c:933
+#: ../plug-ins/gfig/gfig-stock.c:54
 msgid "Create star"
 msgstr "Lag stjerne"
 
-#: ../plug-ins/gfig/gfig-dialog.c:937 ../plug-ins/gfig/gfig-stock.c:54
+#: ../plug-ins/gfig/gfig-dialog.c:936
+#: ../plug-ins/gfig/gfig-stock.c:53
 msgid "Create spiral"
 msgstr "Lag spiral"
 
-#: ../plug-ins/gfig/gfig-dialog.c:940
+#: ../plug-ins/gfig/gfig-dialog.c:939
 msgid "Create bezier curve. Shift + Button ends object creation."
 msgstr "Lag bezierkurve. Shift + Tast avsluttar"
 
-#: ../plug-ins/gfig/gfig-dialog.c:944 ../plug-ins/gfig/gfig-stock.c:48
+#: ../plug-ins/gfig/gfig-dialog.c:943
+#: ../plug-ins/gfig/gfig-stock.c:47
 msgid "Move an object"
 msgstr "Flytt eit objekt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:947 ../plug-ins/gfig/gfig-stock.c:49
+#: ../plug-ins/gfig/gfig-dialog.c:946
+#: ../plug-ins/gfig/gfig-stock.c:48
 msgid "Move a single point"
 msgstr "Flytt eit enkelt punkt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:950 ../plug-ins/gfig/gfig-stock.c:43
+#: ../plug-ins/gfig/gfig-dialog.c:949
+#: ../plug-ins/gfig/gfig-stock.c:42
 msgid "Copy an object"
 msgstr "Kopier eit objekt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:953 ../plug-ins/gfig/gfig-stock.c:45
+#: ../plug-ins/gfig/gfig-dialog.c:952
+#: ../plug-ins/gfig/gfig-stock.c:44
 msgid "Delete an object"
 msgstr "Fjern eit objekt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:956 ../plug-ins/gfig/gfig-stock.c:52
+#: ../plug-ins/gfig/gfig-dialog.c:955
+#: ../plug-ins/gfig/gfig-stock.c:51
 msgid "Select an object"
 msgstr "Vel eit objekt"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1038
+#: ../plug-ins/gfig/gfig-dialog.c:1037
 msgid "This tool has no options"
 msgstr "Verktøyet har ingen innstillingar"
 
 #. Put buttons in
-#: ../plug-ins/gfig/gfig-dialog.c:1228
+#: ../plug-ins/gfig/gfig-dialog.c:1227
 msgid "Show position"
-msgstr "Vis possisjon"
+msgstr "Vis posisjon"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1240
+#: ../plug-ins/gfig/gfig-dialog.c:1239
 msgid "Show control points"
 msgstr "Vis kontrollpunkta"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1274
+#: ../plug-ins/gfig/gfig-dialog.c:1273
 msgid "Max undo:"
 msgstr "Maks angre.:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1283
-#: ../plug-ins/gimpressionist/general.c:185
+#: ../plug-ins/gfig/gfig-dialog.c:1282
+#: ../plug-ins/gimpressionist/general.c:184
 msgid "Transparent"
 msgstr "Gjennomsiktig"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1285
+#: ../plug-ins/gfig/gfig-dialog.c:1284
 msgid "Foreground"
 msgstr "Forgrunn"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1287 ../plug-ins/imagemap/imap_cmd_copy.c:54
-#: ../plug-ins/imagemap/imap_cmd_copy_object.c:55
-#: ../plug-ins/imagemap/imap_menu.c:160
+#: ../plug-ins/gfig/gfig-dialog.c:1286
+#: ../plug-ins/imagemap/imap_cmd_copy.c:53
+#: ../plug-ins/imagemap/imap_cmd_copy_object.c:54
+#: ../plug-ins/imagemap/imap_menu.c:159
 msgid "Copy"
 msgstr "Kopier"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1296
-msgid ""
-"Layer background type. Copy causes the previous layer to be copied before "
-"the draw is performed."
-msgstr ""
-"Lagbakgrunntype. «Kopier» gjer at det førre laget blir kopiert før teikninga "
-"blir utført."
+#: ../plug-ins/gfig/gfig-dialog.c:1295
+msgid "Layer background type. Copy causes the previous layer to be copied before the draw is performed."
+msgstr "Lagbakgrunntype. «Kopier» gjer at det førre laget blir kopiert før teikninga blir utført."
 
-#: ../plug-ins/gfig/gfig-dialog.c:1302
+#: ../plug-ins/gfig/gfig-dialog.c:1301
 msgid "Background:"
 msgstr "Bakgrunn:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1305
+#: ../plug-ins/gfig/gfig-dialog.c:1304
 msgid "Feather"
-msgstr "Fjørkant"
+msgstr "Mjuk kant"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1329
+#: ../plug-ins/gfig/gfig-dialog.c:1328
 msgid "Radius:"
 msgstr "Radius:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1386
+#: ../plug-ins/gfig/gfig-dialog.c:1385
 msgid "Grid spacing:"
 msgstr "Maskevidde:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1403
+#: ../plug-ins/gfig/gfig-dialog.c:1402
 msgid "Polar grid sectors desired:"
-msgstr ""
+msgstr "Talet på polare sektorar:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1425
+#: ../plug-ins/gfig/gfig-dialog.c:1424
 msgid "Polar grid radius interval:"
-msgstr ""
+msgstr "Radiusintervall for polare sirklar:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1441 ../plug-ins/imagemap/imap_menu.c:220
+#: ../plug-ins/gfig/gfig-dialog.c:1440
+#: ../plug-ins/imagemap/imap_menu.c:219
 msgid "Rectangle"
 msgstr "Rektangel"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1443
+#: ../plug-ins/gfig/gfig-dialog.c:1442
 msgid "Isometric"
 msgstr "Isometrisk"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1452
+#: ../plug-ins/gfig/gfig-dialog.c:1451
 msgid "Grid type:"
 msgstr "Nett-type:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1459 ../plug-ins/gflare/gflare.c:552
+#: ../plug-ins/gfig/gfig-dialog.c:1458
+#: ../plug-ins/gradient-flare/gradient-flare.c:550
 msgid "Normal"
 msgstr "Normal"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1462
+#: ../plug-ins/gfig/gfig-dialog.c:1461
 msgid "Grey"
 msgstr "Grå"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1463
+#: ../plug-ins/gfig/gfig-dialog.c:1462
 msgid "Darker"
 msgstr "Mørkare"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1464
+#: ../plug-ins/gfig/gfig-dialog.c:1463
 msgid "Lighter"
 msgstr "Lysare"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1465
+#: ../plug-ins/gfig/gfig-dialog.c:1464
 msgid "Very dark"
 msgstr "Svært mørk"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1474
+#: ../plug-ins/gfig/gfig-dialog.c:1473
 msgid "Grid color:"
 msgstr "Nettfarge:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1697
+#: ../plug-ins/gfig/gfig-dialog.c:1696
 msgid "Sides:"
 msgstr "Sider:"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1707
+#: ../plug-ins/gfig/gfig-dialog.c:1706
 msgid "Right"
 msgstr "Høgre"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1708
+#: ../plug-ins/gfig/gfig-dialog.c:1707
 msgid "Left"
 msgstr "Venstre"
 
-#: ../plug-ins/gfig/gfig-dialog.c:1718
-#: ../plug-ins/gimpressionist/orientation.c:148
+#: ../plug-ins/gfig/gfig-dialog.c:1717
+#: ../plug-ins/gimpressionist/orientation.c:147
 msgid "Orientation:"
 msgstr "Orientering:"
 
-#: ../plug-ins/gfig/gfig-dobject.c:585
+#: ../plug-ins/gfig/gfig-dobject.c:584
 msgid "Hey where has the object gone ?"
 msgstr "Hei, kvar har objektet blitt av?"
 
-#: ../plug-ins/gfig/gfig-dobject.c:955
+#: ../plug-ins/gfig/gfig-dobject.c:954
 msgid "Error reading file"
 msgstr "Feil ved lesing av fil"
 
-#: ../plug-ins/gfig/gfig-dobject.c:1044
+#: ../plug-ins/gfig/gfig-dobject.c:1043
 msgid "Editing read-only object - you will not be able to save it"
-msgstr ""
-"Du arbeider på eit objekt som bare kan lesast frå. Du kan ikkje lagra "
-"resultata."
+msgstr "Du arbeider på eit objekt som bare kan lesast frå. Du kan ikkje lagra resultata."
 
-#: ../plug-ins/gfig/gfig-poly.c:51
+#: ../plug-ins/gfig/gfig-poly.c:50
 msgid "Regular Polygon Number of Sides"
 msgstr "Regulær polygon. Tal på sider"
 
-#: ../plug-ins/gfig/gfig-preview.c:328
+#: ../plug-ins/gfig/gfig-preview.c:327
 msgid "Object Details"
 msgstr "Objektdetaljar"
 
 #. Position labels
-#: ../plug-ins/gfig/gfig-preview.c:378
+#: ../plug-ins/gfig/gfig-preview.c:377
 msgid "XY position:"
 msgstr "XY-Posisjon:"
 
-#: ../plug-ins/gfig/gfig-spiral.c:55
+#: ../plug-ins/gfig/gfig-spiral.c:54
 msgid "Spiral Number of Turns"
 msgstr "Spiral. Tal på vindingar"
 
-#: ../plug-ins/gfig/gfig-star.c:52
+#: ../plug-ins/gfig/gfig-star.c:51
 msgid "Star Number of Points"
 msgstr "Stjerne. Tal på punkt"
 
-#: ../plug-ins/gfig/gfig-stock.c:41
+#: ../plug-ins/gfig/gfig-stock.c:40
 msgid "Create bezier curve"
 msgstr "Lag Bezier-kurve"
 
-#: ../plug-ins/gfig/gfig.c:124
+#: ../plug-ins/gfig/gfig.c:123
 msgid "Create geometric shapes"
 msgstr "Teikna geometriske former på biletet"
 
-#: ../plug-ins/gfig/gfig.c:135
+#: ../plug-ins/gfig/gfig.c:134
 msgid "_Gfig..."
-msgstr "_Gfig-teikning..."
+msgstr "_Gfig-teikning …"
 
-#: ../plug-ins/gfig/gfig.c:731
-msgid ""
-"Error trying to save figure as a parasite: can't attach parasite to drawable."
-msgstr ""
-"Feil i forsøk på å lagre figur som parasitt: Kan ikkje legge ein parasitt "
-"til teikneområdet."
+#: ../plug-ins/gfig/gfig.c:730
+msgid "Error trying to save figure as a parasite: can't attach parasite to drawable."
+msgstr "Feil i forsøk på å lagre figur som parasitt: Kan ikkje legge ein parasitt til teikneområdet."
 
-#: ../plug-ins/gfig/gfig.c:758
-#, c-format
+#: ../plug-ins/gfig/gfig.c:757
 msgid "Error trying to open temporary file '%s' for parasite loading: %s"
-msgstr ""
-"Feil i forsøk på å opne den temporære fila «%s» for å opna parasittar: %s"
+msgstr "Feil i forsøk på å opne den temporære fila «%s» for å opna parasittar: %s"
 
-#: ../plug-ins/gflare/gflare.c:553
+#: ../plug-ins/gimpressionist/brush.c:246
+msgid "Can only save drawables!"
+msgstr "Kan bare lagra teikneflater!"
+
+#: ../plug-ins/gimpressionist/brush.c:251
+msgid "Save Brush"
+msgstr "Lagra penselen"
+
+#: ../plug-ins/gimpressionist/brush.c:506
+msgid "_Brush"
+msgstr "_Pensel"
+
+#: ../plug-ins/gimpressionist/brush.c:543
+msgid "Gamma:"
+msgstr "Gamma:"
+
+#: ../plug-ins/gimpressionist/brush.c:561
+msgid "Changes the gamma (brightness) of the selected brush"
+msgstr "Endra Gamma-verdien (lysstyrken) for den valde penselen"
+
+#: ../plug-ins/gimpressionist/brush.c:569
+msgid "Select:"
+msgstr "Vel:"
+
+#: ../plug-ins/gimpressionist/brush.c:598
+msgid "Aspect ratio:"
+msgstr "Sideforhold:"
+
+#: ../plug-ins/gimpressionist/brush.c:602
+msgid "Specifies the aspect ratio of the brush"
+msgstr "Bestemmer forholdet mellom sidene i penselen"
+
+#: ../plug-ins/gimpressionist/brush.c:611
+#: ../plug-ins/gimpressionist/paper.c:205
+msgid "Relief:"
+msgstr "Relieff:"
+
+#: ../plug-ins/gimpressionist/brush.c:615
+#: ../plug-ins/gimpressionist/paper.c:209
+msgid "Specifies the amount of embossing to apply to the image (in percent)"
+msgstr "Bestemmer graden av relieffeffekt (i %)"
+
+#: ../plug-ins/gimpressionist/color.c:59
+msgid "Co_lor"
+msgstr "_Farge"
+
+#: ../plug-ins/gimpressionist/color.c:69
+msgid "A_verage under brush"
+msgstr "_Gjennomsnitt under penselen"
+
+#: ../plug-ins/gimpressionist/color.c:71
+msgid "C_enter of brush"
+msgstr "_Midten av penselen"
+
+#: ../plug-ins/gimpressionist/color.c:78
+msgid "Color is computed from the average of all pixels under the brush"
+msgstr "Fargen blir bestemt som middelverdien av alle pikslane under penselen"
+
+#: ../plug-ins/gimpressionist/color.c:82
+msgid "Samples the color from the pixel in the center of the brush"
+msgstr "Fargen blir bestemt ut frå pikselen under midten av penselen"
+
+#: ../plug-ins/gimpressionist/color.c:93
+msgid "Color _noise:"
+msgstr "Farge_støy:"
+
+#: ../plug-ins/gimpressionist/color.c:97
+msgid "Adds random noise to the color"
+msgstr "Legg tilfeldig støy til fargen"
+
+#: ../plug-ins/gimpressionist/general.c:133
+#: ../plug-ins/gradient-flare/gradient-flare.c:3528
+msgid "_General"
+msgstr "_Generelt"
+
+#: ../plug-ins/gimpressionist/general.c:149
+msgid "Keep original"
+msgstr "Behald original"
+
+#: ../plug-ins/gimpressionist/general.c:150
+msgid "Preserve the original image as a background"
+msgstr "Behald originalbiletet som bakgrunn"
+
+#: ../plug-ins/gimpressionist/general.c:155
+msgid "From paper"
+msgstr "Frå papir"
+
+#: ../plug-ins/gimpressionist/general.c:156
+msgid "Copy the texture of the selected paper as a background"
+msgstr "Bruk kopi av teksturen i det valde papiret som bakgrunn"
+
+#: ../plug-ins/gimpressionist/general.c:166
+msgid "Solid colored background"
+msgstr "Einsfarga bakgrunn"
+
+#: ../plug-ins/gimpressionist/general.c:185
+msgid "Use a transparent background; Only the strokes painted will be visible"
+msgstr "Bruk gjennomsiktig bakgrunn. Bare penselstrøka blir synlege."
+
+#: ../plug-ins/gimpressionist/general.c:202
+msgid "Paint edges"
+msgstr "Teikna kantane"
+
+#: ../plug-ins/gimpressionist/general.c:207
+msgid "Selects if to place strokes all the way out to the edges of the image"
+msgstr "Penselstrøka skal halde fram til kanten av biletet"
+
+#. Tileable checkbox
+#: ../plug-ins/gimpressionist/general.c:212
+#: ../plug-ins/maze/maze-dialog.c:277
+msgid "Tileable"
+msgstr "Saumlaus"
+
+#: ../plug-ins/gimpressionist/general.c:216
+msgid "Selects if the resulting image should be seamlessly tileable"
+msgstr "Bestemmer om det ferdige biletet skal ha saumlause overgangar."
+
+#: ../plug-ins/gimpressionist/general.c:221
+msgid "Drop shadow"
+msgstr "Slagskygge"
+
+#: ../plug-ins/gimpressionist/general.c:226
+msgid "Adds a shadow effect to each brush stroke"
+msgstr "Legg til ein skyggeeffekt på kvart penselstrøk"
+
+#: ../plug-ins/gimpressionist/general.c:239
+msgid "Edge darken:"
+msgstr "Formørk ved kanten:"
+
+#: ../plug-ins/gimpressionist/general.c:243
+msgid "How much to \"darken\" the edges of each brush stroke"
+msgstr "Mengda av «formørking» av kanten til kvart penselstrøk"
+
+#: ../plug-ins/gimpressionist/general.c:248
+msgid "Shadow darken:"
+msgstr "Skyggeformørking:"
+
+#: ../plug-ins/gimpressionist/general.c:252
+msgid "How much to \"darken\" the drop shadow"
+msgstr "Kor mykje skyggane skal «formørkast»"
+
+#: ../plug-ins/gimpressionist/general.c:257
+msgid "Shadow depth:"
+msgstr "Skyggedjupn:"
+
+#: ../plug-ins/gimpressionist/general.c:261
+msgid "The depth of the drop shadow, i.e. how far apart from the object it should be"
+msgstr "Djupna på skyggen, dvs. kor langt ut frå objektet skal skyggen gå"
+
+#: ../plug-ins/gimpressionist/general.c:266
+msgid "Shadow blur:"
+msgstr "Skyggesløring:"
+
+#: ../plug-ins/gimpressionist/general.c:270
+msgid "How much to blur the drop shadow"
+msgstr "Kor mykje skyggen skal slørast"
+
+#: ../plug-ins/gimpressionist/general.c:275
+msgid "Deviation threshold:"
+msgstr "Avviksgrense:"
+
+#: ../plug-ins/gimpressionist/general.c:279
+msgid "A bailout-value for adaptive selections"
+msgstr "Utløysingsverdi for avpassa utval"
+
+#: ../plug-ins/gimpressionist/gimp.c:89
+msgid "Performs various artistic operations"
+msgstr "Utfør ulike artistiske operasjonar"
+
+#: ../plug-ins/gimpressionist/gimp.c:94
+msgid "_GIMPressionist..."
+msgstr "_GIMPressionist …"
+
+#: ../plug-ins/gimpressionist/gimp.c:370
+msgid "Painting"
+msgstr "Teiknar"
+
+#: ../plug-ins/gimpressionist/gimpressionist.c:138
+msgid "GIMPressionist"
+msgstr "GIMPressionist"
+
+#: ../plug-ins/gimpressionist/orientation.c:91
+msgid "Or_ientation"
+msgstr "_Orientering"
+
+#: ../plug-ins/gimpressionist/orientation.c:105
+msgid "Directions:"
+msgstr "Retningar:"
+
+#: ../plug-ins/gimpressionist/orientation.c:109
+msgid "The number of directions (i.e. brushes) to use"
+msgstr "Kor mange retningar, dvs. penslar, som skal brukast"
+
+#: ../plug-ins/gimpressionist/orientation.c:117
+msgid "Start angle:"
+msgstr "Startvinkel:"
+
+#: ../plug-ins/gimpressionist/orientation.c:121
+msgid "The starting angle of the first brush to create"
+msgstr "Startvinkelen til den første penselen som skal lagast"
+
+#: ../plug-ins/gimpressionist/orientation.c:129
+msgid "Angle span:"
+msgstr "Vinkelspenn:"
+
+#: ../plug-ins/gimpressionist/orientation.c:133
+msgid "The angle span of the first brush to create"
+msgstr "Vinkelspennet (storleiken) på den første penselen som skal lagast"
+
+#: ../plug-ins/gimpressionist/orientation.c:156
+msgid "Let the value (brightness) of the region determine the direction of the stroke"
+msgstr "La lysverdien til området bestemma retninga på penselstrøka"
+
+#: ../plug-ins/gimpressionist/orientation.c:159
+#: ../plug-ins/gimpressionist/size.c:162
+msgid "Radius"
+msgstr "Radius"
+
+#: ../plug-ins/gimpressionist/orientation.c:160
+msgid "The distance from the center of the image determines the direction of the stroke"
+msgstr "La avstanden frå biletsenteret bestemma retninga på penselstrøka"
+
+#: ../plug-ins/gimpressionist/orientation.c:164
+msgid "Selects a random direction of each stroke"
+msgstr "Lag ein tilfeldig retning for kvart penselstrøk"
+
+#: ../plug-ins/gimpressionist/orientation.c:167
+#: ../plug-ins/gimpressionist/size.c:170
+msgid "Radial"
+msgstr "Radial"
+
+#: ../plug-ins/gimpressionist/orientation.c:168
+msgid "Let the direction from the center determine the direction of the stroke"
+msgstr "La retningen frå biletsenteret bestemma retninga på penselstrøka"
+
+#: ../plug-ins/gimpressionist/orientation.c:175
+#: ../plug-ins/gimpressionist/size.c:178
+msgid "Flowing"
+msgstr "Flygande"
+
+#: ../plug-ins/gimpressionist/orientation.c:176
+#: ../plug-ins/gimpressionist/size.c:179
+msgid "The strokes follow a \"flowing\" pattern"
+msgstr "Penselstrøka følgjer eit «flygande» mønster"
+
+#: ../plug-ins/gimpressionist/orientation.c:180
+msgid "The hue of the region determines the direction of the stroke"
+msgstr "La kuløren på området bestemma retninga på penselstrøka"
+
+#: ../plug-ins/gimpressionist/orientation.c:183
+#: ../plug-ins/gimpressionist/size.c:186
+msgid "Adaptive"
+msgstr "Tilpassande"
+
+#: ../plug-ins/gimpressionist/orientation.c:184
+msgid "The direction that matches the original image the closest is selected"
+msgstr "Vel den retningen som kjem nærast originalbiletet"
+
+#: ../plug-ins/gimpressionist/orientation.c:191
+#: ../plug-ins/gimpressionist/size.c:195
+msgid "Manual"
+msgstr "Manuell"
+
+#: ../plug-ins/gimpressionist/orientation.c:192
+msgid "Manually specify the stroke orientation"
+msgstr "Bestem retninga på penselstrøka manuelt"
+
+#: ../plug-ins/gimpressionist/orientation.c:203
+msgid "Opens up the Orientation Map Editor"
+msgstr "Opnar behandlaren for retningsoversynet"
+
+#: ../plug-ins/gimpressionist/orientmap.c:525
+msgid "Orientation Map Editor"
+msgstr "Retningskartbehandlaren"
+
+#: ../plug-ins/gimpressionist/orientmap.c:554
+msgid "Vectors"
+msgstr "Vektorar"
+
+#: ../plug-ins/gimpressionist/orientmap.c:566
+msgid "The vector-field. Left-click to move selected vector, Right-click to point it towards mouse, Middle-click to add a new vector."
+msgstr "Vektorfeltet. Venstreklikk for å flytta vald vektor til musemarkøren. Høgreklikk for å snu vektoren i retning musemarkøren. Midtklikk for å leggja til ein vektor."
+
+#: ../plug-ins/gimpressionist/orientmap.c:589
+#: ../plug-ins/gimpressionist/sizemap.c:458
+msgid "Adjust the preview's brightness"
+msgstr "Juster lysverdien for førehandsvisinga"
+
+#: ../plug-ins/gimpressionist/orientmap.c:611
+msgid "Select previous vector"
+msgstr "Vel førre vektor"
+
+#: ../plug-ins/gimpressionist/orientmap.c:617
+msgid "Select next vector"
+msgstr "Vel neste vektor"
+
+#: ../plug-ins/gimpressionist/orientmap.c:619
+#: ../plug-ins/gimpressionist/sizemap.c:489
+msgid "A_dd"
+msgstr "Legg _til"
+
+#: ../plug-ins/gimpressionist/orientmap.c:623
+msgid "Add new vector"
+msgstr "Legg til ny vektor"
+
+#: ../plug-ins/gimpressionist/orientmap.c:625
+#: ../plug-ins/gimpressionist/sizemap.c:496
+msgid "_Kill"
+msgstr "_Fjern"
+
+#: ../plug-ins/gimpressionist/orientmap.c:629
+msgid "Delete selected vector"
+msgstr "Fjern den markerte vektoren"
+
+#: ../plug-ins/gimpressionist/orientmap.c:640
+msgid "Type"
+msgstr "Type"
+
+#: ../plug-ins/gimpressionist/orientmap.c:644
+msgid "_Normal"
+msgstr "_Normal"
+
+#: ../plug-ins/gimpressionist/orientmap.c:645
+msgid "Vorte_x"
+msgstr "Vorte_x"
+
+#: ../plug-ins/gimpressionist/orientmap.c:646
+msgid "Vortex_2"
+msgstr "Vortex_2"
+
+#: ../plug-ins/gimpressionist/orientmap.c:647
+msgid "Vortex_3"
+msgstr "Vortex_3"
+
+#: ../plug-ins/gimpressionist/orientmap.c:653
+#: ../plug-ins/gimpressionist/sizemap.c:541
+msgid "_Voronoi"
+msgstr "_Voronoi"
+
+#: ../plug-ins/gimpressionist/orientmap.c:661
+msgid "Voronoi-mode makes only the vector closest to the given point have any influence"
+msgstr "Voronoi-Modus: Bare vektoren nærast det gjevne punktet har noe verknad"
+
+#: ../plug-ins/gimpressionist/orientmap.c:671
+msgid "A_ngle:"
+msgstr "Vi_nkel:"
+
+#: ../plug-ins/gimpressionist/orientmap.c:675
+msgid "Change the angle of the selected vector"
+msgstr "Endra vinkelen til den valde vektoren"
+
+#: ../plug-ins/gimpressionist/orientmap.c:682
+msgid "Ang_le offset:"
+msgstr "Vinke_l-forskyving:"
+
+#: ../plug-ins/gimpressionist/orientmap.c:686
+msgid "Offset all vectors with a given angle"
+msgstr "Forskyv alle vinklane med ein gjeven vinkel"
+
+#: ../plug-ins/gimpressionist/orientmap.c:697
+msgid "Change the strength of the selected vector"
+msgstr "Endra styrken til den valde vektoren"
+
+#: ../plug-ins/gimpressionist/orientmap.c:704
+msgid "S_trength exp.:"
+msgstr "S_tyrkeeksp.:"
+
+#: ../plug-ins/gimpressionist/orientmap.c:708
+#: ../plug-ins/gimpressionist/sizemap.c:536
+msgid "Change the exponent of the strength"
+msgstr "Endra styrkeeksponenten"
+
+#: ../plug-ins/gimpressionist/paper.c:137
+msgid "P_aper"
+msgstr "P_apir"
+
+#: ../plug-ins/gimpressionist/paper.c:172
+msgid "Inverts the Papers texture"
+msgstr "Inverterer papirteksturen"
+
+#: ../plug-ins/gimpressionist/paper.c:176
+msgid "O_verlay"
+msgstr "O_verlegg"
+
+#: ../plug-ins/gimpressionist/paper.c:181
+msgid "Applies the paper as it is (without embossing it)"
+msgstr "Bruk papiret som det er, utan bossering (relieffverknad)"
+
+#: ../plug-ins/gimpressionist/paper.c:197
+msgid "Specifies the scale of the texture (in percent of original file)"
+msgstr "Bestemmer storleiken på teksturen i % av originalfila"
+
+#: ../plug-ins/gimpressionist/placement.c:66
+msgid "Pl_acement"
+msgstr "Pl_asering"
+
+#: ../plug-ins/gimpressionist/placement.c:72
+msgid "Placement"
+msgstr "Plasering"
+
+#: ../plug-ins/gimpressionist/placement.c:76
+msgid "Randomly"
+msgstr "Tilfeldig"
+
+#: ../plug-ins/gimpressionist/placement.c:80
+msgid "Evenly distributed"
+msgstr "Likt fordelt"
+
+#: ../plug-ins/gimpressionist/placement.c:88
+msgid "Place strokes randomly around the image"
+msgstr "Plaser strøka tilfeldig rundt om på biletet"
+
+#: ../plug-ins/gimpressionist/placement.c:92
+msgid "The strokes are evenly distributed across the image"
+msgstr "Plasserer strøka jamnt utover biletet"
+
+#: ../plug-ins/gimpressionist/placement.c:101
+msgid "Centered"
+msgstr "Sentrert"
+
+#: ../plug-ins/gimpressionist/placement.c:107
+msgid "Focus the brush strokes around the center of the image"
+msgstr "Fokuser penselstrøka rundt midten av biletet"
+
+#: ../plug-ins/gimpressionist/placement.c:119
+msgid "Stroke _density:"
+msgstr "_Dekkevne:"
+
+#: ../plug-ins/gimpressionist/placement.c:123
+msgid "The relative density of the brush strokes"
+msgstr "Relativ dekkevne for penselstrøka"
+
+#.
+#. * gimp_filename_to_utf8 () and g_strerror () return temporary strings
+#. * that need not and should not be freed. So this call is OK.
+#. *
+#: ../plug-ins/gimpressionist/ppmtool.c:649
+msgid "Failed to save PPM file '%s': %s"
+msgstr "Fekk ikkje lagra PPM-fila «%s»: %s"
+
+#: ../plug-ins/gimpressionist/presets.c:639
+msgid "Save Current"
+msgstr "Lagra innstillingane"
+
+#: ../plug-ins/gimpressionist/presets.c:893
+msgid "Gimpressionist Defaults"
+msgstr "Førehandsinnstillingane for Gimpressionisten"
+
+#: ../plug-ins/gimpressionist/presets.c:1014
+msgid "_Presets"
+msgstr "_Førehandsinnstillingar"
+
+#: ../plug-ins/gimpressionist/presets.c:1029
+msgid "Save Current..."
+msgstr "Lagra gjeldande …"
+
+#: ../plug-ins/gimpressionist/presets.c:1037
+msgid "Save the current settings to the specified file"
+msgstr "Lagra dei brukte innstillingane til den spesifiserte fila"
+
+#: ../plug-ins/gimpressionist/presets.c:1065
+msgid "Reads the selected Preset into memory"
+msgstr "Les dei valde innstillingane til minnet"
+
+#: ../plug-ins/gimpressionist/presets.c:1071
+msgid "Deletes the selected Preset"
+msgstr "Visk ut dei valde innstillingane"
+
+#: ../plug-ins/gimpressionist/presets.c:1077
+msgid "Reread the folder of Presets"
+msgstr "Les inn mappa med førehandsinnstillingar på nytt"
+
+#: ../plug-ins/gimpressionist/preview.c:173
+#: ../plug-ins/gimpressionist/repaint.c:1183
+#: ../plug-ins/imagemap/imap_polygon.c:514
+#: ../plug-ins/lighting/lighting-ui.c:1074
+msgid "_Update"
+msgstr "_Oppdater"
+
+#: ../plug-ins/gimpressionist/preview.c:179
+msgid "Refresh the Preview window"
+msgstr "Oppdater førehandsvisinga"
+
+#: ../plug-ins/gimpressionist/preview.c:187
+msgid "Revert to the original image"
+msgstr "Gå tilbake til originalbiletet"
+
+#: ../plug-ins/gimpressionist/size.c:94
+msgid "_Size"
+msgstr "_Storleik"
+
+#: ../plug-ins/gimpressionist/size.c:108
+msgid "Sizes:"
+msgstr "Storleikar:"
+
+#: ../plug-ins/gimpressionist/size.c:112
+msgid "The number of sizes of brushes to use"
+msgstr "Kor mange penselstorleikar som skal brukast"
+
+#: ../plug-ins/gimpressionist/size.c:120
+msgid "Minimum size:"
+msgstr "Min. storleik:"
+
+#: ../plug-ins/gimpressionist/size.c:124
+msgid "The smallest brush to create"
+msgstr "Den minste penselen som skal brukast"
+
+#: ../plug-ins/gimpressionist/size.c:132
+msgid "Maximum size:"
+msgstr "Maks storleik:"
+
+#: ../plug-ins/gimpressionist/size.c:136
+msgid "The largest brush to create"
+msgstr "Den største penselen som skal brukast"
+
+#: ../plug-ins/gimpressionist/size.c:150
+msgid "Size:"
+msgstr "Storleik:"
+
+#: ../plug-ins/gimpressionist/size.c:159
+msgid "Let the value (brightness) of the region determine the size of the stroke"
+msgstr "La lysverdien i området bestemma storleiken på penselstrøket"
+
+#: ../plug-ins/gimpressionist/size.c:163
+msgid "The distance from the center of the image determines the size of the stroke"
+msgstr "La avstanden frå biletsenteret bestemma storleiken på penselstrøket"
+
+#: ../plug-ins/gimpressionist/size.c:167
+msgid "Selects a random size for each stroke"
+msgstr "Vel ein tilfeldig storleik for penselstrøket"
+
+#: ../plug-ins/gimpressionist/size.c:171
+msgid "Let the direction from the center determine the size of the stroke"
+msgstr "La retninga frå biletsenteret bestemma storleiken på penselstrøket"
+
+#: ../plug-ins/gimpressionist/size.c:183
+msgid "The hue of the region determines the size of the stroke"
+msgstr "La kuløren i området bestemma storleiken på penselstrøket"
+
+#: ../plug-ins/gimpressionist/size.c:187
+msgid "The brush-size that matches the original image the closest is selected"
+msgstr "Vel den penselstorleiken som kjem nærast originalbiletet"
+
+#: ../plug-ins/gimpressionist/size.c:196
+msgid "Manually specify the stroke size"
+msgstr "Spesifiser penselstorleiken manuelt"
+
+#: ../plug-ins/gimpressionist/size.c:207
+msgid "Opens up the Size Map Editor"
+msgstr "Opnar storleiksbehandlaren"
+
+#: ../plug-ins/gimpressionist/sizemap.c:400
+msgid "Size Map Editor"
+msgstr "Storleiksbehandlaren"
+
+#: ../plug-ins/gimpressionist/sizemap.c:428
+msgid "Smvectors"
+msgstr "Sm-vektorar"
+
+#: ../plug-ins/gimpressionist/sizemap.c:438
+msgid "The smvector-field. Left-click to move selected smvector, Right-click to point it towards mouse, Middle-click to add a new smvector."
+msgstr ""
+"smVektorfeltet.\n"
+"Venstreklikk for å flytta vald smvektor til musemarkøren. Høgreklikk for å snu smvektoren i retning musemarkøren. Midtklikk for å leggja til ein vektor.Das smvektor-Feld. Links-klicken, um den ausgewählten smvektor zu bewegen,\n"
+"Rechts-klicken um den Vektor zum Mauszeiger zeigen zu lassen, Mittel-klicken\n"
+"um einen neuen Vektor hinzuzufügen."
+
+#: ../plug-ins/gimpressionist/sizemap.c:480
+msgid "Select previous smvector"
+msgstr "Vel den førre smvektoren"
+
+#: ../plug-ins/gimpressionist/sizemap.c:487
+msgid "Select next smvector"
+msgstr "Vel den neste smvektoren"
+
+#: ../plug-ins/gimpressionist/sizemap.c:494
+msgid "Add new smvector"
+msgstr "Legg til ny smvektor"
+
+#: ../plug-ins/gimpressionist/sizemap.c:501
+msgid "Delete selected smvector"
+msgstr "Slett den valde smvektoren"
+
+#: ../plug-ins/gimpressionist/sizemap.c:514
+msgid "Change the angle of the selected smvector"
+msgstr "Endra vinkelen for den valde smvektoren"
+
+#: ../plug-ins/gimpressionist/sizemap.c:521
+msgid "S_trength:"
+msgstr "S_tyrke:"
+
+#: ../plug-ins/gimpressionist/sizemap.c:525
+msgid "Change the strength of the selected smvector"
+msgstr "Endra styrken for den valde smvektoren"
+
+#: ../plug-ins/gimpressionist/sizemap.c:532
+msgid "St_rength exp.:"
+msgstr "Sty_rkeeksp.:"
+
+#: ../plug-ins/gimpressionist/sizemap.c:548
+msgid "Voronoi-mode makes only the smvector closest to the given point have any influence"
+msgstr "Voronoi-Modus: Bare smvektoren nærast det gjevne punktet har noe verknad"
+
+#: ../plug-ins/gradient-flare/gradient-flare.c:551
 msgid "Addition"
 msgstr "Legg til "
 
-#: ../plug-ins/gflare/gflare.c:554
+#: ../plug-ins/gradient-flare/gradient-flare.c:552
 msgid "Overlay"
 msgstr "Overlegg"
 
-#: ../plug-ins/gflare/gflare.c:809
+#: ../plug-ins/gradient-flare/gradient-flare.c:806
 msgid "Produce a lense flare effect using gradients"
 msgstr "Lager ein linserefleks ved hjelp av fargeovergangar"
 
-#: ../plug-ins/gflare/gflare.c:814
+#: ../plug-ins/gradient-flare/gradient-flare.c:811
 msgid "_Gradient Flare..."
-msgstr "_Gradientrefleks..."
+msgstr "_Gradientrefleks …"
 
 #.
 #. *    Dialog Shell
 #.
-#: ../plug-ins/gflare/gflare.c:953 ../plug-ins/gflare/gflare.c:2311
+#: ../plug-ins/gradient-flare/gradient-flare.c:950
+#: ../plug-ins/gradient-flare/gradient-flare.c:2356
 msgid "Gradient Flare"
 msgstr "Gradientrefleks"
 
-#: ../plug-ins/gflare/gflare.c:1264
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:1263
 msgid "Failed to open GFlare file '%s': %s"
 msgstr "Kunne ikkje opna G-refleksfila «%s»: %s"
 
-#: ../plug-ins/gflare/gflare.c:1272
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:1271
 msgid "'%s' is not a valid GFlare file."
 msgstr "«%s» er ikkje ei gyldig G-refleksfil."
 
-#: ../plug-ins/gflare/gflare.c:1326
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:1325
 msgid "invalid formatted GFlare file: %s\n"
 msgstr "Ugyldig format i G-refleksfila %s\n"
 
-#: ../plug-ins/gflare/gflare.c:1451
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:1450
 msgid ""
 "GFlare '%s' is not saved. If you add a new entry in '%s', like:\n"
 "(gflare-path \"%s\")\n"
@@ -9486,20 +10319,19 @@ msgstr ""
 "(linserefleks-sti «%s»)\n"
 "og lager ei mappe «%s» kan du lagra dine eigne refleksar i denne mappa."
 
-#: ../plug-ins/gflare/gflare.c:1484
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:1483
 msgid "Failed to write GFlare file '%s': %s"
 msgstr "Feil ved skriving av G-refleksfila «%s»: %s"
 
-#: ../plug-ins/gflare/gflare.c:2368
+#: ../plug-ins/gradient-flare/gradient-flare.c:2413
 msgid "A_uto update preview"
-msgstr "A_utomatisk førehandsvising"
+msgstr "Automatisk _førehandsvising"
 
-#: ../plug-ins/gflare/gflare.c:2419
+#: ../plug-ins/gradient-flare/gradient-flare.c:2464
 msgid "`Default' is created."
 msgstr "«Standard» er laga."
 
-#: ../plug-ins/gflare/gflare.c:2420
+#: ../plug-ins/gradient-flare/gradient-flare.c:2465
 msgid "Default"
 msgstr "Standard"
 
@@ -9509,2015 +10341,1800 @@ msgstr "Standard"
 #.
 #. *    Scales
 #.
-#: ../plug-ins/gflare/gflare.c:2699 ../plug-ins/gflare/gflare.c:3536
-#: ../plug-ins/gflare/gflare.c:3641 ../plug-ins/gflare/gflare.c:3778
+#: ../plug-ins/gradient-flare/gradient-flare.c:2744
+#: ../plug-ins/gradient-flare/gradient-flare.c:3581
+#: ../plug-ins/gradient-flare/gradient-flare.c:3686
+#: ../plug-ins/gradient-flare/gradient-flare.c:3823
 msgid "Parameters"
-msgstr "Parametra"
+msgstr "Parameter"
 
-#: ../plug-ins/gflare/gflare.c:2725
+#: ../plug-ins/gradient-flare/gradient-flare.c:2770
 msgid "Ro_tation:"
-msgstr "_Rotasjon:"
+msgstr "R_otasjon:"
 
-#: ../plug-ins/gflare/gflare.c:2737
+#: ../plug-ins/gradient-flare/gradient-flare.c:2782
 msgid "_Hue rotation:"
-msgstr "_Fargerotasjon:"
+msgstr "F_argerotasjon:"
 
-#: ../plug-ins/gflare/gflare.c:2749
+#: ../plug-ins/gradient-flare/gradient-flare.c:2794
 msgid "Vector _angle:"
 msgstr "Vektor_vinkel:"
 
-#: ../plug-ins/gflare/gflare.c:2761
+#: ../plug-ins/gradient-flare/gradient-flare.c:2806
 msgid "Vector _length:"
 msgstr "Vektor_lengde:"
 
-#: ../plug-ins/gflare/gflare.c:2782
+#: ../plug-ins/gradient-flare/gradient-flare.c:2827
 msgid "A_daptive supersampling"
 msgstr "A_daptiv utjamning"
 
-#: ../plug-ins/gflare/gflare.c:2801
+#: ../plug-ins/gradient-flare/gradient-flare.c:2846
 msgid "_Max depth:"
 msgstr "_Maks djupn:"
 
-#: ../plug-ins/gflare/gflare.c:2811
+#: ../plug-ins/gradient-flare/gradient-flare.c:2856
 msgid "_Threshold"
 msgstr "_Terskel:"
 
-#: ../plug-ins/gflare/gflare.c:2949
+#: ../plug-ins/gradient-flare/gradient-flare.c:2994
 msgid "S_elector"
 msgstr "_Utval"
 
-#: ../plug-ins/gflare/gflare.c:3013
+#: ../plug-ins/gradient-flare/gradient-flare.c:3058
 msgid "New Gradient Flare"
 msgstr "Ny gradientrefleks"
 
-#: ../plug-ins/gflare/gflare.c:3016
+#: ../plug-ins/gradient-flare/gradient-flare.c:3061
 msgid "Enter a name for the new GFlare"
 msgstr "Skriv namnet på den nye G-refleksen"
 
-#: ../plug-ins/gflare/gflare.c:3036
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:3081
 msgid "The name '%s' is used already!"
 msgstr "Namnet «%s» er i bruk frå før!"
 
-#: ../plug-ins/gflare/gflare.c:3092
+#: ../plug-ins/gradient-flare/gradient-flare.c:3137
 msgid "Copy Gradient Flare"
 msgstr "Kopier gradientrefleks"
 
-#: ../plug-ins/gflare/gflare.c:3095
+#: ../plug-ins/gradient-flare/gradient-flare.c:3140
 msgid "Enter a name for the copied GFlare"
 msgstr "Skriv namnet på den kopierte G-refleksen"
 
-#: ../plug-ins/gflare/gflare.c:3117
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:3162
 msgid "The name `%s' is used already!"
 msgstr "Namnet «%s» er i bruk frå før!"
 
-#: ../plug-ins/gflare/gflare.c:3148
+#: ../plug-ins/gradient-flare/gradient-flare.c:3193
 msgid "Cannot delete!! There must be at least one GFlare."
 msgstr "Kan ikkje slette. Det må finnast minst ein G-refleks."
 
-#: ../plug-ins/gflare/gflare.c:3158
+#: ../plug-ins/gradient-flare/gradient-flare.c:3203
 msgid "Delete Gradient Flare"
 msgstr "Slett G-refleksen"
 
-#: ../plug-ins/gflare/gflare.c:3230
-#, c-format
+#: ../plug-ins/gradient-flare/gradient-flare.c:3275
 msgid "not found %s in gflares_list"
 msgstr "Fann ikkje %s i lista over G-refleksar"
 
-#: ../plug-ins/gflare/gflare.c:3271
+#: ../plug-ins/gradient-flare/gradient-flare.c:3316
 msgid "Gradient Flare Editor"
 msgstr "Gradientrefleksbehandlaren"
 
-#: ../plug-ins/gflare/gflare.c:3275
+#: ../plug-ins/gradient-flare/gradient-flare.c:3320
 msgid "Rescan Gradients"
 msgstr "Les inn fargeovergangane på nytt"
 
 #. Glow
-#: ../plug-ins/gflare/gflare.c:3400
+#: ../plug-ins/gradient-flare/gradient-flare.c:3445
 msgid "Glow Paint Options"
 msgstr "Innstillingar for glød-teikning"
 
-#: ../plug-ins/gflare/gflare.c:3411 ../plug-ins/gflare/gflare.c:3439
-#: ../plug-ins/gflare/gflare.c:3467
+#: ../plug-ins/gradient-flare/gradient-flare.c:3456
+#: ../plug-ins/gradient-flare/gradient-flare.c:3484
+#: ../plug-ins/gradient-flare/gradient-flare.c:3512
 msgid "Opacity:"
 msgstr "Dekkevne:"
 
-#: ../plug-ins/gflare/gflare.c:3424 ../plug-ins/gflare/gflare.c:3452
-#: ../plug-ins/gflare/gflare.c:3480
+#: ../plug-ins/gradient-flare/gradient-flare.c:3469
+#: ../plug-ins/gradient-flare/gradient-flare.c:3497
+#: ../plug-ins/gradient-flare/gradient-flare.c:3525
 msgid "Paint mode:"
 msgstr "Teiknemodus:"
 
 #. Rays
-#: ../plug-ins/gflare/gflare.c:3428
+#: ../plug-ins/gradient-flare/gradient-flare.c:3473
 msgid "Rays Paint Options"
 msgstr "Innstillingane for teikning av stråler"
 
 #. Rays
-#: ../plug-ins/gflare/gflare.c:3456
+#: ../plug-ins/gradient-flare/gradient-flare.c:3501
 msgid "Second Flares Paint Options"
 msgstr "Innstillingar for sekundærrefleksen"
 
-#: ../plug-ins/gflare/gflare.c:3483 ../plug-ins/gimpressionist/general.c:134
-msgid "_General"
-msgstr "_Generelt"
-
 #.
 #. *  Gradient Menus
 #.
-#: ../plug-ins/gflare/gflare.c:3509 ../plug-ins/gflare/gflare.c:3612
-#: ../plug-ins/gflare/gflare.c:3751
+#: ../plug-ins/gradient-flare/gradient-flare.c:3554
+#: ../plug-ins/gradient-flare/gradient-flare.c:3657
+#: ../plug-ins/gradient-flare/gradient-flare.c:3796
 msgid "Gradients"
 msgstr "Fargeovergangar"
 
-#: ../plug-ins/gflare/gflare.c:3520 ../plug-ins/gflare/gflare.c:3625
-#: ../plug-ins/gflare/gflare.c:3762
+#: ../plug-ins/gradient-flare/gradient-flare.c:3565
+#: ../plug-ins/gradient-flare/gradient-flare.c:3670
+#: ../plug-ins/gradient-flare/gradient-flare.c:3807
 msgid "Radial gradient:"
 msgstr "Radiell fargeovergang:"
 
-#: ../plug-ins/gflare/gflare.c:3524 ../plug-ins/gflare/gflare.c:3629
+#: ../plug-ins/gradient-flare/gradient-flare.c:3569
+#: ../plug-ins/gradient-flare/gradient-flare.c:3674
 msgid "Angular gradient:"
 msgstr "Kanta fargeovergang:"
 
-#: ../plug-ins/gflare/gflare.c:3528 ../plug-ins/gflare/gflare.c:3633
+#: ../plug-ins/gradient-flare/gradient-flare.c:3573
+#: ../plug-ins/gradient-flare/gradient-flare.c:3678
 msgid "Angular size gradient:"
 msgstr "Fargeovergang for kanta storleik:"
 
-#: ../plug-ins/gflare/gflare.c:3548 ../plug-ins/gflare/gflare.c:3653
-#: ../plug-ins/gflare/gflare.c:3790
+#: ../plug-ins/gradient-flare/gradient-flare.c:3593
+#: ../plug-ins/gradient-flare/gradient-flare.c:3698
+#: ../plug-ins/gradient-flare/gradient-flare.c:3835
 msgid "Size (%):"
 msgstr "Storleik (%):"
 
-#: ../plug-ins/gflare/gflare.c:3560 ../plug-ins/gflare/gflare.c:3665
-#: ../plug-ins/gflare/gflare.c:3802
+#: ../plug-ins/gradient-flare/gradient-flare.c:3605
+#: ../plug-ins/gradient-flare/gradient-flare.c:3710
+#: ../plug-ins/gradient-flare/gradient-flare.c:3847
 msgid "Rotation:"
 msgstr "Rotasjon:"
 
-#: ../plug-ins/gflare/gflare.c:3572 ../plug-ins/gflare/gflare.c:3678
-#: ../plug-ins/gflare/gflare.c:3815
+#: ../plug-ins/gradient-flare/gradient-flare.c:3617
+#: ../plug-ins/gradient-flare/gradient-flare.c:3723
+#: ../plug-ins/gradient-flare/gradient-flare.c:3860
 msgid "Hue rotation:"
 msgstr "Fargerotasjon:"
 
-#: ../plug-ins/gflare/gflare.c:3586
+#: ../plug-ins/gradient-flare/gradient-flare.c:3631
 msgid "G_low"
 msgstr "G_lød"
 
-#: ../plug-ins/gflare/gflare.c:3690
+#: ../plug-ins/gradient-flare/gradient-flare.c:3735
 msgid "# of Spikes:"
 msgstr "Tal på stråler:"
 
-#: ../plug-ins/gflare/gflare.c:3702
+#: ../plug-ins/gradient-flare/gradient-flare.c:3747
 msgid "Spike thickness:"
 msgstr "Strålebreidde:"
 
-#: ../plug-ins/gflare/gflare.c:3716
+#: ../plug-ins/gradient-flare/gradient-flare.c:3761
 msgid "_Rays"
 msgstr "St_råler"
 
-#: ../plug-ins/gflare/gflare.c:3766
+#: ../plug-ins/gradient-flare/gradient-flare.c:3811
 msgid "Size factor gradient:"
 msgstr "Storleiksfaktor for overgang:"
 
-#: ../plug-ins/gflare/gflare.c:3770
+#: ../plug-ins/gradient-flare/gradient-flare.c:3815
 msgid "Probability gradient:"
 msgstr "Slumpovergang:"
 
 #.
 #. *    Shape Radio Button Frame
 #.
-#: ../plug-ins/gflare/gflare.c:3832
+#: ../plug-ins/gradient-flare/gradient-flare.c:3877
 msgid "Shape of Second Flares"
 msgstr "Form på sekundærrefleksen"
 
-#: ../plug-ins/gflare/gflare.c:3840 ../plug-ins/imagemap/imap_menu.c:222
+#: ../plug-ins/gradient-flare/gradient-flare.c:3885
+#: ../plug-ins/imagemap/imap_menu.c:221
 msgid "Circle"
 msgstr "Sirkel"
 
-#: ../plug-ins/gflare/gflare.c:3857 ../plug-ins/imagemap/imap_menu.c:224
+#: ../plug-ins/gradient-flare/gradient-flare.c:3902
+#: ../plug-ins/imagemap/imap_menu.c:223
 msgid "Polygon"
 msgstr "Polygon"
 
-#: ../plug-ins/gflare/gflare.c:3890
+#: ../plug-ins/gradient-flare/gradient-flare.c:3935
 msgid "Random seed:"
 msgstr "Tilfeldig frø:"
 
-#: ../plug-ins/gflare/gflare.c:3904
+#: ../plug-ins/gradient-flare/gradient-flare.c:3949
 msgid "_Second Flares"
 msgstr "_Sekundærrefleks"
 
-#: ../plug-ins/gfli/gfli.c:163 ../plug-ins/gfli/gfli.c:183
-msgid "AutoDesk FLIC animation"
-msgstr "AutoDesk-FLIC-animasjon"
-
-#: ../plug-ins/gfli/gfli.c:529
-#, c-format
-msgid "Frame (%i)"
-msgstr "Ramme (%i)"
-
-#: ../plug-ins/gfli/gfli.c:680
-msgid "Sorry, I can save only INDEXED and GRAY images."
-msgstr "Kan bare lagra indekserte bilete og bilete i gråskala."
-
-#: ../plug-ins/gfli/gfli.c:811
-msgid "GFLI 1.3 - Load framestack"
-msgstr "GFLI 1.3 - Opna animasjon"
-
-#. spinbutton 2
-#: ../plug-ins/gfli/gfli.c:849 ../plug-ins/gfli/gfli.c:919
-#: ../plug-ins/rcm/rcm_dialog.c:325 ../plug-ins/rcm/rcm_dialog.c:378
-msgid "To:"
-msgstr "Til:"
-
-#: ../plug-ins/gfli/gfli.c:879
-msgid "GFLI 1.3 - Save framestack"
-msgstr "GFLI 1.3 - Lagra animasjon"
-
-#: ../plug-ins/gimpressionist/brush.c:247
-msgid "Can only save drawables!"
-msgstr "Kan bare lagra teikneflater!"
-
-#: ../plug-ins/gimpressionist/brush.c:252
-msgid "Save Brush"
-msgstr "Lagra penselen"
-
-#: ../plug-ins/gimpressionist/brush.c:507
-msgid "_Brush"
-msgstr "_Pensel"
-
-#: ../plug-ins/gimpressionist/brush.c:544
-msgid "Gamma:"
-msgstr "Gamma:"
-
-#: ../plug-ins/gimpressionist/brush.c:562
-msgid "Changes the gamma (brightness) of the selected brush"
-msgstr "Endra Gamma-verdien (lysstyrken) for den valde penselen"
-
-#: ../plug-ins/gimpressionist/brush.c:570
-msgid "Select:"
-msgstr "Vel:"
-
-#: ../plug-ins/gimpressionist/brush.c:599
-msgid "Aspect ratio:"
-msgstr "Sideforhold:"
-
-#: ../plug-ins/gimpressionist/brush.c:603
-msgid "Specifies the aspect ratio of the brush"
-msgstr "Bestemmer forholdet mellom sidene i penselen"
-
-#: ../plug-ins/gimpressionist/brush.c:612
-#: ../plug-ins/gimpressionist/paper.c:206
-msgid "Relief:"
-msgstr "Relieff:"
-
-#: ../plug-ins/gimpressionist/brush.c:616
-#: ../plug-ins/gimpressionist/paper.c:210
-msgid "Specifies the amount of embossing to apply to the image (in percent)"
-msgstr "Bestemmer graden av relieffeffekt (i %)"
-
-#: ../plug-ins/gimpressionist/color.c:60
-msgid "Co_lor"
-msgstr "_Farge"
-
-#: ../plug-ins/gimpressionist/color.c:70
-msgid "A_verage under brush"
-msgstr "_Gjennomsnitt under penselen"
-
-#: ../plug-ins/gimpressionist/color.c:72
-msgid "C_enter of brush"
-msgstr "_Midten av penselen"
-
-#: ../plug-ins/gimpressionist/color.c:79
-msgid "Color is computed from the average of all pixels under the brush"
-msgstr "Fargen blir bestemt som middelverdien av alle pikslane under penselen"
-
-#: ../plug-ins/gimpressionist/color.c:83
-msgid "Samples the color from the pixel in the center of the brush"
-msgstr "Fargen blir bestemt ut frå pikslane under midten av penselen"
-
-#: ../plug-ins/gimpressionist/color.c:94
-msgid "Color _noise:"
-msgstr "Farge_støy:"
-
-#: ../plug-ins/gimpressionist/color.c:98
-msgid "Adds random noise to the color"
-msgstr "Legg tilfeldig støy til fargen"
-
-#: ../plug-ins/gimpressionist/general.c:150
-msgid "Keep original"
-msgstr "Behald original"
-
-#: ../plug-ins/gimpressionist/general.c:151
-msgid "Preserve the original image as a background"
-msgstr "Behald originalbiletet som bakgrunn"
-
-#: ../plug-ins/gimpressionist/general.c:156
-msgid "From paper"
-msgstr "Frå papir"
-
-#: ../plug-ins/gimpressionist/general.c:157
-msgid "Copy the texture of the selected paper as a background"
-msgstr "Bruk kopi av teksturen i det valde papiret som bakgrunn"
-
-#: ../plug-ins/gimpressionist/general.c:167
-msgid "Solid colored background"
-msgstr "Einsfarga bakgrunn"
-
-#: ../plug-ins/gimpressionist/general.c:186
-msgid "Use a transparent background; Only the strokes painted will be visible"
-msgstr "Bruk gjennomsiktig bakgrunn. Bare penselstrøka blir synlege."
-
-#: ../plug-ins/gimpressionist/general.c:203
-msgid "Paint edges"
-msgstr "Teikna kantane"
-
-#: ../plug-ins/gimpressionist/general.c:208
-msgid "Selects if to place strokes all the way out to the edges of the image"
-msgstr "Penselstrøka skal halde fram til kanten av biletet"
-
-#. Tileable checkbox
-#: ../plug-ins/gimpressionist/general.c:213 ../plug-ins/maze/maze_face.c:284
-msgid "Tileable"
-msgstr "Saumlaus"
-
-#: ../plug-ins/gimpressionist/general.c:217
-msgid "Selects if the resulting image should be seamlessly tileable"
-msgstr "Bestemmer om det ferdige biletet skal ha saumlause overgangar."
-
-#: ../plug-ins/gimpressionist/general.c:222
-msgid "Drop shadow"
-msgstr "Slagskygge"
-
-#: ../plug-ins/gimpressionist/general.c:227
-msgid "Adds a shadow effect to each brush stroke"
-msgstr "Legg til ein skyggeeffekt på kvart penselstrøk"
-
-#: ../plug-ins/gimpressionist/general.c:240
-msgid "Edge darken:"
-msgstr "Formørk ved kanten:"
-
-#: ../plug-ins/gimpressionist/general.c:244
-msgid "How much to \"darken\" the edges of each brush stroke"
-msgstr "Mengda av «formørking» av kanten til kvart penselstrøk"
-
-#: ../plug-ins/gimpressionist/general.c:249
-msgid "Shadow darken:"
-msgstr "Skyggeformørking:"
-
-#: ../plug-ins/gimpressionist/general.c:253
-msgid "How much to \"darken\" the drop shadow"
-msgstr "Kor mykje skyggane skal «formørkast»"
-
-#: ../plug-ins/gimpressionist/general.c:258
-msgid "Shadow depth:"
-msgstr "Skyggedjupn:"
-
-#: ../plug-ins/gimpressionist/general.c:262
-msgid ""
-"The depth of the drop shadow, i.e. how far apart from the object it should be"
-msgstr "Djupna på skyggen, dvs. kor langt ut frå objektet skal skyggen gå"
-
-#: ../plug-ins/gimpressionist/general.c:267
-msgid "Shadow blur:"
-msgstr "Skyggesløring:"
-
-#: ../plug-ins/gimpressionist/general.c:271
-msgid "How much to blur the drop shadow"
-msgstr "Kor mykje skyggen skal slørast"
-
-#: ../plug-ins/gimpressionist/general.c:276
-msgid "Deviation threshold:"
-msgstr "Avviksgrense:"
-
-#: ../plug-ins/gimpressionist/general.c:280
-msgid "A bailout-value for adaptive selections"
-msgstr "Utløysingsverdi for avpassa utval"
-
-#: ../plug-ins/gimpressionist/gimp.c:90
-msgid "Performs various artistic operations"
-msgstr "Utfør ulike artistiske operasjonar"
-
-#: ../plug-ins/gimpressionist/gimp.c:95
-msgid "_GIMPressionist..."
-msgstr "_GIMPressionist..."
-
-#: ../plug-ins/gimpressionist/gimp.c:371
-msgid "Painting"
-msgstr "Teiknar"
-
-#: ../plug-ins/gimpressionist/gimpressionist.c:139
-msgid "GIMPressionist"
-msgstr "GIMPressionist"
-
-#: ../plug-ins/gimpressionist/orientation.c:92
-msgid "Or_ientation"
-msgstr "Or_ientering"
-
-#: ../plug-ins/gimpressionist/orientation.c:106
-msgid "Directions:"
-msgstr "Retningar:"
-
-#: ../plug-ins/gimpressionist/orientation.c:110
-msgid "The number of directions (i.e. brushes) to use"
-msgstr "Kor mange retningar, dvs. penslar, som skal brukast"
-
-#: ../plug-ins/gimpressionist/orientation.c:118
-msgid "Start angle:"
-msgstr "Startvinkel:"
-
-#: ../plug-ins/gimpressionist/orientation.c:122
-msgid "The starting angle of the first brush to create"
-msgstr "Startvinkelen til den første penselen som skal lagast"
-
-#: ../plug-ins/gimpressionist/orientation.c:130
-msgid "Angle span:"
-msgstr "Vinkelspenn:"
-
-#: ../plug-ins/gimpressionist/orientation.c:134
-msgid "The angle span of the first brush to create"
-msgstr "Vinkelspennet (storleiken) på den første penselen som skal lagast"
-
-#: ../plug-ins/gimpressionist/orientation.c:157
-msgid ""
-"Let the value (brightness) of the region determine the direction of the "
-"stroke"
-msgstr "La lysverdien til området bestemma retninga på penselstrøka"
-
-#: ../plug-ins/gimpressionist/orientation.c:160
-#: ../plug-ins/gimpressionist/size.c:163
-msgid "Radius"
-msgstr "Radius"
-
-#: ../plug-ins/gimpressionist/orientation.c:161
-msgid ""
-"The distance from the center of the image determines the direction of the "
-"stroke"
-msgstr "La avstanden frå biletsenteret bestemma retninga på penselstrøka"
-
-#: ../plug-ins/gimpressionist/orientation.c:165
-msgid "Selects a random direction of each stroke"
-msgstr "Lag ein tilfeldig retning for kvart penselstrøk"
-
-#: ../plug-ins/gimpressionist/orientation.c:168
-#: ../plug-ins/gimpressionist/size.c:171
-msgid "Radial"
-msgstr "Radial"
-
-#: ../plug-ins/gimpressionist/orientation.c:169
-msgid "Let the direction from the center determine the direction of the stroke"
-msgstr "La retningen frå biletsenteret bestemma retninga på penselstrøka"
-
-#: ../plug-ins/gimpressionist/orientation.c:176
-#: ../plug-ins/gimpressionist/size.c:179
-msgid "Flowing"
-msgstr "Flygande"
-
-#: ../plug-ins/gimpressionist/orientation.c:177
-#: ../plug-ins/gimpressionist/size.c:180
-msgid "The strokes follow a \"flowing\" pattern"
-msgstr "Penselstrøka følgjer eit «flygande» mønster"
-
-#: ../plug-ins/gimpressionist/orientation.c:181
-msgid "The hue of the region determines the direction of the stroke"
-msgstr "La kuløren på området bestemma retninga på penselstrøka"
-
-#: ../plug-ins/gimpressionist/orientation.c:184
-#: ../plug-ins/gimpressionist/size.c:187
-msgid "Adaptive"
-msgstr "Tilpassande"
-
-#: ../plug-ins/gimpressionist/orientation.c:185
-msgid "The direction that matches the original image the closest is selected"
-msgstr "Vel den retningen som kjem nærast originalbiletet"
-
-#: ../plug-ins/gimpressionist/orientation.c:192
-#: ../plug-ins/gimpressionist/size.c:196
-msgid "Manual"
-msgstr "Manuell"
-
-#: ../plug-ins/gimpressionist/orientation.c:193
-msgid "Manually specify the stroke orientation"
-msgstr "Bestem retninga på penselstrøka manuelt"
-
-#: ../plug-ins/gimpressionist/orientation.c:204
-msgid "Opens up the Orientation Map Editor"
-msgstr "Opnar behandlaren for retningsoversynet"
-
-#: ../plug-ins/gimpressionist/orientmap.c:526
-msgid "Orientation Map Editor"
-msgstr "Retningskartbehandlaren"
-
-#: ../plug-ins/gimpressionist/orientmap.c:555
-msgid "Vectors"
-msgstr "Vektorar"
-
-#: ../plug-ins/gimpressionist/orientmap.c:567
-msgid ""
-"The vector-field. Left-click to move selected vector, Right-click to point "
-"it towards mouse, Middle-click to add a new vector."
-msgstr ""
-"Vektorfeltet. Venstreklikk for å flytta vald vektor til musemarkøren. "
-"Høgreklikk for å snu vektoren i retning musemarkøren. Midtklikk for å leggja "
-"til ein vektor."
-
-#: ../plug-ins/gimpressionist/orientmap.c:590
-#: ../plug-ins/gimpressionist/sizemap.c:459
-msgid "Adjust the preview's brightness"
-msgstr "Juster lysverdien for førehandsvisinga"
-
-#: ../plug-ins/gimpressionist/orientmap.c:612
-msgid "Select previous vector"
-msgstr "Vel førre vektor"
-
-#: ../plug-ins/gimpressionist/orientmap.c:618
-msgid "Select next vector"
-msgstr "Vel neste vektor"
-
-#: ../plug-ins/gimpressionist/orientmap.c:620
-#: ../plug-ins/gimpressionist/sizemap.c:490
-msgid "A_dd"
-msgstr "Legg _til"
-
-#: ../plug-ins/gimpressionist/orientmap.c:624
-msgid "Add new vector"
-msgstr "Legg til ny vektor"
-
-#: ../plug-ins/gimpressionist/orientmap.c:626
-#: ../plug-ins/gimpressionist/sizemap.c:497
-msgid "_Kill"
-msgstr "_Fjern"
-
-#: ../plug-ins/gimpressionist/orientmap.c:630
-msgid "Delete selected vector"
-msgstr "Fjern den valde vektoren"
-
-#: ../plug-ins/gimpressionist/orientmap.c:641
-msgid "Type"
-msgstr "Type"
-
-#: ../plug-ins/gimpressionist/orientmap.c:645
-msgid "_Normal"
-msgstr "_Normal"
-
-#: ../plug-ins/gimpressionist/orientmap.c:646
-msgid "Vorte_x"
-msgstr "Vorte_x"
-
-#: ../plug-ins/gimpressionist/orientmap.c:647
-msgid "Vortex_2"
-msgstr "Vortex_2"
-
-#: ../plug-ins/gimpressionist/orientmap.c:648
-msgid "Vortex_3"
-msgstr "Vortex_3"
-
-#: ../plug-ins/gimpressionist/orientmap.c:654
-#: ../plug-ins/gimpressionist/sizemap.c:542
-msgid "_Voronoi"
-msgstr "_Voronoi"
-
-#: ../plug-ins/gimpressionist/orientmap.c:662
-msgid ""
-"Voronoi-mode makes only the vector closest to the given point have any "
-"influence"
-msgstr "Voronoi-Modus: Bare vektoren nærast det gjevne punktet har noe verknad"
-
-#: ../plug-ins/gimpressionist/orientmap.c:672
-msgid "A_ngle:"
-msgstr "Vi_nkel:"
-
-#: ../plug-ins/gimpressionist/orientmap.c:676
-msgid "Change the angle of the selected vector"
-msgstr "Endra vinkelen til den valde vektoren"
-
-#: ../plug-ins/gimpressionist/orientmap.c:683
-msgid "Ang_le offset:"
-msgstr "Vinke_l-forskyving:"
-
-#: ../plug-ins/gimpressionist/orientmap.c:687
-msgid "Offset all vectors with a given angle"
-msgstr "Forskyv alle vinklane med ein gjeven vinkel"
-
-#: ../plug-ins/gimpressionist/orientmap.c:698
-msgid "Change the strength of the selected vector"
-msgstr "Endra styrken til den valde vektoren"
-
-#: ../plug-ins/gimpressionist/orientmap.c:705
-msgid "S_trength exp.:"
-msgstr "S_tyrkeeksp.:"
-
-#: ../plug-ins/gimpressionist/orientmap.c:709
-#: ../plug-ins/gimpressionist/sizemap.c:537
-msgid "Change the exponent of the strength"
-msgstr "Endra styrkeeksponenten"
-
-#: ../plug-ins/gimpressionist/paper.c:138
-msgid "P_aper"
-msgstr "P_apir"
-
-#: ../plug-ins/gimpressionist/paper.c:173
-msgid "Inverts the Papers texture"
-msgstr "Inverterer papirteksturen"
-
-#: ../plug-ins/gimpressionist/paper.c:177
-msgid "O_verlay"
-msgstr "O_verlegg"
-
-#: ../plug-ins/gimpressionist/paper.c:182
-msgid "Applies the paper as it is (without embossing it)"
-msgstr "Bruk papiret som det er, utan bossering (relieffverknad)"
-
-#: ../plug-ins/gimpressionist/paper.c:198
-msgid "Specifies the scale of the texture (in percent of original file)"
-msgstr "Bestemmer storleiken på teksturen i % av originalfila"
-
-#: ../plug-ins/gimpressionist/placement.c:67
-msgid "Pl_acement"
-msgstr "Pl_asering"
-
-#: ../plug-ins/gimpressionist/placement.c:73
-msgid "Placement"
-msgstr "Plasering"
-
-#: ../plug-ins/gimpressionist/placement.c:77
-msgid "Randomly"
-msgstr "Tilfeldig"
-
-#: ../plug-ins/gimpressionist/placement.c:81
-msgid "Evenly distributed"
-msgstr "Likt fordelt"
-
-#: ../plug-ins/gimpressionist/placement.c:89
-msgid "Place strokes randomly around the image"
-msgstr "Plaser strøka tilfeldig rundt om på biletet"
-
-#: ../plug-ins/gimpressionist/placement.c:93
-msgid "The strokes are evenly distributed across the image"
-msgstr "Plasserer strøka jamnt utover biletet"
-
-#: ../plug-ins/gimpressionist/placement.c:102
-msgid "Centered"
-msgstr "Sentrert"
-
-#: ../plug-ins/gimpressionist/placement.c:108
-msgid "Focus the brush strokes around the center of the image"
-msgstr "Fokuser penselstrøka rundt midten av biletet"
-
-#: ../plug-ins/gimpressionist/placement.c:120
-msgid "Stroke _density:"
-msgstr "_Dekkevne:"
-
-#: ../plug-ins/gimpressionist/placement.c:124
-msgid "The relative density of the brush strokes"
-msgstr "Relativ dekkevne for penselstrøka"
-
-#.
-#. * gimp_filename_to_utf8 () and g_strerror () return temporary strings
-#. * that need not and should not be freed. So this call is OK.
-#. *
-#: ../plug-ins/gimpressionist/ppmtool.c:650
-#, c-format
-msgid "Failed to save PPM file '%s': %s"
-msgstr "Fekk ikkje lagra PPM-fila «%s»: %s"
-
-#: ../plug-ins/gimpressionist/presets.c:638
-msgid "Save Current"
-msgstr "Lagra innstillingane"
-
-#: ../plug-ins/gimpressionist/presets.c:892
-msgid "Gimpressionist Defaults"
-msgstr "Førehandsinnstillingane for Gimpressionisten"
-
-#: ../plug-ins/gimpressionist/presets.c:1013
-msgid "_Presets"
-msgstr "_Førehandsinnstillingar"
-
-#: ../plug-ins/gimpressionist/presets.c:1028
-msgid "Save Current..."
-msgstr "Lagra gjeldande..."
-
-#: ../plug-ins/gimpressionist/presets.c:1036
-msgid "Save the current settings to the specified file"
-msgstr "Lagra dei brukte innstillingane til den spesifiserte fila"
-
-#: ../plug-ins/gimpressionist/presets.c:1064
-msgid "Reads the selected Preset into memory"
-msgstr "Les dei valde innstillingane til minnet"
-
-#: ../plug-ins/gimpressionist/presets.c:1070
-msgid "Deletes the selected Preset"
-msgstr "Visk ut dei valde innstillingane"
-
-#: ../plug-ins/gimpressionist/presets.c:1076
-msgid "Reread the folder of Presets"
-msgstr "Les mappa med førehandsinnstillingar på nytt"
-
-#: ../plug-ins/gimpressionist/preview.c:180
-msgid "Refresh the Preview window"
-msgstr "Oppdater førehandsvisinga"
-
-#: ../plug-ins/gimpressionist/preview.c:188
-msgid "Revert to the original image"
-msgstr "Gå tilbake til originalbiletet"
-
-#: ../plug-ins/gimpressionist/size.c:95
-msgid "_Size"
-msgstr "_Storleik"
-
-#: ../plug-ins/gimpressionist/size.c:109
-msgid "Sizes:"
-msgstr "Storleikar:"
-
-#: ../plug-ins/gimpressionist/size.c:113
-msgid "The number of sizes of brushes to use"
-msgstr "Kor mange penselstorleikar som skal brukast"
-
-#: ../plug-ins/gimpressionist/size.c:121
-msgid "Minimum size:"
-msgstr "Min. storleik:"
-
-#: ../plug-ins/gimpressionist/size.c:125
-msgid "The smallest brush to create"
-msgstr "Den minste penselen som skal brukast"
-
-#: ../plug-ins/gimpressionist/size.c:133
-msgid "Maximum size:"
-msgstr "Maks storleik:"
-
-#: ../plug-ins/gimpressionist/size.c:137
-msgid "The largest brush to create"
-msgstr "Den største penselen som skal brukast"
-
-#: ../plug-ins/gimpressionist/size.c:151
-msgid "Size:"
-msgstr "Storleik:"
-
-#: ../plug-ins/gimpressionist/size.c:160
-msgid ""
-"Let the value (brightness) of the region determine the size of the stroke"
-msgstr "La lysverdien i området bestemma storleiken på penselstrøket"
-
-#: ../plug-ins/gimpressionist/size.c:164
-msgid ""
-"The distance from the center of the image determines the size of the stroke"
-msgstr "La avstanden frå biletsenteret bestemma storleiken på penselstrøket"
-
-#: ../plug-ins/gimpressionist/size.c:168
-msgid "Selects a random size for each stroke"
-msgstr "Vel ein tilfeldig storleik for penselstrøket"
-
-#: ../plug-ins/gimpressionist/size.c:172
-msgid "Let the direction from the center determine the size of the stroke"
-msgstr "La retninga frå biletsenteret bestemma storleiken på penselstrøket"
-
-#: ../plug-ins/gimpressionist/size.c:184
-msgid "The hue of the region determines the size of the stroke"
-msgstr "La kuløren i området bestemma storleiken på penselstrøket"
-
-#: ../plug-ins/gimpressionist/size.c:188
-msgid "The brush-size that matches the original image the closest is selected"
-msgstr "Vel den penselstorleiken som kjem nærast originalbiletet"
-
-#: ../plug-ins/gimpressionist/size.c:197
-msgid "Manually specify the stroke size"
-msgstr "Spesifiser penselstorleiken manuelt"
-
-#: ../plug-ins/gimpressionist/size.c:208
-msgid "Opens up the Size Map Editor"
-msgstr "Opnar storleiksbehandlaren"
-
-#: ../plug-ins/gimpressionist/sizemap.c:401
-msgid "Size Map Editor"
-msgstr "Storleiksbehandlaren"
-
-#: ../plug-ins/gimpressionist/sizemap.c:429
-msgid "Smvectors"
-msgstr "Sm-vektorar"
-
-#: ../plug-ins/gimpressionist/sizemap.c:439
-msgid ""
-"The smvector-field. Left-click to move selected smvector, Right-click to "
-"point it towards mouse, Middle-click to add a new smvector."
-msgstr ""
-"smVektorfeltet.\n"
-"Venstreklikk for å flytta vald smvektor til musemarkøren. Høgreklikk for å "
-"snu smvektoren i retning musemarkøren. Midtklikk for å leggja til ein vektor."
-"Das smvektor-Feld. Links-klicken, um den ausgewählten smvektor zu bewegen,\n"
-"Rechts-klicken um den Vektor zum Mauszeiger zeigen zu lassen, Mittel-"
-"klicken\n"
-"um einen neuen Vektor hinzuzufügen."
-
-#: ../plug-ins/gimpressionist/sizemap.c:481
-msgid "Select previous smvector"
-msgstr "Vel den førre smvektoren"
-
-#: ../plug-ins/gimpressionist/sizemap.c:488
-msgid "Select next smvector"
-msgstr "Vel den neste smvektoren"
-
-#: ../plug-ins/gimpressionist/sizemap.c:495
-msgid "Add new smvector"
-msgstr "Legg til ny smvektor"
-
-#: ../plug-ins/gimpressionist/sizemap.c:502
-msgid "Delete selected smvector"
-msgstr "Slett den valde smvektoren"
-
-#: ../plug-ins/gimpressionist/sizemap.c:515
-msgid "Change the angle of the selected smvector"
-msgstr "Endra vinkelen for den valde smvektoren"
-
-#: ../plug-ins/gimpressionist/sizemap.c:522
-msgid "S_trength:"
-msgstr "S_tyrke:"
-
-#: ../plug-ins/gimpressionist/sizemap.c:526
-msgid "Change the strength of the selected smvector"
-msgstr "Endra styrken for den valde smvektoren"
-
-#: ../plug-ins/gimpressionist/sizemap.c:533
-msgid "St_rength exp.:"
-msgstr "Sty_rkeeksp.:"
-
-#: ../plug-ins/gimpressionist/sizemap.c:549
-msgid ""
-"Voronoi-mode makes only the smvector closest to the given point have any "
-"influence"
-msgstr ""
-"Voronoi-Modus: Bare smvektoren nærast det gjevne punktet har noe verknad"
-
-#: ../plug-ins/help/gimphelpdomain.c:178
-msgid "The GIMP help files are not found."
-msgstr "Fann ikkje hjelpfilene for GIMP"
-
-#: ../plug-ins/help/gimphelpdomain.c:179
-msgid ""
-"Please install the additional help package or use the online user manual at "
-"http://docs.gimp.org/."
-msgstr ""
-"Installer den tilhøyrande hjelp-pakka, eller bruk den nettbaserte handboka "
-"på http://docs.gimp.org/."
-
-#: ../plug-ins/help/gimphelpdomain.c:185
-msgid "There is a problem with the GIMP help files."
-msgstr "Det er eitt eller anna problem med hjelpfilene for GIMP."
+#: ../plug-ins/help-browser/dialog.c:185
+#: ../plug-ins/help-browser/dialog.c:1133
+msgid "GIMP Help Browser"
+msgstr "Hjelplesaren for GIMP"
+
+#: ../plug-ins/help-browser/dialog.c:565
+msgid "Go back one page"
+msgstr "Tilbake ei side"
+
+#: ../plug-ins/help-browser/dialog.c:570
+msgid "Go forward one page"
+msgstr "Fram ei side"
+
+#: ../plug-ins/help-browser/dialog.c:575
+msgid "_Reload"
+msgstr "_Hent på nytt"
+
+#: ../plug-ins/help-browser/dialog.c:575
+msgid "Reload current page"
+msgstr "Last inn gjeldande side på nytt"
+
+#: ../plug-ins/help-browser/dialog.c:580
+msgid "_Stop"
+msgstr "_Stopp"
+
+#: ../plug-ins/help-browser/dialog.c:580
+msgid "Stop loading this page"
+msgstr "Stopp nedlastinga av denne sida"
+
+#: ../plug-ins/help-browser/dialog.c:585
+msgid "Go to the index page"
+msgstr "Gå til indekssida"
+
+#: ../plug-ins/help-browser/dialog.c:590
+msgid "C_opy location"
+msgstr "Kopier _adressa"
+
+#: ../plug-ins/help-browser/dialog.c:591
+msgid "Copy the location of this page to the clipboard"
+msgstr "Kopier adressa for denne sida til utklippstavla"
+
+#: ../plug-ins/help-browser/dialog.c:611
+msgid "Find text in current page"
+msgstr "Finn tekst på denne sida"
+
+#: ../plug-ins/help-browser/dialog.c:616
+msgid "Find _Again"
+msgstr "Finn _igjen"
+
+#: ../plug-ins/help-browser/dialog.c:635
+msgid "S_how Index"
+msgstr "Vis _indeks"
+
+#: ../plug-ins/help-browser/dialog.c:636
+msgid "Toggle the visibility of the sidebar"
+msgstr "Slå syninga av sidestolpane av/på"
+
+#: ../plug-ins/help-browser/dialog.c:657
+msgid "Visit the GIMP documentation website"
+msgstr "Besøk nettsida til GIMP-dokumentasjonen"
+
+#: ../plug-ins/help-browser/dialog.c:1174
+msgid "Find:"
+msgstr "Finn:"
+
+#: ../plug-ins/help-browser/dialog.c:1191
+msgctxt "search"
+msgid "_Previous"
+msgstr "_Førre"
+
+#: ../plug-ins/help-browser/dialog.c:1203
+msgctxt "search"
+msgid "_Next"
+msgstr "_Neste"
+
+#: ../plug-ins/help/gimphelpdomain.c:180
+msgid "The help pages for '%s' are not available."
+msgstr "Hjelpsidene for «%s» er ikkje tilgjengelege"
+
+#: ../plug-ins/help/gimphelpdomain.c:186
+msgid "The GIMP user manual is not available."
+msgstr "Handboka for GIMP er ikkje tilgjengeleg"
 
 #: ../plug-ins/help/gimphelpdomain.c:187
-msgid "Please check your installation."
-msgstr "Kontroller installasjonen din."
+msgid "Please install the additional help package or use the online user manual at http://docs.gimp.org/."
+msgstr "Installer den tilhøyrande hjelp-pakka, eller bruk den nettbaserte handboka på http://docs.gimp.org/."
 
-#: ../plug-ins/help/gimphelpdomain.c:197
-#, c-format
+#: ../plug-ins/help/gimphelpdomain.c:196
+msgid "Perhaps you are missing GIO backends and need to install GVFS?"
+msgstr "Du manglar kan hende GIO oppbackinger og må installera GVFS?"
+
+#: ../plug-ins/help/gimphelpdomain.c:215
 msgid "Help ID '%s' unknown"
 msgstr "Hjelp-ID «%s» er ukjent"
 
-#: ../plug-ins/help/gimphelplocale.c:215
-#, c-format
+#: ../plug-ins/help/gimphelplocale.c:208
+msgid "Loading index from '%s'"
+msgstr "Les indeks frå «%s»"
+
+#: ../plug-ins/help/gimphelplocale.c:266
 msgid ""
 "Parse error in '%s':\n"
 "%s"
 msgstr ""
-"Omsettingsfeil i «%s»:\n"
+"Parsefeil i «%s»:\n"
 "%s"
 
-#: ../plug-ins/helpbrowser/dialog.c:217
-msgid "GIMP Help Browser"
-msgstr "Hjelplesaren for GIMP"
-
-#: ../plug-ins/helpbrowser/dialog.c:312
-msgid "Drag and drop this icon to a web browser"
-msgstr "Dra og slepp dette ikonet til ein nettlesar"
-
-#: ../plug-ins/helpbrowser/dialog.c:703
-msgid "Go back one page"
-msgstr "Tilbake ei side"
-
-#: ../plug-ins/helpbrowser/dialog.c:708
-msgid "Go forward one page"
-msgstr "Fram ei side"
-
-#: ../plug-ins/helpbrowser/dialog.c:713
-msgid "Go to the index page"
-msgstr "Gå til indekssida"
-
-#: ../plug-ins/helpbrowser/dialog.c:748
-msgid "Visit the GIMP documentation website"
-msgstr "Besøk nettsida til GIMP-dokumentasjonen"
-
-#: ../plug-ins/helpbrowser/dialog.c:824
-msgid "Document not found"
-msgstr "Fann ikkje dokument"
-
-#: ../plug-ins/helpbrowser/dialog.c:826
-msgid "The requested URL could not be loaded:"
-msgstr "Kunne ikkje opna den oppgitte fila:"
-
-#: ../plug-ins/ifscompose/ifscompose.c:333
+#: ../plug-ins/ifs-compose/ifs-compose.c:333
 msgid "Create an Iterated Function System (IFS) fractal"
 msgstr "Opprett ein IFS-fraktal (Iterated Function System)"
 
-#: ../plug-ins/ifscompose/ifscompose.c:345
+#: ../plug-ins/ifs-compose/ifs-compose.c:345
 msgid "_IFS Fractal..."
-msgstr "_IFS Fraktal..."
+msgstr "_IFS Fraktal …"
+
+#. X
+#: ../plug-ins/ifs-compose/ifs-compose.c:525
+#: ../plug-ins/lighting/lighting-ui.c:526
+#: ../plug-ins/map-object/map-object-ui.c:675
+#: ../plug-ins/map-object/map-object-ui.c:729
+#: ../plug-ins/map-object/map-object-ui.c:997
+#: ../plug-ins/map-object/map-object-ui.c:1046
+msgid "X:"
+msgstr "X:"
+
+#. Y
+#: ../plug-ins/ifs-compose/ifs-compose.c:539
+#: ../plug-ins/lighting/lighting-ui.c:540
+#: ../plug-ins/map-object/map-object-ui.c:689
+#: ../plug-ins/map-object/map-object-ui.c:742
+#: ../plug-ins/map-object/map-object-ui.c:1010
+#: ../plug-ins/map-object/map-object-ui.c:1057
+#: ../plug-ins/map-object/map-object-ui.c:1155
+msgid "Y:"
+msgstr "Y:"
 
 #. Asym
-#: ../plug-ins/ifscompose/ifscompose.c:581
+#: ../plug-ins/ifs-compose/ifs-compose.c:581
 msgid "Asymmetry:"
 msgstr "Asymmetri:"
 
 #. Shear
-#: ../plug-ins/ifscompose/ifscompose.c:595
+#: ../plug-ins/ifs-compose/ifs-compose.c:595
 msgid "Shear:"
 msgstr "Forskyv:"
 
 #. Simple color control section
-#: ../plug-ins/ifscompose/ifscompose.c:640
+#: ../plug-ins/ifs-compose/ifs-compose.c:640
 msgid "Simple"
 msgstr "Enkel"
 
-#: ../plug-ins/ifscompose/ifscompose.c:649
+#: ../plug-ins/ifs-compose/ifs-compose.c:649
 msgid "IFS Fractal: Target"
 msgstr "IFS-fraktal: Mål"
 
-#: ../plug-ins/ifscompose/ifscompose.c:655
+#: ../plug-ins/ifs-compose/ifs-compose.c:655
 msgid "Scale hue by:"
 msgstr "Skaler kulør med:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:670
+#: ../plug-ins/ifs-compose/ifs-compose.c:670
 msgid "Scale value by:"
 msgstr "Skaler lysverdi med:"
 
 #. Full color control section
-#: ../plug-ins/ifscompose/ifscompose.c:687
+#: ../plug-ins/ifs-compose/ifs-compose.c:687
 msgid "Full"
 msgstr "Heile"
 
-#: ../plug-ins/ifscompose/ifscompose.c:695
+#: ../plug-ins/ifs-compose/ifs-compose.c:695
 msgid "IFS Fractal: Red"
 msgstr "IFS-fraktal: Raud"
 
-#: ../plug-ins/ifscompose/ifscompose.c:703
+#: ../plug-ins/ifs-compose/ifs-compose.c:703
 msgid "IFS Fractal: Green"
 msgstr "IFS-fraktal: Grøn"
 
-#: ../plug-ins/ifscompose/ifscompose.c:711
+#: ../plug-ins/ifs-compose/ifs-compose.c:711
 msgid "IFS Fractal: Blue"
 msgstr "IFS-fraktal: Blå"
 
-#: ../plug-ins/ifscompose/ifscompose.c:719
+#: ../plug-ins/ifs-compose/ifs-compose.c:719
 msgid "IFS Fractal: Black"
 msgstr "IFS-fraktal: Svart"
 
-#: ../plug-ins/ifscompose/ifscompose.c:769
+#: ../plug-ins/ifs-compose/ifs-compose.c:769
 msgid "IFS Fractal"
 msgstr "IFS-fraktal"
 
-#: ../plug-ins/ifscompose/ifscompose.c:867
+#: ../plug-ins/ifs-compose/ifs-compose.c:867
 msgid "Spatial Transformation"
 msgstr "Romtransformasjon"
 
-#: ../plug-ins/ifscompose/ifscompose.c:873
+#: ../plug-ins/ifs-compose/ifs-compose.c:873
 msgid "Color Transformation"
 msgstr "Fargetransformasjon"
 
-#: ../plug-ins/ifscompose/ifscompose.c:883
+#: ../plug-ins/ifs-compose/ifs-compose.c:883
 msgid "Relative probability:"
 msgstr "Relativ slump:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1058
-#: ../plug-ins/imagemap/imap_menu.c:163
+#: ../plug-ins/ifs-compose/ifs-compose.c:1058
+#: ../plug-ins/imagemap/imap_menu.c:162
 msgid "Select _All"
-msgstr "Vel _alle"
+msgstr "Vel _alt"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1062
+#: ../plug-ins/ifs-compose/ifs-compose.c:1062
 msgid "Re_center"
 msgstr "_Sentrer"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1062
+#: ../plug-ins/ifs-compose/ifs-compose.c:1062
 msgid "Recompute Center"
 msgstr "Berekna senter på nytt"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1066
+#: ../plug-ins/ifs-compose/ifs-compose.c:1066
 msgid "Render Options"
 msgstr "Teikneinnstillingar"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1072
-#: ../plug-ins/imagemap/imap_cmd_move.c:86
-#: ../plug-ins/imagemap/imap_cmd_object_move.c:57
+#: ../plug-ins/ifs-compose/ifs-compose.c:1072
+#: ../plug-ins/imagemap/imap_cmd_move.c:85
+#: ../plug-ins/imagemap/imap_cmd_object_move.c:56
 msgid "Move"
 msgstr "Flytt"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1075
+#: ../plug-ins/ifs-compose/ifs-compose.c:1075
 msgid "Rotate"
 msgstr "Rotér"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1075
+#: ../plug-ins/ifs-compose/ifs-compose.c:1075
 msgid "Rotate / Scale"
 msgstr "Rotér/skalér"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1078
+#: ../plug-ins/ifs-compose/ifs-compose.c:1078
 msgid "Stretch"
 msgstr "Strekk"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1176
+#: ../plug-ins/ifs-compose/ifs-compose.c:1176
 msgid "IFS Fractal Render Options"
 msgstr "Innstillingar for IFS-fraktal"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1197
+#: ../plug-ins/ifs-compose/ifs-compose.c:1198
 msgid "Max. memory:"
 msgstr "Maks minne:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1224
+#: ../plug-ins/ifs-compose/ifs-compose.c:1225
 msgid "Subdivide:"
 msgstr "Vidaredeling:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1237
+#: ../plug-ins/ifs-compose/ifs-compose.c:1238
 msgid "Spot radius:"
 msgstr "Punktradius:"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1302
-#, c-format
+#: ../plug-ins/ifs-compose/ifs-compose.c:1303
 msgid "Rendering IFS (%d/%d)"
-msgstr "Lager IFS (%d/%d)..."
+msgstr "Lager IFS (%d/%d)"
 
-#: ../plug-ins/ifscompose/ifscompose.c:1468
-#, c-format
+#: ../plug-ins/ifs-compose/ifs-compose.c:1469
 msgid "Transformation %s"
 msgstr "Transformasjon %s"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2381
+#: ../plug-ins/ifs-compose/ifs-compose.c:2379
 msgid "Save failed"
 msgstr "Mislukka lagring"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2462
-#: ../plug-ins/ifscompose/ifscompose.c:2475
+#: ../plug-ins/ifs-compose/ifs-compose.c:2460
+#: ../plug-ins/ifs-compose/ifs-compose.c:2473
 msgid "Open failed"
 msgstr "Kunne ikkje opna"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2470
-#, c-format
+#: ../plug-ins/ifs-compose/ifs-compose.c:2468
 msgid "File '%s' doesn't seem to be an IFS Fractal file."
 msgstr "Fila «%s» ser ikkje ut til å vere ei IFS-fraktal-fil."
 
-#: ../plug-ins/ifscompose/ifscompose.c:2510
+#: ../plug-ins/ifs-compose/ifs-compose.c:2508
 msgid "Save as IFS Fractal file"
 msgstr "Lagra som IFS-fraktal-fil"
 
-#: ../plug-ins/ifscompose/ifscompose.c:2547
+#: ../plug-ins/ifs-compose/ifs-compose.c:2545
 msgid "Open IFS Fractal file"
 msgstr "Opna IFS-fraktal-fil"
 
-#: ../plug-ins/imagemap/imap_about.c:43
+#: ../plug-ins/imagemap/imap_about.c:42
 msgid "Image Map Plug-In"
 msgstr "Programtillegget biletkart"
 
-#: ../plug-ins/imagemap/imap_about.c:47
+#: ../plug-ins/imagemap/imap_about.c:46
 msgid "Copyright © 1999-2005 by Maurits Rijk"
 msgstr "Copyright(c) 1999-2005 by Maurits Rijk"
 
-#: ../plug-ins/imagemap/imap_about.c:49
+#: ../plug-ins/imagemap/imap_about.c:48
 msgid "Released under the GNU General Public License"
 msgstr "Offentleggjort under GNU General Public License"
 
-#: ../plug-ins/imagemap/imap_circle.c:64
+#: ../plug-ins/imagemap/imap_circle.c:63
 msgid "C_ircle"
 msgstr "S_irkel"
 
-#: ../plug-ins/imagemap/imap_circle.c:264
+#: ../plug-ins/imagemap/imap_circle.c:263
 msgid "Center _x:"
 msgstr "Senter _x:"
 
-#: ../plug-ins/imagemap/imap_circle.c:269
-#: ../plug-ins/imagemap/imap_circle.c:276
-#: ../plug-ins/imagemap/imap_circle.c:282 ../plug-ins/imagemap/imap_grid.c:250
-#: ../plug-ins/imagemap/imap_grid.c:256
-#: ../plug-ins/imagemap/imap_polygon.c:505
-#: ../plug-ins/imagemap/imap_polygon.c:513
-#: ../plug-ins/imagemap/imap_rectangle.c:394
-#: ../plug-ins/imagemap/imap_rectangle.c:401
-#: ../plug-ins/imagemap/imap_rectangle.c:408
-#: ../plug-ins/imagemap/imap_rectangle.c:415
+#: ../plug-ins/imagemap/imap_circle.c:268
+#: ../plug-ins/imagemap/imap_circle.c:275
+#: ../plug-ins/imagemap/imap_circle.c:281
+#: ../plug-ins/imagemap/imap_grid.c:249
+#: ../plug-ins/imagemap/imap_grid.c:255
+#: ../plug-ins/imagemap/imap_polygon.c:504
+#: ../plug-ins/imagemap/imap_polygon.c:512
+#: ../plug-ins/imagemap/imap_rectangle.c:393
+#: ../plug-ins/imagemap/imap_rectangle.c:400
+#: ../plug-ins/imagemap/imap_rectangle.c:407
+#: ../plug-ins/imagemap/imap_rectangle.c:414
 msgid "pixels"
 msgstr "Pikslar"
 
-#: ../plug-ins/imagemap/imap_circle.c:271
+#: ../plug-ins/imagemap/imap_circle.c:270
 msgid "Center _y:"
 msgstr "Senter _y:"
 
-#: ../plug-ins/imagemap/imap_cmd_clear.c:51
+#: ../plug-ins/imagemap/imap_cmd_clear.c:50
 msgid "Clear"
 msgstr "Tøm"
 
-#: ../plug-ins/imagemap/imap_cmd_create.c:58
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:151
+#: ../plug-ins/imagemap/imap_cmd_create.c:57
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:150
 msgid "Create"
 msgstr "Lag"
 
-#: ../plug-ins/imagemap/imap_cmd_cut.c:55
-#: ../plug-ins/imagemap/imap_cmd_cut_object.c:51
-#: ../plug-ins/imagemap/imap_menu.c:159
+#: ../plug-ins/imagemap/imap_cmd_cut.c:54
+#: ../plug-ins/imagemap/imap_cmd_cut_object.c:50
+#: ../plug-ins/imagemap/imap_menu.c:158
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ../plug-ins/imagemap/imap_cmd_delete.c:57
-#: ../plug-ins/imagemap/imap_menu.c:162
+#: ../plug-ins/imagemap/imap_cmd_delete.c:56
+#: ../plug-ins/imagemap/imap_menu.c:161
 msgid "Delete"
 msgstr "Fjern"
 
-#: ../plug-ins/imagemap/imap_cmd_delete_point.c:61
-#: ../plug-ins/imagemap/imap_menu.c:179
+#: ../plug-ins/imagemap/imap_cmd_delete_point.c:60
+#: ../plug-ins/imagemap/imap_menu.c:178
 msgid "Delete Point"
 msgstr "Fjern punkt"
 
-#: ../plug-ins/imagemap/imap_cmd_edit_object.c:54
+#: ../plug-ins/imagemap/imap_cmd_edit_object.c:53
 msgid "Edit Object"
 msgstr "Rediger objekt"
 
 #. Create the areas
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:117
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:147
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:251
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:116
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:146
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:250
 msgid "Use Gimp Guides"
-msgstr "Bruk hjelpelinjer"
+msgstr "Bruk GIMP hjelpelinjer"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:160
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:159
 msgid "Al_ternate"
 msgstr "Al_terner"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:165
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:164
 msgid "A_ll"
 msgstr "A_lle"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:169
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:168
 msgid "Add Additional Guides"
 msgstr "Legg til hjelpelinjer"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:177
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:176
 msgid "L_eft border"
 msgstr "_Venstre kant"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:181
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:180
 msgid "_Right border"
 msgstr "_Høgre kant"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:185
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:184
 msgid "_Upper border"
 msgstr "_Øvre kant"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:189
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:188
 msgid "Lo_wer border"
 msgstr "_Nedre kant"
 
-#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:197
+#: ../plug-ins/imagemap/imap_cmd_gimp_guides.c:196
 msgid "_Base URL:"
 msgstr "_Basis-URL:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:74
-#: ../plug-ins/imagemap/imap_cmd_guides.c:140
+#: ../plug-ins/imagemap/imap_cmd_guides.c:73
+#: ../plug-ins/imagemap/imap_cmd_guides.c:139
 msgid "Create Guides"
-msgstr "Lag hjelpelinjene"
+msgstr "Lag hjelperutene"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:113
-#, c-format
+#: ../plug-ins/imagemap/imap_cmd_guides.c:112
 msgid "Resulting Guide Bounds: %d,%d to %d,%d (%d areas)"
-msgstr "Rekkevidde for hjelperutene: %d,%d til %d,%d (%d område)"
+msgstr "Grensene for hjelperutene: %d,%d til %d,%d (%d område)"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:144
-msgid ""
-"Guides are pre-defined rectangles covering the image. You define them by "
-"their width, height, and spacing from each other. This allows you to rapidly "
-"create the most common image map type - image collection of \"thumbnails\", "
-"suitable for navigation bars."
-msgstr ""
-"Hjelpelinjene er førehandsdefinerte rektangel som dekker biletet. Du "
-"definerer dei ved å bestemma breidde, høgde og avstanden mellom linjene. "
-"Dette gjer at du raskt kan lage eit biletkart med miniatyrar. Kan t.d. "
-"brukast som menylinjer."
+#: ../plug-ins/imagemap/imap_cmd_guides.c:143
+msgid "Guides are pre-defined rectangles covering the image. You define them by their width, height, and spacing from each other. This allows you to rapidly create the most common image map type - image collection of \"thumbnails\", suitable for navigation bars."
+msgstr "Hjelperutene er ein tabell med rektangel som blir lagt over biletet for å definera klikkområda. Du definerer tabellen ved å bestemma breidde, høgde og avstanden mellom linjene. Dette gjer at du t.d. raskt og enkelt kan lage eit biletkart av «miniatyrar» som kan brukast til for eksempel menylinjer."
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:170
+#: ../plug-ins/imagemap/imap_cmd_guides.c:169
 msgid "_Left start at:"
 msgstr "Start _venstre ved:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:180
+#: ../plug-ins/imagemap/imap_cmd_guides.c:179
 msgid "_Top start at:"
 msgstr "Start _oppe ved:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:185
+#: ../plug-ins/imagemap/imap_cmd_guides.c:184
 msgid "_Horz. spacing:"
-msgstr "_Hor. avstand:"
+msgstr "_Kolonneavstand:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:191
+#: ../plug-ins/imagemap/imap_cmd_guides.c:190
 msgid "_No. across:"
 msgstr "_Kolonner:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:197
+#: ../plug-ins/imagemap/imap_cmd_guides.c:196
 msgid "_Vert. spacing:"
-msgstr "_Vert. avstand:"
+msgstr "_Linjeavstand:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:203
+#: ../plug-ins/imagemap/imap_cmd_guides.c:202
 msgid "No. _down:"
 msgstr "_Rader:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:212
+#: ../plug-ins/imagemap/imap_cmd_guides.c:211
 msgid "Base _URL:"
 msgstr "Basis-_URL:"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:237
+#: ../plug-ins/imagemap/imap_cmd_guides.c:236
 msgid "Resulting Guide Bounds: 0,0 to 0,0 (0 areas)"
-msgstr "Resulterande hjelperutegrenser: 0,0 til 0,0 (0 område)"
+msgstr "Grensene for hjelperutene: 0,0 til 0,0 (0 område)"
 
-#: ../plug-ins/imagemap/imap_cmd_guides.c:272
+#: ../plug-ins/imagemap/imap_cmd_guides.c:271
 msgid "Guides"
 msgstr "Hjelpelinjer"
 
-#: ../plug-ins/imagemap/imap_cmd_insert_point.c:62
-#: ../plug-ins/imagemap/imap_menu.c:178
+#: ../plug-ins/imagemap/imap_cmd_insert_point.c:61
+#: ../plug-ins/imagemap/imap_menu.c:177
 msgid "Insert Point"
 msgstr "Set inn punkt"
 
-#: ../plug-ins/imagemap/imap_cmd_move_down.c:53
-#: ../plug-ins/imagemap/imap_cmd_object_down.c:55
-#: ../plug-ins/imagemap/imap_menu.c:176
+#: ../plug-ins/imagemap/imap_cmd_move_down.c:52
+#: ../plug-ins/imagemap/imap_cmd_object_down.c:54
+#: ../plug-ins/imagemap/imap_menu.c:175
 msgid "Move Down"
 msgstr "Flytt ned"
 
-#: ../plug-ins/imagemap/imap_cmd_move_sash.c:68
+#: ../plug-ins/imagemap/imap_cmd_move_sash.c:67
 msgid "Move Sash"
 msgstr "Flytt ramma"
 
-#: ../plug-ins/imagemap/imap_cmd_move_selected.c:56
+#: ../plug-ins/imagemap/imap_cmd_move_selected.c:55
 msgid "Move Selected Objects"
 msgstr "Flytt det valde objektet"
 
-#: ../plug-ins/imagemap/imap_cmd_move_to_front.c:51
+#: ../plug-ins/imagemap/imap_cmd_move_to_front.c:50
 msgid "Move To Front"
 msgstr "Flytt til front"
 
-#: ../plug-ins/imagemap/imap_cmd_move_up.c:53
-#: ../plug-ins/imagemap/imap_cmd_object_up.c:55
-#: ../plug-ins/imagemap/imap_menu.c:175
+#: ../plug-ins/imagemap/imap_cmd_move_up.c:52
+#: ../plug-ins/imagemap/imap_cmd_object_up.c:54
+#: ../plug-ins/imagemap/imap_menu.c:174
 msgid "Move Up"
 msgstr "Flytt opp"
 
-#: ../plug-ins/imagemap/imap_cmd_paste.c:51
-#: ../plug-ins/imagemap/imap_menu.c:161
+#: ../plug-ins/imagemap/imap_cmd_paste.c:50
+#: ../plug-ins/imagemap/imap_menu.c:160
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ../plug-ins/imagemap/imap_cmd_select.c:53
+#: ../plug-ins/imagemap/imap_cmd_select.c:52
 msgid "Select"
 msgstr "Vel"
 
-#: ../plug-ins/imagemap/imap_cmd_select_all.c:51
-#: ../plug-ins/rcm/rcm_stock.c:41
-msgid "Select All"
-msgstr "Vel alle"
-
-#: ../plug-ins/imagemap/imap_cmd_select_next.c:51
+#: ../plug-ins/imagemap/imap_cmd_select_next.c:50
 msgid "Select Next"
 msgstr "Vel neste"
 
-#: ../plug-ins/imagemap/imap_cmd_select_prev.c:51
+#: ../plug-ins/imagemap/imap_cmd_select_prev.c:50
 msgid "Select Previous"
 msgstr "Vel førre"
 
-#: ../plug-ins/imagemap/imap_cmd_select_region.c:64
+#: ../plug-ins/imagemap/imap_cmd_select_region.c:63
 msgid "Select Region"
 msgstr "Vel område"
 
-#: ../plug-ins/imagemap/imap_cmd_send_to_back.c:51
+#: ../plug-ins/imagemap/imap_cmd_send_to_back.c:50
 msgid "Send To Back"
 msgstr "Flytt bakover"
 
-#: ../plug-ins/imagemap/imap_cmd_unselect.c:53
+#: ../plug-ins/imagemap/imap_cmd_unselect.c:52
 msgid "Unselect"
 msgstr "Avmarker"
 
-#: ../plug-ins/imagemap/imap_cmd_unselect_all.c:56
+#: ../plug-ins/imagemap/imap_cmd_unselect_all.c:55
 msgid "Unselect All"
 msgstr "Avmarker alle"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:196
+#: ../plug-ins/imagemap/imap_edit_area_info.c:195
 msgid "Link Type"
-msgstr "Linktypre"
+msgstr "Lenketype"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:205
+#: ../plug-ins/imagemap/imap_edit_area_info.c:204
 msgid "_Web Site"
 msgstr "_Nettside"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:211
+#: ../plug-ins/imagemap/imap_edit_area_info.c:210
 msgid "_Ftp Site"
-msgstr "_FTP-Side"
+msgstr "FT_P-Side"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:217
+#: ../plug-ins/imagemap/imap_edit_area_info.c:216
 msgid "_Gopher"
 msgstr "_Gopher"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:223
+#: ../plug-ins/imagemap/imap_edit_area_info.c:222
 msgid "Ot_her"
-msgstr "A_ndre"
+msgstr "_Andre"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:229
+#: ../plug-ins/imagemap/imap_edit_area_info.c:228
 msgid "F_ile"
-msgstr "F_il"
+msgstr "_Fil"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:235
+#: ../plug-ins/imagemap/imap_edit_area_info.c:234
 msgid "WAI_S"
-msgstr "WAI_S"
+msgstr "_WAIS"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:241
+#: ../plug-ins/imagemap/imap_edit_area_info.c:240
 msgid "Tel_net"
-msgstr "Tel_net"
+msgstr "_Telnet"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:247
+#: ../plug-ins/imagemap/imap_edit_area_info.c:246
 msgid "e-_mail"
-msgstr "e-_post"
+msgstr "_e-post"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:253
+#: ../plug-ins/imagemap/imap_edit_area_info.c:252
 msgid "_URL to activate when this area is clicked: (required)"
 msgstr "_URL som skal aktiverast ved klikk i dette området (nødvendig):"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:255
+#: ../plug-ins/imagemap/imap_edit_area_info.c:254
 msgid "Select HTML file"
 msgstr "Vel HTML-fil"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:264
+#: ../plug-ins/imagemap/imap_edit_area_info.c:263
 msgid "Relati_ve link"
-msgstr "Relati_v link"
+msgstr "_Relativ lenke"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:270
+#: ../plug-ins/imagemap/imap_edit_area_info.c:269
 msgid "_Target frame name/ID: (optional - used for FRAMES only)"
-msgstr "Namn på må_lramma/ID: (valfri - bare brukt i FRAMES)"
+msgstr "Namn på _målramma/ID: (valfri – blir brukt i FRAMES)"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:273
+#: ../plug-ins/imagemap/imap_edit_area_info.c:272
 msgid "ALT te_xt: (optional)"
 msgstr "ALT-Te_kst (valfri):"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:276
+#: ../plug-ins/imagemap/imap_edit_area_info.c:275
 msgid "_Link"
-msgstr "_Link"
+msgstr "_Lenke"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:310
+#: ../plug-ins/imagemap/imap_edit_area_info.c:309
 msgid "Dimensions"
 msgstr "Dimensjonar"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:314
+#: ../plug-ins/imagemap/imap_edit_area_info.c:313
 msgid "Pre_view"
 msgstr "_Førehandsvising"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:352
+#: ../plug-ins/imagemap/imap_edit_area_info.c:351
 msgid "_JavaScript"
 msgstr "_JavaScript"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:451
+#: ../plug-ins/imagemap/imap_edit_area_info.c:450
 msgid "Area Settings"
 msgstr "Områdeinnstillingar"
 
-#: ../plug-ins/imagemap/imap_edit_area_info.c:493
-#, c-format
+#: ../plug-ins/imagemap/imap_edit_area_info.c:492
 msgid "Area #%d Settings"
-msgstr "Område #%d-innstillingar"
+msgstr "Innstillingar for område nr  %d"
 
-#: ../plug-ins/imagemap/imap_file.c:48 ../plug-ins/imagemap/imap_menu.c:71
+#: ../plug-ins/imagemap/imap_file.c:47
+#: ../plug-ins/imagemap/imap_menu.c:70
 msgid "Error opening file"
 msgstr "Feil ved opning av fil"
 
-#: ../plug-ins/imagemap/imap_file.c:68
+#: ../plug-ins/imagemap/imap_file.c:67
 msgid "Load Image Map"
 msgstr "Hent biletkartet"
 
-#: ../plug-ins/imagemap/imap_file.c:123
+#: ../plug-ins/imagemap/imap_file.c:122
 msgid "Save Image Map"
 msgstr "Lagra biletkartet"
 
-#: ../plug-ins/imagemap/imap_grid.c:197
+#: ../plug-ins/imagemap/imap_grid.c:196
 msgid "Grid Settings"
 msgstr "Innstillingar for rutenettet"
 
-#: ../plug-ins/imagemap/imap_grid.c:201
+#: ../plug-ins/imagemap/imap_grid.c:200
 msgid "_Snap-to grid enabled"
-msgstr "_Fest til rutenettet"
+msgstr "Fest til _rutenettet"
 
-#: ../plug-ins/imagemap/imap_grid.c:207
+#: ../plug-ins/imagemap/imap_grid.c:206
 msgid "Grid Visibility and Type"
-msgstr "Type og utsjånad på rutenettet"
+msgstr "Type og utsjånad"
 
-#: ../plug-ins/imagemap/imap_grid.c:214
+#: ../plug-ins/imagemap/imap_grid.c:213
 msgid "_Hidden"
 msgstr "_Skjult"
 
-#: ../plug-ins/imagemap/imap_grid.c:222
+#: ../plug-ins/imagemap/imap_grid.c:221
 msgid "_Lines"
 msgstr "_Linjer"
 
-#: ../plug-ins/imagemap/imap_grid.c:231
+#: ../plug-ins/imagemap/imap_grid.c:230
 msgid "C_rosses"
-msgstr "K_rysspunkt"
+msgstr "_Krysspunkt"
 
-#: ../plug-ins/imagemap/imap_grid.c:239
+#: ../plug-ins/imagemap/imap_grid.c:238
 msgid "Grid Granularity"
-msgstr "Korning for rutenettet"
+msgstr "Rutestorleik"
 
-#: ../plug-ins/imagemap/imap_grid.c:246
+#: ../plug-ins/imagemap/imap_grid.c:245
 msgid "_Width"
 msgstr "_Breidde"
 
-#: ../plug-ins/imagemap/imap_grid.c:252
+#: ../plug-ins/imagemap/imap_grid.c:251
 msgid "_Height"
 msgstr "_Høgde"
 
-#: ../plug-ins/imagemap/imap_grid.c:266
+#: ../plug-ins/imagemap/imap_grid.c:265
 msgid "Grid Offset"
 msgstr "Forskyving"
 
-#: ../plug-ins/imagemap/imap_grid.c:273
+#: ../plug-ins/imagemap/imap_grid.c:272
 msgid "pixels from l_eft"
 msgstr "Pikslar frå _venstre"
 
-#: ../plug-ins/imagemap/imap_grid.c:278
+#: ../plug-ins/imagemap/imap_grid.c:277
 msgid "pixels from _top"
 msgstr "Pikslar _ovanfrå"
 
-#: ../plug-ins/imagemap/imap_grid.c:289
+#: ../plug-ins/imagemap/imap_grid.c:288
 msgid "_Preview"
 msgstr "_Førehandsvising"
 
-#: ../plug-ins/imagemap/imap_main.c:124
+#: ../plug-ins/imagemap/imap_main.c:121
 msgid "Create a clickable imagemap"
 msgstr "Lag eit klikkbart biletkart"
 
-#: ../plug-ins/imagemap/imap_main.c:129
+#: ../plug-ins/imagemap/imap_main.c:126
 msgid "_Image Map..."
-msgstr "_Biletkart..."
+msgstr "_Biletkart …"
 
-#: ../plug-ins/imagemap/imap_main.c:519
-#: ../plug-ins/imagemap/imap_settings.c:171
+#: ../plug-ins/imagemap/imap_main.c:516
+#: ../plug-ins/imagemap/imap_settings.c:170
 msgid ""
 msgstr ""
 
-#: ../plug-ins/imagemap/imap_main.c:662
+#: ../plug-ins/imagemap/imap_main.c:659
 msgid "Some data has been changed!"
-msgstr "Du har endra data i biletet!"
+msgstr "Noen data er endra!"
 
-#: ../plug-ins/imagemap/imap_main.c:665
+#: ../plug-ins/imagemap/imap_main.c:662
 msgid "Do you really want to discard your changes?"
-msgstr "Er det OK å forkasta desse endringane?"
+msgstr "Vil du verkeleg forkaste desse endringane?"
 
-#: ../plug-ins/imagemap/imap_main.c:875
-#, c-format
+#: ../plug-ins/imagemap/imap_main.c:876
 msgid "File \"%s\" saved."
 msgstr "Fila «%s» er lagra."
 
-#: ../plug-ins/imagemap/imap_main.c:879
+#: ../plug-ins/imagemap/imap_main.c:880
 msgid "Couldn't save file:"
 msgstr "Kunne ikjke lagra fila:"
 
-#: ../plug-ins/imagemap/imap_main.c:892
+#: ../plug-ins/imagemap/imap_main.c:893
 msgid "Image size has changed."
 msgstr "Biletstorleiken er endra."
 
-#: ../plug-ins/imagemap/imap_main.c:893
+#: ../plug-ins/imagemap/imap_main.c:894
 msgid "Resize area's?"
-msgstr "Endra arealet?"
+msgstr "Endra storleiken på areala?"
 
-#: ../plug-ins/imagemap/imap_main.c:927
+#: ../plug-ins/imagemap/imap_main.c:928
 msgid "Couldn't read file:"
-msgstr "Kunne ikkje lesa fila:"
+msgstr "Kunne ikkje lese fila:"
 
-#: ../plug-ins/imagemap/imap_main.c:974
-#, c-format
+#: ../plug-ins/imagemap/imap_main.c:975
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../plug-ins/imagemap/imap_menu.c:110
-#, c-format
+#: ../plug-ins/imagemap/imap_menu.c:109
 msgid "_Undo %s"
 msgstr "_Angra %s"
 
-#: ../plug-ins/imagemap/imap_menu.c:123
-#, c-format
+#: ../plug-ins/imagemap/imap_menu.c:122
 msgid "_Redo %s"
 msgstr "_Gjenta %s"
 
-#: ../plug-ins/imagemap/imap_menu.c:146
+#: ../plug-ins/imagemap/imap_menu.c:145
 msgid "_File"
 msgstr "_Fil"
 
-#: ../plug-ins/imagemap/imap_menu.c:147
+#: ../plug-ins/imagemap/imap_menu.c:146
 msgid "_Open..."
-msgstr "_Opna..."
+msgstr "_Opna …"
 
-#: ../plug-ins/imagemap/imap_menu.c:147
+#: ../plug-ins/imagemap/imap_menu.c:146
 msgid "Open"
 msgstr "Opna"
 
-#: ../plug-ins/imagemap/imap_menu.c:149
+#: ../plug-ins/imagemap/imap_menu.c:148
 msgid "_Save..."
-msgstr "Lagra"
+msgstr "Lagra …"
 
-#: ../plug-ins/imagemap/imap_menu.c:149
+#: ../plug-ins/imagemap/imap_menu.c:148
 msgid "Save"
 msgstr "Lagra"
 
-#: ../plug-ins/imagemap/imap_menu.c:151
+#: ../plug-ins/imagemap/imap_menu.c:150
 msgid "Save _As..."
-msgstr "L_agra som..."
+msgstr "L_agra som …"
 
-#: ../plug-ins/imagemap/imap_menu.c:156
+#: ../plug-ins/imagemap/imap_menu.c:155
 msgid "_Edit"
 msgstr "R_ediger"
 
-#: ../plug-ins/imagemap/imap_menu.c:157
+#: ../plug-ins/imagemap/imap_menu.c:156
 msgid "Undo"
 msgstr "Angre"
 
-#: ../plug-ins/imagemap/imap_menu.c:158
+#: ../plug-ins/imagemap/imap_menu.c:157
 msgid "Redo"
 msgstr "Gjenopprett"
 
-#: ../plug-ins/imagemap/imap_menu.c:164
+#: ../plug-ins/imagemap/imap_menu.c:163
 msgid "D_eselect All"
-msgstr "Alle JNG"
+msgstr "Vel _ingen"
+
+#: ../plug-ins/imagemap/imap_menu.c:165
+msgid "Edit Area _Info..."
+msgstr "Rediger områdeinformasjon …"
 
 #: ../plug-ins/imagemap/imap_menu.c:166
-msgid "Edit Area _Info..."
-msgstr "Rediger områdeinformasjon..."
+msgid "Edit selected area info"
+msgstr "Rediger info for vald område"
 
 #: ../plug-ins/imagemap/imap_menu.c:167
-msgid "Edit selected area info"
-msgstr "Rediger områdeinfo"
-
-#: ../plug-ins/imagemap/imap_menu.c:168
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: ../plug-ins/imagemap/imap_menu.c:170
+#: ../plug-ins/imagemap/imap_menu.c:169
 msgid "Move to Front"
-msgstr "Flytt til front"
+msgstr "Flytt opp"
 
-#: ../plug-ins/imagemap/imap_menu.c:172
+#: ../plug-ins/imagemap/imap_menu.c:171
 msgid "Send to Back"
-msgstr "Flytt bakover"
+msgstr "Flytt ned"
 
-#: ../plug-ins/imagemap/imap_menu.c:174
+#: ../plug-ins/imagemap/imap_menu.c:173
 msgid "Delete Area"
 msgstr "Slett området"
 
-#: ../plug-ins/imagemap/imap_menu.c:181
+#: ../plug-ins/imagemap/imap_menu.c:180
 msgid "_View"
 msgstr "V_is"
 
-#: ../plug-ins/imagemap/imap_menu.c:182
+#: ../plug-ins/imagemap/imap_menu.c:181
 msgid "Source..."
-msgstr "Kjelde..."
+msgstr "Resultatkode …"
 
-#: ../plug-ins/imagemap/imap_menu.c:183
+#: ../plug-ins/imagemap/imap_menu.c:182
 msgid "Zoom in"
 msgstr "Forstørr"
 
-#: ../plug-ins/imagemap/imap_menu.c:184
+#: ../plug-ins/imagemap/imap_menu.c:183
 msgid "Zoom out"
 msgstr "Forminsk"
 
-#: ../plug-ins/imagemap/imap_menu.c:185
+#: ../plug-ins/imagemap/imap_menu.c:184
 msgid "_Zoom To"
 msgstr "_Forstørr til"
 
-#: ../plug-ins/imagemap/imap_menu.c:187
+#: ../plug-ins/imagemap/imap_menu.c:186
 msgid "_Mapping"
-msgstr "A_vbilding"
+msgstr "_Kartografi"
+
+#: ../plug-ins/imagemap/imap_menu.c:187
+msgid "Edit Map Info..."
+msgstr "Rediger biletkart-info …"
 
 #: ../plug-ins/imagemap/imap_menu.c:188
-msgid "Edit Map Info..."
-msgstr "Rediger map-info..."
-
-#: ../plug-ins/imagemap/imap_menu.c:189
 msgid "Edit Map Info"
-msgstr "Rediger map-info..."
+msgstr "Rediger informasjonen i biletkartet"
 
-#: ../plug-ins/imagemap/imap_menu.c:191
+#: ../plug-ins/imagemap/imap_menu.c:190
 msgid "_Tools"
 msgstr "Verk_tøy"
 
-#: ../plug-ins/imagemap/imap_menu.c:192
+#: ../plug-ins/imagemap/imap_menu.c:191
 msgid "Grid Settings..."
-msgstr "Instillinger for rutenett..."
+msgstr "Innstillingar for rutenettet …"
 
-#: ../plug-ins/imagemap/imap_menu.c:194
+#: ../plug-ins/imagemap/imap_menu.c:193
 msgid "Use GIMP Guides..."
-msgstr "Bruk hjelpelinjer"
+msgstr "Bruk hjelpelinjer …"
 
-#: ../plug-ins/imagemap/imap_menu.c:196
+#: ../plug-ins/imagemap/imap_menu.c:195
 msgid "Create Guides..."
-msgstr "Lag hjelpelinjene"
+msgstr "Lag hjelperuter …"
 
-#: ../plug-ins/imagemap/imap_menu.c:199
+#: ../plug-ins/imagemap/imap_menu.c:198
 msgid "_Help"
 msgstr "_Hjelp"
 
-#: ../plug-ins/imagemap/imap_menu.c:200
+#: ../plug-ins/imagemap/imap_menu.c:199
 msgid "_Contents"
 msgstr "_Innhald"
 
-#: ../plug-ins/imagemap/imap_menu.c:208
+#: ../plug-ins/imagemap/imap_menu.c:202
+msgid "_Zoom"
+msgstr "_Zoom"
+
+#: ../plug-ins/imagemap/imap_menu.c:207
 msgid "Area List"
 msgstr "Områdeliste"
 
-#: ../plug-ins/imagemap/imap_menu.c:218
+#: ../plug-ins/imagemap/imap_menu.c:217
 msgid "Arrow"
 msgstr "Pil"
 
-#: ../plug-ins/imagemap/imap_menu.c:219
+#: ../plug-ins/imagemap/imap_menu.c:218
 msgid "Select existing area"
-msgstr "Velg eksisterende område"
+msgstr "Vel eksisterande område"
 
-#: ../plug-ins/imagemap/imap_menu.c:221
+#: ../plug-ins/imagemap/imap_menu.c:220
 msgid "Define Rectangle area"
 msgstr "Definer rektangulært område"
 
-#: ../plug-ins/imagemap/imap_menu.c:223
+#: ../plug-ins/imagemap/imap_menu.c:222
 msgid "Define Circle/Oval area"
-msgstr "Definer sirkelforma/ovalt område"
+msgstr "Definer sirkelforma område"
 
-#: ../plug-ins/imagemap/imap_menu.c:225
+#: ../plug-ins/imagemap/imap_menu.c:224
 msgid "Define Polygon area"
-msgstr "Definer polygonområde"
+msgstr "Definer mangekanta område"
 
-#: ../plug-ins/imagemap/imap_polygon.c:72
+#: ../plug-ins/imagemap/imap_polygon.c:71
 msgid "_Polygon"
 msgstr "_Polygon"
 
-#: ../plug-ins/imagemap/imap_polygon.c:474
+#: ../plug-ins/imagemap/imap_polygon.c:473
 msgid "x (pixels)"
 msgstr "x (Pikslar)"
 
-#: ../plug-ins/imagemap/imap_polygon.c:483
+#: ../plug-ins/imagemap/imap_polygon.c:482
 msgid "y (pixels)"
 msgstr "y (Pikslar)"
 
-#: ../plug-ins/imagemap/imap_polygon.c:521
+#: ../plug-ins/imagemap/imap_polygon.c:520
 msgid "_Insert"
 msgstr "Sett _inn"
 
-#: ../plug-ins/imagemap/imap_polygon.c:527
+#: ../plug-ins/imagemap/imap_polygon.c:526
 msgid "A_ppend"
 msgstr "Legg _til"
 
-#: ../plug-ins/imagemap/imap_polygon.c:533
+#: ../plug-ins/imagemap/imap_polygon.c:532
 msgid "_Remove"
 msgstr "_Fjern"
 
-#: ../plug-ins/imagemap/imap_preferences.c:236
+#: ../plug-ins/imagemap/imap_preferences.c:235
 msgid "Couldn't save resource file:"
 msgstr "Kunne ikkje lagra resursfila:"
 
-#: ../plug-ins/imagemap/imap_preferences.c:350
+#: ../plug-ins/imagemap/imap_preferences.c:349
 msgid "General"
 msgstr "Generell"
 
-#: ../plug-ins/imagemap/imap_preferences.c:354
+#: ../plug-ins/imagemap/imap_preferences.c:353
 msgid "Default Map Type"
 msgstr "Standard mappetype"
 
-#: ../plug-ins/imagemap/imap_preferences.c:373
+#: ../plug-ins/imagemap/imap_preferences.c:372
 msgid "_Prompt for area info"
-msgstr "_Bed om info om området"
+msgstr "_Bed om områdeinfo"
 
-#: ../plug-ins/imagemap/imap_preferences.c:375
+#: ../plug-ins/imagemap/imap_preferences.c:374
 msgid "_Require default URL"
 msgstr "_Krev standard-URL"
 
-#: ../plug-ins/imagemap/imap_preferences.c:377
+#: ../plug-ins/imagemap/imap_preferences.c:376
 msgid "Show area _handles"
 msgstr "Vis område_handtaka"
 
-#: ../plug-ins/imagemap/imap_preferences.c:379
+#: ../plug-ins/imagemap/imap_preferences.c:378
 msgid "_Keep NCSA circles true"
 msgstr "_Behald NCSA-sirklar"
 
-#: ../plug-ins/imagemap/imap_preferences.c:381
+#: ../plug-ins/imagemap/imap_preferences.c:380
 msgid "Show area URL _tip"
 msgstr "Vis URL-_tips for området"
 
-#: ../plug-ins/imagemap/imap_preferences.c:384
+#: ../plug-ins/imagemap/imap_preferences.c:383
 msgid "_Use double-sized grab handles"
 msgstr "Bruk store _handtak"
 
-#: ../plug-ins/imagemap/imap_preferences.c:391
+#: ../plug-ins/imagemap/imap_preferences.c:390
 msgid "Menu"
 msgstr "Meny"
 
-#: ../plug-ins/imagemap/imap_preferences.c:395
+#: ../plug-ins/imagemap/imap_preferences.c:394
 msgid "Number of _undo levels (1 - 99):"
 msgstr "Talet på _angringar (1 - 99):"
 
-#: ../plug-ins/imagemap/imap_preferences.c:400
+#: ../plug-ins/imagemap/imap_preferences.c:399
 msgid "Number of M_RU entries (1 - 16):"
 msgstr "Talet på M_RU-innskrivingar (1 - 16):"
 
-#: ../plug-ins/imagemap/imap_preferences.c:409
+#: ../plug-ins/imagemap/imap_preferences.c:408
 msgid "Select Color"
 msgstr "Vel farge"
 
-#: ../plug-ins/imagemap/imap_preferences.c:424
+#: ../plug-ins/imagemap/imap_preferences.c:423
 msgid "Normal:"
 msgstr "Normal:"
 
-#: ../plug-ins/imagemap/imap_preferences.c:428
+#: ../plug-ins/imagemap/imap_preferences.c:427
 msgid "Selected:"
 msgstr "Markert:"
 
-#: ../plug-ins/imagemap/imap_preferences.c:437
+#: ../plug-ins/imagemap/imap_preferences.c:436
 msgid "Co_ntiguous Region"
 msgstr "Tilstøytande _område"
 
-#: ../plug-ins/imagemap/imap_preferences.c:443
+#: ../plug-ins/imagemap/imap_preferences.c:442
 msgid "_Automatically convert"
 msgstr "_Automatisk konvertering"
 
-#: ../plug-ins/imagemap/imap_preferences.c:454
+#: ../plug-ins/imagemap/imap_preferences.c:453
 msgid "General Preferences"
 msgstr "Generelle innstillingar"
 
-#: ../plug-ins/imagemap/imap_rectangle.c:69
+#: ../plug-ins/imagemap/imap_rectangle.c:68
 msgid "_Rectangle"
 msgstr "_Rektangel"
 
-#: ../plug-ins/imagemap/imap_rectangle.c:389
+#: ../plug-ins/imagemap/imap_rectangle.c:388
 msgid "Upper left _x:"
 msgstr "Øvre, venstre _x:"
 
-#: ../plug-ins/imagemap/imap_rectangle.c:396
+#: ../plug-ins/imagemap/imap_rectangle.c:395
 msgid "Upper left _y:"
 msgstr "Øvre, venstre _y:"
 
-#: ../plug-ins/imagemap/imap_selection.c:377
+#: ../plug-ins/imagemap/imap_selection.c:376
 msgid "#"
 msgstr "Nr. "
 
-#: ../plug-ins/imagemap/imap_selection.c:388
+#: ../plug-ins/imagemap/imap_selection.c:387
 msgid "URL"
 msgstr "URL"
 
-#: ../plug-ins/imagemap/imap_selection.c:406
+#: ../plug-ins/imagemap/imap_selection.c:405
 msgid "ALT Text"
 msgstr "ALT-Tekst"
 
-#: ../plug-ins/imagemap/imap_selection.c:416
+#: ../plug-ins/imagemap/imap_selection.c:415
 msgid "Target"
 msgstr "Mål"
 
-#: ../plug-ins/imagemap/imap_settings.c:90
+#: ../plug-ins/imagemap/imap_settings.c:89
 msgid "Settings for this Mapfile"
-msgstr "Innstillingar for denne map-fila"
+msgstr "Innstillingar for biletkartet"
 
-#: ../plug-ins/imagemap/imap_settings.c:94
+#: ../plug-ins/imagemap/imap_settings.c:93
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: ../plug-ins/imagemap/imap_settings.c:97
+#: ../plug-ins/imagemap/imap_settings.c:96
 msgid "Image name:"
 msgstr "Biletnamn:"
 
-#: ../plug-ins/imagemap/imap_settings.c:98
+#: ../plug-ins/imagemap/imap_settings.c:97
 msgid "Select Image File"
 msgstr "Vel biletfil"
 
-#: ../plug-ins/imagemap/imap_settings.c:102
+#: ../plug-ins/imagemap/imap_settings.c:101
 msgid "_Title:"
 msgstr "_Tittel:"
 
-#: ../plug-ins/imagemap/imap_settings.c:104
+#: ../plug-ins/imagemap/imap_settings.c:103
 msgid "Aut_hor:"
-msgstr "_Forfattar:"
+msgstr "_Utviklar:"
 
-#: ../plug-ins/imagemap/imap_settings.c:106
+#: ../plug-ins/imagemap/imap_settings.c:105
 msgid "Default _URL:"
 msgstr "Standard-_URL:"
 
-#: ../plug-ins/imagemap/imap_settings.c:108
+#: ../plug-ins/imagemap/imap_settings.c:107
 msgid "_Description:"
 msgstr "_Beskriving:"
 
-#: ../plug-ins/imagemap/imap_settings.c:130
+#: ../plug-ins/imagemap/imap_settings.c:129
 msgid "Map File Format"
-msgstr "Format for kartfila"
+msgstr "Format for biletkartfila"
 
-#: ../plug-ins/imagemap/imap_source.c:63
+#: ../plug-ins/imagemap/imap_source.c:66
 msgid "View Source"
 msgstr "Vis kjelde"
 
-#: ../plug-ins/jpeg/jpeg-exif.c:288
-msgid "Rotate Image?"
-msgstr "Rotere biletet?"
+#: ../plug-ins/lighting/lighting-apply.c:105
+#: ../plug-ins/lighting/lighting-ui.c:1018
+msgid "Lighting Effects"
+msgstr "Lyseffektar"
 
-#: ../plug-ins/jpeg/jpeg-exif.c:291
-msgid "_Keep Orientation"
-msgstr "_Behald orienteringa"
+#: ../plug-ins/lighting/lighting-main.c:191
+msgid "Apply various lighting effects to an image"
+msgstr "Bruk fleire lyseffektar i biletet"
 
-#: ../plug-ins/jpeg/jpeg-exif.c:347
-msgid "According to the EXIF data, this image is rotated."
-msgstr "I følgje EXIF-data er biletet rotert."
+#: ../plug-ins/lighting/lighting-main.c:196
+msgid "_Lighting Effects..."
+msgstr "L_yseffektar …"
 
-#: ../plug-ins/jpeg/jpeg-exif.c:362
-msgid "Would you like GIMP to rotate it into the standard orientation?"
-msgstr "Skal GIMP rotere biletet i standardretningen?"
+#. General options
+#: ../plug-ins/lighting/lighting-ui.c:294
+#: ../plug-ins/map-object/map-object-ui.c:472
+msgid "General Options"
+msgstr "Generelle innstillingar"
 
-#: ../plug-ins/jpeg/jpeg-load.c:241
-msgid "JPEG preview"
-msgstr "JPEG førehandsvising"
+#: ../plug-ins/lighting/lighting-ui.c:302
+msgid "T_ransparent background"
+msgstr "_Gjennomsiktig bakgrunn"
 
-#: ../plug-ins/jpeg/jpeg-load.c:626 ../plug-ins/psd/psd-thumb-load.c:83
-#: ../plug-ins/winicon/icoload.c:722
-#, c-format
-msgid "Opening thumbnail for '%s'"
-msgstr "Opnar miniatyr for «%s»..."
+#: ../plug-ins/lighting/lighting-ui.c:312
+msgid "Make destination image transparent where bump height is zero"
+msgstr "Gjer målbiletet gennemsigtig når humphøgda er null"
 
-#: ../plug-ins/jpeg/jpeg-save.c:198
-#, c-format
-msgid "File size: %02.01f kB"
-msgstr "Filstorleik: %02.01f kB"
+#: ../plug-ins/lighting/lighting-ui.c:315
+msgid "Cre_ate new image"
+msgstr "Lag n_ytt bilete"
 
-#: ../plug-ins/jpeg/jpeg-save.c:673
-msgid "Calculating file size..."
-msgstr "Reknar ut filstorleik"
+#: ../plug-ins/lighting/lighting-ui.c:325
+#: ../plug-ins/map-object/map-object-ui.c:541
+msgid "Create a new image when applying filter"
+msgstr "Lager eit nytt bilete og bruker filteret i dette. Originalbiletet er uforandra"
 
-#: ../plug-ins/jpeg/jpeg-save.c:764 ../plug-ins/jpeg/jpeg-save.c:868
-msgid "File size: unknown"
-msgstr "Filstorleik: ukjent"
+#: ../plug-ins/lighting/lighting-ui.c:327
+msgid "High _quality preview"
+msgstr "Førehandsvising i høg _kvalitet"
 
-#: ../plug-ins/jpeg/jpeg-save.c:819
-msgid "Save as JPEG"
-msgstr "Lagre som JPEG"
+#: ../plug-ins/lighting/lighting-ui.c:337
+msgid "Enable/disable high quality preview"
+msgstr "Slå førehandsvising i høg _kvalitet av/på"
 
-#: ../plug-ins/jpeg/jpeg-save.c:854
-msgid "_Quality:"
-msgstr "_Kvalitet:"
+#: ../plug-ins/lighting/lighting-ui.c:344
+msgid "Distance:"
+msgstr "Avstand:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:858
-msgid "JPEG quality parameter"
-msgstr "JPEG-kvalitetsinnstillingane"
+#: ../plug-ins/lighting/lighting-ui.c:377
+#: ../plug-ins/map-object/map-object-ui.c:619
+msgid "Light Settings"
+msgstr "Lyssettingar"
 
-#: ../plug-ins/jpeg/jpeg-save.c:877
-msgid "Enable preview to obtain the file size."
-msgstr "Sett førehandsvisinga til å oppdaga fillengda."
+#: ../plug-ins/lighting/lighting-ui.c:390
+msgid "Light 1"
+msgstr "Lys 1"
 
-#: ../plug-ins/jpeg/jpeg-save.c:880
-msgid "Show _preview in image window"
-msgstr "_Vis førehandsvisinga i biletvindauget"
+#: ../plug-ins/lighting/lighting-ui.c:391
+msgid "Light 2"
+msgstr "Lys 2"
 
-#: ../plug-ins/jpeg/jpeg-save.c:921
-msgid "_Smoothing:"
-msgstr "_Utjamning:"
+#: ../plug-ins/lighting/lighting-ui.c:392
+msgid "Light 3"
+msgstr "Lys 3"
 
-#: ../plug-ins/jpeg/jpeg-save.c:934
-msgid "Frequency (rows):"
-msgstr "Frekvens (rader):"
+#: ../plug-ins/lighting/lighting-ui.c:393
+msgid "Light 4"
+msgstr "Lys 4"
 
-#: ../plug-ins/jpeg/jpeg-save.c:950
-msgid "Use restart markers"
-msgstr "Bruk omstartmarkeringar"
+#: ../plug-ins/lighting/lighting-ui.c:394
+msgid "Light 5"
+msgstr "Lys 5"
 
-#: ../plug-ins/jpeg/jpeg-save.c:966 ../plug-ins/xjt/xjt.c:877
-msgid "Optimize"
-msgstr "Optimaliser"
+#: ../plug-ins/lighting/lighting-ui.c:395
+msgid "Light 6"
+msgstr "Lys 6"
 
-#: ../plug-ins/jpeg/jpeg-save.c:979
-msgid "Progressive"
-msgstr "Progressiv"
+#: ../plug-ins/lighting/lighting-ui.c:409
+msgid "Color:"
+msgstr "Farge:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:994
-msgid "Save EXIF data"
-msgstr "Lagra EXIF-data"
+#: ../plug-ins/lighting/lighting-ui.c:416
+msgid "Directional"
+msgstr "Retta"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1011
-msgid "Save thumbnail"
-msgstr "Lagra miniatyr"
+#: ../plug-ins/lighting/lighting-ui.c:417
+msgid "Point"
+msgstr "Punkt"
 
-#. XMP metadata
-#: ../plug-ins/jpeg/jpeg-save.c:1027
-msgid "Save XMP data"
-msgstr "Lagra XMP-data"
+#: ../plug-ins/lighting/lighting-ui.c:431
+#: ../plug-ins/map-object/map-object-ui.c:642
+msgid "Type of light source to apply"
+msgstr "Lyskjeldetype som skal brukast"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1042
-msgid "Use quality settings from original image"
-msgstr "Bruk kvalitetsinnstillingane frå originalbiletet"
+#: ../plug-ins/lighting/lighting-ui.c:433
+#: ../plug-ins/map-object/map-object-ui.c:644
+msgid "Select lightsource color"
+msgstr "Vel lysfarge for lyskjelda"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1048
-msgid ""
-"If the original image was loaded from a JPEG file using non-standard quality "
-"settings (quantization tables), enable this option to get almost the same "
-"quality and file size."
-msgstr ""
-"Dersom originalbiletet blei henta frå ei JPEG-fil med ustandard "
-"kvalitetsinnstilling (kvantiseringstabellar), bruk denne innstillinga for å "
-"få tilnærma same kvalitet og fillengded."
+#: ../plug-ins/lighting/lighting-ui.c:447
+#: ../plug-ins/map-object/map-object-ui.c:657
+msgid "Set light source color"
+msgstr "Sett farge for lyskjelde"
 
-#. Subsampling
-#: ../plug-ins/jpeg/jpeg-save.c:1072
-msgid "Subsampling:"
-msgstr "Mellomsteg:"
+#: ../plug-ins/lighting/lighting-ui.c:455
+msgid "_Intensity:"
+msgstr "_Intensitet:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1079
-msgid "1x1,1x1,1x1 (best quality)"
-msgstr "1x1,1x1,1x1 (best kvalitet)"
+#: ../plug-ins/lighting/lighting-ui.c:463
+msgid "Light intensity"
+msgstr "Lysintensitet"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1080
-msgid "2x1,1x1,1x1 (4:2:2)"
-msgstr "2x1,1x1,1x1 (4:2:2)"
+#: ../plug-ins/lighting/lighting-ui.c:466
+#: ../plug-ins/map-object/map-object-ui.c:659
+#: ../plug-ins/map-object/map-object-ui.c:986
+#: ../plug-ins/print/print-page-layout.c:355
+msgid "Position"
+msgstr "Posisjon"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1081
-msgid "1x2,1x1,1x1"
-msgstr "1x2,1x1,1x1"
+#: ../plug-ins/lighting/lighting-ui.c:484
+#: ../plug-ins/map-object/map-object-ui.c:683
+msgid "Light source X position in XYZ space"
+msgstr "X-koordinata for lyskjelda i XYZ-rommet"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1082
-msgid "2x2,1x1,1x1 (smallest file)"
-msgstr "2x2,1x1,1x1 (minst fil)"
+#: ../plug-ins/lighting/lighting-ui.c:499
+#: ../plug-ins/map-object/map-object-ui.c:697
+msgid "Light source Y position in XYZ space"
+msgstr "Y-koordinata for lyskjelda i XYZ-rommet"
 
-#. DCT method
-#: ../plug-ins/jpeg/jpeg-save.c:1106
-msgid "DCT method:"
-msgstr "DCT-metode:"
+#: ../plug-ins/lighting/lighting-ui.c:506
+msgid "_Z:"
+msgstr "_Z:"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1112
-msgid "Fast Integer"
-msgstr "Raske heiltal"
+#: ../plug-ins/lighting/lighting-ui.c:514
+#: ../plug-ins/map-object/map-object-ui.c:711
+msgid "Light source Z position in XYZ space"
+msgstr "Z-koordinata for lyskjelda i XYZ-rommet"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1113
-msgid "Integer"
-msgstr "Heiltal"
+#: ../plug-ins/lighting/lighting-ui.c:534
+#: ../plug-ins/map-object/map-object-ui.c:737
+msgid "Light source X direction in XYZ space"
+msgstr "X-retningskomponenten for lyskjelda i XYZ-rommet"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1114
-msgid "Floating-Point"
-msgstr "Desimaltal"
+#: ../plug-ins/lighting/lighting-ui.c:548
+#: ../plug-ins/map-object/map-object-ui.c:750
+msgid "Light source Y direction in XYZ space"
+msgstr "Y-retningskomponenten for lyskjelda i XYZ-rommet"
 
-#: ../plug-ins/jpeg/jpeg-save.c:1128
-msgid "Comment"
-msgstr "Kommentar"
+#: ../plug-ins/lighting/lighting-ui.c:554
+#: ../plug-ins/map-object/map-object-ui.c:703
+#: ../plug-ins/map-object/map-object-ui.c:755
+#: ../plug-ins/map-object/map-object-ui.c:1023
+#: ../plug-ins/map-object/map-object-ui.c:1068
+#: ../plug-ins/map-object/map-object-ui.c:1167
+msgid "Z:"
+msgstr "Z:"
 
-#: ../plug-ins/jpeg/jpeg.c:137 ../plug-ins/jpeg/jpeg.c:175
-msgid "JPEG image"
-msgstr "JPEG-bilete"
+#: ../plug-ins/lighting/lighting-ui.c:562
+#: ../plug-ins/map-object/map-object-ui.c:763
+msgid "Light source Z direction in XYZ space"
+msgstr "Z-retningskomponenten for lyskjelda i XYZ-rommet"
 
-#: ../plug-ins/jpeg/jpeg.c:301
-msgid "Export Preview"
-msgstr "Export førehandsvising"
+#: ../plug-ins/lighting/lighting-ui.c:565
+msgid "I_solate"
+msgstr "I_soler"
 
-#: ../plug-ins/maze/algorithms.c:289
+#: ../plug-ins/lighting/lighting-ui.c:574
+msgid "Lighting preset:"
+msgstr "Førevalde lyssettingar:"
+
+#: ../plug-ins/lighting/lighting-ui.c:620
+msgid "Material Properties"
+msgstr "Overflatelinnstillingar"
+
+#: ../plug-ins/lighting/lighting-ui.c:638
+msgid "_Glowing:"
+msgstr "_Glød:"
+
+#: ../plug-ins/lighting/lighting-ui.c:657
+#: ../plug-ins/map-object/map-object-ui.c:824
+msgid "Amount of original color to show where no direct light falls"
+msgstr "Kor mykje av originalfargen som skal synast der det ikkje er direktelys"
+
+#: ../plug-ins/lighting/lighting-ui.c:671
+msgid "_Bright:"
+msgstr "_Lysmengd:"
+
+#: ../plug-ins/lighting/lighting-ui.c:690
+#: ../plug-ins/map-object/map-object-ui.c:853
+msgid "Intensity of original color when lit by a light source"
+msgstr "Intensiteten på originalfargen når han blir opplyst av ei lyskjelde"
+
+#: ../plug-ins/lighting/lighting-ui.c:704
+msgid "_Shiny:"
+msgstr "_Glans:"
+
+#: ../plug-ins/lighting/lighting-ui.c:723
+#: ../plug-ins/map-object/map-object-ui.c:925
+msgid "Controls how intense the highlights will be"
+msgstr "Kontrollerar intensiteten til høglysa"
+
+#: ../plug-ins/lighting/lighting-ui.c:736
+msgid "_Polished:"
+msgstr "_Polert:"
+
+#: ../plug-ins/lighting/lighting-ui.c:755
+#: ../plug-ins/map-object/map-object-ui.c:954
+msgid "Higher values makes the highlights more focused"
+msgstr "Dess høgare verdi dess høgare glans i høglysa"
+
+#. Metallic
+#: ../plug-ins/lighting/lighting-ui.c:765
+msgid "_Metallic"
+msgstr "_Metallisk"
+
+#: ../plug-ins/lighting/lighting-ui.c:802
+msgid "E_nable bump mapping"
+msgstr "_aktiver avbildinga"
+
+#: ../plug-ins/lighting/lighting-ui.c:816
+msgid "Enable/disable bump-mapping (image depth)"
+msgstr "Slå biletpunktkopling av/på (biletdjupn)"
+
+#: ../plug-ins/lighting/lighting-ui.c:838
+msgid "Bumpm_ap image:"
+msgstr "Mønsterbiletet:"
+
+#: ../plug-ins/lighting/lighting-ui.c:842
+msgid "Logarithmic"
+msgstr "Logarithmisk"
+
+#: ../plug-ins/lighting/lighting-ui.c:854
+msgid "Cu_rve:"
+msgstr "Ku_rve:"
+
+#: ../plug-ins/lighting/lighting-ui.c:859
+msgid "Ma_ximum height:"
+msgstr "Ma_ksimal høgde:"
+
+#: ../plug-ins/lighting/lighting-ui.c:869
+msgid "Maximum height for bumps"
+msgstr "Maksimal høgde for humpane"
+
+#: ../plug-ins/lighting/lighting-ui.c:893
+msgid "E_nable environment mapping"
+msgstr "_Aktiver kopling til omgivnadane"
+
+#: ../plug-ins/lighting/lighting-ui.c:907
+msgid "Enable/disable environment-mapping (reflection)"
+msgstr "Slå kopling til omgivnadane av/på (refleksjon)"
+
+#: ../plug-ins/lighting/lighting-ui.c:924
+msgid "En_vironment image:"
+msgstr "_Omgivnadsbilete:"
+
+#: ../plug-ins/lighting/lighting-ui.c:927
+msgid "Environment image to use"
+msgstr "Omgivnadsbilete som skal brukast"
+
+#: ../plug-ins/lighting/lighting-ui.c:949
+msgid "Op_tions"
+msgstr "Inn_stillingar"
+
+#: ../plug-ins/lighting/lighting-ui.c:953
+#: ../plug-ins/map-object/map-object-ui.c:1291
+msgid "_Light"
+msgstr "_Lys"
+
+#: ../plug-ins/lighting/lighting-ui.c:957
+#: ../plug-ins/map-object/map-object-ui.c:1295
+msgid "_Material"
+msgstr "_Materiale"
+
+#: ../plug-ins/lighting/lighting-ui.c:961
+msgid "_Bump Map"
+msgstr "_Avbilding"
+
+#: ../plug-ins/lighting/lighting-ui.c:965
+msgid "_Environment Map"
+msgstr "_Omgivnadskopling"
+
+#: ../plug-ins/lighting/lighting-ui.c:1081
+#: ../plug-ins/map-object/map-object-ui.c:1397
+msgid "Recompute preview image"
+msgstr "Oppdater førehandsvisinga"
+
+#: ../plug-ins/lighting/lighting-ui.c:1083
+msgid "I_nteractive"
+msgstr "I_nteraktiv"
+
+#: ../plug-ins/lighting/lighting-ui.c:1097
+msgid "Enable/disable real time preview of changes"
+msgstr "Sanntidsoppdatering av førehandsvising av/på"
+
+#: ../plug-ins/lighting/lighting-ui.c:1136
+msgid "Save Lighting Preset"
+msgstr "Lagra førehandsinnstillingane for lys"
+
+#: ../plug-ins/lighting/lighting-ui.c:1280
+msgid "Load Lighting Preset"
+msgstr "Opna førehandsinnstillingane for lys"
+
+#: ../plug-ins/map-object/map-object-apply.c:276
+msgid "Map to plane"
+msgstr "Avbild på plan"
+
+#: ../plug-ins/map-object/map-object-apply.c:279
+msgid "Map to sphere"
+msgstr "Avbild på kule"
+
+#: ../plug-ins/map-object/map-object-apply.c:282
+msgid "Map to box"
+msgstr "Avbild på boks"
+
+#: ../plug-ins/map-object/map-object-apply.c:285
+msgid "Map to cylinder"
+msgstr "Avbildt på sylinder"
+
+#: ../plug-ins/map-object/map-object-main.c:192
+msgid "Map the image to an object (plane, sphere, box or cylinder)"
+msgstr "Overfør biletet til eit objekt (plan, kule, boks eller sylinder)."
+
+#: ../plug-ins/map-object/map-object-main.c:197
+msgid "Map _Object..."
+msgstr "Avbild på _objekt …"
+
+#: ../plug-ins/map-object/map-object-ui.c:248
+#: ../plug-ins/map-object/map-object-ui.c:1305
+msgid "_Box"
+msgstr "_Boks"
+
+#: ../plug-ins/map-object/map-object-ui.c:266
+#: ../plug-ins/map-object/map-object-ui.c:1311
+msgid "C_ylinder"
+msgstr "S_ylinder"
+
+#: ../plug-ins/map-object/map-object-ui.c:484
+msgid "Map to:"
+msgstr "Avbild på:"
+
+#: ../plug-ins/map-object/map-object-ui.c:488
+msgid "Plane"
+msgstr "Plan"
+
+#: ../plug-ins/map-object/map-object-ui.c:489
+msgid "Sphere"
+msgstr "Kule"
+
+#: ../plug-ins/map-object/map-object-ui.c:490
+msgid "Box"
+msgstr "Boks"
+
+#: ../plug-ins/map-object/map-object-ui.c:501
+msgid "Type of object to map to"
+msgstr "Type objekt å avbilda på"
+
+#: ../plug-ins/map-object/map-object-ui.c:503
+msgid "Transparent background"
+msgstr "Gjennomsiktig bakgrunn"
+
+#: ../plug-ins/map-object/map-object-ui.c:514
+msgid "Make image transparent outside object"
+msgstr "Lag biletet gjennomsiktig utanfor objektet"
+
+#: ../plug-ins/map-object/map-object-ui.c:516
+msgid "Tile source image"
+msgstr "Flislegg kjeldebiletet"
+
+#: ../plug-ins/map-object/map-object-ui.c:527
+msgid "Tile source image: useful for infinite planes"
+msgstr "Flislegg kjeldebiletet: Nyttig for store flater"
+
+#: ../plug-ins/map-object/map-object-ui.c:530
+msgid "Create new image"
+msgstr "Lag nytt bilete "
+
+#: ../plug-ins/map-object/map-object-ui.c:549
+msgid "Enable _antialiasing"
+msgstr "Aktiver _kantutjamning"
+
+#: ../plug-ins/map-object/map-object-ui.c:560
+msgid "Enable/disable jagged edges removal (antialiasing)"
+msgstr "Slå fjerning av trappekant av/på (kantutglatting)"
+
+#: ../plug-ins/map-object/map-object-ui.c:576
+msgid "Antialiasing quality. Higher is better, but slower"
+msgstr "Kvaliteten på kantutjamninga. Høg er best, men seinast"
+
+#: ../plug-ins/map-object/map-object-ui.c:593
+msgid "Stop when pixel differences are smaller than this value"
+msgstr "Stopp når pikseldifferansen er mindre enn denne verdien"
+
+#: ../plug-ins/map-object/map-object-ui.c:628
+msgid "Point light"
+msgstr "Punktlys"
+
+#: ../plug-ins/map-object/map-object-ui.c:629
+msgid "Directional light"
+msgstr "Retningsbestemt lys"
+
+#: ../plug-ins/map-object/map-object-ui.c:630
+msgid "No light"
+msgstr "Ikkje lys"
+
+#: ../plug-ins/map-object/map-object-ui.c:635
+msgid "Lightsource type:"
+msgstr "Type lyskjelde:"
+
+#: ../plug-ins/map-object/map-object-ui.c:649
+msgid "Lightsource color:"
+msgstr "Lyskjeldefarge:"
+
+#: ../plug-ins/map-object/map-object-ui.c:714
+msgid "Direction Vector"
+msgstr "Retningsvektor"
+
+#: ../plug-ins/map-object/map-object-ui.c:790
+msgid "Intensity Levels"
+msgstr "Intensitetsnivå"
+
+#: ../plug-ins/map-object/map-object-ui.c:809
+msgid "Ambient:"
+msgstr "Bakgrunnslys:"
+
+#: ../plug-ins/map-object/map-object-ui.c:838
+#: ../plug-ins/map-object/map-object-ui.c:881
+msgid "Diffuse:"
+msgstr "Diffusjon:"
+
+#: ../plug-ins/map-object/map-object-ui.c:862
+msgid "Reflectivity"
+msgstr "Reflektivitet"
+
+#: ../plug-ins/map-object/map-object-ui.c:896
+msgid "Higher values makes the object reflect more light (appear lighter)"
+msgstr "Dess høgare verdi dess meir lys blir reflektert frå objektet og gjer at det ser lysare ut"
+
+#: ../plug-ins/map-object/map-object-ui.c:910
+msgid "Specular:"
+msgstr "Spegling:"
+
+#: ../plug-ins/map-object/map-object-ui.c:939
+msgid "Highlight:"
+msgstr "Høgglans:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1000
+msgid "Object X position in XYZ space"
+msgstr "X-koordinata for objektet i XYZ-rommet"
+
+#: ../plug-ins/map-object/map-object-ui.c:1013
+msgid "Object Y position in XYZ space"
+msgstr "Y-koordinata for objektet i XYZ-rommet"
+
+#: ../plug-ins/map-object/map-object-ui.c:1026
+msgid "Object Z position in XYZ space"
+msgstr "Z-koordinata for objektet i XYZ-rommet"
+
+#: ../plug-ins/map-object/map-object-ui.c:1049
+msgid "Rotation angle about X axis"
+msgstr "Rotasjonsvinkel om X-aksen"
+
+#: ../plug-ins/map-object/map-object-ui.c:1060
+msgid "Rotation angle about Y axis"
+msgstr "Rotasjonsvinkel om Y-aksen"
+
+#: ../plug-ins/map-object/map-object-ui.c:1071
+msgid "Rotation angle about Z axis"
+msgstr "Rotasjonsvinkel om Z-aksen"
+
+#: ../plug-ins/map-object/map-object-ui.c:1097
+msgid "Front:"
+msgstr "Front:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1097
+msgid "Back:"
+msgstr "Bak:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1105
+msgid "Map Images to Box Faces"
+msgstr "Bilete til bokssidene"
+
+#: ../plug-ins/map-object/map-object-ui.c:1146
+msgid "X scale (size)"
+msgstr "X-skalering (storleik)"
+
+#: ../plug-ins/map-object/map-object-ui.c:1158
+msgid "Y scale (size)"
+msgstr "Y-skalering (storleik)"
+
+#: ../plug-ins/map-object/map-object-ui.c:1170
+msgid "Z scale (size)"
+msgstr "Z-skalering (storleik)"
+
+#: ../plug-ins/map-object/map-object-ui.c:1193
+#: ../plug-ins/print/print-page-layout.c:414
+msgid "_Top:"
+msgstr "_Topp:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1193
+#: ../plug-ins/print/print-page-layout.c:433
+msgid "_Bottom:"
+msgstr "_Botn:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1198
+msgid "Images for the Cap Faces"
+msgstr "Bilete for endeflatene"
+
+#: ../plug-ins/map-object/map-object-ui.c:1227
+#: ../plug-ins/print/print-page-layout.c:231
+msgid "Size"
+msgstr "Storleik"
+
+#: ../plug-ins/map-object/map-object-ui.c:1238
+msgid "R_adius:"
+msgstr "R_adius:"
+
+#: ../plug-ins/map-object/map-object-ui.c:1242
+msgid "Cylinder radius"
+msgstr "Sylinderradius"
+
+#: ../plug-ins/map-object/map-object-ui.c:1256
+msgid "Cylinder length"
+msgstr "Sylinderlengd"
+
+#: ../plug-ins/map-object/map-object-ui.c:1287
+msgid "O_ptions"
+msgstr "_Innstillingar"
+
+#: ../plug-ins/map-object/map-object-ui.c:1299
+msgid "O_rientation"
+msgstr "O_rientiering"
+
+#: ../plug-ins/map-object/map-object-ui.c:1335
+msgid "Map to Object"
+msgstr "Avbild på objektet"
+
+#: ../plug-ins/map-object/map-object-ui.c:1415
+msgid "Show preview _wireframe"
+msgstr "Vis _rutenett"
+
+#: ../plug-ins/maze/maze-algorithms.c:278
 msgid "Constructing maze using Prim's Algorithm"
 msgstr "Lager labyrint v.h.a. Prims algoritme"
 
-#: ../plug-ins/maze/algorithms.c:465
+#: ../plug-ins/maze/maze-algorithms.c:487
 msgid "Constructing tileable maze using Prim's Algorithm"
 msgstr "Lager saumlaus labyrint v.h.a. Prims algoritme"
 
-#: ../plug-ins/maze/maze.c:153
-msgid "Draw a labyrinth"
-msgstr "Teikna ein labyrint"
-
-#: ../plug-ins/maze/maze.c:160
-msgid "_Maze..."
-msgstr "_Labyrint..."
-
-#: ../plug-ins/maze/maze.c:449
-msgid "Drawing maze"
-msgstr "Teiknar labyrinten..."
-
-#: ../plug-ins/maze/maze.h:22
+#: ../plug-ins/maze/maze-dialog.c:171
 msgid "Maze"
 msgstr "Labyrint"
 
 #. The maze size frame
-#: ../plug-ins/maze/maze_face.c:200
+#: ../plug-ins/maze/maze-dialog.c:193
 msgid "Maze Size"
 msgstr "Labyrintstorleik"
 
 #. entscale == Entry and Scale pair function found in pixelize.c
-#: ../plug-ins/maze/maze_face.c:214
+#: ../plug-ins/maze/maze-dialog.c:207
 msgid "Width (pixels):"
 msgstr "Breidde (pikslar):"
 
-#: ../plug-ins/maze/maze_face.c:226 ../plug-ins/maze/maze_face.c:242
+#: ../plug-ins/maze/maze-dialog.c:219
+#: ../plug-ins/maze/maze-dialog.c:235
 msgid "Pieces:"
 msgstr "Bitar:"
 
-#: ../plug-ins/maze/maze_face.c:231
+#: ../plug-ins/maze/maze-dialog.c:224
 msgid "Height (pixels):"
 msgstr "Høgde (pikslar):"
 
 #. The maze algorithm frame
-#: ../plug-ins/maze/maze_face.c:250
+#: ../plug-ins/maze/maze-dialog.c:243
 msgid "Algorithm"
 msgstr "Algoritme"
 
-#: ../plug-ins/maze/maze_face.c:276
+#: ../plug-ins/maze/maze-dialog.c:269
 msgid "Depth first"
 msgstr "Først djupn"
 
-#: ../plug-ins/maze/maze_face.c:277
+#: ../plug-ins/maze/maze-dialog.c:270
 msgid "Prim's algorithm"
 msgstr "Prims algoritme"
 
-#: ../plug-ins/maze/maze_face.c:396
+#: ../plug-ins/maze/maze-dialog.c:389
 msgid ""
 "Selection size is not even.\n"
 "Tileable maze won't work perfectly."
@@ -11525,785 +12142,262 @@ msgstr ""
 "Storleiken på markeringa er odde.\n"
 "Saumlaus labyrint vil ikkje bli perfekt."
 
-#: ../plug-ins/metadata/xmp-parse.c:240
-#, c-format
+#: ../plug-ins/maze/maze.c:122
+msgid "Draw a labyrinth"
+msgstr "Teikna ein labyrint"
+
+#: ../plug-ins/maze/maze.c:129
+msgid "_Maze..."
+msgstr "_Labyrint..."
+
+#: ../plug-ins/maze/maze.c:425
+msgid "Drawing maze"
+msgstr "Teiknar labyrinten"
+
+#: ../plug-ins/metadata/xmp-parse.c:238
 msgid "Error: No XMP packet found"
 msgstr "Feil: Fann inga XMP-pakke"
 
-#: ../plug-ins/metadata/xmp-parse.c:255
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:254
 msgid "Error on line %d char %d: %s"
 msgstr "Feil i linje %d teiken %d: %s"
 
-#: ../plug-ins/metadata/xmp-parse.c:277
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:276
 msgid "Expected text or optional element <%s>, found <%s> instead"
 msgstr "Venta ein tekst eller det valfrie elementet <%s>, fann i staden <%s>"
 
-#: ../plug-ins/metadata/xmp-parse.c:281
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:280
 msgid "Expected element <%s>, found <%s> instead"
 msgstr "Venta elementet <%s>, fann i staden <%s>"
 
-#: ../plug-ins/metadata/xmp-parse.c:296
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:295
 msgid "Unknown element <%s>"
 msgstr "Ukjent element <%s>"
 
-#: ../plug-ins/metadata/xmp-parse.c:325
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:324
 msgid "Unknown attribute \"%s\"=\"%s\" in element <%s>"
 msgstr "Ukjent eigenskap  «%s»=«%s» i elementet <%s>"
 
-#: ../plug-ins/metadata/xmp-parse.c:655
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:677
 msgid "Required attribute rdf:about missing in <%s>"
 msgstr "Den nødvendige eigenskapen «rdf:about» manglar i <%s>"
 
-#: ../plug-ins/metadata/xmp-parse.c:881
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:903
 msgid "Nested elements (<%s>) are not allowed in this context"
 msgstr "Det er ikkje lov å bruka nøsta element (<%s>) i denne samanhengen"
 
-#: ../plug-ins/metadata/xmp-parse.c:1005
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:1027
 msgid "End of element <%s> not expected in this context"
 msgstr "Slutten på elementet <%s> er ikkje venta i denne samanhengen"
 
-#: ../plug-ins/metadata/xmp-parse.c:1107
-#, c-format
+#: ../plug-ins/metadata/xmp-parse.c:1129
 msgid "The current element (<%s>) cannot contain text"
 msgstr "Det aktuelle elementet (<%s>) kan ikkje innehalde tekst"
 
-#: ../plug-ins/metadata/xmp-parse.c:1132
+#: ../plug-ins/metadata/xmp-parse.c:1154
 msgid "XMP packets must start with "
 msgstr "XMP-pakker må byrja med "
 
-#: ../plug-ins/metadata/xmp-parse.c:1146
+#: ../plug-ins/metadata/xmp-parse.c:1168
 msgid "XMP packets must end with "
 msgstr "XMP-pakker må slutta med "
 
-#: ../plug-ins/metadata/xmp-parse.c:1159
+#: ../plug-ins/metadata/xmp-parse.c:1181
 msgid "XMP cannot contain XML comments or processing instructions"
 msgstr "XMP kan ikkje innehalde XML-kommentarar eller arbeidsinstruksjonar"
 
-#: ../plug-ins/pagecurl/pagecurl.c:216
+#: ../plug-ins/pagecurl/pagecurl.c:215
 msgid "Curl up one of the image corners"
 msgstr "Ruller inn eit av bilethjørna"
 
-#: ../plug-ins/pagecurl/pagecurl.c:221
+#: ../plug-ins/pagecurl/pagecurl.c:220
 msgid "_Pagecurl..."
-msgstr "Innr_ulling..."
+msgstr "Innr_ulling …"
 
-#: ../plug-ins/pagecurl/pagecurl.c:440
+#: ../plug-ins/pagecurl/pagecurl.c:439
 msgid "Pagecurl Effect"
 msgstr "Innrulling av hjørne"
 
-#: ../plug-ins/pagecurl/pagecurl.c:462
+#: ../plug-ins/pagecurl/pagecurl.c:461
 msgid "Curl Location"
 msgstr "Posisjon"
 
-#: ../plug-ins/pagecurl/pagecurl.c:481
+#: ../plug-ins/pagecurl/pagecurl.c:480
 msgid "Lower right"
 msgstr "Nedre, høgre"
 
-#: ../plug-ins/pagecurl/pagecurl.c:482
+#: ../plug-ins/pagecurl/pagecurl.c:481
 msgid "Lower left"
 msgstr "Nedre, venstre"
 
-#: ../plug-ins/pagecurl/pagecurl.c:483
+#: ../plug-ins/pagecurl/pagecurl.c:482
 msgid "Upper left"
 msgstr "Øvre, venstre"
 
-#: ../plug-ins/pagecurl/pagecurl.c:484
+#: ../plug-ins/pagecurl/pagecurl.c:483
 msgid "Upper right"
 msgstr "Øvre, høgre"
 
-#: ../plug-ins/pagecurl/pagecurl.c:524
+#: ../plug-ins/pagecurl/pagecurl.c:523
 msgid "Curl Orientation"
 msgstr "Orientiering"
 
-#: ../plug-ins/pagecurl/pagecurl.c:568
+#: ../plug-ins/pagecurl/pagecurl.c:567
 msgid "_Shade under curl"
 msgstr "_Skygge under bretten"
 
-#: ../plug-ins/pagecurl/pagecurl.c:581
+#: ../plug-ins/pagecurl/pagecurl.c:580
 msgid "Current gradient (reversed)"
 msgstr "Gjeldande fargeovergang (reversert)"
 
-#: ../plug-ins/pagecurl/pagecurl.c:586
+#: ../plug-ins/pagecurl/pagecurl.c:585
 msgid "Current gradient"
 msgstr "Gjeldande fargeovergang"
 
-#: ../plug-ins/pagecurl/pagecurl.c:591
+#: ../plug-ins/pagecurl/pagecurl.c:590
 msgid "Foreground / background colors"
 msgstr "Forgrunn/bakgrunnfarger"
 
-#: ../plug-ins/pagecurl/pagecurl.c:611
+#: ../plug-ins/pagecurl/pagecurl.c:610
 msgid "_Opacity:"
 msgstr "_Dekkevne:"
 
-#: ../plug-ins/pagecurl/pagecurl.c:734
+#: ../plug-ins/pagecurl/pagecurl.c:733
 msgid "Curl Layer"
 msgstr "Innrulla lag"
 
-#: ../plug-ins/pagecurl/pagecurl.c:1022
+#: ../plug-ins/pagecurl/pagecurl.c:1021
 msgid "Page Curl"
 msgstr "Sideinnrulling"
 
-#: ../plug-ins/print/print-page-layout.c:148
+#: ../plug-ins/print/print-page-layout.c:149
 msgid "Ignore Page _Margins"
 msgstr "Ignorer margane"
 
-#: ../plug-ins/print/print-page-layout.c:294
+#. crop marks toggle
+#: ../plug-ins/print/print-page-layout.c:160
+msgid "_Draw Crop Marks"
+msgstr "Beskjer til resultatet"
+
+#: ../plug-ins/print/print-page-layout.c:306
 msgid "_X resolution:"
 msgstr "_X-oppløysing:"
 
-#: ../plug-ins/print/print-page-layout.c:298
+#: ../plug-ins/print/print-page-layout.c:310
 msgid "_Y resolution:"
 msgstr "_Y-oppløysing:"
 
-#: ../plug-ins/print/print-page-layout.c:369
+#: ../plug-ins/print/print-page-layout.c:381
 msgid "_Left:"
 msgstr "_Venstre:"
 
-#: ../plug-ins/print/print-page-layout.c:388
+#: ../plug-ins/print/print-page-layout.c:400
 msgid "_Right:"
 msgstr "_Høgre:"
 
-#: ../plug-ins/print/print-page-layout.c:442
+#: ../plug-ins/print/print-page-layout.c:454
 msgid "C_enter:"
-msgstr "S_enter:"
+msgstr "_Senter:"
 
-#: ../plug-ins/print/print-page-layout.c:450
+#: ../plug-ins/print/print-page-layout.c:462
 msgid "Horizontally"
 msgstr "Horisontalt"
 
-#: ../plug-ins/print/print-page-layout.c:451
+#: ../plug-ins/print/print-page-layout.c:463
 msgid "Vertically"
 msgstr "Vertikal"
 
-#: ../plug-ins/print/print-page-layout.c:452
+#: ../plug-ins/print/print-page-layout.c:464
 msgid "Both"
 msgstr "Begge"
 
-#: ../plug-ins/print/print.c:102
+#: ../plug-ins/print/print.c:101
 msgid "Print the image"
 msgstr "Skriv ut biletet"
 
-#: ../plug-ins/print/print.c:107
+#: ../plug-ins/print/print.c:106
 msgid "_Print..."
-msgstr "_Skriv ut..."
+msgstr "_Skriv ut …"
 
-#: ../plug-ins/print/print.c:118
-#, fuzzy
+#: ../plug-ins/print/print.c:117
 msgid "Adjust page size and orientation for printing"
 msgstr "Bestem sideformat og sideorientering for utskrift"
 
-#: ../plug-ins/print/print.c:124
+#: ../plug-ins/print/print.c:123
 msgid "Page Set_up"
-msgstr "Side_oppsett..."
+msgstr "Side_oppsett"
 
-#: ../plug-ins/print/print.c:261
+#: ../plug-ins/print/print.c:262
 msgid "Image Settings"
 msgstr "Biletinnstillingar"
 
-#: ../plug-ins/print/print.c:341
+#: ../plug-ins/print/print.c:346
 msgid "An error occurred while trying to print:"
 msgstr "Feil ved utskrift:"
 
-#: ../plug-ins/print/print.c:371
+#: ../plug-ins/print/print.c:373
 msgid "Printing"
 msgstr "Skriv ut"
 
-#: ../plug-ins/psd/psd-load.c:208
-#, c-format
-msgid ""
-"Error loading PSD file:\n"
-"\n"
-"%s"
-msgstr ""
-"Feil ved opninga av PSD-fila:\n"
-"\n"
-"%s"
-
-#: ../plug-ins/psd/psd-load.c:263
-#, c-format
-msgid "Not a valid photoshop document file"
-msgstr "Ugyldig photoshop dokumentfil"
-
-#: ../plug-ins/psd/psd-load.c:270
-#, c-format
-msgid "Unsupported file format version: %d"
-msgstr "Har ikkje støtte for filformatversjonen: %d"
-
-#: ../plug-ins/psd/psd-load.c:277
-#, c-format
-msgid "Too many channels in file: %d"
-msgstr "For mange kanalar i fila %d"
-
-#: ../plug-ins/psd/psd-load.c:307
-#, c-format
-msgid "Unsupported color mode: %s"
-msgstr "Har ikkje støtte for fargemodellen %s"
-
-#: ../plug-ins/psd/psd-load.c:334
-#, c-format
-msgid "Unsupported bit depth: %d"
-msgstr "Har ikkje støtte for bitdjupna %d"
-
-#: ../plug-ins/psd/psd-load.c:368 ../plug-ins/psd/psd-load.c:378
-#: ../plug-ins/psd/psd-load.c:597 ../plug-ins/psd/psd-load.c:778
-#, c-format
-msgid "The file is corrupt!"
-msgstr "Fila er øydelagt"
-
-#: ../plug-ins/psd/psd-load.c:538
-#, c-format
-msgid "Too many channels in layer: %d"
-msgstr "For mange kanalar i laget %d"
-
-#: ../plug-ins/psd/psd-load.c:545
-#, c-format
-msgid "Unsupported or invalid layer height: %d"
-msgstr "Ustøtta eller ugyldig laghøgde: %d"
-
-#: ../plug-ins/psd/psd-load.c:552
-#, c-format
-msgid "Unsupported or invalid layer width: %d"
-msgstr "Ustøtta eller ugyldig lagbreidde: %d"
-
-#: ../plug-ins/psd/psd-load.c:1138 ../plug-ins/psd/psd-load.c:1486
-#, c-format
-msgid "Unsupported compression mode: %d"
-msgstr "Har ikkje støtte for kompresjonsmodus %d"
-
-#: ../plug-ins/psd/psd-load.c:1575
-msgid "Extra"
-msgstr "Ekstra"
-
-#: ../plug-ins/psd/psd-util.c:53
-#, c-format
-msgid "Unexpected end of file"
-msgstr "Uventa filslutt."
-
-#: ../plug-ins/rcm/rcm.c:99
-msgid "Replace a range of colors with another"
-msgstr "Flytter fargane på fargesirkelen"
-
-#: ../plug-ins/rcm/rcm.c:106
-msgid "_Rotate Colors..."
-msgstr "_Roter fargane"
-
-#: ../plug-ins/rcm/rcm.c:140
-msgid "Rotating the colors"
-msgstr "Roterer fargane"
-
-#: ../plug-ins/rcm/rcm_dialog.c:119
-msgid "Original"
-msgstr "Original"
-
-#: ../plug-ins/rcm/rcm_dialog.c:137
-msgid "Rotated"
-msgstr "Rotert"
-
-#: ../plug-ins/rcm/rcm_dialog.c:155
-msgid "Continuous update"
-msgstr "Oppdater kontinuerleg"
-
-#: ../plug-ins/rcm/rcm_dialog.c:168
-msgid "Area:"
-msgstr "Område:"
-
-#: ../plug-ins/rcm/rcm_dialog.c:172
-msgid "Entire Layer"
-msgstr "Heile laget"
-
-#: ../plug-ins/rcm/rcm_dialog.c:174
-msgid "Context"
-msgstr "Samanhang"
-
-#. Gray: Circle: Spinbutton 1
-#: ../plug-ins/rcm/rcm_dialog.c:467
-msgid "Hue:"
-msgstr "Kulør:"
-
-#. Gray: Circle: Spinbutton 2
-#: ../plug-ins/rcm/rcm_dialog.c:494 ../plug-ins/rcm/rcm_dialog.c:556
-msgid "Saturation:"
-msgstr "Metning:"
-
-#. * Gray: Operation-Mode *
-#: ../plug-ins/rcm/rcm_dialog.c:514
-msgid "Gray Mode"
-msgstr "Gråmodus:"
-
-#. Gray: Operation-Mode: two radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:523
-msgid "Treat as this"
-msgstr "Behandla som denne"
-
-#: ../plug-ins/rcm/rcm_dialog.c:535
-msgid "Change to this"
-msgstr "Endra til denne"
-
-#. * Gray: What is gray? *
-#: ../plug-ins/rcm/rcm_dialog.c:548
-msgid "Gray Threshold"
-msgstr "Grågrense"
-
-#. * Misc: Used unit selection *
-#: ../plug-ins/rcm/rcm_dialog.c:588 ../plug-ins/rcm/rcm_dialog.c:698
-msgid "Units"
-msgstr "Einingar"
-
-#. Misc: Used unit selection: 3 radio buttons
-#: ../plug-ins/rcm/rcm_dialog.c:597
-msgid "Radians"
-msgstr "Radian"
-
-#: ../plug-ins/rcm/rcm_dialog.c:609
-msgid "Radians/Pi"
-msgstr "Radian/Pi"
-
-#: ../plug-ins/rcm/rcm_dialog.c:621
-msgid "Degrees"
-msgstr "Grader"
-
-#: ../plug-ins/rcm/rcm_dialog.c:652
-msgid "Rotate Colors"
-msgstr "Roter fargane"
-
-#: ../plug-ins/rcm/rcm_dialog.c:692
-msgid "Main Options"
-msgstr "Hovudinnstillingar"
-
-#: ../plug-ins/rcm/rcm_dialog.c:695
-msgid "Gray Options"
-msgstr "Gråinnstillingar"
-
-#: ../plug-ins/rcm/rcm_stock.c:35
-msgid "Switch to Clockwise"
-msgstr "Bytt til medsols"
-
-#: ../plug-ins/rcm/rcm_stock.c:37
-msgid "Switch to C/Clockwise"
-msgstr "Bytt til motsols"
-
-#: ../plug-ins/rcm/rcm_stock.c:39
-msgid "Change Order of Arrows"
-msgstr "Endra rekkefølgja for pilene"
-
 #. printf("width = %d, height = %d\n",BITMAP_WIDTH(marked),BITMAP_HEIGHT(marked));
-#: ../plug-ins/sel2path/pxl-outline.c:84
+#: ../plug-ins/selection-to-path/pxl-outline.c:81
 msgid "Selection to Path"
 msgstr "Utval til bane"
 
-#: ../plug-ins/sel2path/sel2path.c:183
+#: ../plug-ins/selection-to-path/selection-to-path.c:184
 msgid "No selection to convert"
 msgstr "Ingen markeringar å omforma"
 
-#: ../plug-ins/sel2path/sel2path.c:300
+#: ../plug-ins/selection-to-path/selection-to-path.c:301
 msgid "Selection to Path Advanced Settings"
 msgstr "Utval til bane. Avanserte innstillingar"
 
-#: ../plug-ins/sgi/sgi.c:119 ../plug-ins/sgi/sgi.c:139
-msgid "Silicon Graphics IRIS image"
-msgstr "Silicon-Graphics-IRIS-bilete"
-
-#: ../plug-ins/sgi/sgi.c:313
-#, c-format
-msgid "Could not open '%s' for reading."
-msgstr "Kunne ikkje opna for lesing frå «%s»."
-
-#: ../plug-ins/sgi/sgi.c:532
-#, c-format
-msgid "Could not open '%s' for writing."
-msgstr "Kunne ikkje opna «%s» for skriving."
-
-#: ../plug-ins/sgi/sgi.c:612
-msgid "Save as SGI"
-msgstr "Lagra som SGI"
-
-#: ../plug-ins/sgi/sgi.c:628
-msgid "Compression type"
-msgstr "Kompressjonstype"
-
-#: ../plug-ins/sgi/sgi.c:632
-msgid "No compression"
-msgstr "Ingen kompresjon"
-
-#: ../plug-ins/sgi/sgi.c:634
-msgid "RLE compression"
-msgstr "RLE kompresjon"
-
-#: ../plug-ins/sgi/sgi.c:636
-msgid ""
-"Aggressive RLE\n"
-"(not supported by SGI)"
-msgstr ""
-"Agressiv RLE\n"
-"(ikkje støtta av SGI)"
-
-#: ../plug-ins/twain/twain.c:87
+#: ../plug-ins/twain/twain.c:86
 msgid "Capture an image from a TWAIN datasource"
-msgstr "Hent eit bilete frå TWAIN datakjelde"
+msgstr "Hent eit bilete frå ei TWAIN datakjelde"
 
-#: ../plug-ins/twain/twain.c:354
+#: ../plug-ins/twain/twain.c:351
 msgid "_Scanner/Camera..."
-msgstr "_Skannar/kamera..."
+msgstr "frå sk_annar/kamera …"
 
 #. Initialize our progress dialog
-#: ../plug-ins/twain/twain.c:489
+#: ../plug-ins/twain/twain.c:485
 msgid "Transferring data from scanner/camera"
 msgstr "Overfører data frå skannar/kamera"
 
-#: ../plug-ins/uri/uri-backend-gio.c:187
-#, fuzzy, c-format
-msgid "Downloading image (%s of %s)"
-msgstr "Lastar ned %s av biletdata"
-
-#: ../plug-ins/uri/uri-backend-gio.c:190
-#, c-format
-msgid "Uploading image (%s of %s)"
-msgstr ""
-
-#: ../plug-ins/uri/uri-backend-gio.c:210
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:163
-#: ../plug-ins/uri/uri-backend-libcurl.c:133
-#: ../plug-ins/uri/uri-backend-wget.c:345
-#, c-format
-msgid "Downloaded %s of image data"
-msgstr "%s av biletdata er lasta ned"
-
-#: ../plug-ins/uri/uri-backend-gio.c:213
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:182
-#, c-format
-msgid "Uploaded %s of image data"
-msgstr "%s av biletdata er lasta opp"
-
-#: ../plug-ins/uri/uri-backend-gio.c:248
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:252
-#: ../plug-ins/uri/uri-backend-libcurl.c:155
-#: ../plug-ins/uri/uri-backend-wget.c:194
-msgid "Connecting to server"
-msgstr "Koplar til tenaren"
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:162
-#: ../plug-ins/uri/uri-backend-libcurl.c:126
-#: ../plug-ins/uri/uri-backend-wget.c:302
-#, c-format
-msgid "Downloading %s of image data"
-msgstr "Lastar ned %s av biletdata"
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:181
-#, fuzzy, c-format
-msgid "Uploading %s of image data"
-msgstr "Lastar opp %s av biletdata..."
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:311
-#, c-format
-msgid "Failed to read %s from '%s': %s"
-msgstr "Kunne ikkje lesa %s frå «%s»: %s"
-
-#: ../plug-ins/uri/uri-backend-gnomevfs.c:360
-#, c-format
-msgid "Failed to write %s to '%s': %s"
-msgstr "Kunne ikkje skriva %s til «%s»: %s"
-
-#: ../plug-ins/uri/uri-backend-libcurl.c:57
-#, c-format
-msgid "Could not initialize libcurl"
-msgstr "Kunne ikkje initiere libcurl"
-
-#: ../plug-ins/uri/uri-backend-libcurl.c:160
-#, c-format
-msgid "Could not open output file for writing"
-msgstr "Kan ikkje opne utfila for skriving"
-
-#: ../plug-ins/uri/uri-backend-libcurl.c:198
-#, c-format
-msgid "Opening '%s' for reading resulted in HTTP response code: %d"
-msgstr "Oninga av «%s» for lesing gav denne HTTP responskoden: %d"
-
-#: ../plug-ins/uri/uri-backend-wget.c:161
-#: ../plug-ins/uri/uri-backend-wget.c:181
-#: ../plug-ins/uri/uri-backend-wget.c:200
-#: ../plug-ins/uri/uri-backend-wget.c:223
-#: ../plug-ins/uri/uri-backend-wget.c:252
-#, c-format
-msgid "wget exited abnormally on URI '%s'"
-msgstr "wget blei avbroten i URI «%s»"
-
-#. The third line is "Connecting to..."
-#: ../plug-ins/uri/uri-backend-wget.c:189
-#, c-format
-msgid "(timeout is %d second)"
-msgid_plural "(timeout is %d seconds)"
-msgstr[0] "(Tida er ute etter %d sekund)"
-msgstr[1] "(Tida er ute etter %d sekund)"
-
-#. The fourth line is either the network request or an error
-#: ../plug-ins/uri/uri-backend-wget.c:218
-msgid "Opening URI"
-msgstr "Opnar URI..."
-
-#: ../plug-ins/uri/uri-backend-wget.c:229
-#: ../plug-ins/uri/uri-backend-wget.c:262
-#, c-format
-msgid "A network error occurred: %s"
-msgstr "Nettverksfeil: %s"
-
-#: ../plug-ins/uri/uri-backend-wget.c:307
-msgid "Downloading unknown amount of image data"
-msgstr "Lastar ned ei ukjent mengde biletdata"
-
-#: ../plug-ins/uri/uri.c:117 ../plug-ins/uri/uri.c:138
-msgid "URI"
-msgstr "URI"
-
-#: ../plug-ins/winicon/icodialog.c:54
-msgid "Save as Windows Icon"
-msgstr "Lagra som Microsoft icon"
-
-#: ../plug-ins/winicon/icodialog.c:86
-msgid "Icon Details"
-msgstr "Ikondetaljar"
-
-#: ../plug-ins/winicon/icodialog.c:106
-msgid ""
-"Large icons and compression are not supported by all programs. Older "
-"applications may not open this file correctly."
-msgstr ""
-"Store ikon og komprimering blir ikkje støtta av alle program. Eldre utgåver "
-"kan kanskje ikkje opna desse filene rett."
-
-#: ../plug-ins/winicon/icodialog.c:178
-msgid "1 bpp, 1-bit alpha, 2-slot palette"
-msgstr "1 bpp, 1-bit alfa, 2-slot palett"
-
-#: ../plug-ins/winicon/icodialog.c:179
-msgid "4 bpp, 1-bit alpha, 16-slot palette"
-msgstr "4 bpp, 1-bit alfa, 16-slot palett"
-
-#: ../plug-ins/winicon/icodialog.c:180
-msgid "8 bpp, 1-bit alpha, 256-slot palette"
-msgstr "8 bpp, 1-bit alfa, 256-slot palett"
-
-#: ../plug-ins/winicon/icodialog.c:181
-msgid "24 bpp, 1-bit alpha, no palette"
-msgstr "32 bpp, 8-bit alfa, ingen palett"
-
-#: ../plug-ins/winicon/icodialog.c:182
-msgid "32 bpp, 8-bit alpha, no palette"
-msgstr "32 bpp, 8-bit Alfa, ingen palett"
-
-#: ../plug-ins/winicon/icodialog.c:196
-msgid "Compressed (PNG)"
-msgstr "Komprimert (PNG)"
-
-#. read successfully. add to image
-#: ../plug-ins/winicon/icoload.c:616
-#, c-format
-msgid "Icon #%i"
-msgstr "Ikon Nr. %i"
-
-#: ../plug-ins/winicon/main.c:103 ../plug-ins/winicon/main.c:137
-msgid "Microsoft Windows icon"
-msgstr "Microsoft-Windows-ikon"
-
-#: ../plug-ins/winsnap/winsnap.c:864
+#: ../plug-ins/win-snap/winsnap.c:864
 msgid "Grab"
 msgstr "Hent"
 
-#: ../plug-ins/winsnap/winsnap.c:880
+#: ../plug-ins/win-snap/winsnap.c:880
 msgid "Grab a single window"
 msgstr "Hent eitt vindauge"
 
-#: ../plug-ins/winsnap/winsnap.c:894
+#: ../plug-ins/win-snap/winsnap.c:894
 msgid "Grab the whole screen"
 msgstr "Hent heile skjermen"
 
-#: ../plug-ins/winsnap/winsnap.c:910
+#: ../plug-ins/win-snap/winsnap.c:910
 msgid "after"
 msgstr "etter"
 
-#: ../plug-ins/winsnap/winsnap.c:922
+#: ../plug-ins/win-snap/winsnap.c:922
 msgid "Seconds delay"
 msgstr "sekund pause"
 
-#: ../plug-ins/winsnap/winsnap.c:929
+#: ../plug-ins/win-snap/winsnap.c:929
 msgid "Include decorations"
 msgstr "Med ramme"
 
-#: ../plug-ins/winsnap/winsnap.c:988
+#: ../plug-ins/win-snap/winsnap.c:988
 msgid "Capture a window or desktop image"
-msgstr "Hent eit vindauge eller eitskrivebordsbilete"
+msgstr "Knips eit bilete av skrivebordet eller eit vindauge på det"
 
-#: ../plug-ins/winsnap/winsnap.c:993
+#: ../plug-ins/win-snap/winsnap.c:993
 msgid "_Screen Shot..."
-msgstr "_Skjermdump..."
+msgstr "_skjermbilete …"
 
-#: ../plug-ins/winsnap/winsnap.c:1142
+#: ../plug-ins/win-snap/winsnap.c:1141
 msgid "No data captured"
 msgstr "Ingen data henta"
 
-#: ../plug-ins/xjt/xjt.c:485 ../plug-ins/xjt/xjt.c:503
-msgid "GIMP compressed XJT image"
-msgstr "XJT-bilete komprimert med GIMP"
-
-#: ../plug-ins/xjt/xjt.c:724
-#, c-format
-msgid "XJT file contains unknown layermode %d"
-msgstr "XJT-fila inneheld ukjent lagmodus %d"
-
-#: ../plug-ins/xjt/xjt.c:761
-#, c-format
-msgid "Warning: unsupported layermode %d saved to XJT"
-msgstr "Åtvaring: Ustøtta lagmodus %d lagra i XJT"
-
-#: ../plug-ins/xjt/xjt.c:777
-#, c-format
-msgid "XJT file contains unknown pathtype %d"
-msgstr "XJT-fila inneheld ukjent stigtype %d"
-
-#: ../plug-ins/xjt/xjt.c:793
-#, c-format
-msgid "Warning: unsupported pathtype %d saved to XJT"
-msgstr "Åtvaring: Ustøtta stigtype %d lagra i XJT"
-
-#: ../plug-ins/xjt/xjt.c:812
-#, c-format
-msgid "XJT file contains unknown unittype %d"
-msgstr "XJT-fila inneheld ukjent eining %d"
-
-#: ../plug-ins/xjt/xjt.c:833
-#, c-format
-msgid "Warning: unsupported unittype %d saved to XJT"
-msgstr "Åtvaring: Ustøtta eining %d lagra i XJT"
-
-#: ../plug-ins/xjt/xjt.c:854
-msgid "Save as XJT"
-msgstr "Lagra som XJT"
-
-#: ../plug-ins/xjt/xjt.c:887
-msgid "Clear transparent"
-msgstr "Tøm gjennomsiktig"
-
-#: ../plug-ins/xjt/xjt.c:899
-msgid "Quality:"
-msgstr "Kvalitet:"
-
-#: ../plug-ins/xjt/xjt.c:908
-msgid "Smoothing:"
-msgstr "Utjamning:"
-
-#: ../plug-ins/xjt/xjt.c:1705 ../plug-ins/xjt/xjt.c:3353
-#, c-format
-msgid "Could not create working folder '%s': %s"
-msgstr "Kunne ikkje lage arbeidsmappa «%s»: %s"
-
-#: ../plug-ins/xjt/xjt.c:3222
-#, c-format
-msgid "Error: Could not read XJT property file '%s'."
-msgstr "Feil: Kunne ikkje lese fila «%s» med XJT-eigenskapane."
-
-#: ../plug-ins/xjt/xjt.c:3228
-#, c-format
-msgid "Error: XJT property file '%s' is empty."
-msgstr "Feil: Fila «%s» med XJT-eigenskapane er tom."
-
-#, fuzzy
-#~ msgid "Email the image"
-#~ msgstr "Skriv ut biletet"
-
-#, fuzzy
-#~ msgid "_Mail Image..."
-#~ msgstr "_Biletkart..."
-
-#, fuzzy
-#~ msgid "Send as Mail"
-#~ msgstr "Send som e-post"
-
-#, fuzzy
-#~ msgid "Encapsulation:"
-#~ msgstr "_Elevasjon:"
-
-#, fuzzy
-#~ msgid "_Recipient:"
-#~ msgstr "_Beskriving:"
-
-#, fuzzy
-#~ msgid "_Sender:"
-#~ msgstr "_Send"
-
-#, fuzzy
-#~ msgid "Comm_ent:"
-#~ msgstr "Kommentar:"
-
-#, fuzzy
-#~ msgid "First Source Color"
-#~ msgstr "Første farge"
-
-#, fuzzy
-#~ msgid "Second Source Color"
-#~ msgstr "Andre farge"
-
-#, fuzzy
-#~ msgid "First Destination Color"
-#~ msgstr "Farge på krysspunktet"
-
-#, fuzzy
-#~ msgid "Second Destination Color"
-#~ msgstr "Vel målprofilen"
-
-#, fuzzy
-#~ msgid "Adjust _Foreground & Background"
-#~ msgstr "_Forgrunn og bakgrunn"
-
-#, fuzzy
-#~ msgid "Color Range _Mapping..."
-#~ msgstr "Bytt _farge..."
-
-#, fuzzy
-#~ msgid "Cannot operate on gray or indexed color images."
-#~ msgstr "Kan ikkje arbeida på indekserte bilete."
-
-#, fuzzy
-#~ msgid "Adjusting foreground and background colors"
-#~ msgstr "Forgrunn/bakgrunnfarger"
-
-#, fuzzy
-#~ msgid "Mapping colors"
-#~ msgstr "Roterer fargane"
-
-#, fuzzy
-#~ msgid "Map Color Range"
-#~ msgstr "Byter ut ein farge med ein annan"
-
-#, fuzzy
-#~ msgid "Source Color Range"
-#~ msgstr "Byter ut ein farge med ein annan"
-
-#, fuzzy
-#~ msgid "Destination Color Range"
-#~ msgstr "Målkanal:"
-
-#, fuzzy
-#~ msgid "Invalid UTF-8 string in PSD file"
-#~ msgstr "Ugyldig UTF-8-kode i penselfila «%s»"
-
-#, fuzzy
-#~ msgid "Cannot handle PSD file with more than %d channels"
-#~ msgstr "Kan ikkje lagra bilete med alfakanalar."
-
-#, fuzzy
-#~ msgid "This is not an Adobe Photoshop PSD file"
-#~ msgstr "Dette er ikkje ei GIF-fil"
-
-#, fuzzy
-#~ msgid "Printable area:"
-#~ msgstr "Ho_risontal basis:"
-
-#~ msgid "Downloading %s of image data..."
-#~ msgstr "Lastar ned %s av biletdata..."
diff --git a/po-plug-ins/ro.po b/po-plug-ins/ro.po
index a238222df7..db961c4222 100644
--- a/po-plug-ins/ro.po
+++ b/po-plug-ins/ro.po
@@ -1,14 +1,14 @@
-# gimp ro translation
+# Romanian GIMP translation
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Robert Claudiu Gheorghe , 2001.
-# Cristian Secară , 2008-2009.
+# Cristian Secară , 2008.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-plugins\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-22 23:33+0200\n"
-"PO-Revision-Date: 2009-03-20 19:38+0200\n"
+"POT-Creation-Date: 2009-09-28 23:09+0300\n"
+"PO-Revision-Date: 2009-09-28 10:35+0200\n"
 "Last-Translator: Cristian Secară \n"
 "Language-Team: Română \n"
 "MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Poedit-Bookmarks: 2624,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Poedit-Bookmarks: 2549,-1,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:119
 msgid "Original"
@@ -120,7 +120,7 @@ msgstr "Grade"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:652
 msgid "Rotate Colors"
-msgstr "Rotire culori"
+msgstr "Rotire de culori"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:692
 msgid "Main Options"
@@ -153,117 +153,99 @@ msgstr "Înlocuiește un interval de culori cu altul"
 
 #: ../plug-ins/color-rotate/color-rotate.c:106
 msgid "_Rotate Colors..."
-msgstr "_Rotire culori..."
+msgstr "_Roește culorile..."
 
 #: ../plug-ins/color-rotate/color-rotate.c:140
 msgid "Rotating the colors"
-msgstr "Rotire culori"
+msgstr "Rotire de culori"
 
 #: ../plug-ins/common/alien-map.c:140
 msgid "_Modify red channel"
 msgstr "_Modifică canalul de roșu"
 
 #: ../plug-ins/common/alien-map.c:140
-#, fuzzy
 msgid "_Modify hue channel"
-msgstr "Modifică curbele pentru canal:"
+msgstr "_Modifică canalul de nuanță"
 
 #: ../plug-ins/common/alien-map.c:141
-#, fuzzy
 msgid "Mo_dify green channel"
-msgstr "Modifică nivele pentru canal:"
+msgstr "Mo_difică canalul de verde"
 
 #: ../plug-ins/common/alien-map.c:141
-#, fuzzy
 msgid "Mo_dify saturation channel"
-msgstr "Modifică nivele pentru canal:"
+msgstr "Mo_difică canalul de saturație"
 
 #: ../plug-ins/common/alien-map.c:142
-#, fuzzy
 msgid "Mod_ify blue channel"
-msgstr "Modifică nivele pentru canal:"
+msgstr "Mod_ifică ccanalul de albastru"
 
 #: ../plug-ins/common/alien-map.c:142
-#, fuzzy
 msgid "Mod_ify luminosity channel"
-msgstr "Modifică nivele pentru canal:"
+msgstr "Mod_ifică ccanalul de luminanță"
 
 #: ../plug-ins/common/alien-map.c:147
-#, fuzzy
 msgid "Red _frequency:"
-msgstr "Verde:"
+msgstr "_Frecvență roșu:"
 
 #: ../plug-ins/common/alien-map.c:147
-#, fuzzy
 msgid "Hue _frequency:"
-msgstr "Verde:"
+msgstr "_Frecvență nuanță:"
 
 #: ../plug-ins/common/alien-map.c:148
-#, fuzzy
 msgid "Green fr_equency:"
-msgstr "Verde:"
+msgstr "Fr_ecvență la verde:"
 
 #: ../plug-ins/common/alien-map.c:148
-#, fuzzy
 msgid "Saturation fr_equency:"
-msgstr "Saturare:"
+msgstr "Fr_ecvență saturație:"
 
 #: ../plug-ins/common/alien-map.c:149
-#, fuzzy
 msgid "Blue freq_uency:"
-msgstr "Verde:"
+msgstr "Frecvență albastr_u:"
 
 #: ../plug-ins/common/alien-map.c:149
-#, fuzzy
 msgid "Luminosity freq_uency:"
-msgstr "Verde:"
+msgstr "Frecvență l_uminozitate:"
 
 #: ../plug-ins/common/alien-map.c:151
-#, fuzzy
 msgid "Red _phaseshift:"
-msgstr "Inserează"
+msgstr "Decala_j fază roșu:"
 
 #: ../plug-ins/common/alien-map.c:151
-#, fuzzy
 msgid "Hue _phaseshift:"
-msgstr "Inserează"
+msgstr "Decala_j fază nuanță:"
 
 #: ../plug-ins/common/alien-map.c:152
-#, fuzzy
 msgid "Green ph_aseshift:"
-msgstr "Inserează"
+msgstr "Dec_alaj fază verde:"
 
 #: ../plug-ins/common/alien-map.c:152
-#, fuzzy
 msgid "Saturation ph_aseshift:"
-msgstr "Saturare:"
+msgstr "Dec_alaj fază saturație:"
 
 #: ../plug-ins/common/alien-map.c:153
-#, fuzzy
 msgid "Blue pha_seshift:"
-msgstr "Inserează"
+msgstr "Decalaj fa_ză albastru:"
 
 #: ../plug-ins/common/alien-map.c:153
-#, fuzzy
 msgid "Luminosity pha_seshift:"
-msgstr "Prag implicit:"
+msgstr "Decalaj fa_ză luminanță:"
 
 #: ../plug-ins/common/alien-map.c:183
-#, fuzzy
 msgid "Alter colors in various psychedelic ways"
-msgstr "Alterează culorile în "
+msgstr "Alterează culorile în diverse moduri psihedelice"
 
 #: ../plug-ins/common/alien-map.c:188
 msgid "_Alien Map..."
-msgstr "H_artă străină..."
+msgstr "H_artă nepământeană..."
 
 #: ../plug-ins/common/alien-map.c:320
 msgid "Alien Map: Transforming"
-msgstr "Hartă străină: transformare"
+msgstr "Hartă nepământeană: transformare"
 
 #: ../plug-ins/common/alien-map.c:393
 msgid "Alien Map"
-msgstr "Hartă străină"
+msgstr "Hartă nepământeană"
 
 #: ../plug-ins/common/alien-map.c:441 ../plug-ins/common/alien-map.c:465
 #: ../plug-ins/common/alien-map.c:489
@@ -298,15 +280,14 @@ msgid "Align Visi_ble Layers..."
 msgstr "Aliniază straturile vizi_bile..."
 
 #: ../plug-ins/common/align-layers.c:173
-#, fuzzy
 msgid "There are not enough layers to align."
-msgstr "Nu sunt suficiente straturi vizibile pentru a face o combinare în jos."
+msgstr "Nu sunt suficiente straturi de aliniat."
 
 #: ../plug-ins/common/align-layers.c:400
-#, fuzzy
 msgid "Align Visible Layers"
-msgstr "/Combină stratele vizibile..."
+msgstr "Aliniază straturile vizibile"
 
+# (și) la deschiderea unui .ps, la selecția anticrenelare
 #. if and how to center the image on the page
 #: ../plug-ins/common/align-layers.c:424 ../plug-ins/common/align-layers.c:455
 #: ../plug-ins/common/cml-explorer.c:166 ../plug-ins/common/file-ps.c:3247
@@ -318,12 +299,11 @@ msgstr "/Combină stratele vizibile..."
 #: ../plug-ins/lighting/lighting-ui.c:416
 #: ../plug-ins/print/print-page-layout.c:449
 msgid "None"
-msgstr "Nimic"
+msgstr "Fără"
 
 #: ../plug-ins/common/align-layers.c:425 ../plug-ins/common/align-layers.c:456
-#, fuzzy
 msgid "Collect"
-msgstr "Selecție culoare"
+msgstr "Colectează"
 
 #: ../plug-ins/common/align-layers.c:426
 msgid "Fill (left to right)"
@@ -338,30 +318,25 @@ msgid "Snap to grid"
 msgstr "Acroșează la grilă"
 
 #: ../plug-ins/common/align-layers.c:437
-#, fuzzy
 msgid "_Horizontal style:"
-msgstr "Orizontal:"
+msgstr "_Stil orizontal:"
 
 #: ../plug-ins/common/align-layers.c:441
-#, fuzzy
 msgid "Left edge"
-msgstr "Margine:"
+msgstr "Marginea din stânga"
 
 #: ../plug-ins/common/align-layers.c:442 ../plug-ins/common/align-layers.c:472
 #: ../plug-ins/gradient-flare/gradient-flare.c:2713
-#, fuzzy
 msgid "Center"
-msgstr "Centru X:"
+msgstr "Centru"
 
 #: ../plug-ins/common/align-layers.c:443
-#, fuzzy
 msgid "Right edge"
-msgstr "Margine:"
+msgstr "Marginea din dreapta"
 
 #: ../plug-ins/common/align-layers.c:452
-#, fuzzy
 msgid "Ho_rizontal base:"
-msgstr "Orizontal:"
+msgstr "Bază o_rizontală:"
 
 #: ../plug-ins/common/align-layers.c:457
 msgid "Fill (top to bottom)"
@@ -372,29 +347,24 @@ msgid "Fill (bottom to top)"
 msgstr "Umple (de jos în sus)"
 
 #: ../plug-ins/common/align-layers.c:468
-#, fuzzy
 msgid "_Vertical style:"
-msgstr "Vertical:"
+msgstr "Stil _vertical:"
 
 #: ../plug-ins/common/align-layers.c:471
-#, fuzzy
 msgid "Top edge"
-msgstr "Formă"
+msgstr "Marginea de sus"
 
 #: ../plug-ins/common/align-layers.c:473
-#, fuzzy
 msgid "Bottom edge"
-msgstr "Margine:"
+msgstr "Marginea de jos"
 
 #: ../plug-ins/common/align-layers.c:482
-#, fuzzy
 msgid "Ver_tical base:"
-msgstr "Vertical:"
+msgstr "Bază ver_ticală:"
 
 #: ../plug-ins/common/align-layers.c:486
-#, fuzzy
 msgid "_Grid size:"
-msgstr "Dimensiune previzualizare:"
+msgstr "Dimensiune _grilă:"
 
 #: ../plug-ins/common/align-layers.c:495
 msgid "_Ignore the bottom layer even if visible"
@@ -427,19 +397,17 @@ msgstr "_Optimizat (diferență)"
 msgid "Remove optimization to make editing easier"
 msgstr "Elimină optimizarea pentru a face editarea mai ușoară"
 
-# hm ?
 #: ../plug-ins/common/animation-optimize.c:178
 msgid "_Unoptimize"
 msgstr "_De-optimizează"
 
 #: ../plug-ins/common/animation-optimize.c:198
-#, fuzzy
 msgid "_Remove Backdrop"
-msgstr "Refacere"
+msgstr "Elimină fundalul de c_romakey"
 
 #: ../plug-ins/common/animation-optimize.c:214
 msgid "_Find Backdrop"
-msgstr "_Caută copia de siguranță"
+msgstr "Caută _fundalul de croma key"
 
 #: ../plug-ins/common/animation-optimize.c:427
 msgid "Unoptimizing animation"
@@ -450,23 +418,20 @@ msgid "Removing animation background"
 msgstr "Eliminare fundal animație"
 
 #: ../plug-ins/common/animation-optimize.c:433
-#, fuzzy
 msgid "Finding animation background"
-msgstr "Transparent"
+msgstr "Căutare anumație de fundal"
 
 #: ../plug-ins/common/animation-optimize.c:437
-#, fuzzy
 msgid "Optimizing animation"
-msgstr "Transformare"
+msgstr "Optimizare animație"
 
 #: ../plug-ins/common/animation-play.c:163
 msgid "Preview a GIMP layer-based animation"
 msgstr "Previzualizează o animație GIMP bazată pe straturi"
 
 #: ../plug-ins/common/animation-play.c:168
-#, fuzzy
 msgid "_Playback..."
-msgstr "Așteptați vă rog..."
+msgstr "_Redare..."
 
 #: ../plug-ins/common/animation-play.c:447
 msgid "_Step"
@@ -477,9 +442,8 @@ msgid "Step to next frame"
 msgstr "Treaptă la cadrul următor"
 
 #: ../plug-ins/common/animation-play.c:451
-#, fuzzy
 msgid "Rewind the animation"
-msgstr "Opțiuni:\n"
+msgstr "Derulează înapoi animația"
 
 #: ../plug-ins/common/animation-play.c:469
 msgid "Faster"
@@ -498,20 +462,17 @@ msgid "Decrease the speed of the animation"
 msgstr "Scade viteza animației"
 
 #: ../plug-ins/common/animation-play.c:479
-#, fuzzy
 msgid "Reset speed"
-msgstr "Fișier nou"
+msgstr "Restabilește viteza"
 
 #: ../plug-ins/common/animation-play.c:479
-#, fuzzy
 msgid "Reset the speed of the animation"
-msgstr "Salvează o copie a imaginii"
+msgstr "Restabilește viteza animației"
 
 #: ../plug-ins/common/animation-play.c:487
 #: ../plug-ins/common/animation-play.c:1446
-#, fuzzy
 msgid "Start playback"
-msgstr "Numai negru"
+msgstr "Pornește redarea"
 
 #: ../plug-ins/common/animation-play.c:491
 msgid "Detach"
@@ -579,24 +540,20 @@ msgid "Direction"
 msgstr "Direcție"
 
 #: ../plug-ins/common/apply-canvas.c:1296
-#, fuzzy
 msgid "_Top-right"
-msgstr "Copyright:"
+msgstr "Sus-dreap_ta"
 
 #: ../plug-ins/common/apply-canvas.c:1297
-#, fuzzy
 msgid "Top-_left"
-msgstr "Coboară canalul"
+msgstr "Sus-stâng_a"
 
 #: ../plug-ins/common/apply-canvas.c:1298
-#, fuzzy
 msgid "_Bottom-left"
-msgstr "Marire"
+msgstr "Jos-_stânga"
 
 #: ../plug-ins/common/apply-canvas.c:1299
-#, fuzzy
 msgid "Bottom-_right"
-msgstr "Copyright:"
+msgstr "Jos-d_reapta"
 
 #: ../plug-ins/common/apply-canvas.c:1324 ../plug-ins/common/bump-map.c:916
 #: ../plug-ins/common/emboss.c:523 ../plug-ins/common/fractal-trace.c:796
@@ -649,9 +606,9 @@ msgstr "_Vertical"
 #: ../plug-ins/common/file-tga.c:1064 ../plug-ins/common/file-tiff-load.c:997
 #: ../plug-ins/common/file-xbm.c:896 ../plug-ins/common/film.c:746
 #: ../plug-ins/common/smooth-palette.c:257 ../plug-ins/common/tile.c:267
-#: ../plug-ins/file-bmp/bmp-read.c:590 ../plug-ins/file-faxg3/faxg3.c:478
-#: ../plug-ins/file-fits/fits.c:530 ../plug-ins/file-jpeg/jpeg-load.c:249
-#: ../plug-ins/file-jpeg/jpeg-load.c:761
+#: ../plug-ins/file-bmp/bmp-read.c:382 ../plug-ins/file-bmp/bmp-read.c:617
+#: ../plug-ins/file-faxg3/faxg3.c:478 ../plug-ins/file-fits/fits.c:530
+#: ../plug-ins/file-jpeg/jpeg-load.c:249 ../plug-ins/file-jpeg/jpeg-load.c:761
 #: ../plug-ins/file-psd/psd-image-res-load.c:995
 #: ../plug-ins/file-psd/psd-load.c:1526 ../plug-ins/file-sgi/sgi.c:384
 #: ../plug-ins/gfig/gfig-dialog.c:1284
@@ -702,9 +659,8 @@ msgid "_Blur radius:"
 msgstr "_Rază de neclaritate:"
 
 #: ../plug-ins/common/blur-gauss-selective.c:281
-#, fuzzy
 msgid "_Max. delta:"
-msgstr "Adâncimea maximă:"
+msgstr ""
 
 #: ../plug-ins/common/blur-gauss.c:159
 msgid "Simplest, most commonly used way of blurring"
@@ -730,12 +686,12 @@ msgid "Blur Radius"
 msgstr "Rază de neclaritate"
 
 #: ../plug-ins/common/blur-gauss.c:522 ../plug-ins/common/jigsaw.c:2457
-#: ../plug-ins/common/noise-spread.c:384
+#: ../plug-ins/common/noise-spread.c:386
 msgid "_Horizontal:"
 msgstr "_Orizontal:"
 
 #: ../plug-ins/common/blur-gauss.c:526 ../plug-ins/common/jigsaw.c:2474
-#: ../plug-ins/common/noise-spread.c:388
+#: ../plug-ins/common/noise-spread.c:390
 msgid "_Vertical:"
 msgstr "_Vertical:"
 
@@ -841,19 +797,16 @@ msgid "Set foreground to the average color of the image border"
 msgstr "Stabilește culoarea de prim plan la culoarea medie a bordurii imaginii"
 
 #: ../plug-ins/common/border-average.c:104
-#, fuzzy
 msgid "_Border Average..."
-msgstr "Margine:"
+msgstr "Medie de _bordură..."
 
 #: ../plug-ins/common/border-average.c:171
-#, fuzzy
 msgid "Border Average"
-msgstr "Margine:"
+msgstr "Medie de bordură"
 
 #: ../plug-ins/common/border-average.c:351
-#, fuzzy
 msgid "Borderaverage"
-msgstr "Margine:"
+msgstr "Medie de bordură"
 
 #: ../plug-ins/common/border-average.c:372
 msgid "Border Size"
@@ -1062,17 +1015,17 @@ msgstr "Încarcă configurările mixerului de canale"
 #: ../plug-ins/common/file-compressor.c:666
 #: ../plug-ins/common/file-dicom.c:325 ../plug-ins/common/file-gbr.c:361
 #: ../plug-ins/common/file-gif-load.c:340 ../plug-ins/common/file-gih.c:662
-#: ../plug-ins/common/file-mng.c:1073 ../plug-ins/common/file-pat.c:330
+#: ../plug-ins/common/file-mng.c:1108 ../plug-ins/common/file-pat.c:330
 #: ../plug-ins/common/file-pcx.c:361 ../plug-ins/common/file-pdf.c:541
 #: ../plug-ins/common/file-pix.c:343 ../plug-ins/common/file-png.c:721
 #: ../plug-ins/common/file-pnm.c:494 ../plug-ins/common/file-ps.c:1036
 #: ../plug-ins/common/file-ps.c:3048 ../plug-ins/common/file-psp.c:1751
 #: ../plug-ins/common/file-raw.c:249 ../plug-ins/common/file-raw.c:666
 #: ../plug-ins/common/file-sunras.c:391 ../plug-ins/common/file-svg.c:333
-#: ../plug-ins/common/file-svg.c:718 ../plug-ins/common/file-tga.c:442
+#: ../plug-ins/common/file-svg.c:731 ../plug-ins/common/file-tga.c:442
 #: ../plug-ins/common/file-tiff-load.c:291 ../plug-ins/common/file-xbm.c:736
 #: ../plug-ins/common/file-xwd.c:433 ../plug-ins/common/sphere-designer.c:2002
-#: ../plug-ins/file-bmp/bmp-read.c:154 ../plug-ins/file-faxg3/faxg3.c:233
+#: ../plug-ins/file-bmp/bmp-read.c:156 ../plug-ins/file-faxg3/faxg3.c:233
 #: ../plug-ins/file-fits/fits.c:358 ../plug-ins/file-fli/fli-gimp.c:460
 #: ../plug-ins/file-fli/fli-gimp.c:497 ../plug-ins/file-ico/ico-load.c:653
 #: ../plug-ins/file-ico/ico-load.c:732 ../plug-ins/file-jpeg/jpeg-load.c:109
@@ -1104,14 +1057,14 @@ msgstr "Salvează configurările mixerului de canale"
 #: ../plug-ins/common/file-csource.c:406 ../plug-ins/common/file-dicom.c:801
 #: ../plug-ins/common/file-gbr.c:632 ../plug-ins/common/file-gif-save.c:761
 #: ../plug-ins/common/file-gih.c:1275 ../plug-ins/common/file-html-table.c:236
-#: ../plug-ins/common/file-mng.c:575 ../plug-ins/common/file-mng.c:909
+#: ../plug-ins/common/file-mng.c:610 ../plug-ins/common/file-mng.c:944
 #: ../plug-ins/common/file-pat.c:462 ../plug-ins/common/file-pcx.c:666
 #: ../plug-ins/common/file-pix.c:524 ../plug-ins/common/file-png.c:1270
 #: ../plug-ins/common/file-pnm.c:977 ../plug-ins/common/file-ps.c:1213
 #: ../plug-ins/common/file-raw.c:546 ../plug-ins/common/file-raw.c:574
 #: ../plug-ins/common/file-sunras.c:563 ../plug-ins/common/file-tga.c:1170
 #: ../plug-ins/common/file-tiff-save.c:683 ../plug-ins/common/file-xbm.c:1034
-#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2112
+#: ../plug-ins/common/file-xwd.c:614 ../plug-ins/common/sphere-designer.c:2111
 #: ../plug-ins/file-bmp/bmp-write.c:296 ../plug-ins/file-fits/fits.c:476
 #: ../plug-ins/file-fli/fli-gimp.c:750 ../plug-ins/file-ico/ico-save.c:1008
 #: ../plug-ins/file-jpeg/jpeg-save.c:325 ../plug-ins/file-psd/psd-save.c:1635
@@ -1155,7 +1108,7 @@ msgstr "Dimen_siune:"
 
 #: ../plug-ins/common/checkerboard.c:421
 msgid "_Psychobilly"
-msgstr ""
+msgstr "_Psihedelic"
 
 #: ../plug-ins/common/cml-explorer.c:129
 msgid "Keep image's values"
@@ -1203,7 +1156,7 @@ msgstr "Funcție delta în trepte"
 
 #: ../plug-ins/common/cml-explorer.c:140
 msgid "sin^p-based function"
-msgstr "funcție bazată pe sin^p"
+msgstr "Funcție bazată pe sin^p"
 
 #: ../plug-ins/common/cml-explorer.c:141
 msgid "sin^p, stepped"
@@ -1279,31 +1232,31 @@ msgstr "Folosește valoarea inversă"
 
 #: ../plug-ins/common/cml-explorer.c:203
 msgid "With random power (0,10)"
-msgstr ""
+msgstr "Cu putere aleatoare (0,10)"
 
 #: ../plug-ins/common/cml-explorer.c:204
 msgid "With random power (0,1)"
-msgstr ""
+msgstr "Cu putere aleatoare (0,1)"
 
 #: ../plug-ins/common/cml-explorer.c:205
 msgid "With gradient power (0,1)"
-msgstr ""
+msgstr "Cu putere aleatoare (0,1)"
 
 #: ../plug-ins/common/cml-explorer.c:206
 msgid "Multiply rand. value (0,1)"
-msgstr ""
+msgstr "Înmulțit, valoare aleatoare (0,1)"
 
 #: ../plug-ins/common/cml-explorer.c:207
 msgid "Multiply rand. value (0,2)"
-msgstr ""
+msgstr "Înmulțit, valoare aleatoare (0,2)"
 
 #: ../plug-ins/common/cml-explorer.c:208
 msgid "Multiply gradient (0,1)"
-msgstr ""
+msgstr "Înmulțit, gradual (0,1)"
 
 #: ../plug-ins/common/cml-explorer.c:209
 msgid "With p and random (0,1)"
-msgstr ""
+msgstr "Cu p și aleator (0,1)"
 
 #: ../plug-ins/common/cml-explorer.c:223
 msgid "All black"
@@ -1318,9 +1271,8 @@ msgid "All white"
 msgstr "Totul alb"
 
 #: ../plug-ins/common/cml-explorer.c:226
-#, fuzzy
 msgid "The first row of the image"
-msgstr "Salvează o copie a imaginii"
+msgstr "Primul rând al imaginii"
 
 #: ../plug-ins/common/cml-explorer.c:227
 msgid "Continuous gradient"
@@ -1328,23 +1280,23 @@ msgstr "Degrade continuu"
 
 #: ../plug-ins/common/cml-explorer.c:228
 msgid "Continuous grad. w/o gap"
-msgstr ""
+msgstr "Degrade continuu, fără spații goale"
 
 #: ../plug-ins/common/cml-explorer.c:229
 msgid "Random, ch. independent"
-msgstr ""
+msgstr "Aleator, independent de canal"
 
 #: ../plug-ins/common/cml-explorer.c:230
 msgid "Random shared"
-msgstr ""
+msgstr "Aleator, partajat"
 
 #: ../plug-ins/common/cml-explorer.c:231
 msgid "Randoms from seed"
-msgstr ""
+msgstr "Aleatoare din sămânță"
 
 #: ../plug-ins/common/cml-explorer.c:232
 msgid "Randoms from seed (shared)"
-msgstr ""
+msgstr "Aleatoare din sămânță (partajat)"
 
 #: ../plug-ins/common/cml-explorer.c:300 ../plug-ins/common/cml-explorer.c:308
 #: ../plug-ins/common/decompose.c:188
@@ -1356,7 +1308,7 @@ msgstr "Nuanță"
 #: ../plug-ins/common/cml-explorer.c:301 ../plug-ins/common/cml-explorer.c:309
 #: ../plug-ins/common/decompose.c:189
 msgid "Saturation"
-msgstr "Saturare"
+msgstr "Saturație"
 
 #: ../plug-ins/common/cml-explorer.c:302 ../plug-ins/common/cml-explorer.c:310
 #: ../plug-ins/common/decompose.c:190
@@ -1371,34 +1323,31 @@ msgstr "(Nimic)"
 
 #: ../plug-ins/common/cml-explorer.c:455
 msgid "Create abstract Coupled-Map Lattice patterns"
-msgstr ""
+msgstr "Creează modele abstracte Coupled-Map Lattice"
 
 #: ../plug-ins/common/cml-explorer.c:466
 msgid "CML _Explorer..."
-msgstr ""
+msgstr "_Explorator CML..."
 
 #: ../plug-ins/common/cml-explorer.c:756
 msgid "CML Explorer: evoluting"
-msgstr ""
+msgstr "Explorator CML: evoluție"
 
 #: ../plug-ins/common/cml-explorer.c:1177
 msgid "Coupled-Map-Lattice Explorer"
-msgstr ""
+msgstr "Explorator Coupled-Map-Lattice"
 
 #: ../plug-ins/common/cml-explorer.c:1224
-#, fuzzy
 msgid "New Seed"
-msgstr "Fișier nou"
+msgstr "Sămânță nouă"
 
 #: ../plug-ins/common/cml-explorer.c:1235
-#, fuzzy
 msgid "Fix Seed"
-msgstr "Viteză:"
+msgstr "Sămânță fixă"
 
 #: ../plug-ins/common/cml-explorer.c:1246
-#, fuzzy
 msgid "Random Seed"
-msgstr "Re-Refacere"
+msgstr "Sămânță aleatoare"
 
 #: ../plug-ins/common/cml-explorer.c:1288 ../plug-ins/common/filter-pack.c:700
 #: ../plug-ins/common/van-gogh-lic.c:671
@@ -1417,10 +1366,10 @@ msgstr "_Valoare"
 msgid "_Advanced"
 msgstr "_Avansat"
 
+# hm ? cu un singur i ?
 #: ../plug-ins/common/cml-explorer.c:1315
-#, fuzzy
 msgid "Channel Independent Parameters"
-msgstr "Opțiuni pentru noul canal"
+msgstr "Parametri independenți de canal"
 
 #: ../plug-ins/common/cml-explorer.c:1337
 msgid "Initial value:"
@@ -1436,16 +1385,15 @@ msgstr "Decalaj de pornire:"
 
 #: ../plug-ins/common/cml-explorer.c:1361
 msgid "Seed of Random (only for \"From Seed\" Modes)"
-msgstr ""
+msgstr "Sămânță de aleator (numai pentru modurile „Din sămânță”)"
 
 #: ../plug-ins/common/cml-explorer.c:1372 ../plug-ins/maze/maze-dialog.c:261
-#, fuzzy
 msgid "Seed:"
-msgstr "Viteză:"
+msgstr "Sămânță:"
 
 #: ../plug-ins/common/cml-explorer.c:1385
 msgid "Switch to \"From seed\" With the Last Seed"
-msgstr ""
+msgstr "Comută la „Din sămânță” cu ultima sămânță"
 
 #: ../plug-ins/common/cml-explorer.c:1397
 msgid ""
@@ -1456,49 +1404,42 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/common/cml-explorer.c:1405
-#, fuzzy
 msgid "O_thers"
-msgstr "Pană"
+msgstr "Al_tele"
 
 #: ../plug-ins/common/cml-explorer.c:1420
 msgid "Copy Settings"
-msgstr ""
+msgstr "Copiere setări"
 
 #: ../plug-ins/common/cml-explorer.c:1439
-#, fuzzy
 msgid "Source channel:"
-msgstr "Coboară canalul"
+msgstr "Canal sursă:"
 
 #: ../plug-ins/common/cml-explorer.c:1454
 #: ../plug-ins/common/cml-explorer.c:1502
-#, fuzzy
 msgid "Destination channel:"
-msgstr "Informații despre canal:"
+msgstr "Canal de destinație:"
 
 #: ../plug-ins/common/cml-explorer.c:1458
-#, fuzzy
 msgid "Copy Parameters"
-msgstr "/Copiază traseu"
+msgstr "Copiază parametrii"
 
 #: ../plug-ins/common/cml-explorer.c:1467
-#, fuzzy
 msgid "Selective Load Settings"
-msgstr "Operație de selecție"
+msgstr "Setări de încărcare selective"
 
 #: ../plug-ins/common/cml-explorer.c:1487
-#, fuzzy
 msgid "Source channel in file:"
-msgstr "Nume canal:"
+msgstr "Canal sursă în fișier:"
 
+# hm ? sigur ops. înseamnă options ?
 #: ../plug-ins/common/cml-explorer.c:1508
-#, fuzzy
 msgid "_Misc Ops."
-msgstr "Operații pe fișiere"
+msgstr "Opț. div_erse"
 
 #: ../plug-ins/common/cml-explorer.c:1557
-#, fuzzy
 msgid "Function type:"
-msgstr "Tip de interpolare:"
+msgstr "Tip de funcție:"
 
 #: ../plug-ins/common/cml-explorer.c:1573
 msgid "Composition:"
@@ -1506,126 +1447,116 @@ msgstr "Compoziție:"
 
 #: ../plug-ins/common/cml-explorer.c:1587
 msgid "Misc arrange:"
-msgstr ""
+msgstr "Aranjament divers:"
 
 #: ../plug-ins/common/cml-explorer.c:1591
 msgid "Use cyclic range"
-msgstr ""
+msgstr "Folosește un interval ciclic"
 
 #: ../plug-ins/common/cml-explorer.c:1601
-#, fuzzy
 msgid "Mod. rate:"
-msgstr "Mod:"
+msgstr "Rată de modifiare:"
 
 #: ../plug-ins/common/cml-explorer.c:1610
-#, fuzzy
 msgid "Env. sensitivity:"
-msgstr "Sensibilitate"
+msgstr "Sensib. de mediu:"
 
 #: ../plug-ins/common/cml-explorer.c:1619
 msgid "Diffusion dist.:"
-msgstr ""
+msgstr "Dist. de difuzie:"
 
 #: ../plug-ins/common/cml-explorer.c:1628
 msgid "# of subranges:"
-msgstr ""
+msgstr "Nr. de subintervale:"
 
 #: ../plug-ins/common/cml-explorer.c:1637
 msgid "P(ower factor):"
-msgstr ""
+msgstr "P (factor de putere):"
 
 #: ../plug-ins/common/cml-explorer.c:1646
 msgid "Parameter k:"
-msgstr ""
+msgstr "Parametru k:"
 
 #: ../plug-ins/common/cml-explorer.c:1655
-#, fuzzy
 msgid "Range low:"
-msgstr "Rotire"
+msgstr "Interval inferior:"
 
 #: ../plug-ins/common/cml-explorer.c:1664
-#, fuzzy
 msgid "Range high:"
-msgstr "Înălțime:"
+msgstr "Interval superior:"
 
 #: ../plug-ins/common/cml-explorer.c:1676
-#, fuzzy
 msgid "Plot a Graph of the Settings"
-msgstr "Selecție model"
+msgstr "Desenează un grafic al setărilor"
 
 #: ../plug-ins/common/cml-explorer.c:1721
-#, fuzzy
 msgid "Ch. sensitivity:"
-msgstr "Sensibilitate"
+msgstr "Sensibilitate canal:"
 
 #: ../plug-ins/common/cml-explorer.c:1731
-#, fuzzy
 msgid "Mutation rate:"
-msgstr "Rotire"
+msgstr "Rată mutație:"
 
 #: ../plug-ins/common/cml-explorer.c:1741
-#, fuzzy
 msgid "Mutation dist.:"
-msgstr "Saturare:"
+msgstr "Distanță mutație:"
 
 #: ../plug-ins/common/cml-explorer.c:1819
-#, fuzzy
 msgid "Graph of the Current Settings"
-msgstr "Selecție model"
+msgstr "Graficul setărilor curente"
 
 #: ../plug-ins/common/cml-explorer.c:1890
 msgid "Warning: the source and the destination are the same channel."
-msgstr ""
+msgstr "Avertisment: sursa și destinația sunt același canal."
 
 #: ../plug-ins/common/cml-explorer.c:1949
-#, fuzzy
 msgid "Save CML Explorer Parameters"
-msgstr "Salvez Preferințele ?"
+msgstr "Salvare parametri explorator CML"
 
+# titlu
 #: ../plug-ins/common/cml-explorer.c:2082
-#, fuzzy
 msgid "Load CML Explorer Parameters"
-msgstr "Încarcă din"
+msgstr "Încărcare parametri explorator CML"
 
 #: ../plug-ins/common/cml-explorer.c:2200
 msgid "Error: it's not CML parameter file."
-msgstr ""
+msgstr "Eroare: nu este un fișier de parametri de explorator CML."
 
 #: ../plug-ins/common/cml-explorer.c:2207
 #, c-format
 msgid "Warning: '%s' is an old format file."
-msgstr ""
+msgstr "Avertisment: „%s” este un fișier de format vechi"
 
 #: ../plug-ins/common/cml-explorer.c:2211
 #, c-format
 msgid "Warning: '%s' is a parameter file for a newer version of CML Explorer."
 msgstr ""
+"Avertisment: „%s” este un fișier de parametri pentru o versiunea mai nouă a "
+"exploratorului CML."
 
 #: ../plug-ins/common/cml-explorer.c:2274
 msgid "Error: failed to load parameters"
-msgstr ""
+msgstr "Eroare: încărcarea parametrilor a eșuat."
 
 #: ../plug-ins/common/color-cube-analyze.c:106
-#, fuzzy
 msgid "Analyze the set of colors in the image"
-msgstr "Salvează o copie a imaginii"
+msgstr "Analizează setul de culori în imagine"
 
 #: ../plug-ins/common/color-cube-analyze.c:112
-#, fuzzy
 msgid "Colorcube A_nalysis..."
-msgstr "/Filtre/Culori"
+msgstr "A_nalizează spațiul de culoare..."
 
 #: ../plug-ins/common/color-cube-analyze.c:200
 #: ../plug-ins/common/color-cube-analyze.c:356
 msgid "Colorcube Analysis"
-msgstr ""
+msgstr "Analiză de spațiu de culoare"
 
 #. output results
 #: ../plug-ins/common/color-cube-analyze.c:384
 #: ../plug-ins/imagemap/imap_cmd_guides.c:231
 #, c-format
 msgid "Image dimensions: %d × %d"
-msgstr ""
+msgstr "Dimensiuni imagine: %d × %d"
 
 #: ../plug-ins/common/color-cube-analyze.c:387
 msgid "No colors"
@@ -1633,7 +1564,7 @@ msgstr "Fără culori"
 
 #: ../plug-ins/common/color-cube-analyze.c:389
 msgid "Only one unique color"
-msgstr ""
+msgstr "Numai o culoare unică"
 
 #: ../plug-ins/common/color-cube-analyze.c:391
 #, c-format
@@ -1658,16 +1589,17 @@ msgstr "Permută o culoare cu alta"
 
 #: ../plug-ins/common/color-exchange.c:128
 msgid "_Color Exchange..."
-msgstr "Schimbare de _culoare..."
+msgstr "Schimb de _culori..."
 
 #: ../plug-ins/common/color-exchange.c:213
 #: ../plug-ins/common/color-exchange.c:287
 msgid "Color Exchange"
-msgstr "Schimbare de culoare"
+msgstr "Schimb de culori"
 
 #: ../plug-ins/common/color-exchange.c:309
 msgid "Middle-Click Inside Preview to Pick \"From Color\""
 msgstr ""
+"Clic mijloc în interiorul previzualizării pentru a alege „De la culoarea”"
 
 #: ../plug-ins/common/color-exchange.c:347
 msgid "To Color"
@@ -1677,13 +1609,15 @@ msgstr "La culoarea"
 msgid "From Color"
 msgstr "De la culoarea"
 
+# hm ? sau culoare destinație ?
 #: ../plug-ins/common/color-exchange.c:365
 msgid "Color Exchange: To Color"
-msgstr ""
+msgstr "Schimb de culori: la culoarea"
 
+# hm ? sau culoare sursă ?
 #: ../plug-ins/common/color-exchange.c:366
 msgid "Color Exchange: From Color"
-msgstr ""
+msgstr "Schimb de culori: de la culoarea"
 
 #: ../plug-ins/common/color-exchange.c:424
 msgid "R_ed threshold:"
@@ -1732,12 +1666,13 @@ msgstr "Înlocuiește toate culorile cu nuanțe ale unei culori specificate"
 
 #: ../plug-ins/common/colorify.c:108
 msgid "Colorif_y..."
-msgstr "_Colorizare..."
+msgstr "_Colorizează..."
 
 #: ../plug-ins/common/colorify.c:169
 msgid "Colorifying"
 msgstr "Colorizare"
 
+# titlu
 #: ../plug-ins/common/colorify.c:255
 msgid "Colorify"
 msgstr "Colorizare"
@@ -1782,29 +1717,24 @@ msgid "Sort on Hue"
 msgstr "Sortează pe bază de nuanță"
 
 #: ../plug-ins/common/colormap-remap.c:485
-#, fuzzy
 msgid "Sort on Saturation"
-msgstr "Saturare"
+msgstr "Sortează după saturație"
 
 #: ../plug-ins/common/colormap-remap.c:489
-#, fuzzy
 msgid "Sort on Value"
-msgstr "Modulul propriu GIMP"
+msgstr "Sortează după valoare"
 
 #: ../plug-ins/common/colormap-remap.c:493
-#, fuzzy
 msgid "Reverse Order"
-msgstr "Refacere"
+msgstr "Inversează ordinea"
 
 #: ../plug-ins/common/colormap-remap.c:497
-#, fuzzy
 msgid "Reset Order"
-msgstr "Inițializează"
+msgstr "Resetează ordinea"
 
 #: ../plug-ins/common/colormap-remap.c:596
-#, fuzzy
 msgid "Rearrange Colormap"
-msgstr "Rotesc..."
+msgstr "Rearanjează harta de culori"
 
 #: ../plug-ins/common/colormap-remap.c:699
 msgid ""
@@ -1970,45 +1900,44 @@ msgstr "Compunere"
 
 #: ../plug-ins/common/compose.c:697 ../plug-ins/common/compose.c:1735
 msgid "At least one image is needed to compose"
-msgstr ""
+msgstr "Este necesară cel puțin o imagine pentru a compune"
 
 #: ../plug-ins/common/compose.c:708 ../plug-ins/common/compose.c:722
 #, c-format
 msgid "Specified layer %d not found"
-msgstr ""
+msgstr "Stratul %d specificat nu a fost găsit"
 
 #: ../plug-ins/common/compose.c:730
 msgid "Drawables have different size"
-msgstr ""
+msgstr "Figurile au dimensiuni diferite"
 
 #: ../plug-ins/common/compose.c:755
 msgid "Images have different size"
-msgstr ""
+msgstr "Imaginile au înălțimi diferite"
 
 #: ../plug-ins/common/compose.c:773
-#, fuzzy
 msgid "Error in getting layer IDs"
-msgstr "strat plutitor"
+msgstr "Eroare la obținerea ID-urilor de strat"
 
 #: ../plug-ins/common/compose.c:796
 #, c-format
 msgid "Image is not a gray image (bpp=%d)"
-msgstr ""
+msgstr "Imaginea nu este o imagine gri (bpp=%d)"
 
 # hm ? sau recompune ?
 #: ../plug-ins/common/compose.c:824
 msgid "Unable to recompose, source layer not found"
 msgstr "Nu se poate reconstitui, stratul sursă nu a fost găsit"
 
+# titlu
 #: ../plug-ins/common/compose.c:1488
 msgid "Compose"
-msgstr "Compune"
+msgstr "Compunere"
 
 #. Compose type combo
 #: ../plug-ins/common/compose.c:1515
-#, fuzzy
 msgid "Compose Channels"
-msgstr "Ridică canalul"
+msgstr "Compunere de canale"
 
 #: ../plug-ins/common/compose.c:1525 ../plug-ins/common/decompose.c:1515
 msgid "Color _model:"
@@ -2038,7 +1967,7 @@ msgstr "Normalizare"
 
 #: ../plug-ins/common/contrast-retinex.c:156
 msgid "Enhance contrast using the Retinex method"
-msgstr "Ameliorează contrastul utilizând metoda Retinex"
+msgstr "Îmbunătățește contrastul folosind metoda Retinex"
 
 #: ../plug-ins/common/contrast-retinex.c:166
 msgid "Retine_x..."
@@ -2050,7 +1979,7 @@ msgstr "Retinex"
 
 #: ../plug-ins/common/contrast-retinex.c:286
 msgid "Retinex Image Enhancement"
-msgstr "Ameliorare de imagine Retinex"
+msgstr "Îmbunătățire de imagine Retinex"
 
 #: ../plug-ins/common/contrast-retinex.c:321
 msgid "Uniform"
@@ -2133,7 +2062,7 @@ msgstr "_Verde"
 #: ../plug-ins/common/convolution-matrix.c:67
 #: ../plug-ins/common/newsprint.c:361
 msgid "_Blue"
-msgstr "Al_bastru:"
+msgstr "Al_bastru"
 
 #: ../plug-ins/common/convolution-matrix.c:68
 msgid "_Alpha"
@@ -2155,27 +2084,23 @@ msgstr "Decu_pează"
 
 #: ../plug-ins/common/convolution-matrix.c:201
 msgid "Apply a generic 5x5 convolution matrix"
-msgstr ""
+msgstr "Aplică o matrice de convoluție generică de 5x5"
 
 #: ../plug-ins/common/convolution-matrix.c:206
-#, fuzzy
 msgid "_Convolution Matrix..."
-msgstr "/Filtre/Procesare"
+msgstr ""
 
 #: ../plug-ins/common/convolution-matrix.c:241
-#, fuzzy
 msgid "Convolution does not work on layers smaller than 3x3 pixels."
 msgstr ""
-"Transformările nu funcționează pe straturi\n"
-"care conțin strat mască."
 
 #: ../plug-ins/common/convolution-matrix.c:314
 msgid "Applying convolution"
-msgstr ""
+msgstr "Aplicare convoluție"
 
 #: ../plug-ins/common/convolution-matrix.c:906
 msgid "Convolution Matrix"
-msgstr ""
+msgstr "Matrice de convoluție"
 
 #: ../plug-ins/common/convolution-matrix.c:944
 msgid "Matrix"
@@ -2412,14 +2337,12 @@ msgid "Save the curves to a file"
 msgstr "Salvează curbele într-un fișier"
 
 #: ../plug-ins/common/curve-bend.c:2030
-#, fuzzy
 msgid "Load Curve Points from File"
-msgstr "Nu am reusit să citesc punctele de traseu din %s"
+msgstr "Încarcă punctele unei curbe din fișier"
 
 #: ../plug-ins/common/curve-bend.c:2065
-#, fuzzy
 msgid "Save Curve Points to File"
-msgstr "Salvare jurnal de erori în fișier..."
+msgstr "Salvează punctele curbei într-un fișier"
 
 #: ../plug-ins/common/decompose.c:170 ../plug-ins/common/decompose.c:174
 #: ../plug-ins/common/decompose.c:178
@@ -2599,7 +2522,7 @@ msgstr "Descompunere"
 
 #: ../plug-ins/common/decompose.c:1503
 msgid "Extract Channels"
-msgstr "Extrage canalele"
+msgstr "Extragere de canale"
 
 #: ../plug-ins/common/decompose.c:1550
 msgid "_Decompose to layers"
@@ -2644,15 +2567,15 @@ msgstr "Combină două imagini folosind hărți de adâncime (zone tampon pe axa
 
 #: ../plug-ins/common/depth-merge.c:193
 msgid "_Depth Merge..."
-msgstr "Contopire pe a_dâncime..."
+msgstr "Combinare pe a_dâncime..."
 
 #: ../plug-ins/common/depth-merge.c:387
 msgid "Depth-merging"
-msgstr "Contopire pe adâncime"
+msgstr "Combinare pe adâncime"
 
 #: ../plug-ins/common/depth-merge.c:644
 msgid "Depth Merge"
-msgstr "Contopire pe adâncime"
+msgstr "Combinare pe adâncime"
 
 #: ../plug-ins/common/depth-merge.c:696
 msgid "Source 1:"
@@ -2749,24 +2672,20 @@ msgid "Create _histogram"
 msgstr "Creează _histogramă"
 
 #: ../plug-ins/common/diffraction.c:167
-#, fuzzy
 msgid "Generate diffraction patterns"
-msgstr "/Ferestre de dialog/Modele..."
+msgstr "Generează modele de difracție"
 
 #: ../plug-ins/common/diffraction.c:172
-#, fuzzy
 msgid "_Diffraction Patterns..."
-msgstr "/Ferestre de dialog/Modele..."
+msgstr "Modele de _difracție..."
 
 #: ../plug-ins/common/diffraction.c:330
-#, fuzzy
 msgid "Creating diffraction pattern"
-msgstr "/Ferestre de dialog/Modele..."
+msgstr "Creare model de difracție"
 
 #: ../plug-ins/common/diffraction.c:434
-#, fuzzy
 msgid "Diffraction Patterns"
-msgstr "/Ferestre de dialog/Modele..."
+msgstr "Modele de difracție"
 
 #: ../plug-ins/common/diffraction.c:477
 #: ../plug-ins/map-object/map-object-ui.c:1388
@@ -2791,9 +2710,8 @@ msgid "_Brightness:"
 msgstr "_Luminozitate:"
 
 #: ../plug-ins/common/diffraction.c:624
-#, fuzzy
 msgid "Sc_attering:"
-msgstr "Scalare"
+msgstr "_Dispersie:"
 
 #: ../plug-ins/common/diffraction.c:633
 msgid "Po_larization:"
@@ -2816,9 +2734,8 @@ msgid "_Y displacement"
 msgstr "Deplasament _Y"
 
 #: ../plug-ins/common/displace.c:143
-#, fuzzy
 msgid "_Whirl"
-msgstr "Alb"
+msgstr ""
 
 #: ../plug-ins/common/displace.c:169
 msgid "Displace pixels as indicated by displacement maps"
@@ -2881,14 +2798,12 @@ msgid "_Difference of Gaussians..."
 msgstr "_Diferențe gaussiene..."
 
 #: ../plug-ins/common/edge-dog.c:243 ../plug-ins/common/edge-dog.c:300
-#, fuzzy
 msgid "DoG Edge Detect"
-msgstr "Selecție bordură"
+msgstr ""
 
 #: ../plug-ins/common/edge-dog.c:329
-#, fuzzy
 msgid "Smoothing Parameters"
-msgstr "/Copiază traseu"
+msgstr ""
 
 #: ../plug-ins/common/edge-dog.c:343
 msgid "_Radius 1:"
@@ -2975,33 +2890,28 @@ msgid "_Edge..."
 msgstr "Margin_e..."
 
 #: ../plug-ins/common/edge.c:229
-#, fuzzy
 msgid "Edge detection"
-msgstr "Selecție bordură"
+msgstr ""
 
 #: ../plug-ins/common/edge.c:633
-#, fuzzy
 msgid "Edge Detection"
-msgstr "Selecție bordură"
+msgstr ""
 
 #: ../plug-ins/common/edge.c:668
-#, fuzzy
 msgid "Sobel"
-msgstr "Sursă"
+msgstr ""
 
 #: ../plug-ins/common/edge.c:669
-#, fuzzy
 msgid "Prewitt compass"
-msgstr "Presiune"
+msgstr ""
 
 #: ../plug-ins/common/edge.c:670 ../plug-ins/common/sinus.c:904
 msgid "Gradient"
 msgstr "Degrade"
 
 #: ../plug-ins/common/edge.c:671
-#, fuzzy
 msgid "Roberts"
-msgstr "puncte"
+msgstr ""
 
 #: ../plug-ins/common/edge.c:672
 msgid "Differential"
@@ -3091,9 +3001,8 @@ msgid "KISS CEL"
 msgstr "KISS CEL"
 
 #: ../plug-ins/common/file-cel.c:191
-#, fuzzy
 msgid "Load KISS Palette"
-msgstr "Încarcă traseul"
+msgstr ""
 
 #. max. rows allocated
 #. column, highest column ever used
@@ -3109,7 +3018,7 @@ msgstr "Încarcă traseul"
 #: ../plug-ins/common/file-tga.c:447 ../plug-ins/common/file-tiff-load.c:603
 #: ../plug-ins/common/file-wmf.c:994 ../plug-ins/common/file-xbm.c:741
 #: ../plug-ins/common/file-xpm.c:352 ../plug-ins/common/file-xwd.c:520
-#: ../plug-ins/file-bmp/bmp-read.c:159 ../plug-ins/file-faxg3/faxg3.c:217
+#: ../plug-ins/file-bmp/bmp-read.c:161 ../plug-ins/file-faxg3/faxg3.c:217
 #: ../plug-ins/file-fli/fli-gimp.c:502 ../plug-ins/file-ico/ico-load.c:646
 #: ../plug-ins/file-jpeg/jpeg-load.c:115 ../plug-ins/file-psd/psd-load.c:136
 #: ../plug-ins/file-sgi/sgi.c:331 ../plug-ins/file-xjt/xjt.c:3363
@@ -3118,9 +3027,8 @@ msgid "Opening '%s'"
 msgstr "Deschidere „%s”"
 
 #: ../plug-ins/common/file-cel.c:354
-#, fuzzy
 msgid "Can't create a new image"
-msgstr "Imagine nouă"
+msgstr ""
 
 #: ../plug-ins/common/file-cel.c:443
 #, c-format
@@ -3142,9 +3050,9 @@ msgstr ""
 #: ../plug-ins/file-ico/ico-save.c:1002 ../plug-ins/file-jpeg/jpeg-save.c:282
 #: ../plug-ins/file-psd/psd-save.c:1640 ../plug-ins/file-sgi/sgi.c:554
 #: ../plug-ins/file-xjt/xjt.c:1710
-#, fuzzy, c-format
+#, c-format
 msgid "Saving '%s'"
-msgstr "Spațiere:"
+msgstr ""
 
 #: ../plug-ins/common/file-compressor.c:160
 msgid "gzip archive"
@@ -3167,14 +3075,12 @@ msgid "C source code"
 msgstr "cod sursă C"
 
 #: ../plug-ins/common/file-csource.c:660
-#, fuzzy
 msgid "Save as C-Source"
-msgstr "Salvează curbe"
+msgstr ""
 
 #: ../plug-ins/common/file-csource.c:691
-#, fuzzy
 msgid "_Prefixed name:"
-msgstr "Tip cursor:"
+msgstr ""
 
 #: ../plug-ins/common/file-csource.c:700
 msgid "Co_mment:"
@@ -3219,9 +3125,9 @@ msgid "Desktop Link"
 msgstr ""
 
 #: ../plug-ins/common/file-desktop-link.c:173
-#, fuzzy, c-format
+#, c-format
 msgid "Error loading desktop file '%s': %s"
-msgstr "Eroare la deschiderea fișierului: %s\n"
+msgstr ""
 
 #: ../plug-ins/common/file-dicom.c:146
 msgid "DICOM image"
@@ -3244,9 +3150,8 @@ msgstr "Nu se pot salva imagini cu canal alfa."
 #: ../plug-ins/common/file-dicom.c:784 ../plug-ins/common/file-ps.c:1203
 #: ../plug-ins/common/file-xwd.c:604 ../plug-ins/file-fits/fits.c:466
 #: ../plug-ins/file-xjt/xjt.c:1705
-#, fuzzy
 msgid "Cannot operate on unknown image types."
-msgstr "Nu pot umple un tip necunoscut de imagine."
+msgstr ""
 
 # hm ?
 #: ../plug-ins/common/file-gbr.c:154 ../plug-ins/common/file-gbr.c:175
@@ -3406,7 +3311,7 @@ msgstr "Buc_lă infinită"
 msgid "_Delay between frames where unspecified:"
 msgstr "Întârziere între ca_dre acolo unde nu este specificat:"
 
-#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1474
+#: ../plug-ins/common/file-gif-save.c:1144 ../plug-ins/common/file-mng.c:1507
 msgid "milliseconds"
 msgstr "milisecunde"
 
@@ -3436,9 +3341,8 @@ msgid "U_se disposal entered above for all frames"
 msgstr "Folo_sește dispunerea introdusă mai sus pentru toate cadrele"
 
 #: ../plug-ins/common/file-gif-save.c:2341
-#, fuzzy
 msgid "Error writing output file."
-msgstr "Eroare la deschiderea fișierului: %s\n"
+msgstr ""
 
 #: ../plug-ins/common/file-gif-save.c:2411
 #, c-format
@@ -3475,7 +3379,7 @@ msgstr ""
 #: ../plug-ins/common/file-gih.c:911
 #, fuzzy
 msgid "Spacing (percent):"
-msgstr "Spațiere:"
+msgstr "Spațiere (procent):"
 
 #: ../plug-ins/common/file-gih.c:978
 msgid "Pixels"
@@ -3486,9 +3390,8 @@ msgid "Cell size:"
 msgstr "Dimensiune celulă:"
 
 #: ../plug-ins/common/file-gih.c:995
-#, fuzzy
 msgid "Number of cells:"
-msgstr "Numărul minim de culori:"
+msgstr "Număr de celule:"
 
 #: ../plug-ins/common/file-gih.c:1020
 msgid " Rows of "
@@ -3515,9 +3418,8 @@ msgid "Dimension:"
 msgstr "Dimensiune:"
 
 #: ../plug-ins/common/file-gih.c:1129
-#, fuzzy
 msgid "Ranks:"
-msgstr "Rază:"
+msgstr ""
 
 #: ../plug-ins/common/file-header.c:77
 msgid "C source code header"
@@ -3584,9 +3486,8 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/common/file-html-table.c:521
-#, fuzzy
 msgid "C_aption"
-msgstr "Rotire"
+msgstr ""
 
 #: ../plug-ins/common/file-html-table.c:527
 msgid "Check if you would like to have the table captioned."
@@ -3626,18 +3527,16 @@ msgid "The height for each table cell.  Can be a number or a percent."
 msgstr ""
 
 #: ../plug-ins/common/file-html-table.c:626
-#, fuzzy
 msgid "Cell-_padding:"
-msgstr "Spațiere:"
+msgstr ""
 
 #: ../plug-ins/common/file-html-table.c:630
 msgid "The amount of cellpadding."
 msgstr ""
 
 #: ../plug-ins/common/file-html-table.c:639
-#, fuzzy
 msgid "Cell-_spacing:"
-msgstr "Spațiere:"
+msgstr ""
 
 #: ../plug-ins/common/file-html-table.c:643
 msgid "The amount of cellspacing."
@@ -3649,109 +3548,103 @@ msgstr ""
 msgid "Couldn't losslessly save transparency, saving opacity instead."
 msgstr ""
 
-#: ../plug-ins/common/file-mng.c:1254
+#: ../plug-ins/common/file-mng.c:1287
 msgid "Save as MNG"
 msgstr "Salvează ca MNG"
 
-#: ../plug-ins/common/file-mng.c:1274
+#: ../plug-ins/common/file-mng.c:1307
 msgid "MNG Options"
 msgstr "Opțiuni MNG"
 
-#: ../plug-ins/common/file-mng.c:1280
+#: ../plug-ins/common/file-mng.c:1313
 msgid "Interlace"
 msgstr "Întrețese"
 
-#: ../plug-ins/common/file-mng.c:1292
-#, fuzzy
+#: ../plug-ins/common/file-mng.c:1325
 msgid "Save background color"
-msgstr "Fundal"
+msgstr ""
 
-#: ../plug-ins/common/file-mng.c:1303
+#: ../plug-ins/common/file-mng.c:1336
 msgid "Save gamma"
 msgstr "Salvează gama"
 
-#: ../plug-ins/common/file-mng.c:1313
+#: ../plug-ins/common/file-mng.c:1346
 msgid "Save resolution"
 msgstr "Salvează rezoluția"
 
-#: ../plug-ins/common/file-mng.c:1324
-#, fuzzy
+#: ../plug-ins/common/file-mng.c:1357
 msgid "Save creation time"
-msgstr "Salvare opțiuni"
+msgstr ""
 
-#: ../plug-ins/common/file-mng.c:1343
+#: ../plug-ins/common/file-mng.c:1376
 msgid "PNG"
 msgstr "PNG"
 
-#: ../plug-ins/common/file-mng.c:1344
+#: ../plug-ins/common/file-mng.c:1377
 msgid "JNG"
 msgstr "JNG"
 
-#: ../plug-ins/common/file-mng.c:1347
+#: ../plug-ins/common/file-mng.c:1380
 msgid "PNG + delta PNG"
 msgstr "PNG + PNG delta"
 
-#: ../plug-ins/common/file-mng.c:1348
+#: ../plug-ins/common/file-mng.c:1381
 msgid "JNG + delta PNG"
 msgstr "JNG + PNG delta"
 
-#: ../plug-ins/common/file-mng.c:1349
-#, fuzzy
+#: ../plug-ins/common/file-mng.c:1382
 msgid "All PNG"
-msgstr "Toate"
+msgstr ""
 
-#: ../plug-ins/common/file-mng.c:1350
-#, fuzzy
+#: ../plug-ins/common/file-mng.c:1383
 msgid "All JNG"
-msgstr "Toate"
+msgstr ""
 
-#: ../plug-ins/common/file-mng.c:1362
-#, fuzzy
+#: ../plug-ins/common/file-mng.c:1395
 msgid "Default chunks type:"
-msgstr "Tipul implicit de imagine:"
+msgstr ""
 
-#: ../plug-ins/common/file-mng.c:1365
+#: ../plug-ins/common/file-mng.c:1398
 msgid "Combine"
 msgstr "Combină"
 
-#: ../plug-ins/common/file-mng.c:1366
+#: ../plug-ins/common/file-mng.c:1399
 msgid "Replace"
 msgstr "Inlocuiește"
 
-#: ../plug-ins/common/file-mng.c:1377
-#, fuzzy
+#: ../plug-ins/common/file-mng.c:1410
 msgid "Default frame disposal:"
-msgstr "Tipul implicit de imagine:"
+msgstr ""
 
-#: ../plug-ins/common/file-mng.c:1389
+#: ../plug-ins/common/file-mng.c:1422
 msgid "PNG compression level:"
 msgstr "Nivel de compresie PNG:"
 
-#: ../plug-ins/common/file-mng.c:1397 ../plug-ins/common/file-png.c:1908
+#: ../plug-ins/common/file-mng.c:1430 ../plug-ins/common/file-png.c:1908
 msgid "Choose a high compression level for small file size"
 msgstr "Alegeți un nivel de mare compresie pentru dimensiune mică de fișier"
 
-#: ../plug-ins/common/file-mng.c:1411
+#: ../plug-ins/common/file-mng.c:1444
 msgid "JPEG compression quality:"
 msgstr "Calitate de compresie JPEG:"
 
-#: ../plug-ins/common/file-mng.c:1428
+#: ../plug-ins/common/file-mng.c:1461
 msgid "JPEG smoothing factor:"
 msgstr "Factor de netezire JPEG:"
 
-#: ../plug-ins/common/file-mng.c:1438
+#: ../plug-ins/common/file-mng.c:1471
 msgid "Animated MNG Options"
 msgstr "Opțiuni de animație MNG"
 
-#: ../plug-ins/common/file-mng.c:1444
+#: ../plug-ins/common/file-mng.c:1477
 msgid "Loop"
 msgstr "Buclă"
 
-#: ../plug-ins/common/file-mng.c:1458
+#: ../plug-ins/common/file-mng.c:1491
 msgid "Default frame delay:"
 msgstr "Decalaj de cadru implicit:"
 
-#: ../plug-ins/common/file-mng.c:1531
+#: ../plug-ins/common/file-mng.c:1564
 msgid "MNG animation"
 msgstr "Animație MNG"
 
@@ -3783,13 +3676,13 @@ msgstr "Nu s-a putut citi antetul din „%s”"
 msgid "'%s' is not a PCX file"
 msgstr "„%s” nu este un fișier PCX"
 
-#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:579
+#: ../plug-ins/common/file-pcx.c:395 ../plug-ins/file-bmp/bmp-read.c:606
 #: ../plug-ins/file-psd/psd-load.c:302
 #, c-format
 msgid "Unsupported or invalid image width: %d"
 msgstr ""
 
-#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:585
+#: ../plug-ins/common/file-pcx.c:400 ../plug-ins/file-bmp/bmp-read.c:612
 #: ../plug-ins/file-psd/psd-load.c:294
 #, c-format
 msgid "Unsupported or invalid image height: %d"
@@ -3804,14 +3697,14 @@ msgid "Unusual PCX flavour, giving up"
 msgstr ""
 
 #: ../plug-ins/common/file-pcx.c:676
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid X offset: %d"
-msgstr "Decalaj:"
+msgstr "Decalaj X nevalid: %d"
 
 #: ../plug-ins/common/file-pcx.c:682
-#, fuzzy, c-format
+#, c-format
 msgid "Invalid Y offset: %d"
-msgstr "Decalaj:"
+msgstr "Decalaj Y nevalid: %d"
 
 #: ../plug-ins/common/file-pcx.c:688
 #, c-format
@@ -3844,7 +3737,7 @@ msgstr "%s-pagini"
 
 #: ../plug-ins/common/file-pdf.c:808
 msgid "Import from PDF"
-msgstr "Importă din PDF"
+msgstr "Import din PDF"
 
 #: ../plug-ins/common/file-pdf.c:813 ../plug-ins/common/file-ps.c:3100
 #: ../plug-ins/common/file-tiff-load.c:483
@@ -4086,7 +3979,7 @@ msgid "Rendering"
 msgstr "Randare"
 
 #. Resolution
-#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:916
+#: ../plug-ins/common/file-ps.c:3154 ../plug-ins/common/file-svg.c:929
 #: ../plug-ins/common/file-wmf.c:692
 msgid "Resolution:"
 msgstr "Rezoluție:"
@@ -4212,7 +4105,7 @@ msgstr "Dimen_siune previzualizare:"
 
 #: ../plug-ins/common/file-psp.c:599 ../plug-ins/common/file-psp.c:623
 msgid "Paint Shop Pro image"
-msgstr ""
+msgstr "Imagine Paint Shop Pro"
 
 #: ../plug-ins/common/file-psp.c:640
 msgid "Save as PSP"
@@ -4225,20 +4118,19 @@ msgstr ""
 
 #: ../plug-ins/common/file-psp.c:662
 msgid "RLE"
-msgstr ""
+msgstr "RLE"
 
 #: ../plug-ins/common/file-psp.c:663
 msgid "LZ77"
-msgstr ""
+msgstr "LZ77"
 
 #: ../plug-ins/common/file-raw.c:182 ../plug-ins/common/file-raw.c:197
 msgid "Raw image data"
 msgstr "date brute de imagine"
 
 #: ../plug-ins/common/file-raw.c:980
-#, fuzzy
 msgid "Load Image from Raw Data"
-msgstr "Încarcă imagine"
+msgstr "Încarcă imagina din datele brute"
 
 #: ../plug-ins/common/file-raw.c:1013
 msgid "Image"
@@ -4250,7 +4142,7 @@ msgstr "Alfa RGB"
 
 #: ../plug-ins/common/file-raw.c:1025
 msgid "Planar RGB"
-msgstr ""
+msgstr "RGB planar"
 
 #: ../plug-ins/common/file-raw.c:1026
 msgid "Indexed"
@@ -4270,54 +4162,47 @@ msgstr "Paletă"
 
 #: ../plug-ins/common/file-raw.c:1092 ../plug-ins/common/file-raw.c:1191
 msgid "R, G, B (normal)"
-msgstr ""
+msgstr "R, G, B (normal)"
 
 #: ../plug-ins/common/file-raw.c:1093 ../plug-ins/common/file-raw.c:1193
 msgid "B, G, R, X (BMP style)"
-msgstr ""
+msgstr "B, G, R, X (stil BMP)"
 
 #: ../plug-ins/common/file-raw.c:1098
 msgid "_Palette Type:"
 msgstr "Tip de _paletă:"
 
 #: ../plug-ins/common/file-raw.c:1109
-#, fuzzy
 msgid "Off_set:"
-msgstr "Decalaj:"
+msgstr "_Decalaj:"
 
 #: ../plug-ins/common/file-raw.c:1121
-#, fuzzy
 msgid "Select Palette File"
-msgstr "Alege directorul de palete"
+msgstr "Selectați fișierul de paletă"
 
 #: ../plug-ins/common/file-raw.c:1127
-#, fuzzy
 msgid "Pal_ette File:"
-msgstr "Paletă"
+msgstr "Fiși_er de paletă:"
 
 #: ../plug-ins/common/file-raw.c:1155
-#, fuzzy
 msgid "Raw Image Save"
-msgstr "scalare imagine"
+msgstr ""
 
 #: ../plug-ins/common/file-raw.c:1177
-#, fuzzy
 msgid "RGB Save Type"
-msgstr "Interfață utilizator pentru Modele"
+msgstr ""
 
 #: ../plug-ins/common/file-raw.c:1181
-#, fuzzy
 msgid "Standard (R,G,B)"
-msgstr "Standard"
+msgstr "Standard (R,G,B)"
 
 #: ../plug-ins/common/file-raw.c:1182
 msgid "Planar (RRR,GGG,BBB)"
-msgstr ""
+msgstr "Planar (RRR,GGG,BBB)"
 
 #: ../plug-ins/common/file-raw.c:1187
-#, fuzzy
 msgid "Indexed Palette Type"
-msgstr "Paletă indexată"
+msgstr "Tip de paletă indexată"
 
 #: ../plug-ins/common/file-sunras.c:217 ../plug-ins/common/file-sunras.c:237
 msgid "SUN Rasterfile image"
@@ -4338,9 +4223,8 @@ msgid "Could not read color entries from '%s'"
 msgstr ""
 
 #: ../plug-ins/common/file-sunras.c:449
-#, fuzzy
 msgid "Type of colormap not supported"
-msgstr "Tipul de strat %d nu este suportat."
+msgstr "Tipul de hartă de culori nu este suportat"
 
 #: ../plug-ins/common/file-sunras.c:456 ../plug-ins/common/file-xbm.c:826
 #: ../plug-ins/common/file-xwd.c:489
@@ -4375,9 +4259,8 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/common/file-sunras.c:518
-#, fuzzy
 msgid "This image depth is not supported"
-msgstr "Tipul de strat %d nu este suportat."
+msgstr "Această adâncime de culoare nu este suportată"
 
 #: ../plug-ins/common/file-sunras.c:542
 #, c-format
@@ -4413,17 +4296,17 @@ msgstr ""
 msgid "SVG image"
 msgstr "Imagine SVG"
 
-#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:720
+#: ../plug-ins/common/file-svg.c:335 ../plug-ins/common/file-svg.c:733
 msgid "Unknown reason"
-msgstr ""
+msgstr "Motiv necunoscut"
 
 #: ../plug-ins/common/file-svg.c:341
 msgid "Rendering SVG"
-msgstr ""
+msgstr "Randare SVG"
 
 #: ../plug-ins/common/file-svg.c:353
 msgid "Rendered SVG"
-msgstr ""
+msgstr "SVG randat"
 
 #: ../plug-ins/common/file-svg.c:567 ../plug-ins/common/file-wmf.c:358
 #, c-format
@@ -4435,51 +4318,53 @@ msgid ""
 "SVG file does not\n"
 "specify a size!"
 msgstr ""
+"Fișierul SVG nu\n"
+"specifică o dimensiune !"
 
 #. Scalable Vector Graphics is SVG, should perhaps not be translated
-#: ../plug-ins/common/file-svg.c:729
+#: ../plug-ins/common/file-svg.c:742
 msgid "Render Scalable Vector Graphics"
 msgstr ""
 
 #. Width and Height
-#: ../plug-ins/common/file-svg.c:795 ../plug-ins/common/file-wmf.c:571
+#: ../plug-ins/common/file-svg.c:808 ../plug-ins/common/file-wmf.c:571
 #: ../plug-ins/common/grid.c:724
 msgid "Width:"
 msgstr "Lățime:"
 
-#: ../plug-ins/common/file-svg.c:801 ../plug-ins/common/file-wmf.c:577
+#: ../plug-ins/common/file-svg.c:814 ../plug-ins/common/file-wmf.c:577
 msgid "Height:"
 msgstr "Înălțime:"
 
-#: ../plug-ins/common/file-svg.c:875 ../plug-ins/common/file-wmf.c:651
+#: ../plug-ins/common/file-svg.c:888 ../plug-ins/common/file-wmf.c:651
 msgid "_X ratio:"
 msgstr "Raport _X:"
 
-#: ../plug-ins/common/file-svg.c:897 ../plug-ins/common/file-wmf.c:673
+#: ../plug-ins/common/file-svg.c:910 ../plug-ins/common/file-wmf.c:673
 msgid "_Y ratio:"
 msgstr "Raport _Y:"
 
-#: ../plug-ins/common/file-svg.c:911 ../plug-ins/common/file-wmf.c:687
+#: ../plug-ins/common/file-svg.c:924 ../plug-ins/common/file-wmf.c:687
 msgid "Constrain aspect ratio"
 msgstr "Constrânge raportul de aspect"
 
-#: ../plug-ins/common/file-svg.c:922 ../plug-ins/common/file-wmf.c:698
+#: ../plug-ins/common/file-svg.c:935 ../plug-ins/common/file-wmf.c:698
 #: ../plug-ins/print/print-page-layout.c:273
 #, c-format
 msgid "pixels/%a"
 msgstr "pixeli/%a"
 
 #. Path Import
-#: ../plug-ins/common/file-svg.c:942
+#: ../plug-ins/common/file-svg.c:955
 msgid "Import _paths"
 msgstr "Im_portă căile"
 
-#: ../plug-ins/common/file-svg.c:948
+#: ../plug-ins/common/file-svg.c:961
 msgid ""
 "Import path elements of the SVG so they can be used with the GIMP path tool"
 msgstr ""
 
-#: ../plug-ins/common/file-svg.c:961
+#: ../plug-ins/common/file-svg.c:974
 msgid "Merge imported paths"
 msgstr "_Combină căile importate"
 
@@ -4686,7 +4571,7 @@ msgstr ""
 
 #: ../plug-ins/common/file-xbm.c:1232
 msgid "_Identifier prefix:"
-msgstr ""
+msgstr "Prefix de _identificator:"
 
 #. hotspot toggle
 #: ../plug-ins/common/file-xbm.c:1254
@@ -4780,7 +4665,7 @@ msgid "Composing images"
 msgstr "Compunere imagini"
 
 #: ../plug-ins/common/film.c:425 ../plug-ins/common/guillotine.c:216
-#: ../plug-ins/help-browser/dialog.c:1133
+#: ../plug-ins/help-browser/dialog.c:1120
 msgid "Untitled"
 msgstr "Neintitulat"
 
@@ -5059,9 +4944,8 @@ msgid "Transform image with the Mandelbrot Fractal"
 msgstr ""
 
 #: ../plug-ins/common/fractal-trace.c:121
-#, fuzzy
 msgid "_Fractal Trace..."
-msgstr "Tip umplere"
+msgstr ""
 
 #: ../plug-ins/common/fractal-trace.c:460
 #: ../plug-ins/common/fractal-trace.c:691
@@ -5070,9 +4954,8 @@ msgstr ""
 
 #. Settings
 #: ../plug-ins/common/fractal-trace.c:731
-#, fuzzy
 msgid "Outside Type"
-msgstr "Tip curbă:"
+msgstr ""
 
 #: ../plug-ins/common/fractal-trace.c:742
 msgid "_White"
@@ -5103,9 +4986,8 @@ msgid "A big hello from the GIMP team!"
 msgstr "Un mare hello de la echipa GIMP !"
 
 #: ../plug-ins/common/gee-zoom.c:126 ../plug-ins/common/gee-zoom.c:186
-#, fuzzy
 msgid "Gee Zoom"
-msgstr "Marire"
+msgstr ""
 
 #: ../plug-ins/common/gee-zoom.c:192 ../plug-ins/common/gee.c:166
 msgid "Thank You for Choosing GIMP"
@@ -5117,9 +4999,8 @@ msgid "An obsolete creation by %s"
 msgstr ""
 
 #: ../plug-ins/common/gee.c:104 ../plug-ins/common/gee.c:160
-#, fuzzy
 msgid "Gee Slime"
-msgstr "redenumește stratul"
+msgstr ""
 
 #: ../plug-ins/common/gee.c:173
 #, c-format
@@ -5128,7 +5009,7 @@ msgstr ""
 
 #: ../plug-ins/common/gradient-map.c:84
 msgid "Recolor the image using colors from the active gradient"
-msgstr ""
+msgstr "Recolorează imaginea folosind culori din degradeul activ"
 
 #: ../plug-ins/common/gradient-map.c:97
 msgid "_Gradient Map"
@@ -5136,7 +5017,7 @@ msgstr "Hartă de_grade"
 
 #: ../plug-ins/common/gradient-map.c:106
 msgid "Recolor the image using colors from the active palette"
-msgstr ""
+msgstr "Recolorează imaginea folosind culori din paleta activă"
 
 #: ../plug-ins/common/gradient-map.c:119
 msgid "_Palette Map"
@@ -5160,7 +5041,7 @@ msgstr "_Grilă..."
 
 #: ../plug-ins/common/grid.c:241
 msgid "Drawing grid"
-msgstr ""
+msgstr "Desenare grilă"
 
 #: ../plug-ins/common/grid.c:635 ../plug-ins/gfig/gfig-dialog.c:1355
 #: ../plug-ins/imagemap/imap_menu.c:209
@@ -5243,9 +5124,8 @@ msgid "_Blacken"
 msgstr "Î_nnegrire"
 
 #: ../plug-ins/common/illusion.c:91
-#, fuzzy
 msgid "Superimpose many altered copies of the image"
-msgstr "Salvează o copie a imaginii"
+msgstr ""
 
 #: ../plug-ins/common/illusion.c:96
 msgid "_Illusion..."
@@ -5276,14 +5156,13 @@ msgid "_IWarp..."
 msgstr "De_formare interactivă..."
 
 #: ../plug-ins/common/iwarp.c:697
-#, fuzzy
 msgid "Warping"
-msgstr "[ Atenție ]"
+msgstr ""
 
 #: ../plug-ins/common/iwarp.c:802
-#, fuzzy, c-format
+#, c-format
 msgid "Warping Frame %d"
-msgstr "Decupez..."
+msgstr ""
 
 #: ../plug-ins/common/iwarp.c:814
 msgid "Ping pong"
@@ -5429,7 +5308,7 @@ msgstr ""
 #. frame for primitive radio buttons
 #: ../plug-ins/common/jigsaw.c:2539
 msgid "Jigsaw Style"
-msgstr ""
+msgstr "Stil de dinte de ferăstrău"
 
 #: ../plug-ins/common/jigsaw.c:2543
 msgid "_Square"
@@ -5448,9 +5327,8 @@ msgid "Each piece has curved sides"
 msgstr ""
 
 #: ../plug-ins/common/lcms.c:218
-#, fuzzy
 msgid "Set a color profile on the image"
-msgstr "Salvează o copie a imaginii"
+msgstr ""
 
 #: ../plug-ins/common/lcms.c:225
 msgid "_Assign Color Profile..."
@@ -5461,9 +5339,8 @@ msgid "Assign default RGB Profile"
 msgstr "Atribuie profilul RGB implicit"
 
 #: ../plug-ins/common/lcms.c:248
-#, fuzzy
 msgid "Apply a color profile on the image"
-msgstr "Salvează o copie a imaginii"
+msgstr ""
 
 #: ../plug-ins/common/lcms.c:258
 msgid "_Convert to Color Profile..."
@@ -5474,14 +5351,12 @@ msgid "Convert to default RGB Profile"
 msgstr ""
 
 #: ../plug-ins/common/lcms.c:290
-#, fuzzy
 msgid "Image Color Profile Information"
-msgstr "Transformare"
+msgstr ""
 
 #: ../plug-ins/common/lcms.c:304
-#, fuzzy
 msgid "Color Profile Information"
-msgstr "Transformare"
+msgstr ""
 
 #: ../plug-ins/common/lcms.c:572
 #, c-format
@@ -5498,11 +5373,9 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/common/lcms.c:825
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' does not appear to be an ICC color profile"
 msgstr ""
-"%s a eșuat.\n"
-"%s nu este un fișier obișnuit."
 
 #. ICC color profile conversion
 #: ../plug-ins/common/lcms.c:885
@@ -5511,9 +5384,9 @@ msgid "Converting from '%s' to '%s'"
 msgstr "Convertire de la „%s” la „%s”"
 
 #: ../plug-ins/common/lcms.c:1129
-#, fuzzy, c-format
+#, c-format
 msgid "Could not load ICC profile from '%s'"
-msgstr "Nu am reușit să citesc traseul din %s"
+msgstr ""
 
 #: ../plug-ins/common/lcms.c:1151
 #, c-format
@@ -5583,9 +5456,8 @@ msgid "Assign"
 msgstr "Atribuire"
 
 #: ../plug-ins/common/lcms.c:1517
-#, fuzzy
 msgid "_Rendering Intent:"
-msgstr "Amestec..."
+msgstr "Intenție de _randare:"
 
 #: ../plug-ins/common/lcms.c:1533
 msgid "_Black Point Compensation"
@@ -5616,14 +5488,12 @@ msgid "_Keep original surroundings"
 msgstr ""
 
 #: ../plug-ins/common/lens-apply.c:442
-#, fuzzy
 msgid "_Set surroundings to index 0"
-msgstr "Fundal"
+msgstr ""
 
 #: ../plug-ins/common/lens-apply.c:443
-#, fuzzy
 msgid "_Set surroundings to background color"
-msgstr "Fundal"
+msgstr ""
 
 #: ../plug-ins/common/lens-apply.c:458
 msgid "_Make surroundings transparent"
@@ -5705,35 +5575,35 @@ msgstr ""
 msgid "Send by E_mail..."
 msgstr "Trimite prin e_mail..."
 
-#: ../plug-ins/common/mail.c:408
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
 msgstr "Trimite prin email"
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "_Trimite"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "Nume _fișier:"
 
-#: ../plug-ins/common/mail.c:457
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
 msgstr "Că_tre:"
 
-#: ../plug-ins/common/mail.c:471
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
 msgstr "_De la:"
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "S_ubiect:"
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr ""
 
-#: ../plug-ins/common/mail.c:726
+#: ../plug-ins/common/mail.c:725
 #, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "Nu s-a putut porni sendmail-ul (%s)"
@@ -5759,14 +5629,12 @@ msgid "Maximum RGB Value"
 msgstr "Valori RGB maxime"
 
 #: ../plug-ins/common/max-rgb.c:292
-#, fuzzy
 msgid "_Hold the maximal channels"
-msgstr "/Adaugă canal de transparența"
+msgstr ""
 
 #: ../plug-ins/common/max-rgb.c:295
-#, fuzzy
 msgid "Ho_ld the minimal channels"
-msgstr "/Adaugă canal de transparența"
+msgstr ""
 
 #: ../plug-ins/common/mosaic.c:359
 msgid "Convert the image into irregular tiles"
@@ -6001,6 +5869,7 @@ msgstr "Media ajustată la _alfa"
 msgid "Op_timal estimation"
 msgstr "Es_timare optimă"
 
+# hm ?
 #: ../plug-ins/common/nl-filter.c:1052
 msgid "_Edge enhancement"
 msgstr "Îmbunătățir_e margine"
@@ -6166,11 +6035,11 @@ msgstr "Împ_răștie..."
 msgid "Spreading"
 msgstr "Împrăștiere"
 
-#: ../plug-ins/common/noise-spread.c:344
+#: ../plug-ins/common/noise-spread.c:346
 msgid "Spread"
 msgstr "Împrăștiere"
 
-#: ../plug-ins/common/noise-spread.c:369
+#: ../plug-ins/common/noise-spread.c:371
 msgid "Spread Amount"
 msgstr ""
 
@@ -6195,28 +6064,24 @@ msgid "Supernova Color Picker"
 msgstr "Prelevator de culoare Supernova"
 
 #: ../plug-ins/common/nova.c:378
-#, fuzzy
 msgid "_Spokes:"
-msgstr "Viteză:"
+msgstr ""
 
 #: ../plug-ins/common/nova.c:393
-#, fuzzy
 msgid "R_andom hue:"
-msgstr "Re-Refacere"
+msgstr ""
 
 #: ../plug-ins/common/nova.c:446
-#, fuzzy
 msgid "Center of Nova"
-msgstr "Centru X:"
+msgstr ""
 
 #: ../plug-ins/common/oilify.c:119 ../plug-ins/common/oilify.c:134
 msgid "Smear colors to simulate an oil painting"
 msgstr ""
 
 #: ../plug-ins/common/oilify.c:125
-#, fuzzy
 msgid "Oili_fy..."
-msgstr "Scalez..."
+msgstr ""
 
 #: ../plug-ins/common/oilify.c:247
 msgid "Oil painting"
@@ -6230,13 +6095,13 @@ msgstr ""
 msgid "_Mask size:"
 msgstr "Di_mensiune mască:"
 
+# hm ?
 #.
 #. * Mask-size map check button
 #.
 #: ../plug-ins/common/oilify.c:830
-#, fuzzy
 msgid "Use m_ask-size map:"
-msgstr "Salvare imagine"
+msgstr "Folosește h_arta de dimensiune de mască:"
 
 #: ../plug-ins/common/oilify.c:867 ../plug-ins/common/sinus.c:922
 msgid "_Exponent:"
@@ -6246,9 +6111,8 @@ msgstr "_Exponent:"
 #. * Exponent map check button
 #.
 #: ../plug-ins/common/oilify.c:882
-#, fuzzy
 msgid "Use e_xponent map:"
-msgstr "Expunere:"
+msgstr "Folosește harta de e_xponent:"
 
 #.
 #. * Intensity algorithm check button
@@ -6321,9 +6185,8 @@ msgid "Plasma"
 msgstr "Plasmă"
 
 #: ../plug-ins/common/plasma.c:337
-#, fuzzy
 msgid "Random _seed:"
-msgstr "Re-Refacere"
+msgstr "_Sămânță aleatoare:"
 
 #: ../plug-ins/common/plasma.c:348
 msgid "T_urbulence:"
@@ -6342,11 +6205,12 @@ msgid "Searching by name"
 msgstr "Căutare după nume"
 
 #: ../plug-ins/common/plugin-browser.c:386
-#, fuzzy, c-format
+#, c-format
 msgid "%d plug-in"
 msgid_plural "%d plug-ins"
-msgstr[0] "Modul inserabil"
-msgstr[1] "Modul inserabil"
+msgstr[0] "%d plug-in"
+msgstr[1] "%d plugin-uri"
+msgstr[2] "%d de plugin-uri"
 
 #: ../plug-ins/common/plugin-browser.c:395
 msgid "No matches for your query"
@@ -6365,9 +6229,8 @@ msgid "No matches"
 msgstr "Nicio potrivire"
 
 #: ../plug-ins/common/plugin-browser.c:554
-#, fuzzy
 msgid "Plug-In Browser"
-msgstr "Module inserabile"
+msgstr "Plug-in navigator"
 
 #: ../plug-ins/common/plugin-browser.c:597
 msgid "Name"
@@ -6468,14 +6331,12 @@ msgid "Generate a huge variety of abstract patterns"
 msgstr "Generează o varietate imensă de modele abstracte"
 
 #: ../plug-ins/common/qbist.c:410
-#, fuzzy
 msgid "_Qbist..."
-msgstr "/Ajutor/Despre noi..."
+msgstr ""
 
 #: ../plug-ins/common/qbist.c:511
-#, fuzzy
 msgid "Qbist"
-msgstr "/Ajutor/Despre noi..."
+msgstr ""
 
 #: ../plug-ins/common/qbist.c:707
 msgid "Load QBE File"
@@ -6592,22 +6453,20 @@ msgstr "Rotire"
 
 #: ../plug-ins/common/sample-colorize.c:298
 msgid "Colorize image using a sample image as a guide"
-msgstr "Colorează imaginea folosind ca ghid o imagine eșantion"
+msgstr "Colorizează imaginea folosind ca ghid o imagine eșantion"
 
 #: ../plug-ins/common/sample-colorize.c:303
-#, fuzzy
 msgid "_Sample Colorize..."
-msgstr "Dimensiune Eșantion:"
+msgstr "Colorizează pe _bază de eșantion..."
 
+# titlu
 #: ../plug-ins/common/sample-colorize.c:1318
-#, fuzzy
 msgid "Sample Colorize"
-msgstr "Dimensiune Eșantion:"
+msgstr "Colorizare pe bază de eșantion"
 
 #: ../plug-ins/common/sample-colorize.c:1323
-#, fuzzy
 msgid "Get _Sample Colors"
-msgstr "Modifică paleta de culori"
+msgstr "_Obține un eșantion de culoare"
 
 #. layer combo_box (Dst)
 #: ../plug-ins/common/sample-colorize.c:1352
@@ -6649,37 +6508,31 @@ msgstr "Niveluri de ieșire:"
 
 #. check button
 #: ../plug-ins/common/sample-colorize.c:1645
-#, fuzzy
 msgid "Hold intensity"
-msgstr "Intensitate:"
+msgstr "Mențiine intensitatea"
 
 #. check button
 #: ../plug-ins/common/sample-colorize.c:1656
-#, fuzzy
 msgid "Original intensity"
-msgstr "Lățimea originală"
+msgstr "Intensitate originală"
 
 #. check button
 #: ../plug-ins/common/sample-colorize.c:1674
-#, fuzzy
 msgid "Use subcolors"
-msgstr "culori"
+msgstr "Folosește cubculori"
 
 #. check button
 #: ../plug-ins/common/sample-colorize.c:1685
-#, fuzzy
 msgid "Smooth samples"
-msgstr "Import Paletă"
+msgstr "Eșantioane netede"
 
 #: ../plug-ins/common/sample-colorize.c:2657
-#, fuzzy
 msgid "Sample analyze"
-msgstr "/Scalează strat..."
+msgstr ""
 
 #: ../plug-ins/common/sample-colorize.c:3035
-#, fuzzy
 msgid "Remap colorized"
-msgstr "Dimensiune Eșantion:"
+msgstr ""
 
 #: ../plug-ins/common/screenshot.c:240
 msgid "Create an image from an area of the screen"
@@ -6702,9 +6555,8 @@ msgid "Screenshot"
 msgstr "Captură de ecran"
 
 #: ../plug-ins/common/screenshot.c:845
-#, fuzzy
 msgid "Mouse Pointer"
-msgstr "Elimină punct"
+msgstr ""
 
 #: ../plug-ins/common/screenshot.c:949
 msgid "Specified window not found"
@@ -6741,9 +6593,8 @@ msgid "Take a screenshot of a single _window"
 msgstr ""
 
 #: ../plug-ins/common/screenshot.c:1140
-#, fuzzy
 msgid "Include window _decoration"
-msgstr "Operații pe fișiere"
+msgstr ""
 
 #: ../plug-ins/common/screenshot.c:1158
 msgid "Take a screenshot of the entire _screen"
@@ -6754,9 +6605,8 @@ msgid "Include _mouse pointer"
 msgstr ""
 
 #: ../plug-ins/common/screenshot.c:1197
-#, fuzzy
 msgid "Select a _region to grab"
-msgstr "Alege directorul de module"
+msgstr ""
 
 #. Delay
 #: ../plug-ins/common/screenshot.c:1212
@@ -6773,14 +6623,12 @@ msgid "Replace partial transparency with the current background color"
 msgstr ""
 
 #: ../plug-ins/common/semi-flatten.c:75
-#, fuzzy
 msgid "_Semi-Flatten"
-msgstr "Decupez..."
+msgstr ""
 
 #: ../plug-ins/common/semi-flatten.c:118
-#, fuzzy
 msgid "Semi-Flattening"
-msgstr "Decupez..."
+msgstr ""
 
 # hm ?
 #: ../plug-ins/common/sharpen.c:113
@@ -6855,33 +6703,28 @@ msgid "Drawing Settings"
 msgstr ""
 
 #: ../plug-ins/common/sinus.c:700
-#, fuzzy
 msgid "_X scale:"
-msgstr "Scalare"
+msgstr "Scală _X:"
 
 #: ../plug-ins/common/sinus.c:709
-#, fuzzy
 msgid "_Y scale:"
-msgstr "Scalare"
+msgstr "Scală _Y:"
 
 #: ../plug-ins/common/sinus.c:718
 msgid "Co_mplexity:"
 msgstr "Co_mplexitate:"
 
 #: ../plug-ins/common/sinus.c:728
-#, fuzzy
 msgid "Calculation Settings"
-msgstr "Operație de selecție"
+msgstr "Setări de calcul"
 
 #: ../plug-ins/common/sinus.c:741
-#, fuzzy
 msgid "R_andom seed:"
-msgstr "Re-Refacere"
+msgstr "Sămânță _aleatoare:"
 
 #: ../plug-ins/common/sinus.c:750
-#, fuzzy
 msgid "_Force tiling?"
-msgstr "Sursă"
+msgstr ""
 
 #: ../plug-ins/common/sinus.c:763
 msgid "_Ideal"
@@ -6959,34 +6802,28 @@ msgid "_Blend"
 msgstr "_Amestecă"
 
 #: ../plug-ins/common/sinus.c:1049
-#, fuzzy
 msgid "Do _preview"
-msgstr "Previzualizare"
+msgstr "Creează o _previzualizare"
 
 #: ../plug-ins/common/smooth-palette.c:83
-#, fuzzy
 msgid "Derive a smooth color palette from the image"
-msgstr "Salvează o copie a imaginii"
+msgstr "Derivează din imagine o paletă netedă de culori"
 
 #: ../plug-ins/common/smooth-palette.c:88
-#, fuzzy
 msgid "Smoo_th Palette..."
-msgstr "Import Paletă"
+msgstr "Ne_tezește paleta..."
 
 #: ../plug-ins/common/smooth-palette.c:179
-#, fuzzy
 msgid "Deriving smooth palette"
-msgstr "Import Paletă"
+msgstr "Derivează o paletă netedă"
 
 #: ../plug-ins/common/smooth-palette.c:412
-#, fuzzy
 msgid "Smooth Palette"
-msgstr "Import Paletă"
+msgstr "Netezire de paletă"
 
 #: ../plug-ins/common/smooth-palette.c:452
-#, fuzzy
 msgid "_Search depth:"
-msgstr "Decupare"
+msgstr "A_dâncime de căutare:"
 
 #: ../plug-ins/common/softglow.c:134
 msgid "Simulate glow by making highlights intense and fuzzy"
@@ -7009,62 +6846,52 @@ msgid "Turn bright spots into starry sparkles"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:186
-#, fuzzy
 msgid "_Sparkle..."
-msgstr "Scalez..."
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:223
 msgid "Region selected for filter is empty"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:299
-#, fuzzy
 msgid "Sparkling"
-msgstr "Scalez..."
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:337
-#, fuzzy
 msgid "Sparkle"
-msgstr "Scalare"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:373
-#, fuzzy
 msgid "Luminosity _threshold:"
-msgstr "Prag implicit:"
+msgstr "Prag de luminozi_tate:"
 
 #: ../plug-ins/common/sparkle.c:376
-#, fuzzy
 msgid "Adjust the luminosity threshold"
-msgstr "Prag implicit:"
+msgstr "Ajustează pragul de luminozitate"
 
 #: ../plug-ins/common/sparkle.c:386
-#, fuzzy
 msgid "F_lare intensity:"
-msgstr "Intensitate:"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:389
 msgid "Adjust the flare intensity"
 msgstr "Ajustează intensitatea reflexiei"
 
 #: ../plug-ins/common/sparkle.c:399
-#, fuzzy
 msgid "_Spike length:"
-msgstr "Densitate:"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:402
-#, fuzzy
 msgid "Adjust the spike length"
-msgstr "Selectați vă rog de câte ori"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:412
-#, fuzzy
 msgid "Sp_ike points:"
-msgstr "Punct nou"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:415
-#, fuzzy
 msgid "Adjust the number of spikes"
-msgstr "Selectați vă rog de câte ori"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:425
 msgid "Spi_ke angle (-1: random):"
@@ -7075,99 +6902,84 @@ msgid "Adjust the spike angle (-1 causes a random angle to be chosen)"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:439
-#, fuzzy
 msgid "Spik_e density:"
-msgstr "Densitate:"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:442
-#, fuzzy
 msgid "Adjust the spike density"
-msgstr "Selectați vă rog de câte ori"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:452
-#, fuzzy
 msgid "Tr_ansparency:"
-msgstr "Transparență"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:455
-#, fuzzy
 msgid "Adjust the opacity of the spikes"
-msgstr "Selectați vă rog de câte ori"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:465
-#, fuzzy
 msgid "_Random hue:"
-msgstr "Re-Refacere"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:468
 msgid "Adjust how much the hue should be changed randomly"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:478
-#, fuzzy
 msgid "Rando_m saturation:"
-msgstr "Saturare:"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:481
 msgid "Adjust how much the saturation should be changed randomly"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:498
-#, fuzzy
 msgid "_Preserve luminosity"
-msgstr "Păstrează luminozitatea"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:505
 msgid "Should the luminosity be preserved?"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:514
-#, fuzzy
 msgid "In_verse"
-msgstr "Inversează"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:520
 msgid "Should the effect be inversed?"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:529
-#, fuzzy
 msgid "A_dd border"
-msgstr "Margine:"
+msgstr ""
 
 #: ../plug-ins/common/sparkle.c:535
 msgid "Draw a border of spikes around the image"
 msgstr ""
 
 #: ../plug-ins/common/sparkle.c:549
-#, fuzzy
 msgid "_Natural color"
-msgstr "Culoare Statica"
+msgstr "Culoare _naturală"
 
 #: ../plug-ins/common/sparkle.c:550
-#, fuzzy
 msgid "_Foreground color"
-msgstr "Prim Plan "
+msgstr "Culoare de _prim plan"
 
 #: ../plug-ins/common/sparkle.c:551
-#, fuzzy
 msgid "_Background color"
-msgstr "Fundal"
+msgstr "Culoare de _fundal"
 
 #: ../plug-ins/common/sparkle.c:558
-#, fuzzy
 msgid "Use the color of the image"
-msgstr "Salvează o copie a imaginii"
+msgstr "Folosește culoarea imaginii"
 
 #: ../plug-ins/common/sparkle.c:559
-#, fuzzy
 msgid "Use the foreground color"
-msgstr "Fundal"
+msgstr "Folosește culoarea de prim plan"
 
 #: ../plug-ins/common/sparkle.c:560
-#, fuzzy
 msgid "Use the background color"
-msgstr "Fundal"
+msgstr "Folosește culoarea de fundal"
 
 #: ../plug-ins/common/sphere-designer.c:291
 #: ../plug-ins/gimpressionist/general.c:166
@@ -7175,24 +6987,20 @@ msgid "Solid"
 msgstr "Solid"
 
 #: ../plug-ins/common/sphere-designer.c:292
-#, fuzzy
 msgid "Checker"
-msgstr "Dimensiune:"
+msgstr ""
 
 #: ../plug-ins/common/sphere-designer.c:293
-#, fuzzy
 msgid "Marble"
-msgstr "Scalare"
+msgstr "Marmură"
 
 #: ../plug-ins/common/sphere-designer.c:294
-#, fuzzy
 msgid "Lizard"
-msgstr "Linear"
+msgstr ""
 
 #: ../plug-ins/common/sphere-designer.c:295
-#, fuzzy
 msgid "Phong"
-msgstr "punct"
+msgstr ""
 
 #: ../plug-ins/common/sphere-designer.c:296 ../plug-ins/flame/flame.c:774
 msgid "Noise"
@@ -7207,9 +7015,8 @@ msgid "Spiral"
 msgstr "Spirală"
 
 #: ../plug-ins/common/sphere-designer.c:299
-#, fuzzy
 msgid "Spots"
-msgstr "Impărțire"
+msgstr ""
 
 #: ../plug-ins/common/sphere-designer.c:1742
 #: ../plug-ins/common/sphere-designer.c:2690
@@ -7217,43 +7024,38 @@ msgid "Texture"
 msgstr "Textură"
 
 #: ../plug-ins/common/sphere-designer.c:1744
-#, fuzzy
 msgid "Bumpmap"
-msgstr "Inversează"
+msgstr ""
 
 #: ../plug-ins/common/sphere-designer.c:1746
 #: ../plug-ins/common/sphere-designer.c:2692
-#, fuzzy
 msgid "Light"
-msgstr "Înălțime"
+msgstr "Lumină"
 
 #: ../plug-ins/common/sphere-designer.c:2009
-#, fuzzy, c-format
+#, c-format
 msgid "File '%s' is not a valid save file."
 msgstr ""
-"%s a eșuat.\n"
-"%s nu este un fișier obișnuit."
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Open File"
 msgstr "Deschide un fișier"
 
-#: ../plug-ins/common/sphere-designer.c:2188
+#: ../plug-ins/common/sphere-designer.c:2187
 msgid "Save File"
 msgstr "Salvează fișierul"
 
 #: ../plug-ins/common/sphere-designer.c:2544
 msgid "Sphere Designer"
-msgstr ""
+msgstr "Creator de sferă"
 
 #: ../plug-ins/common/sphere-designer.c:2675
 msgid "Properties"
 msgstr "Proprietăți"
 
 #: ../plug-ins/common/sphere-designer.c:2691
-#, fuzzy
 msgid "Bump"
-msgstr "Inversează"
+msgstr ""
 
 #. row labels
 #: ../plug-ins/common/sphere-designer.c:2699
@@ -7271,9 +7073,8 @@ msgstr "Culori:"
 
 #: ../plug-ins/common/sphere-designer.c:2726
 #: ../plug-ins/common/sphere-designer.c:2737
-#, fuzzy
 msgid "Color Selection Dialog"
-msgstr "Selecție culoare"
+msgstr "Dialog de selecție de culoare"
 
 # hm ? sau scalează ?
 #. Scale
@@ -7288,80 +7089,67 @@ msgid "Turbulence:"
 msgstr "Turbulență:"
 
 #: ../plug-ins/common/sphere-designer.c:2763
-#, fuzzy
 msgid "Amount:"
-msgstr "Numar:"
+msgstr "Cantitate:"
 
 #: ../plug-ins/common/sphere-designer.c:2770
 msgid "Exp.:"
 msgstr ""
 
 #: ../plug-ins/common/sphere-designer.c:2777
-#, fuzzy
 msgid "Transformations"
-msgstr "Transformare"
+msgstr "Transformări"
 
 #: ../plug-ins/common/sphere-designer.c:2793
 #: ../plug-ins/map-object/map-object-ui.c:1143
-#, fuzzy
 msgid "Scale X:"
-msgstr "Scalare"
+msgstr "Scalare X:"
 
 #: ../plug-ins/common/sphere-designer.c:2800
-#, fuzzy
 msgid "Scale Y:"
-msgstr "Scalare"
+msgstr "Scalare Y:"
 
 #: ../plug-ins/common/sphere-designer.c:2806
-#, fuzzy
 msgid "Scale Z:"
-msgstr "Scalare"
+msgstr "Scalare Z:"
 
 #: ../plug-ins/common/sphere-designer.c:2813
-#, fuzzy
 msgid "Rotate X:"
-msgstr "Rotire"
+msgstr "Rotire X:"
 
 #: ../plug-ins/common/sphere-designer.c:2820
-#, fuzzy
 msgid "Rotate Y:"
-msgstr "Rotire"
+msgstr "Rotire Y:"
 
 #: ../plug-ins/common/sphere-designer.c:2827
-#, fuzzy
 msgid "Rotate Z:"
-msgstr "Rotire"
+msgstr "Rotire Z:"
 
 #: ../plug-ins/common/sphere-designer.c:2834
-#, fuzzy
 msgid "Position X:"
-msgstr "Poziție fereastră"
+msgstr "Poziție X:"
 
 #: ../plug-ins/common/sphere-designer.c:2841
-#, fuzzy
 msgid "Position Y:"
-msgstr "Poziție fereastră"
+msgstr "Poziție Y:"
 
 #: ../plug-ins/common/sphere-designer.c:2848
-#, fuzzy
 msgid "Position Z:"
-msgstr "Poziție fereastră"
+msgstr "Poziție Z:"
 
 #: ../plug-ins/common/sphere-designer.c:2963
-#, fuzzy
 msgid "Rendering sphere"
-msgstr "Amestec..."
+msgstr "Randare sferă"
 
 #: ../plug-ins/common/sphere-designer.c:3013
 msgid "Create an image of a textured sphere"
-msgstr ""
+msgstr "Creează o imagine a unei sfere texturate"
 
 #: ../plug-ins/common/sphere-designer.c:3020
-#, fuzzy
 msgid "Sphere _Designer..."
-msgstr "/Filtre/Procesare"
+msgstr "Creator _de sferă..."
 
-#: ../plug-ins/common/sphere-designer.c:3074
+#: ../plug-ins/common/sphere-designer.c:3080
 msgid "Region selected for plug-in is empty"
 msgstr ""
 
@@ -7382,9 +7170,8 @@ msgid "RGBA/GRAYA drawable is not selected."
 msgstr ""
 
 #: ../plug-ins/common/threshold-alpha.c:165
-#, fuzzy
 msgid "Coloring transparency"
-msgstr "Transparent"
+msgstr ""
 
 #: ../plug-ins/common/threshold-alpha.c:248
 msgid "Threshold Alpha"
@@ -7399,23 +7186,20 @@ msgid "Simulate distortion caused by square glass tiles"
 msgstr "Simulează o distorsiune cauzată de dale pătrate de sticlă"
 
 #: ../plug-ins/common/tile-glass.c:130
-#, fuzzy
 msgid "_Glass Tile..."
-msgstr "Umplere cu un model"
+msgstr "_Dale de sticlă..."
 
 #: ../plug-ins/common/tile-glass.c:210 ../plug-ins/common/tile-glass.c:250
 msgid "Glass Tile"
 msgstr "Dală de sticlă"
 
 #: ../plug-ins/common/tile-glass.c:289
-#, fuzzy
 msgid "Tile _width:"
-msgstr "Lățime nouă:"
+msgstr "_Lățime dală"
 
 #: ../plug-ins/common/tile-paper.c:243 ../plug-ins/common/tile-paper.c:556
-#, fuzzy
 msgid "Paper Tile"
-msgstr "Umplere cu un model"
+msgstr "Dale de hârtie"
 
 #: ../plug-ins/common/tile-paper.c:269
 msgid "Division"
@@ -7423,7 +7207,7 @@ msgstr "Diviziune"
 
 #: ../plug-ins/common/tile-paper.c:319
 msgid "Fractional Pixels"
-msgstr ""
+msgstr "Pixeli fracționali"
 
 #: ../plug-ins/common/tile-paper.c:324
 msgid "_Background"
@@ -7439,15 +7223,15 @@ msgstr "_Forțează"
 
 #: ../plug-ins/common/tile-paper.c:335
 msgid "C_entering"
-msgstr "C_entrare"
+msgstr "C_entrează"
 
 #: ../plug-ins/common/tile-paper.c:350
 msgid "Movement"
-msgstr ""
+msgstr "Mișcare"
 
 #: ../plug-ins/common/tile-paper.c:363
 msgid "_Max (%):"
-msgstr ""
+msgstr "_Maxim (%):"
 
 #: ../plug-ins/common/tile-paper.c:369
 msgid "_Wrap around"
@@ -7483,16 +7267,15 @@ msgstr "Culoare de fundal"
 
 #: ../plug-ins/common/tile-paper.c:846
 msgid "Cut image into paper tiles, and slide them"
-msgstr ""
+msgstr "Taie imaginea în dale mici de hârtie și le deplasează"
 
 #: ../plug-ins/common/tile-paper.c:851
 msgid "September 31, 1999"
-msgstr ""
+msgstr "31 septembrie, 1999"
 
 #: ../plug-ins/common/tile-paper.c:852
-#, fuzzy
 msgid "_Paper Tile..."
-msgstr "Umplere cu un model"
+msgstr "_Dale de hârtie..."
 
 #: ../plug-ins/common/tile-seamless.c:67
 msgid "Alters edges to make the image seamlessly tileable"
@@ -7503,18 +7286,17 @@ msgid "_Make Seamless"
 msgstr ""
 
 #: ../plug-ins/common/tile-seamless.c:338
-#, fuzzy
 msgid "Tiler"
-msgstr "Triunghi"
-
-#: ../plug-ins/common/tile-small.c:215
-msgid "Tile image into smaller versions of the original"
 msgstr ""
 
-#: ../plug-ins/common/tile-small.c:220
+#: ../plug-ins/common/tile-small.c:215
 #, fuzzy
+msgid "Tile image into smaller versions of the original"
+msgstr " imaginea în versiuni mai mici ale originalului"
+
+#: ../plug-ins/common/tile-small.c:220
 msgid "_Small Tiles..."
-msgstr "Permite redimensionarea ferestrei"
+msgstr "_Dale mici..."
 
 #: ../plug-ins/common/tile-small.c:263
 msgid "Region selected for filter is empty."
@@ -7522,15 +7304,13 @@ msgstr ""
 
 #. Set the tile cache size
 #: ../plug-ins/common/tile-small.c:321 ../plug-ins/common/tile.c:190
-#, fuzzy
 msgid "Tiling"
-msgstr "Scalez..."
+msgstr ""
 
 #. Get the preview image
 #: ../plug-ins/common/tile-small.c:364
-#, fuzzy
 msgid "Small Tiles"
-msgstr "Permite redimensionarea ferestrei"
+msgstr "Dale mici"
 
 #. Area for buttons etc
 #. Flip
@@ -7540,68 +7320,57 @@ msgid "Flip"
 msgstr "Întoarce"
 
 #: ../plug-ins/common/tile-small.c:462
-#, fuzzy
 msgid "A_ll tiles"
-msgstr "Permite redimensionarea ferestrei"
+msgstr "Toate da_lele"
 
 #: ../plug-ins/common/tile-small.c:476
-#, fuzzy
 msgid "Al_ternate tiles"
-msgstr "imagine"
+msgstr "Dale al_ternative"
 
 #: ../plug-ins/common/tile-small.c:490
-#, fuzzy
 msgid "_Explicit tile"
-msgstr "Decupat după imagine"
+msgstr "O dală anum_e"
 
 #: ../plug-ins/common/tile-small.c:496
-#, fuzzy
 msgid "Ro_w:"
-msgstr "R:"
+msgstr "_Rând:"
 
 #: ../plug-ins/common/tile-small.c:520
-#, fuzzy
 msgid "Col_umn:"
-msgstr "Numar:"
+msgstr "_Coloană:"
 
 #: ../plug-ins/common/tile-small.c:572
-#, fuzzy
 msgid "O_pacity:"
-msgstr "Opacitate:"
+msgstr "O_pacitate:"
 
 #. Lower frame saying howmany segments
 #: ../plug-ins/common/tile-small.c:581
-#, fuzzy
 msgid "Number of Segments"
-msgstr "Oglindire segment"
+msgstr "Număr de segmente"
 
 #: ../plug-ins/common/tile.c:101
 msgid "Create an array of copies of the image"
 msgstr ""
 
 #: ../plug-ins/common/tile.c:111
-#, fuzzy
 msgid "_Tile..."
-msgstr "/Fișier/Revenire..."
+msgstr ""
 
 #: ../plug-ins/common/tile.c:401
-#, fuzzy
 msgid "Tile"
-msgstr "Triunghi"
+msgstr ""
 
 #: ../plug-ins/common/tile.c:422
 msgid "Tile to New Size"
 msgstr ""
 
 #: ../plug-ins/common/tile.c:444
-#, fuzzy
 msgid "C_reate new image"
-msgstr "Imagine nouă"
+msgstr "C_reează o imagine nouă"
 
 #: ../plug-ins/common/unit-editor.c:94
-#, fuzzy
 msgid "Saved"
-msgstr "Salvează"
+msgstr "Salvat"
 
 #: ../plug-ins/common/unit-editor.c:94
 msgid ""
@@ -7621,9 +7390,8 @@ msgstr ""
 "configurație GIMP."
 
 #: ../plug-ins/common/unit-editor.c:98
-#, fuzzy
 msgid "Factor"
-msgstr "Pană"
+msgstr "Factor"
 
 #: ../plug-ins/common/unit-editor.c:98
 msgid "How many units make up an inch."
@@ -7654,36 +7422,32 @@ msgstr ""
 "unitatea nu are un simbol, este folosită abrevierea unității."
 
 #: ../plug-ins/common/unit-editor.c:107
-#, fuzzy
 msgid "Abbreviation"
-msgstr "Rotire"
+msgstr "Abreviere"
 
 #: ../plug-ins/common/unit-editor.c:107
 msgid "The unit's abbreviation (e.g. \"cm\" for centimeters)."
 msgstr "Abrevierea unității (de exemplu „cm” pentru centimetri)."
 
 #: ../plug-ins/common/unit-editor.c:109
-#, fuzzy
 msgid "Singular"
-msgstr "Undă triunghiulara"
+msgstr "Singular"
 
 #: ../plug-ins/common/unit-editor.c:109
 msgid "The unit's singular form."
 msgstr "Forma unității la singular."
 
 #: ../plug-ins/common/unit-editor.c:110
-#, fuzzy
 msgid "Plural"
-msgstr "Claritate"
+msgstr "Plural"
 
 #: ../plug-ins/common/unit-editor.c:110
 msgid "The unit's plural form."
 msgstr "Forma unității la plural."
 
 #: ../plug-ins/common/unit-editor.c:121
-#, fuzzy
 msgid "Create a new unit from scratch"
-msgstr "Imagine nouă"
+msgstr ""
 
 #: ../plug-ins/common/unit-editor.c:127
 msgid "Create a new unit using the currently selected unit as template"
@@ -7698,9 +7462,8 @@ msgid "U_nits"
 msgstr "U_nități de măsură"
 
 #: ../plug-ins/common/unit-editor.c:208
-#, fuzzy
 msgid "Add a New Unit"
-msgstr "Punct nou"
+msgstr "Adaugă o unitate nouă"
 
 #: ../plug-ins/common/unit-editor.c:237
 msgid "_ID:"
@@ -7739,9 +7502,8 @@ msgid "Please fill in all text fields."
 msgstr "Completați toate câmpurile textului."
 
 #: ../plug-ins/common/unit-editor.c:409
-#, fuzzy
 msgid "Unit Editor"
-msgstr "Editorul de gradienți"
+msgstr ""
 
 #: ../plug-ins/common/unsharp-mask.c:128
 msgid "The most widely useful method for sharpening an image"
@@ -7812,18 +7574,16 @@ msgid "_Value Propagate..."
 msgstr "Propagare de _valoare..."
 
 #: ../plug-ins/common/value-propagate.c:245
-#, fuzzy
 msgid "Shrink lighter areas of the image"
-msgstr "Micșorează zonele întunecate ale imaginii"
+msgstr ""
 
 #: ../plug-ins/common/value-propagate.c:250
 msgid "E_rode"
 msgstr "E_rodare"
 
 #: ../plug-ins/common/value-propagate.c:257
-#, fuzzy
 msgid "Grow lighter areas of the image"
-msgstr "Mărește zonele întunecate ale imaginii"
+msgstr ""
 
 #: ../plug-ins/common/value-propagate.c:262
 msgid "_Dilate"
@@ -7872,32 +7632,28 @@ msgid "Propagating _alpha channel"
 msgstr "Propagare canal _alfa"
 
 #: ../plug-ins/common/value-propagate.c:1229
-#, fuzzy
 msgid "Propagating value channel"
-msgstr "Canalul alfa al stratului"
+msgstr ""
 
 #: ../plug-ins/common/van-gogh-lic.c:566 ../plug-ins/common/van-gogh-lic.c:641
 msgid "Van Gogh (LIC)"
 msgstr "Van Gogh (LIC)"
 
 #: ../plug-ins/common/van-gogh-lic.c:666
-#, fuzzy
 msgid "Effect Channel"
-msgstr "Canal nou"
+msgstr "Canal de efect"
 
 #: ../plug-ins/common/van-gogh-lic.c:673
 msgid "_Brightness"
 msgstr "_Luminozitate"
 
 #: ../plug-ins/common/van-gogh-lic.c:679
-#, fuzzy
 msgid "Effect Operator"
-msgstr "Operații pe fișiere"
+msgstr "Operator de efect"
 
 #: ../plug-ins/common/van-gogh-lic.c:684
-#, fuzzy
 msgid "_Derivative"
-msgstr "Imparte"
+msgstr "_Derivativ"
 
 #: ../plug-ins/common/van-gogh-lic.c:685
 msgid "_Gradient"
@@ -7912,19 +7668,16 @@ msgid "_With white noise"
 msgstr "Cu _zgomot alb"
 
 #: ../plug-ins/common/van-gogh-lic.c:697
-#, fuzzy
 msgid "W_ith source image"
-msgstr "Scalează imaginea"
+msgstr "Cu imaginea sursă"
 
 #: ../plug-ins/common/van-gogh-lic.c:716
-#, fuzzy
 msgid "_Effect image:"
-msgstr "Imagine nouă"
+msgstr ""
 
 #: ../plug-ins/common/van-gogh-lic.c:727
-#, fuzzy
 msgid "_Filter length:"
-msgstr "Densitate:"
+msgstr ""
 
 #: ../plug-ins/common/van-gogh-lic.c:736
 msgid "_Noise magnitude:"
@@ -7935,14 +7688,12 @@ msgid "In_tegration steps:"
 msgstr "_Trepte de integrare:"
 
 #: ../plug-ins/common/van-gogh-lic.c:754
-#, fuzzy
 msgid "_Minimum value:"
-msgstr "Dimensiunea maximă a imaginii:"
+msgstr ""
 
 #: ../plug-ins/common/van-gogh-lic.c:763
-#, fuzzy
 msgid "M_aximum value:"
-msgstr "Dimensiunea maximă a imaginii:"
+msgstr ""
 
 #: ../plug-ins/common/van-gogh-lic.c:809
 msgid "Special effects that nobody understands"
@@ -7961,14 +7712,12 @@ msgid "_Large staggered"
 msgstr ""
 
 #: ../plug-ins/common/video.c:44
-#, fuzzy
 msgid "S_triped"
-msgstr "Viteză:"
+msgstr ""
 
 #: ../plug-ins/common/video.c:45
-#, fuzzy
 msgid "_Wide-striped"
-msgstr "Directoare"
+msgstr ""
 
 #: ../plug-ins/common/video.c:46
 msgid "Lo_ng-staggered"
@@ -7979,9 +7728,8 @@ msgid "_3x3"
 msgstr ""
 
 #: ../plug-ins/common/video.c:48
-#, fuzzy
 msgid "Larg_e 3x3"
-msgstr "Mare"
+msgstr ""
 
 #: ../plug-ins/common/video.c:49
 msgid "_Hex"
@@ -8024,9 +7772,8 @@ msgid "Twist or smear image in many different ways"
 msgstr ""
 
 #: ../plug-ins/common/warp.c:241
-#, fuzzy
 msgid "_Warp..."
-msgstr "Decupez..."
+msgstr ""
 
 #: ../plug-ins/common/warp.c:376
 msgid "Warp"
@@ -8081,14 +7828,12 @@ msgid "Advanced Options"
 msgstr "Opțiuni avansate"
 
 #: ../plug-ins/common/warp.c:552
-#, fuzzy
 msgid "Dither size:"
-msgstr "Dimensiune previzualizare:"
+msgstr ""
 
 #: ../plug-ins/common/warp.c:565
-#, fuzzy
 msgid "Rotation angle:"
-msgstr "Rotire"
+msgstr "Unghi de rotire:"
 
 #: ../plug-ins/common/warp.c:578
 msgid "Substeps:"
@@ -8096,21 +7841,18 @@ msgstr "Trepte intermediare:"
 
 #. Magnitude map menu
 #: ../plug-ins/common/warp.c:587
-#, fuzzy
 msgid "Magnitude map:"
-msgstr "Violet"
+msgstr ""
 
 #: ../plug-ins/common/warp.c:609
-#, fuzzy
 msgid "Use magnitude map"
-msgstr "Salvare imagine"
+msgstr ""
 
 #. --------------------------------------------------------------------
 #. ---------    The "other" table         --------------------------
 #: ../plug-ins/common/warp.c:622
-#, fuzzy
 msgid "More Advanced Options"
-msgstr "Opțiuni de desenare"
+msgstr ""
 
 #: ../plug-ins/common/warp.c:639
 msgid "Gradient scale:"
@@ -8121,9 +7863,8 @@ msgid "Gradient map selection menu"
 msgstr "Meniu de selecție hartă degrade"
 
 #: ../plug-ins/common/warp.c:668
-#, fuzzy
 msgid "Vector mag:"
-msgstr "Unghi:"
+msgstr ""
 
 #. Angle
 #: ../plug-ins/common/warp.c:683 ../plug-ins/ifs-compose/ifs-compose.c:568
@@ -8246,14 +7987,12 @@ msgid "Wi_nd..."
 msgstr "Vâ_nt..."
 
 #: ../plug-ins/common/wind.c:315
-#, fuzzy
 msgid "Rendering blast"
-msgstr "Amestec..."
+msgstr ""
 
 #: ../plug-ins/common/wind.c:447
-#, fuzzy
 msgid "Rendering wind"
-msgstr "Amestec..."
+msgstr ""
 
 #: ../plug-ins/common/wind.c:879
 msgid "Wind"
@@ -8271,18 +8010,16 @@ msgid "_Wind"
 msgstr "_Vânt"
 
 #: ../plug-ins/common/wind.c:926
-#, fuzzy
 msgid "_Blast"
-msgstr "inserează"
+msgstr ""
 
 #: ../plug-ins/common/wind.c:949
 msgid "_Left"
 msgstr "_Stânga"
 
 #: ../plug-ins/common/wind.c:950
-#, fuzzy
 msgid "_Right"
-msgstr "Înălțime"
+msgstr ""
 
 #. ****************************************************
 #. radio buttons for choosing BOTH, LEADING, TRAILING
@@ -8292,14 +8029,12 @@ msgid "Edge Affected"
 msgstr ""
 
 #: ../plug-ins/common/wind.c:973
-#, fuzzy
 msgid "L_eading"
-msgstr "Decupare"
+msgstr ""
 
 #: ../plug-ins/common/wind.c:974
-#, fuzzy
 msgid "Tr_ailing"
-msgstr "Scalare"
+msgstr ""
 
 #: ../plug-ins/common/wind.c:975
 msgid "Bot_h"
@@ -8310,44 +8045,43 @@ msgid "Higher values restrict the effect to fewer areas of the image"
 msgstr ""
 
 #: ../plug-ins/common/wind.c:1027 ../plug-ins/gimpressionist/orientmap.c:694
-#, fuzzy
 msgid "_Strength:"
-msgstr "Memorează traseul"
+msgstr ""
 
 #: ../plug-ins/common/wind.c:1031
 msgid "Higher values increase the magnitude of the effect"
 msgstr ""
 
-#: ../plug-ins/file-bmp/bmp-read.c:86
+#: ../plug-ins/file-bmp/bmp-read.c:88
 msgid "Bad colormap"
 msgstr "Hartă de culori greșită"
 
-#: ../plug-ins/file-bmp/bmp-read.c:170 ../plug-ins/file-bmp/bmp-read.c:180
-#: ../plug-ins/file-bmp/bmp-read.c:187 ../plug-ins/file-bmp/bmp-read.c:196
-#: ../plug-ins/file-bmp/bmp-read.c:211 ../plug-ins/file-bmp/bmp-read.c:395
-#: ../plug-ins/file-bmp/bmp-read.c:403 ../plug-ins/file-bmp/bmp-read.c:411
-#: ../plug-ins/file-bmp/bmp-read.c:419
+#: ../plug-ins/file-bmp/bmp-read.c:172 ../plug-ins/file-bmp/bmp-read.c:182
+#: ../plug-ins/file-bmp/bmp-read.c:189 ../plug-ins/file-bmp/bmp-read.c:198
+#: ../plug-ins/file-bmp/bmp-read.c:213 ../plug-ins/file-bmp/bmp-read.c:422
+#: ../plug-ins/file-bmp/bmp-read.c:430 ../plug-ins/file-bmp/bmp-read.c:438
+#: ../plug-ins/file-bmp/bmp-read.c:446
 #, c-format
 msgid "'%s' is not a valid BMP file"
 msgstr "„%s” nu este un fișier BMP valid"
 
-#: ../plug-ins/file-bmp/bmp-read.c:225 ../plug-ins/file-bmp/bmp-read.c:252
-#: ../plug-ins/file-bmp/bmp-read.c:280 ../plug-ins/file-bmp/bmp-read.c:345
-#: ../plug-ins/file-bmp/bmp-read.c:371
-#, fuzzy, c-format
+#: ../plug-ins/file-bmp/bmp-read.c:227 ../plug-ins/file-bmp/bmp-read.c:254
+#: ../plug-ins/file-bmp/bmp-read.c:282 ../plug-ins/file-bmp/bmp-read.c:347
+#: ../plug-ins/file-bmp/bmp-read.c:397
+#, c-format
 msgid "Error reading BMP file header from '%s'"
-msgstr "Eroare la deschiderea fișierului: %s\n"
+msgstr ""
 
-#: ../plug-ins/file-bmp/bmp-read.c:531
+#: ../plug-ins/file-bmp/bmp-read.c:558
 msgid "Unrecognized or invalid BMP compression format."
 msgstr ""
 
-#: ../plug-ins/file-bmp/bmp-read.c:573
+#: ../plug-ins/file-bmp/bmp-read.c:600
 msgid "Unsupported or invalid bitdepth."
 msgstr ""
 
-#: ../plug-ins/file-bmp/bmp-read.c:761 ../plug-ins/file-bmp/bmp-read.c:802
-#: ../plug-ins/file-bmp/bmp-read.c:852
+#: ../plug-ins/file-bmp/bmp-read.c:788 ../plug-ins/file-bmp/bmp-read.c:829
+#: ../plug-ins/file-bmp/bmp-read.c:879
 msgid "The bitmap ends unexpectedly."
 msgstr ""
 
@@ -8364,9 +8098,8 @@ msgid "Save as BMP"
 msgstr "Salvează ca BMP"
 
 #: ../plug-ins/file-bmp/bmp-write.c:816
-#, fuzzy
 msgid "_Run-Length Encoded"
-msgstr "Extins"
+msgstr ""
 
 #: ../plug-ins/file-bmp/bmp-write.c:828 ../plug-ins/file-jpeg/jpeg-save.c:900
 msgid "_Advanced Options"
@@ -8389,9 +8122,8 @@ msgid "Windows BMP image"
 msgstr "imagine Windows BMP"
 
 #: ../plug-ins/file-faxg3/faxg3.c:103
-#, fuzzy
 msgid "G3 fax image"
-msgstr "[ imagine de bază]"
+msgstr ""
 
 #: ../plug-ins/file-fits/fits.c:168 ../plug-ins/file-fits/fits.c:188
 msgid "Flexible Image Transport System"
@@ -8410,9 +8142,8 @@ msgid "FITS save cannot handle images with alpha channels"
 msgstr "Salvarea tip FITS nu poate manipula imagini cu canale alfa"
 
 #: ../plug-ins/file-fits/fits.c:993
-#, fuzzy
 msgid "Load FITS File"
-msgstr "Incărcarea a eșuat"
+msgstr ""
 
 #: ../plug-ins/file-fits/fits.c:1017
 msgid "Replacement for undefined pixels"
@@ -8424,18 +8155,16 @@ msgid "White"
 msgstr "Alb"
 
 #: ../plug-ins/file-fits/fits.c:1029
-#, fuzzy
 msgid "Pixel value scaling"
-msgstr "Salvare de fișiere"
+msgstr ""
 
 #: ../plug-ins/file-fits/fits.c:1034
 msgid "By DATAMIN/DATAMAX"
 msgstr ""
 
 #: ../plug-ins/file-fits/fits.c:1041
-#, fuzzy
 msgid "Image Composing"
-msgstr "Mască imagine"
+msgstr ""
 
 #: ../plug-ins/file-fli/fli-gimp.c:166 ../plug-ins/file-fli/fli-gimp.c:186
 msgid "AutoDesk FLIC animation"
@@ -8667,9 +8396,9 @@ msgstr "Exportă previzualizarea"
 
 #: ../plug-ins/file-psd/psd-load.c:215
 #: ../plug-ins/file-psd/psd-thumb-load.c:131
-#, fuzzy, c-format
+#, c-format
 msgid "Error loading PSD file: %s"
-msgstr "Eroare la încărcarea fișierului: %s"
+msgstr ""
 
 #: ../plug-ins/file-psd/psd-load.c:270
 #, c-format
@@ -8682,9 +8411,9 @@ msgid "Unsupported file format version: %d"
 msgstr "Versiune nesuportată de format de fișier: %d"
 
 #: ../plug-ins/file-psd/psd-load.c:284
-#, fuzzy, c-format
+#, c-format
 msgid "Too many channels in file: %d"
-msgstr "Nume canal:"
+msgstr ""
 
 #: ../plug-ins/file-psd/psd-load.c:314
 #, c-format
@@ -8703,9 +8432,9 @@ msgid "The file is corrupt!"
 msgstr "Fișierul este corupt !"
 
 #: ../plug-ins/file-psd/psd-load.c:545
-#, fuzzy, c-format
+#, c-format
 msgid "Too many channels in layer: %d"
-msgstr "Nume canal:"
+msgstr ""
 
 #: ../plug-ins/file-psd/psd-load.c:552
 #, c-format
@@ -8758,9 +8487,8 @@ msgstr ""
 
 # hm ? sau sfârșit prematur de fișier ?
 #: ../plug-ins/file-psd/psd-util.c:51
-#, fuzzy
 msgid "Unexpected end of file"
-msgstr "Sfârșit prematur al fișierului."
+msgstr "Sfârșit prematur al fișierului"
 
 #: ../plug-ins/file-sgi/sgi.c:121 ../plug-ins/file-sgi/sgi.c:141
 msgid "Silicon Graphics IRIS image"
@@ -8777,19 +8505,16 @@ msgid "Could not open '%s' for writing."
 msgstr "Nu s-a putut deschide „%s” pentru scriere."
 
 #: ../plug-ins/file-sgi/sgi.c:629
-#, fuzzy
 msgid "Save as SGI"
-msgstr "Salvează ca fișier POV-Ray"
+msgstr ""
 
 #: ../plug-ins/file-sgi/sgi.c:645
-#, fuzzy
 msgid "Compression type"
-msgstr "Sesiune"
+msgstr ""
 
 #: ../plug-ins/file-sgi/sgi.c:649
-#, fuzzy
 msgid "No compression"
-msgstr "Sesiune"
+msgstr ""
 
 #: ../plug-ins/file-sgi/sgi.c:651
 msgid "RLE compression"
@@ -8872,14 +8597,14 @@ msgid "Connecting to server"
 msgstr "Conectare la server"
 
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:312
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to read %s from '%s': %s"
-msgstr "Nu am reușit să citesc din %s"
+msgstr ""
 
 #: ../plug-ins/file-uri/uri-backend-gnomevfs.c:361
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write %s to '%s': %s"
-msgstr "Nu am reușit să citesc din %s"
+msgstr ""
 
 #: ../plug-ins/file-uri/uri-backend-gvfs.c:200
 #, c-format
@@ -8924,9 +8649,9 @@ msgstr "Deschidere URI"
 
 #: ../plug-ins/file-uri/uri-backend-wget.c:230
 #: ../plug-ins/file-uri/uri-backend-wget.c:263
-#, fuzzy, c-format
+#, c-format
 msgid "A network error occurred: %s"
-msgstr "Scrie toate erorile în fișier..."
+msgstr ""
 
 #: ../plug-ins/file-uri/uri-backend-wget.c:308
 msgid "Downloading unknown amount of image data"
@@ -8971,42 +8696,39 @@ msgid "Warning: unsupported unittype %d saved to XJT"
 msgstr ""
 
 #: ../plug-ins/file-xjt/xjt.c:866
-#, fuzzy
 msgid "Save as XJT"
-msgstr "Salvează ca fișier POV-Ray"
+msgstr ""
 
 #: ../plug-ins/file-xjt/xjt.c:889
 msgid "Optimize"
 msgstr "Optimizează"
 
 #: ../plug-ins/file-xjt/xjt.c:899
-#, fuzzy
 msgid "Clear transparent"
-msgstr "Transparent"
+msgstr ""
 
 #: ../plug-ins/file-xjt/xjt.c:911
-#, fuzzy
 msgid "Quality:"
-msgstr "Ieșire"
+msgstr ""
 
 #: ../plug-ins/file-xjt/xjt.c:920
 msgid "Smoothing:"
 msgstr "Netezire:"
 
 #: ../plug-ins/file-xjt/xjt.c:1719 ../plug-ins/file-xjt/xjt.c:3373
-#, fuzzy, c-format
+#, c-format
 msgid "Could not create working folder '%s': %s"
-msgstr "Nu pot scrie în %s; %s"
+msgstr ""
 
 #: ../plug-ins/file-xjt/xjt.c:3239
-#, fuzzy, c-format
+#, c-format
 msgid "Error: Could not read XJT property file '%s'."
-msgstr "Eroare la deschiderea fișierului %s: %s"
+msgstr ""
 
 #: ../plug-ins/file-xjt/xjt.c:3246
-#, fuzzy, c-format
+#, c-format
 msgid "Error: XJT property file '%s' is empty."
-msgstr "Eroare la deschiderea fișierului %s: %s"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:129
 msgid "Create cosmic recursive fractal flames"
@@ -9025,11 +8747,9 @@ msgid "Flame works only on RGB drawables."
 msgstr "Flăcările funcționează numai pe imagini de tip RGB."
 
 #: ../plug-ins/flame/flame.c:402
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a regular file"
 msgstr ""
-"%s a eșuat.\n"
-"%s nu este un fișier obișnuit."
 
 #: ../plug-ins/flame/flame.c:646
 msgid "Edit Flame"
@@ -9045,25 +8765,21 @@ msgid "Controls"
 msgstr "Controale"
 
 #: ../plug-ins/flame/flame.c:719
-#, fuzzy
 msgid "_Speed:"
-msgstr "Viteză:"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:736
-#, fuzzy
 msgid "_Randomize"
-msgstr "Re-Refacere"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:746
-#, fuzzy
 msgid "Same"
-msgstr "Salvează"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:747 ../plug-ins/gimpressionist/orientation.c:164
 #: ../plug-ins/gimpressionist/size.c:167
-#, fuzzy
 msgid "Random"
-msgstr "Re-Refacere"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:751
 msgid "Swirl"
@@ -9074,23 +8790,20 @@ msgid "Horseshoe"
 msgstr ""
 
 #: ../plug-ins/flame/flame.c:753 ../plug-ins/gfig/gfig-dialog.c:1442
-#, fuzzy
 msgid "Polar"
-msgstr "Culoare"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:754
-#, fuzzy
 msgid "Bent"
-msgstr "In spate"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:755
 msgid "Handkerchief"
 msgstr ""
 
 #: ../plug-ins/flame/flame.c:756
-#, fuzzy
 msgid "Heart"
-msgstr "Decupare"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:757
 msgid "Disc"
@@ -9122,9 +8835,8 @@ msgid "Exponential"
 msgstr "Exponențial"
 
 #: ../plug-ins/flame/flame.c:767
-#, fuzzy
 msgid "Power"
-msgstr "Strat"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:768
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:997
@@ -9134,9 +8846,8 @@ msgid "Cosine"
 msgstr "Cosinus"
 
 #: ../plug-ins/flame/flame.c:769
-#, fuzzy
 msgid "Rings"
-msgstr "Radial"
+msgstr ""
 
 #: ../plug-ins/flame/flame.c:770
 msgid "Fan"
@@ -9227,22 +8938,16 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:638
-#, fuzzy
 msgid "Realtime preview"
 msgstr ""
-"Generează o\n"
-"previzualizare"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:646
 msgid "If enabled the preview will be redrawn automatically"
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:649
-#, fuzzy
 msgid "R_edraw preview"
 msgstr ""
-"Generează o\n"
-"previzualizare"
 
 #. Zoom Options
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:657
@@ -9254,9 +8959,8 @@ msgid "Undo last zoom change"
 msgstr "Anulează ultima modificare de zoom"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:703
-#, fuzzy
 msgid "Redo last zoom change"
-msgstr "schimbare rezoluție"
+msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:718
 msgid "_Parameters"
@@ -9338,9 +9042,8 @@ msgid "Barnsley 3"
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:852
-#, fuzzy
 msgid "Spider"
-msgstr "Dimensiune"
+msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:854
 msgid "Man'o'war"
@@ -9363,9 +9066,8 @@ msgid "Change the number of colors in the mapping"
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:930
-#, fuzzy
 msgid "Use loglog smoothing"
-msgstr "Netezire"
+msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:937
 msgid "Use log log smoothing to eliminate \"banding\" in the result"
@@ -9465,9 +9167,9 @@ msgid "_Fractals"
 msgstr "_Fractali"
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1560
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write '%s': %s"
-msgstr "Nu am reușit să citesc din %s"
+msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1635
 msgid "Load Fractal Parameters"
@@ -9478,11 +9180,9 @@ msgid "Save Fractal Parameters"
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1871
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a FractalExplorer file"
 msgstr ""
-"%s a eșuat.\n"
-"%s nu este un fișier obișnuit."
 
 #: ../plug-ins/fractal-explorer/fractal-explorer-dialogs.c:1877
 #, c-format
@@ -9494,14 +9194,12 @@ msgid "Render fractal art"
 msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:244
-#, fuzzy
 msgid "_Fractal Explorer..."
-msgstr "/Filtre/Procesare"
+msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:374
-#, fuzzy
 msgid "Rendering fractal"
-msgstr "Amestec..."
+msgstr ""
 
 #: ../plug-ins/fractal-explorer/fractal-explorer.c:756
 #: ../plug-ins/gradient-flare/gradient-flare.c:3200
@@ -9625,19 +9323,16 @@ msgid "Show grid"
 msgstr "Arată grila"
 
 #: ../plug-ins/gfig/gfig-dialog.c:637
-#, fuzzy
 msgid "Load Gfig Object Collection"
-msgstr "Încarcă din"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-dialog.c:686
-#, fuzzy
 msgid "Save Gfig Drawing"
-msgstr "elimină strat"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-dialog.c:831
-#, fuzzy
 msgid "First Gfig"
-msgstr "Modifică punct"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-dialog.c:870
 msgid "_Undo"
@@ -9652,19 +9347,16 @@ msgid "_Grid"
 msgstr "_Grilă"
 
 #: ../plug-ins/gfig/gfig-dialog.c:886
-#, fuzzy
 msgid "Raise selected object"
-msgstr "Elimină selecția"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-dialog.c:890
-#, fuzzy
 msgid "Lower selected object"
-msgstr "Elimină selecția"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-dialog.c:894
-#, fuzzy
 msgid "Raise selected object to top"
-msgstr "Elimină selecția"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-dialog.c:898
 msgid "Lower selected object to bottom"
@@ -9748,9 +9440,8 @@ msgid "Show position"
 msgstr "Arată poziția"
 
 #: ../plug-ins/gfig/gfig-dialog.c:1240
-#, fuzzy
 msgid "Show control points"
-msgstr "Elimină punct"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-dialog.c:1274
 msgid "Max undo:"
@@ -9882,27 +9573,24 @@ msgid "XY position:"
 msgstr "Poziție XY:"
 
 #: ../plug-ins/gfig/gfig-spiral.c:55
-#, fuzzy
 msgid "Spiral Number of Turns"
-msgstr "Numărul minim de culori:"
+msgstr ""
 
 #: ../plug-ins/gfig/gfig-star.c:52
 msgid "Star Number of Points"
 msgstr ""
 
 #: ../plug-ins/gfig/gfig-stock.c:41
-#, fuzzy
 msgid "Create bezier curve"
-msgstr "redenumește stratul"
+msgstr "Creează curbe Bézier"
 
 #: ../plug-ins/gfig/gfig.c:124
 msgid "Create geometric shapes"
 msgstr ""
 
 #: ../plug-ins/gfig/gfig.c:135
-#, fuzzy
 msgid "_Gfig..."
-msgstr "Decupez..."
+msgstr ""
 
 #: ../plug-ins/gfig/gfig.c:731
 msgid ""
@@ -9910,14 +9598,13 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/gfig/gfig.c:758
-#, fuzzy, c-format
+#, c-format
 msgid "Error trying to open temporary file '%s' for parasite loading: %s"
-msgstr "Nu pot deschide %s; %s"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/brush.c:247
-#, fuzzy
 msgid "Can only save drawables!"
-msgstr "Nuanța-Saturare funcționează numai pe imaginii RGB."
+msgstr ""
 
 #: ../plug-ins/gimpressionist/brush.c:252
 msgid "Save Brush"
@@ -10015,9 +9702,8 @@ msgid "Use a transparent background; Only the strokes painted will be visible"
 msgstr ""
 
 #: ../plug-ins/gimpressionist/general.c:203
-#, fuzzy
 msgid "Paint edges"
-msgstr "Proceduri parazit"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/general.c:208
 msgid "Selects if to place strokes all the way out to the edges of the image"
@@ -10025,9 +9711,8 @@ msgstr ""
 
 #. Tileable checkbox
 #: ../plug-ins/gimpressionist/general.c:213 ../plug-ins/maze/maze-dialog.c:278
-#, fuzzy
 msgid "Tileable"
-msgstr "Triunghi"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/general.c:217
 msgid "Selects if the resulting image should be seamlessly tileable"
@@ -10075,9 +9760,8 @@ msgid "How much to blur the drop shadow"
 msgstr "Cât de mult să fie atenuată claritatea umbrei de perspectivă"
 
 #: ../plug-ins/gimpressionist/general.c:276
-#, fuzzy
 msgid "Deviation threshold:"
-msgstr "Prag implicit:"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/general.c:280
 msgid "A bailout-value for adaptive selections"
@@ -10088,9 +9772,8 @@ msgid "Performs various artistic operations"
 msgstr ""
 
 #: ../plug-ins/gimpressionist/gimp.c:95
-#, fuzzy
 msgid "_GIMPressionist..."
-msgstr "Sesiune"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/gimp.c:371
 msgid "Painting"
@@ -10196,9 +9879,8 @@ msgid "Opens up the Orientation Map Editor"
 msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:526
-#, fuzzy
 msgid "Orientation Map Editor"
-msgstr "Editorul de gradienți"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:555
 msgid "Vectors"
@@ -10250,19 +9932,16 @@ msgid "_Normal"
 msgstr "_Normal"
 
 #: ../plug-ins/gimpressionist/orientmap.c:646
-#, fuzzy
 msgid "Vorte_x"
-msgstr "text"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:647
-#, fuzzy
 msgid "Vortex_2"
-msgstr "text"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:648
-#, fuzzy
 msgid "Vortex_3"
-msgstr "text"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:654
 #: ../plug-ins/gimpressionist/sizemap.c:542
@@ -10284,9 +9963,8 @@ msgid "Change the angle of the selected vector"
 msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:683
-#, fuzzy
 msgid "Ang_le offset:"
-msgstr "Unghi:"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:687
 msgid "Offset all vectors with a given angle"
@@ -10297,9 +9975,8 @@ msgid "Change the strength of the selected vector"
 msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:705
-#, fuzzy
 msgid "S_trength exp.:"
-msgstr "Memorează traseul"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/orientmap.c:709
 #: ../plug-ins/gimpressionist/sizemap.c:537
@@ -10315,9 +9992,8 @@ msgid "Inverts the Papers texture"
 msgstr ""
 
 #: ../plug-ins/gimpressionist/paper.c:177
-#, fuzzy
 msgid "O_verlay"
-msgstr "Suprapunere"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/paper.c:182
 msgid "Applies the paper as it is (without embossing it)"
@@ -10328,14 +10004,12 @@ msgid "Specifies the scale of the texture (in percent of original file)"
 msgstr ""
 
 #: ../plug-ins/gimpressionist/placement.c:67
-#, fuzzy
 msgid "Pl_acement"
-msgstr "Incremental"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/placement.c:73
-#, fuzzy
 msgid "Placement"
-msgstr "Incremental"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/placement.c:77
 msgid "Randomly"
@@ -10374,28 +10048,25 @@ msgstr ""
 #. * that need not and should not be freed. So this call is OK.
 #. *
 #: ../plug-ins/gimpressionist/ppmtool.c:650
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to save PPM file '%s': %s"
-msgstr "Nu am reușit să citesc din %s"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/presets.c:640
-#, fuzzy
 msgid "Save Current"
-msgstr "Salvează curbe"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/presets.c:894
-#, fuzzy
 msgid "Gimpressionist Defaults"
-msgstr "Sesiune"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/presets.c:1015
 msgid "_Presets"
 msgstr "_Predefiniri"
 
 #: ../plug-ins/gimpressionist/presets.c:1030
-#, fuzzy
 msgid "Save Current..."
-msgstr "Salvează curbe"
+msgstr ""
 
 #: ../plug-ins/gimpressionist/presets.c:1038
 msgid "Save the current settings to the specified file"
@@ -10578,11 +10249,9 @@ msgid "Failed to open GFlare file '%s': %s"
 msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:1272
-#, fuzzy, c-format
+#, c-format
 msgid "'%s' is not a valid GFlare file."
 msgstr ""
-"%s a eșuat.\n"
-"%s nu este un fișier obișnuit."
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:1326
 #, c-format
@@ -10598,9 +10267,9 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:1484
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write GFlare file '%s': %s"
-msgstr "Nu am reușit să citesc din %s"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:2414
 msgid "A_uto update preview"
@@ -10660,14 +10329,12 @@ msgid "S_elector"
 msgstr "S_elector"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3059
-#, fuzzy
 msgid "New Gradient Flare"
-msgstr "Interfață utilizator pentru Gradienți"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3062
-#, fuzzy
 msgid "Enter a name for the new GFlare"
-msgstr "Introduceți un nume pentru acest memorie tampon"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3082
 #, c-format
@@ -10675,14 +10342,12 @@ msgid "The name '%s' is used already!"
 msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3138
-#, fuzzy
 msgid "Copy Gradient Flare"
-msgstr "Interfață utilizator pentru Gradienți"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3141
-#, fuzzy
 msgid "Enter a name for the copied GFlare"
-msgstr "Introduceți un nume pentru traseu"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3163
 #, c-format
@@ -10694,9 +10359,8 @@ msgid "Cannot delete!! There must be at least one GFlare."
 msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3204
-#, fuzzy
 msgid "Delete Gradient Flare"
-msgstr "elimină strat"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3276
 #, c-format
@@ -10704,14 +10368,12 @@ msgid "not found %s in gflares_list"
 msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3317
-#, fuzzy
 msgid "Gradient Flare Editor"
-msgstr "Editorul de gradienți"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3321
-#, fuzzy
 msgid "Rescan Gradients"
-msgstr "Gradienți"
+msgstr ""
 
 # hm ? sau opțiuni de strălucire a picturii ?
 #. Glow
@@ -10733,9 +10395,8 @@ msgstr "Mod de pictură:"
 
 #. Rays
 #: ../plug-ins/gradient-flare/gradient-flare.c:3474
-#, fuzzy
 msgid "Rays Paint Options"
-msgstr "Opțiuni de desenare"
+msgstr ""
 
 #. Rays
 #: ../plug-ins/gradient-flare/gradient-flare.c:3502
@@ -10802,9 +10463,8 @@ msgid "_Rays"
 msgstr "_Raze"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3812
-#, fuzzy
 msgid "Size factor gradient:"
-msgstr "Alege directorul de gradienți"
+msgstr ""
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3816
 msgid "Probability gradient:"
@@ -10828,86 +10488,85 @@ msgid "Polygon"
 msgstr "Poligon"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3936
-#, fuzzy
 msgid "Random seed:"
-msgstr "Re-Refacere"
+msgstr "Sămânță aleatoare:"
 
 #: ../plug-ins/gradient-flare/gradient-flare.c:3950
 msgid "_Second Flares"
 msgstr "Reflexie _secundară"
 
 #: ../plug-ins/help-browser/dialog.c:186
-#: ../plug-ins/help-browser/dialog.c:1134
+#: ../plug-ins/help-browser/dialog.c:1121
 msgid "GIMP Help Browser"
 msgstr "Navigator de ajutor GIMP"
 
-#: ../plug-ins/help-browser/dialog.c:566
+#: ../plug-ins/help-browser/dialog.c:564
 msgid "Go back one page"
 msgstr "Du-te o pagină înapoi"
 
-#: ../plug-ins/help-browser/dialog.c:571
+#: ../plug-ins/help-browser/dialog.c:569
 msgid "Go forward one page"
 msgstr "Du-te o pagină înainte"
 
-#: ../plug-ins/help-browser/dialog.c:576
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "_Reload"
 msgstr "_Reîncarcă"
 
-#: ../plug-ins/help-browser/dialog.c:576
+#: ../plug-ins/help-browser/dialog.c:574
 msgid "Reload current page"
 msgstr "Reîncarcă pagina curentă"
 
-#: ../plug-ins/help-browser/dialog.c:581
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "_Stop"
 msgstr "_Stop"
 
-#: ../plug-ins/help-browser/dialog.c:581
+#: ../plug-ins/help-browser/dialog.c:579
 msgid "Stop loading this page"
 msgstr "Oprește încărcarea acestei pagini"
 
-#: ../plug-ins/help-browser/dialog.c:586
+#: ../plug-ins/help-browser/dialog.c:584
 msgid "Go to the index page"
 msgstr "Du-te la pagina de index"
 
-#: ../plug-ins/help-browser/dialog.c:591
+#: ../plug-ins/help-browser/dialog.c:589
 msgid "C_opy location"
 msgstr "C_opiază adresa"
 
-#: ../plug-ins/help-browser/dialog.c:592
+#: ../plug-ins/help-browser/dialog.c:590
 msgid "Copy the location of this page to the clipboard"
 msgstr "Copiază adresa acestei pagini în clipboard"
 
-#: ../plug-ins/help-browser/dialog.c:612
+#: ../plug-ins/help-browser/dialog.c:610
 msgid "Find text in current page"
 msgstr "Caută un text în pagina curentă"
 
-#: ../plug-ins/help-browser/dialog.c:617
+#: ../plug-ins/help-browser/dialog.c:615
 msgid "Find _Again"
 msgstr "C_aută din nou"
 
-#: ../plug-ins/help-browser/dialog.c:636
+#: ../plug-ins/help-browser/dialog.c:634
 msgid "S_how Index"
 msgstr "_Arată indexul"
 
-#: ../plug-ins/help-browser/dialog.c:637
+#: ../plug-ins/help-browser/dialog.c:635
 msgid "Toggle the visibility of the sidebar"
 msgstr "Comută vizibilitatea barei laterale"
 
 # hm ?
-#: ../plug-ins/help-browser/dialog.c:658
+#: ../plug-ins/help-browser/dialog.c:656
 msgid "Visit the GIMP documentation website"
 msgstr "Vizitați saitul web al documentației GIMP"
 
-#: ../plug-ins/help-browser/dialog.c:1175
+#: ../plug-ins/help-browser/dialog.c:1162
 msgid "Find:"
 msgstr "Caută:"
 
-#: ../plug-ins/help-browser/dialog.c:1192
+#: ../plug-ins/help-browser/dialog.c:1179
 msgctxt "search"
 msgid "_Previous"
 msgstr "_Precedent"
 
-#: ../plug-ins/help-browser/dialog.c:1204
+#: ../plug-ins/help-browser/dialog.c:1191
 msgctxt "search"
 msgid "_Next"
 msgstr "_Următor"
@@ -10944,20 +10603,19 @@ msgid "Loading index from '%s'"
 msgstr "Încărcare index de la „%s”"
 
 #: ../plug-ins/help/gimphelplocale.c:267
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Parse error in '%s':\n"
 "%s"
-msgstr "Eroare la deschiderea fișierului: %s\n"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:334
 msgid "Create an Iterated Function System (IFS) fractal"
 msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:346
-#, fuzzy
 msgid "_IFS Fractal..."
-msgstr "Tip umplere"
+msgstr ""
 
 #. X
 #: ../plug-ins/ifs-compose/ifs-compose.c:526
@@ -10996,19 +10654,16 @@ msgid "Simple"
 msgstr "Siimplu"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:650
-#, fuzzy
 msgid "IFS Fractal: Target"
-msgstr "Tip umplere"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:656
-#, fuzzy
 msgid "Scale hue by:"
-msgstr "Factor de scală X:"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:671
-#, fuzzy
 msgid "Scale value by:"
-msgstr "Factor de scală X:"
+msgstr ""
 
 #. Full color control section
 #: ../plug-ins/ifs-compose/ifs-compose.c:688
@@ -11016,38 +10671,32 @@ msgid "Full"
 msgstr "Complet"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:696
-#, fuzzy
 msgid "IFS Fractal: Red"
-msgstr "Tip umplere"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:704
-#, fuzzy
 msgid "IFS Fractal: Green"
-msgstr "Tip umplere"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:712
-#, fuzzy
 msgid "IFS Fractal: Blue"
-msgstr "Tip umplere"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:720
 msgid "IFS Fractal: Black"
 msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:770
-#, fuzzy
 msgid "IFS Fractal"
-msgstr "Fișier nou"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:868
-#, fuzzy
 msgid "Spatial Transformation"
-msgstr "Transformare"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:874
-#, fuzzy
 msgid "Color Transformation"
-msgstr "Transformare"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:884
 msgid "Relative probability:"
@@ -11055,24 +10704,20 @@ msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1059
 #: ../plug-ins/imagemap/imap_menu.c:163
-#, fuzzy
 msgid "Select _All"
-msgstr "/Selecție/Selectează tot"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1063
-#, fuzzy
 msgid "Re_center"
-msgstr "Centru X:"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1063
-#, fuzzy
 msgid "Recompute Center"
-msgstr "Previzualizare indisponibilă"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1067
-#, fuzzy
 msgid "Render Options"
-msgstr "Opțiuni pentru simularea de nuanțe"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1073
 #: ../plug-ins/imagemap/imap_cmd_move.c:86
@@ -11093,70 +10738,56 @@ msgid "Stretch"
 msgstr "Extinde"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1177
-#, fuzzy
 msgid "IFS Fractal Render Options"
-msgstr "Opțiuni pentru simularea de nuanțe"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1199
 msgid "Max. memory:"
 msgstr "Memorie maximă:"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1226
-#, fuzzy
 msgid "Subdivide:"
-msgstr "Imparte"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1239
-#, fuzzy
 msgid "Spot radius:"
-msgstr "Rază:"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1304
-#, fuzzy, c-format
+#, c-format
 msgid "Rendering IFS (%d/%d)"
-msgstr "Amestec..."
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:1470
-#, fuzzy, c-format
+#, c-format
 msgid "Transformation %s"
-msgstr "Transformare"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2379
-#, fuzzy
 msgid "Save failed"
-msgstr "Salvare imagine"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2460
 #: ../plug-ins/ifs-compose/ifs-compose.c:2473
-#, fuzzy
 msgid "Open failed"
 msgstr ""
-"Deschiderea a eșuat.\n"
-"%s"
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2468
-#, fuzzy, c-format
+#, c-format
 msgid "File '%s' doesn't seem to be an IFS Fractal file."
 msgstr ""
-"%s a eșuat.\n"
-"%s nu este un fișier obișnuit."
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2508
-#, fuzzy
 msgid "Save as IFS Fractal file"
-msgstr "Salvează ca fișier POV-Ray"
+msgstr ""
 
 #: ../plug-ins/ifs-compose/ifs-compose.c:2545
-#, fuzzy
 msgid "Open IFS Fractal file"
 msgstr ""
-"Deschiderea a eșuat.\n"
-"%s"
 
 #: ../plug-ins/imagemap/imap_about.c:43
-#, fuzzy
 msgid "Image Map Plug-In"
-msgstr "Modul inserabil GIMP"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_about.c:47
 msgid "Copyright © 1999-2005 by Maurits Rijk"
@@ -11171,9 +10802,8 @@ msgid "C_ircle"
 msgstr "_Cerc"
 
 #: ../plug-ins/imagemap/imap_circle.c:264
-#, fuzzy
 msgid "Center _x:"
-msgstr "Centru X:"
+msgstr "Centru _x:"
 
 #: ../plug-ins/imagemap/imap_circle.c:269
 #: ../plug-ins/imagemap/imap_circle.c:276
@@ -11189,9 +10819,8 @@ msgid "pixels"
 msgstr "puncte ecran"
 
 #: ../plug-ins/imagemap/imap_circle.c:271
-#, fuzzy
 msgid "Center _y:"
-msgstr "Centru X:"
+msgstr "Centru _y:"
 
 #: ../plug-ins/imagemap/imap_cmd_clear.c:51
 msgid "Clear"
@@ -11281,33 +10910,28 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:170
-#, fuzzy
 msgid "_Left start at:"
-msgstr "Stare:"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:180
-#, fuzzy
 msgid "_Top start at:"
-msgstr "Stare:"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:185
-#, fuzzy
 msgid "_Horz. spacing:"
-msgstr "Spațiere:"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:191
 msgid "_No. across:"
 msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:197
-#, fuzzy
 msgid "_Vert. spacing:"
-msgstr "Spațiere:"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:203
-#, fuzzy
 msgid "No. _down:"
-msgstr "/Combină în jos"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_guides.c:212
 msgid "Base _URL:"
@@ -11323,37 +10947,32 @@ msgstr "Ghidaje"
 
 #: ../plug-ins/imagemap/imap_cmd_insert_point.c:62
 #: ../plug-ins/imagemap/imap_menu.c:178
-#, fuzzy
 msgid "Insert Point"
-msgstr "Elimină punct"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_move_down.c:53
 #: ../plug-ins/imagemap/imap_cmd_object_down.c:55
 #: ../plug-ins/imagemap/imap_menu.c:176
-#, fuzzy
 msgid "Move Down"
-msgstr "/Combină în jos"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_move_sash.c:68
-#, fuzzy
 msgid "Move Sash"
-msgstr "Deplasare: "
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_move_selected.c:56
 msgid "Move Selected Objects"
 msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_move_to_front.c:51
-#, fuzzy
 msgid "Move To Front"
-msgstr "Unealtă deplasare"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_move_up.c:53
 #: ../plug-ins/imagemap/imap_cmd_object_up.c:55
 #: ../plug-ins/imagemap/imap_menu.c:175
-#, fuzzy
 msgid "Move Up"
-msgstr "Deplasare: "
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_paste.c:51
 #: ../plug-ins/imagemap/imap_menu.c:161
@@ -11365,63 +10984,52 @@ msgid "Select"
 msgstr "Selectează"
 
 #: ../plug-ins/imagemap/imap_cmd_select_next.c:51
-#, fuzzy
 msgid "Select Next"
-msgstr "Selectează"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_select_prev.c:51
-#, fuzzy
 msgid "Select Previous"
-msgstr "Alege directorul de module"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_select_region.c:64
-#, fuzzy
 msgid "Select Region"
-msgstr "Selecție"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_cmd_send_to_back.c:51
 msgid "Send To Back"
 msgstr "Trimite în spate"
 
 #: ../plug-ins/imagemap/imap_cmd_unselect.c:53
-#, fuzzy
 msgid "Unselect"
-msgstr "Selectează"
+msgstr "Deselectează"
 
 #: ../plug-ins/imagemap/imap_cmd_unselect_all.c:56
-#, fuzzy
 msgid "Unselect All"
-msgstr "/Selecție/Selectează tot"
+msgstr "Deselectează tot"
 
 #: ../plug-ins/imagemap/imap_edit_area_info.c:196
-#, fuzzy
 msgid "Link Type"
-msgstr "Tip umplere"
+msgstr "Tip de legătură"
 
 #: ../plug-ins/imagemap/imap_edit_area_info.c:205
-#, fuzzy
 msgid "_Web Site"
-msgstr "Alb"
+msgstr "Sait _Web"
 
 #: ../plug-ins/imagemap/imap_edit_area_info.c:211
-#, fuzzy
 msgid "_Ftp Site"
-msgstr "Dimensiune Eșantion:"
+msgstr "Sait FTP"
 
 #: ../plug-ins/imagemap/imap_edit_area_info.c:217
-#, fuzzy
 msgid "_Gopher"
-msgstr "Decupare"
+msgstr "_Gopher"
 
 #: ../plug-ins/imagemap/imap_edit_area_info.c:223
-#, fuzzy
 msgid "Ot_her"
-msgstr "Pană"
+msgstr "_Altele"
 
 #: ../plug-ins/imagemap/imap_edit_area_info.c:229
-#, fuzzy
 msgid "F_ile"
-msgstr "/_Fișier"
+msgstr "F_ișier"
 
 #: ../plug-ins/imagemap/imap_edit_area_info.c:235
 msgid "WAI_S"
@@ -11644,7 +11252,7 @@ msgstr "D_electează tot"
 
 #: ../plug-ins/imagemap/imap_menu.c:166
 msgid "Edit Area _Info..."
-msgstr "Editare zonă de _informații..."
+msgstr "Editează zona de _informații..."
 
 #: ../plug-ins/imagemap/imap_menu.c:167
 msgid "Edit selected area info"
@@ -11692,11 +11300,11 @@ msgstr "_Cartografiere"
 
 #: ../plug-ins/imagemap/imap_menu.c:188
 msgid "Edit Map Info..."
-msgstr "Editare informațiil hartă..."
+msgstr "Editează informațiile hărții..."
 
 #: ../plug-ins/imagemap/imap_menu.c:189
 msgid "Edit Map Info"
-msgstr "Editare informațiil hartă"
+msgstr "Editează informațiile hărții"
 
 #: ../plug-ins/imagemap/imap_menu.c:191
 msgid "_Tools"
@@ -11727,9 +11335,8 @@ msgid "_Zoom"
 msgstr "_Zoom"
 
 #: ../plug-ins/imagemap/imap_menu.c:208
-#, fuzzy
 msgid "Area List"
-msgstr "redenumește stratul"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_menu.c:218
 msgid "Arrow"
@@ -11768,9 +11375,8 @@ msgid "_Insert"
 msgstr "_Inserează"
 
 #: ../plug-ins/imagemap/imap_polygon.c:527
-#, fuzzy
 msgid "A_ppend"
-msgstr "Aspect"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_polygon.c:533
 msgid "_Remove"
@@ -11785,18 +11391,16 @@ msgid "General"
 msgstr "General"
 
 #: ../plug-ins/imagemap/imap_preferences.c:354
-#, fuzzy
 msgid "Default Map Type"
-msgstr "Tipul implicit de imagine:"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_preferences.c:373
 msgid "_Prompt for area info"
 msgstr ""
 
 #: ../plug-ins/imagemap/imap_preferences.c:375
-#, fuzzy
 msgid "_Require default URL"
-msgstr "Implicit"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_preferences.c:377
 msgid "Show area _handles"
@@ -11823,9 +11427,8 @@ msgid "Number of _undo levels (1 - 99):"
 msgstr "N_umăr de niveluri de anulare (1-99):"
 
 #: ../plug-ins/imagemap/imap_preferences.c:400
-#, fuzzy
 msgid "Number of M_RU entries (1 - 16):"
-msgstr "Numar de procesoare utilizat"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_preferences.c:409
 msgid "Select Color"
@@ -11840,18 +11443,16 @@ msgid "Selected:"
 msgstr "Selectat:"
 
 #: ../plug-ins/imagemap/imap_preferences.c:437
-#, fuzzy
 msgid "Co_ntiguous Region"
-msgstr "Determinare limite(intindere) regiuni"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_preferences.c:443
 msgid "_Automatically convert"
 msgstr ""
 
 #: ../plug-ins/imagemap/imap_preferences.c:454
-#, fuzzy
 msgid "General Preferences"
-msgstr "Preferințe"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_rectangle.c:69
 msgid "_Rectangle"
@@ -11894,9 +11495,8 @@ msgid "Image name:"
 msgstr "Nume imagine:"
 
 #: ../plug-ins/imagemap/imap_settings.c:98
-#, fuzzy
 msgid "Select Image File"
-msgstr "Scalează imaginea"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_settings.c:102
 msgid "_Title:"
@@ -11915,9 +11515,8 @@ msgid "_Description:"
 msgstr "_Descriere:"
 
 #: ../plug-ins/imagemap/imap_settings.c:130
-#, fuzzy
 msgid "Map File Format"
-msgstr "Format titlu imagine:"
+msgstr ""
 
 #: ../plug-ins/imagemap/imap_source.c:63
 msgid "View Source"
@@ -11925,19 +11524,16 @@ msgstr "Vizualizează sursa"
 
 #: ../plug-ins/lighting/lighting-apply.c:105
 #: ../plug-ins/lighting/lighting-ui.c:1019
-#, fuzzy
 msgid "Lighting Effects"
-msgstr "/Filtre/Efecte de lumini"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-main.c:192
-#, fuzzy
 msgid "Apply various lighting effects to an image"
-msgstr "Salvare jurnal de erori în fișier..."
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-main.c:197
-#, fuzzy
 msgid "_Lighting Effects..."
-msgstr "/Filtre/Efecte de lumini"
+msgstr ""
 
 #. General options
 #: ../plug-ins/lighting/lighting-ui.c:295
@@ -11977,37 +11573,31 @@ msgstr "Distanță:"
 #: ../plug-ins/lighting/lighting-ui.c:378
 #: ../plug-ins/map-object/map-object-ui.c:619
 msgid "Light Settings"
-msgstr ""
+msgstr "Setări de lumină"
 
 #: ../plug-ins/lighting/lighting-ui.c:391
-#, fuzzy
 msgid "Light 1"
-msgstr "Înălțime"
+msgstr "Lumina 1"
 
 #: ../plug-ins/lighting/lighting-ui.c:392
-#, fuzzy
 msgid "Light 2"
-msgstr "Înălțime"
+msgstr "Lumina 2"
 
 #: ../plug-ins/lighting/lighting-ui.c:393
-#, fuzzy
 msgid "Light 3"
-msgstr "Înălțime"
+msgstr "Lumina 3"
 
 #: ../plug-ins/lighting/lighting-ui.c:394
-#, fuzzy
 msgid "Light 4"
-msgstr "Înălțime"
+msgstr "Lumina 4"
 
 #: ../plug-ins/lighting/lighting-ui.c:395
-#, fuzzy
 msgid "Light 5"
-msgstr "Înălțime"
+msgstr "Lumina 5"
 
 #: ../plug-ins/lighting/lighting-ui.c:396
-#, fuzzy
 msgid "Light 6"
-msgstr "Înălțime"
+msgstr "Lumina 6"
 
 #: ../plug-ins/lighting/lighting-ui.c:410
 msgid "Color:"
@@ -12025,7 +11615,7 @@ msgstr "Punct"
 #: ../plug-ins/lighting/lighting-ui.c:432
 #: ../plug-ins/map-object/map-object-ui.c:642
 msgid "Type of light source to apply"
-msgstr ""
+msgstr "Tipul de sursă de lumină de aplicat"
 
 #: ../plug-ins/lighting/lighting-ui.c:434
 #: ../plug-ins/map-object/map-object-ui.c:644
@@ -12035,7 +11625,7 @@ msgstr "Selectați culoarea sursei de lumină"
 #: ../plug-ins/lighting/lighting-ui.c:448
 #: ../plug-ins/map-object/map-object-ui.c:657
 msgid "Set light source color"
-msgstr ""
+msgstr "Stabilește culoarea sursei de lumină"
 
 #: ../plug-ins/lighting/lighting-ui.c:456
 msgid "_Intensity:"
@@ -12101,14 +11691,12 @@ msgid "I_solate"
 msgstr "I_zolează"
 
 #: ../plug-ins/lighting/lighting-ui.c:575
-#, fuzzy
 msgid "Lighting preset:"
-msgstr "/Filtre/Efecte de lumini"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:621
-#, fuzzy
 msgid "Material Properties"
-msgstr "Proceduri interne"
+msgstr "Proprietăți material"
 
 #: ../plug-ins/lighting/lighting-ui.c:639
 msgid "_Glowing:"
@@ -12155,18 +11743,16 @@ msgid "_Metallic"
 msgstr "_Metalic"
 
 #: ../plug-ins/lighting/lighting-ui.c:803
-#, fuzzy
 msgid "E_nable bump mapping"
-msgstr "Mediu"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:817
 msgid "Enable/disable bump-mapping (image depth)"
 msgstr "Activează sau dezactivează stamparea (adâncimea de imagine)"
 
 #: ../plug-ins/lighting/lighting-ui.c:839
-#, fuzzy
 msgid "Bumpm_ap image:"
-msgstr "Imagine:"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:843
 msgid "Logarithmic"
@@ -12177,32 +11763,28 @@ msgid "Cu_rve:"
 msgstr "Cu_rbă:"
 
 #: ../plug-ins/lighting/lighting-ui.c:860
-#, fuzzy
 msgid "Ma_ximum height:"
-msgstr "Dimensiunea maximă a imaginii:"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:870
 msgid "Maximum height for bumps"
 msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:894
-#, fuzzy
 msgid "E_nable environment mapping"
-msgstr "Mediu"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:908
 msgid "Enable/disable environment-mapping (reflection)"
 msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:925
-#, fuzzy
 msgid "En_vironment image:"
-msgstr "Mediu"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:928
-#, fuzzy
 msgid "Environment image to use"
-msgstr "Mediu"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:950
 msgid "Op_tions"
@@ -12210,70 +11792,58 @@ msgstr "_Opțiuni"
 
 #: ../plug-ins/lighting/lighting-ui.c:954
 #: ../plug-ins/map-object/map-object-ui.c:1291
-#, fuzzy
 msgid "_Light"
-msgstr "Înălțime"
+msgstr "_Lumină"
 
 #: ../plug-ins/lighting/lighting-ui.c:958
 #: ../plug-ins/map-object/map-object-ui.c:1295
-#, fuzzy
 msgid "_Material"
-msgstr "Stapân"
+msgstr "_Material"
 
 #: ../plug-ins/lighting/lighting-ui.c:962
-#, fuzzy
 msgid "_Bump Map"
-msgstr "Inversează"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:966
-#, fuzzy
 msgid "_Environment Map"
-msgstr "Mediu"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:1082
 #: ../plug-ins/map-object/map-object-ui.c:1397
-#, fuzzy
 msgid "Recompute preview image"
-msgstr "Previzualizare indisponibilă"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:1084
-#, fuzzy
 msgid "I_nteractive"
-msgstr "Interfață"
+msgstr "I_nteractiv"
 
 #: ../plug-ins/lighting/lighting-ui.c:1098
 msgid "Enable/disable real time preview of changes"
 msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:1137
-#, fuzzy
 msgid "Save Lighting Preset"
-msgstr "/Filtre/Efecte de lumini"
+msgstr ""
 
 #: ../plug-ins/lighting/lighting-ui.c:1281
-#, fuzzy
 msgid "Load Lighting Preset"
-msgstr "/Filtre/Efecte de lumini"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-apply.c:276
-#, fuzzy
 msgid "Map to plane"
-msgstr "Balanța de culori"
+msgstr "Mapează la un plan"
 
 #: ../plug-ins/map-object/map-object-apply.c:279
-#, fuzzy
 msgid "Map to sphere"
-msgstr "Tip"
+msgstr "Mapează la o sferă"
 
 #: ../plug-ins/map-object/map-object-apply.c:282
-#, fuzzy
 msgid "Map to box"
-msgstr "RGB simplu"
+msgstr "Mapează la o cutie"
 
 #: ../plug-ins/map-object/map-object-apply.c:285
-#, fuzzy
 msgid "Map to cylinder"
-msgstr "Curăță"
+msgstr "Mapează la un cilindru"
 
 #: ../plug-ins/map-object/map-object-main.c:193
 msgid "Map the image to an object (plane, sphere, box or cylinder)"
@@ -12290,23 +11860,20 @@ msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:266
 #: ../plug-ins/map-object/map-object-ui.c:1311
-#, fuzzy
 msgid "C_ylinder"
-msgstr "Curăță"
+msgstr "_Cilindru"
 
 #: ../plug-ins/map-object/map-object-ui.c:484
 msgid "Map to:"
 msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:488
-#, fuzzy
 msgid "Plane"
-msgstr "Inserează"
+msgstr "Plan"
 
 #: ../plug-ins/map-object/map-object-ui.c:489
-#, fuzzy
 msgid "Sphere"
-msgstr "Decupare"
+msgstr "Sferă"
 
 #: ../plug-ins/map-object/map-object-ui.c:490
 msgid "Box"
@@ -12317,27 +11884,24 @@ msgid "Type of object to map to"
 msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:503
-#, fuzzy
 msgid "Transparent background"
-msgstr "Transparent"
+msgstr "Fundal transparent"
 
 #: ../plug-ins/map-object/map-object-ui.c:514
 msgid "Make image transparent outside object"
 msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:516
-#, fuzzy
 msgid "Tile source image"
-msgstr "Scalează imaginea"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:527
 msgid "Tile source image: useful for infinite planes"
 msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:530
-#, fuzzy
 msgid "Create new image"
-msgstr "Imagine nouă"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:549
 msgid "Enable _antialiasing"
@@ -12356,38 +11920,32 @@ msgid "Stop when pixel differences are smaller than this value"
 msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:628
-#, fuzzy
 msgid "Point light"
-msgstr "punct"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:629
-#, fuzzy
 msgid "Directional light"
-msgstr "Culoare Directă"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:630
 msgid "No light"
 msgstr "Fără lumină"
 
 #: ../plug-ins/map-object/map-object-ui.c:635
-#, fuzzy
 msgid "Lightsource type:"
-msgstr "Tip curbă:"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:649
-#, fuzzy
 msgid "Lightsource color:"
-msgstr "Culoare Directă"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:714
-#, fuzzy
 msgid "Direction Vector"
-msgstr "Culoare Directă"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:790
-#, fuzzy
 msgid "Intensity Levels"
-msgstr "Intensitate:"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:809
 msgid "Ambient:"
@@ -12399,9 +11957,8 @@ msgid "Diffuse:"
 msgstr "Difuzează:"
 
 #: ../plug-ins/map-object/map-object-ui.c:862
-#, fuzzy
 msgid "Reflectivity"
-msgstr "Sensibilitate"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:896
 msgid "Higher values makes the object reflect more light (appear lighter)"
@@ -12440,9 +11997,8 @@ msgid "Rotation angle about Z axis"
 msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:1097
-#, fuzzy
 msgid "Front:"
-msgstr "Numar:"
+msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:1097
 msgid "Back:"
@@ -12466,15 +12022,13 @@ msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:1193
 #: ../plug-ins/print/print-page-layout.c:402
-#, fuzzy
 msgid "_Top:"
-msgstr "Tip:"
+msgstr "_Sus:"
 
 #: ../plug-ins/map-object/map-object-ui.c:1193
 #: ../plug-ins/print/print-page-layout.c:421
-#, fuzzy
 msgid "_Bottom:"
-msgstr "Marire"
+msgstr "_Jos:"
 
 #: ../plug-ins/map-object/map-object-ui.c:1198
 msgid "Images for the Cap Faces"
@@ -12486,17 +12040,16 @@ msgid "Size"
 msgstr "Dimensiune"
 
 #: ../plug-ins/map-object/map-object-ui.c:1238
-#, fuzzy
 msgid "R_adius:"
-msgstr "Rază:"
+msgstr "R_ază:"
 
 #: ../plug-ins/map-object/map-object-ui.c:1242
 msgid "Cylinder radius"
-msgstr ""
+msgstr "Rază cilindru"
 
 #: ../plug-ins/map-object/map-object-ui.c:1256
 msgid "Cylinder length"
-msgstr ""
+msgstr "Lungime cilindru"
 
 #: ../plug-ins/map-object/map-object-ui.c:1287
 msgid "O_ptions"
@@ -12511,9 +12064,8 @@ msgid "Map to Object"
 msgstr ""
 
 #: ../plug-ins/map-object/map-object-ui.c:1415
-#, fuzzy
 msgid "Show preview _wireframe"
-msgstr "Dimensiune previzualizare:"
+msgstr ""
 
 #: ../plug-ins/maze/maze-algorithms.c:279
 msgid "Constructing maze using Prim's Algorithm"
@@ -12524,15 +12076,13 @@ msgid "Constructing tileable maze using Prim's Algorithm"
 msgstr ""
 
 #: ../plug-ins/maze/maze-dialog.c:172
-#, fuzzy
 msgid "Maze"
-msgstr "Scalare"
+msgstr "Labirint"
 
 #. The maze size frame
 #: ../plug-ins/maze/maze-dialog.c:194
-#, fuzzy
 msgid "Maze Size"
-msgstr "Dimensiunea imaginii: %s"
+msgstr "Dimensiune labirint"
 
 #. entscale == Entry and Scale pair function found in pixelize.c
 #: ../plug-ins/maze/maze-dialog.c:208
@@ -12553,9 +12103,8 @@ msgid "Algorithm"
 msgstr "Algoritm"
 
 #: ../plug-ins/maze/maze-dialog.c:270
-#, fuzzy
 msgid "Depth first"
-msgstr "Combină"
+msgstr ""
 
 #: ../plug-ins/maze/maze-dialog.c:271
 msgid "Prim's algorithm"
@@ -12572,14 +12121,12 @@ msgid "Draw a labyrinth"
 msgstr ""
 
 #: ../plug-ins/maze/maze.c:130
-#, fuzzy
 msgid "_Maze..."
-msgstr "Salvează"
+msgstr "_Labirint..."
 
 #: ../plug-ins/maze/maze.c:426
-#, fuzzy
 msgid "Drawing maze"
-msgstr "Nume:"
+msgstr "Desenare labirint"
 
 #: ../plug-ins/metadata/xmp-parse.c:240
 #, c-format
@@ -12621,25 +12168,25 @@ msgstr ""
 msgid "Nested elements (<%s>) are not allowed in this context"
 msgstr ""
 
-#: ../plug-ins/metadata/xmp-parse.c:1005
+#: ../plug-ins/metadata/xmp-parse.c:1010
 #, c-format
 msgid "End of element <%s> not expected in this context"
 msgstr ""
 
-#: ../plug-ins/metadata/xmp-parse.c:1107
+#: ../plug-ins/metadata/xmp-parse.c:1112
 #, c-format
 msgid "The current element (<%s>) cannot contain text"
 msgstr ""
 
-#: ../plug-ins/metadata/xmp-parse.c:1132
+#: ../plug-ins/metadata/xmp-parse.c:1137
 msgid "XMP packets must start with "
 msgstr ""
 
-#: ../plug-ins/metadata/xmp-parse.c:1146
+#: ../plug-ins/metadata/xmp-parse.c:1151
 msgid "XMP packets must end with "
 msgstr ""
 
-#: ../plug-ins/metadata/xmp-parse.c:1159
+#: ../plug-ins/metadata/xmp-parse.c:1164
 msgid "XMP cannot contain XML comments or processing instructions"
 msgstr ""
 
diff --git a/po-plug-ins/zh_CN.po b/po-plug-ins/zh_CN.po
index 9106eaa8d7..82c01c5895 100644
--- a/po-plug-ins/zh_CN.po
+++ b/po-plug-ins/zh_CN.po
@@ -11,9 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-plug-ins HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=gimp&component=general\n"
-"POT-Creation-Date: 2009-07-26 19:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-09-07 16:15+0800\n"
 "PO-Revision-Date: 2009-07-27 15:47+0800\n"
 "Last-Translator: Aron Xu \n"
 "Language-Team: Chinese/Simplified \n"
@@ -51,7 +50,7 @@ msgstr "选区"
 
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:174
 msgid "Context"
-msgstr ""
+msgstr "环境"
 
 #. spinbutton 1
 #: ../plug-ins/color-rotate/color-rotate-dialog.c:299
@@ -5562,35 +5561,35 @@ msgstr "用 email 发送图像"
 msgid "Send by E_mail..."
 msgstr "发送为邮件(_M)..."
 
-#: ../plug-ins/common/mail.c:408
+#: ../plug-ins/common/mail.c:407
 msgid "Send by Email"
 msgstr "发送为邮件..."
 
-#: ../plug-ins/common/mail.c:413
+#: ../plug-ins/common/mail.c:412
 msgid "_Send"
 msgstr "发送(_S)"
 
-#: ../plug-ins/common/mail.c:445
+#: ../plug-ins/common/mail.c:444
 msgid "_Filename:"
 msgstr "文件名(_F)："
 
-#: ../plug-ins/common/mail.c:457
+#: ../plug-ins/common/mail.c:456
 msgid "_To:"
 msgstr "到(_T)："
 
-#: ../plug-ins/common/mail.c:471
+#: ../plug-ins/common/mail.c:470
 msgid "_From:"
 msgstr "从(_F)："
 
-#: ../plug-ins/common/mail.c:483
+#: ../plug-ins/common/mail.c:482
 msgid "S_ubject:"
 msgstr "主题(_U)："
 
-#: ../plug-ins/common/mail.c:592
+#: ../plug-ins/common/mail.c:591
 msgid "some sort of error with the file extension or lack thereof"
 msgstr "文件扩展名缺失或者存在某种错误"
 
-#: ../plug-ins/common/mail.c:726
+#: ../plug-ins/common/mail.c:725
 #, c-format
 msgid "Could not start sendmail (%s)"
 msgstr "无法启动 sendmail (%s)"
@@ -8423,7 +8422,7 @@ msgstr "不支持的压缩模式：%d"
 
 #: ../plug-ins/file-psd/psd-load.c:1595
 msgid "Extra"
-msgstr ""
+msgstr "额外"
 
 #: ../plug-ins/file-psd/psd-save.c:228 ../plug-ins/file-psd/psd.c:114
 #: ../plug-ins/file-psd/psd.c:153
diff --git a/po-python/cs.po b/po-python/cs.po
index 218239c597..0fe66bf7b7 100644
--- a/po-python/cs.po
+++ b/po-python/cs.po
@@ -1,5 +1,3 @@
-# translation of cs.po to Czech
-# translation of cs.po to
 # Czech translation of GIMP python
 # Copyright (C) 2001,2003, 2006, 2007 Free Software Foundation, Inc.
 # Copyright (C) 2004, 2005 Miloslav Trmac 
@@ -8,56 +6,61 @@
 # Michal Bukovjan , 2003.
 # Miloslav Trmac , 2003 - 2005.
 # Jakub Friedl , 2006, 2007.
+# Marek Černocký , 2009.
+#
 msgid ""
 msgstr ""
-"Project-Id-Version: cs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-10 17:14+0200\n"
-"PO-Revision-Date: 2007-08-17 18:50+0200\n"
-"Last-Translator: Jakub Friedl \n"
+"Project-Id-Version: gimp gnome-2-26\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=general\n"
+"POT-Creation-Date: 2009-10-27 18:14+0000\n"
+"PO-Revision-Date: 2009-10-15 16:41+0100\n"
+"Last-Translator: Marek Černocký \n"
 "Language-Team: Czech \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms:  nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Poedit-Language: Czech\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
-#: ../plug-ins/pygimp/gimpfu.py:380
+#: ../plug-ins/pygimp/gimpfu.py:386
 msgid "Missing exception information"
 msgstr "Chybějící informace o výjimce"
 
-#: ../plug-ins/pygimp/gimpfu.py:389
+#: ../plug-ins/pygimp/gimpfu.py:395
 #, python-format
 msgid "An error occured running %s"
 msgstr "Při běhu %s došlo k chybě"
 
-#: ../plug-ins/pygimp/gimpfu.py:400
+#: ../plug-ins/pygimp/gimpfu.py:406
 msgid "_More Information"
 msgstr "_Více informací"
 
-#: ../plug-ins/pygimp/gimpfu.py:506 ../plug-ins/pygimp/gimpfu.py:518
-#: ../plug-ins/pygimp/gimpfu.py:524
+#: ../plug-ins/pygimp/gimpfu.py:518 ../plug-ins/pygimp/gimpfu.py:530
+#: ../plug-ins/pygimp/gimpfu.py:536
 msgid "No"
 msgstr "Ne"
 
-#: ../plug-ins/pygimp/gimpfu.py:516 ../plug-ins/pygimp/gimpfu.py:524
+#: ../plug-ins/pygimp/gimpfu.py:528 ../plug-ins/pygimp/gimpfu.py:536
 msgid "Yes"
 msgstr "Ano"
 
-#: ../plug-ins/pygimp/gimpfu.py:558 ../plug-ins/pygimp/gimpui.py:222
+#: ../plug-ins/pygimp/gimpfu.py:587 ../plug-ins/pygimp/gimpui.py:224
 msgid "Python-Fu File Selection"
 msgstr "Výběr souboru Python-Fu"
 
-#: ../plug-ins/pygimp/gimpfu.py:569
+#: ../plug-ins/pygimp/gimpfu.py:598
 msgid "Python-Fu Folder Selection"
 msgstr "Výběr složky Python-Fu"
 
-#: ../plug-ins/pygimp/gimpfu.py:659
+#: ../plug-ins/pygimp/gimpfu.py:689
 #, python-format
 msgid "Invalid input for '%s'"
-msgstr "Neplatný vstup pro '%s'"
+msgstr "Neplatný vstup pro „%s“"
 
-#: ../plug-ins/pygimp/gimpui.py:175
+#: ../plug-ins/pygimp/gimpui.py:177
 msgid "Python-Fu Color Selection"
 msgstr "Výběr barev Python-Fu"
 
@@ -101,65 +104,31 @@ msgstr "_Velikost písma v pixelech"
 msgid "_Write a separate CSS file"
 msgstr "_Zapsat oddělený CSS soubor"
 
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:46
-msgid "Python Console"
-msgstr "Konzole Python-Fu"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:50
-msgid "_Browse..."
-msgstr "_Procházet..."
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:132
-msgid "Python Procedure Browser"
-msgstr "Prohlížeč procedur Pythonu"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:161
-#, python-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "Nelze otevřít '%s' pro zápis: %s"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:176
-#, python-format
-msgid "Could not write to '%s': %s"
-msgstr "Nelze zapisovat do '%s': %s"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:184
-msgid "Save Python-Fu Console Output"
-msgstr "Uložit výstup konzole Python-Fu"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:218
-msgid "Interactive Gimp-Python interpreter"
-msgstr "Interaktivní interpretr Gimp-Pythonu"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:223
-msgid "_Console"
-msgstr "_Konzole"
-
-#: ../plug-ins/pygimp/plug-ins/foggify.py:51
+#: ../plug-ins/pygimp/plug-ins/foggify.py:57
 msgid "Add a layer of fog"
 msgstr "Přidat vrstvu mlhy"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:56
+#: ../plug-ins/pygimp/plug-ins/foggify.py:62
 msgid "_Fog..."
 msgstr "_Mlha..."
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:61
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "_Layer name"
 msgstr "Jméno _vrstvy"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:61
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "Clouds"
 msgstr "Mraky"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:62
+#: ../plug-ins/pygimp/plug-ins/foggify.py:68
 msgid "_Fog color"
 msgstr "Barva _mlhy"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:63
+#: ../plug-ins/pygimp/plug-ins/foggify.py:69
 msgid "_Turbulence"
 msgstr "_Turbulence"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:64
+#: ../plug-ins/pygimp/plug-ins/foggify.py:70
 msgid "Op_acity"
 msgstr "_Krytí"
 
@@ -242,50 +211,87 @@ msgstr "Paleta do _přechodu"
 msgid "Slice"
 msgstr "Rozřezat"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:416
+#. table snippet means a small piece of HTML code here
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:418
 msgid "Cuts an image along its guides, creates images and a HTML table snippet"
-msgstr "Rozřeže obrázek podle vodítek, vytvoří dílčí obrázky a kód tabulky v HTML"
+msgstr ""
+"Rozřeže obrázek podle vodítek, vytvoří dílčí obrázky a kód tabulky v HTML"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:427
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:429
 msgid "_Slice..."
 msgstr "_Rozřezat..."
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:432
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:434
 msgid "Path for HTML export"
 msgstr "Cesta pro export HTML"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:433
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:435
 msgid "Filename for export"
 msgstr "Jméno souboru pro export"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:434
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:436
 msgid "Image name prefix"
 msgstr "Předpona jména obrázku"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:435
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:437
 msgid "Image format"
 msgstr "Formát obrázku"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:436
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:438
 msgid "Separate image folder"
 msgstr "Oddělená složka pro obrázky"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:438
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:440
 msgid "Folder for image export"
 msgstr "Složka pro export obrázku"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:439
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:441
 msgid "Space between table elements"
 msgstr "Prostor mezi prvky tabulky"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:441
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:443
 msgid "Javascript for onmouseover and clicked"
 msgstr "Javascript při přejetí myší a kliknutí"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:443
+#. table caps are table cells on the edge of the table
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:446
 msgid "Skip animation for table caps"
 msgstr "Vynechat animaci záhlaví tabulky"
 
+#: ../plug-ins/pygimp/plug-ins/python-console.py:57
+msgid "Python Console"
+msgstr "Konzole Python-Fu"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:61
+msgid "_Browse..."
+msgstr "_Procházet..."
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:139
+msgid "Python Procedure Browser"
+msgstr "Prohlížeč procedur Pythonu"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:168
+#, python-format
+msgid "Could not open '%s' for writing: %s"
+msgstr "Nelze otevřít „%s“ pro zápis: %s"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:183
+#, python-format
+msgid "Could not write to '%s': %s"
+msgstr "Nelze zapisovat do „%s“: %s"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:191
+msgid "Save Python-Fu Console Output"
+msgstr "Uložit výstup konzole Python-Fu"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:217
+msgid "Interactive GIMP Python interpreter"
+msgstr "Interaktivní interpretr GIMP Python"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:222
+msgid "_Console"
+msgstr "_Konzole"
+
 #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:61
 msgid "Add a drop shadow to a layer, and optionally bevel it"
 msgstr "Přidat vrstvě stín a volitelně jej zkosit"
diff --git a/po-python/el.po b/po-python/el.po
index 4981cec4fb..f6528550ed 100644
--- a/po-python/el.po
+++ b/po-python/el.po
@@ -1,35 +1,343 @@
 # Greek translation for gimp-python.
 # Copyright (C) 2001, 2002 Free Software Foundation.
-# Simos Xenitellis , 2001, 2002.
-# 
-# 
+#
+#
+# Simos Xenitellis , 2001, 2002, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-python 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-13 21:07+0200\n"
-"PO-Revision-Date: 2001-12-27 17:09+0000\n"
-"Last-Translator: Simos Xenitellis \n"
-"Language-Team: Greek \n"
+"POT-Creation-Date: 2009-10-20 14:39+0300\n"
+"PO-Revision-Date: 2009-07-31 11:10+0300\n"
+"Last-Translator: Tournaris Pavlos  \n"
+"Language-Team: Greek \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:43
+#: ../plug-ins/pygimp/gimpfu.py:391
+msgid "Missing exception information"
+msgstr "Έλλειψη πληροφορίας εξαίρεσης "
+
+#: ../plug-ins/pygimp/gimpfu.py:400
+#, python-format
+msgid "An error occured running %s"
+msgstr "Ένα σφάλμα προέκυψε τρέχοντας το %s"
+
+#: ../plug-ins/pygimp/gimpfu.py:411
+msgid "_More Information"
+msgstr "_Περισσότερες πληροφορίες"
+
+#: ../plug-ins/pygimp/gimpfu.py:523 ../plug-ins/pygimp/gimpfu.py:535
+#: ../plug-ins/pygimp/gimpfu.py:541
+msgid "No"
+msgstr "Όχι"
+
+#: ../plug-ins/pygimp/gimpfu.py:533 ../plug-ins/pygimp/gimpfu.py:541
+msgid "Yes"
+msgstr "Ναι"
+
+#: ../plug-ins/pygimp/gimpfu.py:592 ../plug-ins/pygimp/gimpui.py:223
+msgid "Python-Fu File Selection"
+msgstr "Python-Fu επιλογή αρχείου"
+
+#: ../plug-ins/pygimp/gimpfu.py:603
+msgid "Python-Fu Folder Selection"
+msgstr "Python-Fu επιλογή φακέλου"
+
+#: ../plug-ins/pygimp/gimpfu.py:694
+#, python-format
+msgid "Invalid input for '%s'"
+msgstr "Άκυρη εισαγωγή για το '%s'"
+
+#: ../plug-ins/pygimp/gimpui.py:176
+#, fuzzy
+msgid "Python-Fu Color Selection"
+msgstr "Κονσόλα Python"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:106
+msgid "Saving as colored XHTML"
+msgstr "Αποθήκευση ως έγχρωμο XHTML"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:183
+msgid "Save as colored XHTML"
+msgstr "Αποθήκευση ως έγχρωμο XHTML"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:188
+msgid "Colored XHTML"
+msgstr "Έγχρωμο XHTML"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:195
+msgid "Character _source"
+msgstr "_Πηγή χαρακτήρα"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:196
+msgid "Source code"
+msgstr "Πηγαίος κώδικας"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:197
+msgid "Text file"
+msgstr "Αρχείο κειμένου"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:198
+msgid "Entry box"
+msgstr "Κουτί εισόδου"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:199
+msgid "_File to read or characters to use"
+msgstr "_Αρχείο προς ανάγνωση ή χαρακτήρες προς χρήση"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:201
+msgid "Fo_nt size in pixels"
+msgstr "Μέγεθος γραμμα_τοσειράς σε pixels"
+
+#: ../plug-ins/pygimp/plug-ins/colorxhtml.py:202
+msgid "_Write a separate CSS file"
+msgstr "_Γράψτε ένα μεμονωμένο CSS αρχείο"
+
+#: ../plug-ins/pygimp/plug-ins/foggify.py:56
+msgid "Add a layer of fog"
+msgstr "Προσθήκη ενός επιπέδου ομίχλης"
+
+#: ../plug-ins/pygimp/plug-ins/foggify.py:61
+msgid "_Fog..."
+msgstr "_Ομίχλη..."
+
+#: ../plug-ins/pygimp/plug-ins/foggify.py:66
+msgid "_Layer name"
+msgstr "_Όνομα επιπέδου"
+
+#: ../plug-ins/pygimp/plug-ins/foggify.py:66
+msgid "Clouds"
+msgstr "Σύννεφα"
+
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
+msgid "_Fog color"
+msgstr "_Χρώμα ομίχλης"
+
+#: ../plug-ins/pygimp/plug-ins/foggify.py:68
+msgid "_Turbulence"
+msgstr "_Αναταράξεις"
+
+#: ../plug-ins/pygimp/plug-ins/foggify.py:69
+msgid "Op_acity"
+msgstr "Ορ_ατότητα"
+
+#: ../plug-ins/pygimp/plug-ins/palette-offset.py:44
+msgid "Offset the colors in a palette"
+msgstr "Αντιστάθμιση των χρωμάτων σε μια παλέτα"
+
+#: ../plug-ins/pygimp/plug-ins/palette-offset.py:49
+msgid "_Offset Palette..."
+msgstr "_Αντιστάθμιση παλέτας..."
+
+#: ../plug-ins/pygimp/plug-ins/palette-offset.py:52
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:56
+#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:56
+#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:78
+msgid "Palette"
+msgstr "Παλέτα"
+
+#: ../plug-ins/pygimp/plug-ins/palette-offset.py:53
+msgid "Off_set"
+msgstr "Αντι_στάθμιση"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:48
+msgid "Sort the colors in a palette"
+msgstr "Ταξινόμηση των χρωμάτων σε μια παλέτα"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:53
+msgid "_Sort Palette..."
+msgstr "_Ταξινόμηση παλέτας"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:57
+msgid "Color _model"
+msgstr "_Μοντέλο χρώματος"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:58
+msgid "RGB"
+msgstr "RGB"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:59
+msgid "HSV"
+msgstr "HSV"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:60
+msgid "Channel to _sort"
+msgstr "Κανάλι για _ταξινόμηση"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:61
+msgid "Red or Hue"
+msgstr "Κόκκινο ή απόχρωση"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:62
+msgid "Green or Saturation"
+msgstr "Πράσινο ή κορεσμός"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:63
+msgid "Blue or Value"
+msgstr "Μπλέ ή τιμή"
+
+#: ../plug-ins/pygimp/plug-ins/palette-sort.py:64
+msgid "_Ascending"
+msgstr "_Αύξουσα"
+
+#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:49
+msgid "Create a repeating gradient using colors from the palette"
+msgstr ""
+"Δημιουργία μιας επαναλαμβανόμενης κλίσης με χρήση των χρωμάτων της παλέτας"
+
+#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:54
+msgid "Palette to _Repeating Gradient"
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:71
+msgid "Create a gradient using colors from the palette"
+msgstr "Δημιουργία μιας κλίσης με χρήση των χρωμάτων της παλέτας"
+
+#: ../plug-ins/pygimp/plug-ins/palette-to-gradient.py:76
+msgid "Palette to _Gradient"
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:56
+msgid "Slice"
+msgstr "Φέτα"
+
+#. table snippet means a small piece of HTML code here
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:417
+msgid "Cuts an image along its guides, creates images and a HTML table snippet"
+msgstr ""
+"Κόβει μια εικόνα κατά μήκος των οδηγών της, δημιουργεί εικόνες και ένα "
+"απόσπασμα HTML"
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:428
+msgid "_Slice..."
+msgstr "_Φέτα..."
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:433
+msgid "Path for HTML export"
+msgstr "Μονοπάτι για εξαγωγή HTML"
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:434
+msgid "Filename for export"
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:435
+msgid "Image name prefix"
+msgstr "Πρόθεμα ονόματος εικόνας"
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:436
+msgid "Image format"
+msgstr "Μορφή εικόνας"
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:437
+msgid "Separate image folder"
+msgstr "Μεμωνωμένος φάκελος εικόνων"
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:439
+msgid "Folder for image export"
+msgstr "Φάκελος για εξαγωγή εικόνων"
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:440
+msgid "Space between table elements"
+msgstr "Κενό μεταξύ των στοιχείων του τραπεζιού"
+
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:442
+msgid "Javascript for onmouseover and clicked"
+msgstr ""
+
+#. table caps are table cells on the edge of the table
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:445
+msgid "Skip animation for table caps"
+msgstr "Παράλειψη κινοθμένων σχεδίων για κεφαλαιοποίηση τραπεζίου"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:56
 msgid "Python Console"
 msgstr "Κονσόλα Python"
 
 #
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:75
-#, fuzzy
+#: ../plug-ins/pygimp/plug-ins/python-console.py:60
 msgid "_Browse..."
-msgstr "Εξερεύνηση..."
+msgstr "_Εξερεύνηση..."
 
-#: ../plug-ins/pygimp/plug-ins/gtkcons.py:217
+#: ../plug-ins/pygimp/plug-ins/python-console.py:138
+msgid "Python Procedure Browser"
+msgstr "Φυλλομετρητής διαδικασίας Python"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:167
+#, python-format
+msgid "Could not open '%s' for writing: %s"
+msgstr "Αδύνατο το άνοιγμα του '%s' για εγγραφή: %s"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:182
+#, python-format
+msgid "Could not write to '%s': %s"
+msgstr "Αδύνατη η εγγραφή στο '%s': %s"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:190
 #, fuzzy
-msgid "Gimp-Python Console"
+msgid "Save Python-Fu Console Output"
 msgstr "Κονσόλα Python"
 
-#: ../plug-ins/pygimp/plug-ins/gtkcons.py:218
-msgid "Interactive Python Development"
+#: ../plug-ins/pygimp/plug-ins/python-console.py:216
+msgid "Interactive GIMP Python interpreter"
 msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:221
+#, fuzzy
+msgid "_Console"
+msgstr "Κονσόλα Python"
+
+#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:60
+msgid "Add a drop shadow to a layer, and optionally bevel it"
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:65
+msgid "_Drop Shadow and Bevel..."
+msgstr "_Δημιουργία σκιάς και εμβάθυνση"
+
+#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:70
+msgid "_Shadow blur"
+msgstr "Θόλωμα _σκιάς"
+
+#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:71
+msgid "_Bevel"
+msgstr "_Εμβάθυνση"
+
+#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:72
+msgid "_Drop shadow"
+msgstr "_Δημιουργία σκιάς"
+
+#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:73
+msgid "Drop shadow _X displacement"
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:74
+msgid "Drop shadow _Y displacement"
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/text-brush.py:75
+msgid "Create a new brush with characters from a text sequence"
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/text-brush.py:81
+msgid "New Brush from _Text..."
+msgstr ""
+
+#: ../plug-ins/pygimp/plug-ins/text-brush.py:84
+msgid "Font"
+msgstr "Γραμματοσειρά"
+
+#: ../plug-ins/pygimp/plug-ins/text-brush.py:85
+msgid "Pixel Size"
+msgstr "Μέγεθος εικονοστοιχείου"
+
+#: ../plug-ins/pygimp/plug-ins/text-brush.py:86
+msgid "Text"
+msgstr "Κείμενο"
+
+#, fuzzy
+#~ msgid "Gimp-Python Console"
+#~ msgstr "Κονσόλα Python"
diff --git a/po-python/en_GB.po b/po-python/en_GB.po
index 336053d3a6..1b126c9f51 100644
--- a/po-python/en_GB.po
+++ b/po-python/en_GB.po
@@ -1,51 +1,51 @@
-# This is the English, British catalog for GIMP Python.
+# This is the English, British catalogue for GIMP Python.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Piers Cornwell , 2000.
 # Gareth Owen , David Lodge , 2004.
-#
+# Bruce Cowan , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: GIMP\n"
+"Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-09 19:21+0000\n"
-"PO-Revision-Date: 2007-03-11 23:16-0000\n"
-"Last-Translator: David Lodge \n"
-"Language-Team: English, British\n"
+"POT-Creation-Date: 2009-10-17 23:03+0100\n"
+"PO-Revision-Date: 2009-10-17 23:04+0100\n"
+"Last-Translator: Bruce Cowan \n"
+"Language-Team: British English \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../plug-ins/pygimp/gimpfu.py:380
+#: ../plug-ins/pygimp/gimpfu.py:386
 msgid "Missing exception information"
 msgstr "Missing exception information"
 
-#: ../plug-ins/pygimp/gimpfu.py:389
+#: ../plug-ins/pygimp/gimpfu.py:395
 #, python-format
 msgid "An error occured running %s"
-msgstr "An error occured running %s"
+msgstr "An error occurred running %s"
 
-#: ../plug-ins/pygimp/gimpfu.py:400
+#: ../plug-ins/pygimp/gimpfu.py:406
 msgid "_More Information"
 msgstr "_More Information"
 
-#: ../plug-ins/pygimp/gimpfu.py:506 ../plug-ins/pygimp/gimpfu.py:518
-#: ../plug-ins/pygimp/gimpfu.py:524
+#: ../plug-ins/pygimp/gimpfu.py:518 ../plug-ins/pygimp/gimpfu.py:530
+#: ../plug-ins/pygimp/gimpfu.py:536
 msgid "No"
 msgstr "No"
 
-#: ../plug-ins/pygimp/gimpfu.py:516 ../plug-ins/pygimp/gimpfu.py:524
+#: ../plug-ins/pygimp/gimpfu.py:528 ../plug-ins/pygimp/gimpfu.py:536
 msgid "Yes"
 msgstr "Yes"
 
-#: ../plug-ins/pygimp/gimpfu.py:558 ../plug-ins/pygimp/gimpui.py:224
+#: ../plug-ins/pygimp/gimpfu.py:587 ../plug-ins/pygimp/gimpui.py:224
 msgid "Python-Fu File Selection"
 msgstr "Python-Fu File Selection"
 
-#: ../plug-ins/pygimp/gimpfu.py:569
+#: ../plug-ins/pygimp/gimpfu.py:598
 msgid "Python-Fu Folder Selection"
 msgstr "Python-Fu Folder Selection"
 
-#: ../plug-ins/pygimp/gimpfu.py:659
+#: ../plug-ins/pygimp/gimpfu.py:689
 #, python-format
 msgid "Invalid input for '%s'"
 msgstr "Invalid input for '%s'"
@@ -94,65 +94,31 @@ msgstr "Fo_nt size in pixels"
 msgid "_Write a separate CSS file"
 msgstr "_Write a separate CSS file"
 
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:46
-msgid "Python Console"
-msgstr "Python Console"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:50
-msgid "_Browse..."
-msgstr "_Browse..."
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:132
-msgid "Python Procedure Browser"
-msgstr "Python Procedure Browser"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:161
-#, python-format
-msgid "Could not open '%s' for writing: %s"
-msgstr "Could not open '%s' for writing: %s"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:176
-#, python-format
-msgid "Could not write to '%s': %s"
-msgstr "Could not write to '%s': %s"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:184
-msgid "Save Python-Fu Console Output"
-msgstr "Save Python-Fu Console Output"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:218
-msgid "Interactive GIMP Python interpreter"
-msgstr "Interactive GIMP Python interpreter"
-
-#: ../plug-ins/pygimp/plug-ins/gimpcons.py:223
-msgid "_Console"
-msgstr "_Console"
-
-#: ../plug-ins/pygimp/plug-ins/foggify.py:53
+#: ../plug-ins/pygimp/plug-ins/foggify.py:57
 msgid "Add a layer of fog"
 msgstr "Add a layer of fog"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:58
+#: ../plug-ins/pygimp/plug-ins/foggify.py:62
 msgid "_Fog..."
 msgstr "_Fog..."
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:63
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "_Layer name"
 msgstr "_Layer name"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:63
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "Clouds"
 msgstr "Clouds"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:64
+#: ../plug-ins/pygimp/plug-ins/foggify.py:68
 msgid "_Fog color"
 msgstr "_Fog colour"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:65
+#: ../plug-ins/pygimp/plug-ins/foggify.py:69
 msgid "_Turbulence"
 msgstr "_Turbulence"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:66
+#: ../plug-ins/pygimp/plug-ins/foggify.py:70
 msgid "Op_acity"
 msgstr "Op_acity"
 
@@ -235,51 +201,87 @@ msgstr "Palette to _Gradient"
 msgid "Slice"
 msgstr "Slice"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:416
+#. table snippet means a small piece of HTML code here
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:418
 msgid "Cuts an image along its guides, creates images and a HTML table snippet"
 msgstr ""
 "Cuts an image along its guides, creates images and a HTML table snippet"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:427
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:429
 msgid "_Slice..."
 msgstr "_Slice..."
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:432
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:434
 msgid "Path for HTML export"
 msgstr "Path for HTML export"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:433
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:435
 msgid "Filename for export"
 msgstr "Filename for export"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:434
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:436
 msgid "Image name prefix"
 msgstr "Image name prefix"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:435
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:437
 msgid "Image format"
 msgstr "Image format"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:436
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:438
 msgid "Separate image folder"
 msgstr "Separate image folder"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:438
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:440
 msgid "Folder for image export"
 msgstr "Folder for image export"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:439
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:441
 msgid "Space between table elements"
 msgstr "Space between table elements"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:441
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:443
 msgid "Javascript for onmouseover and clicked"
 msgstr "Javascript for onmouseover and clicked"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:443
+#. table caps are table cells on the edge of the table
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:446
 msgid "Skip animation for table caps"
 msgstr "Skip animation for table caps"
 
+#: ../plug-ins/pygimp/plug-ins/python-console.py:57
+msgid "Python Console"
+msgstr "Python Console"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:61
+msgid "_Browse..."
+msgstr "_Browse..."
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:139
+msgid "Python Procedure Browser"
+msgstr "Python Procedure Browser"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:168
+#, python-format
+msgid "Could not open '%s' for writing: %s"
+msgstr "Could not open '%s' for writing: %s"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:183
+#, python-format
+msgid "Could not write to '%s': %s"
+msgstr "Could not write to '%s': %s"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:191
+msgid "Save Python-Fu Console Output"
+msgstr "Save Python-Fu Console Output"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:217
+msgid "Interactive GIMP Python interpreter"
+msgstr "Interactive GIMP Python interpreter"
+
+#: ../plug-ins/pygimp/plug-ins/python-console.py:222
+msgid "_Console"
+msgstr "_Console"
+
 #: ../plug-ins/pygimp/plug-ins/shadow_bevel.py:61
 msgid "Add a drop shadow to a layer, and optionally bevel it"
 msgstr "Add a drop shadow to a layer, and optionally bevel it"
diff --git a/po-python/ja.po b/po-python/ja.po
index befaedc749..cef5ee4496 100644
--- a/po-python/ja.po
+++ b/po-python/ja.po
@@ -1,56 +1,57 @@
 # GIMP Python Japanese message catalog
-# Copyright (C) 2000,2003,2005,2008 Free Software Foundation, Inc.
-# Shirasaki Yasuhiro , 2000
-# Takashi Kido , 2000
+# Copyright (C) 2000,2003,2005,2008-2009 Free Software Foundation, Inc.
+# Shirasaki Yasuhiro , 2000.
+# Takashi Kido , 2000.
 # KAMAGASAKO Masatoshi , 2003.
 # Ryoichi INAGAKI , 2003.
 # Tadashi Jokagi , 2005.
 # OKANO Takayoshi , 2005.
-# Nishibori Kiyotaka , 2008
+# Nishibori Kiyotaka , 2008-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-01 11:11+0900\n"
-"PO-Revision-Date: 2008-08-24 18:56+0900\n"
+"Project-Id-Version: gimp gimp-2-6\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=Internationalisation\n"
+"POT-Creation-Date: 2009-10-03 21:26+0900\n"
+"PO-Revision-Date: 2009-09-28 22:54+0900\n"
 "Last-Translator: Nishibori Kiyotaka \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../plug-ins/pygimp/gimpfu.py:385
+#: ../plug-ins/pygimp/gimpfu.py:386
 msgid "Missing exception information"
 msgstr "例外情報はありません"
 
-#: ../plug-ins/pygimp/gimpfu.py:394
+#: ../plug-ins/pygimp/gimpfu.py:395
 #, python-format
 msgid "An error occured running %s"
 msgstr "%s 実行中にエラーが発生しました"
 
-#: ../plug-ins/pygimp/gimpfu.py:405
+#: ../plug-ins/pygimp/gimpfu.py:406
 msgid "_More Information"
 msgstr "詳細な情報(_M)"
 
-#: ../plug-ins/pygimp/gimpfu.py:511 ../plug-ins/pygimp/gimpfu.py:523
-#: ../plug-ins/pygimp/gimpfu.py:529
+#: ../plug-ins/pygimp/gimpfu.py:518 ../plug-ins/pygimp/gimpfu.py:530
+#: ../plug-ins/pygimp/gimpfu.py:536
 msgid "No"
 msgstr "しない"
 
-#: ../plug-ins/pygimp/gimpfu.py:521 ../plug-ins/pygimp/gimpfu.py:529
+#: ../plug-ins/pygimp/gimpfu.py:528 ../plug-ins/pygimp/gimpfu.py:536
 msgid "Yes"
 msgstr "する"
 
-#: ../plug-ins/pygimp/gimpfu.py:580 ../plug-ins/pygimp/gimpui.py:224
+#: ../plug-ins/pygimp/gimpfu.py:587 ../plug-ins/pygimp/gimpui.py:224
 msgid "Python-Fu File Selection"
 msgstr "Python-Fu ファイル選択"
 
-#: ../plug-ins/pygimp/gimpfu.py:591
+#: ../plug-ins/pygimp/gimpfu.py:598
 msgid "Python-Fu Folder Selection"
 msgstr "Python-Fu フォルダ選択"
 
-#: ../plug-ins/pygimp/gimpfu.py:682
+#: ../plug-ins/pygimp/gimpfu.py:689
 #, python-format
 msgid "Invalid input for '%s'"
 msgstr "'%s' に対して無効な入力がありました"
@@ -101,31 +102,31 @@ msgstr "フォントサイズ(ピクセル) (_N)"
 msgid "_Write a separate CSS file"
 msgstr "独立した CSS(ファイル)を記述(_W)"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:53
+#: ../plug-ins/pygimp/plug-ins/foggify.py:57
 msgid "Add a layer of fog"
 msgstr "霧が描かれたレイヤーを追加します"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:58
+#: ../plug-ins/pygimp/plug-ins/foggify.py:62
 msgid "_Fog..."
 msgstr "霧(_F)..."
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:63
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "_Layer name"
 msgstr "レイヤー名(_L)"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:63
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "Clouds"
 msgstr "霧模様"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:64
+#: ../plug-ins/pygimp/plug-ins/foggify.py:68
 msgid "_Fog color"
 msgstr "霧の色(_F)"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:65
+#: ../plug-ins/pygimp/plug-ins/foggify.py:69
 msgid "_Turbulence"
 msgstr "霧の深さ"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:66
+#: ../plug-ins/pygimp/plug-ins/foggify.py:70
 msgid "Op_acity"
 msgstr "不透明度(_A)"
 
diff --git a/po-python/nn.po b/po-python/nn.po
index 0076143be6..f764357a18 100644
--- a/po-python/nn.po
+++ b/po-python/nn.po
@@ -5,46 +5,49 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: achtung 1.1.25\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-07-17 11:46+0200\n"
-"PO-Revision-Date: 2008-06-29 17:33+0100\n"
-"Last-Translator: Kolbjørn Stuestøl \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n"
+"POT-Creation-Date: 2009-04-17 09:06+0000\n"
+"PO-Revision-Date: 2009-05-16 23:03+0100\n"
+"Last-Translator: Kolbjørn Stuestøl \n"
 "Language-Team: Norwegian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../plug-ins/pygimp/gimpfu.py:385
+#: ../plug-ins/pygimp/gimpfu.py:386
 msgid "Missing exception information"
 msgstr "Manglar informasjon om unntak"
 
-#: ../plug-ins/pygimp/gimpfu.py:394
+#: ../plug-ins/pygimp/gimpfu.py:395
 #, python-format
 msgid "An error occured running %s"
 msgstr "Det oppsto ein feil under køyringa av %s"
 
-#: ../plug-ins/pygimp/gimpfu.py:405
+#: ../plug-ins/pygimp/gimpfu.py:406
 msgid "_More Information"
 msgstr "_Meir informasjon"
 
-#: ../plug-ins/pygimp/gimpfu.py:511 ../plug-ins/pygimp/gimpfu.py:523
-#: ../plug-ins/pygimp/gimpfu.py:529
+#: ../plug-ins/pygimp/gimpfu.py:518
+#: ../plug-ins/pygimp/gimpfu.py:530
+#: ../plug-ins/pygimp/gimpfu.py:536
 msgid "No"
 msgstr "Nei"
 
-#: ../plug-ins/pygimp/gimpfu.py:521 ../plug-ins/pygimp/gimpfu.py:529
+#: ../plug-ins/pygimp/gimpfu.py:528
+#: ../plug-ins/pygimp/gimpfu.py:536
 msgid "Yes"
 msgstr "Ja"
 
-#: ../plug-ins/pygimp/gimpfu.py:580 ../plug-ins/pygimp/gimpui.py:224
+#: ../plug-ins/pygimp/gimpfu.py:587
+#: ../plug-ins/pygimp/gimpui.py:224
 msgid "Python-Fu File Selection"
 msgstr "Python-Fu filutval"
 
-#: ../plug-ins/pygimp/gimpfu.py:591
+#: ../plug-ins/pygimp/gimpfu.py:598
 msgid "Python-Fu Folder Selection"
 msgstr "Python-Fu mappeutval"
 
-#: ../plug-ins/pygimp/gimpfu.py:682
+#: ../plug-ins/pygimp/gimpfu.py:689
 #, python-format
 msgid "Invalid input for '%s'"
 msgstr "Ugyldig inndata for «%s»"
@@ -93,31 +96,31 @@ msgstr "_Skriftstorleik i pikslar"
 msgid "_Write a separate CSS file"
 msgstr "_Skriv ei eigen CSS-fil"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:53
+#: ../plug-ins/pygimp/plug-ins/foggify.py:57
 msgid "Add a layer of fog"
 msgstr "Legg til eit tåkelag"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:58
+#: ../plug-ins/pygimp/plug-ins/foggify.py:62
 msgid "_Fog..."
 msgstr "_Tåke..."
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:63
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "_Layer name"
 msgstr "_Lagnamnet"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:63
+#: ../plug-ins/pygimp/plug-ins/foggify.py:67
 msgid "Clouds"
 msgstr "Skyer"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:64
+#: ../plug-ins/pygimp/plug-ins/foggify.py:68
 msgid "_Fog color"
 msgstr "_Tåkefarge"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:65
+#: ../plug-ins/pygimp/plug-ins/foggify.py:69
 msgid "_Turbulence"
 msgstr "_Turbulens"
 
-#: ../plug-ins/pygimp/plug-ins/foggify.py:66
+#: ../plug-ins/pygimp/plug-ins/foggify.py:70
 msgid "Op_acity"
 msgstr "_Dekkevne"
 
@@ -200,83 +203,83 @@ msgstr "Palett til _fargeovergang"
 msgid "Slice"
 msgstr "Del opp"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:416
+#. table snippet means a small piece of HTML code here
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:418
 msgid "Cuts an image along its guides, creates images and a HTML table snippet"
-msgstr ""
-"Del biletet lags hjelpelinjene, opprett nødvendige småbilete og HTML tabell"
+msgstr "Del biletet lags hjelpelinjene, opprett nødvendige småbilete og HTML tabell"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:427
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:429
 msgid "_Slice..."
 msgstr "_Del opp..."
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:432
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:434
 msgid "Path for HTML export"
 msgstr "Stig for HTML-eksport"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:433
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:435
 msgid "Filename for export"
 msgstr "Filnamn for eksport"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:434
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:436
 msgid "Image name prefix"
 msgstr "Prefiks for filnamnet"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:435
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:437
 msgid "Image format"
 msgstr "Biletformat"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:436
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:438
 msgid "Separate image folder"
 msgstr "Særskild biletmappe"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:438
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:440
 msgid "Folder for image export"
 msgstr "Mappe for bileteksport"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:439
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:441
 msgid "Space between table elements"
 msgstr "Avstand mellom tabellelementa"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:441
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:443
 msgid "Javascript for onmouseover and clicked"
 msgstr "Javascript for «onmouseover» og «clicked»"
 
-#: ../plug-ins/pygimp/plug-ins/py-slice.py:443
+#. table caps are table cells on the edge of the table
+#: ../plug-ins/pygimp/plug-ins/py-slice.py:446
 msgid "Skip animation for table caps"
 msgstr "Hopp over animasjon for tabellen"
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:46
+#: ../plug-ins/pygimp/plug-ins/python-console.py:57
 msgid "Python Console"
 msgstr "Python konsoll"
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:50
+#: ../plug-ins/pygimp/plug-ins/python-console.py:61
 msgid "_Browse..."
 msgstr "Bla gjennom..."
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:132
+#: ../plug-ins/pygimp/plug-ins/python-console.py:139
 msgid "Python Procedure Browser"
 msgstr "Python Procedure Browser"
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:161
+#: ../plug-ins/pygimp/plug-ins/python-console.py:168
 #, python-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Kunne ikkje opna «%s» for skriving: %s"
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:176
+#: ../plug-ins/pygimp/plug-ins/python-console.py:183
 #, python-format
 msgid "Could not write to '%s': %s"
 msgstr "Kunne ikkje skrive til «%s»: %s"
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:184
+#: ../plug-ins/pygimp/plug-ins/python-console.py:191
 msgid "Save Python-Fu Console Output"
 msgstr "Lagra utdata frå Python-Fu-konsollen"
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:218
-#, fuzzy
+#: ../plug-ins/pygimp/plug-ins/python-console.py:217
 msgid "Interactive GIMP Python interpreter"
-msgstr "Interaktiv Gimp-Python fortolkar"
+msgstr "Interaktiv Gimp-Python tolkar"
 
-#: ../plug-ins/pygimp/plug-ins/python-console.py:223
+#: ../plug-ins/pygimp/plug-ins/python-console.py:222
 msgid "_Console"
 msgstr "_Konsollen"
 
@@ -311,3 +314,4 @@ msgstr "_Y-lengde for slagskyggen"
 #, fuzzy
 #~ msgid "Gimp-Python Console"
 #~ msgstr "Python konsoll"
+
diff --git a/po-python/ro.po b/po-python/ro.po
index 81d1ef97de..ef69b8d3db 100644
--- a/po-python/ro.po
+++ b/po-python/ro.po
@@ -1,22 +1,23 @@
-# gimp ro translation
+# Romanian GIMP translation
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Robert Claudiu Gheorghe , 2001.
-# Cristian Secară , 2008.
+# Cristian Secară , 2008-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-python\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-18 23:35+0200\n"
-"PO-Revision-Date: 2008-12-02 00:36+0200\n"
+"POT-Creation-Date: 2009-09-28 23:10+0300\n"
+"PO-Revision-Date: 2009-03-19 20:37+0200\n"
 "Last-Translator: Cristian Secară \n"
-"Language-Team: Română \n"
+"Language-Team: Română \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
 
+# hm ? sau despre excepție ?
 #: ../plug-ins/pygimp/gimpfu.py:386
 msgid "Missing exception information"
 msgstr "Lipsește informația asupra excepției"
diff --git a/po-script-fu/cs.po b/po-script-fu/cs.po
index 6ba6a8c4c3..7c58213a70 100644
--- a/po-script-fu/cs.po
+++ b/po-script-fu/cs.po
@@ -1,24 +1,23 @@
 # Czech translation of GIMP script-fu.
-# Copyright (C) 2001, 2003, 2006, 2007, 2008 the author(s) of the GIMP.
+# Copyright (C) 2001, 2003, 2006, 2007, 2008, 2009 the author(s) of the GIMP.
 # Copyright (C) 2004, 2005 Miloslav Trmac .
 # This file is distributed under the same license as the gimp-script-fu package.
 # Stanislav Brabec , 2000-2001.
 # Michal Bukovjan , 2003.
 # Miloslav Trmac , 2003 - 2005.
 # Jakub Friedl , 2006, 2007.
-#
+# JardaK , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp-script-fu\n"
+"Project-Id-Version: script-fu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-27 23:57+0100\n"
-"PO-Revision-Date: 2008-10-28 00:05+0100\n"
-"Last-Translator: Petr Kovar \n"
+"POT-Creation-Date: 2009-09-06 00:42+0200\n"
+"PO-Revision-Date: 2009-08-24 19:15+0200\n"
+"Last-Translator: JardaK \n"
 "Language-Team: Czech \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../plug-ins/script-fu/script-fu-console.c:131
@@ -110,26 +109,18 @@ msgid "Script-Fu Brush Selection"
 msgstr "Script-Fu výběr stopy"
 
 #: ../plug-ins/script-fu/script-fu-interface.c:824
-#, fuzzy, c-format
+#, c-format
 msgid "Error while executing %s:"
-msgstr ""
-"Chyba při spouštění\n"
-"%s\n"
-"\n"
-"%s"
+msgstr "Chyba při spouštění %s:"
 
 #: ../plug-ins/script-fu/script-fu-scripts.c:150
 msgid "Too few arguments to 'script-fu-register' call"
-msgstr ""
+msgstr "Příliš málo argumentů pro volání 'script-fu-register'"
 
 #: ../plug-ins/script-fu/script-fu-scripts.c:609
-#, fuzzy, c-format
+#, c-format
 msgid "Error while loading %s:"
-msgstr ""
-"Chyba při spouštění\n"
-"%s\n"
-"\n"
-"%s"
+msgstr "Chyba při nahrávání %s:"
 
 #: ../plug-ins/script-fu/script-fu-server.c:713
 msgid "Script-Fu Server Options"
@@ -326,7 +317,8 @@ msgid "Outline blur radius"
 msgstr "Poloměr rozostření obrysu"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:8
-msgid "Outline the selected region (or alpha) with a pattern and add a drop shadow"
+msgid ""
+"Outline the selected region (or alpha) with a pattern and add a drop shadow"
 msgstr "Obtáhnout vybranou oblast (nebo alfu) vzorkem a přidat vržený stín"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:9
@@ -796,7 +788,8 @@ msgstr "Animace mísení vyžaduje nejméně tři zdrojové vrstvy"
 msgid ""
 "Create intermediate layers to blend two or more layers over a background as "
 "an animation"
-msgstr "Vytvořit mezivrstvy pro animaci mísení dvou nebo více vrstev nad pozadím"
+msgstr ""
+"Vytvořit mezivrstvy pro animaci mísení dvou nebo více vrstev nad pozadím"
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:3
 msgid "Intermediate frames"
@@ -939,8 +932,8 @@ msgid ""
 "The Burn-In script needs two layers in total. A foreground layer with "
 "transparency and a background layer."
 msgstr ""
-"Vpálení vyžaduje celkem dvě vrstvy. Vrstvu s průhledností v popředí "
-"a vrstvu pozadí."
+"Vpálení vyžaduje celkem dvě vrstvy. Vrstvu s průhledností v popředí a vrstvu "
+"pozadí."
 
 #: ../plug-ins/script-fu/scripts/camo.scm.h:1
 msgid "Color 1"
@@ -1005,7 +998,8 @@ msgstr "Řezba..."
 msgid ""
 "Create a logo with text raised above or carved in to the specified "
 "background image"
-msgstr "Vytvořit logo s vyvýšeným textem nebo vyrytým do zadaného obrázku pozadí"
+msgstr ""
+"Vytvořit logo s vyvýšeným textem nebo vyrytým do zadaného obrázku pozadí"
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
 msgid "Padding around text"
@@ -1132,7 +1126,8 @@ msgid "Circuit seed"
 msgstr "Hnízdo obvodu"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:2
-msgid "Fill the selected region (or alpha) with traces like those on a circuit board"
+msgid ""
+"Fill the selected region (or alpha) with traces like those on a circuit board"
 msgstr "Vyplnit vybranou oblast (nebo alfu) vzorem plošného spoje"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:3
@@ -1261,7 +1256,8 @@ msgstr "Obrázek na pozadí"
 
 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:3
 msgid "Create a logo with a crystal/gel effect displacing the image underneath"
-msgstr "Vytvořit efekt s krystalickým/gelovým efektem přemisťujícím spodní obrázek"
+msgstr ""
+"Vytvořit efekt s krystalickým/gelovým efektem přemisťujícím spodní obrázek"
 
 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:4
 msgid "Crystal..."
@@ -1437,7 +1433,8 @@ msgid "Black on white"
 msgstr "Černá na bílé"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:3
-msgid "Create an image filled with previews of fonts matching a fontname filter"
+msgid ""
+"Create an image filled with previews of fonts matching a fontname filter"
 msgstr "Vytvořit obrázek s náhledy fontů odpovídajících filtru jména fontu"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:4
@@ -1578,19 +1575,22 @@ msgstr "Vytvořit hlavičku nabídky podle klasického tématu gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:3
 msgid "Create an image of a Tube Button Label using the gimp.org webpage theme"
-msgstr "Vytvořit tlačítko nabídky první úrovně podle klasického tématu gimp.org"
+msgstr ""
+"Vytvořit tlačítko nabídky první úrovně podle klasického tématu gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:4
 msgid ""
 "Create an image of a second level Tube Button Label using the gimp.org "
 "webpage theme"
-msgstr "Vytvořit tlačítko nabídky druhé úrovně podle klasického tématu gimp.org"
+msgstr ""
+"Vytvořit tlačítko nabídky druhé úrovně podle klasického tématu gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:5
 msgid ""
 "Create an image of a third level Tube Button Label using the gimp.org "
 "webpage theme"
-msgstr "Vytvořit tlačítko nabídky třetí úrovně podle klasického tématu gimp.org"
+msgstr ""
+"Vytvořit tlačítko nabídky třetí úrovně podle klasického tématu gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:16
 msgid "T_ube Sub-Button Label..."
@@ -1612,7 +1612,8 @@ msgstr "Popisek _tlačítka I. úrovně..."
 msgid ""
 "Add gradients, patterns, shadows, and bump maps to the selected region (or "
 "alpha)"
-msgstr "Přidat přechody, vzorky, stíny a mapy vyvýšení do vybrané oblasti (nebo alfy)"
+msgstr ""
+"Přidat přechody, vzorky, stíny a mapy vyvýšení do vybrané oblasti (nebo alfy)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:3
 msgid "Blend gradient (outline)"
@@ -1833,7 +1834,8 @@ msgid "_Lava..."
 msgstr "_Láva..."
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:1
-msgid "Fill a layer with rays emanating outward from its center using the FG color"
+msgid ""
+"Fill a layer with rays emanating outward from its center using the FG color"
 msgstr "Vyplnit vrstvu paprsky v barvě popředí vycházejícími ze středu"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:2
@@ -2119,8 +2121,10 @@ msgid "Black"
 msgstr "Černá"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:2
-msgid "Create a multi-layer image by adding a ripple effect to the current image"
-msgstr "Vytvořit vícevrstvý obrázek přidáním efektu čeření do aktuálního obrázku"
+msgid ""
+"Create a multi-layer image by adding a ripple effect to the current image"
+msgstr ""
+"Vytvořit vícevrstvý obrázek přidáním efektu čeření do aktuálního obrázku"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:3
 msgid "Edge behavior"
@@ -2160,7 +2164,8 @@ msgid "Edge radius"
 msgstr "Poloměr hran"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:5
-msgid "Round the corners of an image and optionally add a drop-shadow and background"
+msgid ""
+"Round the corners of an image and optionally add a drop-shadow and background"
 msgstr "Zaoblit rohy obrázku a volitelně přidat stín a pozadí"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:9
@@ -2273,7 +2278,8 @@ msgid "_Spinning Globe..."
 msgstr "_Rotující glóbus..."
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:1
-msgid "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
+msgid ""
+"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
 msgstr ""
 "Vykresluje hypotrochoidy, epitrochoidy a Lissajousovy křivky v aktuální "
 "vrstvě"
@@ -2472,7 +2478,8 @@ msgid "Antialias"
 msgstr "Vyhlazování"
 
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
-msgid "Create a logo by rendering the specified text along the perimeter of a circle"
+msgid ""
+"Create a logo by rendering the specified text along the perimeter of a circle"
 msgstr "Vytvořit logo vykreslením zadaného textu podél kružnice"
 
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:3
@@ -2484,7 +2491,8 @@ msgid "Text C_ircle..."
 msgstr "Textový _kruh..."
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:3
-msgid "Create a textured logo with highlights, shadows, and a mosaic background"
+msgid ""
+"Create a textured logo with highlights, shadows, and a mosaic background"
 msgstr "Vytvořit texturované logo se světly, stíny a mozaikovitým pozadím"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:4
@@ -2591,7 +2599,8 @@ msgstr "Rozkmit"
 msgid ""
 "Create a multi-layer image with an effect like a stone was thrown into the "
 "current image"
-msgstr "Vytvořit vícevrstevný obrázek s efektem kamene hozeného do aktuálního obrázku"
+msgstr ""
+"Vytvořit vícevrstevný obrázek s efektem kamene hozeného do aktuálního obrázku"
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:3
 msgid "Invert direction"
@@ -2740,122 +2749,3 @@ msgstr "Krytí světel"
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:12
 msgid "_Xach-Effect..."
 msgstr "Efekt _Xach..."
-
-#~ msgid "_Misc"
-#~ msgstr "_Různé"
-
-#~ msgid "_Utilities"
-#~ msgstr "_Pomůcky"
-
-#~ msgid "An_imation"
-#~ msgstr "An_imace"
-
-#~ msgid "_Animators"
-#~ msgstr "_Animátory"
-
-#~ msgid "_Artistic"
-#~ msgstr "_Umění"
-
-#~ msgid "_Blur"
-#~ msgstr "_Rozostření"
-
-#~ msgid "_Decor"
-#~ msgstr "_Dekorace"
-
-#~ msgid "_Effects"
-#~ msgstr "_Efekty"
-
-#~ msgid "En_hance"
-#~ msgstr "Vy_lepšit"
-
-#~ msgid "_Light and Shadow"
-#~ msgstr "_Světlo a stín"
-
-#~ msgid "S_hadow"
-#~ msgstr "_Stín"
-
-#~ msgid "_Render"
-#~ msgstr "_Vykreslit"
-
-#~ msgid "_Alchemy"
-#~ msgstr "_Alchymie"
-
-#~ msgid "Effect size (pixels * 3)"
-#~ msgstr "Velikost efektu (pixely * 3)"
-
-#~ msgid "BG opacity"
-#~ msgstr "Krytí pozadí"
-
-#~ msgid "Create a graph of the Hue, Saturation, and Value distributions"
-#~ msgstr "Vytvořit graf distribuce odstíny, sytosti a hodnoty"
-
-#~ msgid "Draw _HSV Graph..."
-#~ msgstr "Nakreslit graf _HSV..."
-
-#~ msgid "End X"
-#~ msgstr "Konec X"
-
-#~ msgid "End Y"
-#~ msgstr "Konec Y"
-
-#~ msgid "From top-left to bottom-right"
-#~ msgstr "Odshora zleva dolů doprava"
-
-#~ msgid "Graph scale"
-#~ msgstr "Měřítko grafu"
-
-#~ msgid "Start X"
-#~ msgstr "X počátek"
-
-#~ msgid "Start Y"
-#~ msgstr "Y počátek"
-
-#~ msgid "Use selection bounds instead of values below"
-#~ msgstr "Použít hranice výběru místo hodnot uvedených níže"
-
-#~ msgid "Effect size (pixels * 5)"
-#~ msgstr "Velikost efektu (pixely * 5)"
-
-#~ msgid "Create a simple sphere with a drop shadow"
-#~ msgstr "Vytvořit jednoduchou kouli vrhající stín"
-
-#~ msgid "Lighting (degrees)"
-#~ msgstr "Osvětlení (stupně)"
-
-#~ msgid "Radius (pixels)"
-#~ msgstr "Poloměr (pixely)"
-
-#~ msgid "Sphere color"
-#~ msgstr "Barva koule"
-
-#~ msgid "_Sphere..."
-#~ msgstr "_Koule..."
-
-#~ msgid "Burst color"
-#~ msgstr "Barva výbuchu"
-
-#~ msgid "Create a logo using a starburst gradient"
-#~ msgstr "Vytvořit logo s přechodem v podobě výbuchu hvězdy"
-
-#~ msgid "Effect size (pixels * 30)"
-#~ msgstr "Velikost efektu (pixely * 30)"
-
-#~ msgid ""
-#~ "Fill the selected region (or alpha) with a starburst gradient and add a "
-#~ "shadow"
-#~ msgstr ""
-#~ "Vyplnit vybranou oblast (či alfu) přechodem v podobě výbuchu hvězdy a "
-#~ "přidat stín"
-
-#~ msgid "Starb_urst..."
-#~ msgstr "_Výbuch hvězdy..."
-
-#~ msgid "Effect size (pixels * 4)"
-#~ msgstr "Velikost efektu (pixely * 4)"
-
-#~ msgid ""
-#~ "Fill the selected region (or alpha) with a rock-like texture, a nova "
-#~ "glow, and shadow"
-#~ msgstr ""
-#~ "Vyplnit vybranou oblast (nebo alfu) texturou skály, září novy a stínem."
-
diff --git a/po-script-fu/el.po b/po-script-fu/el.po
index 8c9e8d4ee6..7066784e68 100644
--- a/po-script-fu/el.po
+++ b/po-script-fu/el.po
@@ -1,2907 +1,3389 @@
 # Greek translation for gimp-script-fu.
 # Copyright (C) 2001, 2002 Free Software Foundation.
 # Simos Xenitellis , 2001, 2002.
-# 
-# 
+#
+#
+# Vasilis Kontogiannis , 2009
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-script-fu 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-12-28 15:42+0100\n"
+"POT-Creation-Date: 2009-10-20 14:35+0300\n"
 "PO-Revision-Date: 2001-12-27 17:09+0000\n"
-"Last-Translator: Simos Xenitellis \n"
+"Last-Translator: Vasilis Kontogiannis \n"
 "Language-Team: Greek \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: plug-ins/script-fu/script-fu-console.c:129
-#: plug-ins/script-fu/script-fu-text-console.c:66
-msgid "Script-Fu console mode allows only interactive invocation"
-msgstr ""
-
-#: plug-ins/script-fu/script-fu-console.c:156
+#: ../plug-ins/script-fu/script-fu-console.c:131
+#: ../plug-ins/script-fu/script-fu-console.c:198
 msgid "Script-Fu Console"
 msgstr "Κονσόλα Script-Fu"
 
-#: plug-ins/script-fu/script-fu-console.c:183
-#, fuzzy
-msgid "SIOD Output"
-msgstr "Έξοδος DSP"
+#: ../plug-ins/script-fu/script-fu-console.c:194
+msgid "Welcome to TinyScheme"
+msgstr "Καλώς ήρθατε στο TinyScheme"
 
-#: plug-ins/script-fu/script-fu-console.c:249
-#, fuzzy
-msgid "Current Command"
-msgstr "Εντολή Εκτύπωσης"
+#: ../plug-ins/script-fu/script-fu-console.c:200
+msgid "Interactive Scheme Development"
+msgstr "Ανάπτυξη σχεδίου αλληλεπίδρασης"
 
 #
-#: plug-ins/script-fu/script-fu-console.c:267
+#: ../plug-ins/script-fu/script-fu-console.c:236
 #, fuzzy
 msgid "_Browse..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/script-fu-console.c:548
-msgid "Script-Fu evaluate mode allows only noninteractive invocation"
-msgstr ""
+#: ../plug-ins/script-fu/script-fu-console.c:294
+#, fuzzy
+msgid "Save Script-Fu Console Output"
+msgstr "Κονσόλα Script-Fu"
 
-#: plug-ins/script-fu/script-fu-interface.c:177
+#: ../plug-ins/script-fu/script-fu-console.c:341
+#, c-format
+msgid "Could not open '%s' for writing: %s"
+msgstr "Δεν μπορεί να ανοίξει το '%s' για γράψιμο: %s"
+
+#: ../plug-ins/script-fu/script-fu-console.c:370
+#, fuzzy
+msgid "Script-Fu Procedure Browser"
+msgstr "Λιγότερες Επιλογές"
+
+#: ../plug-ins/script-fu/script-fu-eval.c:63
+msgid "Script-Fu evaluation mode only allows non-interactive invocation"
+msgstr ""
+"Η κατάσταση αξιολόγησης του προγράμματος επιτρέπει μόνο προσκλήσης μη "
+"αλλιλεπίδρασης"
+
+#: ../plug-ins/script-fu/script-fu-interface.c:196
 msgid "Script-Fu cannot process two scripts at the same time."
-msgstr ""
+msgstr "Δεν μπορεί να διεκπεραιώσει δύο σενάρια την ίδια στιγμή"
 
-#: plug-ins/script-fu/script-fu-interface.c:179
+#: ../plug-ins/script-fu/script-fu-interface.c:198
 #, c-format
 msgid "You are already running the \"%s\" script."
-msgstr ""
+msgstr "Εκτελείται ήδη το σενάριο \"%s\"."
 
-#. strip the first part of the menupath if it contains _("/Script-Fu/")
-#: plug-ins/script-fu/script-fu-interface.c:202
-#: plug-ins/script-fu/script-fu-interface.c:204
-#, fuzzy
-msgid "/Script-Fu/"
-msgstr "Πρόγραμμα εντολών:"
-
-#: plug-ins/script-fu/script-fu-interface.c:217
+#: ../plug-ins/script-fu/script-fu-interface.c:224
 #, fuzzy, c-format
 msgid "Script-Fu: %s"
 msgstr "Πρόγραμμα εντολών:"
 
-#. the script arguments frame
-#: plug-ins/script-fu/script-fu-interface.c:254
-#, fuzzy
-msgid "Script Arguments"
-msgstr "Ορίσματα"
-
 #. we add a colon after the label;
-#. some languages want an extra space here
-#: plug-ins/script-fu/script-fu-interface.c:285
+#. *  some languages want an extra space here
+#.
+#: ../plug-ins/script-fu/script-fu-interface.c:288
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
 #
-#: plug-ins/script-fu/script-fu-interface.c:328
+#: ../plug-ins/script-fu/script-fu-interface.c:336
 #, fuzzy
 msgid "Script-Fu Color Selection"
 msgstr "Επιλογή χρώματος"
 
-#: plug-ins/script-fu/script-fu-interface.c:431
+#: ../plug-ins/script-fu/script-fu-interface.c:445
 #, fuzzy
 msgid "Script-Fu File Selection"
-msgstr "Κλάδεμα Επιλεγμένου"
+msgstr "Επιλογή αρχείου"
 
-#: plug-ins/script-fu/script-fu-interface.c:435
+#: ../plug-ins/script-fu/script-fu-interface.c:448
 #, fuzzy
 msgid "Script-Fu Folder Selection"
-msgstr "Κλάδεμα Επιλεγμένου"
+msgstr "Επιλογή φακέλου"
 
 #
-#: plug-ins/script-fu/script-fu-interface.c:447
+#: ../plug-ins/script-fu/script-fu-interface.c:461
 #, fuzzy
 msgid "Script-Fu Font Selection"
 msgstr "Επιλογή Γραμματοσειράς"
 
-#: plug-ins/script-fu/script-fu-interface.c:454
+#: ../plug-ins/script-fu/script-fu-interface.c:469
 #, fuzzy
 msgid "Script-Fu Palette Selection"
-msgstr "Επιλογή Προφύλαξης Οθόνης"
+msgstr "Επιλογή πυξίου"
 
-#: plug-ins/script-fu/script-fu-interface.c:462
+#: ../plug-ins/script-fu/script-fu-interface.c:478
 #, fuzzy
-msgid "Script-fu Pattern Selection"
-msgstr "Επιλογή Προφύλαξης Οθόνης"
+msgid "Script-Fu Pattern Selection"
+msgstr "Επιλογή υποδείγματος"
 
-#: plug-ins/script-fu/script-fu-interface.c:469
+#: ../plug-ins/script-fu/script-fu-interface.c:487
 #, fuzzy
 msgid "Script-Fu Gradient Selection"
-msgstr "Κλάδεμα της τρέχουσας επιλογής"
+msgstr "Επιλογή διαβάθμισης"
 
-#: plug-ins/script-fu/script-fu-interface.c:477
+#: ../plug-ins/script-fu/script-fu-interface.c:496
 #, fuzzy
 msgid "Script-Fu Brush Selection"
-msgstr "Κλάδεμα Επιλεγμένου"
+msgstr "Επιλογή βούρτσας"
 
-#. the script progress frame
-#: plug-ins/script-fu/script-fu-interface.c:533
-#, fuzzy
-msgid "Script Progress"
-msgstr "Ορίσματα"
-
-#: plug-ins/script-fu/script-fu-interface.c:541
-msgid "(none)"
-msgstr ""
-
-#
-#: plug-ins/script-fu/script-fu-interface.c:1058
-#: plug-ins/dbbrowser/gimpprocview.c:198
-msgid "Author:"
-msgstr "Συγγραφέας:"
-
-#: plug-ins/script-fu/script-fu-interface.c:1065
-#: plug-ins/dbbrowser/gimpprocview.c:220
-#, fuzzy
-msgid "Copyright:"
-msgstr "Πνευματικά Δικαιώματα"
-
-#
-#: plug-ins/script-fu/script-fu-interface.c:1072
-#: plug-ins/dbbrowser/gimpprocview.c:209
-msgid "Date:"
-msgstr "Ημ/νία:"
-
-#: plug-ins/script-fu/script-fu-interface.c:1081
-#, fuzzy
-msgid "Image Types:"
-msgstr "Τύπος Στοιχείου:"
-
-#: plug-ins/script-fu/script-fu-scripts.c:611
+#: ../plug-ins/script-fu/script-fu-interface.c:824
 #, fuzzy, c-format
-msgid ""
-"Error while executing\n"
-"%s\n"
-"%s"
-msgstr ""
-"Σφάλμα κατά την ανάγνωση του αρχείου %s:\n"
-"%s"
+msgid "Error while executing %s:"
+msgstr "Σφάλμα κατά την εκτέλεση %s:"
 
-#: plug-ins/script-fu/script-fu-server.c:642
+#: ../plug-ins/script-fu/script-fu-scripts.c:150
+msgid "Too few arguments to 'script-fu-register' call"
+msgstr "Πολύ λίγες παραμέτροι κατά την κλήση του 'script-fu-register'"
+
+#: ../plug-ins/script-fu/script-fu-scripts.c:609
+#, fuzzy, c-format
+msgid "Error while loading %s:"
+msgstr "Σφάλμα κατά τη φόρτωση %s:"
+
+#: ../plug-ins/script-fu/script-fu-server.c:713
 #, fuzzy
 msgid "Script-Fu Server Options"
-msgstr "Λιγότερες Επιλογές"
+msgstr "Επιλογές εξυπηρετητή"
 
-#: plug-ins/script-fu/script-fu-server.c:670
+#: ../plug-ins/script-fu/script-fu-server.c:718
 #, fuzzy
-msgid "Server Port:"
-msgstr "Εξυπηρετητής:"
+msgid "_Start Server"
+msgstr "Εκκίνηση εξυπηρετητή"
+
+#: ../plug-ins/script-fu/script-fu-server.c:746
+#, fuzzy
+msgid "Server port:"
+msgstr "Θύρα εξυπηρετητή:"
 
 #
-#: plug-ins/script-fu/script-fu-server.c:676
+#: ../plug-ins/script-fu/script-fu-server.c:752
 #, fuzzy
-msgid "Server Logfile:"
-msgstr "Αποθήκευση Αρχείου Καταγραφών"
+msgid "Server logfile:"
+msgstr "Αρχείο Καταγραφών εξυπηρετητή"
 
-#: plug-ins/script-fu/script-fu.c:122
+#: ../plug-ins/script-fu/script-fu.c:111
+msgid "Interactive console for Script-Fu development"
+msgstr "Περιβάλλον αλληλεπίδρασης για ανάπτυξη"
+
+#: ../plug-ins/script-fu/script-fu.c:117
 #, fuzzy
-msgid "Script-Fu _Console"
-msgstr "Κονσόλα Script-Fu"
+msgid "_Console"
+msgstr "_Περιβάλλον"
 
-#: plug-ins/script-fu/script-fu.c:129 plug-ins/script-fu/script-fu.c:158
-#: plug-ins/script-fu/script-fu.c:290
-#, fuzzy
-msgid "/Xtns/Script-Fu"
-msgstr "Κονσόλα Script-Fu"
+#: ../plug-ins/script-fu/script-fu.c:141
+msgid "Server for remote Script-Fu operation"
+msgstr "Εξυπηρετητής για απομακρυσμένη λειτουργία"
 
-#: plug-ins/script-fu/script-fu.c:151
+#: ../plug-ins/script-fu/script-fu.c:146
 msgid "_Start Server..."
-msgstr ""
+msgstr "_Εκκίνηση εξυπηρετητή"
 
-#: plug-ins/script-fu/script-fu.c:282
-msgid "_Refresh Scripts"
-msgstr ""
+#: ../plug-ins/script-fu/script-fu.c:302
+msgid "_GIMP Online"
+msgstr "Το _GIMP στο διαδίκτυο"
 
-#: plug-ins/dbbrowser/gimpprocbrowser.c:128
-#: plug-ins/dbbrowser/gimpprocbrowser.c:142
-msgid "Procedure Browser"
-msgstr ""
+#: ../plug-ins/script-fu/script-fu.c:303
+msgid "_User Manual"
+msgstr "_Εγχειρίδιο χρήστη"
 
-#: plug-ins/dbbrowser/gimpprocbrowser.c:132
-#: plug-ins/dbbrowser/gimpprocbrowser.c:146
+#: ../plug-ins/script-fu/script-fu.c:306
 #, fuzzy
-msgid "Search by _Name"
-msgstr "Βάση αναζήτησης:"
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:133
-#: plug-ins/dbbrowser/gimpprocbrowser.c:147
-#, fuzzy
-msgid "Search by _Blurb"
-msgstr "Εύρεση στη Μνήμη.."
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:224
-#, fuzzy
-msgid "_Search:"
-msgstr "Αναζήτηση: "
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:386
-msgid "Searching by name - please wait"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:410
-msgid "Searching by blurb - please wait"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:421
-msgid "Searching - please wait"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:428
-msgid "1 Procedure"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:430
-#, c-format
-msgid "%d Procedures"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocbrowser.c:476
-msgid "No matches"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocview.c:133
-#, fuzzy
-msgid "Parameters"
-msgstr "Ελάττωση Χρωμάτων"
-
-#: plug-ins/dbbrowser/gimpprocview.c:146
-msgid "Return Values"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocview.c:159
-msgid "Additional Information"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocview.c:319
-msgid "Internal GIMP procedure"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocview.c:320
-msgid "GIMP Plug-In"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocview.c:321
-msgid "GIMP Extension"
-msgstr ""
-
-#: plug-ins/dbbrowser/gimpprocview.c:322
-msgid "Temporary Procedure"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:1
-msgid "3D _Outline..."
-msgstr ""
+msgid "_Script-Fu"
+msgstr "Πρόγραμμα εντολών:"
 
 #
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:2
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:1
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:1
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:1
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:1
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:1
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:1
-#: plug-ins/script-fu/scripts/chalk.scm.h:1
-#: plug-ins/script-fu/scripts/chip-away.scm.h:1
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:1
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:1
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:1
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:1
-#: plug-ins/script-fu/scripts/glossy.scm.h:1
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:1
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:1
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:1
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:1
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:1
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:1
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:1
+#: ../plug-ins/script-fu/script-fu.c:308
 #, fuzzy
-msgid "/Script-Fu/Alpha to Logo"
-msgstr "Επιλογή Γραμματοσειράς"
+msgid "_Test"
+msgstr "Κείμενο"
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:3
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:2
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:2
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:2
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:2
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:2
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:2
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:1
-#: plug-ins/script-fu/scripts/chalk.scm.h:2
-#: plug-ins/script-fu/scripts/chip-away.scm.h:2
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:2
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:2
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:2
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:1
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:2
-#: plug-ins/script-fu/scripts/glossy.scm.h:2
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:2
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:2
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:1
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:2
-#: plug-ins/script-fu/scripts/news-text.scm.h:1
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:1
-#: plug-ins/script-fu/scripts/speed-text.scm.h:1
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:2
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:2
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:2
-#: plug-ins/script-fu/scripts/text-circle.scm.h:1
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:2
-#: plug-ins/script-fu/scripts/title-header.scm.h:1
+#: ../plug-ins/script-fu/script-fu.c:311
+msgid "_Buttons"
+msgstr "_Κουμπιά"
+
+#: ../plug-ins/script-fu/script-fu.c:313
+msgid "_Logos"
+msgstr "_Λογότυπα"
+
+#: ../plug-ins/script-fu/script-fu.c:315
 #, fuzzy
-msgid "/Xtns/Script-Fu/Logos"
-msgstr "Κονσόλα Script-Fu"
+msgid "_Patterns"
+msgstr "_Υποδείγματα"
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:4
+#: ../plug-ins/script-fu/script-fu.c:318
+msgid "_Web Page Themes"
+msgstr "_Θέματα ιστοσελίδων"
+
+#: ../plug-ins/script-fu/script-fu.c:320
+msgid "_Alien Glow"
+msgstr ""
+
+#: ../plug-ins/script-fu/script-fu.c:322
+#, fuzzy
+msgid "_Beveled Pattern"
+msgstr "Υπόδειγμα λοξότμησης"
+
+#: ../plug-ins/script-fu/script-fu.c:324
+msgid "_Classic.Gimp.Org"
+msgstr ""
+
+#: ../plug-ins/script-fu/script-fu.c:327
+msgid "Alpha to _Logo"
+msgstr ""
+
+#: ../plug-ins/script-fu/script-fu.c:330
+#, fuzzy
+msgid "Re-read all available Script-Fu scripts"
+msgstr "Επανάγνωση όλων των διαθέσιμων σεναρίων"
+
+#: ../plug-ins/script-fu/script-fu.c:335
+msgid "_Refresh Scripts"
+msgstr "_Ανανέωση σεναρίων"
+
+#: ../plug-ins/script-fu/script-fu.c:358
+msgid ""
+"You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open.  "
+"Please close all Script-Fu windows and try again."
+msgstr ""
+"Δεν μπορείτε να χρησιμοποιήσετε \"Refresh Scripts\" ενώ το παράθυρο διαλόγου "
+"του προγράμματος είναι ανοιχτό. Παρακαλώ κλείστε όλα τα παράθυρα του "
+"προγράμματος και προσπαθήστε ξανα."
+
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:1
+msgid "3D _Outline..."
+msgstr "3Δ _Περίγραμμα"
+
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:2
 msgid "Bumpmap (alpha layer) blur radius"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:5
-#: plug-ins/script-fu/scripts/glossy.scm.h:7
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:3
+msgid "Create a logo with outlined text and a drop shadow"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:4
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:6
 #, fuzzy
 msgid "Default bumpmap settings"
-msgstr "Εξ' ορισμού Ρυθμίσεις"
+msgstr "Προεπιλεγμένες ρυθμίσεις χαρτογράφησης ανώμαλων επιφανειών"
 
 #
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:6
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:5
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:4
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:6
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:4
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:5
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:3
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:3
-#: plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:2
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:11
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:6
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:5
-#: plug-ins/script-fu/scripts/chalk.scm.h:5
-#: plug-ins/script-fu/scripts/chip-away.scm.h:8
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:6
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:5
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:6
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:6
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:5
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:4
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:3
-#: plug-ins/script-fu/scripts/glossy.scm.h:8
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:5
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:8
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:2
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:6
-#: plug-ins/script-fu/scripts/news-text.scm.h:7
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:3
-#: plug-ins/script-fu/scripts/slide.scm.h:2
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:7
-#: plug-ins/script-fu/scripts/speed-text.scm.h:5
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:6
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:4
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:8
-#: plug-ins/script-fu/scripts/text-circle.scm.h:4
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:6
-#: plug-ins/script-fu/scripts/title-header.scm.h:2
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:3
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:3
+#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:2
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:11
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:5
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:8
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:5
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:6
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:7
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:2
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:7
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:3
+#: ../plug-ins/script-fu/scripts/slide.scm.h:2
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:5
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:4
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/title-header.scm.h:2
 msgid "Font"
 msgstr "Γραμματοσειρά"
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:7
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:6
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:5
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:7
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:5
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:6
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:4
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:4
-#: plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:3
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:12
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:7
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:6
-#: plug-ins/script-fu/scripts/chalk.scm.h:6
-#: plug-ins/script-fu/scripts/chip-away.scm.h:9
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:7
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:6
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:7
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:7
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:6
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:5
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:4
-#: plug-ins/script-fu/scripts/glossy.scm.h:9
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:6
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:9
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:3
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:7
-#: plug-ins/script-fu/scripts/news-text.scm.h:8
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:4
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:8
-#: plug-ins/script-fu/scripts/speed-text.scm.h:6
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:7
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:5
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:9
-#: plug-ins/script-fu/scripts/text-circle.scm.h:5
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:7
-#: plug-ins/script-fu/scripts/title-header.scm.h:3
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:4
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:4
+#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:3
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:12
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:6
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:9
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:6
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:7
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:8
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:3
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:8
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:4
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:6
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:5
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/title-header.scm.h:3
 #, fuzzy
 msgid "Font size (pixels)"
-msgstr "Μέγεθος (εικονοστοιχεία)"
+msgstr "Μέγεθος γραμματοσειράς (εικονοστοιχεία)"
 
 #
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:8
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:7
 #, fuzzy
 msgid "Outline blur radius"
 msgstr "Μπλούγκρας"
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:9
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:5
-#: plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:3
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:5
-#: plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:5
-#: plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:3
-#: plug-ins/script-fu/scripts/chip-away.scm.h:13
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:11
-msgid "Pattern"
-msgstr "Σχέδιο"
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:8
+msgid ""
+"Outline the selected region (or alpha) with a pattern and add a drop shadow"
+msgstr ""
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:10
-#: plug-ins/script-fu/scripts/glossy.scm.h:17
-#: plug-ins/script-fu/scripts/round-corners.scm.h:6
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:9
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:5
+#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:3
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:5
+#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:5
+#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:3
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:13
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:11
+msgid "Pattern"
+msgstr "Υπόδειγμα"
+
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:10
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:16
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:6
 #, fuzzy
 msgid "Shadow X offset"
-msgstr "Εμφάνιση Λεπτομερειών"
+msgstr "Μετατόπιση X σκίασης"
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:11
-#: plug-ins/script-fu/scripts/glossy.scm.h:18
-#: plug-ins/script-fu/scripts/round-corners.scm.h:7
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:11
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:17
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:7
 #, fuzzy
 msgid "Shadow Y offset"
-msgstr "Εμφάνιση Λεπτομερειών"
+msgstr "Μετατόπιση Υ σκίασης"
 
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:12
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:12
 #, fuzzy
 msgid "Shadow blur radius"
 msgstr "Αραιά βροχή"
 
 #
-#: plug-ins/script-fu/scripts/3d-outline.scm.h:13
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:10
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:8
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:10
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:6
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:7
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:9
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:7
-#: plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:6
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:17
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:10
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:8
-#: plug-ins/script-fu/scripts/chalk.scm.h:7
-#: plug-ins/script-fu/scripts/chip-away.scm.h:14
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:9
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:11
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:10
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:8
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:7
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:12
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:14
-#: plug-ins/script-fu/scripts/glossy.scm.h:19
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:8
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:11
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:7
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:10
-#: plug-ins/script-fu/scripts/news-text.scm.h:10
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:13
-#: plug-ins/script-fu/scripts/slide.scm.h:5
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:11
-#: plug-ins/script-fu/scripts/speed-text.scm.h:8
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:9
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:8
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:11
-#: plug-ins/script-fu/scripts/text-circle.scm.h:8
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:14
-#: plug-ins/script-fu/scripts/title-header.scm.h:5
+#: ../plug-ins/script-fu/scripts/3d-outline.scm.h:13
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:10
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:9
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:7
+#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:6
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:17
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:7
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:14
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:11
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:13
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:17
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:18
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:7
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:10
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:13
+#: ../plug-ins/script-fu/scripts/slide.scm.h:5
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:11
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:8
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:11
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:8
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:14
+#: ../plug-ins/script-fu/scripts/title-header.scm.h:5
 msgid "Text"
 msgstr "Κείμενο"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:1
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:1
 msgid "3_D Truchet..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:2
-#: plug-ins/script-fu/scripts/camo.scm.h:1
-#: plug-ins/script-fu/scripts/flatland.scm.h:1
-#: plug-ins/script-fu/scripts/land.scm.h:1
-#: plug-ins/script-fu/scripts/rendermap.scm.h:1
-#: plug-ins/script-fu/scripts/swirltile.scm.h:1
-#: plug-ins/script-fu/scripts/swirly-pattern.scm.h:1
-#: plug-ins/script-fu/scripts/truchet.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Patterns"
-msgstr "Κονσόλα Script-Fu"
-
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:3
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:2
-#: plug-ins/script-fu/scripts/alien-glow-bar.scm.h:2
-#: plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:2
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:3
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:4
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:3
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:4
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:3
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:4
-#: plug-ins/script-fu/scripts/chalk.scm.h:3
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:4
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:3
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:3
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:3
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:2
-#: plug-ins/script-fu/scripts/glossy.scm.h:3
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:3
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:3
-#: plug-ins/script-fu/scripts/image-structure.scm.h:3
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:3
-#: plug-ins/script-fu/scripts/news-text.scm.h:2
-#: plug-ins/script-fu/scripts/speed-text.scm.h:2
-#: plug-ins/script-fu/scripts/sphere.scm.h:2
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:3
-#: plug-ins/script-fu/scripts/swirltile.scm.h:3
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:3
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:3
-#: plug-ins/script-fu/scripts/truchet.scm.h:2
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:2
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:1
+#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:1
+#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:1
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:2
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:1
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:1
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:2
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:1
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:1
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:1
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:2
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:1
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:1
 #, fuzzy
 msgid "Background color"
-msgstr "Χρώμα Φόντου"
+msgstr "Χρώμα παρασκηνίου"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:4
-#: plug-ins/script-fu/scripts/truchet.scm.h:3
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:3
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:2
 #, fuzzy
 msgid "Block size"
-msgstr "Αποστολή Μεγέθους Block:"
+msgstr "Μέγεθος τμήματος:"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:5
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:4
+msgid "Create an image filled with a 3D Truchet pattern"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:5
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:7
 #, fuzzy
 msgid "End blend"
 msgstr "Λήξη στις"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:6
-#: plug-ins/script-fu/scripts/truchet.scm.h:5
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:6
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:5
 #, fuzzy
 msgid "Number of X tiles"
 msgstr "Αριθμός αρχείων"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:7
-#: plug-ins/script-fu/scripts/truchet.scm.h:6
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:7
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:6
 #, fuzzy
 msgid "Number of Y tiles"
 msgstr "Αριθμός αρχείων"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:8
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:16
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:8
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:16
 #, fuzzy
 msgid "Start blend"
 msgstr "Έναρξη Esound"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:9
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:9
 #, fuzzy
 msgid "Supersample"
 msgstr "Δείγμα"
 
-#: plug-ins/script-fu/scripts/3dTruchet.scm.h:10
-#: plug-ins/script-fu/scripts/add-bevel.scm.h:4
-#: plug-ins/script-fu/scripts/truchet.scm.h:8
+#: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:10
+#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:4
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:8
 #, fuzzy
 msgid "Thickness"
 msgstr "Μολυβιές"
 
-#
-#: plug-ins/script-fu/scripts/add-bevel.scm.h:1
-#: plug-ins/script-fu/scripts/addborder.scm.h:1
-#: plug-ins/script-fu/scripts/coffee.scm.h:1
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:1
-#: plug-ins/script-fu/scripts/old-photo.scm.h:1
-#: plug-ins/script-fu/scripts/round-corners.scm.h:1
-#: plug-ins/script-fu/scripts/slide.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Decor"
-msgstr "Επιλογή Γραμματοσειράς"
-
-#: plug-ins/script-fu/scripts/add-bevel.scm.h:2
+#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:1
 msgid "Add B_evel..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/add-bevel.scm.h:3
-#: plug-ins/script-fu/scripts/chip-away.scm.h:12
-msgid "Keep bump layer"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:2
+msgid "Add a beveled border to an image"
+msgstr "Πρόσθέστε ένα περίγραμμα λοξότμησης στην εικόνα"
 
-#: plug-ins/script-fu/scripts/add-bevel.scm.h:5
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:10
-#: plug-ins/script-fu/scripts/old-photo.scm.h:6
-#: plug-ins/script-fu/scripts/round-corners.scm.h:8
-#: plug-ins/script-fu/scripts/slide.scm.h:6
-#: plug-ins/script-fu/scripts/spinning-globe.scm.h:6
+#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:3
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:12
+msgid "Keep bump layer"
+msgstr "Διατήρηση στρώσης ανώμαλων επιφανειών"
+
+#: ../plug-ins/script-fu/scripts/add-bevel.scm.h:5
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:10
+#: ../plug-ins/script-fu/scripts/old-photo.scm.h:6
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:8
+#: ../plug-ins/script-fu/scripts/slide.scm.h:6
+#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:6
 #, fuzzy
 msgid "Work on copy"
-msgstr "Αφύπνηση σε %s"
+msgstr "Εργασία σε αντίγραφο"
 
-#: plug-ins/script-fu/scripts/addborder.scm.h:2
+#: ../plug-ins/script-fu/scripts/addborder.scm.h:1
 #, fuzzy
 msgid "Add _Border..."
-msgstr "Πλαίσιο"
+msgstr "Προσθήκη _Πλαισίου..."
 
-#: plug-ins/script-fu/scripts/addborder.scm.h:3
+#: ../plug-ins/script-fu/scripts/addborder.scm.h:2
+msgid "Add a border around an image"
+msgstr "Προσθήκη περιγράμματος στην εικόνα"
+
+#: ../plug-ins/script-fu/scripts/addborder.scm.h:3
 #, fuzzy
 msgid "Border X size"
-msgstr "Μέγεθος άβακα"
+msgstr "Μέγεθος Χ άβακα"
 
-#: plug-ins/script-fu/scripts/addborder.scm.h:4
+#: ../plug-ins/script-fu/scripts/addborder.scm.h:4
 #, fuzzy
 msgid "Border Y size"
-msgstr "Μέγεθος άβακα"
+msgstr "Μέγεθος Υ άβακα"
 
-#: plug-ins/script-fu/scripts/addborder.scm.h:5
+#: ../plug-ins/script-fu/scripts/addborder.scm.h:5
 #, fuzzy
 msgid "Border color"
-msgstr "Χρώμα Παλαιοτέρων:"
+msgstr "Χρώμα περιγράμματος:"
 
-#: plug-ins/script-fu/scripts/addborder.scm.h:6
+#: ../plug-ins/script-fu/scripts/addborder.scm.h:6
 #, fuzzy
 msgid "Delta value on color"
-msgstr "Διαγραφή Χρώματος"
+msgstr "Τιμή δέλτα στο χρώμα"
 
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:1
-#: plug-ins/script-fu/scripts/alien-glow-bar.scm.h:1
-#: plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:1
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Web Page Themes/Alien Glow"
-msgstr "Κονσόλα Script-Fu"
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:2
+msgid "Create an arrow graphic with an eerie glow for web pages"
+msgstr ""
 
 #
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:3
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:2
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:3
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:2
 msgid "Down"
 msgstr "Κάτω"
 
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:4
-#: plug-ins/script-fu/scripts/alien-glow-bar.scm.h:5
-#: plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:3
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:4
-#: plug-ins/script-fu/scripts/camo.scm.h:5
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:4
+#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:3
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:4
+#: ../plug-ins/script-fu/scripts/camo.scm.h:5
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:6
 #, fuzzy
 msgid "Flatten image"
-msgstr "Νέα Εικόνα"
+msgstr "Εξομάλυνση εικόνας"
 
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:5
-#: plug-ins/script-fu/scripts/alien-glow-bar.scm.h:6
-#: plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:4
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:7
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:6
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:8
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:9
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:8
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:4
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:7
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:8
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:4
 #, fuzzy
 msgid "Glow color"
 msgstr "Νέο Χρώμα"
 
 #
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:6
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:3
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:6
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:3
 msgid "Left"
 msgstr "Αριστερά"
 
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:7
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:4
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:7
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:4
 msgid "Orientation"
 msgstr "Προσανατολισμός"
 
 #
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:8
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:8
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:6
 msgid "Right"
 msgstr "Δεξιά"
 
 #
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:9
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:7
-#: plug-ins/script-fu/scripts/lava.scm.h:7
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:9
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:7
+#: ../plug-ins/script-fu/scripts/lava.scm.h:7
 msgid "Size"
 msgstr "Μέγεθος"
 
 #
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:10
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:8
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:10
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:8
 msgid "Up"
 msgstr "Επάνω"
 
 #
-#: plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:11
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:9
+#: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:11
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:9
 #, fuzzy
 msgid "_Arrow..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/scripts/alien-glow-bar.scm.h:3
+#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:2
 #, fuzzy
 msgid "Bar height"
 msgstr "Ύψος"
 
-#: plug-ins/script-fu/scripts/alien-glow-bar.scm.h:4
+#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:3
 #, fuzzy
 msgid "Bar length"
 msgstr "Διάρκεια"
 
+#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:4
+msgid "Create an Hrule graphic with an eerie glow for web pages"
+msgstr ""
+
 #
-#: plug-ins/script-fu/scripts/alien-glow-bar.scm.h:7
-#: plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:7
+#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:5
 #, fuzzy
 msgid "_Hrule..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:5
-#: plug-ins/script-fu/scripts/text-circle.scm.h:6
-#: plug-ins/script-fu/scripts/tileblur.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:2
+msgid "Create a bullet graphic with an eerie glow for web pages"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:5
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:6
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:7
 #, fuzzy
 msgid "Radius"
 msgstr "Ράδιο"
 
 #
-#: plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:6
-#: plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-glow-bullet.scm.h:6
+#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:5
 #, fuzzy
 msgid "_Bullet..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:2
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:2
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:1
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:1
 msgid "B_utton..."
+msgstr "Κ_ουμπί"
+
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:3
+msgid "Create a button graphic with an eerie glow for web pages"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:8
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:8
 #, fuzzy
 msgid "Glow radius"
 msgstr "Σκόνη με άνεμο"
 
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:9
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:6
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:9
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:6
 #, fuzzy
 msgid "Padding"
 msgstr "Σκίαση"
 
-#: plug-ins/script-fu/scripts/alien-glow-button.scm.h:11
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:7
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:8
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:10
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:8
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:18
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:13
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:15
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:8
-#: plug-ins/script-fu/scripts/news-text.scm.h:11
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:14
-#: plug-ins/script-fu/scripts/speed-text.scm.h:9
+#: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:11
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:10
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:8
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:18
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:14
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:18
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:8
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:11
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:14
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:9
 #, fuzzy
 msgid "Text color"
 msgstr "Χρώμα Κειμένου"
 
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:1
+msgid "Add an eerie glow around the selected region (or alpha)"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:2
 msgid "Alien _Glow..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/alien-glow-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:3
+msgid "Create a logo with an alien glow around the text"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/alien-glow-logo.scm.h:7
 #, fuzzy
 msgid "Glow size (pixels * 4)"
 msgstr "Μέγεθος (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:1
+msgid "Add psychedelic outlines to the selected region (or alpha)"
+msgstr "Προσθέστε ψυχεδελικούς σχεδιασμούς στην επιλεγμένη περιοχή (ή άλφα)"
+
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:2
 msgid "Alien _Neon..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:4
+msgid "Create a logo with psychedelic outlines around the text"
+msgstr "Δημιουργήστε ψυχεδελικούς σχεδιασμούς γύρω από το κείμενο"
+
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:5
 #, fuzzy
 msgid "Fade away"
 msgstr "Σημειωση Απουσίας"
 
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:9
 #, fuzzy
 msgid "Number of bands"
 msgstr "Αριθμός Σελίδων"
 
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:11
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:11
 #, fuzzy
 msgid "Width of bands"
 msgstr "Πλάτος παραθύρου"
 
-#: plug-ins/script-fu/scripts/alien-neon-logo.scm.h:12
+#: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:12
 #, fuzzy
 msgid "Width of gaps"
 msgstr "Πλάτος ναρκοπεδίου"
 
-#: plug-ins/script-fu/scripts/basic1-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:1
+msgid ""
+"Add a gradient effect, a drop shadow, and a background to the selected "
+"region (or alpha)"
+msgstr ""
+"Προσθέσθε τα φαινόμενα διαβάθμισης, σκιάς και παρασκηνίου στην επιλεγμένη "
+"περιοχή (ή άλφα)"
+
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:3
+msgid ""
+"Create a plain text logo with a gradient effect, a drop shadow, and a "
+"background"
+msgstr "Δημιουργήστε ένα απλό λογότυπο με διαβάθμιση, σκιά και παρασκήνιο"
+
+#: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:8
 msgid "_Basic I..."
-msgstr ""
+msgstr "_Βασικό Α..."
 
-#: plug-ins/script-fu/scripts/basic2-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:1
+msgid "Add a shadow and a highlight to the selected region (or alpha)"
+msgstr "Προσθέσθε σκιά και τονισμό στην επιλεγμένη περιοχή (ή άλφα)"
+
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:2
 msgid "B_asic II..."
-msgstr ""
+msgstr "Β_ασικό Β..."
 
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:1
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Buttons"
-msgstr "Κονσόλα Script-Fu"
+#: ../plug-ins/script-fu/scripts/basic2-logo.scm.h:4
+msgid "Create a simple logo with a shadow and a highlight"
+msgstr "Δημιουργήστε ένα απλό λογότυπο με σκιά και τονικότητα"
 
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:2
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:6
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:2
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:1
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:1
 #, fuzzy
 msgid "Bevel width"
-msgstr "Πλάτος Πλαισίου:"
+msgstr "Πλάτος λοξότμησης:"
 
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:5
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:2
+msgid "Create a simple, beveled button graphic for webpages"
+msgstr "Δημιουργήστε ένα απλό, γράφημα λοξοτμημένου κουμπιού για ιστοσελίδες"
+
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:5
 #, fuzzy
 msgid "Lower-right color"
 msgstr "Χρώμα Μαρκαρίσματος"
 
 #
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:7
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:6
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:11
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:7
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:6
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:11
 #, fuzzy
 msgid "Pressed"
-msgstr "Πίεση"
+msgstr "Πατήθηκε"
 
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:8
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:8
 msgid "Simple _Beveled Button..."
-msgstr ""
+msgstr "Απλό _Λοξοτμημένο κουμπί"
 
-#: plug-ins/script-fu/scripts/beveled-button.scm.h:11
+#: ../plug-ins/script-fu/scripts/beveled-button.scm.h:11
 #, fuzzy
 msgid "Upper-left color"
 msgstr "Επιλογή χρώματος"
 
-#: plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:1
-#: plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:1
-#: plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:1
-#: plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:1
-#: plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Web Page Themes/Beveled Pattern"
-msgstr "Κονσόλα Script-Fu"
+#: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:1
+msgid "Create a beveled pattern arrow for webpages"
+msgstr "Δημιουργήστε ένα βέλος υποδείγματος λοξότμησης για ιστοσελίδες"
 
-#: plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:2
+#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:1
+msgid "Create a beveled pattern bullet for webpages"
+msgstr "Δημιουργήστε κουκίδα υποδείγματος λοξότμησης για ιστοσελίδες"
+
+#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:2
 #, fuzzy
 msgid "Diameter"
-msgstr "Ελάττωση Χρωμάτων"
+msgstr "Διάμετρος"
 
-#: plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:4
-#: plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:7
-#: plug-ins/script-fu/scripts/spinning-globe.scm.h:4
+#: ../plug-ins/script-fu/scripts/beveled-pattern-bullet.scm.h:4
+#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:7
+#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:4
 #, fuzzy
 msgid "Transparent background"
 msgstr "Διαφανές Παρασκήνιο"
 
-#: plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:4
+#: ../plug-ins/script-fu/scripts/beveled-pattern-button.scm.h:2
+msgid "Create a beveled pattern button for webpages"
+msgstr "Δημιουργήστε ένα κουμπί υποδείγματος λοξότμησης για ιστοσελίδες"
+
+#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:1
+msgid "Create a beveled pattern heading for webpages"
+msgstr "Δημιουργήστε μία κεφαλίδα υποδείγματος λοξότμησης για ιστοσελίδες"
+
+#: ../plug-ins/script-fu/scripts/beveled-pattern-heading.scm.h:4
 msgid "H_eading..."
+msgstr "Κ_εφαλίδα"
+
+#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:1
+msgid "Create a beveled pattern hrule for webpages"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:2
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:5
-#: plug-ins/script-fu/scripts/gradient-example.scm.h:4
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:4
-#: plug-ins/script-fu/scripts/swirltile.scm.h:7
+#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:2
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:8
+#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:4
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:7
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:7
 msgid "Height"
 msgstr "Ύψος"
 
-#: plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:4
-#: plug-ins/script-fu/scripts/gradient-example.scm.h:5
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:8
-#: plug-ins/script-fu/scripts/swirltile.scm.h:11
+#: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:4
+#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:5
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:11
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:11
 msgid "Width"
 msgstr "Πλάτος"
 
-#
-#: plug-ins/script-fu/scripts/blend-anim.scm.h:1
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:1
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:1
-#: plug-ins/script-fu/scripts/spinning-globe.scm.h:1
-#: plug-ins/script-fu/scripts/waves-anim.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Animators"
-msgstr "Επιλογή Γραμματοσειράς"
+#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:1
+msgid "Blend Animation needs at least three source layers"
+msgstr ""
 
-#: plug-ins/script-fu/scripts/blend-anim.scm.h:2
+#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:2
+msgid ""
+"Create intermediate layers to blend two or more layers over a background as "
+"an animation"
+msgstr ""
+"Δημιουργήστε ενδιάμεσες στρώσεις για τη μείξη δύο ή περισσοτέρων στρώσεων "
+"πάνω από ένα παρασκήνιο σαν σχεδιοκίνηση"
+
+#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:3
 #, fuzzy
 msgid "Intermediate frames"
 msgstr "Μέσου επιπέδου"
 
-#: plug-ins/script-fu/scripts/blend-anim.scm.h:3
+#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:4
 #, fuzzy
 msgid "Looped"
 msgstr "Βρόχος"
 
 #
-#: plug-ins/script-fu/scripts/blend-anim.scm.h:4
+#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:5
 #, fuzzy
 msgid "Max. blur radius"
 msgstr "Μπλούγκρας"
 
 #
-#: plug-ins/script-fu/scripts/blend-anim.scm.h:5
+#: ../plug-ins/script-fu/scripts/blend-anim.scm.h:6
 #, fuzzy
 msgid "_Blend..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:1
+msgid ""
+"Add blended backgrounds, highlights, and shadows to the selected region (or "
+"alpha)"
+msgstr ""
+"Προσθέσθε μίγμα παρασκηνίων, τονισμών αλλά και σκιών στην επιλεγμνένη "
+"περιοχή (ή άλφα)"
+
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:3
 msgid "Blen_ded..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:4
 #, fuzzy
 msgid "Blend mode"
 msgstr "Κατάσταση Αρχείου"
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:5
+msgid "Create a logo with blended backgrounds, highlights, and shadows"
+msgstr "Δημιουργήστε ένα λογότυπο με μίγμα παρασκηνίων, τονισμών και σκιών"
+
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:6
 #, fuzzy
 msgid "Custom Gradient"
 msgstr "Βαθμίδα"
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:8
 msgid "FG-BG-HSV"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:9
 msgid "FG-BG-RGB"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:10
 #, fuzzy
 msgid "FG-Transparent"
 msgstr "Διαφανές"
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:13
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:7
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:8
-#: plug-ins/script-fu/scripts/land.scm.h:3
-#: plug-ins/script-fu/scripts/lava.scm.h:2
-#: plug-ins/script-fu/scripts/rendermap.scm.h:4
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:10
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:13
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/land.scm.h:3
+#: ../plug-ins/script-fu/scripts/lava.scm.h:2
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:4
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:9
 msgid "Gradient"
 msgstr "Βαθμίδα"
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:14
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:8
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:9
-#: plug-ins/script-fu/scripts/gradient-example.scm.h:3
-#: plug-ins/script-fu/scripts/rendermap.scm.h:5
-#: plug-ins/script-fu/scripts/title-header.scm.h:4
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:14
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:3
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:5
+#: ../plug-ins/script-fu/scripts/title-header.scm.h:4
 #, fuzzy
 msgid "Gradient reverse"
 msgstr "Βαθμίδα"
 
-#: plug-ins/script-fu/scripts/blended-logo.scm.h:15
+#: ../plug-ins/script-fu/scripts/blended-logo.scm.h:15
 #, fuzzy
 msgid "Offset (pixels)"
 msgstr "Μέγεθος (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:3
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:1
+msgid "Add 'cow spots' to the selected region (or alpha)"
+msgstr "Προσθέσθε 'αποτύπωμα αγελάδας' στις επιλεγμένη περιοχή (ή άλφα)"
+
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:2
 msgid "Background Color"
 msgstr "Χρώμα Φόντου"
 
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:4
 msgid "Bo_vination..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:5
+msgid "Create a logo with text in the style of 'cow spots'"
+msgstr "Δημιουργήστε ένα λογότυπο με κείμενο μεχνοτροπίας 'αποτύπωμα αγελάδας'"
+
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:8
 msgid "Spots density X"
-msgstr ""
+msgstr "Πυκνότητα αποτυπωμάτων Χ"
 
-#: plug-ins/script-fu/scripts/bovinated-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:9
 msgid "Spots density Y"
-msgstr ""
+msgstr "Πυκνότητα αποτυπωμάτων Υ"
 
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:2
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:1
 msgid "Add glowing"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:3
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:2
 msgid "After glow"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:4
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:3
 msgid "B_urn-In..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:5
-msgid "Burn-In: Need two layers in total!"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:6
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:4
 #, fuzzy
 msgid "Corona width"
 msgstr "Πλάτος Εικονιδίου:"
 
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:5
+msgid ""
+"Create intermediate layers to produce an animated 'burn-in' transition "
+"between two layers"
+msgstr ""
+"Δημιουργήστε ενδιάμεσες στρώσεις για να παραχθεί μία σχεδιοκινούμενη "
+"μεταβολή 'συνεχούς λειτουργίας' μεταξύ δύο στρώσεων"
+
 #
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:7
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:6
 #, fuzzy
 msgid "Fadeout"
 msgstr "Καθορισμός Πλάτους:"
 
 #
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:8
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:7
 #, fuzzy
 msgid "Fadeout width"
 msgstr "Καθορισμός Πλάτους:"
 
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:10
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:9
 msgid "Prepare for GIF"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/burn-in-anim.scm.h:11
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:10
 msgid "Speed (pixels/frame)"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/camo.scm.h:2
+#: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:11
+msgid ""
+"The Burn-In script needs two layers in total. A foreground layer with "
+"transparency and a background layer."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/camo.scm.h:1
 msgid "Color 1"
 msgstr "Χρώμα 1"
 
-#: plug-ins/script-fu/scripts/camo.scm.h:3
+#: ../plug-ins/script-fu/scripts/camo.scm.h:2
 msgid "Color 2"
 msgstr "Χρώμα 2"
 
-#: plug-ins/script-fu/scripts/camo.scm.h:4
+#: ../plug-ins/script-fu/scripts/camo.scm.h:3
 #, fuzzy
 msgid "Color 3"
 msgstr "Χρώμα 1"
 
-#: plug-ins/script-fu/scripts/camo.scm.h:6
-#: plug-ins/script-fu/scripts/rendermap.scm.h:6
+#: ../plug-ins/script-fu/scripts/camo.scm.h:4
+msgid "Create an image filled with a camouflage pattern"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/camo.scm.h:6
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:6
 #, fuzzy
 msgid "Granularity"
 msgstr "Ιανουάριος"
 
-#: plug-ins/script-fu/scripts/camo.scm.h:7
-#: plug-ins/script-fu/scripts/rendermap.scm.h:7
+#: ../plug-ins/script-fu/scripts/camo.scm.h:7
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:7
 #, fuzzy
 msgid "Image size"
 msgstr "Μέγεθος Εικόνας:"
 
-#: plug-ins/script-fu/scripts/camo.scm.h:8
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:3
+#: ../plug-ins/script-fu/scripts/camo.scm.h:8
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:3
 msgid "Smooth"
 msgstr "Ομαλό"
 
-#: plug-ins/script-fu/scripts/camo.scm.h:9
+#: ../plug-ins/script-fu/scripts/camo.scm.h:9
 msgid "_Camouflage..."
 msgstr ""
 
-#
-#: plug-ins/script-fu/scripts/carve-it.scm.h:1
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Stencil Ops"
-msgstr "Επιλογή Γραμματοσειράς"
-
-#: plug-ins/script-fu/scripts/carve-it.scm.h:2
-msgid "C_arve-It..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/carve-it.scm.h:3
+#: ../plug-ins/script-fu/scripts/carve-it.scm.h:1
 #, fuzzy
 msgid "Carve white areas"
 msgstr "Αποθήκευση Αρχείου Ως"
 
-#: plug-ins/script-fu/scripts/carve-it.scm.h:4
+#: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
 #, fuzzy
 msgid "Image to carve"
 msgstr "Όνομα Εικόνας"
 
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/carve-it.scm.h:3
+msgid "Stencil C_arve..."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:1
 msgid "Background Image"
 msgstr "Εικόνα Παρασκηνίου"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:2
 #, fuzzy
 msgid "Carve raised text"
 msgstr "Νέο Κείμενο"
 
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:3
 msgid "Carved..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/carved-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:4
+msgid ""
+"Create a logo with text raised above or carved in to the specified "
+"background image"
+msgstr ""
+"Δημιουργήστε ένα λογότυπο με υπερηψομένο ή ανάγλυφο κείμενο στην εικόνα του "
+"παρασκηνίου"
+
+#: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
 #, fuzzy
 msgid "Padding around text"
-msgstr "Απλό Κείμενο"
+msgstr "Παραγέμισμα γύρω από το κείμενο"
 
-#: plug-ins/script-fu/scripts/chalk.scm.h:4
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:2
 #, fuzzy
 msgid "Chalk color"
-msgstr "Χρώμα ρολογιού"
+msgstr "Χρώμα κιμωλίας"
 
-#: plug-ins/script-fu/scripts/chalk.scm.h:8
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:3
+msgid "Create a chalk drawing effect for the selected region (or alpha)"
+msgstr ""
+"Δημιουργήστε ένα φίλτρο σχεδίου με κιμωλία για την επιλεγμένη περιοχή (ή "
+"άλφα)"
+
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:4
+msgid "Create a logo resembling chalk scribbled on a blackboard"
+msgstr ""
+"Δημιουργήστε ένα λογότυπο που μοιάζει με ορνιθοσκαλίσματα κιμωλίας σε "
+"μαυροπίνακα"
+
+#: ../plug-ins/script-fu/scripts/chalk.scm.h:8
 msgid "_Chalk..."
+msgstr "_Κιμωλία"
+
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:1
+msgid "Add a chipped woodcarving effect to the selected region (or alpha)"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/chip-away.scm.h:3
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:2
 #, fuzzy
 msgid "Blur amount"
-msgstr "Πηγαίος Λογαριασμός"
+msgstr "Ποσό θόλωσης"
 
-#: plug-ins/script-fu/scripts/chip-away.scm.h:4
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:3
 msgid "Chip Awa_y..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/chip-away.scm.h:5
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:4
 #, fuzzy
 msgid "Chip amount"
-msgstr "Clip Art"
+msgstr "Ποσό ροκανίσματος"
 
-#: plug-ins/script-fu/scripts/chip-away.scm.h:6
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:5
+msgid "Create a logo resembling a chipped wood carving"
+msgstr "Δημιουργήστε ένα λογότυπο που να μοιάζει με ξυλογλυπτική"
+
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:6
 #, fuzzy
 msgid "Drop shadow"
 msgstr "Σκιά:"
 
-#: plug-ins/script-fu/scripts/chip-away.scm.h:7
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:7
 #, fuzzy
 msgid "Fill BG with pattern"
-msgstr "Σταθερό πλάτος"
+msgstr "Γέμισμα παρασκηνίου με υπόδειγμα"
 
-#: plug-ins/script-fu/scripts/chip-away.scm.h:10
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:10
 msgid "Invert"
 msgstr "Αντιστροφή"
 
-#: plug-ins/script-fu/scripts/chip-away.scm.h:11
+#: ../plug-ins/script-fu/scripts/chip-away.scm.h:11
 #, fuzzy
 msgid "Keep background"
 msgstr "Αρχικοποίηση Παρασκηνίου"
 
-#
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:2
-#, fuzzy
-msgid "C_hrome-It..."
-msgstr "Εξερεύνηση..."
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:1
+msgid ""
+"Add a chrome effect to the selected region (or alpha) using a specified "
+"(grayscale) stencil"
+msgstr ""
+"Προσθέσθε το φίλτρο χρωμίου στην συγκεκριμένη περιοχή (ή άλφα) με την χρήση "
+"καθορισμένης φαιάς κλίμακας, για αχνάρι"
 
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:3
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:2
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:1
 #, fuzzy
 msgid "Chrome balance"
 msgstr "Ισορροπία"
 
 #
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:4
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:3
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:3
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:3
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:2
 #, fuzzy
 msgid "Chrome factor"
-msgstr "Εργοστάσιο φτερουγιστή"
+msgstr "Συντελεστής χρωμίου"
 
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:5
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:4
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:3
 #, fuzzy
 msgid "Chrome lightness"
-msgstr "Ενδείξεις μόντεμ"
+msgstr "Φωτεινότητα χρωμίου"
 
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:6
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:5
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:4
 #, fuzzy
 msgid "Chrome saturation"
-msgstr "Κορεσμός"
+msgstr "Κορεσμός χρωμίου"
 
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:7
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:6
 #, fuzzy
 msgid "Chrome white areas"
-msgstr "Αποθήκευση Αρχείου Ως"
+msgstr "Λευκές περιοχές χρωμίου"
 
 #
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:8
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:5
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:7
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:6
 #, fuzzy
 msgid "Environment map"
-msgstr "Περιβάλλον"
+msgstr "Χάρτης περιβάλλοντος"
 
-#: plug-ins/script-fu/scripts/chrome-it.scm.h:9
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:8
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:9
 #, fuzzy
 msgid "Highlight balance"
 msgstr "Επιλεγμένο"
 
 #
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/chrome-it.scm.h:9
+#, fuzzy
+msgid "Stencil C_hrome..."
+msgstr "Εξερεύνηση..."
+
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:1
+msgid "Add a simple chrome effect to the selected region (or alpha)"
+msgstr "Προσθέσθε ένα απλό φίλτρο χρωμίου στην επιλεγμένη περιοχή (ή άλφα)"
+
+#
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:4
 #, fuzzy
 msgid "C_hrome..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/scripts/chrome-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:5
+msgid "Create a simplistic, but cool, chromed logo"
+msgstr "Δημιουργήστε ένα απλουστευμένο, αλλά περίκομψο, λογότυπο χρωμίου"
+
+#: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:8
 #, fuzzy
 msgid "Offsets (pixels * 2)"
-msgstr "Μέγεθος (εικονοστοιχεία)"
+msgstr "Μετατοπίσεις (εικονοστοιχεία*2)"
 
-#
-#: plug-ins/script-fu/scripts/circuit.scm.h:1
-#: plug-ins/script-fu/scripts/grid-system.scm.h:1
-#: plug-ins/script-fu/scripts/lava.scm.h:1
-#: plug-ins/script-fu/scripts/line-nova.scm.h:1
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Render"
-msgstr "Επιλογή Γραμματοσειράς"
-
-#: plug-ins/script-fu/scripts/circuit.scm.h:2
+#: ../plug-ins/script-fu/scripts/circuit.scm.h:1
 msgid "Circuit seed"
-msgstr ""
+msgstr "Κόκκοι κυκλώματος"
 
-#: plug-ins/script-fu/scripts/circuit.scm.h:3
-#: plug-ins/script-fu/scripts/lava.scm.h:3
-#: plug-ins/script-fu/scripts/predator.scm.h:3
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:11
+#: ../plug-ins/script-fu/scripts/circuit.scm.h:2
+msgid ""
+"Fill the selected region (or alpha) with traces like those on a circuit board"
+msgstr ""
+"Γεμίστε την επιλεγμένη περιοχή (ή άλφα) με ίχνη σαν αυτά του ηλεκτρικού "
+"κυκλώματος"
+
+#: ../plug-ins/script-fu/scripts/circuit.scm.h:3
+#: ../plug-ins/script-fu/scripts/lava.scm.h:3
+#: ../plug-ins/script-fu/scripts/predator.scm.h:3
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:11
 #, fuzzy
 msgid "Keep selection"
 msgstr "Κλάδεμα Επιλεγμένου"
 
-#: plug-ins/script-fu/scripts/circuit.scm.h:4
+#: ../plug-ins/script-fu/scripts/circuit.scm.h:4
 msgid "No background (only for separate layer)"
-msgstr ""
+msgstr "Χωρίς παρασκήνιο (μόνο για ξεχωριστή στρώση)"
 
-#: plug-ins/script-fu/scripts/circuit.scm.h:5
+#: ../plug-ins/script-fu/scripts/circuit.scm.h:5
 #, fuzzy
 msgid "Oilify mask size"
-msgstr "Αρχικό _Μέγεθος"
+msgstr "Ελαιοποίηση μεγέθους προσωπίδας"
 
 #
-#: plug-ins/script-fu/scripts/circuit.scm.h:6
-#: plug-ins/script-fu/scripts/lava.scm.h:6
-#: plug-ins/script-fu/scripts/predator.scm.h:6
+#: ../plug-ins/script-fu/scripts/circuit.scm.h:6
+#: ../plug-ins/script-fu/scripts/lava.scm.h:6
+#: ../plug-ins/script-fu/scripts/predator.scm.h:6
 #, fuzzy
 msgid "Separate layer"
 msgstr "Καθορισμός Στρώματος"
 
-#: plug-ins/script-fu/scripts/circuit.scm.h:7
+#: ../plug-ins/script-fu/scripts/circuit.scm.h:7
 msgid "_Circuit..."
-msgstr ""
+msgstr "_Κύκλωμα"
 
-#
-#: plug-ins/script-fu/scripts/clothify.scm.h:1
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:1
-#: plug-ins/script-fu/scripts/predator.scm.h:1
-#: plug-ins/script-fu/scripts/unsharp-mask.scm.h:1
-#: plug-ins/script-fu/scripts/weave.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Alchemy"
-msgstr "Επιλογή Γραμματοσειράς"
+#: ../plug-ins/script-fu/scripts/clothify.scm.h:1
+msgid "Add a cloth-like texture to the selected region (or alpha)"
+msgstr "Προσθέσθε μία υφή όμοια με υφάσμα στην επιλεγμένη περιοχή (ή άλφα)"
 
-#: plug-ins/script-fu/scripts/clothify.scm.h:2
-#: plug-ins/script-fu/scripts/swirltile.scm.h:2
+#: ../plug-ins/script-fu/scripts/clothify.scm.h:2
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:1
 #, fuzzy
 msgid "Azimuth"
 msgstr "Έγκριση:"
 
-#: plug-ins/script-fu/scripts/clothify.scm.h:3
+#: ../plug-ins/script-fu/scripts/clothify.scm.h:3
 #, fuzzy
 msgid "Blur X"
-msgstr "Μπλε : "
+msgstr "Θόλωση Χ"
 
-#: plug-ins/script-fu/scripts/clothify.scm.h:4
+#: ../plug-ins/script-fu/scripts/clothify.scm.h:4
 #, fuzzy
 msgid "Blur Y"
-msgstr "Μπλε : "
+msgstr "Θόλωση Υ"
 
-#: plug-ins/script-fu/scripts/clothify.scm.h:5
-#: plug-ins/script-fu/scripts/swirltile.scm.h:5
+#: ../plug-ins/script-fu/scripts/clothify.scm.h:5
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:5
 #, fuzzy
 msgid "Depth"
-msgstr "Τμήμ."
+msgstr "Βάθος"
 
-#: plug-ins/script-fu/scripts/clothify.scm.h:6
-#: plug-ins/script-fu/scripts/swirltile.scm.h:6
+#: ../plug-ins/script-fu/scripts/clothify.scm.h:6
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:6
 #, fuzzy
 msgid "Elevation"
 msgstr "τοποθεσία"
 
-#: plug-ins/script-fu/scripts/clothify.scm.h:7
+#: ../plug-ins/script-fu/scripts/clothify.scm.h:7
 msgid "_Clothify..."
-msgstr ""
+msgstr "_Υφασματοποίηση..."
 
-#: plug-ins/script-fu/scripts/coffee.scm.h:2
-msgid ""
-"Darken only\n"
-"(Better, but only for images with alot of white)"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/coffee.scm.h:1
+msgid "Add realistic looking coffee stains to the image"
+msgstr "Προσθέσθε μία πραγματισμική όψη από κηλίδες καφέ στην εικόνα"
 
-#: plug-ins/script-fu/scripts/coffee.scm.h:3
+#: ../plug-ins/script-fu/scripts/coffee.scm.h:2
+#, fuzzy
+msgid "Darken only"
+msgstr "Βαθύχρωμο μόνο"
+
+#: ../plug-ins/script-fu/scripts/coffee.scm.h:3
 #, fuzzy
 msgid "Stains"
-msgstr "Ισπανία"
+msgstr "Κηλίδες"
 
-#: plug-ins/script-fu/scripts/coffee.scm.h:4
+#: ../plug-ins/script-fu/scripts/coffee.scm.h:4
 msgid "_Coffee Stain..."
-msgstr ""
+msgstr "_Κηλίδα καφέ..."
 
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:1
+msgid ""
+"Add a comic-book effect to the selected region (or alpha) by outlining and "
+"filling with a gradient"
+msgstr ""
+"Προσθέσθε ένα φίλτρο περιοδικού με αστεία σχέδια στην επιλεγμένη περιοχή (ή "
+"άλφα) σχηματίζοντας και γεμίζοντας με διαβάθμιση"
+
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:3
 msgid "Comic Boo_k..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:4
+msgid "Create a comic-book style logo by outlining and filling with a gradient"
+msgstr ""
+"Δημιουργήστεμία τεχνοτροπία περιοδικού με αστεία σχέδια σχηματίζοντας και "
+"γεμίζοντας με διαβάθμιση"
+
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:9
 #, fuzzy
 msgid "Outline color"
 msgstr "Περίγραμμα"
 
-#: plug-ins/script-fu/scripts/comic-logo.scm.h:10
-#: plug-ins/script-fu/scripts/glossy.scm.h:12
+#: ../plug-ins/script-fu/scripts/comic-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:11
 #, fuzzy
 msgid "Outline size"
 msgstr "Περίγραμμα"
 
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:1
+msgid ""
+"Add a metallic effect to the selected region (or alpha) with reflections and "
+"perspective shadows"
+msgstr ""
+"Προσθέστε ένα μεταλλικό φίλτρο στην επιλεγμένη περιοχή (ή άλφα) με "
+"αντανακλάσεις και απεικονίσεις σκιών"
+
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:3
 msgid "Cool _Metal..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/coolmetal-logo.scm.h:5
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:4
+msgid "Create a metallic logo with reflections and perspective shadows"
+msgstr ""
+"Δημιουργήστε ένα μεταλλικό λογότυπο με αντανακλάσεις και απεικονίσεις σκιών"
+
+#: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:5
 #, fuzzy
 msgid "Effect size (pixels)"
 msgstr "Μέγεθος (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:2
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:1
 #, fuzzy
 msgid "Background image"
 msgstr "Εικόνα Παρασκηνίου"
 
-#: plug-ins/script-fu/scripts/crystal-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:3
+msgid "Create a logo with a crystal/gel effect displacing the image underneath"
+msgstr ""
+"Δημιουργήστε ένα λογότυπο με το φίλτρο κρύσταλλο/γέλη μετατοπίζοντας την "
+"εικόνα από κάτω"
+
+#: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:4
 msgid "Crystal..."
+msgstr "Κρύσταλλο"
+
+#: ../plug-ins/script-fu/scripts/difference-clouds.scm.h:1
+msgid "Difference Clouds..."
 msgstr ""
 
-#
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:1
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:1
-#: plug-ins/script-fu/scripts/select-to-brush.scm.h:1
-#: plug-ins/script-fu/scripts/select-to-image.scm.h:1
-#: plug-ins/script-fu/scripts/select-to-pattern.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Selection"
-msgstr "Επιλογή Γραμματοσειράς"
+#: ../plug-ins/script-fu/scripts/difference-clouds.scm.h:2
+msgid "Solid noise applied with Difference layer mode"
+msgstr "Στερεός θόρυβος εφαρμόστηκε με κατάσταση σρτώσης διαφοράς"
 
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:2
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:1
+#, fuzzy
+msgid "Distress the selection"
+msgstr "Κλάδεμα Επιλεγμένου"
+
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:2
 #, fuzzy
 msgid "Granularity (1 is low)"
 msgstr "Ιανουάριος"
 
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:4
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:4
 #, fuzzy
 msgid "Smooth horizontally"
 msgstr "_Οριζόντια"
 
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:5
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:5
 #, fuzzy
 msgid "Smooth vertically"
 msgstr "Κατακόρυ_φα"
 
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:6
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:6
 #, fuzzy
 msgid "Spread"
-msgstr "SC/XSpread"
+msgstr "Εκπέτασμα"
 
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:7
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:7
 msgid "Threshold (bigger 1<-->255 smaller)"
-msgstr ""
+msgstr "Κατώφλι (μεγαλύτερο 1<-->255 μικρότερο)"
 
-#: plug-ins/script-fu/scripts/distress-selection.scm.h:8
+#: ../plug-ins/script-fu/scripts/distress-selection.scm.h:8
 #, fuzzy
-msgid "_Distress Selection..."
-msgstr "Κλάδεμα Επιλεγμένου"
+msgid "_Distort..."
+msgstr "_Παραμόρφωση"
 
-#
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:1
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:1
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Shadow"
-msgstr "Επιλογή Γραμματοσειράς"
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:1
+msgid "Add a drop shadow to the selected region (or alpha)"
+msgstr "Προσθέσθε σκιά στην επιλεγμένη περιοχή (ή άλφα)"
 
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:2
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:2
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:2
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:2
 #, fuzzy
 msgid "Allow resizing"
 msgstr "Όλες οι ρυθμίσεις"
 
 #
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:3
-#: plug-ins/script-fu/scripts/news-text.scm.h:3
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:4
-#: plug-ins/script-fu/scripts/round-corners.scm.h:4
-#: plug-ins/script-fu/scripts/swirltile.scm.h:4
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:3
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:2
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:4
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:3
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:3
 #, fuzzy
 msgid "Blur radius"
 msgstr "Μπλούγκρας"
 
 #
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:4
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:5
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:5
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:5
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:4
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:5
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:5
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:5
 msgid "Color"
 msgstr "Χρώμα"
 
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:5
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:8
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:5
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:11
 #, fuzzy
 msgid "Offset X"
 msgstr "Μετατόπιση"
 
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:6
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:9
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:6
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:12
 #, fuzzy
 msgid "Offset Y"
 msgstr "Μετατόπιση"
 
 #
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:7
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:10
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:7
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:7
 #, fuzzy
 msgid "Opacity"
-msgstr "Διαφάνεια:"
+msgstr "Αδιαφάνεια:"
 
-#: plug-ins/script-fu/scripts/drop-shadow.scm.h:8
+#: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:8
 #, fuzzy
-msgid "_Drop-Shadow..."
+msgid "_Drop Shadow..."
 msgstr "Σκιά:"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:2
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:1
 msgid "Columns"
 msgstr "Στήλες"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:3
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:2
 msgid "Erase"
 msgstr "Διαγραφή"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:4
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:3
+#, fuzzy
+msgid "Erase every other row or column"
+msgstr "Διαγράψτε κάθε άλλη γραμμή ή στήλη"
+
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:4
 #, fuzzy
 msgid "Erase/fill"
 msgstr "Διαγραφή"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:5
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:5
 #, fuzzy
 msgid "Even"
 msgstr "Συμβάν"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:6
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:6
 #, fuzzy
 msgid "Even/odd"
 msgstr "Συμβάν"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:7
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:7
 #, fuzzy
 msgid "Fill with BG"
 msgstr "Σταθερό πλάτος"
 
 #
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:8
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:8
 #, fuzzy
 msgid "Odd"
 msgstr "Προσθήκη"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:9
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:9
 msgid "Rows"
 msgstr "Σειρές"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:10
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:10
 #, fuzzy
 msgid "Rows/cols"
-msgstr "Γραμματοσειρές/Χρώματα"
+msgstr "Γραμμές/στήλες"
 
-#: plug-ins/script-fu/scripts/erase-rows.scm.h:11
+#: ../plug-ins/script-fu/scripts/erase-rows.scm.h:11
 #, fuzzy
-msgid "_Erase every other Row..."
-msgstr "Κλάδεμα Επιλεγμένου"
+msgid "_Erase Every Other Row..."
+msgstr "Διαγραφή κάθε άλλης γραμμής"
 
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:2
-msgid "Apply generated layermask"
-msgstr ""
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:1
+msgid "Create an image filled with a Land Pattern"
+msgstr "Δημιουργήστε μία εικόνα με γέμισμα υποδείγματος γης"
 
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:3
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:4
-#: plug-ins/script-fu/scripts/old-photo.scm.h:2
-#, fuzzy
-msgid "Border size"
-msgstr "Μέγεθος άβακα"
-
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:4
-#, fuzzy
-msgid "Clear unselected maskarea"
-msgstr "Αποκοπή επιλεγμένης εργασίας"
-
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:6
-#, fuzzy, no-c-format
-msgid "Fade from %"
-msgstr "Εύρος: Από "
-
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:8
-#, fuzzy, no-c-format
-msgid "Fade to   %"
-msgstr "Εύρος: Από "
-
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:9
-#, fuzzy
-msgid "Use growing selection"
-msgstr "Κλάδεμα Επιλεγμένου"
-
-#: plug-ins/script-fu/scripts/fade-outline.scm.h:10
-msgid "_Fade Outline..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/flatland.scm.h:2
-#: plug-ins/script-fu/scripts/land.scm.h:2
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:2
+#: ../plug-ins/script-fu/scripts/land.scm.h:2
 #, fuzzy
 msgid "Detail level"
-msgstr "Αναλυτικά"
+msgstr "Λεπτομερές επίπεδο"
 
-#: plug-ins/script-fu/scripts/flatland.scm.h:3
-#: plug-ins/script-fu/scripts/land.scm.h:4
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:3
+#: ../plug-ins/script-fu/scripts/land.scm.h:4
 #, fuzzy
 msgid "Image height"
-msgstr "Ύψος"
+msgstr "Ύψος εικόνας"
 
-#: plug-ins/script-fu/scripts/flatland.scm.h:4
-#: plug-ins/script-fu/scripts/land.scm.h:5
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:4
+#: ../plug-ins/script-fu/scripts/land.scm.h:5
 #, fuzzy
 msgid "Image width"
-msgstr "Παράθυρα Εικόνων"
+msgstr "Πλάτος εικόνας"
 
-#: plug-ins/script-fu/scripts/flatland.scm.h:5
-#: plug-ins/script-fu/scripts/land.scm.h:7
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:5
+#: ../plug-ins/script-fu/scripts/land.scm.h:7
 #, fuzzy
 msgid "Random seed"
 msgstr "Τυχαίο"
 
-#: plug-ins/script-fu/scripts/flatland.scm.h:6
-#: plug-ins/script-fu/scripts/land.scm.h:8
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:6
+#: ../plug-ins/script-fu/scripts/land.scm.h:8
 #, fuzzy
 msgid "Scale X"
-msgstr "Κλίμακα Χ:"
+msgstr "Κλίμακα Χ"
 
 #
-#: plug-ins/script-fu/scripts/flatland.scm.h:7
-#: plug-ins/script-fu/scripts/land.scm.h:9
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:7
+#: ../plug-ins/script-fu/scripts/land.scm.h:9
 #, fuzzy
 msgid "Scale Y"
-msgstr "Κλιμάκωση"
+msgstr "Κλίμακα Y"
 
-#: plug-ins/script-fu/scripts/flatland.scm.h:8
+#: ../plug-ins/script-fu/scripts/flatland.scm.h:8
 msgid "_Flatland..."
-msgstr ""
+msgstr "_Επίπεδη έκταση..."
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:1
-#: plug-ins/script-fu/scripts/gradient-example.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Utils"
-msgstr "Κονσόλα Script-Fu"
-
-#: plug-ins/script-fu/scripts/font-map.scm.h:2
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:1
 #, fuzzy
 msgid "Active colors"
-msgstr "Περίγραμμα"
+msgstr "Ζωηρά χρώματα"
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:3
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:2
 msgid "Black on white"
+msgstr "Μαύρο σε λευκό"
+
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:3
+msgid ""
+"Create an image filled with previews of fonts matching a fontname filter"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:4
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:4
 #, fuzzy
 msgid "Font _size (pixels)"
 msgstr "Μέγεθος (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:5
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:5
+msgid "Render _Font Map..."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:6
 msgid "Use font _name as text"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:6
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:7
 #, fuzzy
 msgid "_Border (pixels)"
 msgstr "Μέγεθος (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:7
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:8
 #, fuzzy
 msgid "_Color scheme"
 msgstr "Χρώμα 1"
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:8
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:9
 msgid "_Filter (regexp)"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/font-map.scm.h:9
-msgid "_Font Map..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/font-map.scm.h:10
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:10
 msgid "_Labels"
 msgstr ""
 
 #
-#: plug-ins/script-fu/scripts/font-map.scm.h:11
+#: ../plug-ins/script-fu/scripts/font-map.scm.h:11
 #, fuzzy
 msgid "_Text"
 msgstr "Κείμενο"
 
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:1
+msgid ""
+"Add a frost effect to the selected region (or alpha) with an added drop "
+"shadow"
+msgstr ""
+"Προσθέστε ένα φίλτρο παγετού στην επιλεγμένη περιοχή (ή άλφα) με επιπρόσθετη "
+"σκιά"
+
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:3
+msgid "Create frozen logo with an added drop shadow"
+msgstr "Δημιουργήστε ένα λογότυπο παγετού με επιπρόσθετη σκιά"
+
 #
-#: plug-ins/script-fu/scripts/frosty-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:8
 #, fuzzy
 msgid "_Frosty..."
-msgstr "Εξερεύνηση..."
+msgstr "_Παγερό..."
 
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:2
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:1
+msgid "Add a jagged, fuzzy border to an image"
+msgstr "Προσθέσθε ένα πριονωτό, θολό περίγραμμα στην εικόνα"
+
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:2
 #, fuzzy
 msgid "Add shadow"
-msgstr "Σκιά:"
+msgstr "Προσθήκη σκιάς"
 
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:3
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:3
 #, fuzzy
 msgid "Blur border"
-msgstr "Πλαίσιο"
+msgstr "Θολό περίγραμμα"
 
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:7
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:4
+#: ../plug-ins/script-fu/scripts/old-photo.scm.h:1
+#, fuzzy
+msgid "Border size"
+msgstr "Μέγεθος άβακα"
+
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:7
 #, fuzzy
 msgid "Granularity (1 is Low)"
-msgstr "Ιανουάριος"
+msgstr "Κοκκώδη (1 είναι κατώτερο)"
 
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:9
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:9
 #, fuzzy, no-c-format
 msgid "Shadow weight (%)"
-msgstr "Εμφάνιση Λεπτομερειών"
+msgstr "Βάρος σκιάς (%)"
 
-#: plug-ins/script-fu/scripts/fuzzyborder.scm.h:11
+#: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:11
 msgid "_Fuzzy Border..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:1
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org"
-msgstr "Κονσόλα Script-Fu"
-
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:2
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:1
 #, fuzzy
 msgid "Autocrop"
-msgstr "Συγγραφέας"
+msgstr "Αυτοπερικοπή"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:3
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:2
+msgid "Create an image of a large header using the gimp.org webpage theme"
+msgstr ""
+"Δημιουργήστε μία εικόνα μεγάλης κεφαλίδας με τη χρήση του θέματος "
+"ιστοσελίδας gimp.org"
+
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:3
+msgid "Create an image of a small header using the gimp.org webpage theme"
+msgstr ""
+"Δημιουργήστε μία εικόνα μικρής κεφαλίδας με τη χρήση του θέματος ιστοσελίδας "
+"gimp.org"
+
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:4
 #, fuzzy
 msgid "Dark color"
-msgstr "Σκοτεινός φελλός"
+msgstr "Σκοτεινό χρώμα"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:6
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:9
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:7
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:9
 #, fuzzy
 msgid "Highlight color"
-msgstr "Χρώμα Μαρκαρίσματος"
+msgstr "Τονισμένο χρώμα"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:7
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:6
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:8
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:9
 #, fuzzy
 msgid "Index image"
 msgstr "Επόμενη Εικόνα"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:8
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:7
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:9
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:10
 #, fuzzy
 msgid "Number of colors"
 msgstr "Αριθμός Χρωμάτων"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:9
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:10
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:10
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:13
 #, fuzzy
 msgid "Remove background"
 msgstr "Αρχικοποίηση Παρασκηνίου"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:10
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:11
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:11
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:14
 #, fuzzy
 msgid "Select-by-color threshold"
 msgstr "Χαρακτήρες επιλογής ανά λέξη:"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:11
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:12
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:12
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:15
 #, fuzzy
 msgid "Shadow color"
-msgstr "Εμφάνιση Προχείρου"
+msgstr "Χρώμα σκιάς"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:14
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:15
 msgid "_Big Header..."
-msgstr ""
+msgstr "_Μεγάλη κεφαλίδα"
 
-#: plug-ins/script-fu/scripts/gimp-headers.scm.h:15
+#: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:16
 msgid "_Small Header..."
+msgstr "_Μικρή κεφαλίδα"
+
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:2
+msgid ""
+"Create an image of a Tube Button Label Header using the gimp.org webpage "
+"theme"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:13
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:3
+msgid "Create an image of a Tube Button Label using the gimp.org webpage theme"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:4
+msgid ""
+"Create an image of a second level Tube Button Label using the gimp.org "
+"webpage theme"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:5
+msgid ""
+"Create an image of a third level Tube Button Label using the gimp.org "
+"webpage theme"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:16
 msgid "T_ube Sub-Button Label..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:16
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:19
 msgid "Tub_e Sub-Sub-Button Label..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:17
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:20
 msgid "_General Tube Labels..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/gimp-labels.scm.h:18
+#: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:21
 msgid "_Tube Button Label..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:4
-#, fuzzy
-msgid "Blend gradient (Text)"
-msgstr "Θέμα Διαβάθμισης"
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:1
+msgid ""
+"Add gradients, patterns, shadows, and bump maps to the selected region (or "
+"alpha)"
+msgstr ""
+"Προσθήκη διαβαθμίσεων, υποδειγμάτων, σκιών και χαρτογράφηση ανώμαλων "
+"επιφανειών στην επιλεγμένη περιοχή (ή άλφα)"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:5
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:3
 #, fuzzy
 msgid "Blend gradient (outline)"
 msgstr "Θέμα Διαβάθμισης"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:6
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:4
 #, fuzzy
 msgid "Blend gradient (text)"
 msgstr "Θέμα Διαβάθμισης"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:10
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:5
+msgid "Create a logo with gradients, patterns, shadows, and bump maps"
+msgstr ""
+"Δημιουργήστε ένα λογότυπο με διαβαθμίσεις, υποδείγματα, σκιές και "
+"χαρτογραφήσεις ανώμαλων επιφανειών"
+
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:9
 msgid "Glo_ssy..."
 msgstr ""
 
 #
-#: plug-ins/script-fu/scripts/glossy.scm.h:11
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:10
 #, fuzzy
 msgid "Outline gradient reverse"
 msgstr "Μπλούγκρας"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:13
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:12
 #, fuzzy
 msgid "Pattern (outline)"
 msgstr "Δημιουργία Περιγράμματος Μπεζιέρ"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:14
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:13
 #, fuzzy
 msgid "Pattern (overlay)"
-msgstr "Γερμανικά (Γερμανία)"
+msgstr "Υπόδειγμα (επίσρτωμα)"
 
 # # NOTE: Translation of "Create" as "New" to
 # #       keep msg length relatively short...
-#: plug-ins/script-fu/scripts/glossy.scm.h:15
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:14
 #, fuzzy
 msgid "Pattern (text)"
-msgstr "Επικόλληση Κειμένου"
+msgstr "Υπόδειγμα (κείμενο)"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:16
-#: plug-ins/script-fu/scripts/sphere.scm.h:5
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:15
 #, fuzzy
 msgid "Shadow"
-msgstr "Σκιά:"
+msgstr "Σκιά"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:20
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:19
 #, fuzzy
 msgid "Text gradient reverse"
-msgstr "Βαθμίδα"
+msgstr "Αντίστρο διαβάθμιση κειμένου"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:21
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:20
 #, fuzzy
 msgid "Use pattern for outline instead of gradient"
 msgstr "Εμφάνιση γνωμικών αντί υποδείξεων"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:22
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:21
 #, fuzzy
 msgid "Use pattern for text instead of gradient"
 msgstr "Σελίδες για τα /query αντί ξεχωριστών παραθύρων"
 
-#: plug-ins/script-fu/scripts/glossy.scm.h:23
+#: ../plug-ins/script-fu/scripts/glossy.scm.h:22
 #, fuzzy
 msgid "Use pattern overlay"
-msgstr "Υπόδειγμα URL"
+msgstr "Χρήση υποδείγματος επίστρωσης"
 
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:4
-#, fuzzy
-msgid "Effect size (pixels * 3)"
-msgstr "Μέγεθος (εικονοστοιχεία)"
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:1
+msgid "Add a glowing hot metal effect to the selected region (or alpha)"
+msgstr ""
 
-#: plug-ins/script-fu/scripts/glowing-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:3
+msgid "Create a logo that looks like glowing hot metal"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:7
 msgid "Glo_wing Hot..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:4
-msgid "Bevel height (Sharpness)"
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:1
+msgid "Add a shiny look and bevel effect to the selected region (or alpha)"
 msgstr ""
+"Προσθέσθε μία λαμπερή εμφάνιση και ένα φίλτρο λοξότμησης στην επιλεγμένη "
+"περιοχή (ή άλφα)"
 
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:3
 msgid "Bevel height (sharpness)"
-msgstr ""
+msgstr "Ύψος λοξότμησης (ευκρίνεια)"
 
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:7
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:5
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:2
 #, fuzzy
 msgid "Border size (pixels)"
-msgstr "Μέγεθος (εικονοστοιχεία)"
+msgstr "Μέγεθος περιγράμματος (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:6
+msgid "Create a logo with a shiny look and beveled edges"
+msgstr "Δημιουργήστε ένα λογότυπο με λαμπερή εμφάνιση και λοξοτμημένες άκρες"
+
+#: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:9
 #, fuzzy
 msgid "Gradient Beve_l..."
 msgstr "Βαθμίδα"
 
-#: plug-ins/script-fu/scripts/gradient-example.scm.h:2
+#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:1
+msgid "Create an image filled with an example of the current gradient"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/gradient-example.scm.h:2
 #, fuzzy
 msgid "Custom _Gradient..."
 msgstr "Βαθμίδα"
 
-#: plug-ins/script-fu/scripts/grid-system.scm.h:2
+#: ../plug-ins/script-fu/scripts/grid-system.scm.h:1
+#: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:1
+msgid ""
+"Draw a grid as specified by the lists of X and Y locations using the current "
+"brush"
+msgstr ""
+"Σχεδιάστε ένα πλέγμα όπως καθορίζεται από τα X και Y με τη χρήση της ενεργής "
+"βούρτας"
+
+#: ../plug-ins/script-fu/scripts/grid-system.scm.h:2
 msgid "X divisions"
-msgstr ""
+msgstr "Χ υποδιαιρέσεις"
 
-#: plug-ins/script-fu/scripts/grid-system.scm.h:3
+#: ../plug-ins/script-fu/scripts/grid-system.scm.h:3
 msgid "Y divisions"
-msgstr ""
+msgstr "Υ υποδιαιρέσεις"
 
-#: plug-ins/script-fu/scripts/grid-system.scm.h:4
+#: ../plug-ins/script-fu/scripts/grid-system.scm.h:4
 msgid "_Grid..."
-msgstr ""
+msgstr "_Πλέγμα..."
 
-#: plug-ins/script-fu/scripts/guides-from-selection.scm.h:1
-msgid "Creates four Guides around the bounding box of the current selection."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/guides-from-selection.scm.h:2
+#: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:2
 msgid "New Guides from _Selection"
+msgstr "Νέοι οδηγοί από _Επιλογή"
+
+#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:1
+msgid "Add a guide at the position specified as a percentage of the image size"
 msgstr ""
+"Προσθέσθε ένα οδηγό στην καθορισμένη θέση ανάλογα με το μέγεθος της εικόνας"
 
 #
-#: plug-ins/script-fu/scripts/guides-new-percent.scm.h:1
-#: plug-ins/script-fu/scripts/guides-new.scm.h:1
+#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:2
+#: ../plug-ins/script-fu/scripts/guides-new.scm.h:2
 #, fuzzy
 msgid "Direction"
 msgstr "Περιγραφή"
 
-#: plug-ins/script-fu/scripts/guides-new-percent.scm.h:2
-#: plug-ins/script-fu/scripts/guides-new.scm.h:2
+#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:3
+#: ../plug-ins/script-fu/scripts/guides-new.scm.h:3
 #, fuzzy
 msgid "Horizontal"
 msgstr "_Οριζόντια"
 
-#: plug-ins/script-fu/scripts/guides-new-percent.scm.h:3
+#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:4
 msgid "New Guide (by _Percent)..."
-msgstr ""
+msgstr "Νέος οδηγός (_Αναλογία)"
 
-#: plug-ins/script-fu/scripts/guides-new-percent.scm.h:5
+#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:6
 #, no-c-format
 msgid "Position (in %)"
-msgstr ""
+msgstr "Θέση (σε %)"
 
-#: plug-ins/script-fu/scripts/guides-new-percent.scm.h:6
-#: plug-ins/script-fu/scripts/guides-new.scm.h:4
+#: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:7
+#: ../plug-ins/script-fu/scripts/guides-new.scm.h:6
 #, fuzzy
 msgid "Vertical"
 msgstr "Κατακόρυ_φα"
 
-#: plug-ins/script-fu/scripts/guides-new.scm.h:3
+#: ../plug-ins/script-fu/scripts/guides-new.scm.h:1
+msgid "Add a guide at the orientation and position specified (in pixels)"
+msgstr ""
+"Προσθέσθε ένα οδηγό στην καθορισμένη και προσανατολισμό (σε εικονοστοιχεία)"
+
+#: ../plug-ins/script-fu/scripts/guides-new.scm.h:4
 msgid "New _Guide..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/guides-remove-all.scm.h:1
+#: ../plug-ins/script-fu/scripts/guides-new.scm.h:5
+msgid "Position"
+msgstr "Θέση"
+
+#: ../plug-ins/script-fu/scripts/guides-remove-all.scm.h:1
+msgid "Remove all horizontal and vertical guides"
+msgstr "Διαγραφή όλων των οριζόντιων και κάθετων οδηγών"
+
+#: ../plug-ins/script-fu/scripts/guides-remove-all.scm.h:2
 msgid "_Remove all Guides"
 msgstr ""
 
-#
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:1
-#: plug-ins/script-fu/scripts/image-structure.scm.h:1
-#, fuzzy
-msgid "/Script-Fu/Utils"
-msgstr "Επιλογή Γραμματοσειράς"
-
-#
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:2
-#, fuzzy
-msgid "BG opacity"
-msgstr "Διαφάνεια:"
-
-#
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:3
-#, fuzzy
-msgid "Draw _HSV Graph..."
-msgstr "Επιλογή Γραμματοσειράς"
-
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:4
-#, fuzzy
-msgid "End X"
-msgstr "Τέλος"
-
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:5
-#, fuzzy
-msgid "End Y"
-msgstr "Τέλος"
-
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:6
-#, fuzzy
-msgid "From top-left to bottom-right"
-msgstr "Αριστερά προς δεξιά"
-
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:7
-#, fuzzy
-msgid "Graph scale"
-msgstr "Κλίμακα του γκρι"
-
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:8
-#, fuzzy
-msgid "Start X"
-msgstr "Εκκίνηση"
-
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:9
-#, fuzzy
-msgid "Start Y"
-msgstr "Εκκίνηση"
-
-#: plug-ins/script-fu/scripts/hsv-graph.scm.h:10
-msgid "Use selection bounds instead of belows"
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:1
+msgid "Create a logo in a two-color, scribbled text style"
 msgstr ""
+"Δημιουργήστε ένα λογότυπο σε δύο χρώματα και τεχντοτροπίας κείμενο "
+"ορνιθοσκαλίσματος"
 
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:4
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:4
 #, fuzzy
 msgid "Frame color"
-msgstr "Νέο Χρώμα"
+msgstr "Χρώμα πλαισίου"
 
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:5
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:5
 #, fuzzy
 msgid "Frame size"
-msgstr "Μέγεθος Αρχείου:"
+msgstr "Μέγεθος πλαισίου"
 
-#: plug-ins/script-fu/scripts/i26-gunya2.scm.h:6
-msgid "Imigre-26..."
+#: ../plug-ins/script-fu/scripts/i26-gunya2.scm.h:6
+msgid "Imigre-_26..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/image-structure.scm.h:2
-msgid "Apply layer mask (or discard)"
+#: ../plug-ins/script-fu/scripts/land.scm.h:1
+msgid "Create an image filled with a topographic map pattern"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/image-structure.scm.h:4
-#, fuzzy
-msgid "Create new image"
-msgstr "Νέα Εικόνα"
-
-#: plug-ins/script-fu/scripts/image-structure.scm.h:5
-#, fuzzy
-msgid "Insert layer names"
-msgstr "Ονόματα Παικτών"
-
-#: plug-ins/script-fu/scripts/image-structure.scm.h:6
-#, fuzzy
-msgid "Make new background"
-msgstr "Αρχικοποίηση Παρασκηνίου"
-
-#: plug-ins/script-fu/scripts/image-structure.scm.h:7
-#, fuzzy
-msgid "Outer border"
-msgstr "Πλαίσιο"
-
-#: plug-ins/script-fu/scripts/image-structure.scm.h:8
-#, fuzzy
-msgid "Pad color"
-msgstr "Προσθήκη Χρώματος"
-
-#
-#: plug-ins/script-fu/scripts/image-structure.scm.h:9
-#, fuzzy
-msgid "Pad opacity"
-msgstr "Διαφάνεια:"
-
-#: plug-ins/script-fu/scripts/image-structure.scm.h:10
-msgid "Padding for transparent regions"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/image-structure.scm.h:11
-#, fuzzy
-msgid "Shear length"
-msgstr "Γωνία στρέβλωσης:"
-
-#
-#: plug-ins/script-fu/scripts/image-structure.scm.h:12
-#, fuzzy
-msgid "Show Image _Structure..."
-msgstr "Επιλογή Γραμματοσειράς"
-
-#: plug-ins/script-fu/scripts/image-structure.scm.h:13
-#, fuzzy
-msgid "Space between layers"
-msgstr "Διάχυση μεταξύ γραμμών"
-
-#: plug-ins/script-fu/scripts/land.scm.h:6
+#: ../plug-ins/script-fu/scripts/land.scm.h:6
 #, fuzzy
 msgid "Land height"
 msgstr "Κα_νονικό Ύψος"
 
-#: plug-ins/script-fu/scripts/land.scm.h:10
+#: ../plug-ins/script-fu/scripts/land.scm.h:10
 #, fuzzy
 msgid "Sea depth"
 msgstr "πραγματική διαδρομή"
 
-#: plug-ins/script-fu/scripts/land.scm.h:11
+#: ../plug-ins/script-fu/scripts/land.scm.h:11
 msgid "_Land..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/lava.scm.h:4
-#: plug-ins/script-fu/scripts/swirltile.scm.h:8
+#: ../plug-ins/script-fu/scripts/lava.scm.h:1
+msgid "Fill the current selection with lava"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/lava.scm.h:4
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:8
 #, fuzzy
 msgid "Roughness"
 msgstr "Σκληρό Χαρτί"
 
-#: plug-ins/script-fu/scripts/lava.scm.h:5
+#: ../plug-ins/script-fu/scripts/lava.scm.h:5
 msgid "Seed"
 msgstr "Σπόρος"
 
-#: plug-ins/script-fu/scripts/lava.scm.h:8
+#: ../plug-ins/script-fu/scripts/lava.scm.h:8
 #, fuzzy
 msgid "Use current gradient"
-msgstr "Χρήση τρέχοντος"
+msgstr "Χρήση τρέχουσας διαβάθμισης"
 
-#: plug-ins/script-fu/scripts/lava.scm.h:9
+#: ../plug-ins/script-fu/scripts/lava.scm.h:9
 msgid "_Lava..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/line-nova.scm.h:2
+#: ../plug-ins/script-fu/scripts/line-nova.scm.h:1
+msgid ""
+"Fill a layer with rays emanating outward from its center using the FG color"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/line-nova.scm.h:2
 msgid "Line _Nova..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/line-nova.scm.h:3
+#: ../plug-ins/script-fu/scripts/line-nova.scm.h:3
 #, fuzzy
 msgid "Number of lines"
-msgstr "Αριθμός ναρκών"
+msgstr "Αριθμός γραμμών"
 
-#: plug-ins/script-fu/scripts/line-nova.scm.h:4
+#: ../plug-ins/script-fu/scripts/line-nova.scm.h:4
 #, fuzzy
 msgid "Offset radius"
 msgstr "Μετατόπιση: %s"
 
-#: plug-ins/script-fu/scripts/line-nova.scm.h:5
+#: ../plug-ins/script-fu/scripts/line-nova.scm.h:5
 #, fuzzy
 msgid "Randomness"
 msgstr "Τυχαίο"
 
-#: plug-ins/script-fu/scripts/line-nova.scm.h:6
+#: ../plug-ins/script-fu/scripts/line-nova.scm.h:6
 #, fuzzy
 msgid "Sharpness (degrees)"
 msgstr "ανοιχτό πράσινο"
 
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Make Brush"
-msgstr "Κονσόλα Script-Fu"
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:1
+msgid "Create a rectangular brush"
+msgstr ""
 
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:2
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:2
+msgid "Create a rectangular brush with feathered edges"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:3
+msgid "Create an elliptical brush"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:4
+msgid "Create an elliptical brush with feathered edges"
+msgstr "Δημιουργήστε μία ελλειπτική βούρτσα με φτερωτές άκρες"
+
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:5
 msgid "Elli_ptical, Feathered..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:3
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:6
 #, fuzzy
 msgid "Feathering"
 msgstr "Μακρύτερα"
 
 #
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:5
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:8
 #, fuzzy
 msgid "Name"
 msgstr "Όνομα:"
 
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:6
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:9
 msgid "Re_ctangular, Feathered..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:7
-#: plug-ins/script-fu/scripts/select-to-brush.scm.h:4
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:10
+#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:5
+#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:4
 msgid "Spacing"
 msgstr "Διαστήματα"
 
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:9
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:12
 msgid "_Elliptical..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/mkbrush.scm.h:10
+#: ../plug-ins/script-fu/scripts/mkbrush.scm.h:13
 msgid "_Rectangular..."
 msgstr ""
 
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:2
+msgid "Convert the selected region (or alpha) into a neon-sign like object"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:3
+msgid "Create a logo in the style of a neon sign"
+msgstr ""
+
 #
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:4
 #, fuzzy
 msgid "Create shadow"
-msgstr "Δημιουργία βέλους"
+msgstr "Δημιουργήστε σκιά"
 
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:5
-#, fuzzy
-msgid "Effect size (pixels * 5)"
-msgstr "Μέγεθος (εικονοστοιχεία)"
-
-#: plug-ins/script-fu/scripts/neon-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:9
 msgid "N_eon..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/news-text.scm.h:4
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:3
 #, fuzzy
 msgid "Cell size (pixels)"
 msgstr "Μέγεθος (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/news-text.scm.h:6
-#: plug-ins/script-fu/scripts/speed-text.scm.h:4
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:4
+msgid "Create a logo in the style of newspaper printing"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:6
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:4
 #, fuzzy, no-c-format
 msgid "Density (%)"
 msgstr "Πυκνότητα"
 
-#: plug-ins/script-fu/scripts/news-text.scm.h:9
-msgid "Newsprint Text..."
+#: ../plug-ins/script-fu/scripts/news-text.scm.h:9
+msgid "Newsprint Te_xt..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/old-photo.scm.h:3
+#: ../plug-ins/script-fu/scripts/old-photo.scm.h:2
 #, fuzzy
 msgid "Defocus"
 msgstr "Εξ' ορισμού ρυθμίσεις"
 
-#: plug-ins/script-fu/scripts/old-photo.scm.h:4
+#: ../plug-ins/script-fu/scripts/old-photo.scm.h:3
+msgid "Make an image look like an old photo"
+msgstr "ΦΤιάξτε μία εικόνα να μοιάζει σαν παλιά φωτογραφία"
+
+#: ../plug-ins/script-fu/scripts/old-photo.scm.h:4
 #, fuzzy
 msgid "Mottle"
-msgstr "Μαγιότ"
+msgstr "Κηλίδα"
 
-#: plug-ins/script-fu/scripts/old-photo.scm.h:5
+#: ../plug-ins/script-fu/scripts/old-photo.scm.h:5
 #, fuzzy
 msgid "Sepia"
 msgstr "Σειριακό"
 
-#: plug-ins/script-fu/scripts/old-photo.scm.h:7
+#: ../plug-ins/script-fu/scripts/old-photo.scm.h:7
 msgid "_Old Photo..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:3
-#, fuzzy
-msgid "Angle"
-msgstr "_Γωνία"
-
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:6
-msgid "Cubic"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:7
-#, fuzzy
-msgid "Interpolation"
-msgstr "Παρεμβολή"
-
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:8
-msgid "Linear"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:9
-msgid "None"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:11
-msgid "Relative distance of horizon"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:12
-msgid "Relative length of shadow"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/perspective-shadow.scm.h:13
-msgid "_Perspective..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/predator.scm.h:2
-#, fuzzy
-msgid "Edge amount"
-msgstr "Νέος Λογαριασμός"
-
-#: plug-ins/script-fu/scripts/predator.scm.h:4
-#, fuzzy
-msgid "Pixel amount"
-msgstr "Αριθμός Γραμμών"
-
-#
-#: plug-ins/script-fu/scripts/predator.scm.h:5
-#, fuzzy
-msgid "Pixelize"
-msgstr "Μέγεθος σε Εικ/χεία:"
-
-#: plug-ins/script-fu/scripts/predator.scm.h:7
-msgid "_Predator..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:5
-#, fuzzy
-msgid "Lower color"
-msgstr "Χρώμα αδύναμης μπαταρίας:"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:6
-#, fuzzy
-msgid "Lower color (active)"
-msgstr "Χαμήλωμα σημειώματος"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:7
-#, fuzzy
-msgid "Not pressed"
-msgstr "Δεν έχει ξεκινήσει"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:8
-#, fuzzy
-msgid "Not pressed (active)"
-msgstr "Δεν έχει ξεκινήσει"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:9
-#, fuzzy
-msgid "Padding X"
-msgstr "Σκίαση"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:10
-#, fuzzy
-msgid "Padding Y"
-msgstr "Σκίαση"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:12
-#, fuzzy
-msgid "Round ratio"
-msgstr "Επιλογές ήχου"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:15
-#, fuzzy
-msgid "Text color (active)"
-msgstr "Χρώμα Κειμένου"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:16
-#, fuzzy
-msgid "Upper color"
-msgstr "Χρώματα Χρήστη"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:17
-#, fuzzy
-msgid "Upper color (active)"
-msgstr "Χαμήλωμα σημειώματος"
-
-#: plug-ins/script-fu/scripts/pupi-button.scm.h:18
-msgid "_Round Button..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/rendermap.scm.h:2
-msgid "Behaviour"
-msgstr "Συμπεριφορά"
-
-#
-#: plug-ins/script-fu/scripts/rendermap.scm.h:3
-#, fuzzy
-msgid "Detail in Middle"
-msgstr "Διάλογος λεπτομερειών"
-
-#: plug-ins/script-fu/scripts/rendermap.scm.h:8
-msgid "Render _Map..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/rendermap.scm.h:9
-msgid "Tile"
-msgstr "Παράθεση"
-
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:2
-msgid "Black"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:3
-#, fuzzy
-msgid "Edge behaviour"
-msgstr "Συμπεριφορά"
-
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:4
-#: plug-ins/script-fu/scripts/waves-anim.scm.h:4
-#, fuzzy
-msgid "Number of frames"
-msgstr "Αριθμός Σελίδων"
-
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:5
-msgid "Rippling strength"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:6
-#, fuzzy
-msgid "Smear"
-msgstr "Αναζήτηση: "
-
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:7
-msgid "Wrap"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/ripply-anim.scm.h:8
-msgid "_Rippling..."
-msgstr ""
-
-#
-#: plug-ins/script-fu/scripts/round-corners.scm.h:2
-#, fuzzy
-msgid "Add background"
-msgstr "Φόντο"
-
-#: plug-ins/script-fu/scripts/round-corners.scm.h:3
-#, fuzzy
-msgid "Add drop-shadow"
-msgstr "Σκιά:"
-
-#: plug-ins/script-fu/scripts/round-corners.scm.h:5
-#, fuzzy
-msgid "Edge radius"
-msgstr "Ράδιο"
-
-#: plug-ins/script-fu/scripts/round-corners.scm.h:9
-msgid "_Round Corners..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/select-to-brush.scm.h:2
+#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:1
+#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:1
 #, fuzzy
 msgid "Brush name"
-msgstr "Χρήστες"
+msgstr "Όηνομα βούρτσας"
 
 #
-#: plug-ins/script-fu/scripts/select-to-brush.scm.h:3
+#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:2
+#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:1
+#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:3
+#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:2
 #, fuzzy
 msgid "File name"
 msgstr "Όνομα αρχείου"
 
 #
-#: plug-ins/script-fu/scripts/select-to-brush.scm.h:5
+#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:3
+#, fuzzy
+msgid "New _Brush..."
+msgstr "Εξερεύνηση..."
+
+#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:4
+msgid "Paste the clipboard contents into a new brush"
+msgstr "Επικολλήστε τα περιεχόμενα του πρόχειρου σε νέα βούρτσα"
+
+#: ../plug-ins/script-fu/scripts/paste-as-brush.scm.h:6
+#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:5
+msgid "There is no image data in the clipboard to paste."
+msgstr "Δεν υπάρχουν στοιχεία εικόνας στο πρόχειρο για επικόλληση. "
+
+#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:2
+#, fuzzy
+msgid "New _Pattern..."
+msgstr "Σχέδιο"
+
+#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:3
+msgid "Paste the clipboard contents into a new pattern"
+msgstr "Επικολλλήστε τα περιεχόμενα του πρόχειρου σε νέο υπόδειγμα"
+
+#: ../plug-ins/script-fu/scripts/paste-as-pattern.scm.h:4
+#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:3
+#, fuzzy
+msgid "Pattern name"
+msgstr "Όνομα υποδείγματος"
+
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:1
+msgid "Add a perspective shadow to the selected region (or alpha)"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:3
+#, fuzzy
+msgid "Angle"
+msgstr "_Γωνία"
+
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:6
+#, fuzzy
+msgid "Interpolation"
+msgstr "Παρεμβολή"
+
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:8
+msgid "Relative distance of horizon"
+msgstr "Σχτετική απόσταση του ορίζοντα"
+
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:9
+msgid "Relative length of shadow"
+msgstr "Σχετικό μήκος της σκιάς"
+
+#: ../plug-ins/script-fu/scripts/perspective-shadow.scm.h:10
+msgid "_Perspective..."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/predator.scm.h:1
+msgid "Add a 'Predator' effect to the selected region (or alpha)"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/predator.scm.h:2
+#, fuzzy
+msgid "Edge amount"
+msgstr "Νέος Λογαριασμός"
+
+#: ../plug-ins/script-fu/scripts/predator.scm.h:4
+#, fuzzy
+msgid "Pixel amount"
+msgstr "Αριθμός Γραμμών"
+
+#
+#: ../plug-ins/script-fu/scripts/predator.scm.h:5
+#, fuzzy
+msgid "Pixelize"
+msgstr "Εικονοστοιχειοποίηση:"
+
+#: ../plug-ins/script-fu/scripts/predator.scm.h:7
+msgid "_Predator..."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:2
+msgid "Create images, each containing an oval button graphic"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:5
+#, fuzzy
+msgid "Lower color"
+msgstr "Χρώμα αδύναμης μπαταρίας:"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:6
+#, fuzzy
+msgid "Lower color (active)"
+msgstr "Χαμήλωμα σημειώματος"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:7
+#, fuzzy
+msgid "Not pressed"
+msgstr "Δεν έχει ξεκινήσει"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:8
+#, fuzzy
+msgid "Not pressed (active)"
+msgstr "Δεν έχει ξεκινήσει"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:9
+#, fuzzy
+msgid "Padding X"
+msgstr "Σκίαση"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:10
+#, fuzzy
+msgid "Padding Y"
+msgstr "Σκίαση"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:12
+#, fuzzy
+msgid "Round ratio"
+msgstr "Επιλογές ήχου"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:15
+#, fuzzy
+msgid "Text color (active)"
+msgstr "Χρώμα Κειμένου"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:16
+#, fuzzy
+msgid "Upper color"
+msgstr "Χρώματα Χρήστη"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:17
+#, fuzzy
+msgid "Upper color (active)"
+msgstr "Χαμήλωμα σημειώματος"
+
+#: ../plug-ins/script-fu/scripts/pupi-button.scm.h:18
+msgid "_Round Button..."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:1
+#, fuzzy
+msgid "Behavior"
+msgstr "Συμπεριφορά"
+
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:2
+msgid "Create an image filled with an Earth-like map pattern"
+msgstr ""
+
+#
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:3
+#, fuzzy
+msgid "Detail in Middle"
+msgstr "Διάλογος λεπτομερειών"
+
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:8
+msgid "Render _Map..."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/rendermap.scm.h:9
+msgid "Tile"
+msgstr "Παράθεση"
+
+#: ../plug-ins/script-fu/scripts/reverse-layers.scm.h:1
+msgid "Reverse Layer Order"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/reverse-layers.scm.h:2
+msgid "Reverse the order of layers in the image"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:1
+msgid "Black"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:2
+msgid ""
+"Create a multi-layer image by adding a ripple effect to the current image"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:3
+#, fuzzy
+msgid "Edge behavior"
+msgstr "Συμπεριφορά"
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:4
+#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:4
+#, fuzzy
+msgid "Number of frames"
+msgstr "Αριθμός Σελίδων"
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:5
+msgid "Rippling strength"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:6
+#, fuzzy
+msgid "Smear"
+msgstr "Επάλειψη"
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:7
+msgid "Wrap"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:8
+msgid "_Rippling..."
+msgstr ""
+
+#
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:1
+#, fuzzy
+msgid "Add background"
+msgstr "Προσθήκη παρασκηνίου"
+
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:2
+#, fuzzy
+msgid "Add drop-shadow"
+msgstr "Προσθήκη σκιάς"
+
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:4
+#, fuzzy
+msgid "Edge radius"
+msgstr "Ράδιο"
+
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:5
+msgid ""
+"Round the corners of an image and optionally add a drop-shadow and background"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/round-corners.scm.h:9
+msgid "_Round Corners..."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:1
+msgid "Change the colormap of an image to the colors in a specified palette."
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:2
+#, fuzzy
+msgid "Palette"
+msgstr "Πυξίο"
+
+#: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:3
+#, fuzzy
+msgid "Se_t Colormap..."
+msgstr "Χρώμα Κειμένου"
+
+#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:2
+msgid "Convert a selection to a brush"
+msgstr "Μετατροπή επιλογής σε βούρτσα"
+
+#
+#: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:5
 #, fuzzy
 msgid "To _Brush..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/scripts/select-to-image.scm.h:2
+#: ../plug-ins/script-fu/scripts/select-to-image.scm.h:1
+msgid "Convert a selection to an image"
+msgstr "Μετατροπή επιλογής σε εικόνα"
+
+#: ../plug-ins/script-fu/scripts/select-to-image.scm.h:2
 msgid "To _Image"
 msgstr ""
 
-#
-#: plug-ins/script-fu/scripts/select-to-pattern.scm.h:2
-msgid "Filename"
-msgstr "Όνομα αρχείου"
+#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:1
+msgid "Convert a selection to a pattern"
+msgstr "Μετατροπή επιλογής σε υπόδειγμα"
 
-#: plug-ins/script-fu/scripts/select-to-pattern.scm.h:3
-#, fuzzy
-msgid "Pattern name"
-msgstr "Σχέδιο"
-
-#: plug-ins/script-fu/scripts/select-to-pattern.scm.h:4
+#: ../plug-ins/script-fu/scripts/select-to-pattern.scm.h:4
 #, fuzzy
 msgid "To _Pattern..."
 msgstr "Σχέδιο"
 
 #
-#: plug-ins/script-fu/scripts/selection-round.scm.h:1
+#: ../plug-ins/script-fu/scripts/selection-round.scm.h:1
 #, fuzzy
 msgid "Concave"
-msgstr "Ακύρωση"
+msgstr "Κοίλος"
 
-#: plug-ins/script-fu/scripts/selection-round.scm.h:3
+#: ../plug-ins/script-fu/scripts/selection-round.scm.h:3
 #, fuzzy, no-c-format
 msgid "Radius (%)"
 msgstr "Ράδιο"
 
+#: ../plug-ins/script-fu/scripts/selection-round.scm.h:4
+msgid "Round the corners of the current selection"
+msgstr "Στρογγυλοποίηση γωνιών της τρέχουσας επιλογής"
+
 #
-#: plug-ins/script-fu/scripts/selection-round.scm.h:4
+#: ../plug-ins/script-fu/scripts/selection-round.scm.h:5
 #, fuzzy
 msgid "Rounded R_ectangle..."
 msgstr "Επιλογή Γραμματοσειράς"
 
-#: plug-ins/script-fu/scripts/slide.scm.h:3
+#: ../plug-ins/script-fu/scripts/slide.scm.h:1
+msgid "Add a slide-film like frame, sprocket holes, and labels to an image"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/slide.scm.h:3
 #, fuzzy
 msgid "Font color"
 msgstr "Χρώμα γραμματοσειράς:"
 
-#: plug-ins/script-fu/scripts/slide.scm.h:4
+#: ../plug-ins/script-fu/scripts/slide.scm.h:4
 msgid "Number"
 msgstr "Αριθμός"
 
-#: plug-ins/script-fu/scripts/slide.scm.h:7
+#: ../plug-ins/script-fu/scripts/slide.scm.h:7
 msgid "_Slide..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:5
+msgid "Create a State Of The Art chromed logo"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:10
 msgid "SOTA Chrome..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/speed-text.scm.h:7
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:2
+msgid "Create a logo with a speedy text effect"
+msgstr "Δημιουργήστε λογότυπου με τη χρήση γρήγορου κειμένου"
+
+#: ../plug-ins/script-fu/scripts/speed-text.scm.h:7
 msgid "Speed Text..."
+msgstr "Γρήγορο κείμενο..."
+
+#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:1
+msgid "Create an animation by mapping the current image onto a spinning sphere"
 msgstr ""
+"Δημουργία σχεδιοκίνησης χαρτογραφόντας την τρέχουσα εικόνα σε μία "
+"στροβιλίζουσα σφαίρα"
 
-#: plug-ins/script-fu/scripts/sphere.scm.h:1
-#, fuzzy
-msgid "/Xtns/Script-Fu/Misc"
-msgstr "Κονσόλα Script-Fu"
-
-#: plug-ins/script-fu/scripts/sphere.scm.h:3
-#, fuzzy
-msgid "Lighting (degrees)"
-msgstr "ανοιχτό πράσινο"
-
-#: plug-ins/script-fu/scripts/sphere.scm.h:4
-#, fuzzy
-msgid "Radius (pixels)"
-msgstr "Γελοίο (128 εικονοστοιχεία)"
-
-#
-#: plug-ins/script-fu/scripts/sphere.scm.h:6
-#, fuzzy
-msgid "Sphere color"
-msgstr "Επιλέξτε Χρώμα"
-
-#
-#: plug-ins/script-fu/scripts/sphere.scm.h:7
-#, fuzzy
-msgid "_Sphere..."
-msgstr "Εξερεύνηση..."
-
-#: plug-ins/script-fu/scripts/spinning-globe.scm.h:2
+#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:2
 msgid "Frames"
 msgstr "Πλαίσια"
 
-#: plug-ins/script-fu/scripts/spinning-globe.scm.h:3
+#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:3
 msgid "Index to n colors (0 = remain RGB)"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spinning-globe.scm.h:5
+#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:5
 #, fuzzy
 msgid "Turn from left to right"
 msgstr "Αριστερά προς δεξιά"
 
-#: plug-ins/script-fu/scripts/spinning-globe.scm.h:7
+#: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:7
 msgid "_Spinning Globe..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:2
-msgid "Airbrush"
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:1
+msgid ""
+"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:3
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:2
+msgid "Airbrush"
+msgstr "Αερόβουρτσα"
+
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:3
 #, fuzzy
 msgid "Brush"
-msgstr "Χρήστες"
+msgstr "Βούρτσα"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:4
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:4
 #, fuzzy
 msgid "Circle"
-msgstr "Παράθεση"
+msgstr "Κύκλος"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:6
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:6
 #, fuzzy
 msgid "Color method"
 msgstr "Χρώμα 1"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:7
-msgid ""
-"Draws Spirographs, Epitrochoids and Lissajous Curves. More info at http://"
-"netword.com/*spyrogimp"
-msgstr ""
-
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:8
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:7
 msgid "Epitrochoid"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:9
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:8
 #, fuzzy
 msgid "Frame"
 msgstr "Πλαίσια"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:11
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:10
 msgid "Gradient: Loop Sawtooth"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:12
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:11
 msgid "Gradient: Loop Triangle"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:13
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:12
 #, fuzzy
 msgid "Hexagon"
-msgstr "Περιοχές"
+msgstr "Εξάγωνο"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:14
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:13
 #, fuzzy
 msgid "Hole ratio"
 msgstr "Ημερομηνία Λήξης"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:15
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:14
 #, fuzzy
 msgid "Inner teeth"
 msgstr "Πλαίσιο"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:16
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:15
 msgid "Lissajous"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:17
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:16
 #, fuzzy
 msgid "Margin (pixels)"
-msgstr "Γελοίο (128 εικονοστοιχεία)"
+msgstr "Περιθώριο (εικονοστοιχεία)"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:18
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:17
 #, fuzzy
 msgid "Outer teeth"
 msgstr "Πλαίσιο"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:19
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:18
 msgid "Pencil"
-msgstr ""
+msgstr "Μολύβι"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:20
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:19
 #, fuzzy
 msgid "Pentagon"
-msgstr "Προσανατολισμός"
+msgstr "Πεντάγωνο"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:21
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:20
 msgid "Polygon: 10 sides"
-msgstr ""
+msgstr "Πολύγωνο: 10 πλευρές"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:22
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:21
 msgid "Polygon: 7 sides"
-msgstr ""
+msgstr "Πολύγωνο: 7 πλευρές"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:23
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:22
 msgid "Polygon: 8 sides"
-msgstr ""
+msgstr "Πολύγωνο: 8 πλευρές"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:24
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:23
 msgid "Polygon: 9 sides"
+msgstr "Πολύγωνο:΅9 πλευρές"
+
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:24
+msgid "Rendering Spyro"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:25
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:25
 msgid "Shape"
-msgstr ""
+msgstr "Σχήμα"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:26
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:26
 #, fuzzy
 msgid "Solid Color"
-msgstr "Προσθήκη Χρώματος"
+msgstr "Στερεό χρώμα"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:27
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:27
 msgid "Spyrograph"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:28
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:28
 #, fuzzy
 msgid "Square"
 msgstr "Τετράγωνο"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:29
-#: plug-ins/script-fu/scripts/text-circle.scm.h:7
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:29
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:7
 #, fuzzy
 msgid "Start angle"
-msgstr "Εκκινείται"
+msgstr "Γωνία εκκίνησης"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:30
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:30
 msgid "Tool"
-msgstr ""
+msgstr "Εργαλείο"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:31
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:31
 #, fuzzy
 msgid "Triangle"
-msgstr "Παράθεση"
+msgstr "Τρίγωνο"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:32
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:32
 #, fuzzy
 msgid "Type"
-msgstr "Μπλε Τύπος"
+msgstr "Τύπος"
 
-#: plug-ins/script-fu/scripts/spyrogimp.scm.h:33
+#: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:33
 msgid "_Spyrogimp..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:4
-#, fuzzy
-msgid "Burst color"
-msgstr "Ειδικό Χρώμα:"
-
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:5
-#, fuzzy
-msgid "Effect size (pixels * 30)"
-msgstr "Μέγεθος (εικονοστοιχεία)"
-
-#: plug-ins/script-fu/scripts/starburst-logo.scm.h:8
-msgid "Starb_urst..."
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:1
+msgid "Create a logo using a rock-like texture, a nova glow, and shadow"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:3
-#, fuzzy
-msgid "Effect size (pixels * 4)"
-msgstr "Μέγεθος (εικονοστοιχεία)"
-
 #
-#: plug-ins/script-fu/scripts/starscape-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:5
 #, fuzzy
 msgid "Sta_rscape..."
 msgstr "Εξερεύνηση..."
 
-#: plug-ins/script-fu/scripts/swirltile.scm.h:9
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:4
+msgid "Create an image filled with a swirled tile effect"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:9
 msgid "Swirl-_Tile..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/swirltile.scm.h:10
+#: ../plug-ins/script-fu/scripts/swirltile.scm.h:10
 #, fuzzy
 msgid "Whirl amount"
-msgstr "Αριθμός Λέξεων"
+msgstr "ΑΠοσό στρεβλώσεων"
 
-#: plug-ins/script-fu/scripts/swirly-pattern.scm.h:2
+#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:1
+msgid "Create an image filled with a swirly pattern"
+msgstr "Δημιουργήστε μία εικόνα γεμισμένη με τη χρήση υποδείγματος στρέβλωσης"
+
+#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:2
 #, fuzzy
 msgid "Number of times to whirl"
-msgstr "Αριθμός εικονοστοιχείων προς χρήση."
+msgstr "Αριθμός περιόδων προς στρέβλωση."
 
-#: plug-ins/script-fu/scripts/swirly-pattern.scm.h:3
+#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:3
 #, fuzzy
 msgid "Quarter size"
 msgstr "Μέγεθος Σ&ελίδας:"
 
-#: plug-ins/script-fu/scripts/swirly-pattern.scm.h:4
+#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:4
 #, fuzzy
 msgid "Whirl angle"
 msgstr "Γωνία στρέβλωσης:"
 
-#: plug-ins/script-fu/scripts/swirly-pattern.scm.h:5
+#: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:5
 msgid "_Swirly..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:1
+msgid "Add a Trace of Particles effect to the selected region (or alpha)"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:3
 #, fuzzy
 msgid "Base color"
 msgstr "Χρώμα βάσης"
 
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:5
+msgid "Create a logo using a Trace Of Particles effect"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:6
 #, fuzzy
 msgid "Edge only"
 msgstr "Ακραίο ταμπλώ"
 
 #
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:7
 #, fuzzy
 msgid "Edge width"
 msgstr "Καθορισμός Πλάτους:"
 
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:10
 #, fuzzy
 msgid "Hit rate"
 msgstr "Ρυθμός bit"
 
-#: plug-ins/script-fu/scripts/t-o-p-logo.scm.h:12
+#: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:12
 msgid "_Particle Trace..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/text-circle.scm.h:2
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:1
 msgid "Antialias"
 msgstr "Εξομάλυνση"
 
-#: plug-ins/script-fu/scripts/text-circle.scm.h:3
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
+msgid ""
+"Create a logo by rendering the specified text along the perimeter of a circle"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:3
 #, fuzzy
 msgid "Fill angle"
 msgstr "Γεμισμένο Τρίγωνο"
 
-#: plug-ins/script-fu/scripts/text-circle.scm.h:9
+#: ../plug-ins/script-fu/scripts/text-circle.scm.h:9
 #, fuzzy
-msgid "Text Circle..."
+msgid "Text C_ircle..."
 msgstr "Παράθεση"
 
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:3
+msgid ""
+"Create a textured logo with highlights, shadows, and a mosaic background"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:4
 #, fuzzy
 msgid "Ending blend"
 msgstr "Ημ/νία λήξης"
 
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:5
+msgid ""
+"Fill the selected region (or alpha) with a texture and add highlights, "
+"shadows, and a mosaic background"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:8
 #, fuzzy
 msgid "Hexagons"
-msgstr "Περιοχές"
+msgstr "Εξάγωνα"
 
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:9
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:9
 #, fuzzy
 msgid "Mosaic tile type"
 msgstr "Είδος MIME"
 
 #
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:10
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:10
 #, fuzzy
 msgid "Octagons"
-msgstr "Επιλογές"
+msgstr "Οκτάγωνα"
 
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:12
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:12
 #, fuzzy
 msgid "Squares"
-msgstr "Τετράγωνο"
+msgstr "Τετράγωνα"
 
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:13
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:13
 #, fuzzy
 msgid "Starting blend"
 msgstr "Αρχικό επίπεδο: "
 
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:15
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:15
 #, fuzzy
 msgid "Text pattern"
-msgstr "Σχέδιο"
+msgstr "Υπόδειγμα κειμένου"
 
-#: plug-ins/script-fu/scripts/textured-logo.scm.h:16
+#: ../plug-ins/script-fu/scripts/textured-logo.scm.h:16
 msgid "_Textured..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/tileblur.scm.h:1
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:1
 #, fuzzy
 msgid "Blur horizontally"
 msgstr "_Οριζόντια"
 
-#: plug-ins/script-fu/scripts/tileblur.scm.h:2
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:2
+msgid "Blur the edges of an image so the result tiles seamlessly"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:3
 #, fuzzy
 msgid "Blur type"
-msgstr "Μπλε Τύπος"
+msgstr "Τύπος θόλωσης"
 
-#: plug-ins/script-fu/scripts/tileblur.scm.h:3
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:4
 #, fuzzy
 msgid "Blur vertically"
 msgstr "Κατακόρυ_φα"
 
-#: plug-ins/script-fu/scripts/tileblur.scm.h:4
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:5
 #, fuzzy
 msgid "IIR"
 msgstr "ΙΙ"
 
-#: plug-ins/script-fu/scripts/tileblur.scm.h:5
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:6
 #, fuzzy
 msgid "RLE"
 msgstr "RE:"
 
-#: plug-ins/script-fu/scripts/tileblur.scm.h:7
+#: ../plug-ins/script-fu/scripts/tileblur.scm.h:8
 #, fuzzy
 msgid "_Tileable Blur..."
 msgstr "/Φίλτρα/Κείμενο/FreeType..."
 
-#: plug-ins/script-fu/scripts/title-header.scm.h:6
+#: ../plug-ins/script-fu/scripts/title-header.scm.h:1
+msgid "Create a decorative web title header"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/title-header.scm.h:6
 msgid "Web Title Header..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/truchet.scm.h:4
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:3
+msgid "Create an image filled with a Truchet pattern"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:4
 #, fuzzy
 msgid "Foreground color"
 msgstr "Χρώμα Προσκηνίου"
 
-#: plug-ins/script-fu/scripts/truchet.scm.h:7
+#: ../plug-ins/script-fu/scripts/truchet.scm.h:7
 msgid "T_ruchet..."
 msgstr ""
 
 #
-#: plug-ins/script-fu/scripts/unsharp-mask.scm.h:2
+#: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:1
 #, fuzzy
 msgid "Mask opacity"
 msgstr "Διαφάνεια:"
 
-#: plug-ins/script-fu/scripts/unsharp-mask.scm.h:3
+#: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:2
 #, fuzzy
 msgid "Mask size"
 msgstr "Μεγέθος Τετραγωνιδίων"
 
-#: plug-ins/script-fu/scripts/unsharp-mask.scm.h:4
-msgid "_Unsharp Mask..."
-msgstr ""
-
-#: plug-ins/script-fu/scripts/waves-anim.scm.h:2
+#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:1
 msgid "Amplitude"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/waves-anim.scm.h:3
+#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:2
+msgid ""
+"Create a multi-layer image with an effect like a stone was thrown into the "
+"current image"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:3
 #, fuzzy
 msgid "Invert direction"
 msgstr "Αντιστροφή Επιλογής"
 
-#: plug-ins/script-fu/scripts/waves-anim.scm.h:5
+#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:5
 #, fuzzy
 msgid "Wavelength"
-msgstr "ενδέκατο"
+msgstr "Μήκος κύματος"
 
-#: plug-ins/script-fu/scripts/waves-anim.scm.h:6
+#: ../plug-ins/script-fu/scripts/waves-anim.scm.h:6
 msgid "_Waves..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/weave.scm.h:2
+#: ../plug-ins/script-fu/scripts/weave.scm.h:1
+msgid ""
+"Create a new layer filled with a weave effect to be used as an overlay or "
+"bump map"
+msgstr ""
+"Δημιουργήστε μία νέα στρώση με τη χρήση του φίλτρου πλεκτό που θα "
+"χρησιμοποιηθεί σαν επίστρωμα ή σαν χαρτογράφηση ανώμαλων επιφανειών"
+
+#: ../plug-ins/script-fu/scripts/weave.scm.h:2
 #, fuzzy
 msgid "Ribbon spacing"
 msgstr "Διαστήματα"
 
-#: plug-ins/script-fu/scripts/weave.scm.h:3
+#: ../plug-ins/script-fu/scripts/weave.scm.h:3
 #, fuzzy
 msgid "Ribbon width"
 msgstr "Πλάτος Εικονιδίου:"
 
-#: plug-ins/script-fu/scripts/weave.scm.h:4
+#: ../plug-ins/script-fu/scripts/weave.scm.h:4
 #, fuzzy
 msgid "Shadow darkness"
 msgstr "Εμφάνιση λαβής"
 
-#: plug-ins/script-fu/scripts/weave.scm.h:5
+#: ../plug-ins/script-fu/scripts/weave.scm.h:5
 #, fuzzy
 msgid "Shadow depth"
 msgstr "Εμφάνιση Λεπτομερειών"
 
-#: plug-ins/script-fu/scripts/weave.scm.h:6
+#: ../plug-ins/script-fu/scripts/weave.scm.h:6
 #, fuzzy
 msgid "Thread density"
-msgstr "Πυκνότητα"
+msgstr "Πυκνότητα νήματος"
 
-#: plug-ins/script-fu/scripts/weave.scm.h:7
+#: ../plug-ins/script-fu/scripts/weave.scm.h:7
 #, fuzzy
 msgid "Thread intensity"
-msgstr "Τοπική θύελλα"
+msgstr "Ένταση νήματος"
 
-#: plug-ins/script-fu/scripts/weave.scm.h:8
+#: ../plug-ins/script-fu/scripts/weave.scm.h:8
 #, fuzzy
 msgid "Thread length"
-msgstr "Διάρκεια"
+msgstr "Μήκος νήματος"
 
-#: plug-ins/script-fu/scripts/weave.scm.h:9
+#: ../plug-ins/script-fu/scripts/weave.scm.h:9
 msgid "_Weave..."
 msgstr ""
 
-#: plug-ins/script-fu/scripts/web-browser.scm.h:1
-msgid "/Help/The GIMP Online"
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:1
+msgid "Bookmark to the GIMP web site"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/web-browser.scm.h:2
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:2
+msgid "Bookmark to the user manual"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:3
+#, fuzzy
+msgid "Create and Use _Selections"
+msgstr "Κλάδεμα Επιλεγμένου"
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:4
+msgid "Create, Open and Save _Files"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:5
+msgid "Drawing _Simple Objects"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:6
+msgid "How to Use _Dialogs"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:7
 msgid "Plug-in _Registry"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/web-browser.scm.h:3
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:8
+msgid "Using _Paths"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:9
+msgid "_Basic Concepts"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:10
 msgid "_Developer Web Site"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/web-browser.scm.h:4
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:11
 msgid "_Main Web Site"
 msgstr ""
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:2
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:12
+msgid "_Preparing your Images for the Web"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:13
+msgid "_User Manual Web Site"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/web-browser.scm.h:14
+msgid "_Working with Digital Camera Photos"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:1
+msgid "Add a subtle translucent 3D effect to the selected region (or alpha)"
+msgstr ""
+
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:2
 #, fuzzy
 msgid "Drop shadow X offset"
 msgstr "Σκιά:"
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:3
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:3
 #, fuzzy
 msgid "Drop shadow Y offset"
 msgstr "Σκιά:"
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:4
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:4
 #, fuzzy
 msgid "Drop shadow blur radius"
 msgstr "Αραιά βροχή"
 
 #
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:5
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:5
 #, fuzzy
 msgid "Drop shadow color"
 msgstr "Χρώματα Γραφήματος"
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:6
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:6
 #, fuzzy
 msgid "Drop shadow opacity"
 msgstr "Σκιά:"
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:7
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:7
 #, fuzzy
 msgid "Highlight X offset"
 msgstr "Επιλεγμένο"
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:8
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:8
 #, fuzzy
 msgid "Highlight Y offset"
 msgstr "Επιλεγμένο"
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:10
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:10
 #, fuzzy
 msgid "Highlight opacity"
 msgstr "Τονισμένη ημέρα:"
 
-#: plug-ins/script-fu/scripts/xach-effect.scm.h:12
+#: ../plug-ins/script-fu/scripts/xach-effect.scm.h:12
 msgid "_Xach-Effect..."
 msgstr ""
 
+#, fuzzy
+#~ msgid "SIOD Output"
+#~ msgstr "Έξοδος DSP"
+
+#, fuzzy
+#~ msgid "Current Command"
+#~ msgstr "Εντολή Εκτύπωσης"
+
+#, fuzzy
+#~ msgid "Script Arguments"
+#~ msgstr "Ορίσματα"
+
+#, fuzzy
+#~ msgid "Script Progress"
+#~ msgstr "Ορίσματα"
+
+#
+#~ msgid "Author:"
+#~ msgstr "Συγγραφέας:"
+
+#, fuzzy
+#~ msgid "Copyright:"
+#~ msgstr "Πνευματικά Δικαιώματα"
+
+#
+#~ msgid "Date:"
+#~ msgstr "Ημ/νία:"
+
+#, fuzzy
+#~ msgid "Image Types:"
+#~ msgstr "Τύπος Στοιχείου:"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "Search by _Name"
+#~ msgstr "Βάση αναζήτησης:"
+
+#, fuzzy
+#~ msgid "Search by _Blurb"
+#~ msgstr "Εύρεση στη Μνήμη.."
+
+#, fuzzy
+#~ msgid "_Search:"
+#~ msgstr "Αναζήτηση: "
+
+#, fuzzy
+#~ msgid "Parameters"
+#~ msgstr "Ελάττωση Χρωμάτων"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Alpha to Logo"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Logos"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Patterns"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Decor"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Web Page Themes/Alien Glow"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Buttons"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Web Page Themes/Beveled Pattern"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Animators"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Stencil Ops"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#
+#, fuzzy
+#~ msgid "C_hrome-It..."
+#~ msgstr "Εξερεύνηση..."
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Render"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Alchemy"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Selection"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Shadow"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#, fuzzy
+#~ msgid "Clear unselected maskarea"
+#~ msgstr "Αποκοπή επιλεγμένης εργασίας"
+
+#, fuzzy
+#~ msgid "Fade from %"
+#~ msgstr "Εύρος: Από "
+
+#, fuzzy
+#~ msgid "Fade to   %"
+#~ msgstr "Εύρος: Από "
+
+#, fuzzy
+#~ msgid "Use growing selection"
+#~ msgstr "Κλάδεμα Επιλεγμένου"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Utils"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Web Page Themes/Classic.Gimp.Org"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "Blend gradient (Text)"
+#~ msgstr "Θέμα Διαβάθμισης"
+
+#, fuzzy
+#~ msgid "Effect size (pixels * 3)"
+#~ msgstr "Μέγεθος (εικονοστοιχεία)"
+
+#
+#, fuzzy
+#~ msgid "/Script-Fu/Utils"
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#
+#, fuzzy
+#~ msgid "BG opacity"
+#~ msgstr "Διαφάνεια:"
+
+#
+#, fuzzy
+#~ msgid "Draw _HSV Graph..."
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#, fuzzy
+#~ msgid "End X"
+#~ msgstr "Τέλος"
+
+#, fuzzy
+#~ msgid "End Y"
+#~ msgstr "Τέλος"
+
+#, fuzzy
+#~ msgid "From top-left to bottom-right"
+#~ msgstr "Αριστερά προς δεξιά"
+
+#, fuzzy
+#~ msgid "Graph scale"
+#~ msgstr "Κλίμακα του γκρι"
+
+#, fuzzy
+#~ msgid "Start Y"
+#~ msgstr "Εκκίνηση"
+
+#, fuzzy
+#~ msgid "Create new image"
+#~ msgstr "Νέα Εικόνα"
+
+#, fuzzy
+#~ msgid "Insert layer names"
+#~ msgstr "Ονόματα Παικτών"
+
+#, fuzzy
+#~ msgid "Make new background"
+#~ msgstr "Αρχικοποίηση Παρασκηνίου"
+
+#, fuzzy
+#~ msgid "Outer border"
+#~ msgstr "Πλαίσιο"
+
+#, fuzzy
+#~ msgid "Pad color"
+#~ msgstr "Προσθήκη Χρώματος"
+
+#
+#, fuzzy
+#~ msgid "Pad opacity"
+#~ msgstr "Διαφάνεια:"
+
+#, fuzzy
+#~ msgid "Shear length"
+#~ msgstr "Γωνία στρέβλωσης:"
+
+#
+#, fuzzy
+#~ msgid "Show Image _Structure..."
+#~ msgstr "Επιλογή Γραμματοσειράς"
+
+#, fuzzy
+#~ msgid "Space between layers"
+#~ msgstr "Διάχυση μεταξύ γραμμών"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Make Brush"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "Effect size (pixels * 5)"
+#~ msgstr "Μέγεθος (εικονοστοιχεία)"
+
+#
+#~ msgid "Filename"
+#~ msgstr "Όνομα αρχείου"
+
+#, fuzzy
+#~ msgid "/Xtns/Script-Fu/Misc"
+#~ msgstr "Κονσόλα Script-Fu"
+
+#, fuzzy
+#~ msgid "Lighting (degrees)"
+#~ msgstr "ανοιχτό πράσινο"
+
+#, fuzzy
+#~ msgid "Radius (pixels)"
+#~ msgstr "Γελοίο (128 εικονοστοιχεία)"
+
+#
+#, fuzzy
+#~ msgid "Sphere color"
+#~ msgstr "Επιλέξτε Χρώμα"
+
+#
+#, fuzzy
+#~ msgid "_Sphere..."
+#~ msgstr "Εξερεύνηση..."
+
+#, fuzzy
+#~ msgid "Burst color"
+#~ msgstr "Ειδικό Χρώμα:"
+
+#, fuzzy
+#~ msgid "Effect size (pixels * 30)"
+#~ msgstr "Μέγεθος (εικονοστοιχεία)"
+
+#, fuzzy
+#~ msgid "Effect size (pixels * 4)"
+#~ msgstr "Μέγεθος (εικονοστοιχεία)"
+
 #
 #, fuzzy
 #~ msgid "_ASCII to Layer..."
@@ -3130,10 +3612,6 @@ msgstr ""
 #~ msgid "/Script-Fu/Shadow/_Xach-Effect..."
 #~ msgstr "Επιλογή Γραμματοσειράς"
 
-#, fuzzy
-#~ msgid "Re-read all available scripts"
-#~ msgstr "εμφάνιση λίστας με διαθέσιμους αγωγούς"
-
 #, fuzzy
 #~ msgid "Relative radius"
 #~ msgstr "Συγγενείς"
@@ -3172,9 +3650,6 @@ msgstr ""
 #~ msgid "Font Size (pixels)"
 #~ msgstr "Μέγεθος (εικονοστοιχεία)"
 
-#~ msgid "Text Color"
-#~ msgstr "Χρώμα Κειμένου"
-
 #~ msgid "Transparent Background"
 #~ msgstr "Διαφανές Παρασκήνιο"
 
diff --git a/po-script-fu/en_GB.po b/po-script-fu/en_GB.po
index 3f2ef1e332..d512f461c9 100644
--- a/po-script-fu/en_GB.po
+++ b/po-script-fu/en_GB.po
@@ -1,261 +1,211 @@
-# This is the English, British catalog for GIMP Script-Fu.
+# This is the English, British catalogue for GIMP Script-Fu.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Piers Cornwell , 2000.
 # Gareth Owen , David Lodge , 2004.
-#
+# Bruce Cowan , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: GIMP\n"
+"Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-09 19:51+0000\n"
-"PO-Revision-Date: 2007-05-16 08:10-0000\n"
-"Last-Translator: David Lodge \n"
-"Language-Team: English, British\n"
+"POT-Creation-Date: 2009-10-17 23:04+0100\n"
+"PO-Revision-Date: 2009-10-17 23:06+0100\n"
+"Last-Translator: Bruce Cowan \n"
+"Language-Team: British English \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../plug-ins/script-fu/script-fu-console.c:133
-#: ../plug-ins/script-fu/script-fu-console.c:200
+#: ../plug-ins/script-fu/script-fu-console.c:131
+#: ../plug-ins/script-fu/script-fu-console.c:198
 msgid "Script-Fu Console"
 msgstr "Script-Fu Console"
 
-#: ../plug-ins/script-fu/script-fu-console.c:196
+#: ../plug-ins/script-fu/script-fu-console.c:194
 msgid "Welcome to TinyScheme"
 msgstr "Welcome to TinyScheme"
 
-#: ../plug-ins/script-fu/script-fu-console.c:202
+#: ../plug-ins/script-fu/script-fu-console.c:200
 msgid "Interactive Scheme Development"
 msgstr "Interactive Scheme Development"
 
-#: ../plug-ins/script-fu/script-fu-console.c:238
+#: ../plug-ins/script-fu/script-fu-console.c:236
 msgid "_Browse..."
 msgstr "_Browse..."
 
-#: ../plug-ins/script-fu/script-fu-console.c:296
+#: ../plug-ins/script-fu/script-fu-console.c:294
 msgid "Save Script-Fu Console Output"
 msgstr "Save Script-Fu Console Output"
 
-#: ../plug-ins/script-fu/script-fu-console.c:343
+#: ../plug-ins/script-fu/script-fu-console.c:341
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Could not open '%s' for writing: %s"
 
-#: ../plug-ins/script-fu/script-fu-console.c:372
+#: ../plug-ins/script-fu/script-fu-console.c:370
 msgid "Script-Fu Procedure Browser"
 msgstr "Script-Fu Procedure Browser"
 
-#: ../plug-ins/script-fu/script-fu-console.c:718
+#: ../plug-ins/script-fu/script-fu-eval.c:63
 msgid "Script-Fu evaluation mode only allows non-interactive invocation"
 msgstr "Script-Fu evaluation mode only allows non-interactive invocation"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:191
+#: ../plug-ins/script-fu/script-fu-interface.c:196
 msgid "Script-Fu cannot process two scripts at the same time."
 msgstr "Script-Fu cannot process two scripts at the same time."
 
-#: ../plug-ins/script-fu/script-fu-interface.c:193
+#: ../plug-ins/script-fu/script-fu-interface.c:198
 #, c-format
 msgid "You are already running the \"%s\" script."
 msgstr "You are already running the \"%s\" script."
 
-#: ../plug-ins/script-fu/script-fu-interface.c:238
+#: ../plug-ins/script-fu/script-fu-interface.c:224
 #, c-format
 msgid "Script-Fu: %s"
 msgstr "Script-Fu: %s"
 
 #. we add a colon after the label;
-#. some languages want an extra space here
-#: ../plug-ins/script-fu/script-fu-interface.c:300
+#. *  some languages want an extra space here
+#.
+#: ../plug-ins/script-fu/script-fu-interface.c:288
 #, c-format
 msgid "%s:"
 msgstr "%s:"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:348
+#: ../plug-ins/script-fu/script-fu-interface.c:336
 msgid "Script-Fu Color Selection"
 msgstr "Script-Fu Colour Selection"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:460
+#: ../plug-ins/script-fu/script-fu-interface.c:445
 msgid "Script-Fu File Selection"
 msgstr "Script-Fu File Selection"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:463
+#: ../plug-ins/script-fu/script-fu-interface.c:448
 msgid "Script-Fu Folder Selection"
 msgstr "Script-Fu Folder Selection"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:475
+#: ../plug-ins/script-fu/script-fu-interface.c:461
 msgid "Script-Fu Font Selection"
 msgstr "Script-Fu Font Selection"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:483
+#: ../plug-ins/script-fu/script-fu-interface.c:469
 msgid "Script-Fu Palette Selection"
 msgstr "Script-Fu Palette Selection"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:492
+#: ../plug-ins/script-fu/script-fu-interface.c:478
 msgid "Script-Fu Pattern Selection"
 msgstr "Script-Fu Pattern Selection"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:501
+#: ../plug-ins/script-fu/script-fu-interface.c:487
 msgid "Script-Fu Gradient Selection"
 msgstr "Script-Fu Gradient Selection"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:510
+#: ../plug-ins/script-fu/script-fu-interface.c:496
 msgid "Script-Fu Brush Selection"
 msgstr "Script-Fu Brush Selection"
 
-#: ../plug-ins/script-fu/script-fu-scripts.c:658
+#: ../plug-ins/script-fu/script-fu-interface.c:824
 #, c-format
-msgid ""
-"Error while executing\n"
-"%s\n"
-"\n"
-"%s"
-msgstr ""
-"Error while executing\n"
-"%s\n"
-"\n"
-"%s"
+msgid "Error while executing %s:"
+msgstr "Error while executing %s:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:712
+#: ../plug-ins/script-fu/script-fu-scripts.c:150
+msgid "Too few arguments to 'script-fu-register' call"
+msgstr "Too few arguments to 'script-fu-register' call"
+
+#: ../plug-ins/script-fu/script-fu-scripts.c:609
+#, c-format
+msgid "Error while loading %s:"
+msgstr "Error while loading %s:"
+
+#: ../plug-ins/script-fu/script-fu-server.c:713
 msgid "Script-Fu Server Options"
 msgstr "Script-Fu Server Options"
 
-#: ../plug-ins/script-fu/script-fu-server.c:717
+#: ../plug-ins/script-fu/script-fu-server.c:718
 msgid "_Start Server"
 msgstr "_Start Server"
 
-#: ../plug-ins/script-fu/script-fu-server.c:745
+#: ../plug-ins/script-fu/script-fu-server.c:746
 msgid "Server port:"
 msgstr "Server port:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:751
+#: ../plug-ins/script-fu/script-fu-server.c:752
 msgid "Server logfile:"
 msgstr "Server logfile:"
 
-#: ../plug-ins/script-fu/script-fu.c:110
+#: ../plug-ins/script-fu/script-fu.c:111
 msgid "Interactive console for Script-Fu development"
 msgstr "Interactive console for Script-Fu development"
 
-#: ../plug-ins/script-fu/script-fu.c:116
+#: ../plug-ins/script-fu/script-fu.c:117
 msgid "_Console"
 msgstr "_Console"
 
-#: ../plug-ins/script-fu/script-fu.c:140
+#: ../plug-ins/script-fu/script-fu.c:141
 msgid "Server for remote Script-Fu operation"
 msgstr "Server for remote Script-Fu operation"
 
-#: ../plug-ins/script-fu/script-fu.c:145
+#: ../plug-ins/script-fu/script-fu.c:146
 msgid "_Start Server..."
 msgstr "_Start Server..."
 
-#: ../plug-ins/script-fu/script-fu.c:301
+#: ../plug-ins/script-fu/script-fu.c:302
 msgid "_GIMP Online"
 msgstr "_GIMP Online"
 
-#: ../plug-ins/script-fu/script-fu.c:302
+#: ../plug-ins/script-fu/script-fu.c:303
 msgid "_User Manual"
 msgstr "_User Manual"
 
-#: ../plug-ins/script-fu/script-fu.c:305
+#: ../plug-ins/script-fu/script-fu.c:306
 msgid "_Script-Fu"
 msgstr "_Script-Fu"
 
-#: ../plug-ins/script-fu/script-fu.c:307
-msgid "_Buttons"
-msgstr "_Buttons"
-
-#: ../plug-ins/script-fu/script-fu.c:309
-msgid "_Logos"
-msgstr "_Logos"
-
-#: ../plug-ins/script-fu/script-fu.c:311
-msgid "_Misc"
-msgstr "_Misc"
-
-#: ../plug-ins/script-fu/script-fu.c:313
-msgid "_Patterns"
-msgstr "_Patterns"
-
-#: ../plug-ins/script-fu/script-fu.c:315
+#: ../plug-ins/script-fu/script-fu.c:308
 msgid "_Test"
 msgstr "_Test"
 
-#: ../plug-ins/script-fu/script-fu.c:317
-msgid "_Utilities"
-msgstr "_Utilities"
+#: ../plug-ins/script-fu/script-fu.c:311
+msgid "_Buttons"
+msgstr "_Buttons"
 
-#: ../plug-ins/script-fu/script-fu.c:319
+#: ../plug-ins/script-fu/script-fu.c:313
+msgid "_Logos"
+msgstr "_Logos"
+
+#: ../plug-ins/script-fu/script-fu.c:315
+msgid "_Patterns"
+msgstr "_Patterns"
+
+#: ../plug-ins/script-fu/script-fu.c:318
 msgid "_Web Page Themes"
 msgstr "_Web Page Themes"
 
-#: ../plug-ins/script-fu/script-fu.c:321
+#: ../plug-ins/script-fu/script-fu.c:320
 msgid "_Alien Glow"
 msgstr "_Alien Glow"
 
-#: ../plug-ins/script-fu/script-fu.c:323
+#: ../plug-ins/script-fu/script-fu.c:322
 msgid "_Beveled Pattern"
 msgstr "_Beveled Pattern"
 
-#: ../plug-ins/script-fu/script-fu.c:325
+#: ../plug-ins/script-fu/script-fu.c:324
 msgid "_Classic.Gimp.Org"
 msgstr "_Classic.Gimp.Org"
 
-#: ../plug-ins/script-fu/script-fu.c:328
+#: ../plug-ins/script-fu/script-fu.c:327
 msgid "Alpha to _Logo"
 msgstr "Alpha to _Logo"
 
 #: ../plug-ins/script-fu/script-fu.c:330
-msgid "An_imation"
-msgstr "An_imation"
-
-#: ../plug-ins/script-fu/script-fu.c:332
-msgid "_Animators"
-msgstr "_Animators"
-
-#: ../plug-ins/script-fu/script-fu.c:334
-msgid "_Artistic"
-msgstr "_Artistic"
-
-#: ../plug-ins/script-fu/script-fu.c:336
-msgid "_Blur"
-msgstr "_Blur"
-
-#: ../plug-ins/script-fu/script-fu.c:338
-msgid "_Decor"
-msgstr "_Decor"
-
-#: ../plug-ins/script-fu/script-fu.c:340
-msgid "_Effects"
-msgstr "_Effects"
-
-#: ../plug-ins/script-fu/script-fu.c:342
-msgid "En_hance"
-msgstr "En_hance"
-
-#: ../plug-ins/script-fu/script-fu.c:344
-msgid "_Light and Shadow"
-msgstr "_Light and Shadow"
-
-#: ../plug-ins/script-fu/script-fu.c:346
-msgid "S_hadow"
-msgstr "S_hadow"
-
-#: ../plug-ins/script-fu/script-fu.c:348
-msgid "_Render"
-msgstr "_Render"
-
-#: ../plug-ins/script-fu/script-fu.c:350
-msgid "_Alchemy"
-msgstr "_Alchemy"
-
-#: ../plug-ins/script-fu/script-fu.c:353
 msgid "Re-read all available Script-Fu scripts"
 msgstr "Re-read all available Script-Fu scripts"
 
-#: ../plug-ins/script-fu/script-fu.c:358
+#: ../plug-ins/script-fu/script-fu.c:335
 msgid "_Refresh Scripts"
 msgstr "_Refresh Scripts"
 
-#: ../plug-ins/script-fu/script-fu.c:381
+#: ../plug-ins/script-fu/script-fu.c:358
 msgid ""
 "You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open.  "
 "Please close all Script-Fu windows and try again."
@@ -311,8 +261,7 @@ msgstr "Default bumpmap settings"
 #: ../plug-ins/script-fu/scripts/slide.scm.h:2
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:7
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:5
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:2
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:8
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:4
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:6
@@ -350,8 +299,7 @@ msgstr "Font"
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:4
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:8
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:6
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:3
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:9
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:5
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:7
@@ -427,8 +375,7 @@ msgstr "Shadow blur radius"
 #: ../plug-ins/script-fu/scripts/slide.scm.h:5
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:11
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:8
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:9
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:6
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:11
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:8
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:14
@@ -462,8 +409,6 @@ msgstr "3_D Truchet..."
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:1
 #: ../plug-ins/script-fu/scripts/news-text.scm.h:1
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:1
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:1
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:1
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:2
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:2
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:1
@@ -582,7 +527,7 @@ msgstr "Flatten image"
 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:8
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:8
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:4
 msgid "Glow color"
 msgstr "Glow colour"
 
@@ -731,15 +676,15 @@ msgid ""
 "Add a gradient effect, a drop shadow, and a background to the selected "
 "region (or alpha)"
 msgstr ""
-"Add a gradient effect, a drop shadow, and a background to the selected "
-"region (or alpha)"
+"Add a gradient effect, a drop shadow and a background to the selected region "
+"(or alpha)"
 
 #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:3
 msgid ""
 "Create a plain text logo with a gradient effect, a drop shadow, and a "
 "background"
 msgstr ""
-"Create a plain text logo with a gradient effect, a drop shadow, and a "
+"Create a plain text logo with a gradient effect, a drop shadow and a "
 "background"
 
 #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:8
@@ -868,7 +813,7 @@ msgid ""
 "Add blended backgrounds, highlights, and shadows to the selected region (or "
 "alpha)"
 msgstr ""
-"Add blended backgrounds, highlights, and shadows to the selected region (or "
+"Add blended backgrounds, highlights and shadows to the selected region (or "
 "alpha)"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:3
@@ -881,7 +826,7 @@ msgstr "Blend mode"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:5
 msgid "Create a logo with blended backgrounds, highlights, and shadows"
-msgstr "Create a logo with blended backgrounds, highlights, and shadows"
+msgstr "Create a logo with blended backgrounds, highlights and shadows"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:6
 msgid "Custom Gradient"
@@ -1308,6 +1253,8 @@ msgstr "Create a metallic logo with reflections and perspective shadows"
 
 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:5
 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:5
 msgid "Effect size (pixels)"
 msgstr "Effect size (pixels)"
 
@@ -1681,7 +1628,7 @@ msgid ""
 "Add gradients, patterns, shadows, and bump maps to the selected region (or "
 "alpha)"
 msgstr ""
-"Add gradients, patterns, shadows, and bump maps to the selected region (or "
+"Add gradients, patterns, shadows and bump maps to the selected region (or "
 "alpha)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:3
@@ -1694,7 +1641,7 @@ msgstr "Blend gradient (text)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:5
 msgid "Create a logo with gradients, patterns, shadows, and bump maps"
-msgstr "Create a logo with gradients, patterns, shadows, and bump maps"
+msgstr "Create a logo with gradients, patterns, shadows and bump maps"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:9
 msgid "Glo_ssy..."
@@ -1717,7 +1664,6 @@ msgid "Pattern (text)"
 msgstr "Pattern (text)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:15
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:5
 msgid "Shadow"
 msgstr "Shadow"
 
@@ -1745,10 +1691,6 @@ msgstr "Add a glowing hot metal effect to the selected region (or alpha)"
 msgid "Create a logo that looks like glowing hot metal"
 msgstr "Create a logo that looks like glowing hot metal"
 
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:4
-msgid "Effect size (pixels * 3)"
-msgstr "Effect size (pixels * 3)"
-
 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:7
 msgid "Glo_wing Hot..."
 msgstr "Glo_wing Hot..."
@@ -1995,10 +1937,6 @@ msgstr "Create a logo in the style of a neon sign"
 msgid "Create shadow"
 msgstr "Create shadow"
 
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:5
-msgid "Effect size (pixels * 5)"
-msgstr "Effect size (pixels * 5)"
-
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:9
 msgid "N_eon..."
 msgstr "N_eon..."
@@ -2312,7 +2250,7 @@ msgstr "Rounded R_ectangle..."
 
 #: ../plug-ins/script-fu/scripts/slide.scm.h:1
 msgid "Add a slide-film like frame, sprocket holes, and labels to an image"
-msgstr "Add a slide-film like frame, sprocket holes, and labels to an image"
+msgstr "Add a slide-film like frame, sprocket holes and labels to an image"
 
 #: ../plug-ins/script-fu/scripts/slide.scm.h:3
 msgid "Font color"
@@ -2342,26 +2280,6 @@ msgstr "Create a logo with a speedy text effect"
 msgid "Speed Text..."
 msgstr "Speed Text..."
 
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:2
-msgid "Create a simple sphere with a drop shadow"
-msgstr "Create a simple sphere with a drop shadow"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:3
-msgid "Lighting (degrees)"
-msgstr "Lighting (degrees)"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:4
-msgid "Radius (pixels)"
-msgstr "Radius (pixels)"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:6
-msgid "Sphere color"
-msgstr "Sphere colour"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:7
-msgid "_Sphere..."
-msgstr "_Sphere..."
-
 #: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:1
 msgid "Create an animation by mapping the current image onto a spinning sphere"
 msgstr ""
@@ -2387,7 +2305,7 @@ msgstr "_Spinning Globe..."
 msgid ""
 "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
 msgstr ""
-"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
+"Add Spirographs, Epitrochoids and Lissajous Curves to the current layer"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:2
 msgid "Airbrush"
@@ -2510,47 +2428,11 @@ msgstr "Type"
 msgid "_Spyrogimp..."
 msgstr "_Spyrogimp..."
 
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:2
-msgid "Burst color"
-msgstr "Burst colour"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:3
-msgid "Create a logo using a starburst gradient"
-msgstr "Create a logo using a starburst gradient"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:4
-msgid "Effect size (pixels * 30)"
-msgstr "Effect size (pixels * 30)"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:5
-msgid ""
-"Fill the selected region (or alpha) with a starburst gradient and add a "
-"shadow"
-msgstr ""
-"Fill the selected region (or alpha) with a starburst gradient and add a "
-"shadow"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:8
-msgid "Starb_urst..."
-msgstr "Starb_urst..."
-
 #: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:1
 msgid "Create a logo using a rock-like texture, a nova glow, and shadow"
-msgstr "Create a logo using a rock-like texture, a nova glow, and shadow"
+msgstr "Create a logo using a rock-like texture, a nova glow and shadow"
 
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:2
-msgid "Effect size (pixels * 4)"
-msgstr "Effect size (pixels * 4)"
-
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:3
-msgid ""
-"Fill the selected region (or alpha) with a rock-like texture, a nova glow, "
-"and shadow"
-msgstr ""
-"Fill the selected region (or alpha) with a rock-like texture, a nova glow, "
-"and shadow"
-
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:5
 msgid "Sta_rscape..."
 msgstr "Sta_rscape..."
 
@@ -2636,7 +2518,7 @@ msgstr "Text C_ircle..."
 msgid ""
 "Create a textured logo with highlights, shadows, and a mosaic background"
 msgstr ""
-"Create a textured logo with highlights, shadows, and a mosaic background"
+"Create a textured logo with highlights, shadows and a mosaic background"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:4
 msgid "Ending blend"
@@ -2648,7 +2530,7 @@ msgid ""
 "shadows, and a mosaic background"
 msgstr ""
 "Fill the selected region (or alpha) with a texture and add highlights, "
-"shadows, and a mosaic background"
+"shadows and a mosaic background"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:8
 msgid "Hexagons"
@@ -2894,6 +2776,95 @@ msgstr "Highlight opacity"
 msgid "_Xach-Effect..."
 msgstr "_Xach-Effect..."
 
+#~ msgid "_Misc"
+#~ msgstr "_Misc"
+
+#~ msgid "_Utilities"
+#~ msgstr "_Utilities"
+
+#~ msgid "An_imation"
+#~ msgstr "An_imation"
+
+#~ msgid "_Animators"
+#~ msgstr "_Animators"
+
+#~ msgid "_Artistic"
+#~ msgstr "_Artistic"
+
+#~ msgid "_Blur"
+#~ msgstr "_Blur"
+
+#~ msgid "_Decor"
+#~ msgstr "_Decor"
+
+#~ msgid "_Effects"
+#~ msgstr "_Effects"
+
+#~ msgid "En_hance"
+#~ msgstr "En_hance"
+
+#~ msgid "_Light and Shadow"
+#~ msgstr "_Light and Shadow"
+
+#~ msgid "S_hadow"
+#~ msgstr "S_hadow"
+
+#~ msgid "_Render"
+#~ msgstr "_Render"
+
+#~ msgid "_Alchemy"
+#~ msgstr "_Alchemy"
+
+#~ msgid "Effect size (pixels * 3)"
+#~ msgstr "Effect size (pixels * 3)"
+
+#~ msgid "Effect size (pixels * 5)"
+#~ msgstr "Effect size (pixels * 5)"
+
+#~ msgid "Create a simple sphere with a drop shadow"
+#~ msgstr "Create a simple sphere with a drop shadow"
+
+#~ msgid "Lighting (degrees)"
+#~ msgstr "Lighting (degrees)"
+
+#~ msgid "Radius (pixels)"
+#~ msgstr "Radius (pixels)"
+
+#~ msgid "Sphere color"
+#~ msgstr "Sphere colour"
+
+#~ msgid "_Sphere..."
+#~ msgstr "_Sphere..."
+
+#~ msgid "Burst color"
+#~ msgstr "Burst colour"
+
+#~ msgid "Create a logo using a starburst gradient"
+#~ msgstr "Create a logo using a starburst gradient"
+
+#~ msgid "Effect size (pixels * 30)"
+#~ msgstr "Effect size (pixels * 30)"
+
+#~ msgid ""
+#~ "Fill the selected region (or alpha) with a starburst gradient and add a "
+#~ "shadow"
+#~ msgstr ""
+#~ "Fill the selected region (or alpha) with a starburst gradient and add a "
+#~ "shadow"
+
+#~ msgid "Starb_urst..."
+#~ msgstr "Starb_urst..."
+
+#~ msgid "Effect size (pixels * 4)"
+#~ msgstr "Effect size (pixels * 4)"
+
+#~ msgid ""
+#~ "Fill the selected region (or alpha) with a rock-like texture, a nova "
+#~ "glow, and shadow"
+#~ msgstr ""
+#~ "Fill the selected region (or alpha) with a rock-like texture, a nova "
+#~ "glow, and shadow"
+
 #~ msgid "/Script-Fu/"
 #~ msgstr "/Script-Fu/"
 
diff --git a/po-script-fu/fr.po b/po-script-fu/fr.po
index 1db89d8b4a..d7cc449c9f 100644
--- a/po-script-fu/fr.po
+++ b/po-script-fu/fr.po
@@ -14,9 +14,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-script-fu\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-06 21:53+0200\n"
-"PO-Revision-Date: 2009-03-02 08:19+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=general\n"
+"POT-Creation-Date: 2009-07-08 19:33+0000\n"
+"PO-Revision-Date: 2009-07-23 08:19+0100\n"
 "Last-Translator: Julien Hardelin \n"
 "Language-Team: GNOME French Team \n"
 "MIME-Version: 1.0\n"
@@ -439,7 +440,7 @@ msgstr "Crée une image remplie avec un motif 3D truchet"
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:5
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:7
 msgid "End blend"
-msgstr "Mélange final"
+msgstr "Fin du mélange"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:6
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:5
@@ -994,11 +995,11 @@ msgstr "Entailler les zones blanches"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
 msgid "Image to carve"
-msgstr "Image à entailler"
+msgstr "Image à graver"
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:3
 msgid "Stencil C_arve..."
-msgstr "Patron de t_aillage..."
+msgstr "Patron de gr_avure..."
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:1
 msgid "Background Image"
@@ -1010,7 +1011,7 @@ msgstr "Entaille le texte agrandi"
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:3
 msgid "Carved..."
-msgstr "Taillé..."
+msgstr "Gravé..."
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:4
 msgid ""
@@ -1044,7 +1045,7 @@ msgstr "C_raie..."
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:1
 msgid "Add a chipped woodcarving effect to the selected region (or alpha)"
 msgstr ""
-"Ajoute un effet de sculpture sur bois à la région sélectionnée (ou alpha)"
+"Ajoute un effet de gravure sur bois à la région sélectionnée (ou alpha)"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:2
 msgid "Blur amount"
@@ -1052,15 +1053,15 @@ msgstr "Importance du flou"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:3
 msgid "Chip Awa_y..."
-msgstr "Éclaté..."
+msgstr "Gravure au _burin..."
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:4
 msgid "Chip amount"
-msgstr "Quantité d'éclats"
+msgstr "Nombre d'éclats"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:5
 msgid "Create a logo resembling a chipped wood carving"
-msgstr "Crée un logo ressemblant à du bois sculpté"
+msgstr "Crée un logo ressemblant à du bois gravé au burin"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:6
 msgid "Drop shadow"
@@ -1322,7 +1323,7 @@ msgstr "Seuil (plus grand 1<-->255 plus petit)"
 
 #: ../plug-ins/script-fu/scripts/distress-selection.scm.h:8
 msgid "_Distort..."
-msgstr "_Perturbation..."
+msgstr "_Déformation..."
 
 #: ../plug-ins/script-fu/scripts/drop-shadow.scm.h:1
 msgid "Add a drop shadow to the selected region (or alpha)"
@@ -2659,8 +2660,8 @@ msgid ""
 "Create a multi-layer image with an effect like a stone was thrown into the "
 "current image"
 msgstr ""
-"Crée une image multi-calque avec un effet de pierre "
-"jetée au travers de l'image courante"
+"Crée une image multi-calque avec un effet de pierre jetée au travers de "
+"l'image courante"
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:3
 msgid "Invert direction"
@@ -2810,4 +2811,3 @@ msgstr "Opacité d'éclairage"
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:12
 msgid "_Xach-Effect..."
 msgstr "Effet _Xach..."
-
diff --git a/po-script-fu/ja.po b/po-script-fu/ja.po
index 0f23f627a9..e034390f7e 100644
--- a/po-script-fu/ja.po
+++ b/po-script-fu/ja.po
@@ -1,21 +1,22 @@
 # GIMP Script-Fu Japanese message catalog
-# Copyright (C) 2000,2003,2005,2008 Free Software Foundation, Inc.
+# Copyright (C) 2000,2003,2005,2008-2009 Free Software Foundation, Inc.
 # Shirasaki Yasuhiro , 2000
 # Takashi Kido , 2000
 # KAMAGASAKO Masatoshi , 2003.
 # Ryoichi INAGAKI , 2003.
 # Tadashi Jokagi , 2005.
 # OKANO Takayoshi , 2005.
-# Nishibori Kiyotaka , 2008.
+# Nishibori Kiyotaka , 2008-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-30 23:39+0900\n"
-"PO-Revision-Date: 2008-10-12 19:41+0900\n"
+"Project-Id-Version: gimp gimp-2-6\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=Internationalisation\n"
+"POT-Creation-Date: 2009-10-03 21:33+0900\n"
+"PO-Revision-Date: 2009-09-28 22:45+0900\n"
 "Last-Translator: Nishibori Kiyotaka \n"
-"Language-Team: Japanese \n"
+"Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -513,7 +514,7 @@ msgstr "枠の色"
 
 #: ../plug-ins/script-fu/scripts/addborder.scm.h:6
 msgid "Delta value on color"
-msgstr "色のデフォルト値"
+msgstr "色のデルタ値"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:2
 msgid "Create an arrow graphic with an eerie glow for web pages"
@@ -531,7 +532,7 @@ msgstr "下"
 #: ../plug-ins/script-fu/scripts/camo.scm.h:5
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:6
 msgid "Flatten image"
-msgstr "平坦画像"
+msgstr "画像を統合"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-arrow.scm.h:5
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:6
@@ -1231,7 +1232,7 @@ msgstr ""
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:2
 msgid "Darken only"
-msgstr "ダーク色"
+msgstr "レイヤーモードを [比較(暗)] に"
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:3
 msgid "Stains"
@@ -1555,7 +1556,7 @@ msgstr "粒状度 (1 が最低)"
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:9
 #, no-c-format
 msgid "Shadow weight (%)"
-msgstr "影の幅 (%)"
+msgstr "影の濃さ (%)"
 
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:11
 msgid "_Fuzzy Border..."
@@ -2741,19 +2742,19 @@ msgstr "ユーザーマニュアルへのブックマーク"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:3
 msgid "Create and Use _Selections"
-msgstr "選択範囲の作成と使用 (英語) (_S)"
+msgstr "選択範囲の作成と使用(_S)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:4
 msgid "Create, Open and Save _Files"
-msgstr "ファイルを開く・作成・保存 (英語) (_F)"
+msgstr "ファイルを開く・作成・保存(_F)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:5
 msgid "Drawing _Simple Objects"
-msgstr "シンプルなオブジェクトを描く (英語) (_S)"
+msgstr "シンプルなオブジェクトを描く(_S)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:6
 msgid "How to Use _Dialogs"
-msgstr "ダイアログの使い方 (英語) (_D)"
+msgstr "ダイアログの使い方(_D)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:7
 msgid "Plug-in _Registry"
@@ -2761,11 +2762,11 @@ msgstr "プラグインレジストリ (英語) (_R)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:8
 msgid "Using _Paths"
-msgstr "パスを使う (英語) (_P)"
+msgstr "パスを使う(_P)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:9
 msgid "_Basic Concepts"
-msgstr "基本コンセプト (英語) (_B)"
+msgstr "基本コンセプト(_B)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:10
 msgid "_Developer Web Site"
@@ -2777,15 +2778,15 @@ msgstr "メインのウェブサイト (英語) (_M)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:12
 msgid "_Preparing your Images for the Web"
-msgstr "ウェブ用画像を作成するには (英語) (_P)"
+msgstr "ウェブ用画像を作成するには(_P)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:13
 msgid "_User Manual Web Site"
-msgstr "ユーザーマニュアル (英語) (_U)"
+msgstr "ユーザーマニュアル(_U)"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:14
 msgid "_Working with Digital Camera Photos"
-msgstr "デジカメ画像を修正する (英語) (_W)"
+msgstr "デジカメ画像を修正する(_W)"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:1
 msgid "Add a subtle translucent 3D effect to the selected region (or alpha)"
diff --git a/po-script-fu/nn.po b/po-script-fu/nn.po
index 158d537cf5..75947f97dc 100644
--- a/po-script-fu/nn.po
+++ b/po-script-fu/nn.po
@@ -3,9 +3,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-12 15:26+0100\n"
-"PO-Revision-Date: 2008-03-05 21:54+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n"
+"POT-Creation-Date: 2009-04-17 09:05+0000\n"
+"PO-Revision-Date: 2009-06-25 17:49+0100\n"
 "Last-Translator: Kolbjørn Stuestøl \n"
 "Language-Team: Kolbjørn Stuestøl \n"
 "MIME-Version: 1.0\n"
@@ -15,254 +15,209 @@ msgstr ""
 "X-Poedit-Country: NORWAY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../plug-ins/script-fu/script-fu-console.c:133
-#: ../plug-ins/script-fu/script-fu-console.c:200
+#: ../plug-ins/script-fu/script-fu-console.c:131
+#: ../plug-ins/script-fu/script-fu-console.c:198
 msgid "Script-Fu Console"
 msgstr "Script-Fu konsoll"
 
-#: ../plug-ins/script-fu/script-fu-console.c:196
+#: ../plug-ins/script-fu/script-fu-console.c:194
 msgid "Welcome to TinyScheme"
 msgstr "Velkommen til TinyScheme"
 
-#: ../plug-ins/script-fu/script-fu-console.c:202
+#: ../plug-ins/script-fu/script-fu-console.c:200
 msgid "Interactive Scheme Development"
 msgstr "Interaktiv Scheme-utvikling"
 
-#: ../plug-ins/script-fu/script-fu-console.c:238
+#: ../plug-ins/script-fu/script-fu-console.c:236
 msgid "_Browse..."
 msgstr "_Bla gjennom..."
 
-#: ../plug-ins/script-fu/script-fu-console.c:296
+#: ../plug-ins/script-fu/script-fu-console.c:294
 msgid "Save Script-Fu Console Output"
 msgstr "Lagra utdata frå Script-Fu konsollen"
 
-#: ../plug-ins/script-fu/script-fu-console.c:343
+#: ../plug-ins/script-fu/script-fu-console.c:341
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Kan ikkje opna «%s» for skriving: %s"
 
-#: ../plug-ins/script-fu/script-fu-console.c:372
+#: ../plug-ins/script-fu/script-fu-console.c:370
 msgid "Script-Fu Procedure Browser"
 msgstr "Prosedyrelesaren for Script-Fu"
 
-#: ../plug-ins/script-fu/script-fu-console.c:718
+#: ../plug-ins/script-fu/script-fu-eval.c:63
 msgid "Script-Fu evaluation mode only allows non-interactive invocation"
 msgstr "Script-Fu evalueringsmodus tillet bare ikkje-interaktiv køyring"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:191
+#: ../plug-ins/script-fu/script-fu-interface.c:196
 msgid "Script-Fu cannot process two scripts at the same time."
 msgstr "Script-Fu kan ikkje køyre to skript samstundes."
 
-#: ../plug-ins/script-fu/script-fu-interface.c:193
+#: ../plug-ins/script-fu/script-fu-interface.c:198
 #, c-format
 msgid "You are already running the \"%s\" script."
 msgstr "Skriptet «%s» er i bruk nå."
 
-#: ../plug-ins/script-fu/script-fu-interface.c:238
+#: ../plug-ins/script-fu/script-fu-interface.c:224
 #, c-format
 msgid "Script-Fu: %s"
 msgstr "Script-Fu: %s"
 
 #. we add a colon after the label;
-#. some languages want an extra space here
-#: ../plug-ins/script-fu/script-fu-interface.c:300
+#. *  some languages want an extra space here
+#.
+#: ../plug-ins/script-fu/script-fu-interface.c:288
 #, c-format
 msgid "%s:"
 msgstr "%s"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:348
+#: ../plug-ins/script-fu/script-fu-interface.c:336
 msgid "Script-Fu Color Selection"
 msgstr "Script-Fu fargeval"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:460
+#: ../plug-ins/script-fu/script-fu-interface.c:445
 msgid "Script-Fu File Selection"
 msgstr "Script-Fu filval"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:463
+#: ../plug-ins/script-fu/script-fu-interface.c:448
 msgid "Script-Fu Folder Selection"
 msgstr "Script-Fu mappeval"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:475
+#: ../plug-ins/script-fu/script-fu-interface.c:461
 msgid "Script-Fu Font Selection"
 msgstr "Script-Fu skrifttypeval"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:483
+#: ../plug-ins/script-fu/script-fu-interface.c:469
 msgid "Script-Fu Palette Selection"
 msgstr "Script-Fu palettval"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:492
+#: ../plug-ins/script-fu/script-fu-interface.c:478
 msgid "Script-Fu Pattern Selection"
 msgstr "Script-Fu mønsterval"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:501
+#: ../plug-ins/script-fu/script-fu-interface.c:487
 msgid "Script-Fu Gradient Selection"
 msgstr "Script-Fu fargeovergangsval"
 
-#: ../plug-ins/script-fu/script-fu-interface.c:510
+#: ../plug-ins/script-fu/script-fu-interface.c:496
 msgid "Script-Fu Brush Selection"
 msgstr "Script-Fu penselval"
 
-#: ../plug-ins/script-fu/script-fu-scripts.c:658
+#: ../plug-ins/script-fu/script-fu-interface.c:824
 #, c-format
-msgid ""
-"Error while executing\n"
-"%s\n"
-"\n"
-"%s"
-msgstr ""
-"Køyrefeil i\n"
-" %s\n"
-"\n"
-"%s"
+#| msgid ""
+#| "Error while executing\n"
+#| "%s\n"
+#| "\n"
+#| "%s"
+msgid "Error while executing %s:"
+msgstr "Feil under utføringa av %s:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:712
+#: ../plug-ins/script-fu/script-fu-scripts.c:150
+msgid "Too few arguments to 'script-fu-register' call"
+msgstr "For få argument i oppkallet til «script-fu-register»"
+
+#: ../plug-ins/script-fu/script-fu-scripts.c:609
+#, c-format
+#| msgid ""
+#| "Error while executing\n"
+#| "%s\n"
+#| "\n"
+#| "%s"
+msgid "Error while loading %s:"
+msgstr "Feil ved lastinga av %s:"
+
+#: ../plug-ins/script-fu/script-fu-server.c:713
 msgid "Script-Fu Server Options"
 msgstr "Script-Fu tenaralternativ"
 
-#: ../plug-ins/script-fu/script-fu-server.c:717
+#: ../plug-ins/script-fu/script-fu-server.c:718
 msgid "_Start Server"
 msgstr "_Start tenaren"
 
-#: ../plug-ins/script-fu/script-fu-server.c:745
+#: ../plug-ins/script-fu/script-fu-server.c:746
 msgid "Server port:"
 msgstr "Tenarport:"
 
-#: ../plug-ins/script-fu/script-fu-server.c:751
+#: ../plug-ins/script-fu/script-fu-server.c:752
 msgid "Server logfile:"
 msgstr "Loggfil for tenar:"
 
-#: ../plug-ins/script-fu/script-fu.c:110
+#: ../plug-ins/script-fu/script-fu.c:111
 msgid "Interactive console for Script-Fu development"
 msgstr "Interaktive konsoll for programmering med  Script-Fu"
 
-#: ../plug-ins/script-fu/script-fu.c:116
-#, fuzzy
+#: ../plug-ins/script-fu/script-fu.c:117
 msgid "_Console"
-msgstr "_Konsoll for Script-Fu"
+msgstr "_Konsoll"
 
-#: ../plug-ins/script-fu/script-fu.c:140
+#: ../plug-ins/script-fu/script-fu.c:141
 msgid "Server for remote Script-Fu operation"
 msgstr "Server for fjernoperering av Script-Fu"
 
-#: ../plug-ins/script-fu/script-fu.c:145
+#: ../plug-ins/script-fu/script-fu.c:146
 msgid "_Start Server..."
 msgstr "_Start tenaren..."
 
-#: ../plug-ins/script-fu/script-fu.c:301
+#: ../plug-ins/script-fu/script-fu.c:302
 msgid "_GIMP Online"
 msgstr "_GIMP på Internett"
 
-#: ../plug-ins/script-fu/script-fu.c:302
+#: ../plug-ins/script-fu/script-fu.c:303
 msgid "_User Manual"
 msgstr "_Handboka"
 
-#: ../plug-ins/script-fu/script-fu.c:305
+#: ../plug-ins/script-fu/script-fu.c:306
 msgid "_Script-Fu"
 msgstr "_Script-Fu"
 
-#: ../plug-ins/script-fu/script-fu.c:307
-msgid "_Buttons"
-msgstr "_Knappar"
-
-#: ../plug-ins/script-fu/script-fu.c:309
-msgid "_Logos"
-msgstr "_Logoar"
-
-#: ../plug-ins/script-fu/script-fu.c:311
-msgid "_Misc"
-msgstr "_Ymse"
-
-#: ../plug-ins/script-fu/script-fu.c:313
-msgid "_Patterns"
-msgstr "_Mønsterelement"
-
-#: ../plug-ins/script-fu/script-fu.c:315
+#: ../plug-ins/script-fu/script-fu.c:308
 msgid "_Test"
 msgstr "_Test"
 
-#: ../plug-ins/script-fu/script-fu.c:317
-msgid "_Utilities"
-msgstr "_Nytteprogram"
+#: ../plug-ins/script-fu/script-fu.c:311
+msgid "_Buttons"
+msgstr "_Knappar"
 
-#: ../plug-ins/script-fu/script-fu.c:319
+#: ../plug-ins/script-fu/script-fu.c:313
+msgid "_Logos"
+msgstr "_Logoar"
+
+#: ../plug-ins/script-fu/script-fu.c:315
+msgid "_Patterns"
+msgstr "_Mønsterelement"
+
+#: ../plug-ins/script-fu/script-fu.c:318
 msgid "_Web Page Themes"
-msgstr "Tema for nettside"
+msgstr "Tema for _nettside"
 
-#: ../plug-ins/script-fu/script-fu.c:321
+#: ../plug-ins/script-fu/script-fu.c:320
 msgid "_Alien Glow"
 msgstr "Alien Glow"
 
-#: ../plug-ins/script-fu/script-fu.c:323
+#: ../plug-ins/script-fu/script-fu.c:322
 msgid "_Beveled Pattern"
 msgstr "_Fasettert mønster"
 
-#: ../plug-ins/script-fu/script-fu.c:325
+#: ../plug-ins/script-fu/script-fu.c:324
 msgid "_Classic.Gimp.Org"
 msgstr "_Classic.Gimp.Org"
 
-#: ../plug-ins/script-fu/script-fu.c:328
+#: ../plug-ins/script-fu/script-fu.c:327
 msgid "Alpha to _Logo"
 msgstr "Alfa til _logo"
 
 #: ../plug-ins/script-fu/script-fu.c:330
-msgid "An_imation"
-msgstr "An_imasjon"
-
-#: ../plug-ins/script-fu/script-fu.c:332
-msgid "_Animators"
-msgstr "_Animatorar"
-
-#: ../plug-ins/script-fu/script-fu.c:334
-msgid "_Artistic"
-msgstr "_Artistisk"
-
-#: ../plug-ins/script-fu/script-fu.c:336
-msgid "_Blur"
-msgstr "_Sløring"
-
-#: ../plug-ins/script-fu/script-fu.c:338
-msgid "_Decor"
-msgstr "_Dekor"
-
-#: ../plug-ins/script-fu/script-fu.c:340
-msgid "_Effects"
-msgstr "_Effektar"
-
-#: ../plug-ins/script-fu/script-fu.c:342
-msgid "En_hance"
-msgstr "For_betra"
-
-#: ../plug-ins/script-fu/script-fu.c:344
-msgid "_Light and Shadow"
-msgstr "_Lys og skygge"
-
-#: ../plug-ins/script-fu/script-fu.c:346
-msgid "S_hadow"
-msgstr "_Skygge"
-
-#: ../plug-ins/script-fu/script-fu.c:348
-msgid "_Render"
-msgstr "_Teikning"
-
-#: ../plug-ins/script-fu/script-fu.c:350
-msgid "_Alchemy"
-msgstr "_Alkemi"
-
-#: ../plug-ins/script-fu/script-fu.c:353
 msgid "Re-read all available Script-Fu scripts"
 msgstr "Les alle dei tilgjengelege Script-Fu-skripta inn på nytt"
 
-#: ../plug-ins/script-fu/script-fu.c:358
+#: ../plug-ins/script-fu/script-fu.c:335
 msgid "_Refresh Scripts"
 msgstr "_Oppdater skript"
 
-#: ../plug-ins/script-fu/script-fu.c:381
-msgid ""
-"You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open.  "
-"Please close all Script-Fu windows and try again."
-msgstr ""
-"Du kan ikkje bruke «oppdater skript» når du har ein open Script-Fu dialog. "
-"Lukk alle Script-Fu vindauge og prøv igjen."
+#: ../plug-ins/script-fu/script-fu.c:358
+msgid "You can not use \"Refresh Scripts\" while a Script-Fu dialog box is open.  Please close all Script-Fu windows and try again."
+msgstr "Du kan ikkje bruke «oppdater skript» når du har ein open Script-Fu dialog. Lukk alle Script-Fu vindauge og prøv igjen."
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:1
 msgid "3D _Outline..."
@@ -312,8 +267,7 @@ msgstr "Bruk normalinnstillingane for avbildingskart"
 #: ../plug-ins/script-fu/scripts/slide.scm.h:2
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:7
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:5
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:6
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:2
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:8
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:4
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:6
@@ -351,8 +305,7 @@ msgstr "Skrifttype"
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:4
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:8
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:6
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:7
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:5
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:3
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:9
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:5
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:7
@@ -365,11 +318,8 @@ msgid "Outline blur radius"
 msgstr "Slørradius for omriss"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:8
-msgid ""
-"Outline the selected region (or alpha) with a pattern and add a drop shadow"
-msgstr ""
-"Teikna omrisset til eit vald område (eller alfakanalen) med eit mønster og "
-"ein slagskygge"
+msgid "Outline the selected region (or alpha) with a pattern and add a drop shadow"
+msgstr "Teikna omrisset til eit vald område (eller alfakanalen) med eit mønster og ein slagskygge"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:9
 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:5
@@ -429,8 +379,7 @@ msgstr "Sløringsradius for skygge"
 #: ../plug-ins/script-fu/scripts/slide.scm.h:5
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:11
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:8
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:9
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:8
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:6
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:11
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:8
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:14
@@ -464,8 +413,6 @@ msgstr "3_D Truchet..."
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:1
 #: ../plug-ins/script-fu/scripts/news-text.scm.h:1
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:1
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:1
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:1
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:2
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:2
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:1
@@ -584,7 +531,7 @@ msgstr "Flat ut biletet"
 #: ../plug-ins/script-fu/scripts/alien-neon-logo.scm.h:8
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:8
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:8
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:6
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:4
 msgid "Glow color"
 msgstr "Glødfarge"
 
@@ -629,9 +576,7 @@ msgstr "Stolpelengde"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:4
 msgid "Create an Hrule graphic with an eerie glow for web pages"
-msgstr ""
-"Lager ein linjal («hruler») med ein nifs glød, særleg tenkt brukt på  "
-"nettsider "
+msgstr "Lager ein linjal («hruler») med ein nifs glød, særleg tenkt brukt på  nettsider "
 
 #: ../plug-ins/script-fu/scripts/alien-glow-bar.scm.h:7
 #: ../plug-ins/script-fu/scripts/beveled-pattern-hrule.scm.h:5
@@ -731,19 +676,12 @@ msgid "Width of gaps"
 msgstr "Avstand mellom banda"
 
 #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:1
-msgid ""
-"Add a gradient effect, a drop shadow, and a background to the selected "
-"region (or alpha)"
-msgstr ""
-"Legg fargeovergangseffekt, slagskygge og bakgrunn til det valde området "
-"(eller alfa)"
+msgid "Add a gradient effect, a drop shadow, and a background to the selected region (or alpha)"
+msgstr "Legg fargeovergangseffekt, slagskygge og bakgrunn til det valde området (eller alfa)"
 
 #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:3
-msgid ""
-"Create a plain text logo with a gradient effect, a drop shadow, and a "
-"background"
-msgstr ""
-"Lager ein enkel tekstlogo med fargeovergangseffekt, slagskygge og bakgrunn"
+msgid "Create a plain text logo with a gradient effect, a drop shadow, and a background"
+msgstr "Lager ein enkel tekstlogo med fargeovergangseffekt, slagskygge og bakgrunn"
 
 #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:8
 msgid "_Basic I..."
@@ -843,12 +781,8 @@ msgid "Blend Animation needs at least three source layers"
 msgstr "Filteret «bland» må ha minst tre kjeldelag."
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:2
-msgid ""
-"Create intermediate layers to blend two or more layers over a background as "
-"an animation"
-msgstr ""
-"Oppretter mellombels lag for å blande to eller fleire lag over ein bakgrunn "
-"som animasjon"
+msgid "Create intermediate layers to blend two or more layers over a background as an animation"
+msgstr "Oppretter mellombels lag for å blande to eller fleire lag over ein bakgrunn som animasjon"
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:3
 msgid "Intermediate frames"
@@ -867,12 +801,8 @@ msgid "_Blend..."
 msgstr "_Bland..."
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:1
-msgid ""
-"Add blended backgrounds, highlights, and shadows to the selected region (or "
-"alpha)"
-msgstr ""
-"Legg høglys, skyggar og ein bakgrunnsfargeovergang til det valde området "
-"(eller alfakanalen)"
+msgid "Add blended backgrounds, highlights, and shadows to the selected region (or alpha)"
+msgstr "Legg høglys, skyggar og ein bakgrunnsfargeovergang til det valde området (eller alfakanalen)"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:3
 msgid "Blen_ded..."
@@ -884,8 +814,7 @@ msgstr "Blandemodus"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:5
 msgid "Create a logo with blended backgrounds, highlights, and shadows"
-msgstr ""
-"Lager ein logo med høglys og skyggar og med ein fargeovergang som bakgrunn"
+msgstr "Lager ein logo med høglys og skyggar og med ein fargeovergang som bakgrunn"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:6
 msgid "Custom Gradient"
@@ -968,12 +897,8 @@ msgid "Corona width"
 msgstr "Koronabreidde"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:5
-msgid ""
-"Create intermediate layers to produce an animated 'burn-in' transition "
-"between two layers"
-msgstr ""
-"Oppretter mellombels lag for å lage ein animert «innbrent» overgang mellom "
-"to lag"
+msgid "Create intermediate layers to produce an animated 'burn-in' transition between two layers"
+msgstr "Oppretter mellombels lag for å lage ein animert «innbrent» overgang mellom to lag"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:6
 msgid "Fadeout"
@@ -992,12 +917,8 @@ msgid "Speed (pixels/frame)"
 msgstr "Fart (pikslar/ramme)"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:11
-msgid ""
-"The Burn-In script needs two layers in total. A foreground layer with "
-"transparency and a background layer."
-msgstr ""
-"Filteret «brenn inn» treng totalt to lag, eit forgrunnslag med gjennomsikt "
-"og eit bakgrunnslag"
+msgid "The Burn-In script needs two layers in total. A foreground layer with transparency and a background layer."
+msgstr "Filteret «brenn inn» treng totalt to lag, eit forgrunnslag med gjennomsikt og eit bakgrunnslag"
 
 #: ../plug-ins/script-fu/scripts/camo.scm.h:1
 msgid "Color 1"
@@ -1059,12 +980,8 @@ msgid "Carved..."
 msgstr "Utskjering..."
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:4
-msgid ""
-"Create a logo with text raised above or carved in to the specified "
-"background image"
-msgstr ""
-"Lager ein tekst som er løfta ut av eller skore ned i det spesifiserte "
-"bakgrunnsbiletet"
+msgid "Create a logo with text raised above or carved in to the specified background image"
+msgstr "Lager ein tekst som er løfta ut av eller skore ned i det spesifiserte bakgrunnsbiletet"
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
 msgid "Padding around text"
@@ -1088,8 +1005,7 @@ msgstr "_Kritt..."
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:1
 msgid "Add a chipped woodcarving effect to the selected region (or alpha)"
-msgstr ""
-"Legg ein sponlagt treskjeringseffekt til det valde området (eller alfa)"
+msgstr "Legg ein sponlagt treskjeringseffekt til det valde området (eller alfa)"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:2
 msgid "Blur amount"
@@ -1124,12 +1040,8 @@ msgid "Keep background"
 msgstr "Behald bakgrunnen"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:1
-msgid ""
-"Add a chrome effect to the selected region (or alpha) using a specified "
-"(grayscale) stencil"
-msgstr ""
-"Legg ein kromeffekt i det valde området (eller alfa) ved hjelp av eit "
-"spesifisert (gråskala) mønster"
+msgid "Add a chrome effect to the selected region (or alpha) using a specified (grayscale) stencil"
+msgstr "Legg ein kromeffekt i det valde området (eller alfa) ved hjelp av eit spesifisert (gråskala) mønster"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:2
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:1
@@ -1192,11 +1104,8 @@ msgid "Circuit seed"
 msgstr "Startverdi"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:2
-msgid ""
-"Fill the selected region (or alpha) with traces like those on a circuit board"
-msgstr ""
-"Fyller det valde området (eller alfa) med mønster som minner om eit "
-"printbrett"
+msgid "Fill the selected region (or alpha) with traces like those on a circuit board"
+msgstr "Fyller det valde området (eller alfa) med mønster som minner om eit printbrett"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:3
 #: ../plug-ins/script-fu/scripts/lava.scm.h:3
@@ -1225,8 +1134,7 @@ msgstr "_Kretskort..."
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:1
 msgid "Add a cloth-like texture to the selected region (or alpha)"
-msgstr ""
-"Legg ein tekstilliknande tekstur over det valde området (eller alfakanalen)"
+msgstr "Legg ein tekstilliknande tekstur over det valde området (eller alfakanalen)"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:2
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:1
@@ -1272,12 +1180,8 @@ msgid "_Coffee Stain..."
 msgstr "_Kaffiflekkar..."
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:1
-msgid ""
-"Add a comic-book effect to the selected region (or alpha) by outlining and "
-"filling with a gradient"
-msgstr ""
-"Legg ein teikneserieffekt til det valde området (eller alfakanalen) ved å "
-"teikne omrissa og fylle med ein fargeovergang"
+msgid "Add a comic-book effect to the selected region (or alpha) by outlining and filling with a gradient"
+msgstr "Legg ein teikneserieffekt til det valde området (eller alfakanalen) ved å teikne omrissa og fylle med ein fargeovergang"
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:3
 msgid "Comic Boo_k..."
@@ -1285,9 +1189,7 @@ msgstr "Tei_kneserie..."
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:4
 msgid "Create a comic-book style logo by outlining and filling with a gradient"
-msgstr ""
-"Legg ein teiknesliknande logo ved å teikne omrissa og fylle med ein "
-"fargeovergang"
+msgstr "Legg ein teiknesliknande logo ved å teikne omrissa og fylle med ein fargeovergang"
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:9
 msgid "Outline color"
@@ -1299,12 +1201,8 @@ msgid "Outline size"
 msgstr "Omrisstorleik"
 
 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:1
-msgid ""
-"Add a metallic effect to the selected region (or alpha) with reflections and "
-"perspective shadows"
-msgstr ""
-"Lager ein metalleffekt i det valde området (eller alfakanalen) med "
-"refleksjonar og perspektivskygge"
+msgid "Add a metallic effect to the selected region (or alpha) with reflections and perspective shadows"
+msgstr "Lager ein metalleffekt i det valde området (eller alfakanalen) med refleksjonar og perspektivskygge"
 
 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:3
 msgid "Cool _Metal..."
@@ -1316,6 +1214,8 @@ msgstr "Lager ein metallisk logo med refleksjonar og perspektivskygge"
 
 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:5
 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:4
+#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:5
 msgid "Effect size (pixels)"
 msgstr "Effektbreidde (pikslar)"
 
@@ -1325,9 +1225,7 @@ msgstr "Bakgrunnsbilete"
 
 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:3
 msgid "Create a logo with a crystal/gel effect displacing the image underneath"
-msgstr ""
-"Lager ein logo med ein krystall- eller gélé-effekt ved å forskyve biletet "
-"nedanfrå"
+msgstr "Lager ein logo med ein krystall- eller gélé-effekt ved å forskyve biletet nedanfrå"
 
 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:4
 msgid "Crystal..."
@@ -1503,11 +1401,8 @@ msgid "Black on white"
 msgstr "Svart på kvit"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:3
-msgid ""
-"Create an image filled with previews of fonts matching a fontname filter"
-msgstr ""
-"Lager eit bilete med førehandsvisingar av dei skrifttypane som er valde i "
-"filteret"
+msgid "Create an image filled with previews of fonts matching a fontname filter"
+msgstr "Lager eit bilete med førehandsvisingar av dei skrifttypane som er valde i filteret"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:4
 msgid "Font _size (pixels)"
@@ -1542,12 +1437,8 @@ msgid "_Text"
 msgstr "_Tekst"
 
 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:1
-msgid ""
-"Add a frost effect to the selected region (or alpha) with an added drop "
-"shadow"
-msgstr ""
-"Legg ein frosteffekt og ein slagskygge til det valde området (eller "
-"alfakanalen)"
+msgid "Add a frost effect to the selected region (or alpha) with an added drop shadow"
+msgstr "Legg ein frosteffekt og ein slagskygge til det valde området (eller alfakanalen)"
 
 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:3
 msgid "Create frozen logo with an added drop shadow"
@@ -1642,33 +1533,20 @@ msgid "_Small Header..."
 msgstr "_Lita overskrift..."
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:2
-msgid ""
-"Create an image of a Tube Button Label Header using the gimp.org webpage "
-"theme"
-msgstr ""
-"Lager tekst til ein merkelapp  med røyrforma skrift og nettsidetema frå gimp."
-"org"
+msgid "Create an image of a Tube Button Label Header using the gimp.org webpage theme"
+msgstr "Lager tekst til ein merkelapp  med røyrforma skrift og nettsidetema frå gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:3
 msgid "Create an image of a Tube Button Label using the gimp.org webpage theme"
-msgstr ""
-"Lager tekst til knapp med røyrforma skrift og nettsidetema frå gimp.org"
+msgstr "Lager tekst til knapp med røyrforma skrift og nettsidetema frå gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:4
-msgid ""
-"Create an image of a second level Tube Button Label using the gimp.org "
-"webpage theme"
-msgstr ""
-"Lager tekst til ein andre nivå knapp med røyrforma skrift og nettsidetema "
-"frå gimp.org"
+msgid "Create an image of a second level Tube Button Label using the gimp.org webpage theme"
+msgstr "Lager tekst til ein andre nivå knapp med røyrforma skrift og nettsidetema frå gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:5
-msgid ""
-"Create an image of a third level Tube Button Label using the gimp.org "
-"webpage theme"
-msgstr ""
-"Lager tekst til ein tredje nivå knapp med røyrforma skrift og nettsidetema "
-"frå gimp.org"
+msgid "Create an image of a third level Tube Button Label using the gimp.org webpage theme"
+msgstr "Lager tekst til ein tredje nivå knapp med røyrforma skrift og nettsidetema frå gimp.org"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:16
 msgid "T_ube Sub-Button Label..."
@@ -1687,12 +1565,8 @@ msgid "_Tube Button Label..."
 msgstr "_Knappetekst normal..."
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:1
-msgid ""
-"Add gradients, patterns, shadows, and bump maps to the selected region (or "
-"alpha)"
-msgstr ""
-"Legg fargeovergang, mønster, skygge og punktkart til det valde området "
-"(eller alfakanalen)"
+msgid "Add gradients, patterns, shadows, and bump maps to the selected region (or alpha)"
+msgstr "Legg fargeovergang, mønster, skygge og punktkart til det valde området (eller alfakanalen)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:3
 msgid "Blend gradient (outline)"
@@ -1727,7 +1601,6 @@ msgid "Pattern (text)"
 msgstr "Mønster (tekst)"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:15
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:5
 msgid "Shadow"
 msgstr "Skygge"
 
@@ -1749,17 +1622,12 @@ msgstr "Bruk mønsteroverlegg"
 
 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:1
 msgid "Add a glowing hot metal effect to the selected region (or alpha)"
-msgstr ""
-"Legg ein effekt av glødande metall til det valde området (eller alfakanalen)"
+msgstr "Legg ein effekt av glødande metall til det valde området (eller alfakanalen)"
 
 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:3
 msgid "Create a logo that looks like glowing hot metal"
 msgstr "Lager ein logo som minner om glødande metall"
 
-#: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:4
-msgid "Effect size (pixels * 3)"
-msgstr "Effektbreidde (pikslar * 3)"
-
 #: ../plug-ins/script-fu/scripts/glowing-logo.scm.h:7
 msgid "Glo_wing Hot..."
 msgstr "_Glødande..."
@@ -1796,12 +1664,8 @@ msgstr "_Eigendefinert fargeovergang..."
 
 #: ../plug-ins/script-fu/scripts/grid-system.scm.h:1
 #: ../plug-ins/script-fu/scripts/guides-from-selection.scm.h:1
-msgid ""
-"Draw a grid as specified by the lists of X and Y locations using the current "
-"brush"
-msgstr ""
-"Teiknar eit rutenett ut frå x- og y-koordinata ved hjelp av den aktive "
-"penselen."
+msgid "Draw a grid as specified by the lists of X and Y locations using the current brush"
+msgstr "Teiknar eit rutenett ut frå x- og y-koordinata ved hjelp av den aktive penselen."
 
 #: ../plug-ins/script-fu/scripts/grid-system.scm.h:2
 msgid "X divisions"
@@ -1821,9 +1685,7 @@ msgstr "Nye hjelpelinjer frå _utvalet"
 
 #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:1
 msgid "Add a guide at the position specified as a percentage of the image size"
-msgstr ""
-"Legg til ei hjelpelinje i den spesifiserte posisjonen som prosent av "
-"biletstorleiken"
+msgstr "Legg til ei hjelpelinje i den spesifiserte posisjonen som prosent av biletstorleiken"
 
 #: ../plug-ins/script-fu/scripts/guides-new-percent.scm.h:2
 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:2
@@ -1851,8 +1713,7 @@ msgstr "Vertikal"
 
 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:1
 msgid "Add a guide at the orientation and position specified (in pixels)"
-msgstr ""
-"Legg til ei hjelpelinje i den spesifiserte retninga og posisjonen i pikslar)"
+msgstr "Legg til ei hjelpelinje i den spesifiserte retninga og posisjonen i pikslar)"
 
 #: ../plug-ins/script-fu/scripts/guides-new.scm.h:4
 msgid "New _Guide..."
@@ -1924,11 +1785,8 @@ msgid "_Lava..."
 msgstr "_Lava..."
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:1
-msgid ""
-"Fill a layer with rays emanating outward from its center using the FG color"
-msgstr ""
-"Fyller biletet med stråler som går utover frå sentrum. Farge frå "
-"forgrunnsfargen"
+msgid "Fill a layer with rays emanating outward from its center using the FG color"
+msgstr "Fyller biletet med stråler som går utover frå sentrum. Farge frå forgrunnsfargen"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:2
 msgid "Line _Nova..."
@@ -1998,9 +1856,7 @@ msgstr "_Rektangulær..."
 
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:2
 msgid "Convert the selected region (or alpha) into a neon-sign like object"
-msgstr ""
-"Omformar det valde området (eller alfakanalen) til eit neonskiltliknande "
-"objekt"
+msgstr "Omformar det valde området (eller alfakanalen) til eit neonskiltliknande objekt"
 
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:3
 msgid "Create a logo in the style of a neon sign"
@@ -2010,10 +1866,6 @@ msgstr "Lager ein logo som minner om neonskilt"
 msgid "Create shadow"
 msgstr "Lag skygge"
 
-#: ../plug-ins/script-fu/scripts/neon-logo.scm.h:5
-msgid "Effect size (pixels * 5)"
-msgstr "Effektbreidde"
-
 #: ../plug-ins/script-fu/scripts/neon-logo.scm.h:9
 msgid "N_eon..."
 msgstr "N_eon..."
@@ -2219,10 +2071,8 @@ msgid "Black"
 msgstr "Svart"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:2
-msgid ""
-"Create a multi-layer image by adding a ripple effect to the current image"
-msgstr ""
-"Lager eit multilagsbilete ved å legge ein krusningseffekt til i biletet"
+msgid "Create a multi-layer image by adding a ripple effect to the current image"
+msgstr "Lager eit multilagsbilete ved å legge ein krusningseffekt til i biletet"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:3
 msgid "Edge behavior"
@@ -2262,8 +2112,7 @@ msgid "Edge radius"
 msgstr "Kantradius"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:5
-msgid ""
-"Round the corners of an image and optionally add a drop-shadow and background"
+msgid "Round the corners of an image and optionally add a drop-shadow and background"
 msgstr "Rund av bilethjørna og legg til slagskygge og bakgrunn"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:9
@@ -2355,30 +2204,9 @@ msgstr "Lag ein fartsfylt logo"
 msgid "Speed Text..."
 msgstr "Fartsfylt tekst..."
 
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:2
-msgid "Create a simple sphere with a drop shadow"
-msgstr "Lag ei enkel kule med slagskygge"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:3
-msgid "Lighting (degrees)"
-msgstr "Lyssetting (grader)"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:4
-msgid "Radius (pixels)"
-msgstr "Radius (pikslar)"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:6
-msgid "Sphere color"
-msgstr "Farge på kula"
-
-#: ../plug-ins/script-fu/scripts/sphere.scm.h:7
-msgid "_Sphere..."
-msgstr "_Kule..."
-
 #: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:1
 msgid "Create an animation by mapping the current image onto a spinning sphere"
-msgstr ""
-"Lager ein animasjon ved å avbilde det aktive biletet på ei roterande kule"
+msgstr "Lager ein animasjon ved å avbilde det aktive biletet på ei roterande kule"
 
 #: ../plug-ins/script-fu/scripts/spinning-globe.scm.h:2
 msgid "Frames"
@@ -2397,10 +2225,8 @@ msgid "_Spinning Globe..."
 msgstr "_Roterande kule..."
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:1
-msgid ""
-"Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
-msgstr ""
-"Legg spirographs, epitrochoids og Lissajous kurver til det gjeldande laget"
+msgid "Add Spirographs, Epitrochoids, and Lissajous Curves to the current layer"
+msgstr "Legg spirographs, epitrochoids og Lissajous kurver til det gjeldande laget"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:2
 msgid "Airbrush"
@@ -2523,47 +2349,11 @@ msgstr "Type"
 msgid "_Spyrogimp..."
 msgstr "_Spyrogimp..."
 
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:2
-msgid "Burst color"
-msgstr "Utbrotsfarge"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:3
-msgid "Create a logo using a starburst gradient"
-msgstr "Lager ein logo med stjerneutbrot som fargeovergang"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:4
-msgid "Effect size (pixels * 30)"
-msgstr "Effektstorleik (pikslar * 30)"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:5
-msgid ""
-"Fill the selected region (or alpha) with a starburst gradient and add a "
-"shadow"
-msgstr ""
-"Fyll det valde området (eller alfakanalen) med stjerneutbrot og legg til "
-"skygge"
-
-#: ../plug-ins/script-fu/scripts/starburst-logo.scm.h:8
-msgid "Starb_urst..."
-msgstr "Stjerne_utbrot..."
-
 #: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:1
 msgid "Create a logo using a rock-like texture, a nova glow, and shadow"
 msgstr "Lager ein logo med steinstruktur, stjerneglød og skygge"
 
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:2
-msgid "Effect size (pixels * 4)"
-msgstr "Effektstorleik (pikslar * 4)"
-
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:3
-msgid ""
-"Fill the selected region (or alpha) with a rock-like texture, a nova glow, "
-"and shadow"
-msgstr ""
-"Fyll det valde området (eller alfakanalen) med ein steinliknande tekstur, "
-"eit nova utbrot og skygge"
-
-#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:7
+#: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:5
 msgid "Sta_rscape..."
 msgstr "St_jerneform..."
 
@@ -2632,8 +2422,7 @@ msgid "Antialias"
 msgstr "Kantutjamning"
 
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:2
-msgid ""
-"Create a logo by rendering the specified text along the perimeter of a circle"
+msgid "Create a logo by rendering the specified text along the perimeter of a circle"
 msgstr "Lager ein logo ved å teikne teksten langs ein sirkelperiferi"
 
 #: ../plug-ins/script-fu/scripts/text-circle.scm.h:3
@@ -2645,8 +2434,7 @@ msgid "Text C_ircle..."
 msgstr "_Tekstsirkel..."
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:3
-msgid ""
-"Create a textured logo with highlights, shadows, and a mosaic background"
+msgid "Create a textured logo with highlights, shadows, and a mosaic background"
 msgstr "Lager ein mønstra logo med høglys, skygger og mosaikkbakgrunn"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:4
@@ -2654,12 +2442,8 @@ msgid "Ending blend"
 msgstr "Sluttfarge"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:5
-msgid ""
-"Fill the selected region (or alpha) with a texture and add highlights, "
-"shadows, and a mosaic background"
-msgstr ""
-"Fyll det valde området (eller alfakanalen) med ein teksur og legg til "
-"høglys, skygge og ein mosaikkbakgrunn"
+msgid "Fill the selected region (or alpha) with a texture and add highlights, shadows, and a mosaic background"
+msgstr "Fyll det valde området (eller alfakanalen) med ein teksur og legg til høglys, skygge og ein mosaikkbakgrunn"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:8
 msgid "Hexagons"
@@ -2750,12 +2534,8 @@ msgid "Amplitude"
 msgstr "Amplityde"
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:2
-msgid ""
-"Create a multi-layer image with an effect like a stone was thrown into the "
-"current image"
-msgstr ""
-"Oppretter eit fleirlags bilete med ein effekt som kan minne om ringer i vatn "
-"etter eit steinkast"
+msgid "Create a multi-layer image with an effect like a stone was thrown into the current image"
+msgstr "Oppretter eit fleirlags bilete med ein effekt som kan minne om ringer i vatn etter eit steinkast"
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:3
 msgid "Invert direction"
@@ -2770,12 +2550,8 @@ msgid "_Waves..."
 msgstr "_Bølgjer..."
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:1
-msgid ""
-"Create a new layer filled with a weave effect to be used as an overlay or "
-"bump map"
-msgstr ""
-"Opretter eit nytt lag fylt med bølgjer. Kan brukast som overlegg eller eit "
-"avbildingskart."
+msgid "Create a new layer filled with a weave effect to be used as an overlay or bump map"
+msgstr "Opretter eit nytt lag fylt med bølgjer. Kan brukast som overlegg eller eit avbildingskart."
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:2
 msgid "Ribbon spacing"
@@ -2867,9 +2643,7 @@ msgstr "Arbeid med foto frå _digitalkamera"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:1
 msgid "Add a subtle translucent 3D effect to the selected region (or alpha)"
-msgstr ""
-"Legg ein subtil halvgjennomsiktig 3D-effekt til det valde området (eller "
-"alfakanalen)"
+msgstr "Legg ein subtil halvgjennomsiktig 3D-effekt til det valde området (eller alfakanalen)"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:2
 msgid "Drop shadow X offset"
@@ -2907,6 +2681,70 @@ msgstr "Dekkevne for høglys"
 msgid "_Xach-Effect..."
 msgstr "_Xach-Effect..."
 
+#~ msgid "_Misc"
+#~ msgstr "_Ymse"
+#~ msgid "_Utilities"
+#~ msgstr "_Nytteprogram"
+#~ msgid "An_imation"
+#~ msgstr "An_imasjon"
+#~ msgid "_Animators"
+#~ msgstr "_Animatorar"
+#~ msgid "_Artistic"
+#~ msgstr "_Artistisk"
+#~ msgid "_Blur"
+#~ msgstr "_Sløring"
+#~ msgid "_Decor"
+#~ msgstr "_Dekor"
+#~ msgid "_Effects"
+#~ msgstr "_Effektar"
+#~ msgid "En_hance"
+#~ msgstr "For_betra"
+#~ msgid "_Light and Shadow"
+#~ msgstr "_Lys og skygge"
+#~ msgid "S_hadow"
+#~ msgstr "_Skygge"
+#~ msgid "_Render"
+#~ msgstr "_Teikning"
+#~ msgid "_Alchemy"
+#~ msgstr "_Alkemi"
+#~ msgid "Effect size (pixels * 3)"
+#~ msgstr "Effektbreidde (pikslar * 3)"
+#~ msgid "Effect size (pixels * 5)"
+#~ msgstr "Effektbreidde"
+#~ msgid "Create a simple sphere with a drop shadow"
+#~ msgstr "Lag ei enkel kule med slagskygge"
+#~ msgid "Lighting (degrees)"
+#~ msgstr "Lyssetting (grader)"
+#~ msgid "Radius (pixels)"
+#~ msgstr "Radius (pikslar)"
+#~ msgid "Sphere color"
+#~ msgstr "Farge på kula"
+#~ msgid "_Sphere..."
+#~ msgstr "_Kule..."
+#~ msgid "Burst color"
+#~ msgstr "Utbrotsfarge"
+#~ msgid "Create a logo using a starburst gradient"
+#~ msgstr "Lager ein logo med stjerneutbrot som fargeovergang"
+#~ msgid "Effect size (pixels * 30)"
+#~ msgstr "Effektstorleik (pikslar * 30)"
+#~ msgid ""
+#~ "Fill the selected region (or alpha) with a starburst gradient and add a "
+#~ "shadow"
+#~ msgstr ""
+#~ "Fyll det valde området (eller alfakanalen) med stjerneutbrot og legg til "
+#~ "skygge"
+#~ msgid "Starb_urst..."
+#~ msgstr "Stjerne_utbrot..."
+#~ msgid "Effect size (pixels * 4)"
+#~ msgstr "Effektstorleik (pikslar * 4)"
+#~ msgid ""
+#~ "Fill the selected region (or alpha) with a rock-like texture, a nova "
+#~ "glow, and shadow"
+#~ msgstr ""
+#~ "Fyll det valde området (eller alfakanalen) med ein steinliknande tekstur, "
+#~ "eit nova utbrot og skygge"
+
 #, fuzzy
 #~ msgid "Script-Fu _Console"
 #~ msgstr "Script-Fu konsoll"
+
diff --git a/po-script-fu/ro.po b/po-script-fu/ro.po
index d5641ba936..eacfaf7cf2 100644
--- a/po-script-fu/ro.po
+++ b/po-script-fu/ro.po
@@ -1,4 +1,4 @@
-# gimp ro translation
+# Romanian GIMP translation
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Robert Claudiu Gheorghe , 2001.
 # Cristian Secară , 2008-2009.
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp-script-fu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-22 23:39+0200\n"
-"PO-Revision-Date: 2009-03-18 21:58+0200\n"
+"POT-Creation-Date: 2009-09-28 23:10+0300\n"
+"PO-Revision-Date: 2009-09-15 17:32+0200\n"
 "Last-Translator: Cristian Secară \n"
 "Language-Team: Română \n"
 "MIME-Version: 1.0\n"
@@ -230,9 +230,8 @@ msgstr "Creează o siglă cu text conturat și umbră de perspectivă"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:4
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:6
-#, fuzzy
 msgid "Default bumpmap settings"
-msgstr "Comentariul implicit"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:5
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:5
@@ -312,14 +311,15 @@ msgid "Font size (pixels)"
 msgstr "Dimensiune font (pixeli)"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:7
-#, fuzzy
 msgid "Outline blur radius"
-msgstr "Rază:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:8
 msgid ""
 "Outline the selected region (or alpha) with a pattern and add a drop shadow"
 msgstr ""
+"Conturează zona selectată (sau alfa) cu un model și adaugă o umbră de "
+"perspectivă"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:9
 #: ../plug-ins/script-fu/scripts/beveled-pattern-arrow.scm.h:5
@@ -345,9 +345,8 @@ msgid "Shadow Y offset"
 msgstr "Decalaș umbră pe axa Y"
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:12
-#, fuzzy
 msgid "Shadow blur radius"
-msgstr "Rază:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/3d-outline.scm.h:13
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:10
@@ -419,7 +418,7 @@ msgstr "Truchet 3_D..."
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:1
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:1
 msgid "Background color"
-msgstr "Culoare de fundal"
+msgstr "Culoare fundal"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:3
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:2
@@ -428,13 +427,12 @@ msgstr "Dimensiune bloc"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:4
 msgid "Create an image filled with a 3D Truchet pattern"
-msgstr ""
+msgstr "Creează o imagine umplută cu un model 3D Truchet"
 
-# hm ? sigur nu invers ?
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:5
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:7
 msgid "End blend"
-msgstr "Amestec final"
+msgstr "Amestec de final"
 
 #: ../plug-ins/script-fu/scripts/3dTruchet.scm.h:6
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:5
@@ -619,7 +617,7 @@ msgstr "Rază de strălucire"
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:9
 #: ../plug-ins/script-fu/scripts/beveled-button.scm.h:6
 msgid "Padding"
-msgstr ""
+msgstr "Umplere"
 
 #: ../plug-ins/script-fu/scripts/alien-glow-button.scm.h:11
 #: ../plug-ins/script-fu/scripts/basic1-logo.scm.h:7
@@ -810,9 +808,8 @@ msgid "Looped"
 msgstr "Buclat"
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:5
-#, fuzzy
 msgid "Max. blur radius"
-msgstr "Rază:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/blend-anim.scm.h:6
 msgid "_Blend..."
@@ -823,6 +820,8 @@ msgid ""
 "Add blended backgrounds, highlights, and shadows to the selected region (or "
 "alpha)"
 msgstr ""
+"Adaugă fundaluri amestecate, părți luminoase și umbre la zona selectată (sau "
+"alfa)"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:3
 msgid "Blen_ded..."
@@ -834,26 +833,23 @@ msgstr "Mod de amestec"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:5
 msgid "Create a logo with blended backgrounds, highlights, and shadows"
-msgstr ""
+msgstr "Creează o siglă cu fundaluri amestecate, părți luminoase și umbre"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:6
 msgid "Custom Gradient"
 msgstr "Degrade personalizat"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:8
-#, fuzzy
 msgid "FG-BG-HSV"
-msgstr "Prim plan -> Fundal (HSV)"
+msgstr "PP-FD-HSV"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:9
-#, fuzzy
 msgid "FG-BG-RGB"
-msgstr "Prim plan -> Fundal (RGB)"
+msgstr "PP-FD-RGB"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:10
-#, fuzzy
 msgid "FG-Transparent"
-msgstr "Transparent"
+msgstr "Fundal-Transparent"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:13
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:7
@@ -871,9 +867,8 @@ msgstr "Degrade"
 #: ../plug-ins/script-fu/scripts/gradient-example.scm.h:3
 #: ../plug-ins/script-fu/scripts/rendermap.scm.h:5
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:4
-#, fuzzy
 msgid "Gradient reverse"
-msgstr "Gradienți"
+msgstr "Degrade invers"
 
 #: ../plug-ins/script-fu/scripts/blended-logo.scm.h:15
 msgid "Offset (pixels)"
@@ -889,9 +884,8 @@ msgid "Background Color"
 msgstr "Culoare fundal"
 
 #: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:4
-#, fuzzy
 msgid "Bo_vination..."
-msgstr "Rotesc..."
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/bovinated-logo.scm.h:5
 msgid "Create a logo with text in the style of 'cow spots'"
@@ -922,21 +916,22 @@ msgstr ""
 msgid "Corona width"
 msgstr "Lățime coroană"
 
+# hm ?
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:5
 msgid ""
 "Create intermediate layers to produce an animated 'burn-in' transition "
 "between two layers"
 msgstr ""
+"Creează straturi intermediare pentru a produce o tranziție „arsu” între două "
+"straturi"
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:6
-#, fuzzy
 msgid "Fadeout"
-msgstr "Lațime strat:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:7
-#, fuzzy
 msgid "Fadeout width"
-msgstr "Lațime strat:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/burn-in-anim.scm.h:9
 msgid "Prepare for GIF"
@@ -988,19 +983,16 @@ msgid "_Camouflage..."
 msgstr "_Camuflaj..."
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:1
-#, fuzzy
 msgid "Carve white areas"
-msgstr "Luminozitate:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:2
-#, fuzzy
 msgid "Image to carve"
-msgstr "Imagine sursă"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/carve-it.scm.h:3
-#, fuzzy
 msgid "Stencil C_arve..."
-msgstr "Curbat"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:1
 msgid "Background Image"
@@ -1011,9 +1003,8 @@ msgid "Carve raised text"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:3
-#, fuzzy
 msgid "Carved..."
-msgstr "Curbat"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:4
 msgid ""
@@ -1023,12 +1014,11 @@ msgstr ""
 
 #: ../plug-ins/script-fu/scripts/carved-logo.scm.h:7
 msgid "Padding around text"
-msgstr ""
+msgstr "Umplere în jurul textului"
 
 #: ../plug-ins/script-fu/scripts/chalk.scm.h:2
-#, fuzzy
 msgid "Chalk color"
-msgstr "Culoarea pentru noul canal"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chalk.scm.h:3
 msgid "Create a chalk drawing effect for the selected region (or alpha)"
@@ -1036,7 +1026,8 @@ msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chalk.scm.h:4
 msgid "Create a logo resembling chalk scribbled on a blackboard"
-msgstr "Crează o siglă asemănătoare cu o mâzgăleală de cretă pe o tablă neagră"
+msgstr ""
+"Creează o siglă asemănătoare cu o mâzgăleală de cretă pe o tablă neagră"
 
 #: ../plug-ins/script-fu/scripts/chalk.scm.h:8
 msgid "_Chalk..."
@@ -1055,9 +1046,8 @@ msgid "Chip Awa_y..."
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:4
-#, fuzzy
 msgid "Chip amount"
-msgstr "Umple împrejur"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:5
 msgid "Create a logo resembling a chipped wood carving"
@@ -1068,9 +1058,8 @@ msgid "Drop shadow"
 msgstr "Umbră de perspectivă"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:7
-#, fuzzy
 msgid "Fill BG with pattern"
-msgstr "/Modificare/Umple cu culoarea de fundal"
+msgstr "Umple fundalul cu un model"
 
 #: ../plug-ins/script-fu/scripts/chip-away.scm.h:10
 msgid "Invert"
@@ -1099,20 +1088,17 @@ msgstr "Factor de crominanţă"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:4
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:3
-#, fuzzy
 msgid "Chrome lightness"
-msgstr "Luminozitate culoare"
+msgstr "Luminozitate crom"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:5
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:4
-#, fuzzy
 msgid "Chrome saturation"
-msgstr "Saturație culoare"
+msgstr "Saturație crom"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:6
-#, fuzzy
 msgid "Chrome white areas"
-msgstr "Zone de alb culoare"
+msgstr "Zone albe ale cromului"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:7
 #: ../plug-ins/script-fu/scripts/crystal-logo.scm.h:5
@@ -1122,23 +1108,20 @@ msgstr "Hartă de mediu"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:8
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:9
-#, fuzzy
 msgid "Highlight balance"
-msgstr "Balans de "
+msgstr "Balans parte luminoasă"
 
 #: ../plug-ins/script-fu/scripts/chrome-it.scm.h:9
-#, fuzzy
 msgid "Stencil C_hrome..."
-msgstr "Afișare informații de ajutor"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:1
 msgid "Add a simple chrome effect to the selected region (or alpha)"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:4
-#, fuzzy
 msgid "C_hrome..."
-msgstr "Afișare informații de ajutor"
+msgstr "_Crom..."
 
 #: ../plug-ins/script-fu/scripts/chrome-logo.scm.h:5
 msgid "Create a simplistic, but cool, chromed logo"
@@ -1161,25 +1144,22 @@ msgstr ""
 #: ../plug-ins/script-fu/scripts/lava.scm.h:3
 #: ../plug-ins/script-fu/scripts/predator.scm.h:3
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:11
-#, fuzzy
 msgid "Keep selection"
-msgstr "Selecție"
+msgstr "Păstrează selecția"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:4
 msgid "No background (only for separate layer)"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:5
-#, fuzzy
 msgid "Oilify mask size"
-msgstr "Dimensiune"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:6
 #: ../plug-ins/script-fu/scripts/lava.scm.h:6
 #: ../plug-ins/script-fu/scripts/predator.scm.h:6
-#, fuzzy
 msgid "Separate layer"
-msgstr "Scalează stratul"
+msgstr "Strat separat"
 
 #: ../plug-ins/script-fu/scripts/circuit.scm.h:7
 msgid "_Circuit..."
@@ -1195,44 +1175,38 @@ msgid "Azimuth"
 msgstr "Azimut"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:3
-#, fuzzy
 msgid "Blur X"
-msgstr "Claritate"
+msgstr "Neclaritate X"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:4
-#, fuzzy
 msgid "Blur Y"
-msgstr "Claritate"
+msgstr "Neclaritate Y"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:5
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:5
-#, fuzzy
 msgid "Depth"
-msgstr "Adâncimea maximă:"
+msgstr "Adâncime"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:6
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:6
-#, fuzzy
 msgid "Elevation"
-msgstr "Selecție"
+msgstr "Elevație"
 
 #: ../plug-ins/script-fu/scripts/clothify.scm.h:7
 msgid "_Clothify..."
-msgstr ""
+msgstr "Ț_esătură..."
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:1
 msgid "Add realistic looking coffee stains to the image"
 msgstr "Adaugă la imagine un aspect realist de pete de cafea"
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:2
-#, fuzzy
 msgid "Darken only"
-msgstr "Culoare Directă"
+msgstr "Mumai întunecare"
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:3
-#, fuzzy
 msgid "Stains"
-msgstr "Saturare"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/coffee.scm.h:4
 msgid "_Coffee Stain..."
@@ -1243,25 +1217,27 @@ msgid ""
 "Add a comic-book effect to the selected region (or alpha) by outlining and "
 "filling with a gradient"
 msgstr ""
+"Adaugă un efect de carte de benzi desenate comice la zona selectată (sau "
+"alfa) prin conturarea și umplerea cu un degrade"
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:3
 msgid "Comic Boo_k..."
-msgstr ""
+msgstr "_Benzi comice..."
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:4
 msgid "Create a comic-book style logo by outlining and filling with a gradient"
 msgstr ""
+"Creează o siglă în stilul cărților de benzilor desenate comice prin "
+"conturarea și umplerea cu un degrade"
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:9
-#, fuzzy
 msgid "Outline color"
-msgstr "Culoare adevărată"
+msgstr "Culoare contur"
 
 #: ../plug-ins/script-fu/scripts/comic-logo.scm.h:10
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:11
-#, fuzzy
 msgid "Outline size"
-msgstr "Culoare adevărată"
+msgstr "Dimensiune contur"
 
 #: ../plug-ins/script-fu/scripts/coolmetal-logo.scm.h:1
 msgid ""
@@ -1446,24 +1422,21 @@ msgstr "Sămânță aleatoare"
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:6
 #: ../plug-ins/script-fu/scripts/land.scm.h:8
-#, fuzzy
 msgid "Scale X"
-msgstr "Scalare"
+msgstr "Scalare X"
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:7
 #: ../plug-ins/script-fu/scripts/land.scm.h:9
-#, fuzzy
 msgid "Scale Y"
-msgstr "Scalare"
+msgstr "Scalare Y"
 
 #: ../plug-ins/script-fu/scripts/flatland.scm.h:8
 msgid "_Flatland..."
-msgstr ""
+msgstr "_Teren plat..."
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:1
-#, fuzzy
 msgid "Active colors"
-msgstr "Actualizează culoarea activă"
+msgstr "Culori active"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:2
 msgid "Black on white"
@@ -1475,28 +1448,24 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:4
-#, fuzzy
 msgid "Font _size (pixels)"
-msgstr "Margine:"
+msgstr "Dimen_siune font (pixeli)"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:5
 msgid "Render _Font Map..."
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:6
-#, fuzzy
 msgid "Use font _name as text"
-msgstr "Folosește text dinamic"
+msgstr "Folosește _numele fontului ca text"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:7
-#, fuzzy
 msgid "_Border (pixels)"
-msgstr "Margine:"
+msgstr "_Bordură (pixeli):"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:8
-#, fuzzy
 msgid "_Color scheme"
-msgstr "Selector de culori"
+msgstr "S_chemă de culori"
 
 #: ../plug-ins/script-fu/scripts/font-map.scm.h:9
 msgid "_Filter (regexp)"
@@ -1521,9 +1490,8 @@ msgid "Create frozen logo with an added drop shadow"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/frosty-logo.scm.h:8
-#, fuzzy
 msgid "_Frosty..."
-msgstr "Afișare informații de ajutor"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/fuzzyborder.scm.h:1
 msgid "Add a jagged, fuzzy border to an image"
@@ -1574,13 +1542,12 @@ msgstr "Culoare întunecată"
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:7
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:9
 msgid "Highlight color"
-msgstr "Culoare luminoasă"
+msgstr "Culoare parte luminoasă"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:8
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:9
-#, fuzzy
 msgid "Index image"
-msgstr "Imagine nouă"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:9
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:10
@@ -1594,24 +1561,21 @@ msgstr "Elimină fundalul"
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:11
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:14
-#, fuzzy
 msgid "Select-by-color threshold"
-msgstr "Prag implicit:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:12
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:15
-#, fuzzy
 msgid "Shadow color"
-msgstr "Pseudo Culoare"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:15
 msgid "_Big Header..."
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/gimp-headers.scm.h:16
-#, fuzzy
 msgid "_Small Header..."
-msgstr "/Scalează strat..."
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:2
 msgid ""
@@ -1658,14 +1622,12 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:3
-#, fuzzy
 msgid "Blend gradient (outline)"
-msgstr "Model sursă"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:4
-#, fuzzy
 msgid "Blend gradient (text)"
-msgstr "Model sursă"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:5
 msgid "Create a logo with gradients, patterns, shadows, and bump maps"
@@ -1676,9 +1638,8 @@ msgid "Glo_ssy..."
 msgstr "Lucio_s..."
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:10
-#, fuzzy
 msgid "Outline gradient reverse"
-msgstr "Rază:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:12
 msgid "Pattern (outline)"
@@ -1697,9 +1658,8 @@ msgid "Shadow"
 msgstr "Umbră"
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:19
-#, fuzzy
 msgid "Text gradient reverse"
-msgstr "Alege directorul de gradienți"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/glossy.scm.h:20
 msgid "Use pattern for outline instead of gradient"
@@ -1739,9 +1699,8 @@ msgstr "Înălțime teșitură (claritate)"
 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:5
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:4
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:2
-#, fuzzy
 msgid "Border size (pixels)"
-msgstr "Margine:"
+msgstr "Dimensiune bordură (pixeli)"
 
 #: ../plug-ins/script-fu/scripts/gradient-bevel-logo.scm.h:6
 msgid "Create a logo with a shiny look and beveled edges"
@@ -1855,14 +1814,12 @@ msgid "Create an image filled with a topographic map pattern"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/land.scm.h:6
-#, fuzzy
 msgid "Land height"
-msgstr "Înălțime"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/land.scm.h:10
-#, fuzzy
 msgid "Sea depth"
-msgstr "Adâncimea maximă:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/land.scm.h:11
 msgid "_Land..."
@@ -1874,14 +1831,12 @@ msgstr ""
 
 #: ../plug-ins/script-fu/scripts/lava.scm.h:4
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:8
-#, fuzzy
 msgid "Roughness"
-msgstr "Luminozitate:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/lava.scm.h:5
-#, fuzzy
 msgid "Seed"
-msgstr "Viteză:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/lava.scm.h:8
 msgid "Use current gradient"
@@ -1909,9 +1864,8 @@ msgid "Offset radius"
 msgstr "Rază decalaj"
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:5
-#, fuzzy
 msgid "Randomness"
-msgstr "Duritate"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/line-nova.scm.h:6
 msgid "Sharpness (degrees)"
@@ -1980,9 +1934,8 @@ msgid "N_eon..."
 msgstr "N_eon..."
 
 #: ../plug-ins/script-fu/scripts/news-text.scm.h:3
-#, fuzzy
 msgid "Cell size (pixels)"
-msgstr "Margine:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/news-text.scm.h:4
 msgid "Create a logo in the style of newspaper printing"
@@ -2085,14 +2038,12 @@ msgid "Add a 'Predator' effect to the selected region (or alpha)"
 msgstr "Adaugă un efect de tip „Predator” la zona selectată (sau alfa)"
 
 #: ../plug-ins/script-fu/scripts/predator.scm.h:2
-#, fuzzy
 msgid "Edge amount"
-msgstr "Dimensiune punct ecran"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/predator.scm.h:4
-#, fuzzy
 msgid "Pixel amount"
-msgstr "Dimensiune punct ecran"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/predator.scm.h:5
 msgid "Pixelize"
@@ -2107,52 +2058,44 @@ msgid "Create images, each containing an oval button graphic"
 msgstr "Creează imagini, fiecare conținând o grafică de buton oval"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:5
-#, fuzzy
 msgid "Lower color"
-msgstr "Culoare adevărată"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:6
-#, fuzzy
 msgid "Lower color (active)"
-msgstr "Culoare adevărată"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:7
-#, fuzzy
 msgid "Not pressed"
-msgstr "Presiune"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:8
-#, fuzzy
 msgid "Not pressed (active)"
-msgstr "Presiune"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:9
 msgid "Padding X"
-msgstr ""
+msgstr "Umplere X"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:10
 msgid "Padding Y"
-msgstr ""
+msgstr "Umplere Y"
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:12
-#, fuzzy
 msgid "Round ratio"
-msgstr "Rotire"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:15
-#, fuzzy
 msgid "Text color (active)"
-msgstr "Culoare adevărată"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:16
-#, fuzzy
 msgid "Upper color"
-msgstr "Culoare adevărată"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:17
-#, fuzzy
 msgid "Upper color (active)"
-msgstr "Culoare adevărată"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/pupi-button.scm.h:18
 msgid "_Round Button..."
@@ -2204,9 +2147,8 @@ msgstr "Comportament margine"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:4
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:4
-#, fuzzy
 msgid "Number of frames"
-msgstr "Numărul minim de culori:"
+msgstr "Număr de cadre"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:5
 msgid "Rippling strength"
@@ -2221,23 +2163,20 @@ msgid "Wrap"
 msgstr "Întoarce la capăt"
 
 #: ../plug-ins/script-fu/scripts/ripply-anim.scm.h:8
-#, fuzzy
 msgid "_Rippling..."
-msgstr "Scalez..."
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:1
-#, fuzzy
 msgid "Add background"
-msgstr "Fundal"
+msgstr "Adaugă un fundal"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:2
 msgid "Add drop-shadow"
 msgstr "Adaugă o umbră de perspectivă"
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:4
-#, fuzzy
 msgid "Edge radius"
-msgstr "Rază:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/round-corners.scm.h:5
 msgid ""
@@ -2253,15 +2192,16 @@ msgstr "_Rotunjire colțuri..."
 #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:1
 msgid "Change the colormap of an image to the colors in a specified palette."
 msgstr ""
+"Schimbă harta de culori a unei imagini cu culorile dintr-o paletă "
+"specificată."
 
 #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:2
 msgid "Palette"
 msgstr "Paletă"
 
 #: ../plug-ins/script-fu/scripts/script-fu-set-cmap.scm.h:3
-#, fuzzy
 msgid "Se_t Colormap..."
-msgstr "Instalează harta de culori"
+msgstr "S_tabilește harta de culori..."
 
 #: ../plug-ins/script-fu/scripts/select-to-brush.scm.h:2
 msgid "Convert a selection to a brush"
@@ -2322,13 +2262,15 @@ msgstr "Număr"
 msgid "_Slide..."
 msgstr "_Peliculă foto..."
 
+# hm ?
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:5
 msgid "Create a State Of The Art chromed logo"
 msgstr ""
+"Creează un logo cromat cu maxim de perfecțiune (SOTA - State Of The Art)"
 
 #: ../plug-ins/script-fu/scripts/sota-chrome-logo.scm.h:10
 msgid "SOTA Chrome..."
-msgstr ""
+msgstr "Crom SOTA..."
 
 #: ../plug-ins/script-fu/scripts/speed-text.scm.h:2
 msgid "Create a logo with a speedy text effect"
@@ -2388,42 +2330,36 @@ msgid "Frame"
 msgstr "Cadru"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:10
-#, fuzzy
 msgid "Gradient: Loop Sawtooth"
-msgstr "Buclează dinte de fierastrău"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:11
-#, fuzzy
 msgid "Gradient: Loop Triangle"
-msgstr "Buclează triunghi"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:12
 msgid "Hexagon"
 msgstr "Hexagon"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:13
-#, fuzzy
 msgid "Hole ratio"
-msgstr "Factorul de scară:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:14
-#, fuzzy
 msgid "Inner teeth"
-msgstr "Intersectează"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:15
 msgid "Lissajous"
 msgstr "Lissajous"
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:16
-#, fuzzy
 msgid "Margin (pixels)"
-msgstr "Margine:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:17
-#, fuzzy
 msgid "Outer teeth"
-msgstr "Margine:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/spyrogimp.scm.h:18
 msgid "Pencil"
@@ -2497,9 +2433,8 @@ msgstr ""
 "o umbră"
 
 #: ../plug-ins/script-fu/scripts/starscape-logo.scm.h:5
-#, fuzzy
 msgid "Sta_rscape..."
-msgstr "Afișare informații de ajutor"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:4
 msgid "Create an image filled with a swirled tile effect"
@@ -2510,28 +2445,24 @@ msgid "Swirl-_Tile..."
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/swirltile.scm.h:10
-#, fuzzy
 msgid "Whirl amount"
-msgstr "Umple împrejur"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:1
 msgid "Create an image filled with a swirly pattern"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:2
-#, fuzzy
 msgid "Number of times to whirl"
-msgstr "Numar de procesoare utilizat"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:3
-#, fuzzy
 msgid "Quarter size"
-msgstr "Margine:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:4
-#, fuzzy
 msgid "Whirl angle"
-msgstr "Tip umplere"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/swirly-pattern.scm.h:5
 msgid "_Swirly..."
@@ -2542,23 +2473,20 @@ msgid "Add a Trace of Particles effect to the selected region (or alpha)"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:3
-#, fuzzy
 msgid "Base color"
-msgstr "Culoare RGB"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:5
 msgid "Create a logo using a Trace Of Particles effect"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:6
-#, fuzzy
 msgid "Edge only"
-msgstr "Numai alb"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:7
-#, fuzzy
 msgid "Edge width"
-msgstr "Lățime nouă:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/t-o-p-logo.scm.h:10
 msgid "Hit rate"
@@ -2589,6 +2517,7 @@ msgstr "_Cerc de text..."
 msgid ""
 "Create a textured logo with highlights, shadows, and a mosaic background"
 msgstr ""
+"Creează o siglă texturată cu părți luminoase, umbre și un fundal de mozaic"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:4
 msgid "Ending blend"
@@ -2599,6 +2528,8 @@ msgid ""
 "Fill the selected region (or alpha) with a texture and add highlights, "
 "shadows, and a mosaic background"
 msgstr ""
+"Umple zona selectată (sau alfa) cu o textură și adaugă părți luminoase, "
+"umbre și un fundal de mozaic"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:8
 msgid "Hexagons"
@@ -2606,34 +2537,31 @@ msgstr "Hexagoane"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:9
 msgid "Mosaic tile type"
-msgstr ""
+msgstr "Tip de dală al mozaicului"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:10
 msgid "Octagons"
 msgstr "Octogoane"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:12
-#, fuzzy
 msgid "Squares"
-msgstr "Pătrat"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:13
 msgid "Starting blend"
 msgstr "Amestec de început"
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:15
-#, fuzzy
 msgid "Text pattern"
-msgstr "Strat de text"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/textured-logo.scm.h:16
 msgid "_Textured..."
-msgstr ""
+msgstr "_Texturat..."
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:1
-#, fuzzy
 msgid "Blur horizontally"
-msgstr "Orizontal"
+msgstr ""
 
 # hm ?
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:2
@@ -2643,14 +2571,12 @@ msgstr ""
 "mozaic să nu prezinte urme de racord"
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:3
-#, fuzzy
 msgid "Blur type"
-msgstr "Tip curbă:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:4
-#, fuzzy
 msgid "Blur vertically"
-msgstr "Vertical"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/tileblur.scm.h:5
 msgid "IIR"
@@ -2666,7 +2592,7 @@ msgstr "Neclari_tate mozaicabilă..."
 
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:1
 msgid "Create a decorative web title header"
-msgstr ""
+msgstr "Creează un antet de titlu Web decorativ"
 
 #: ../plug-ins/script-fu/scripts/title-header.scm.h:6
 msgid "Web Title Header..."
@@ -2677,23 +2603,20 @@ msgid "Create an image filled with a Truchet pattern"
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:4
-#, fuzzy
 msgid "Foreground color"
-msgstr "Prim Plan "
+msgstr "Culoare prim plan"
 
 #: ../plug-ins/script-fu/scripts/truchet.scm.h:7
 msgid "T_ruchet..."
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:1
-#, fuzzy
 msgid "Mask opacity"
 msgstr "Opacitate mască"
 
 #: ../plug-ins/script-fu/scripts/unsharp-mask.scm.h:2
-#, fuzzy
 msgid "Mask size"
-msgstr "Dimensiune"
+msgstr "Dimensiune mască"
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:1
 msgid "Amplitude"
@@ -2706,9 +2629,8 @@ msgid ""
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:3
-#, fuzzy
 msgid "Invert direction"
-msgstr "/Intersectează cu selecția"
+msgstr "Inversează direcția"
 
 #: ../plug-ins/script-fu/scripts/waves-anim.scm.h:5
 msgid "Wavelength"
@@ -2719,52 +2641,44 @@ msgid "_Waves..."
 msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:1
-#, fuzzy
 msgid ""
 "Create a new layer filled with a weave effect to be used as an overlay or "
 "bump map"
 msgstr ""
-"Crează un strat nou umplut cu un efect de val pentru a fi olosit ca "
-"suprapunere sau bump map"
+"Creează un strat nou umplut cu un efect de împletitură pentru a fi folosit "
+"ca suprapunere sau bump map"
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:2
-#, fuzzy
 msgid "Ribbon spacing"
-msgstr "Spațiere:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:3
-#, fuzzy
 msgid "Ribbon width"
-msgstr "Lățimea originală"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:4
-#, fuzzy
 msgid "Shadow darkness"
-msgstr "Umbre"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:5
-#, fuzzy
 msgid "Shadow depth"
-msgstr "Arată Calea"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:6
-#, fuzzy
 msgid "Thread density"
-msgstr "Densitate:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:7
-#, fuzzy
 msgid "Thread intensity"
-msgstr "Intensitate:"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:8
-#, fuzzy
 msgid "Thread length"
-msgstr "Decupare"
+msgstr ""
 
 #: ../plug-ins/script-fu/scripts/weave.scm.h:9
 msgid "_Weave..."
-msgstr ""
+msgstr "Î_mpletitură..."
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:1
 msgid "Bookmark to the GIMP web site"
@@ -2775,9 +2689,8 @@ msgid "Bookmark to the user manual"
 msgstr "Semn de carte către manualul de utilizare"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:3
-#, fuzzy
 msgid "Create and Use _Selections"
-msgstr "Selecție pană"
+msgstr "Creează și folosește _selecțiile"
 
 #: ../plug-ins/script-fu/scripts/web-browser.scm.h:4
 msgid "Create, Open and Save _Files"
@@ -2825,7 +2738,7 @@ msgstr "_Lucrul cu camere foto digitale"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:1
 msgid "Add a subtle translucent 3D effect to the selected region (or alpha)"
-msgstr ""
+msgstr "Adaugă un efect 3D translucid subtil la zona selectată (sau alfa)"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:2
 msgid "Drop shadow X offset"
@@ -2849,11 +2762,11 @@ msgstr "Opacitate umbră de perspectivă"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:7
 msgid "Highlight X offset"
-msgstr "Evidențiază decalajul X"
+msgstr "Decalaj X parte luminoasă"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:8
 msgid "Highlight Y offset"
-msgstr "Evidențiază decalajul Y"
+msgstr "Decalaj Y parte luminoasă"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:10
 msgid "Highlight opacity"
@@ -2861,7 +2774,7 @@ msgstr "Opacitate parte luminoasă"
 
 #: ../plug-ins/script-fu/scripts/xach-effect.scm.h:12
 msgid "_Xach-Effect..."
-msgstr ""
+msgstr "Efect _Xach..."
 
 #~ msgid "_Misc"
 #~ msgstr "_Diverse"
diff --git a/po-script-fu/zh_CN.po b/po-script-fu/zh_CN.po
index 432856a65b..50ccdeded3 100644
--- a/po-script-fu/zh_CN.po
+++ b/po-script-fu/zh_CN.po
@@ -10,9 +10,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp-script-fu HEAD\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=gimp&component=general\n"
-"POT-Creation-Date: 2009-07-26 19:04+0000\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-09-07 16:18+0800\n"
 "PO-Revision-Date: 2009-07-27 13:51+0800\n"
 "Last-Translator: Aron Xu \n"
 "Language-Team: Chinese (simplified) \n"
@@ -1560,8 +1559,7 @@ msgstr "小标题(_S)..."
 msgid ""
 "Create an image of a Tube Button Label Header using the gimp.org webpage "
 "theme"
-msgstr ""
-"创建一个使用 gimp.org 所使用风格的管状按钮标签 Header 图像"
+msgstr "创建一个使用 gimp.org 所使用风格的管状按钮标签 Header 图像"
 
 #: ../plug-ins/script-fu/scripts/gimp-labels.scm.h:3
 msgid "Create an image of a Tube Button Label using the gimp.org webpage theme"
diff --git a/po-tips/en_GB.po b/po-tips/en_GB.po
index 456a83ee9a..5efd2bc878 100644
--- a/po-tips/en_GB.po
+++ b/po-tips/en_GB.po
@@ -2,24 +2,20 @@
 # Copyright (C) 2004 Adam Weinberger and the GNOME Foundation
 # This file is distributed under the same license as the gimp tips package.
 # Gareth Owen  2004
-#
+# Bruce Cowan , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp tips\n"
+"Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-09 19:52+0000\n"
-"PO-Revision-Date: 2007-05-16 08:10-0000\n"
-"Last-Translator: David Lodge \n"
-"Language-Team: \n"
+"POT-Creation-Date: 2009-10-17 23:04+0100\n"
+"PO-Revision-Date: 2009-10-17 23:08+0100\n"
+"Last-Translator: Bruce Cowan \n"
+"Language-Team: British English \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
 #: ../data/tips/gimp-tips.xml.in.h:1
-msgid "Welcome to the GNU Image Manipulation Program!"
-msgstr "Welcome to the GNU Image Manipulation Program!"
-
-#: ../data/tips/gimp-tips.xml.in.h:2
 msgid ""
 "Ctrl-click with the Bucket Fill tool to have it use the background "
 "color instead of the foreground color. Similarly, Ctrl-clicking "
@@ -31,7 +27,7 @@ msgstr ""
 "with the eyedropper tool sets the background colour instead of the "
 "foreground colour."
 
-#: ../data/tips/gimp-tips.xml.in.h:3
+#: ../data/tips/gimp-tips.xml.in.h:2
 msgid ""
 "Ctrl-clicking on the layer mask's preview in the Layers dialog "
 "toggles the effect of the layer mask. Alt-clicking on the layer "
@@ -41,24 +37,24 @@ msgstr ""
 "toggles the effect of the layer mask. Alt-clicking on the layer "
 "mask's preview in the Layers dialogue toggles viewing the mask directly."
 
+#: ../data/tips/gimp-tips.xml.in.h:3
+msgid ""
+"Ctrl-drag with the Rotate tool will constrain the rotation to 15 "
+"degree angles."
+msgstr ""
+"Ctrl-drag with the Rotate tool will constrain the rotation to 15 "
+"degree angles."
+
 #: ../data/tips/gimp-tips.xml.in.h:4
 msgid ""
-"Ctrl-drag with the Rotate tool will constrain the rotation to 15 "
-"degree angles."
+"Shift-click on the eye icon in the Layers dialog to hide all layers "
+"but that one. Shift-click again to show all layers."
 msgstr ""
-"Ctrl-drag with the Rotate tool will constrain the rotation to 15 "
-"degree angles."
+"Shift-click on the eye icon in the Layers dialog to hide all layers "
+"but that one. Shift-click again to show all layers."
 
 #: ../data/tips/gimp-tips.xml.in.h:5
 msgid ""
-"Shift-click on the eye icon in the Layers dialog to hide all layers "
-"but that one. Shift-click again to show all layers."
-msgstr ""
-"Shift-click on the eye icon in the Layers dialog to hide all layers "
-"but that one. Shift-click again to show all layers."
-
-#: ../data/tips/gimp-tips.xml.in.h:6
-msgid ""
 "A floating selection must be anchored to a new layer or to the last active "
 "layer before doing other operations on the image. Click on the "New "
 "Layer" or the "Anchor Layer" button in the Layers dialog, or "
@@ -69,7 +65,7 @@ msgstr ""
 "Layer" or the "Anchor Layer" button in the Layers dialogue, "
 "or use the menus to do the same."
 
-#: ../data/tips/gimp-tips.xml.in.h:7
+#: ../data/tips/gimp-tips.xml.in.h:6
 msgid ""
 "After you enabled "Dynamic Keyboard Shortcuts" in the Preferences "
 "dialog, you can reassign shortcut keys. Do so by bringing up the menu, "
@@ -81,42 +77,34 @@ msgid ""
 msgstr ""
 "After you enabled "Dynamic Keyboard Shortcuts" in the Preferences "
 "dialogue, you can reassign shortcut keys. Do so by bringing up the menu, "
-"selecting a menu item, and pressing the desired key combination. If ""
+"selecting a menu item and pressing the desired key combination. If ""
 "Save Keyboard Shortcuts" is enabled, the key bindings are saved when "
 "you exit GIMP. You should probably disable "Dynamic Keyboard "
 "Shortcuts" afterwards, to prevent accidentally assigning/reassigning "
 "shortcuts."
 
+#: ../data/tips/gimp-tips.xml.in.h:7
+msgid ""
+"Click and drag on a ruler to place a guide on an image. All dragged "
+"selections will snap to the guides. You can remove guides by dragging them "
+"off the image with the Move tool."
+msgstr ""
+"Click and drag on a ruler to place a guide on an image. All dragged "
+"selections will snap to the guides. You can remove guides by dragging them "
+"off the image with the Move tool."
+
 #: ../data/tips/gimp-tips.xml.in.h:8
 msgid ""
-"Click and drag on a ruler to place a guide on an image. All dragged "
-"selections will snap to the guides. You can remove guides by dragging them "
-"off the image with the Move tool."
+"GIMP supports gzip compression on the fly. Just add .gz (or ."
+"bz2, if you have bzip2 installed) to the filename and your image will "
+"be saved compressed. Of course loading compressed images works too."
 msgstr ""
-"Click and drag on a ruler to place a guide on an image. All dragged "
-"selections will snap to the guides. You can remove guides by dragging them "
-"off the image with the Move tool."
+"GIMP supports gzip compression on the fly. Just add .gz (or ."
+"bz2, if you have bzip2 installed) to the filename and your image will "
+"be saved compressed. Of course loading compressed images works too."
 
 #: ../data/tips/gimp-tips.xml.in.h:9
 msgid ""
-"GIMP allows you to undo most changes to the image, so feel free to "
-"experiment."
-msgstr ""
-"GIMP allows you to undo most changes to the image, so feel free to "
-"experiment."
-
-#: ../data/tips/gimp-tips.xml.in.h:10
-msgid ""
-"GIMP supports gzip compression on the fly. Just add .gz (or ."
-"bz2, if you have bzip2 installed) to the filename and your image will "
-"be saved compressed. Of course loading compressed images works too."
-msgstr ""
-"GIMP supports gzip compression on the fly. Just add .gz (or ."
-"bz2, if you have bzip2 installed) to the filename and your image will "
-"be saved compressed. Of course loading compressed images works too."
-
-#: ../data/tips/gimp-tips.xml.in.h:11
-msgid ""
 "GIMP uses layers to let you organize your image. Think of them as a stack of "
 "slides or filters, such that looking through them you see a composite of "
 "their contents."
@@ -125,7 +113,7 @@ msgstr ""
 "slides or filters, such that looking through them you see a composite of "
 "their contents."
 
-#: ../data/tips/gimp-tips.xml.in.h:12
+#: ../data/tips/gimp-tips.xml.in.h:10
 msgid ""
 "If a layer's name in the Layers dialog is displayed in bold, this "
 "layer doesn't have an alpha-channel. You can add an alpha-channel using "
@@ -135,7 +123,7 @@ msgstr ""
 "layer doesn't have an alpha-channel. You can add an alpha-channel using "
 "Layer→Transparency→Add Alpha Channel."
 
-#: ../data/tips/gimp-tips.xml.in.h:13
+#: ../data/tips/gimp-tips.xml.in.h:11
 msgid ""
 "If some of your scanned photos do not look colorful enough, you can easily "
 "improve their tonal range with the "Auto" button in the Levels "
@@ -147,7 +135,7 @@ msgstr ""
 "tool (Colours→Levels). If there are any colour casts, you can correct them "
 "with the Curves tool (Colours→Curves)."
 
-#: ../data/tips/gimp-tips.xml.in.h:14
+#: ../data/tips/gimp-tips.xml.in.h:12
 msgid ""
 "If you stroke a path (Edit→Stroke Path), the paint tools can be used with "
 "their current settings. You can use the Paintbrush in gradient mode or even "
@@ -157,7 +145,7 @@ msgstr ""
 "their current settings. You can use the Paintbrush in gradient mode or even "
 "the Eraser or the Smudge tool."
 
-#: ../data/tips/gimp-tips.xml.in.h:15
+#: ../data/tips/gimp-tips.xml.in.h:13
 msgid ""
 "If your screen is too cluttered, you can press Tab in an image "
 "window to toggle the visibility of the toolbox and other dialogs."
@@ -165,7 +153,7 @@ msgstr ""
 "If your screen is too cluttered, you can press Tab in an image "
 "window to toggle the visibility of the toolbox and other dialogues."
 
-#: ../data/tips/gimp-tips.xml.in.h:16
+#: ../data/tips/gimp-tips.xml.in.h:14
 msgid ""
 "Most plug-ins work on the current layer of the current image. In some cases, "
 "you will have to merge all layers (Image→Flatten Image) if you want the plug-"
@@ -175,7 +163,7 @@ msgstr ""
 "you will have to merge all layers (Image→Flatten Image) if you want the plug-"
 "in to work on the whole image."
 
-#: ../data/tips/gimp-tips.xml.in.h:17
+#: ../data/tips/gimp-tips.xml.in.h:15
 msgid ""
 "Not all effects can be applied to all kinds of images. This is indicated by "
 "a grayed-out menu-entry. You may need to change the image mode to RGB "
@@ -187,56 +175,42 @@ msgstr ""
 "(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha "
 "Channel) or flatten it (Image→Flatten Image)."
 
+#: ../data/tips/gimp-tips.xml.in.h:16
+msgid ""
+"Pressing and holding the Shift key before making a selection allows "
+"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one."
+msgstr ""
+"Pressing and holding the Shift key before making a selection allows "
+"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one."
+
+#: ../data/tips/gimp-tips.xml.in.h:17
+msgid ""
+"When you save an image to work on it again later, try using XCF, GIMP's "
+"native file format (use the file extension .xcf). This preserves "
+"the layers and every aspect of your work-in-progress. Once a project is "
+"completed, you can save it as JPEG, PNG, GIF, ..."
+msgstr ""
+"When you save an image to work on it again later, try using XCF, GIMP's "
+"native file format (use the file extension .xcf). This preserves "
+"the layers and every aspect of your work-in-progress. Once a project is "
+"completed, you can save it as JPEG, PNG, GIF, ..."
+
 #: ../data/tips/gimp-tips.xml.in.h:18
 msgid ""
-"Pressing and holding the Shift key before making a selection allows "
-"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one."
+"You can adjust or move a selection by using Alt-drag. If this makes "
+"the window move, your window manager uses the Alt key already. Most "
+"window managers can be configured to ignore the Alt key or to use "
+"the Super key (or \"Windows logo\") instead."
 msgstr ""
-"Pressing and holding the Shift key before making a selection allows "
-"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one."
+"You can adjust or move a selection by using Alt-drag. If this makes "
+"the window move, your window manager uses the Alt key already. Most "
+"window managers can be configured to ignore the Alt key or to use "
+"the Super key (or \"Windows logo\") instead."
 
 #: ../data/tips/gimp-tips.xml.in.h:19
 msgid ""
-"To create a circle-shaped selection, hold Shift while doing an "
-"ellipse select. To place a circle precisely, drag horizontal and vertical "
-"guides tangent to the circle you want to select, place your cursor at the "
-"intersection of the guides, and the resulting selection will just touch the "
-"guides."
-msgstr ""
-"To create a circle-shaped selection, hold Shift while doing an "
-"ellipse select. To place a circle precisely, drag horizontal and vertical "
-"guides tangent to the circle you want to select, place your cursor at the "
-"intersection of the guides, and the resulting selection will just touch the "
-"guides."
-
-#: ../data/tips/gimp-tips.xml.in.h:20
-msgid ""
-"When you save an image to work on it again later, try using XCF, GIMP's "
-"native file format (use the file extension .xcf). This preserves "
-"the layers and every aspect of your work-in-progress. Once a project is "
-"completed, you can save it as JPEG, PNG, GIF, ..."
-msgstr ""
-"When you save an image to work on it again later, try using XCF, GIMP's "
-"native file format (use the file extension .xcf). This preserves "
-"the layers and every aspect of your work-in-progress. Once a project is "
-"completed, you can save it as JPEG, PNG, GIF, ..."
-
-#: ../data/tips/gimp-tips.xml.in.h:21
-msgid ""
-"You can adjust or move a selection by using Alt-drag. If this makes "
-"the window move, your window manager uses the Alt key already. Most "
-"window managers can be configured to ignore the Alt key or to use "
-"the Super key (or \"Windows logo\") instead."
-msgstr ""
-"You can adjust or move a selection by using Alt-drag. If this makes "
-"the window move, your window manager uses the Alt key already. Most "
-"window managers can be configured to ignore the Alt key or to use "
-"the Super key (or \"Windows logo\") instead."
-
-#: ../data/tips/gimp-tips.xml.in.h:22
-msgid ""
 "You can create and edit complex selections using the Path tool. The Paths "
 "dialog allows you to work on multiple paths and to convert them to "
 "selections."
@@ -245,7 +219,7 @@ msgstr ""
 "dialogue allows you to work on multiple paths and to convert them to "
 "selections."
 
-#: ../data/tips/gimp-tips.xml.in.h:23
+#: ../data/tips/gimp-tips.xml.in.h:20
 msgid ""
 "You can drag a layer from the Layers dialog and drop it onto the toolbox. "
 "This will create a new image containing only that layer."
@@ -253,7 +227,7 @@ msgstr ""
 "You can drag a layer from the Layers dialogue and drop it onto the toolbox. "
 "This will create a new image containing only that layer."
 
-#: ../data/tips/gimp-tips.xml.in.h:24
+#: ../data/tips/gimp-tips.xml.in.h:21
 msgid ""
 "You can drag and drop many things in GIMP. For example, dragging a color "
 "from the toolbox or from a color palette and dropping it into an image will "
@@ -263,7 +237,7 @@ msgstr ""
 "from the toolbox or from a colour palette and dropping it into an image will "
 "fill the current selection with that colour."
 
-#: ../data/tips/gimp-tips.xml.in.h:25
+#: ../data/tips/gimp-tips.xml.in.h:22
 msgid ""
 "You can draw simple squares or circles using Edit→Stroke Selection. It "
 "strokes the edge of your current selection. More complex shapes can be drawn "
@@ -273,7 +247,7 @@ msgstr ""
 "strokes the edge of your current selection. More complex shapes can be drawn "
 "using the Path tool or with Filters→Render→Gfig."
 
-#: ../data/tips/gimp-tips.xml.in.h:26
+#: ../data/tips/gimp-tips.xml.in.h:23
 msgid ""
 "You can get context-sensitive help for most of GIMP's features by pressing "
 "the F1 key at any time. This also works inside the menus."
@@ -281,7 +255,7 @@ msgstr ""
 "You can get context-sensitive help for most of GIMP's features by pressing "
 "the F1 key at any time. This also works inside the menus."
 
-#: ../data/tips/gimp-tips.xml.in.h:27
+#: ../data/tips/gimp-tips.xml.in.h:24
 msgid ""
 "You can perform many layer operations by right-clicking on the text label of "
 "a layer in the Layers dialog."
@@ -289,7 +263,7 @@ msgstr ""
 "You can perform many layer operations by right-clicking on the text label of "
 "a layer in the Layers dialogue."
 
-#: ../data/tips/gimp-tips.xml.in.h:28
+#: ../data/tips/gimp-tips.xml.in.h:25
 msgid ""
 "You can save a selection to a channel (Select→Save to Channel) and then "
 "modify this channel with any paint tools. Using the buttons in the Channels "
@@ -301,7 +275,7 @@ msgstr ""
 "dialogue, you can toggle the visibility of this new channel or convert it to "
 "a selection."
 
-#: ../data/tips/gimp-tips.xml.in.h:29
+#: ../data/tips/gimp-tips.xml.in.h:26
 msgid ""
 "You can use Ctrl-Tab to cycle through all layers in an "
 "image (if your window manager doesn't trap those keys...)."
@@ -309,7 +283,7 @@ msgstr ""
 "You can use Ctrl-Tab to cycle through all layers in an "
 "image (if your window manager doesn't trap those keys...)."
 
-#: ../data/tips/gimp-tips.xml.in.h:30
+#: ../data/tips/gimp-tips.xml.in.h:27
 msgid ""
 "You can use the middle mouse button to pan around the image (or optionally "
 "hold Spacebar while you move the mouse)."
@@ -317,7 +291,7 @@ msgstr ""
 "You can use the middle mouse button to pan around the image (or optionally "
 "hold Spacebar while you move the mouse)."
 
-#: ../data/tips/gimp-tips.xml.in.h:31
+#: ../data/tips/gimp-tips.xml.in.h:28
 msgid ""
 "You can use the paint tools to change the selection. Click on the ""
 "Quick Mask" button at the bottom left of an image window. Change your "
@@ -329,6 +303,29 @@ msgstr ""
 "selection by painting in the image and click on the button again to convert "
 "it back to a normal selection."
 
+#~ msgid "Welcome to the GNU Image Manipulation Program!"
+#~ msgstr "Welcome to the GNU Image Manipulation Program!"
+
+#~ msgid ""
+#~ "GIMP allows you to undo most changes to the image, so feel free to "
+#~ "experiment."
+#~ msgstr ""
+#~ "GIMP allows you to undo most changes to the image, so feel free to "
+#~ "experiment."
+
+#~ msgid ""
+#~ "To create a circle-shaped selection, hold Shift while doing an "
+#~ "ellipse select. To place a circle precisely, drag horizontal and vertical "
+#~ "guides tangent to the circle you want to select, place your cursor at the "
+#~ "intersection of the guides, and the resulting selection will just touch "
+#~ "the guides."
+#~ msgstr ""
+#~ "To create a circle-shaped selection, hold Shift while doing an "
+#~ "ellipse select. To place a circle precisely, drag horizontal and vertical "
+#~ "guides tangent to the circle you want to select, place your cursor at the "
+#~ "intersection of the guides, and the resulting selection will just touch "
+#~ "the guides."
+
 #~ msgid ""
 #~ "Alt-click on the layer mask's preview in the Layers dialog "
 #~ "toggles viewing the mask directly."
diff --git a/po-tips/ja.po b/po-tips/ja.po
index 7f2074eea1..435748a11f 100644
--- a/po-tips/ja.po
+++ b/po-tips/ja.po
@@ -1,21 +1,22 @@
 # This is the Japanese locale definition for the GIMP tips.
-# Copyright (C) 1999,2002,2003,2004,2008 Free Software Foundation, Inc.
+# Copyright (C) 1999,2002,2003,2004,2008-2009 Free Software Foundation, Inc.
 # SHIRASAKI Yasuhiro , 1999
 # Takashi Kido , 2002
 # KAMAGASAKO Masatoshi , 2003
 # Ryoichi INAGAKI , 2004
-# Nishibori Kiyotaka , 2008.
+# Nishibori Kiyotaka , 2008-2009.
 #
 # Replaced: & -> ＆
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-01 11:14+0900\n"
-"PO-Revision-Date: 2008-10-13 15:15+0900\n"
+"Project-Id-Version: gimp gimp-2-6\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=Internationalisation\n"
+"POT-Creation-Date: 2009-10-03 21:36+0900\n"
+"PO-Revision-Date: 2009-09-28 22:55+0900\n"
 "Last-Translator: Nishibori Kiyotaka \n"
-"Language-Team: Japanese \n"
+"Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -265,7 +266,7 @@ msgid ""
 "the F1 key at any time. This also works inside the menus."
 msgstr ""
 "F1 キーを押すと、いつでもその機能のヘルプを呼び出すことができるんだ。これはメ"
-"ニューの中でも使えるよ。（ヘルプは英語表示だけどね・・・）"
+"ニューの中でも使えるよ。"
 
 #: ../data/tips/gimp-tips.xml.in.h:24
 msgid ""
diff --git a/po-tips/ro.po b/po-tips/ro.po
index dacb742232..eb5afc86bc 100644
--- a/po-tips/ro.po
+++ b/po-tips/ro.po
@@ -1,327 +1,140 @@
-# gimp ro translation
+# Romanian GIMP translation
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Robert Claudiu Gheorghe , 2001.
-# Cristian Secară , 2008.
+# Cristian Secară , 2008-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: GIMP 2.4\n"
+"Project-Id-Version: gimp-tips\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-18 23:37+0200\n"
+"POT-Creation-Date: 2008-09-20 11:30+0000\n"
 "PO-Revision-Date: 2008-10-15 11:50+0200\n"
 "Last-Translator: Cristian Secară \n"
-"Language-Team: Română \n"
+"Language-Team: Română \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
-"20)) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2;\n"
 
 #: ../data/tips/gimp-tips.xml.in.h:1
-msgid ""
-"Ctrl-click with the Bucket Fill tool to have it use the background "
-"color instead of the foreground color. Similarly, Ctrl-clicking "
-"with the eyedropper tool sets the background color instead of the foreground "
-"color."
-msgstr ""
-"Ctrl-clic pe instrumentul Umplere cu găleata determină folosirea de "
-"către aceasta a culorii de fundal în locul celei de prim plan. Similar, "
-"Ctrl-clic pe instrumentul Pipetă determină stabilirea culorii de "
-"fundal în locul celei de prim plan."
+msgid "Ctrl-click with the Bucket Fill tool to have it use the background color instead of the foreground color. Similarly, Ctrl-clicking with the eyedropper tool sets the background color instead of the foreground color."
+msgstr "Ctrl-clic pe instrumentul Umplere cu găleata determină folosirea de către aceasta a culorii de fundal în locul celei de prim plan. Similar, Ctrl-clic pe instrumentul Pipetă determină stabilirea culorii de fundal în locul celei de prim plan."
 
 #: ../data/tips/gimp-tips.xml.in.h:2
-msgid ""
-"Ctrl-clicking on the layer mask's preview in the Layers dialog "
-"toggles the effect of the layer mask. Alt-clicking on the layer "
-"mask's preview in the Layers dialog toggles viewing the mask directly."
-msgstr ""
-"Ctrl-clic pe previzualizarea măștii de strat în dialogul de "
-"straturi comută efectul măștii de strat. Alt-clic pe "
-"previzualizarea măștii de strat în dialogul de straturi comută vizualizarea "
-"directă a măștii."
+msgid "Ctrl-clicking on the layer mask's preview in the Layers dialog toggles the effect of the layer mask. Alt-clicking on the layer mask's preview in the Layers dialog toggles viewing the mask directly."
+msgstr "Ctrl-clic pe previzualizarea măștii de strat în dialogul de straturi comută efectul măștii de strat. Alt-clic pe previzualizarea măștii de strat în dialogul de straturi comută vizualizarea directă a măștii."
 
 #: ../data/tips/gimp-tips.xml.in.h:3
-msgid ""
-"Ctrl-drag with the Rotate tool will constrain the rotation to 15 "
-"degree angles."
-msgstr ""
-"Ctrl-și-tragere cu instrumentul Rotire va constrânge unghiul de "
-"rotire în incremente de 15 grade."
+msgid "Ctrl-drag with the Rotate tool will constrain the rotation to 15 degree angles."
+msgstr "Ctrl-și-tragere cu instrumentul Rotire va constrânge unghiul de rotire în incremente de 15 grade."
 
 #: ../data/tips/gimp-tips.xml.in.h:4
-msgid ""
-"Shift-click on the eye icon in the Layers dialog to hide all layers "
-"but that one. Shift-click again to show all layers."
-msgstr ""
-"Shift-clic pe simbolul ochi din dialogul de straturi determină "
-"ascunderea tuturor straturilor în afară de acela. Shift-clic din "
-"nou arată la loc toate straturile."
+msgid "Shift-click on the eye icon in the Layers dialog to hide all layers but that one. Shift-click again to show all layers."
+msgstr "Shift-clic pe simbolul ochi din dialogul de straturi determină ascunderea tuturor straturilor în afară de acela. Shift-clic din nou arată la loc toate straturile."
 
 #: ../data/tips/gimp-tips.xml.in.h:5
-msgid ""
-"A floating selection must be anchored to a new layer or to the last active "
-"layer before doing other operations on the image. Click on the "New "
-"Layer" or the "Anchor Layer" button in the Layers dialog, or "
-"use the menus to do the same."
-msgstr ""
-"O selecție flotantă trebuie să fie ancorată la un strat nou, sau la ultimul "
-"strat activ înainte de a efectua alte operații asupra imaginii. Clic pe "
-"butonul „Strat nou” sau „Ancorează stratul” în dialogul de straturi, sau "
-"folosiți meniurile pentru a face același lucru."
+msgid "A floating selection must be anchored to a new layer or to the last active layer before doing other operations on the image. Click on the "New Layer" or the "Anchor Layer" button in the Layers dialog, or use the menus to do the same."
+msgstr "O selecție flotantă trebuie să fie ancorată la un strat nou, sau la ultimul strat activ înainte de a efectua alte operații asupra imaginii. Clic pe butonul „Strat nou” sau „Ancorează stratul” în dialogul de straturi, sau folosiți meniurile pentru a face același lucru."
 
 #: ../data/tips/gimp-tips.xml.in.h:6
-msgid ""
-"After you enabled "Dynamic Keyboard Shortcuts" in the Preferences "
-"dialog, you can reassign shortcut keys. Do so by bringing up the menu, "
-"selecting a menu item, and pressing the desired key combination. If ""
-"Save Keyboard Shortcuts" is enabled, the key bindings are saved when "
-"you exit GIMP. You should probably disable "Dynamic Keyboard "
-"Shortcuts" afterwards, to prevent accidentally assigning/reassigning "
-"shortcuts."
-msgstr ""
-"După ce ați activat „Scurtături dinamice de tastatură” în dialogul de "
-"preferințe, puteți reasocia scurtături de tastatură. Aceasta se face prin "
-"afișarea meniului, selectarea unui element al meniului și apăsarea "
-"combinației de taste dorite. Dacă „Salvează scurtăturile de tastatură” este "
-"activată, tema de combinații de taste este salvată la ieșirea GIMP. Pobabil "
-"că după aceea ar trebui să dezactivați „Scurtături dinamice de tastatură”, "
-"pentru a preveni asocierea/reasocierea accidentală a scurtăturilor."
+msgid "After you enabled "Dynamic Keyboard Shortcuts" in the Preferences dialog, you can reassign shortcut keys. Do so by bringing up the menu, selecting a menu item, and pressing the desired key combination. If "Save Keyboard Shortcuts" is enabled, the key bindings are saved when you exit GIMP. You should probably disable "Dynamic Keyboard Shortcuts" afterwards, to prevent accidentally assigning/reassigning shortcuts."
+msgstr "După ce ați activat „Scurtături dinamice de tastatură” în dialogul de preferințe, puteți reasocia scurtături de tastatură. Aceasta se face prin afișarea meniului, selectarea unui element al meniului și apăsarea combinației de taste dorite. Dacă „Salvează scurtăturile de tastatură” este activată, tema de combinații de taste este salvată la ieșirea GIMP. Pobabil că după aceea ar trebui să dezactivați „Scurtături dinamice de tastatură”, pentru a preveni asocierea/reasocierea accidentală a scurtăturilor."
 
 #: ../data/tips/gimp-tips.xml.in.h:7
-msgid ""
-"Click and drag on a ruler to place a guide on an image. All dragged "
-"selections will snap to the guides. You can remove guides by dragging them "
-"off the image with the Move tool."
-msgstr ""
-"Clic pe o riglă și trageți de ea pentru a așeza un ghidaj pe o imagine. "
-"Toate selecțiile trase vor acroșa la ghidaje. Puteți elimina ghidajele prin "
-"tragerea lor în afara imaginii cu instrumentul de mutare."
+msgid "Click and drag on a ruler to place a guide on an image. All dragged selections will snap to the guides. You can remove guides by dragging them off the image with the Move tool."
+msgstr "Clic pe o riglă și trageți de ea pentru a așeza un ghidaj pe o imagine. Toate selecțiile trase vor acroșa la ghidaje. Puteți elimina ghidajele prin tragerea lor în afara imaginii cu instrumentul de mutare."
 
 #: ../data/tips/gimp-tips.xml.in.h:8
-msgid ""
-"GIMP supports gzip compression on the fly. Just add .gz (or ."
-"bz2, if you have bzip2 installed) to the filename and your image will "
-"be saved compressed. Of course loading compressed images works too."
-msgstr ""
-"GIMP suportă comprimarea gzip din mers. Trebuie doar să adăugați .gz (sau .bz2, dacă aveți instalat bzip2) la numele de fișier și "
-"imaginile vor fi salvate gata comprimate. Desigur că încărcarea imaginilor "
-"comprimate este de asemenea posibilă."
+msgid "GIMP supports gzip compression on the fly. Just add .gz (or .bz2, if you have bzip2 installed) to the filename and your image will be saved compressed. Of course loading compressed images works too."
+msgstr "GIMP suportă comprimarea gzip din mers. Trebuie doar să adăugați .gz (sau .bz2, dacă aveți instalat bzip2) la numele de fișier și imaginile vor fi salvate gata comprimate. Desigur că încărcarea imaginilor comprimate este de asemenea posibilă."
 
 #: ../data/tips/gimp-tips.xml.in.h:9
-msgid ""
-"GIMP uses layers to let you organize your image. Think of them as a stack of "
-"slides or filters, such that looking through them you see a composite of "
-"their contents."
-msgstr ""
-"GIMP folosește straturi pentru a vă permite organizarea imaginii la care "
-"lucrați. Gândiți-vă la ele ca la o stivă de diapozitive sau filtre, unde "
-"dacă vă uitați prin ele vedeți o compunere a conținutului lor."
+msgid "GIMP uses layers to let you organize your image. Think of them as a stack of slides or filters, such that looking through them you see a composite of their contents."
+msgstr "GIMP folosește straturi pentru a vă permite organizarea imaginii la care lucrați. Gândiți-vă la ele ca la o stivă de diapozitive sau filtre, unde dacă vă uitați prin ele vedeți o compunere a conținutului lor."
 
 #: ../data/tips/gimp-tips.xml.in.h:10
-msgid ""
-"If a layer's name in the Layers dialog is displayed in bold, this "
-"layer doesn't have an alpha-channel. You can add an alpha-channel using "
-"Layer→Transparency→Add Alpha Channel."
-msgstr ""
-"Dacă numele unui strat în dialogul de straturi este afișat îngroșat, "
-"acel strat nu are un canal alfa. Puteți adăuga un canal alfa folosind Strat "
-"→ Transparență → Adaugă un canal alfa"
+msgid "If a layer's name in the Layers dialog is displayed in bold, this layer doesn't have an alpha-channel. You can add an alpha-channel using Layer→Transparency→Add Alpha Channel."
+msgstr "Dacă numele unui strat în dialogul de straturi este afișat îngroșat, acel strat nu are un canal alfa. Puteți adăuga un canal alfa folosind Strat → Transparență → Adaugă un canal alfa"
 
 #: ../data/tips/gimp-tips.xml.in.h:11
-msgid ""
-"If some of your scanned photos do not look colorful enough, you can easily "
-"improve their tonal range with the "Auto" button in the Levels "
-"tool (Colors→Levels). If there are any color casts, you can correct them "
-"with the Curves tool (Colors→Curves)."
-msgstr ""
-"Dacă unele dintre fotografiile scanate nu arată suficient de colorate, "
-"puteți să îmbunătățiți cu ușurință gama lor tonală cu butonul „Automat” în "
-"instrumentul Niveluri (Culori → Niveluri). Dacă sunt prezente dominante de "
-"culoare, puteți să le corectați cu instrumentul Curbe (Culori → Curbe)."
+msgid "If some of your scanned photos do not look colorful enough, you can easily improve their tonal range with the "Auto" button in the Levels tool (Colors→Levels). If there are any color casts, you can correct them with the Curves tool (Colors→Curves)."
+msgstr "Dacă unele dintre fotografiile scanate nu arată suficient de colorate, puteți să îmbunătățiți cu ușurință gama lor tonală cu butonul „Automat” în instrumentul Niveluri (Culori → Niveluri). Dacă sunt prezente dominante de culoare, puteți să le corectați cu instrumentul Curbe (Culori → Curbe)."
 
 #: ../data/tips/gimp-tips.xml.in.h:12
-msgid ""
-"If you stroke a path (Edit→Stroke Path), the paint tools can be used with "
-"their current settings. You can use the Paintbrush in gradient mode or even "
-"the Eraser or the Smudge tool."
-msgstr ""
-"Dacă trasați o cale (Editare → Trasează o cale...), instrumentele de pictură "
-"pot fi folosite cu setările lor curente. Puteți folosi pensula de pictură în "
-"modul degrade, sau chiar în instrumentul Gumă de șters sau Mânjire."
+msgid "If you stroke a path (Edit→Stroke Path), the paint tools can be used with their current settings. You can use the Paintbrush in gradient mode or even the Eraser or the Smudge tool."
+msgstr "Dacă trasați o cale (Editare → Trasează o cale...), instrumentele de pictură pot fi folosite cu setările lor curente. Puteți folosi pensula de pictură în modul degrade, sau chiar în instrumentul Gumă de șters sau Mânjire."
 
 #: ../data/tips/gimp-tips.xml.in.h:13
-msgid ""
-"If your screen is too cluttered, you can press Tab in an image "
-"window to toggle the visibility of the toolbox and other dialogs."
-msgstr ""
-"Dacă ecranul calculatorului este prea aglomerat, puteți apăsa Tab "
-"într-o fereastră de imagine pentru a comuta vizibilitatea barei de unelte și "
-"a altor dialoguri."
+msgid "If your screen is too cluttered, you can press Tab in an image window to toggle the visibility of the toolbox and other dialogs."
+msgstr "Dacă ecranul calculatorului este prea aglomerat, puteți apăsa Tab într-o fereastră de imagine pentru a comuta vizibilitatea barei de unelte și a altor dialoguri."
 
 #: ../data/tips/gimp-tips.xml.in.h:14
-msgid ""
-"Most plug-ins work on the current layer of the current image. In some cases, "
-"you will have to merge all layers (Image→Flatten Image) if you want the plug-"
-"in to work on the whole image."
-msgstr ""
-"Majoritatea plugin-urilor lucrează pe stratul curent al imaginii curente. În "
-"unele cazuri, va trebui să combinați toate straturile (Imagine → Aplatizează "
-"imaginea) dacă vreți ca plugin-ul să lucreze pe întreaga imagine."
+msgid "Most plug-ins work on the current layer of the current image. In some cases, you will have to merge all layers (Image→Flatten Image) if you want the plug-in to work on the whole image."
+msgstr "Majoritatea plugin-urilor lucrează pe stratul curent al imaginii curente. În unele cazuri, va trebui să combinați toate straturile (Imagine → Aplatizează imaginea) dacă vreți ca plugin-ul să lucreze pe întreaga imagine."
 
 #: ../data/tips/gimp-tips.xml.in.h:15
-msgid ""
-"Not all effects can be applied to all kinds of images. This is indicated by "
-"a grayed-out menu-entry. You may need to change the image mode to RGB "
-"(Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha "
-"Channel) or flatten it (Image→Flatten Image)."
-msgstr ""
-"Nu toate efectele pot fi aplicate la toate tipurile de imagini. Acest lucru "
-"este indicat prin colorarea în gri a  intrării de meniu inactive. Este "
-"posibil să trebuiească să schimbați modul imaginii la RGB (Imagine → Mod → "
-"RGB), să adăugați un canal alfa (Strat → Transparență → Adaugă un canal "
-"alfa), sau să o aplatizați (Imagine → Aplatizează imaginea)."
+msgid "Not all effects can be applied to all kinds of images. This is indicated by a grayed-out menu-entry. You may need to change the image mode to RGB (Image→Mode→RGB), add an alpha-channel (Layer→Transparency→Add Alpha Channel) or flatten it (Image→Flatten Image)."
+msgstr "Nu toate efectele pot fi aplicate la toate tipurile de imagini. Acest lucru este indicat prin colorarea în gri a  intrării de meniu inactive. Este posibil să trebuiească să schimbați modul imaginii la RGB (Imagine → Mod → RGB), să adăugați un canal alfa (Strat → Transparență → Adaugă un canal alfa), sau să o aplatizați (Imagine → Aplatizează imaginea)."
 
 # hm ? ceva pare idiot și la varianta engleză
 #: ../data/tips/gimp-tips.xml.in.h:16
-msgid ""
-"Pressing and holding the Shift key before making a selection allows "
-"you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one."
-msgstr ""
-"Apăsarea și menținerea tastei Shift înainte de a face o selecție vă "
-"permite să adăugați la selecția curentă în loc să o înlocuiți. Folosind "
-"Ctrl înainte de a face o selecție scade din cea curentă."
+msgid "Pressing and holding the Shift key before making a selection allows you to add to the current selection instead of replacing it. Using Ctrl before making a selection subtracts from the current one."
+msgstr "Apăsarea și menținerea tastei Shift înainte de a face o selecție vă permite să adăugați la selecția curentă în loc să o înlocuiți. Folosind Ctrl înainte de a face o selecție scade din cea curentă."
 
 #: ../data/tips/gimp-tips.xml.in.h:17
-msgid ""
-"When you save an image to work on it again later, try using XCF, GIMP's "
-"native file format (use the file extension .xcf). This preserves "
-"the layers and every aspect of your work-in-progress. Once a project is "
-"completed, you can save it as JPEG, PNG, GIF, ..."
-msgstr ""
-"Când salvați o imagine pentru a lucra la ea mai târziu, încercați să "
-"folosiți XCF, formatul nativ GIMP (folosește extensia .xcf). Acest "
-"lucru conservă straturile și orice aspect al lucrului în desfășurare. Odată "
-"ce proiectul este complet, puteți să îl salvați ca JPEG, PNG, GIF, ..."
+msgid "When you save an image to work on it again later, try using XCF, GIMP's native file format (use the file extension .xcf). This preserves the layers and every aspect of your work-in-progress. Once a project is completed, you can save it as JPEG, PNG, GIF, ..."
+msgstr "Când salvați o imagine pentru a lucra la ea mai târziu, încercați să folosiți XCF, formatul nativ GIMP (folosește extensia .xcf). Acest lucru conservă straturile și orice aspect al lucrului în desfășurare. Odată ce proiectul este complet, puteți să îl salvați ca JPEG, PNG, GIF, ..."
 
 #: ../data/tips/gimp-tips.xml.in.h:18
-msgid ""
-"You can adjust or move a selection by using Alt-drag. If this makes "
-"the window move, your window manager uses the Alt key already. Most "
-"window managers can be configured to ignore the Alt key or to use "
-"the Super key (or \"Windows logo\") instead."
-msgstr ""
-"Puteți să ajustați sau să mutați o selecție prin folosirea Alt-și-"
-"tragere. Dacă acest lucru determină mișcarea ferestrei, înseamnă că "
-"gestionarul de fereastră folosește deja tasta Alt. Majoritatea "
-"gestionarilor de fereastră pot fi configurați să ignore tasta Alt, "
-"sau să folosească tasta Super (sau „sigla Windows”) în loc."
+msgid "You can adjust or move a selection by using Alt-drag. If this makes the window move, your window manager uses the Alt key already. Most window managers can be configured to ignore the Alt key or to use the Super key (or \"Windows logo\") instead."
+msgstr "Puteți să ajustați sau să mutați o selecție prin folosirea Alt-și-tragere. Dacă acest lucru determină mișcarea ferestrei, înseamnă că gestionarul de fereastră folosește deja tasta Alt. Majoritatea gestionarilor de fereastră pot fi configurați să ignore tasta Alt, sau să folosească tasta Super (sau „sigla Windows”) în loc."
 
 #: ../data/tips/gimp-tips.xml.in.h:19
-msgid ""
-"You can create and edit complex selections using the Path tool. The Paths "
-"dialog allows you to work on multiple paths and to convert them to "
-"selections."
-msgstr ""
-"Puteți crea și edita selecții complexe utilizând instrumentul de cale. "
-"Dialogul de căi vă permite să lucrați pe căi multiple și să le convertiți la "
-"selecții."
+msgid "You can create and edit complex selections using the Path tool. The Paths dialog allows you to work on multiple paths and to convert them to selections."
+msgstr "Puteți crea și edita selecții complexe utilizând instrumentul de cale. Dialogul de căi vă permite să lucrați pe căi multiple și să le convertiți la selecții."
 
 #: ../data/tips/gimp-tips.xml.in.h:20
-msgid ""
-"You can drag a layer from the Layers dialog and drop it onto the toolbox. "
-"This will create a new image containing only that layer."
-msgstr ""
-"Puteți trage un strat din dialogul de straturi și să îl lăsați să cadă peste "
-"trusa de instrumente. În acest fel se va crea o nouă imagine ce conține doar "
-"acel strat."
+msgid "You can drag a layer from the Layers dialog and drop it onto the toolbox. This will create a new image containing only that layer."
+msgstr "Puteți trage un strat din dialogul de straturi și să îl lăsați să cadă peste trusa de instrumente. În acest fel se va crea o nouă imagine ce conține doar acel strat."
 
 #: ../data/tips/gimp-tips.xml.in.h:21
-msgid ""
-"You can drag and drop many things in GIMP. For example, dragging a color "
-"from the toolbox or from a color palette and dropping it into an image will "
-"fill the current selection with that color."
-msgstr ""
-"Puteți să trageți și să aruncați multe chestii în GIMP. De exemplu, tragerea "
-"unei culori din trusa de instrumente sau dintr-o paletă de culoare și "
-"aruncarea acesteia peste o imagine va umple selecția curentă cu acea culoare."
+msgid "You can drag and drop many things in GIMP. For example, dragging a color from the toolbox or from a color palette and dropping it into an image will fill the current selection with that color."
+msgstr "Puteți să trageți și să aruncați multe chestii în GIMP. De exemplu, tragerea unei culori din trusa de instrumente sau dintr-o paletă de culoare și aruncarea acesteia peste o imagine va umple selecția curentă cu acea culoare."
 
 #: ../data/tips/gimp-tips.xml.in.h:22
-msgid ""
-"You can draw simple squares or circles using Edit→Stroke Selection. It "
-"strokes the edge of your current selection. More complex shapes can be drawn "
-"using the Path tool or with Filters→Render→Gfig."
-msgstr ""
-"Puteți desena pătrate simple sau cercuri folosind Editare → Trasează o "
-"seleție. Aceasta va trasa marginea selecției curente. Forme mai complexe pot "
-"fi desenate prin utilizarea instrumentului Căi, sau cu Filtre → Render → "
-"Gfig."
+msgid "You can draw simple squares or circles using Edit→Stroke Selection. It strokes the edge of your current selection. More complex shapes can be drawn using the Path tool or with Filters→Render→Gfig."
+msgstr "Puteți desena pătrate simple sau cercuri folosind Editare → Trasează o seleție. Aceasta va trasa marginea selecției curente. Forme mai complexe pot fi desenate prin utilizarea instrumentului Căi, sau cu Filtre → Render → Gfig."
 
 #: ../data/tips/gimp-tips.xml.in.h:23
-msgid ""
-"You can get context-sensitive help for most of GIMP's features by pressing "
-"the F1 key at any time. This also works inside the menus."
-msgstr ""
-"Puteți să obțineți ajutor contextual pentru majoritatea caracteristicilor "
-"GIMP prin apăsarea în orice moment a tastei F1. Acest lucru funcționează de "
-"asemenea și în interiorul meniurilor."
+msgid "You can get context-sensitive help for most of GIMP's features by pressing the F1 key at any time. This also works inside the menus."
+msgstr "Puteți să obțineți ajutor contextual pentru majoritatea caracteristicilor GIMP prin apăsarea în orice moment a tastei F1. Acest lucru funcționează de asemenea și în interiorul meniurilor."
 
 #: ../data/tips/gimp-tips.xml.in.h:24
-msgid ""
-"You can perform many layer operations by right-clicking on the text label of "
-"a layer in the Layers dialog."
-msgstr ""
-"Puteți executa multe operații de strat prin clic-dreapta pe eticheta text a "
-"unui strat în dialogul de straturi."
+msgid "You can perform many layer operations by right-clicking on the text label of a layer in the Layers dialog."
+msgstr "Puteți executa multe operații de strat prin clic-dreapta pe eticheta text a unui strat în dialogul de straturi."
 
 #: ../data/tips/gimp-tips.xml.in.h:25
-msgid ""
-"You can save a selection to a channel (Select→Save to Channel) and then "
-"modify this channel with any paint tools. Using the buttons in the Channels "
-"dialog, you can toggle the visibility of this new channel or convert it to a "
-"selection."
-msgstr ""
-"Puteți salva o selecție la un canal (Selecție → Salvează în canal) și "
-"modifica după aceea acest canal cu orice instrument de pictură. Folosind "
-"butoanele în dialogul de canale, puteți comuta vizibilitatea acestui canal "
-"nou, sau să îl convertiți la selecție."
+msgid "You can save a selection to a channel (Select→Save to Channel) and then modify this channel with any paint tools. Using the buttons in the Channels dialog, you can toggle the visibility of this new channel or convert it to a selection."
+msgstr "Puteți salva o selecție la un canal (Selecție → Salvează în canal) și modifica după aceea acest canal cu orice instrument de pictură. Folosind butoanele în dialogul de canale, puteți comuta vizibilitatea acestui canal nou, sau să îl convertiți la selecție."
 
 #: ../data/tips/gimp-tips.xml.in.h:26
-msgid ""
-"You can use Ctrl-Tab to cycle through all layers in an "
-"image (if your window manager doesn't trap those keys...)."
-msgstr ""
-"Puteți folosi Ctrl-Tab pentru a comuta ciclic prin toate "
-"straturile unei imagini (asta dacă gestionarul de ferestre nu capturează "
-"aceste taste ...)."
+msgid "You can use Ctrl-Tab to cycle through all layers in an image (if your window manager doesn't trap those keys...)."
+msgstr "Puteți folosi Ctrl-Tab pentru a comuta ciclic prin toate straturile unei imagini (asta dacă gestionarul de ferestre nu capturează aceste taste ...)."
 
 #: ../data/tips/gimp-tips.xml.in.h:27
-msgid ""
-"You can use the middle mouse button to pan around the image (or optionally "
-"hold Spacebar while you move the mouse)."
-msgstr ""
-"Puteți folosi butonul din mijloc pentru a deplasa imaginea în jur (sau "
-"opțional țineți apăsat tasta Spațiu în timp ce mișcați mausul)."
+msgid "You can use the middle mouse button to pan around the image (or optionally hold Spacebar while you move the mouse)."
+msgstr "Puteți folosi butonul din mijloc pentru a deplasa imaginea în jur (sau opțional țineți apăsat tasta Spațiu în timp ce mișcați mausul)."
 
 #: ../data/tips/gimp-tips.xml.in.h:28
-msgid ""
-"You can use the paint tools to change the selection. Click on the ""
-"Quick Mask" button at the bottom left of an image window. Change your "
-"selection by painting in the image and click on the button again to convert "
-"it back to a normal selection."
-msgstr ""
-"Puteți folosi uneltele de desenat pentru a modifica selecția. Clic pe "
-"butonul „Mască rapidă” din partea din stânga jos a unei ferestre cu o "
-"imagine. Modificați selecția prin desenare în imagine după care clic din nou "
-"pe buton pentru a-l converti la loc la o selecție normală."
+msgid "You can use the paint tools to change the selection. Click on the "Quick Mask" button at the bottom left of an image window. Change your selection by painting in the image and click on the button again to convert it back to a normal selection."
+msgstr "Puteți folosi uneltele de desenat pentru a modifica selecția. Clic pe butonul „Mască rapidă” din partea din stânga jos a unei ferestre cu o imagine. Modificați selecția prin desenare în imagine după care clic din nou pe buton pentru a-l converti la loc la o selecție normală."
 
 #~ msgid "Welcome to the GNU Image Manipulation Program!"
 #~ msgstr "Bun venit la programul GNU de manipulare de imagini !"
-
 #~ msgid ""
 #~ "GIMP allows you to undo most changes to the image, so feel free to "
 #~ "experiment."
 #~ msgstr ""
 #~ "GIMP vă permite să anulați majoritatea modificărilor făcute asupra "
 #~ "imaginii, deci simțiți-vă liberi să experimentați."
+
diff --git a/po/ChangeLog b/po/ChangeLog
index 1f0c91db61..5dd826da16 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2009-10-16  Funda Wang  
+
+	* zh_CN.po: Updated zh_CN translation.
+
 2009-05-26  Manoj Kuamr Giri  
 
 	* or.po: Updated Oriya Translation.
diff --git a/po/cs.po b/po/cs.po
index ee631b3249..bd89da7280 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,19 +7,18 @@
 # Miloslav Trmac , 2003 - 2005.
 # Jakub Friedl , 2006, 2007, 2008.
 # Petr Kovar , 2008, 2009.
-#
+# JardaK , 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-06-29 00:44+0200\n"
-"PO-Revision-Date: 2009-06-29 00:26+0200\n"
+"POT-Creation-Date: 2009-09-06 00:36+0200\n"
+"PO-Revision-Date: 2009-09-06 00:07+0200\n"
 "Last-Translator: Petr Kovar \n"
 "Language-Team: Czech \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.11.4\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ../app/about.h:24
@@ -74,10 +73,10 @@ msgid ""
 "To avoid data loss, please check the location and permissions of the swap "
 "directory defined in your Preferences (currently \"%s\")."
 msgstr ""
-"Nemohu otevřít testovací odkládací soubor.\n"
+"Nelze otevřít testovací odkládací soubor.\n"
 "\n"
 "Abyste předešli ztrátě dat, zkontrolujte prosím umístění a oprávnění "
-"odkládacího adresáře definovaného ve vašich Předvolbách (momentálně \"%s\")."
+"odkládacího adresáře definovaného v Předvolbách (momentálně \"%s\")."
 
 #: ../app/batch.c:75
 #, c-format
@@ -239,7 +238,7 @@ msgstr ""
 #: ../app/version.c:64
 #, c-format
 msgid "using %s version %s (compiled against version %s)"
-msgstr ""
+msgstr "používá se %s verze %s (kompilovaná vůči verzi %s)"
 
 #: ../app/version.c:127 ../tools/gimp-remote.c:95
 #, c-format
@@ -271,9 +270,8 @@ msgid "Colormap"
 msgstr "Mapa barev"
 
 #: ../app/actions/actions.c:116
-#, fuzzy
 msgid "Configuration"
-msgstr "Konfigurace zdrojů"
+msgstr "Konfigurace"
 
 #: ../app/actions/actions.c:119
 msgid "Context"
@@ -419,9 +417,8 @@ msgid "View"
 msgstr "Zobrazit"
 
 #: ../app/actions/actions.c:212
-#, fuzzy
 msgid "Windows"
-msgstr "Okna obrázku"
+msgstr "Okno"
 
 #: ../app/actions/brush-editor-actions.c:43
 msgid "Brush Editor Menu"
@@ -728,11 +725,11 @@ msgstr "Upravit položku mapy barev"
 
 #: ../app/actions/config-actions.c:39
 msgid "Use _GEGL"
-msgstr ""
+msgstr "Použít _GEGL"
 
 #: ../app/actions/config-actions.c:40
 msgid "If possible, use GEGL for image processing"
-msgstr ""
+msgstr "Je-li to možné, použít ke zpracování obrázků GEGL"
 
 #: ../app/actions/context-actions.c:46
 msgid "_Context"
@@ -987,7 +984,6 @@ msgid "Open the brushes dialog"
 msgstr "Otevřít dialog stop"
 
 #: ../app/actions/dialogs-actions.c:124
-#, fuzzy
 msgid "Open the brush editor"
 msgstr "Otevřít dialog stop"
 
@@ -1008,7 +1004,6 @@ msgid "Open the gradients dialog"
 msgstr "Otevřít dialog přechodů"
 
 #: ../app/actions/dialogs-actions.c:142
-#, fuzzy
 msgid "Open the gradient editor"
 msgstr "Otevřít dialog přechodů"
 
@@ -1021,7 +1016,6 @@ msgid "Open the palettes dialog"
 msgstr "Otevřít dialog palet"
 
 #: ../app/actions/dialogs-actions.c:154
-#, fuzzy
 msgid "Open the palette editor"
 msgstr "Otevřít dialog palet"
 
@@ -1098,9 +1092,8 @@ msgid "Open the keyboard shortcuts editor"
 msgstr "Otevřít editor klávesových zkratek"
 
 #: ../app/actions/dialogs-actions.c:218
-#, fuzzy
 msgid "_Modules"
-msgstr "Moduly"
+msgstr "_Moduly"
 
 #: ../app/actions/dialogs-actions.c:219
 msgid "Open the module manager dialog"
@@ -1112,7 +1105,7 @@ msgstr "_Tip dne"
 
 #: ../app/actions/dialogs-actions.c:225
 msgid "Show some helpful tips on using GIMP"
-msgstr ""
+msgstr "Ukázat užitečné tipy, jak používat GIMP"
 
 #: ../app/actions/dialogs-actions.c:230
 msgid "_About"
@@ -1229,11 +1222,11 @@ msgstr "_Stav a text"
 
 #: ../app/actions/dockable-actions.c:108
 msgid "Loc_k Tab to Dock"
-msgstr ""
+msgstr "_Zamknout kartu do okna"
 
 #: ../app/actions/dockable-actions.c:109
 msgid "Protect this tab from being dragged with the mouse pointer"
-msgstr ""
+msgstr "Chrání kartu před možným přesunem pomocí myši"
 
 #: ../app/actions/dockable-actions.c:115
 msgid "Show _Button Bar"
@@ -1328,18 +1321,16 @@ msgid "Clear Document History"
 msgstr "Vymazat historii dokumentů"
 
 #: ../app/actions/documents-commands.c:221
-#, fuzzy
 msgid "Clear the Recent Documents list?"
-msgstr "Vymazat celou historii dokumentů"
+msgstr "Vymazat seznam nedávných dokumentů?"
 
 #: ../app/actions/documents-commands.c:224
-#, fuzzy
 msgid ""
 "Clearing the document history will permanently remove all items from the "
 "recent documents list in all applications."
 msgstr ""
-"Vymazání historie dokumentu natrvalo odstraní všechny momentálně vypsané "
-"položky."
+"Vymazání historie dokumentů natrvalo odstraní všechny položky ze seznamu "
+"nedávných dokumentů."
 
 #: ../app/actions/drawable-actions.c:45
 msgid "_Equalize"
@@ -1528,9 +1519,8 @@ msgid "Copy _Visible"
 msgstr "Kopírovat _viditelné"
 
 #: ../app/actions/edit-actions.c:121
-#, fuzzy
 msgid "Copy what is visible in the selected region"
-msgstr "Nemohu udělat výběr plovoucí, protože vybraná oblast je prázdná."
+msgstr "Kopírovat to, co je viditelné ve vybrané oblasti"
 
 #: ../app/actions/edit-actions.c:126
 msgid "_Paste"
@@ -1549,9 +1539,8 @@ msgid "Paste the content of the clipboard into the current selection"
 msgstr "Vložit obsah schránky do aktuálního výběru"
 
 #: ../app/actions/edit-actions.c:138
-#, fuzzy
 msgid "From _Clipboard"
-msgstr "Schránka"
+msgstr "Ze _schránky"
 
 #: ../app/actions/edit-actions.c:139 ../app/actions/edit-actions.c:145
 msgid "Create a new image from the content of the clipboard"
@@ -1562,14 +1551,12 @@ msgid "_New Image"
 msgstr "_Nový obrázek"
 
 #: ../app/actions/edit-actions.c:150
-#, fuzzy
 msgid "New _Layer"
-msgstr "Nová vrstva"
+msgstr "Nová _vrstva"
 
 #: ../app/actions/edit-actions.c:151
-#, fuzzy
 msgid "Create a new layer from the content of the clipboard"
-msgstr "Vytvořit nový obrázek z obsahu schránky"
+msgstr "Vytvořit novou vrstvu z obsahu schránky"
 
 #: ../app/actions/edit-actions.c:156
 msgid "Cu_t Named..."
@@ -1665,9 +1652,8 @@ msgid "Clearing the undo history of this image will gain %s of memory."
 msgstr "Vymazání historie změn tohoto obrázku ušetří %s paměti."
 
 #: ../app/actions/edit-commands.c:201
-#, fuzzy
 msgid "Cut pixels to the clipboard"
-msgstr "Pixely zkopírované do schránky"
+msgstr "Oříznout pixely do schránky"
 
 #: ../app/actions/edit-commands.c:228 ../app/actions/edit-commands.c:254
 msgid "Copied pixels to the clipboard"
@@ -1771,9 +1757,8 @@ msgid "_File"
 msgstr "_Soubor"
 
 #: ../app/actions/file-actions.c:67
-#, fuzzy
 msgid "Create"
-msgstr "Aktuální"
+msgstr "Vytvořit"
 
 #: ../app/actions/file-actions.c:68
 msgid "Open _Recent"
@@ -1894,7 +1879,7 @@ msgstr ""
 
 #: ../app/actions/file-commands.c:300
 msgid "No changes need to be saved"
-msgstr ""
+msgstr "Žádné změny k uložení"
 
 #: ../app/actions/file-commands.c:307 ../app/dialogs/file-save-dialog.c:88
 msgid "Save Image"
@@ -2681,14 +2666,12 @@ msgid "Create a new layer with last used values"
 msgstr "Vytvořit novou vrstvu s naposledy použitými hodnotami"
 
 #: ../app/actions/layers-actions.c:86
-#, fuzzy
 msgid "New from _Visible"
-msgstr "Kopírovat _viditelné"
+msgstr "Nová z _viditelné"
 
 #: ../app/actions/layers-actions.c:87
-#, fuzzy
 msgid "Create a new layer from what is visible in this image"
-msgstr "Vytvořit z tohoto obrázku novou šablonu"
+msgstr "Vytvořit novou vrstvu z toho, co je viditelné v tomto obrázku"
 
 #: ../app/actions/layers-actions.c:92
 msgid "D_uplicate Layer"
@@ -2998,9 +2981,8 @@ msgid "Create a New Layer"
 msgstr "Vytvořit novou vrstvu"
 
 #: ../app/actions/layers-commands.c:352
-#, fuzzy
 msgid "Visible"
-msgstr "_Viditelné"
+msgstr "Viditelné"
 
 #: ../app/actions/layers-commands.c:571
 msgid "Set Layer Boundary Size"
@@ -3263,7 +3245,7 @@ msgstr "_Umění"
 
 #: ../app/actions/plug-in-actions.c:94
 msgid "_Decor"
-msgstr ""
+msgstr "_Dekorace"
 
 #: ../app/actions/plug-in-actions.c:96
 msgid "_Render"
@@ -3545,7 +3527,6 @@ msgid "Templates Menu"
 msgstr "Menu Šablony"
 
 #: ../app/actions/templates-actions.c:46
-#, fuzzy
 msgid "_Create Image from Template"
 msgstr "_Vytvořit obrázek ze šablony..."
 
@@ -4349,19 +4330,16 @@ msgid "Move this window to screen %s"
 msgstr "Přesunout toto okno na obrazovku %s"
 
 #: ../app/actions/windows-actions.c:79
-#, fuzzy
 msgid "_Windows"
-msgstr "Vyplni_t okno"
+msgstr "_Okno"
 
 #: ../app/actions/windows-actions.c:80
-#, fuzzy
 msgid "_Recently Closed Docks"
-msgstr "Naposled použité"
+msgstr "_Nedávno zavřená okna"
 
 #: ../app/actions/windows-actions.c:81
-#, fuzzy
 msgid "_Dockable Dialogs"
-msgstr "Dokovatelné"
+msgstr "_Připojitelné dialogy"
 
 #: ../app/actions/windows-actions.c:84
 msgid "Tool_box"
@@ -4514,10 +4492,10 @@ msgid ""
 "using different filenames, restart GIMP and check the location of the swap "
 "directory in your Preferences."
 msgstr ""
-"Nemohu otevřít odkládací soubor. GIMPu došla paměť a nemůže použít odkládací "
-"soubor. Některé části vašich obrázků mohou být poškozeny. Zkuste uložit svou "
-"práci pod jinými názvy souborů, spustit GIMP znovu a zkontrolovat nastavení "
-"odkládacího adresáře ve vašich Předvolbách."
+"Nelze otevřít odkládací soubor. Aplikaci GIMP došla paměť a nemůže použít "
+"odkládací soubor. Některé části vašich obrázků mohou být poškozeny. Zkuste "
+"uložit svou práci pod jinými názvy souborů, spustit GIMP znovu a "
+"zkontrolovat nastavení odkládacího adresáře v Předvolbách."
 
 #: ../app/base/tile-swap.c:568
 #, c-format
@@ -4813,12 +4791,12 @@ msgstr ""
 "Zapamatovat si aktuální nástroj, vzorek, barvu a stopu mezi sezeními GIMP."
 
 #: ../app/config/gimprc-blurbs.h:269
-#, fuzzy
 msgid ""
 "Keep a permanent record of all opened and saved files in the Recent "
 "Documents list."
 msgstr ""
-"Přidat všechny otevřené a uložené soubory do historie dokumentů na disku."
+"Zachovat záznam o všech otevřených a uložených souborech v seznamu nedávných "
+"dokumentů."
 
 #: ../app/config/gimprc-blurbs.h:273
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
@@ -5017,18 +4995,16 @@ msgstr ""
 "hodnotu zvýšit."
 
 #: ../app/config/gimprc-blurbs.h:390
-#, fuzzy
 msgid "Show the current foreground and background colors in the toolbox."
-msgstr "Prohodit barvy popředí a pozadí"
+msgstr "Zobrazovat aktivní barvu popředí a pozadí v panelu nástrojů."
 
 #: ../app/config/gimprc-blurbs.h:393
-#, fuzzy
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
-msgstr "Zobrazovat aktivní _stopu, vzorek a přechod"
+msgstr "Zobrazovat aktivní stopu, vzorek a přechod v panelu nástrojů."
 
 #: ../app/config/gimprc-blurbs.h:396
 msgid "Show the currently active image in the toolbox."
-msgstr ""
+msgstr "Zobrazovat aktivní obrázek v panelu nástrojů."
 
 #: ../app/config/gimprc-blurbs.h:402
 msgid ""
@@ -5595,12 +5571,10 @@ msgid "Reposition path"
 msgstr "Cesta přemístění"
 
 #: ../app/core/core-enums.c:924
-#, fuzzy
 msgid "Rigor floating selection"
 msgstr "Ukotvit plovoucí výběr"
 
 #: ../app/core/core-enums.c:925
-#, fuzzy
 msgid "Relax floating selection"
 msgstr "Odstranit plovoucí výběr"
 
@@ -5615,7 +5589,7 @@ msgstr "Nastavit barvu popředí"
 
 #: ../app/core/core-enums.c:932
 msgid "Not undoable"
-msgstr ""
+msgstr "Není nevratný"
 
 #: ../app/core/core-enums.c:1196
 msgid "Composite"
@@ -5760,7 +5734,7 @@ msgstr "Moduly"
 #: ../app/core/gimpbrush-load.c:177
 #, c-format
 msgid "Could not read %d bytes from '%s': %s"
-msgstr "Nemohu načíst %d bajtů ze '%s': %s"
+msgstr "Nelze načíst %d bajtů ze '%s': %s"
 
 #: ../app/core/gimpbrush-load.c:197
 #, c-format
@@ -5820,7 +5794,7 @@ msgstr ""
 msgid ""
 "Fatal parse error in brush file '%s': unable to decode abr format version %d."
 msgstr ""
-"Fatální chyba zpracování souboru stopy '%s': nemohu dekódovat verzi %d "
+"Fatální chyba zpracování souboru stopy '%s': nelze dekódovat verzi %d "
 "formátu abr."
 
 #: ../app/core/gimpbrush-load.c:615
@@ -5873,19 +5847,16 @@ msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr "Fatální chyba zpracování souboru stopy '%s': Soubor je poškozen."
 
 #: ../app/core/gimpchannel-select.c:60
-#, fuzzy
 msgctxt "command"
 msgid "Rectangle Select"
 msgstr "Výběr obdélníku"
 
 #: ../app/core/gimpchannel-select.c:111
-#, fuzzy
 msgctxt "command"
 msgid "Ellipse Select"
 msgstr "Výběr elipsy"
 
 #: ../app/core/gimpchannel-select.c:165
-#, fuzzy
 msgctxt "command"
 msgid "Rounded Rectangle Select"
 msgstr "Výběr zaobleného obdélníku"
@@ -5900,14 +5871,12 @@ msgid "%s Channel to Selection"
 msgstr "Kanál %s do výběru"
 
 #: ../app/core/gimpchannel-select.c:520 ../app/tools/gimpfuzzyselecttool.c:80
-#, fuzzy
 msgctxt "command"
 msgid "Fuzzy Select"
 msgstr "Přibližný výběr"
 
 #: ../app/core/gimpchannel-select.c:567
 #: ../app/tools/gimpbycolorselecttool.c:82
-#, fuzzy
 msgctxt "command"
 msgid "Select by Color"
 msgstr "Výběr dle barvy"
@@ -5983,7 +5952,7 @@ msgstr "Zmenšit kanál"
 #: ../app/core/gimpchannel.c:710
 #, c-format
 msgid "Cannot stroke empty channel."
-msgstr "Nemohu vykreslit prázdný kanál."
+msgstr "Nelze vykreslit prázdný kanál."
 
 #: ../app/core/gimpchannel.c:1631
 msgid "Set Channel Color"
@@ -6044,9 +6013,8 @@ msgid "Blend"
 msgstr "Mísení"
 
 #: ../app/core/gimpdrawable-brightness-contrast.c:76
-#, fuzzy
 msgid "Brightness_Contrast"
-msgstr "Jas-kontrast"
+msgstr "Jas_kontrast"
 
 #: ../app/core/gimpdrawable-brightness-contrast.c:87
 #: ../app/tools/gimpbrightnesscontrasttool.c:111
@@ -6059,7 +6027,6 @@ msgid "No patterns available for this operation."
 msgstr "Nejsou k dispozici žádné vzorky pro tuto operaci."
 
 #: ../app/core/gimpdrawable-bucket-fill.c:286
-#, fuzzy
 msgctxt "command"
 msgid "Bucket Fill"
 msgstr "Plechovka"
@@ -6100,9 +6067,8 @@ msgid "Hue-Saturation"
 msgstr "Odstín-sytost"
 
 #: ../app/core/gimpdrawable-hue-saturation.c:88
-#, fuzzy
 msgid "Hue_Saturation"
-msgstr "Odstín-sytost"
+msgstr "Odstín_sytost"
 
 #: ../app/core/gimpdrawable-invert.c:60 ../app/core/gimpdrawable-invert.c:68
 msgid "Invert"
@@ -6132,13 +6098,11 @@ msgid "Threshold"
 msgstr "Práh"
 
 #: ../app/core/gimpdrawable-transform.c:645 ../app/tools/gimpfliptool.c:116
-#, fuzzy
 msgctxt "command"
 msgid "Flip"
 msgstr "Překlopení"
 
 #: ../app/core/gimpdrawable-transform.c:745 ../app/tools/gimprotatetool.c:121
-#, fuzzy
 msgctxt "command"
 msgid "Rotate"
 msgstr "Rotovat"
@@ -6197,7 +6161,7 @@ msgstr "V '%s' nebyl nalezen lineární přechod"
 #: ../app/core/gimpgradient-load.c:344
 #, c-format
 msgid "Failed to import gradients from '%s': %s"
-msgstr "Nemohu importovat přechody z '%s': %s"
+msgstr "Nelze importovat přechody z '%s': %s"
 
 #: ../app/core/gimpgrid.c:84
 msgid "Line style used for the grid."
@@ -6248,7 +6212,7 @@ msgstr "Přidat barvu do mapy barev"
 #: ../app/core/gimpimage-convert.c:792
 #, c-format
 msgid "Cannot convert image: palette is empty."
-msgstr "Nemohu převést obrázek: paleta je prázdná."
+msgstr "Nelze převést obrázek: paleta je prázdná."
 
 #: ../app/core/gimpimage-convert.c:806
 msgid "Convert Image to RGB"
@@ -6264,14 +6228,13 @@ msgstr "Převést obrázek na indexovaný"
 
 #: ../app/core/gimpimage-convert.c:896
 msgid "Converting to indexed colors (stage 2)"
-msgstr "Převádím do indexovaných barev (krok 2)"
+msgstr "Převádí se do indexovaných barev (krok 2)"
 
 #: ../app/core/gimpimage-convert.c:941
 msgid "Converting to indexed colors (stage 3)"
-msgstr "Převádím do indexovaných barev (krok 3)"
+msgstr "Převádí se do indexovaných barev (krok 3)"
 
 #: ../app/core/gimpimage-crop.c:130
-#, fuzzy
 msgctxt "command"
 msgid "Crop Image"
 msgstr "Ořezat obrázek"
@@ -6523,7 +6486,7 @@ msgstr[2] "%d vrstev"
 #: ../app/core/gimpimagefile.c:675
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
-msgstr "Nemohu otevřít miniaturu '%s': %s"
+msgstr "Nelze otevřít miniaturu '%s': %s"
 
 #: ../app/core/gimpitem.c:1138
 msgid "Attach Parasite"
@@ -6551,7 +6514,7 @@ msgid ""
 "Cannot create a new layer from the floating selection because it belongs to "
 "a layer mask or channel."
 msgstr ""
-"Nemohu vytvořit novou vrstvu z plovoucího výběru, protože patří do masky "
+"Nelze vytvořit novou vrstvu z plovoucího výběru, protože patří do masky "
 "výběru nebo kanálu."
 
 #: ../app/core/gimplayer-floating-sel.c:211
@@ -6690,9 +6653,10 @@ msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "Čtení souboru palety '%s': Chybí komponenta RED na řádku %d."
 
 #: ../app/core/gimppalette-load.c:191
-#, fuzzy, c-format
+#, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
-msgstr "Čtení souboru palety '%s': Chybí komponenta RED na řádku %d."
+msgstr ""
+"Čtení souboru palety '%s': Chybí zelená (GREEN) komponenta na řádku %d."
 
 #: ../app/core/gimppalette-load.c:199
 #, c-format
@@ -6737,7 +6701,7 @@ msgstr "Neplatný řetězec v kódování UTF-8 v souboru se vzorkem '%s'."
 #: ../app/core/gimppdbprogress.c:288 ../app/widgets/gimppdbdialog.c:352
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
-msgstr "Nemohu spustit zpětné volání %s. Příslušný zásuvný modul možná spadl."
+msgstr "Nelze spustit zpětné volání %s. Příslušný zásuvný modul možná spadl."
 
 #: ../app/core/gimpprogress.c:107 ../app/core/gimpprogress.c:154
 msgid "Please wait"
@@ -6771,12 +6735,12 @@ msgstr "Není žádný výběr k vytažení."
 #: ../app/core/gimpselection.c:640
 #, c-format
 msgid "Unable to cut or copy because the selected region is empty."
-msgstr "Nemohu vyříznout nebo kopírovat, protože zvolená oblast je prázdná."
+msgstr "Nelze vyříznout nebo kopírovat, protože zvolená oblast je prázdná."
 
 #: ../app/core/gimpselection.c:814
 #, c-format
 msgid "Cannot float selection because the selected region is empty."
-msgstr "Nemohu udělat výběr plovoucí, protože vybraná oblast je prázdná."
+msgstr "Nelze udělat výběr plovoucí, protože vybraná oblast je prázdná."
 
 #: ../app/core/gimpselection.c:821
 msgid "Float Selection"
@@ -6874,7 +6838,9 @@ msgstr ""
 "Stanislav Brabec\n"
 "Michal Bukovjan\n"
 "Miloslav Trmač\n"
-"Jakub Friedl"
+"Jakub Friedl\n"
+"Petr Kovář\n"
+"Jaroslav Krejčí"
 
 #: ../app/dialogs/about-dialog.c:529
 msgid "GIMP is brought to you by"
@@ -6927,12 +6893,12 @@ msgstr "_Povolit rozptyl průhlednosti"
 
 #: ../app/dialogs/convert-dialog.c:286
 msgid "Converting to indexed colors"
-msgstr "Převádím do indexovaných barev"
+msgstr "Převádí se do indexovaných barev"
 
 #: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:150
 #, c-format
 msgid "Cannot convert to a palette with more than 256 colors."
-msgstr "Nemohu převést do palety s více než 256 barvami."
+msgstr "Nelze převést do palety s více než 256 barvami."
 
 #: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:161
 #: ../app/gui/gui-message.c:148
@@ -7136,7 +7102,6 @@ msgid "Comment"
 msgstr "Poznámka"
 
 #: ../app/dialogs/image-scale-dialog.c:111
-#, fuzzy
 msgctxt "dialog-title"
 msgid "Scale Image"
 msgstr "Velikost obrázku"
@@ -7178,9 +7143,8 @@ msgstr ""
 "klávesové zkratky nebo ji vymažte stisknutím Backspace."
 
 #: ../app/dialogs/keyboard-shortcuts-dialog.c:81
-#, fuzzy
 msgid "S_ave keyboard shortcuts on exit"
-msgstr "_Uložit klávesové zkratky při ukončení"
+msgstr "U_ložit klávesové zkratky při ukončení"
 
 #: ../app/dialogs/layer-add-mask-dialog.c:83
 msgid "Add a Mask to the Layer"
@@ -7218,19 +7182,16 @@ msgid "Set name from _text"
 msgstr "Nastavit jméno z _textu"
 
 #: ../app/dialogs/module-dialog.c:127
-#, fuzzy
 msgid "Module Manager"
-msgstr "Správce _modulů"
+msgstr "Správce modulů"
 
 #: ../app/dialogs/module-dialog.c:150
-#, fuzzy
 msgid "You will have to restart GIMP for the changes to take effect."
-msgstr "Aby se následující změny projevily, musíte restartovat GIMP:"
+msgstr "Aby se změny projevily, musíte restartovat GIMP."
 
 #: ../app/dialogs/module-dialog.c:191
-#, fuzzy
 msgid "Module"
-msgstr "Moduly"
+msgstr "Modul"
 
 #: ../app/dialogs/module-dialog.c:464
 msgid "Only in memory"
@@ -7536,7 +7497,7 @@ msgstr "Potvrzovat zavření _neuložených obrázků"
 
 #: ../app/dialogs/preferences-dialog.c:1598
 msgid "Keep record of used files in the Recent Documents list"
-msgstr ""
+msgstr "Zachovat záznam o použitých souborech v seznamu nedávných dokumentů"
 
 #: ../app/dialogs/preferences-dialog.c:1607
 msgid "User Interface"
@@ -7631,24 +7592,23 @@ msgstr "Zobrazovat _tlačítka nápovědy"
 
 #: ../app/dialogs/preferences-dialog.c:1817
 msgid "Use the online version"
-msgstr ""
+msgstr "Použít online verzi"
 
 #: ../app/dialogs/preferences-dialog.c:1818
 msgid "Use a locally installed copy"
-msgstr ""
+msgstr "Použít lokálně instalovanou kopii"
 
 #: ../app/dialogs/preferences-dialog.c:1819
-#, fuzzy
 msgid "User manual:"
-msgstr "_Zadat ručně"
+msgstr "Uživatelská přiručka:"
 
 #: ../app/dialogs/preferences-dialog.c:1826
 msgid "There's a local installation of the user manual."
-msgstr ""
+msgstr "K dispozici lokální instalace uživatelské příručky."
 
 #: ../app/dialogs/preferences-dialog.c:1831
 msgid "The user manual is not installed locally."
-msgstr ""
+msgstr "Uživatelská příručka není lokálně nainstalovaná."
 
 #. Help Browser
 #: ../app/dialogs/preferences-dialog.c:1854
@@ -8277,15 +8237,13 @@ msgstr "Kreslicí nástroj:"
 
 #: ../app/dialogs/stroke-dialog.c:246
 msgid "_Emulate brush dynamics"
-msgstr ""
+msgstr "_Emulovat dynamiku štětce"
 
 #: ../app/dialogs/tips-dialog.c:89
-#, fuzzy
 msgid "The GIMP tips file is empty!"
-msgstr "Soubor s tipy GIMPu nebylo možné zpracovat!"
+msgstr "Soubor s tipy GIMPu je prázdný!"
 
 #: ../app/dialogs/tips-dialog.c:93
-#, fuzzy
 msgid "The GIMP tips file appears to be missing!"
 msgstr "Váš soubor s tipy GIMPu zřejmě chybí!"
 
@@ -8314,7 +8272,7 @@ msgstr "_Další tip"
 #. a link to the related section in the user manual
 #: ../app/dialogs/tips-dialog.c:194
 msgid "Learn more"
-msgstr ""
+msgstr "Dozvědět se více"
 
 #. This is a special string to specify the language identifier to
 #. look for in the gimp-tips.xml file. Please translate the C in it
@@ -8446,7 +8404,7 @@ msgstr "Navigace v obrázku"
 #: ../app/display/gimpdisplayshell.c:1285
 #: ../app/display/gimpdisplayshell.c:1375 ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
-msgstr ""
+msgstr "Upusťte sem soubory s obrázky, dojde k jejich otevření"
 
 #: ../app/display/gimpdisplayshell-close.c:147
 #: ../app/display/gimpdisplayshell-close.c:224
@@ -8599,7 +8557,7 @@ msgstr "(žádný)"
 #: ../app/display/gimpstatusbar.c:346
 #, c-format
 msgid "Cancel %s"
-msgstr ""
+msgstr "Zrušit %s"
 
 #: ../app/file/file-open.c:131 ../app/file/file-save.c:111
 #, c-format
@@ -8722,7 +8680,7 @@ msgstr "Štětec"
 #: ../app/paint/gimppaintcore-stroke.c:332
 #, c-format
 msgid "Not enough points to stroke"
-msgstr ""
+msgstr "Nedostatek bodů k vykreslení"
 
 #: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
 msgid "Pencil"
@@ -8932,50 +8890,52 @@ msgstr "Kreslící metoda '%s' neexistuje"
 msgid ""
 "Item '%s' (%d) can not be used because it has not been added to an image"
 msgstr ""
+"Položka '%s' (%d) nemůže být použita, protože nebyla přidána do obrázku"
 
 #: ../app/pdb/gimppdb-utils.c:329
 #, c-format
 msgid "Item '%s' (%d) has already been added to an image"
-msgstr ""
+msgstr "Položka '%s' (%d) byla již do obrázku přidána"
 
 #: ../app/pdb/gimppdb-utils.c:337
 #, c-format
 msgid "Trying to add item '%s' (%d) to wrong image"
-msgstr ""
+msgstr "Pokus přidat položku '%s' (%d) do špatného obrázku"
 
 #: ../app/pdb/gimppdb-utils.c:356
 #, c-format
 msgid "Layer '%s' (%d) can not be used because it is not a text layer"
-msgstr ""
+msgstr "Vrstva '%s' (%d) nemůže být použita, protože to není textová vrstva"
 
 #: ../app/pdb/gimppdb-utils.c:401
 #, c-format
 msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
 msgstr ""
+"Obrázek '%s' (%d) je soubor typu '%s', ale je očekáván soubor typu '%s'"
 
 #: ../app/pdb/gimppdb-utils.c:430
 #, c-format
 msgid "Image '%s' (%d) is already of type '%s'"
-msgstr ""
+msgstr "Obrázek '%s' (%d) už je soubor typu '%s'"
 
 #: ../app/pdb/gimppdb-utils.c:455
 #, c-format
 msgid "Vectors object %d does not contain stroke with ID %d"
-msgstr ""
+msgstr "Objekt vektorů %d neobsahuje vykreslení s ID %d"
 
 #: ../app/pdb/gimppdb.c:411
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Procedure '%s' has been called with a wrong type for argument #%d. Expected %"
 "s, got %s."
 msgstr ""
-"Procedura'%s' byla zavolána s nesprávným typem hodnoty argumentu '%s' (#%d). "
+"Procedura'%s' byla zavolána s nesprávným typem hodnoty argumentu #%d. "
 "Očekáváno %s, obdrženo %s."
 
 #: ../app/pdb/gimpprocedure.c:361 ../app/plug-in/gimppluginprocframe.c:209
-#, fuzzy, c-format
+#, c-format
 msgid "Procedure '%s' returned no return values"
-msgstr "Procedura '%s' nenalezena"
+msgstr "Procedura '%s' vrátila neplatnou hodnotu"
 
 #: ../app/pdb/gimpprocedure.c:585
 #, c-format
@@ -9061,9 +9021,9 @@ msgid "Free Select"
 msgstr "Volný výběr"
 
 #: ../app/pdb/text-layer-cmds.c:90
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to create text layer"
-msgstr "Nástroj text: tvorba a úprava textových vrstev"
+msgstr "Vytvoření textové vrstvy selhalo"
 
 #: ../app/pdb/text-layer-cmds.c:163 ../app/pdb/text-layer-cmds.c:235
 #: ../app/pdb/text-layer-cmds.c:314 ../app/pdb/text-layer-cmds.c:394
@@ -9072,9 +9032,8 @@ msgstr "Nástroj text: tvorba a úprava textových vrstev"
 #: ../app/pdb/text-layer-cmds.c:755 ../app/pdb/text-layer-cmds.c:825
 #: ../app/pdb/text-layer-cmds.c:897 ../app/pdb/text-layer-cmds.c:969
 #: ../app/pdb/text-layer-cmds.c:1041
-#, fuzzy
 msgid "Set text layer attribute"
-msgstr "Úpravy vlastností vrstvy"
+msgstr "Nastavit vlastnosti textové vrstvy"
 
 #: ../app/plug-in/gimpenvirontable.c:282
 #, c-format
@@ -9097,27 +9056,26 @@ msgid "Bad binary format string in interpreter file %s"
 msgstr "Špatný řetězec binárního formátu v souboru interpretru %s"
 
 #: ../app/plug-in/gimpplugin-message.c:423
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Calling error for procedure '%s':\n"
 "%s"
 msgstr ""
-"PDB chyba volání procedury '%s':\n"
+"Chyba volání procedury '%s':\n"
 "%s"
 
 #: ../app/plug-in/gimpplugin-message.c:432
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Execution error for procedure '%s':\n"
 "%s"
 msgstr ""
-"PDB chyba volání procedury '%s':\n"
+"Chyba volání procedury '%s':\n"
 "%s"
 
 #: ../app/plug-in/gimpplugin-progress.c:330
-#, fuzzy
 msgid "Cancelled"
-msgstr "Zrušit"
+msgstr "Zrušeno"
 
 #: ../app/plug-in/gimpplugin.c:639
 #, c-format
@@ -9137,9 +9095,9 @@ msgstr ""
 #: ../app/plug-in/gimppluginmanager-call.c:173
 #: ../app/plug-in/gimppluginmanager-call.c:223
 #: ../app/plug-in/gimppluginmanager-call.c:321
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to run plug-in \"%s\""
-msgstr "Selhala změna velikosti odkládacího souboru: %s"
+msgstr "Selhalo spuštění zásuvného modulu \"%s\""
 
 #: ../app/plug-in/gimppluginmanager-restore.c:222
 msgid "Searching Plug-Ins"
@@ -9170,21 +9128,21 @@ msgid "Plug-In Environment"
 msgstr "Prostředí zásuvných modulů"
 
 #: ../app/plug-in/gimppluginprocedure.c:989
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Calling error for '%s':\n"
 "%s"
 msgstr ""
-"PDB chyba volání procedury '%s':\n"
+"Chyba volání procedury '%s':\n"
 "%s"
 
 #: ../app/plug-in/gimppluginprocedure.c:1001
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Execution error for '%s':\n"
 "%s"
 msgstr ""
-"PDB chyba volání procedury '%s':\n"
+"Chyba volání procedury '%s':\n"
 "%s"
 
 #: ../app/plug-in/plug-in-icc-profile.c:113
@@ -9482,14 +9440,12 @@ msgid "Adjust Brightness and Contrast"
 msgstr "Úprava jasu a kontrastu"
 
 #: ../app/tools/gimpbrightnesscontrasttool.c:135
-#, fuzzy
 msgid "Import Brightness-Contrast settings"
-msgstr "Jas-kontrast"
+msgstr "Importovat nastavení jas-kontrast"
 
 #: ../app/tools/gimpbrightnesscontrasttool.c:136
-#, fuzzy
 msgid "Export Brightness-Contrast settings"
-msgstr "Jas-kontrast"
+msgstr "Exportovat nastavení jas-kontrast"
 
 #: ../app/tools/gimpbrightnesscontrasttool.c:184
 #, c-format
@@ -9506,7 +9462,7 @@ msgstr "Kon_trast:"
 
 #: ../app/tools/gimpbrightnesscontrasttool.c:354
 msgid "Edit these Settings as Levels"
-msgstr ""
+msgstr "Upravit tato nastavení jako úrovně"
 
 #: ../app/tools/gimpbucketfilloptions.c:100
 msgid "Allow completely transparent regions to be filled"
@@ -9628,14 +9584,12 @@ msgid "Adjust Color Balance"
 msgstr "Úprava vyvážení barev"
 
 #: ../app/tools/gimpcolorbalancetool.c:115
-#, fuzzy
 msgid "Import Color Balance Settings"
-msgstr "Vyvážení barev"
+msgstr "Importovat nastavení vyvážení barev"
 
 #: ../app/tools/gimpcolorbalancetool.c:116
-#, fuzzy
 msgid "Export Color Balance Settings"
-msgstr "Vyvážení barev"
+msgstr "Exportovat nastavení vyvážení barev"
 
 #: ../app/tools/gimpcolorbalancetool.c:163
 #, c-format
@@ -9687,11 +9641,11 @@ msgstr "Obarvit obrázek"
 
 #: ../app/tools/gimpcolorizetool.c:111
 msgid "Import Colorize Settings"
-msgstr ""
+msgstr "Importovat nastavení obarvení"
 
 #: ../app/tools/gimpcolorizetool.c:112
 msgid "Export Colorize Settings"
-msgstr ""
+msgstr "Exportovat nastavení obarvení"
 
 #: ../app/tools/gimpcolorizetool.c:156
 #, c-format
@@ -9866,14 +9820,12 @@ msgid "Adjust Color Curves"
 msgstr "Úprava barevných křivek"
 
 #: ../app/tools/gimpcurvestool.c:170
-#, fuzzy
 msgid "Import Curves"
-msgstr "Načíst křivky"
+msgstr "Importovat křivky"
 
 #: ../app/tools/gimpcurvestool.c:171
-#, fuzzy
 msgid "Export Curves"
-msgstr "Načíst křivky"
+msgstr "Exportovat křivky"
 
 #: ../app/tools/gimpcurvestool.c:221
 #, c-format
@@ -9897,35 +9849,32 @@ msgid "R_eset Channel"
 msgstr "O_bnovit kanál"
 
 #: ../app/tools/gimpcurvestool.c:557
-#, fuzzy
 msgid "Curve _type:"
-msgstr "Typ křivky"
+msgstr "_Typ křivky:"
 
 #: ../app/tools/gimpcurvestool.c:632 ../app/tools/gimplevelstool.c:752
-#, fuzzy, c-format
+#, c-format
 msgid "Could not read header from '%s': %s"
-msgstr "Nemohu načíst %d bajtů ze '%s': %s"
+msgstr "Nelze číst hlavičku ze '%s': %s"
 
 #: ../app/tools/gimpcurvestool.c:705
 msgid "Use _old curves file format"
-msgstr ""
+msgstr "Použít _starý formát křivky"
 
 #: ../app/tools/gimpdesaturatetool.c:78
-#, fuzzy
 msgid "Desaturate Tool: Turn colors into shades of gray"
-msgstr "Proměnit barvy v odstíny šedi"
+msgstr "Nástroj odbarvit: Proměnit barvy v odstíny šedi"
 
 #: ../app/tools/gimpdesaturatetool.c:79
 msgid "_Desaturate..."
 msgstr "_Odbarvit..."
 
 #: ../app/tools/gimpdesaturatetool.c:93
-#, fuzzy
 msgid "Desaturate (Remove Colors)"
-msgstr "Odstranit barvy"
+msgstr "Odbarvit"
 
 #: ../app/tools/gimpdesaturatetool.c:125
-#, fuzzy, c-format
+#, c-format
 msgid "Desaturate does only operate on RGB layers."
 msgstr "Odbarvení pracuje pouze s vrstvami v barvách RGB."
 
@@ -9979,9 +9928,8 @@ msgstr "Typ  (%s)"
 
 #. mode (highlights, midtones, or shadows)
 #: ../app/tools/gimpdodgeburntool.c:213
-#, fuzzy
 msgid "Range"
-msgstr "Přeběh"
+msgstr "Rozsah"
 
 #: ../app/tools/gimpdodgeburntool.c:225
 msgid "Exposure:"
@@ -10152,46 +10100,44 @@ msgid "Mark foreground by painting on the object to extract"
 msgstr "Popředí označte malbou přes extrahovaný objekt"
 
 #: ../app/tools/gimpforegroundselecttool.c:327
-#, fuzzy
 msgid "Rougly outline the object to extract"
-msgstr "Nakreslete hrubý obrys kolem objektu, který extrahovat"
+msgstr "Nakreslete hrubý obrys kolem objektu, který chcete extrahovat"
 
 #: ../app/tools/gimpforegroundselecttool.c:766
-#, fuzzy
 msgctxt "command"
 msgid "Foreground Select"
 msgstr "Výběr popředí"
 
 #: ../app/tools/gimpfreeselecttool.c:198
-#, fuzzy
 msgid ""
 "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
-msgstr "Volný výběr: výběr oblasti od ruky"
+msgstr ""
+"Volný výběr: výběr oblasti od ruky s volnými a mnohoúhelníkovými segmenty"
 
 #: ../app/tools/gimpfreeselecttool.c:199
 msgid "_Free Select"
 msgstr "_Volný výběr"
 
 #: ../app/tools/gimpfreeselecttool.c:1116
-#, fuzzy
 msgid "Click to complete selection"
-msgstr "Kliknutím a tažením vytvoříte nový výběr"
+msgstr "Klikněte k dokončení výběru"
 
 #: ../app/tools/gimpfreeselecttool.c:1120
-#, fuzzy
 msgid "Click-Drag to move segment vertex"
-msgstr "Kliknutím a tažením přesunete komponentu"
+msgstr "Kliknutím a tažením přesunete vrchol segmentu"
 
 #: ../app/tools/gimpfreeselecttool.c:1125
 msgid "Return commits, Escape cancels, Backspace removes last segment"
 msgstr ""
+"Klávesa Enter potvrdí, Escape zruší, Backspace odstraní poslední segment"
 
 #: ../app/tools/gimpfreeselecttool.c:1129
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
 msgstr ""
+"Klikněte a táhněte - přidáte volný segment, klikněte - přidáte "
+"mnohoúhelníkový segment"
 
 #: ../app/tools/gimpfreeselecttool.c:1581
-#, fuzzy
 msgctxt "command"
 msgid "Free Select"
 msgstr "Volný výběr"
@@ -10210,31 +10156,29 @@ msgstr "Při_bližný výběr"
 
 #: ../app/tools/gimpgegltool.c:92 ../app/tools/gimpgegltool.c:111
 msgid "GEGL Operation"
-msgstr ""
+msgstr "Operace GEGL"
 
 #: ../app/tools/gimpgegltool.c:93
 msgid "GEGL Tool: Use an arbitrary GEGL operation"
-msgstr ""
+msgstr "Nástroj GEGL: Použijte libovolnou operaci GEGL"
 
 #: ../app/tools/gimpgegltool.c:94
-#, fuzzy
 msgid "_GEGL Operation..."
-msgstr "Otevřít _umístění..."
+msgstr "Operace _GEGL..."
 
 #: ../app/tools/gimpgegltool.c:158
-#, fuzzy, c-format
+#, c-format
 msgid "GEGL operations do not operate on indexed layers."
-msgstr "Léčení nefunguje na indexovaných vrstvách."
+msgstr "Operace GEGL nefungují na indexovaných vrstvách."
 
 #: ../app/tools/gimpgegltool.c:338
-#, fuzzy
 msgid "_Operation:"
-msgstr "_Sytost:"
+msgstr "_Operace:"
 
 #. The options vbox
 #: ../app/tools/gimpgegltool.c:411
 msgid "Operation Settings"
-msgstr ""
+msgstr "Nastavení operací"
 
 #: ../app/tools/gimphealtool.c:54
 msgid "Healing Tool: Heal image irregularities"
@@ -10274,14 +10218,12 @@ msgid "Adjust Hue / Lightness / Saturation"
 msgstr "Úprava odstínu / světlosti / sytosti"
 
 #: ../app/tools/gimphuesaturationtool.c:123
-#, fuzzy
 msgid "Import Hue-Saturation Settings"
-msgstr "Odstín-sytost"
+msgstr "Importovat odstín-sytost"
 
 #: ../app/tools/gimphuesaturationtool.c:124
-#, fuzzy
 msgid "Export Hue-Saturation Settings"
-msgstr "Odstín-sytost"
+msgstr "Exportovat odstín-sytost"
 
 #: ../app/tools/gimphuesaturationtool.c:171
 #, c-format
@@ -10337,9 +10279,8 @@ msgid "R_eset Color"
 msgstr "Obnovit bar_vu"
 
 #: ../app/tools/gimpimagemaptool-settings.c:81
-#, fuzzy
 msgid "Pre_sets:"
-msgstr "Tlak:"
+msgstr "Před_volby:"
 
 #: ../app/tools/gimpimagemaptool-settings.c:221
 #, c-format
@@ -10449,14 +10390,12 @@ msgid "_Levels..."
 msgstr "Ú_rovně..."
 
 #: ../app/tools/gimplevelstool.c:174
-#, fuzzy
 msgid "Import Levels"
-msgstr "Vstupní úrovně"
+msgstr "Importovat úrovně"
 
 #: ../app/tools/gimplevelstool.c:175
-#, fuzzy
 msgid "Export Levels"
-msgstr "Vstupní úrovně"
+msgstr "Exportovat úrovně"
 
 #: ../app/tools/gimplevelstool.c:228
 #, c-format
@@ -10500,11 +10439,11 @@ msgstr "Automaticky upravit úrovně"
 
 #: ../app/tools/gimplevelstool.c:682
 msgid "Edit these Settings as Curves"
-msgstr ""
+msgstr "Upravit tato nastavení jako křivky"
 
 #: ../app/tools/gimplevelstool.c:825
 msgid "Use _old levels file format"
-msgstr ""
+msgstr "Použijte _starý souborový formát úrovní"
 
 #: ../app/tools/gimpmagnifyoptions.c:167
 msgid "Auto-resize window"
@@ -10602,7 +10541,6 @@ msgid "Move:"
 msgstr "Přesun:"
 
 #: ../app/tools/gimpmovetool.c:127
-#, fuzzy
 msgctxt "tool"
 msgid "Move"
 msgstr "Přesun"
@@ -10673,16 +10611,15 @@ msgstr "Velikost"
 
 #: ../app/tools/gimppaintoptions-gui.c:186
 msgid "Brush Dynamics"
-msgstr ""
+msgstr "Dynamika štětce"
 
 #: ../app/tools/gimppaintoptions-gui.c:204
-#, fuzzy
 msgid "Velocity:"
-msgstr "Vybrat podle:"
+msgstr "Rychlost:"
 
 #: ../app/tools/gimppaintoptions-gui.c:210
 msgid "Random:"
-msgstr ""
+msgstr "Nahodilost:"
 
 #: ../app/tools/gimppaintoptions-gui.c:264
 msgid "Incremental"
@@ -10764,7 +10701,6 @@ msgid "_Perspective"
 msgstr "_Perspektiva"
 
 #: ../app/tools/gimpperspectivetool.c:99
-#, fuzzy
 msgctxt "command"
 msgid "Perspective"
 msgstr "Perspektiva"
@@ -10857,9 +10793,8 @@ msgid "Allow completely transparent regions to be selected"
 msgstr "Umožní vybrat zcela průhledné oblasti"
 
 #: ../app/tools/gimpregionselectoptions.c:90
-#, fuzzy
 msgid "Base region_select on all visible layers"
-msgstr "Založit výběr na všech viditelných vrstvách"
+msgstr "Základní označní _oblastí na všech viditelných vrstvách"
 
 #: ../app/tools/gimpregionselectoptions.c:202
 msgid "Select transparent areas"
@@ -10910,7 +10845,6 @@ msgid "_Scale"
 msgstr "Š_kála"
 
 #: ../app/tools/gimpscaletool.c:106
-#, fuzzy
 msgctxt "command"
 msgid "Scale"
 msgstr "Škála"
@@ -10972,7 +10906,6 @@ msgid "S_hear"
 msgstr "_Naklonit"
 
 #: ../app/tools/gimpsheartool.c:110
-#, fuzzy
 msgctxt "command"
 msgid "Shear"
 msgstr "Naklonit"
@@ -11077,9 +11010,8 @@ msgid "Confirm Text Editing"
 msgstr "Potvrdit úpravu textu"
 
 #: ../app/tools/gimptexttool.c:1079
-#, fuzzy
 msgid "Create _New Layer"
-msgstr "Vytvořit novou vrstvu"
+msgstr "Vytvořit _novou vrstvu"
 
 #: ../app/tools/gimptexttool.c:1103
 msgid ""
@@ -11096,9 +11028,8 @@ msgstr ""
 "textu."
 
 #: ../app/tools/gimptexttool.c:1315
-#, fuzzy
 msgid "Reshape Text Layer"
-msgstr "Přejmenovat textovou vrstvu"
+msgstr "Přetvořit textovou vrstvu"
 
 #: ../app/tools/gimpthresholdtool.c:91
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
@@ -11114,11 +11045,11 @@ msgstr "Aplikovat práh"
 
 #: ../app/tools/gimpthresholdtool.c:111
 msgid "Import Threshold Settings"
-msgstr ""
+msgstr "Importovat nastavení pro práh"
 
 #: ../app/tools/gimpthresholdtool.c:112
 msgid "Export Threshold Settings"
-msgstr ""
+msgstr "Exportovat nastavení pro práh"
 
 #: ../app/tools/gimpthresholdtool.c:161
 #, c-format
@@ -11459,12 +11390,11 @@ msgstr "V bufferu nebyla nalezena žádná cesta"
 #: ../app/vectors/gimpvectors-import.c:349
 #, c-format
 msgid "Failed to import paths from '%s': %s"
-msgstr "Nemohu importovat cesty z '%s': %s"
+msgstr "Nelze importovat cesty z '%s': %s"
 
 #: ../app/widgets/gimpactioneditor.c:71
-#, fuzzy
 msgid "_Search:"
-msgstr "Naklonit"
+msgstr "_Hledat:"
 
 #: ../app/widgets/gimpactiongroup.c:802
 #, c-format
@@ -11665,7 +11595,7 @@ msgstr "Notace HTML:"
 
 #: ../app/widgets/gimpcolormapeditor.c:492
 msgid "Only indexed images have a colormap."
-msgstr ""
+msgstr "Pouze indexované obrázky obsahují paletu barev."
 
 #: ../app/widgets/gimpcolorselectorpalette.c:59
 msgid "Palette"
@@ -12142,22 +12072,20 @@ msgid "Spacing"
 msgstr "Rozestup"
 
 #: ../app/widgets/gimphelp.c:294
-#, fuzzy
 msgid "Help browser is missing"
-msgstr "_Používaný prohlížeč nápovědy:"
+msgstr "Není možné nalézt prohlížeč nápovědy"
 
 #: ../app/widgets/gimphelp.c:295
-#, fuzzy
 msgid "The GIMP help browser is not available."
-msgstr "Prohlížeč nápovědy GIMPu"
+msgstr "Prohlížeč nápovědy GIMPu není dostupný."
 
 #: ../app/widgets/gimphelp.c:296
-#, fuzzy
 msgid ""
 "The GIMP help browser plug-in appears to be missing from your installation. "
 "You may instead use the web browser for reading the help pages."
 msgstr ""
-"Zásuvný modul prohlížeče nápovědy GIMPu zřejmě ve vaší instalaci chybí."
+"Zásuvný modul prohlížeče nápovědy GIMPu zřejmě ve vaší instalaci chybí. "
+"Můžete však k pročítání nápovědy využít webový prohlížeč."
 
 #: ../app/widgets/gimphelp.c:337
 msgid "Help browser doesn't start"
@@ -12165,31 +12093,31 @@ msgstr "Prohlížeč nápovědy se nespouští"
 
 #: ../app/widgets/gimphelp.c:338
 msgid "Could not start the GIMP help browser plug-in."
-msgstr "Nemohu spustit zásuvný modul prohlížeče nápovědy GIMPu."
+msgstr "Nelze spustit zásuvný modul prohlížeče nápovědy GIMP."
 
 #: ../app/widgets/gimphelp.c:365
-#, fuzzy
 msgid "Use _Web Browser"
-msgstr "WWW prohlížeč"
+msgstr "Použít _webový prohlížeč"
 
 #: ../app/widgets/gimphelp.c:614
-#, fuzzy
 msgid "GIMP user manual is missing"
-msgstr "Otevřít uživatelskou příručku GIMPu"
+msgstr "Uživatelská příručka GIMPu chybí"
 
 #: ../app/widgets/gimphelp.c:621
 msgid "_Read Online"
-msgstr ""
+msgstr "Čís_t online"
 
 #: ../app/widgets/gimphelp.c:645
 msgid "The GIMP user manual is not installed on your computer."
-msgstr ""
+msgstr "Uživatelská příručka GIMPu není nainstalovaná na vašem PC."
 
 #: ../app/widgets/gimphelp.c:648
 msgid ""
 "You may either install the additional help package or change your "
 "preferences to use the online version."
 msgstr ""
+"Buď si můžete nainstalovat dodatečný balíček s příručkou nebo změňte v "
+"předvolbách systém nápovědy na online."
 
 #: ../app/widgets/gimphistogrameditor.c:99
 msgid "Mean:"
@@ -12369,63 +12297,52 @@ msgid "Invalid UTF-8"
 msgstr "Neplatné UTF-8"
 
 #: ../app/widgets/gimpsettingsbox.c:239
-#, fuzzy
 msgid "Pick a setting from the list"
-msgstr "Kliknutím přidáte vrstvu do seznamu"
+msgstr "Vybrat volby ze seznamu"
 
 #: ../app/widgets/gimpsettingsbox.c:260
-#, fuzzy
 msgid "Add settings to favorites"
-msgstr "Uložit nastavení křivek do souboru"
+msgstr "Přidat volby do oblíbených"
 
 #: ../app/widgets/gimpsettingsbox.c:288
-#, fuzzy
 msgid "_Import Settings from File..."
-msgstr "Načíst nastavení křivek ze souboru"
+msgstr "_Importovat volby ze souboru..."
 
 #: ../app/widgets/gimpsettingsbox.c:294
-#, fuzzy
 msgid "_Export Settings to File..."
-msgstr "_Uložit záznam chyb do souboru..."
+msgstr "_Exportovat volby do souboru..."
 
 #: ../app/widgets/gimpsettingsbox.c:301
-#, fuzzy
 msgid "_Manage Settings..."
-msgstr "_Sloučit palety..."
+msgstr "_Spravovat volby..."
 
 #: ../app/widgets/gimpsettingsbox.c:588
 msgid "Add Settings to Favorites"
-msgstr ""
+msgstr "Přidat volby do oblíbených"
 
 #: ../app/widgets/gimpsettingsbox.c:591
-#, fuzzy
 msgid "Enter a name for the settings"
-msgstr "Zadejte název uložených voleb"
+msgstr "Zadejte název voleb"
 
 #: ../app/widgets/gimpsettingsbox.c:592
-#, fuzzy
 msgid "Saved Settings"
 msgstr "Uložené volby"
 
 #: ../app/widgets/gimpsettingsbox.c:627
-#, fuzzy
 msgid "Manage Saved Settings"
-msgstr "_Přejmenovat uložené volby"
+msgstr "Spravovat uložené volby"
 
 #: ../app/widgets/gimpsettingseditor.c:174
-#, fuzzy
 msgid "Import settings from a file"
-msgstr "Načíst nastavení křivek ze souboru"
+msgstr "Importovat volby ze souboru"
 
 #: ../app/widgets/gimpsettingseditor.c:183
-#, fuzzy
 msgid "Export the selected settings to a file"
-msgstr "Uložit nastavení úrovní do souboru"
+msgstr "Exportovat vybrané volby do souboru"
 
 #: ../app/widgets/gimpsettingseditor.c:192
-#, fuzzy
 msgid "Delete the selected settings"
-msgstr "Odstranit vybranou šablonu"
+msgstr "Odstranit vybrané volby"
 
 #: ../app/widgets/gimpsizebox.c:464
 #, c-format
@@ -12509,9 +12426,8 @@ msgid "%d ppi, %s"
 msgstr "%d ppi, %s"
 
 #: ../app/widgets/gimptexteditor.c:188
-#, fuzzy
 msgid "_Language:"
-msgstr "_Velké"
+msgstr "_Jazyk:"
 
 #: ../app/widgets/gimptexteditor.c:234
 msgid "_Use selected font"
@@ -12740,14 +12656,12 @@ msgid "Web browser"
 msgstr "WWW prohlížeč"
 
 #: ../app/widgets/widgets-enums.c:229
-#, fuzzy
 msgid "Linear histogram"
-msgstr "Histogram"
+msgstr "Lineární histogram"
 
 #: ../app/widgets/widgets-enums.c:230
-#, fuzzy
 msgid "Logarithmic histogram"
-msgstr "Logaritmický"
+msgstr "Logaritmický histogram"
 
 #: ../app/widgets/widgets-enums.c:263
 msgid "Icon"
@@ -12877,7 +12791,7 @@ msgstr "Spustit GIMP bez zobrazování okna při spouštění"
 
 #: ../tools/gimp-remote-x11.c:67
 msgid "Could not connect to GIMP."
-msgstr "Nemohu se připojit ke GIMPu."
+msgstr "Nelze se připojit k aplikaci GIMP."
 
 #: ../tools/gimp-remote-x11.c:68
 msgid "Make sure that the Toolbox is visible!"
@@ -12887,256 +12801,4 @@ msgstr "Přesvědčte se, že nástroj jsou viditelné!"
 #: ../tools/gimp-remote-x11.c:248
 #, c-format
 msgid "Couldn't start '%s': %s"
-msgstr "Nemohu spustit '%s': %s"
-
-#~ msgid "_Dialogs"
-#~ msgstr "_Dialogy"
-
-#~ msgid "Create New Doc_k"
-#~ msgstr "_Vytvořit nový dok"
-
-#~ msgid "_Layers, Channels & Paths"
-#~ msgstr "_Vrstvy, kanály a cesty"
-
-#~ msgid "Open a Layers, Channels & Paths dock"
-#~ msgstr "Otevřít dok Vrstvy, kanály a cesty"
-
-#~ msgid "_Brushes, Patterns & Gradients"
-#~ msgstr "_Stopy, vzorky a přechody"
-
-#~ msgid "Open a Brushes, Patterns & Gradients dock"
-#~ msgstr "Otevřít dok Stopy, vzorky a přechody"
-
-#~ msgid "_Misc. Stuff"
-#~ msgstr "_Různé"
-
-#~ msgid "Open a dock containing miscellaneous dialogs"
-#~ msgstr "Otevřít dok obsahující různé dialogy"
-
-#~ msgid "Show the tip of the day"
-#~ msgstr "Zobrazit tip dne"
-
-#~ msgid "Remove all entries from the document history?"
-#~ msgstr "Odstranit všechny položky z historie dokumentů?"
-
-#~ msgid "Copy the selected region to the clipboard"
-#~ msgstr "Kopírovat vybranou oblast do schránky"
-
-#~ msgid "Paste as New"
-#~ msgstr "Vložit jako nové"
-
-#~ msgid "Acq_uire"
-#~ msgstr "Získ_at"
-
-#~ msgid "Toolbox Menu"
-#~ msgstr "Menu Nástroje"
-
-#~ msgid "_Xtns"
-#~ msgstr "_Rozš."
-
-#~ msgid "Enable displaying a handy GIMP tip on startup."
-#~ msgstr "Povolit zobrazování užitečného tipu GIMPu po spuštění."
-
-#~ msgid "FS rigor"
-#~ msgstr "Upevnění plovoucího výběru"
-
-#~ msgid "FS relax"
-#~ msgstr "Uvolnění plovoucího výběru"
-
-#~ msgid "EEK: can't undo"
-#~ msgstr "EEK: nemohu vrátit zpět"
-
-#~ msgid "command|Rectangle Select"
-#~ msgstr "Výběr obdélníku"
-
-#~ msgid "command|Ellipse Select"
-#~ msgstr "Výběr elipsy"
-
-#~ msgid "command|Fuzzy Select"
-#~ msgstr "Přibližný výběr"
-
-#~ msgid "command|Select by Color"
-#~ msgstr "Výběr dle barvy"
-
-#~ msgid "command|Bucket Fill"
-#~ msgstr "Plechovka"
-
-#~ msgid "command|Flip"
-#~ msgstr "Překlopit"
-
-#~ msgid "command|Rotate"
-#~ msgstr "Rotovat"
-
-#~ msgid "command|Crop Image"
-#~ msgstr "Ořezat obrázek"
-
-#~ msgid "Channel is already on top."
-#~ msgstr "Kanál je již nahoře."
-
-#~ msgid "Channel is already on the bottom."
-#~ msgstr "Kanál je již vespod."
-
-#~ msgid "Path is already on top."
-#~ msgstr "Cesta je již nahoře."
-
-#~ msgid "Path is already on the bottom."
-#~ msgstr "Cesta je již vespod."
-
-#~ msgid "Cannot add layer mask to layer which is not part of an image."
-#~ msgstr "Nelze přidat masku vrstvy do vrstvy, která není součástí obrázku."
-
-#~ msgid "Reading palette '%s': Missing GREEN component in line %d."
-#~ msgstr "Čtu soubor palety '%s': Chybí komponenta GREEN na řádku %d."
-
-#~ msgid "_Desaturate"
-#~ msgstr "O_dbarvit"
-
-#~ msgid "dialog-title|Scale Image"
-#~ msgstr "Velikost obrázku"
-
-#~ msgid "Manage Loadable Modules"
-#~ msgstr "Spravovat zásuvné moduly"
-
-#~ msgid "Autoload"
-#~ msgstr "Automaticky nahrát"
-
-#~ msgid "Module Path"
-#~ msgstr "Cesta k modulům"
-
-#~ msgid ""
-#~ msgstr "<Žádné moduly>"
-
-#~ msgid "On disk"
-#~ msgstr "Na disku"
-
-#~ msgid "Load"
-#~ msgstr "Načíst"
-
-#~ msgid "Query"
-#~ msgstr "Dotaz"
-
-#~ msgid "Unload"
-#~ msgstr "Uvolnit"
-
-#~ msgid "Purpose:"
-#~ msgstr "Účel:"
-
-#~ msgid "Last error:"
-#~ msgstr "Poslední chyba:"
-
-#~ msgid "Available types:"
-#~ msgstr "Dostupné typy:"
-
-#~ msgid "Save document _history on exit"
-#~ msgstr "Ukládat _historii dokumentů při skončení"
-
-#~ msgid "Show tips on _startup"
-#~ msgstr "Zobrazovat tipy při _spuštění"
-
-#~ msgid "Show tip next time GIMP starts"
-#~ msgstr "Zobrazit tip při příštím spuštění GIMPu"
-
-#~ msgid "Other..."
-#~ msgstr "_Jiné..."
-
-#~ msgid ""
-#~ "PDB calling error:\n"
-#~ "Procedure '%s' not found"
-#~ msgstr ""
-#~ "Chyba volání PDB:\n"
-#~ "procedura '%s' nenalezena"
-
-#~ msgid ""
-#~ "PDB calling error for procedure '%s':\n"
-#~ "Argument #%d type mismatch (expected %s, got %s)"
-#~ msgstr ""
-#~ "Chyba volání PDB pro proceduru '%s':\n"
-#~ "Nesouhlasí typ argumentu #%d (očekávám %s, dostal jsem %s)"
-
-#~ msgid "Left justified"
-#~ msgstr "Zarovnaný doleva"
-
-#~ msgid "Right justified"
-#~ msgstr "Zarovnaný doprava"
-
-#~ msgid "Centered"
-#~ msgstr "Centrovaný"
-
-#~ msgid "Filled"
-#~ msgstr "Do bloku"
-
-#~ msgid "Save Curves"
-#~ msgstr "Uložit křivky"
-
-#~ msgid "Mode"
-#~ msgstr "Režim"
-
-#~ msgid "command|Foreground Select"
-#~ msgstr "Výběr popředí"
-
-#~ msgid "command|Free Select"
-#~ msgstr "Volný výběr"
-
-#~ msgid "Quick Load"
-#~ msgstr "Rychlé načtení"
-
-#~ msgid "Quick Save"
-#~ msgstr "Rychlé uložení"
-
-#~ msgid "Load Levels"
-#~ msgstr "Načíst úrovně"
-
-#~ msgid "Load levels settings from file"
-#~ msgstr "Načíst nastavení úrovní ze souboru"
-
-#~ msgid "Save Levels"
-#~ msgstr "Zapsat úrovně"
-
-#~ msgid "tool|Move"
-#~ msgstr "Přesun"
-
-#~ msgid "Pressure sensitivity"
-#~ msgstr "Citlivost na tlak"
-
-#~ msgid "command|Perspective"
-#~ msgstr "Perspektiva"
-
-#~ msgid "command|Scale"
-#~ msgstr "Změnit velikost"
-
-#~ msgid "command|Shear"
-#~ msgstr "Naklonit"
-
-#~ msgid "Close all Tabs?"
-#~ msgstr "Zavřít všechny karty?"
-
-#~ msgid "Close all Tabs"
-#~ msgstr "Zavřít všechny karty"
-
-#~ msgid "Close all tabs?"
-#~ msgstr "Zavřít všechny karty?"
-
-#~ msgid ""
-#~ "This window has %d tab open. Closing the window will also close all its "
-#~ "tabs."
-#~ msgid_plural ""
-#~ "This window has %d tabs open. Closing the window will also close all its "
-#~ "tabs."
-#~ msgstr[0] ""
-#~ "Toto okno má otevřeno %d kartu. Zavření okna zavře všechny jeho karty."
-#~ msgstr[1] ""
-#~ "Toto okno má otevřeno %d karty. Zavření okna zavře všechny jeho karty."
-#~ msgstr[2] ""
-#~ "Toto okno má otevřeno %d karet. Zavření okna zavře všechny jeho karty."
-
-#~ msgid "Help browser not found"
-#~ msgstr "Prohlížeč nápovědy nenalezen"
-
-#~ msgid "Could not find GIMP help browser."
-#~ msgstr "Nemohu najít prohlížeč nápovědy GIMPu"
-
-#~ msgid "Use _web browser instead"
-#~ msgstr "Použít místo toho _WWW prohlížeč"
-
-#~ msgid "Linear"
-#~ msgstr "Lineární"
+msgstr "Nelze spustit '%s': %s"
diff --git a/po/en_GB.po b/po/en_GB.po
index 7cb05ed556..735025eb23 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -1,19 +1,18 @@
-# This is the English, British catalog for GIMP.
+# This is the English, British catalogue for GIMP.
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Robert Brady , 2000.
 # Piers Cornwell , 2000.
 # Gareth Owen , David Lodge , 2004
 # Thomas Thurman 
-# 
-# 
+# Bruce Cowan , 2009.
 msgid ""
 msgstr ""
-"Project-Id-Version: GIMP 1.1.24\n"
+"Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-09 19:11+0000\n"
-"PO-Revision-Date: 2008-03-09 19:09+0000\n"
-"Last-Translator: David Lodge \n"
-"Language-Team: English, British \n"
+"POT-Creation-Date: 2009-10-17 22:38+0100\n"
+"PO-Revision-Date: 2009-10-17 22:57+0100\n"
+"Last-Translator: Bruce Cowan \n"
+"Language-Team: British English \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -65,7 +64,7 @@ msgstr ""
 "GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - "
 "Suite 330, Boston, MA 02111-1307, USA."
 
-#: ../app/app.c:211
+#: ../app/app.c:214
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
@@ -88,101 +87,101 @@ msgstr "No batch interpreter specified, using the default '%s'.\n"
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "The batch interpreter '%s' is not available. Batch mode disabled."
 
-#: ../app/main.c:156 ../tools/gimp-remote.c:60
+#: ../app/main.c:144 ../tools/gimp-remote.c:60
 msgid "Show version information and exit"
 msgstr "Show version information and exit"
 
-#: ../app/main.c:161
+#: ../app/main.c:149
 msgid "Show license information and exit"
 msgstr "Show licence information and exit"
 
-#: ../app/main.c:166
+#: ../app/main.c:154
 msgid "Be more verbose"
 msgstr "Be more verbose"
 
-#: ../app/main.c:171
+#: ../app/main.c:159
 msgid "Start a new GIMP instance"
 msgstr "Start a new GIMP instance"
 
-#: ../app/main.c:176
+#: ../app/main.c:164
 msgid "Open images as new"
 msgstr "Open images as new"
 
-#: ../app/main.c:181
+#: ../app/main.c:169
 msgid "Run without a user interface"
 msgstr "Run without a user interface"
 
-#: ../app/main.c:186
+#: ../app/main.c:174
 msgid "Do not load brushes, gradients, patterns, ..."
 msgstr "Do not load brushes, gradients, patterns, ..."
 
-#: ../app/main.c:191
+#: ../app/main.c:179
 msgid "Do not load any fonts"
 msgstr "Do not load any fonts"
 
-#: ../app/main.c:196
+#: ../app/main.c:184
 msgid "Do not show a startup window"
 msgstr "Do not show a startup window"
 
-#: ../app/main.c:201
+#: ../app/main.c:189
 msgid "Do not use shared memory between GIMP and plugins"
 msgstr "Do not use shared memory between GIMP and plugins"
 
-#: ../app/main.c:206
+#: ../app/main.c:194
 msgid "Do not use special CPU acceleration functions"
 msgstr "Do not use special CPU acceleration functions"
 
-#: ../app/main.c:211
+#: ../app/main.c:199
 msgid "Use an alternate sessionrc file"
 msgstr "Use an alternate sessionrc file"
 
-#: ../app/main.c:216
+#: ../app/main.c:204
 msgid "Use an alternate user gimprc file"
 msgstr "Use an alternate user gimprc file"
 
-#: ../app/main.c:221
+#: ../app/main.c:209
 msgid "Use an alternate system gimprc file"
 msgstr "Use an alternate system gimprc file"
 
-#: ../app/main.c:226
+#: ../app/main.c:214
 msgid "Batch command to run (can be used multiple times)"
 msgstr "Batch command to run (can be used multiple times)"
 
-#: ../app/main.c:231
+#: ../app/main.c:219
 msgid "The procedure to process batch commands with"
 msgstr "The procedure to process batch commands with"
 
-#: ../app/main.c:236
+#: ../app/main.c:224
 msgid "Send messages to console instead of using a dialog"
 msgstr "Send messages to console instead of using a dialogue"
 
 #. don't translate the mode names (off|on|warn)
-#: ../app/main.c:242
+#: ../app/main.c:230
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "PDB compatibility mode (off|on|warn)"
 
 #. don't translate the mode names (never|query|always)
-#: ../app/main.c:248
+#: ../app/main.c:236
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "Debug in case of a crash (never|query|always)"
 
-#: ../app/main.c:253
+#: ../app/main.c:241
 msgid "Enable non-fatal debugging signal handlers"
 msgstr "Enable non-fatal debugging signal handlers"
 
-#: ../app/main.c:258
+#: ../app/main.c:246
 msgid "Make all warnings fatal"
 msgstr "Make all warnings fatal"
 
-#: ../app/main.c:263
+#: ../app/main.c:251
 msgid "Output a gimprc file with default settings"
 msgstr "Output a gimprc file with default settings"
 
-#: ../app/main.c:357
+#: ../app/main.c:355
 msgid "[FILE|URI...]"
 msgstr "[FILE|URI...]"
 
-#: ../app/main.c:375
+#: ../app/main.c:373
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -190,24 +189,24 @@ msgstr ""
 "GIMP could not initialise the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
 
-#: ../app/main.c:453
+#: ../app/main.c:392
+msgid "Another GIMP instance is already running."
+msgstr "Another GIMP instance is already running."
+
+#: ../app/main.c:462
 msgid "GIMP output. Type any character to close this window."
 msgstr "GIMP output. Type any character to close this window."
 
-#: ../app/main.c:454
+#: ../app/main.c:463
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Type any character to close this window)\n"
 
-#: ../app/main.c:471
+#: ../app/main.c:480
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "GIMP output. You can minimise this window, but don't close it."
 
-#: ../app/main.c:792
-msgid "Another GIMP instance is already running."
-msgstr "Another GIMP instance is already running."
-
-#: ../app/sanity.c:257
+#: ../app/sanity.c:365
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -218,7 +217,7 @@ msgstr ""
 "\n"
 "Please check the value of the environment variable G_FILENAME_ENCODING."
 
-#: ../app/sanity.c:276
+#: ../app/sanity.c:384
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -238,181 +237,189 @@ msgstr ""
 #. show versions of libraries used by GIMP
 #: ../app/version.c:64
 #, c-format
-msgid "using %s, compiled against version %s, running against version %s"
-msgstr "using %s, compiled against version %s, running against version %s"
+msgid "using %s version %s (compiled against version %s)"
+msgstr "using %s version %s (compiled against version %s)"
 
-#: ../app/version.c:128 ../tools/gimp-remote.c:95
+#: ../app/version.c:127 ../tools/gimp-remote.c:95
 #, c-format
 msgid "%s version %s"
 msgstr "%s version %s"
 
-#: ../app/actions/actions.c:99 ../app/dialogs/dialogs.c:216
-#: ../app/widgets/gimpbrusheditor.c:90
+#: ../app/actions/actions.c:101 ../app/actions/dialogs-actions.c:123
+#: ../app/dialogs/dialogs.c:224 ../app/widgets/gimpbrusheditor.c:90
 msgid "Brush Editor"
 msgstr "Brush Editor"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:102 ../app/core/gimp.c:832
-#: ../app/dialogs/dialogs.c:149 ../app/dialogs/preferences-dialog.c:2710
+#: ../app/actions/actions.c:104 ../app/core/gimp.c:838
+#: ../app/dialogs/dialogs.c:157 ../app/dialogs/preferences-dialog.c:2744
 msgid "Brushes"
 msgstr "Brushes"
 
-#: ../app/actions/actions.c:105 ../app/dialogs/dialogs.c:161
+#: ../app/actions/actions.c:107 ../app/dialogs/dialogs.c:169
 msgid "Buffers"
 msgstr "Buffers"
 
-#: ../app/actions/actions.c:108 ../app/dialogs/dialogs.c:174
+#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:182
 msgid "Channels"
 msgstr "Channels"
 
-#: ../app/actions/actions.c:111 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:182
+#: ../app/actions/actions.c:113 ../app/dialogs/convert-dialog.c:174
+#: ../app/dialogs/dialogs.c:190
 msgid "Colormap"
 msgstr "Colourmap"
 
-#: ../app/actions/actions.c:114
+#: ../app/actions/actions.c:116
+msgid "Configuration"
+msgstr "Configuration"
+
+#: ../app/actions/actions.c:119
 msgid "Context"
 msgstr "Context"
 
-#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:142
+#: ../app/actions/actions.c:122 ../app/dialogs/dialogs.c:150
 msgid "Pointer Information"
 msgstr "Pointer Information"
 
-#: ../app/actions/actions.c:120
+#: ../app/actions/actions.c:125
 msgid "Debug"
 msgstr "Debug"
 
-#: ../app/actions/actions.c:123
+#: ../app/actions/actions.c:128
 msgid "Dialogs"
 msgstr "Dialogues"
 
-#: ../app/actions/actions.c:126
+#: ../app/actions/actions.c:131
 msgid "Dock"
 msgstr "Dock"
 
-#: ../app/actions/actions.c:129
+#: ../app/actions/actions.c:134
 msgid "Dockable"
 msgstr "Dockable"
 
 #. Document History
-#: ../app/actions/actions.c:132 ../app/dialogs/dialogs.c:163
-#: ../app/dialogs/preferences-dialog.c:1604
+#: ../app/actions/actions.c:137 ../app/dialogs/dialogs.c:171
+#: ../app/dialogs/preferences-dialog.c:1595
 msgid "Document History"
 msgstr "Document History"
 
-#: ../app/actions/actions.c:135
+#: ../app/actions/actions.c:140
 msgid "Drawable"
 msgstr "Drawable"
 
-#: ../app/actions/actions.c:138 ../app/tools/tools-enums.c:300
+#: ../app/actions/actions.c:143 ../app/tools/tools-enums.c:300
 msgid "Edit"
 msgstr "Edit"
 
-#: ../app/actions/actions.c:141 ../app/dialogs/dialogs.c:138
+#: ../app/actions/actions.c:146 ../app/dialogs/dialogs.c:146
 msgid "Error Console"
 msgstr "Error Console"
 
-#: ../app/actions/actions.c:144
+#: ../app/actions/actions.c:149
 msgid "File"
 msgstr "File"
 
-#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:157
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:165
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Fonts"
 msgstr "Fonts"
 
-#: ../app/actions/actions.c:150 ../app/dialogs/dialogs.c:220
-#: ../app/widgets/gimpgradienteditor.c:276
+#: ../app/actions/actions.c:155 ../app/actions/dialogs-actions.c:141
+#: ../app/dialogs/dialogs.c:228 ../app/widgets/gimpgradienteditor.c:276
 msgid "Gradient Editor"
 msgstr "Gradient Editor"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:153 ../app/core/gimp.c:844
-#: ../app/dialogs/dialogs.c:153 ../app/dialogs/preferences-dialog.c:2722
+#: ../app/actions/actions.c:158 ../app/core/gimp.c:850
+#: ../app/dialogs/dialogs.c:161 ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradients"
 msgstr "Gradients"
 
-#: ../app/actions/actions.c:156
+#: ../app/actions/actions.c:161
 msgid "Help"
 msgstr "Help"
 
-#: ../app/actions/actions.c:159 ../app/core/core-enums.c:212
+#: ../app/actions/actions.c:164 ../app/core/core-enums.c:212
 #: ../app/tools/tools-enums.c:242
 msgid "Image"
 msgstr "Image"
 
 #. list & grid views
-#: ../app/actions/actions.c:162 ../app/dialogs/dialogs.c:147
+#: ../app/actions/actions.c:167 ../app/dialogs/dialogs.c:155
 msgid "Images"
 msgstr "Images"
 
-#: ../app/actions/actions.c:165 ../app/dialogs/dialogs.c:170
+#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:178
 #: ../app/dialogs/resize-dialog.c:286
 msgid "Layers"
 msgstr "Layers"
 
-#: ../app/actions/actions.c:168 ../app/dialogs/dialogs.c:224
-#: ../app/widgets/gimppaletteeditor.c:155
+#: ../app/actions/actions.c:173 ../app/actions/dialogs-actions.c:153
+#: ../app/dialogs/dialogs.c:232 ../app/widgets/gimppaletteeditor.c:155
 msgid "Palette Editor"
 msgstr "Palette Editor"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:171 ../app/core/gimp.c:840
-#: ../app/dialogs/dialogs.c:155 ../app/dialogs/preferences-dialog.c:2718
+#: ../app/actions/actions.c:176 ../app/core/gimp.c:846
+#: ../app/dialogs/dialogs.c:163 ../app/dialogs/preferences-dialog.c:2752
 msgid "Palettes"
 msgstr "Palettes"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:174 ../app/core/gimp.c:836
-#: ../app/dialogs/dialogs.c:151 ../app/dialogs/preferences-dialog.c:2714
+#: ../app/actions/actions.c:179 ../app/core/gimp.c:842
+#: ../app/dialogs/dialogs.c:159 ../app/dialogs/preferences-dialog.c:2748
 msgid "Patterns"
 msgstr "Patterns"
 
-#: ../app/actions/actions.c:177 ../app/dialogs/preferences-dialog.c:2730
+#: ../app/actions/actions.c:182 ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-Ins"
 msgstr "Plug-Ins"
 
-#: ../app/actions/actions.c:180 ../app/core/core-enums.c:860
+#: ../app/actions/actions.c:185 ../app/core/core-enums.c:860
 #: ../app/core/gimpchannel.c:362
 msgid "Quick Mask"
 msgstr "Quick Mask"
 
-#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:198
+#: ../app/actions/actions.c:188 ../app/dialogs/dialogs.c:206
 msgid "Sample Points"
 msgstr "Sample Points"
 
-#: ../app/actions/actions.c:186
+#: ../app/actions/actions.c:191
 msgid "Select"
 msgstr "Select"
 
 #. initialize the template list
-#: ../app/actions/actions.c:189 ../app/core/gimp.c:861
-#: ../app/dialogs/dialogs.c:165
+#: ../app/actions/actions.c:194 ../app/core/gimp.c:859
+#: ../app/dialogs/dialogs.c:173
 msgid "Templates"
 msgstr "Templates"
 
-#: ../app/actions/actions.c:192
+#: ../app/actions/actions.c:197
 msgid "Text Editor"
 msgstr "Text Editor"
 
-#: ../app/actions/actions.c:195 ../app/dialogs/dialogs.c:130
-#: ../app/dialogs/preferences-dialog.c:1846 ../app/gui/gui.c:439
+#: ../app/actions/actions.c:200 ../app/dialogs/dialogs.c:138
+#: ../app/dialogs/preferences-dialog.c:1880 ../app/gui/gui.c:429
 msgid "Tool Options"
 msgstr "Tool Options"
 
-#: ../app/actions/actions.c:198 ../app/dialogs/dialogs.c:159
+#: ../app/actions/actions.c:203 ../app/dialogs/dialogs.c:167
 msgid "Tools"
 msgstr "Tools"
 
-#: ../app/actions/actions.c:201 ../app/dialogs/dialogs.c:178
+#: ../app/actions/actions.c:206 ../app/dialogs/dialogs.c:186
 #: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "Paths"
 
-#: ../app/actions/actions.c:204
+#: ../app/actions/actions.c:209
 msgid "View"
 msgstr "View"
 
+#: ../app/actions/actions.c:212
+msgid "Windows"
+msgstr "Windows"
+
 #: ../app/actions/brush-editor-actions.c:43
 msgid "Brush Editor Menu"
 msgstr "Brush Editor Menu"
@@ -601,7 +608,7 @@ msgstr "Channel to Sele_ction"
 msgid "Replace the selection with this channel"
 msgstr "Replace the selection with this channel"
 
-#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:260
+#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:266
 #: ../app/actions/vectors-actions.c:173
 msgid "_Add to Selection"
 msgstr "_Add to Selection"
@@ -610,8 +617,8 @@ msgstr "_Add to Selection"
 msgid "Add this channel to the current selection"
 msgstr "Add this channel to the current selection"
 
-#: ../app/actions/channels-actions.c:117 ../app/actions/layers-actions.c:266
-#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
+#: ../app/actions/channels-actions.c:117 ../app/actions/layers-actions.c:272
+#: ../app/actions/layers-actions.c:299 ../app/actions/layers-actions.c:326
 #: ../app/actions/vectors-actions.c:179
 msgid "_Subtract from Selection"
 msgstr "_Subtract from Selection"
@@ -620,8 +627,8 @@ msgstr "_Subtract from Selection"
 msgid "Subtract this channel from the current selection"
 msgstr "Subtract this channel from the current selection"
 
-#: ../app/actions/channels-actions.c:123 ../app/actions/layers-actions.c:272
-#: ../app/actions/layers-actions.c:299 ../app/actions/layers-actions.c:326
+#: ../app/actions/channels-actions.c:123 ../app/actions/layers-actions.c:278
+#: ../app/actions/layers-actions.c:305 ../app/actions/layers-actions.c:332
 #: ../app/actions/vectors-actions.c:185
 msgid "_Intersect with Selection"
 msgstr "_Intersect with Selection"
@@ -665,15 +672,15 @@ msgid "New Channel Color"
 msgstr "New Channel Colour"
 
 #: ../app/actions/channels-commands.c:243
-#: ../app/display/gimpdisplayshell-dnd.c:488
+#: ../app/display/gimpdisplayshell-dnd.c:584
 #: ../app/widgets/gimpchanneltreeview.c:249
-#: ../app/widgets/gimplayertreeview.c:774 ../app/widgets/gimptoolbox-dnd.c:313
+#: ../app/widgets/gimplayertreeview.c:773 ../app/widgets/gimptoolbox-dnd.c:313
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s Channel Copy"
 
 #: ../app/actions/channels-commands.c:307 ../app/core/gimpselection.c:549
-#: ../app/pdb/selection_cmds.c:440 ../app/pdb/selection_cmds.c:505
+#: ../app/pdb/selection-cmds.c:454 ../app/pdb/selection-cmds.c:521
 msgid "Channel to Selection"
 msgstr "Channel to Selection"
 
@@ -716,11 +723,19 @@ msgstr "Edit colourmap entry #%d"
 msgid "Edit Colormap Entry"
 msgstr "Edit Colourmap Entry"
 
+#: ../app/actions/config-actions.c:39
+msgid "Use _GEGL"
+msgstr "Use _GEGL"
+
+#: ../app/actions/config-actions.c:40
+msgid "If possible, use GEGL for image processing"
+msgstr "If possible, use GEGL for image processing"
+
 #: ../app/actions/context-actions.c:46
 msgid "_Context"
 msgstr "_Context"
 
-#: ../app/actions/context-actions.c:47 ../app/actions/image-actions.c:65
+#: ../app/actions/context-actions.c:47 ../app/actions/image-actions.c:59
 msgid "_Colors"
 msgstr "_Colours"
 
@@ -737,12 +752,12 @@ msgid "_Tool"
 msgstr "_Tool"
 
 #: ../app/actions/context-actions.c:51
-#: ../app/dialogs/preferences-dialog.c:1906
+#: ../app/dialogs/preferences-dialog.c:1940
 msgid "_Brush"
 msgstr "_Brush"
 
-#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:98
-#: ../app/dialogs/preferences-dialog.c:1909
+#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:99
+#: ../app/dialogs/preferences-dialog.c:1943
 msgid "_Pattern"
 msgstr "_Pattern"
 
@@ -752,7 +767,7 @@ msgstr "_Palette"
 
 #: ../app/actions/context-actions.c:54
 #: ../app/dialogs/palette-import-dialog.c:216
-#: ../app/dialogs/preferences-dialog.c:1912
+#: ../app/dialogs/preferences-dialog.c:1946
 msgid "_Gradient"
 msgstr "_Gradient"
 
@@ -786,7 +801,7 @@ msgstr "A_ngle"
 
 #: ../app/actions/context-actions.c:65
 msgid "_Default Colors"
-msgstr "_Default Colors"
+msgstr "_Default Colours"
 
 #: ../app/actions/context-actions.c:66
 msgid "Set foreground color to black, background color to white"
@@ -794,7 +809,7 @@ msgstr "Set foreground colour to black, background colour to white"
 
 #: ../app/actions/context-actions.c:71
 msgid "S_wap Colors"
-msgstr "S_wap Colors"
+msgstr "S_wap Colours"
 
 #: ../app/actions/context-actions.c:72
 msgid "Exchange foreground and background colors"
@@ -815,14 +830,14 @@ msgstr "_Sample Merged"
 msgid "Sample Merged"
 msgstr "Sample Merged"
 
-#: ../app/actions/data-commands.c:107 ../app/actions/documents-commands.c:320
-#: ../app/actions/file-commands.c:170 ../app/dialogs/file-open-dialog.c:197
-#: ../app/dialogs/file-open-dialog.c:243
+#: ../app/actions/data-commands.c:107 ../app/actions/documents-commands.c:344
+#: ../app/actions/file-commands.c:184 ../app/dialogs/file-open-dialog.c:220
+#: ../app/dialogs/file-open-dialog.c:264
 #: ../app/dialogs/file-open-location-dialog.c:213
 #: ../app/dialogs/file-open-location-dialog.c:225
-#: ../app/display/gimpdisplayshell-dnd.c:443
-#: ../app/widgets/gimplayertreeview.c:731 ../app/widgets/gimptoolbox-dnd.c:158
-#: ../app/widgets/gimptoolbox.c:900
+#: ../app/display/gimpdisplayshell-dnd.c:537
+#: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -834,10 +849,10 @@ msgstr ""
 "%s"
 
 #: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1388
-#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:223
-#: ../app/core/gimppalette.c:333 ../app/dialogs/palette-import-dialog.c:770
-#: ../app/pdb/image_cmds.c:2063 ../app/widgets/gimpdnd-xds.c:92
+#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1419
+#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:222
+#: ../app/core/gimppalette.c:333 ../app/dialogs/palette-import-dialog.c:774
+#: ../app/pdb/image-cmds.c:2198 ../app/widgets/gimpdnd-xds.c:92
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -857,276 +872,248 @@ msgid ""
 msgstr ""
 "Are you sure you want to remove '%s' from the list and delete it on disk?"
 
-#: ../app/actions/dialogs-actions.c:38
-msgid "_Dialogs"
-msgstr "_Dialogues"
-
 #: ../app/actions/dialogs-actions.c:39
-msgid "Create New Doc_k"
-msgstr "Create New Doc_k"
-
-#: ../app/actions/dialogs-actions.c:42
-msgid "_Layers, Channels & Paths"
-msgstr "_Layers, Channels & Paths"
-
-#: ../app/actions/dialogs-actions.c:43
-msgid "Open a Layers, Channels & Paths dock"
-msgstr "Open a Layers, Channels & Paths dock"
-
-#: ../app/actions/dialogs-actions.c:48
-msgid "_Brushes, Patterns & Gradients"
-msgstr "_Brushes, Patterns & Gradients"
-
-#: ../app/actions/dialogs-actions.c:49
-msgid "Open a Brushes, Patterns & Gradients dock"
-msgstr "Open a Brushes, Patterns & Gradients dock"
-
-#: ../app/actions/dialogs-actions.c:54
-msgid "_Misc. Stuff"
-msgstr "_Misc. Stuff"
-
-#: ../app/actions/dialogs-actions.c:55
-msgid "Open a dock containing miscellaneous dialogs"
-msgstr "Open a dock containing miscellaneous dialogues"
-
-#: ../app/actions/dialogs-actions.c:60
-msgid "Tool_box"
-msgstr "Tool_box"
-
-#: ../app/actions/dialogs-actions.c:61
-msgid "Raise the toolbox"
-msgstr "Raise the toolbox"
-
-#: ../app/actions/dialogs-actions.c:69
 msgid "Tool _Options"
 msgstr "Tool _Options"
 
-#: ../app/actions/dialogs-actions.c:70
+#: ../app/actions/dialogs-actions.c:40
 msgid "Open the tool options dialog"
 msgstr "Open the tool options dialogue"
 
-#: ../app/actions/dialogs-actions.c:75
+#: ../app/actions/dialogs-actions.c:45
 msgid "_Device Status"
 msgstr "_Device Status"
 
-#: ../app/actions/dialogs-actions.c:76
+#: ../app/actions/dialogs-actions.c:46
 msgid "Open the device status dialog"
 msgstr "Open the device status dialogue"
 
-#: ../app/actions/dialogs-actions.c:81
+#: ../app/actions/dialogs-actions.c:51
 msgid "_Layers"
 msgstr "_Layers"
 
-#: ../app/actions/dialogs-actions.c:82
+#: ../app/actions/dialogs-actions.c:52
 msgid "Open the layers dialog"
 msgstr "Open the layers dialogue"
 
-#: ../app/actions/dialogs-actions.c:87
+#: ../app/actions/dialogs-actions.c:57
 msgid "_Channels"
 msgstr "_Channels"
 
-#: ../app/actions/dialogs-actions.c:88
+#: ../app/actions/dialogs-actions.c:58
 msgid "Open the channels dialog"
 msgstr "Open the channels dialogue"
 
-#: ../app/actions/dialogs-actions.c:93
+#: ../app/actions/dialogs-actions.c:63
 msgid "_Paths"
 msgstr "_Paths"
 
-#: ../app/actions/dialogs-actions.c:94
+#: ../app/actions/dialogs-actions.c:64
 msgid "Open the paths dialog"
 msgstr "Open the paths dialogue"
 
-#: ../app/actions/dialogs-actions.c:99
+#: ../app/actions/dialogs-actions.c:69
 msgid "Color_map"
 msgstr "Colour_map"
 
-#: ../app/actions/dialogs-actions.c:100
+#: ../app/actions/dialogs-actions.c:70
 msgid "Open the colormap dialog"
 msgstr "Open the colourmap dialogue"
 
-#: ../app/actions/dialogs-actions.c:105
+#: ../app/actions/dialogs-actions.c:75
 msgid "Histogra_m"
 msgstr "Histogra_m"
 
-#: ../app/actions/dialogs-actions.c:106
+#: ../app/actions/dialogs-actions.c:76
 msgid "Open the histogram dialog"
 msgstr "Open the histogram dialogue"
 
-#: ../app/actions/dialogs-actions.c:111
+#: ../app/actions/dialogs-actions.c:81
 msgid "_Selection Editor"
 msgstr "_Selection Editor"
 
-#: ../app/actions/dialogs-actions.c:112
+#: ../app/actions/dialogs-actions.c:82
 msgid "Open the selection editor"
 msgstr "Open the selection editor"
 
-#: ../app/actions/dialogs-actions.c:117
+#: ../app/actions/dialogs-actions.c:87
 msgid "Na_vigation"
 msgstr "Na_vigation"
 
-#: ../app/actions/dialogs-actions.c:118
+#: ../app/actions/dialogs-actions.c:88
 msgid "Open the display navigation dialog"
 msgstr "Open the display navigation dialogue"
 
-#: ../app/actions/dialogs-actions.c:123
+#: ../app/actions/dialogs-actions.c:93
 msgid "Undo _History"
 msgstr "Undo _History"
 
-#: ../app/actions/dialogs-actions.c:124
+#: ../app/actions/dialogs-actions.c:94
 msgid "Open the undo history dialog"
 msgstr "Open the undo history dialogue"
 
-#: ../app/actions/dialogs-actions.c:129 ../app/dialogs/dialogs.c:142
+#: ../app/actions/dialogs-actions.c:99 ../app/dialogs/dialogs.c:150
 msgid "Pointer"
 msgstr "Pointer"
 
-#: ../app/actions/dialogs-actions.c:130
+#: ../app/actions/dialogs-actions.c:100
 msgid "Open the pointer information dialog"
 msgstr "Open the pointer information dialogue"
 
-#: ../app/actions/dialogs-actions.c:135
+#: ../app/actions/dialogs-actions.c:105
 msgid "_Sample Points"
 msgstr "_Sample Points"
 
-#: ../app/actions/dialogs-actions.c:136
+#: ../app/actions/dialogs-actions.c:106
 msgid "Open the sample points dialog"
 msgstr "Open the sample points dialogue"
 
-#: ../app/actions/dialogs-actions.c:141
+#: ../app/actions/dialogs-actions.c:111
 msgid "Colo_rs"
 msgstr "Colou_rs"
 
-#: ../app/actions/dialogs-actions.c:142
+#: ../app/actions/dialogs-actions.c:112
 msgid "Open the FG/BG color dialog"
 msgstr "Open the FG/BG colour dialogue"
 
-#: ../app/actions/dialogs-actions.c:147
+#: ../app/actions/dialogs-actions.c:117
 msgid "_Brushes"
 msgstr "_Brushes"
 
-#: ../app/actions/dialogs-actions.c:148
+#: ../app/actions/dialogs-actions.c:118
 msgid "Open the brushes dialog"
 msgstr "Open the brushes dialogue"
 
-#: ../app/actions/dialogs-actions.c:153
+#: ../app/actions/dialogs-actions.c:124
+msgid "Open the brush editor"
+msgstr "Open the brush editor"
+
+#: ../app/actions/dialogs-actions.c:129
 msgid "P_atterns"
 msgstr "P_atterns"
 
-#: ../app/actions/dialogs-actions.c:154
+#: ../app/actions/dialogs-actions.c:130
 msgid "Open the patterns dialog"
 msgstr "Open the patterns dialogue"
 
-#: ../app/actions/dialogs-actions.c:159
+#: ../app/actions/dialogs-actions.c:135
 msgid "_Gradients"
 msgstr "_Gradients"
 
-#: ../app/actions/dialogs-actions.c:160
+#: ../app/actions/dialogs-actions.c:136
 msgid "Open the gradients dialog"
 msgstr "Open the gradients dialogue"
 
-#: ../app/actions/dialogs-actions.c:165
+#: ../app/actions/dialogs-actions.c:142
+msgid "Open the gradient editor"
+msgstr "Open the gradient editor"
+
+#: ../app/actions/dialogs-actions.c:147
 msgid "Pal_ettes"
 msgstr "Pal_ettes"
 
-#: ../app/actions/dialogs-actions.c:166
+#: ../app/actions/dialogs-actions.c:148
 msgid "Open the palettes dialog"
 msgstr "Open the palettes dialogue"
 
-#: ../app/actions/dialogs-actions.c:171
+#: ../app/actions/dialogs-actions.c:154
+msgid "Open the palette editor"
+msgstr "Open the palette editor"
+
+#: ../app/actions/dialogs-actions.c:159
 msgid "_Fonts"
 msgstr "_Fonts"
 
-#: ../app/actions/dialogs-actions.c:172
+#: ../app/actions/dialogs-actions.c:160
 msgid "Open the fonts dialog"
 msgstr "Open the fonts dialogue"
 
-#: ../app/actions/dialogs-actions.c:177
+#: ../app/actions/dialogs-actions.c:165
 msgid "B_uffers"
 msgstr "B_uffers"
 
-#: ../app/actions/dialogs-actions.c:178
+#: ../app/actions/dialogs-actions.c:166
 msgid "Open the named buffers dialog"
 msgstr "Open the named buffers dialogue"
 
-#: ../app/actions/dialogs-actions.c:183
+#: ../app/actions/dialogs-actions.c:171
 msgid "_Images"
 msgstr "_Images"
 
-#: ../app/actions/dialogs-actions.c:184
+#: ../app/actions/dialogs-actions.c:172
 msgid "Open the images dialog"
 msgstr "Open the images dialogue"
 
-#: ../app/actions/dialogs-actions.c:189
+#: ../app/actions/dialogs-actions.c:177
 msgid "Document Histor_y"
 msgstr "Document Histor_y"
 
-#: ../app/actions/dialogs-actions.c:190
+#: ../app/actions/dialogs-actions.c:178
 msgid "Open the document history dialog"
 msgstr "Open the document history dialogue"
 
-#: ../app/actions/dialogs-actions.c:195
+#: ../app/actions/dialogs-actions.c:183
 msgid "_Templates"
 msgstr "_Templates"
 
-#: ../app/actions/dialogs-actions.c:196
+#: ../app/actions/dialogs-actions.c:184
 msgid "Open the image templates dialog"
 msgstr "Open the image templates dialogue"
 
-#: ../app/actions/dialogs-actions.c:201
+#: ../app/actions/dialogs-actions.c:189
 msgid "T_ools"
 msgstr "T_ools"
 
-#: ../app/actions/dialogs-actions.c:202
+#: ../app/actions/dialogs-actions.c:190
 msgid "Open the tools dialog"
 msgstr "Open the tools dialogue"
 
-#: ../app/actions/dialogs-actions.c:207
+#: ../app/actions/dialogs-actions.c:195
 msgid "Error Co_nsole"
 msgstr "Error Co_nsole"
 
-#: ../app/actions/dialogs-actions.c:208
+#: ../app/actions/dialogs-actions.c:196
 msgid "Open the error console"
 msgstr "Open the error console"
 
-#: ../app/actions/dialogs-actions.c:218
+#: ../app/actions/dialogs-actions.c:206
 msgid "_Preferences"
 msgstr "_Preferences"
 
-#: ../app/actions/dialogs-actions.c:219
+#: ../app/actions/dialogs-actions.c:207
 msgid "Open the preferences dialog"
 msgstr "Open the preferences dialogue"
 
-#: ../app/actions/dialogs-actions.c:224
+#: ../app/actions/dialogs-actions.c:212
 msgid "_Keyboard Shortcuts"
 msgstr "_Keyboard Shortcuts"
 
-#: ../app/actions/dialogs-actions.c:225
+#: ../app/actions/dialogs-actions.c:213
 msgid "Open the keyboard shortcuts editor"
 msgstr "Open the keyboard shortcuts editor"
 
-#: ../app/actions/dialogs-actions.c:230
-msgid "_Module Manager"
-msgstr "_Module Manager"
+#: ../app/actions/dialogs-actions.c:218
+msgid "_Modules"
+msgstr "_Modules"
 
-#: ../app/actions/dialogs-actions.c:231
+#: ../app/actions/dialogs-actions.c:219
 msgid "Open the module manager dialog"
 msgstr "Open the module manager dialogue"
 
-#: ../app/actions/dialogs-actions.c:236
+#: ../app/actions/dialogs-actions.c:224
 msgid "_Tip of the Day"
 msgstr "_Tip of the Day"
 
-#: ../app/actions/dialogs-actions.c:237
-msgid "Show the tip of the day"
-msgstr "Show the tip of the day"
+#: ../app/actions/dialogs-actions.c:225
+msgid "Show some helpful tips on using GIMP"
+msgstr "Show some helpful tips on using GIMP"
 
-#: ../app/actions/dialogs-actions.c:242
+#: ../app/actions/dialogs-actions.c:230
 msgid "_About"
 msgstr "_About"
 
-#: ../app/actions/dialogs-actions.c:243 ../app/dialogs/about-dialog.c:114
-#: ../app/gui/gui.c:488
+#: ../app/actions/dialogs-actions.c:231 ../app/dialogs/about-dialog.c:114
+#: ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "About GIMP"
 
@@ -1235,14 +1222,22 @@ msgid "St_atus & Text"
 msgstr "St_atus & Text"
 
 #: ../app/actions/dockable-actions.c:108
+msgid "Loc_k Tab to Dock"
+msgstr "Loc_k Tab to Dock"
+
+#: ../app/actions/dockable-actions.c:109
+msgid "Protect this tab from being dragged with the mouse pointer"
+msgstr "Protect this tab from being dragged with the mouse pointer"
+
+#: ../app/actions/dockable-actions.c:115
 msgid "Show _Button Bar"
 msgstr "Show _Button Bar"
 
-#: ../app/actions/dockable-actions.c:117
+#: ../app/actions/dockable-actions.c:124
 msgid "View as _List"
 msgstr "View as _List"
 
-#: ../app/actions/dockable-actions.c:122
+#: ../app/actions/dockable-actions.c:129
 msgid "View as _Grid"
 msgstr "View as _Grid"
 
@@ -1322,133 +1317,121 @@ msgstr "Remove Dangling E_ntries"
 msgid "Remove dangling entries"
 msgstr "Remove dangling entries"
 
-#: ../app/actions/documents-commands.c:187
+#: ../app/actions/documents-commands.c:198
 msgid "Clear Document History"
 msgstr "Clear Document History"
 
-#: ../app/actions/documents-commands.c:210
-msgid "Remove all entries from the document history?"
-msgstr "Remove all entries from the document history?"
+#: ../app/actions/documents-commands.c:221
+msgid "Clear the Recent Documents list?"
+msgstr "Clear the Recent Documents list?"
 
-#: ../app/actions/documents-commands.c:214
+#: ../app/actions/documents-commands.c:224
 msgid ""
-"Clearing the document history will permanently remove all currently listed "
-"entries."
+"Clearing the document history will permanently remove all items from the "
+"recent documents list in all applications."
 msgstr ""
-"Clearing the document history will permanently remove all currently listed "
-"entries."
+"Clearing the document history will permanently remove all items from the "
+"recent documents list in all applications."
 
 #: ../app/actions/drawable-actions.c:45
-msgid "_Desaturate..."
-msgstr "_Desaturate..."
-
-#: ../app/actions/drawable-actions.c:46
-msgid "Turn colors into shades of gray"
-msgstr "Turn colours into shades of grey"
-
-#: ../app/actions/drawable-actions.c:51
 msgid "_Equalize"
 msgstr "_Equalise"
 
-#: ../app/actions/drawable-actions.c:52
+#: ../app/actions/drawable-actions.c:46
 msgid "Automatic contrast enhancement"
 msgstr "Automatic contrast enhancement"
 
-#: ../app/actions/drawable-actions.c:57
+#: ../app/actions/drawable-actions.c:51
 msgid "In_vert"
 msgstr "In_vert"
 
-#: ../app/actions/drawable-actions.c:58
+#: ../app/actions/drawable-actions.c:52
 msgid "Invert the colors"
 msgstr "Invert the colours"
 
-#: ../app/actions/drawable-actions.c:63
+#: ../app/actions/drawable-actions.c:57
 msgid "_White Balance"
 msgstr "_White Balance"
 
-#: ../app/actions/drawable-actions.c:64
+#: ../app/actions/drawable-actions.c:58
 msgid "Automatic white balance correction"
 msgstr "Automatic white balance correction"
 
-#: ../app/actions/drawable-actions.c:69
+#: ../app/actions/drawable-actions.c:63
 msgid "_Offset..."
 msgstr "_Offset..."
 
-#: ../app/actions/drawable-actions.c:70
+#: ../app/actions/drawable-actions.c:64
 msgid "Shift the pixels, optionally wrapping them at the borders"
 msgstr "Shift the pixels, optionally wrapping them at the borders"
 
-#: ../app/actions/drawable-actions.c:78 ../app/actions/vectors-actions.c:153
+#: ../app/actions/drawable-actions.c:72 ../app/actions/vectors-actions.c:153
 msgid "_Linked"
 msgstr "_Linked"
 
-#: ../app/actions/drawable-actions.c:79
+#: ../app/actions/drawable-actions.c:73
 msgid "Toggle the linked state"
 msgstr "Toggle the linked state"
 
-#: ../app/actions/drawable-actions.c:85 ../app/actions/vectors-actions.c:147
+#: ../app/actions/drawable-actions.c:79 ../app/actions/vectors-actions.c:147
 msgid "_Visible"
 msgstr "_Visible"
 
-#: ../app/actions/drawable-actions.c:86
+#: ../app/actions/drawable-actions.c:80
 msgid "Toggle visibility"
 msgstr "Toggle visibility"
 
-#: ../app/actions/drawable-actions.c:95 ../app/actions/image-actions.c:171
+#: ../app/actions/drawable-actions.c:89 ../app/actions/image-actions.c:159
 msgid "Flip _Horizontally"
 msgstr "Flip _Horizontally"
 
-#: ../app/actions/drawable-actions.c:96
+#: ../app/actions/drawable-actions.c:90
 msgid "Flip horizontally"
 msgstr "Flip horizontally"
 
-#: ../app/actions/drawable-actions.c:101 ../app/actions/image-actions.c:177
+#: ../app/actions/drawable-actions.c:95 ../app/actions/image-actions.c:165
 msgid "Flip _Vertically"
 msgstr "Flip _Vertically"
 
-#: ../app/actions/drawable-actions.c:102
+#: ../app/actions/drawable-actions.c:96
 msgid "Flip vertically"
 msgstr "Flip vertically"
 
-#: ../app/actions/drawable-actions.c:110 ../app/actions/image-actions.c:186
+#: ../app/actions/drawable-actions.c:104 ../app/actions/image-actions.c:174
 msgid "Rotate 90° _clockwise"
 msgstr "Rotate 90° _clockwise"
 
-#: ../app/actions/drawable-actions.c:111
+#: ../app/actions/drawable-actions.c:105
 msgid "Rotate 90 degrees to the right"
 msgstr "Rotate 90 degrees to the right"
 
-#: ../app/actions/drawable-actions.c:116 ../app/actions/image-actions.c:192
+#: ../app/actions/drawable-actions.c:110 ../app/actions/image-actions.c:180
 msgid "Rotate _180°"
 msgstr "Rotate _180°"
 
-#: ../app/actions/drawable-actions.c:117
+#: ../app/actions/drawable-actions.c:111
 msgid "Turn upside-down"
 msgstr "Turn upside-down"
 
-#: ../app/actions/drawable-actions.c:122 ../app/actions/image-actions.c:198
+#: ../app/actions/drawable-actions.c:116 ../app/actions/image-actions.c:186
 msgid "Rotate 90° counter-clock_wise"
 msgstr "Rotate 90° anti-clock_wise"
 
-#: ../app/actions/drawable-actions.c:123
+#: ../app/actions/drawable-actions.c:117
 msgid "Rotate 90 degrees to the left"
 msgstr "Rotate 90 degrees to the left"
 
-#: ../app/actions/drawable-commands.c:76
-msgid "Desaturate operates only on RGB color layers."
-msgstr "Desaturate operates only on RGB colour layers."
-
-#: ../app/actions/drawable-commands.c:104
+#: ../app/actions/drawable-commands.c:62
 msgid "Equalize does not operate on indexed layers."
 msgstr "Equalise does not operate on indexed layers."
 
-#: ../app/actions/drawable-commands.c:127
+#: ../app/actions/drawable-commands.c:85
 msgid "Invert does not operate on indexed layers."
 msgstr "Invert does not operate on indexed layers."
 
-#: ../app/actions/drawable-commands.c:150
+#: ../app/actions/drawable-commands.c:108
 msgid "White Balance operates only on RGB color layers."
-msgstr "White Balance operates only on RGB color layers."
+msgstr "White Balance operates only on RGB colour layers."
 
 #: ../app/actions/edit-actions.c:63
 msgid "_Edit"
@@ -1466,7 +1449,7 @@ msgstr "_Buffer"
 msgid "Undo History Menu"
 msgstr "Undo History Menu"
 
-#: ../app/actions/edit-actions.c:72 ../app/actions/edit-actions.c:302
+#: ../app/actions/edit-actions.c:72 ../app/actions/edit-actions.c:313
 msgid "_Undo"
 msgstr "_Undo"
 
@@ -1474,7 +1457,7 @@ msgstr "_Undo"
 msgid "Undo the last operation"
 msgstr "Undo the last operation"
 
-#: ../app/actions/edit-actions.c:78 ../app/actions/edit-actions.c:303
+#: ../app/actions/edit-actions.c:78 ../app/actions/edit-actions.c:314
 msgid "_Redo"
 msgstr "_Redo"
 
@@ -1506,7 +1489,7 @@ msgstr "_Clear Undo History"
 msgid "Remove all operations from the undo history"
 msgstr "Remove all operations from the undo history"
 
-#: ../app/actions/edit-actions.c:102 ../app/actions/edit-actions.c:304
+#: ../app/actions/edit-actions.c:102 ../app/actions/edit-actions.c:315
 msgid "_Fade..."
 msgstr "_Fade..."
 
@@ -1536,8 +1519,8 @@ msgid "Copy _Visible"
 msgstr "Copy _Visible"
 
 #: ../app/actions/edit-actions.c:121
-msgid "Copy the selected region to the clipboard"
-msgstr "Copy the selected region to the clipboard"
+msgid "Copy what is visible in the selected region"
+msgstr "Copy what is visible in the selected region"
 
 #: ../app/actions/edit-actions.c:126
 msgid "_Paste"
@@ -1556,8 +1539,8 @@ msgid "Paste the content of the clipboard into the current selection"
 msgstr "Paste the content of the clipboard into the current selection"
 
 #: ../app/actions/edit-actions.c:138
-msgid "Paste as New"
-msgstr "Paste as New"
+msgid "From _Clipboard"
+msgstr "From _Clipboard"
 
 #: ../app/actions/edit-actions.c:139 ../app/actions/edit-actions.c:145
 msgid "Create a new image from the content of the clipboard"
@@ -1568,137 +1551,151 @@ msgid "_New Image"
 msgstr "_New Image"
 
 #: ../app/actions/edit-actions.c:150
+msgid "New _Layer"
+msgstr "New _Layer"
+
+#: ../app/actions/edit-actions.c:151
+msgid "Create a new layer from the content of the clipboard"
+msgstr "Create a new layer from the content of the clipboard"
+
+#: ../app/actions/edit-actions.c:156
 msgid "Cu_t Named..."
 msgstr "Cu_t Named..."
 
-#: ../app/actions/edit-actions.c:151
+#: ../app/actions/edit-actions.c:157
 msgid "Move the selected pixels to a named buffer"
 msgstr "Move the selected pixels to a named buffer"
 
-#: ../app/actions/edit-actions.c:156
+#: ../app/actions/edit-actions.c:162
 msgid "_Copy Named..."
 msgstr "_Copy Named..."
 
-#: ../app/actions/edit-actions.c:157
+#: ../app/actions/edit-actions.c:163
 msgid "Copy the selected pixels to a named buffer"
 msgstr "Copy the selected pixels to a named buffer"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:162
+#: ../app/actions/edit-actions.c:168
 msgid "Copy _Visible Named..."
 msgstr "Copy _Visible Named..."
 
-#: ../app/actions/edit-actions.c:163
+#: ../app/actions/edit-actions.c:169
 msgid "Copy the selected region to a named buffer"
 msgstr "Copy the selected region to a named buffer"
 
-#: ../app/actions/edit-actions.c:168
+#: ../app/actions/edit-actions.c:174
 msgid "_Paste Named..."
 msgstr "_Paste Named..."
 
-#: ../app/actions/edit-actions.c:169
+#: ../app/actions/edit-actions.c:175
 msgid "Paste the content of a named buffer"
 msgstr "Paste the content of a named buffer"
 
-#: ../app/actions/edit-actions.c:174
+#: ../app/actions/edit-actions.c:180
 msgid "Cl_ear"
 msgstr "Cl_ear"
 
-#: ../app/actions/edit-actions.c:175
+#: ../app/actions/edit-actions.c:181
 msgid "Clear the selected pixels"
 msgstr "Clear the selected pixels"
 
-#: ../app/actions/edit-actions.c:183
+#: ../app/actions/edit-actions.c:189
 msgid "Fill with _FG Color"
 msgstr "Fill with _FG Colour"
 
-#: ../app/actions/edit-actions.c:184
+#: ../app/actions/edit-actions.c:190
 msgid "Fill the selection using the foreground color"
 msgstr "Fill the selection using the foreground colour"
 
-#: ../app/actions/edit-actions.c:189
+#: ../app/actions/edit-actions.c:195
 msgid "Fill with B_G Color"
 msgstr "Fill with B_G Colour"
 
-#: ../app/actions/edit-actions.c:190
+#: ../app/actions/edit-actions.c:196
 msgid "Fill the selection using the background color"
 msgstr "Fill the selection using the background colour"
 
-#: ../app/actions/edit-actions.c:195
+#: ../app/actions/edit-actions.c:201
 msgid "Fill with P_attern"
 msgstr "Fill with P_attern"
 
-#: ../app/actions/edit-actions.c:196
+#: ../app/actions/edit-actions.c:202
 msgid "Fill the selection using the active pattern"
 msgstr "Fill the selection using the active pattern"
 
-#: ../app/actions/edit-actions.c:275
+#: ../app/actions/edit-actions.c:279
 #, c-format
 msgid "_Undo %s"
 msgstr "_Undo %s"
 
-#: ../app/actions/edit-actions.c:280
+#: ../app/actions/edit-actions.c:286
 #, c-format
 msgid "_Redo %s"
 msgstr "_Redo %s"
 
-#: ../app/actions/edit-actions.c:291
+#: ../app/actions/edit-actions.c:301
 #, c-format
 msgid "_Fade %s..."
 msgstr "_Fade %s..."
 
-#: ../app/actions/edit-commands.c:133
+#: ../app/actions/edit-commands.c:134
 msgid "Clear Undo History"
 msgstr "Clear Undo History"
 
-#: ../app/actions/edit-commands.c:159
+#: ../app/actions/edit-commands.c:160
 msgid "Really clear image's undo history?"
 msgstr "Really clear image's undo history?"
 
-#: ../app/actions/edit-commands.c:171
+#: ../app/actions/edit-commands.c:172
 #, c-format
 msgid "Clearing the undo history of this image will gain %s of memory."
 msgstr "Clearing the undo history of this image will gain %s of memory."
 
-#: ../app/actions/edit-commands.c:200
+#: ../app/actions/edit-commands.c:201
 msgid "Cut pixels to the clipboard"
 msgstr "Cut pixels to the clipboard"
 
-#: ../app/actions/edit-commands.c:227 ../app/actions/edit-commands.c:253
+#: ../app/actions/edit-commands.c:228 ../app/actions/edit-commands.c:254
 msgid "Copied pixels to the clipboard"
 msgstr "Copied pixels to the clipboard"
 
-#: ../app/actions/edit-commands.c:315 ../app/actions/edit-commands.c:491
+#: ../app/actions/edit-commands.c:315 ../app/actions/edit-commands.c:349
+#: ../app/actions/edit-commands.c:525
 msgid "There is no image data in the clipboard to paste."
 msgstr "There is no image data in the clipboard to paste."
 
-#: ../app/actions/edit-commands.c:329
+#: ../app/actions/edit-commands.c:338 ../app/core/gimpbrushclipboard.c:181
+#: ../app/core/gimppatternclipboard.c:181 ../app/widgets/gimpclipboard.c:296
+msgid "Clipboard"
+msgstr "Clipboard"
+
+#: ../app/actions/edit-commands.c:363
 msgid "Cut Named"
 msgstr "Cut Named"
 
-#: ../app/actions/edit-commands.c:332 ../app/actions/edit-commands.c:373
-#: ../app/actions/edit-commands.c:393
+#: ../app/actions/edit-commands.c:366 ../app/actions/edit-commands.c:407
+#: ../app/actions/edit-commands.c:427
 msgid "Enter a name for this buffer"
 msgstr "Enter a name for this buffer"
 
-#: ../app/actions/edit-commands.c:370
+#: ../app/actions/edit-commands.c:404
 msgid "Copy Named"
 msgstr "Copy Named"
 
-#: ../app/actions/edit-commands.c:390
+#: ../app/actions/edit-commands.c:424
 msgid "Copy Visible Named "
 msgstr "Copy Visible Named "
 
-#: ../app/actions/edit-commands.c:508
+#: ../app/actions/edit-commands.c:542
 msgid "There is no active layer or channel to cut from."
 msgstr "There is no active layer or channel to cut from."
 
-#: ../app/actions/edit-commands.c:513 ../app/actions/edit-commands.c:545
-#: ../app/actions/edit-commands.c:569
+#: ../app/actions/edit-commands.c:547 ../app/actions/edit-commands.c:579
+#: ../app/actions/edit-commands.c:603
 msgid "(Unnamed Buffer)"
 msgstr "(Unnamed Buffer)"
 
-#: ../app/actions/edit-commands.c:540
+#: ../app/actions/edit-commands.c:574
 msgid "There is no active layer or channel to copy from."
 msgstr "There is no active layer or channel to copy from."
 
@@ -1755,111 +1752,120 @@ msgstr ""
 "Error writing file '%s':\n"
 "%s"
 
-#: ../app/actions/file-actions.c:64
+#: ../app/actions/file-actions.c:66
 msgid "_File"
 msgstr "_File"
 
-#: ../app/actions/file-actions.c:65
+#: ../app/actions/file-actions.c:67
+msgid "Create"
+msgstr "Create"
+
+#: ../app/actions/file-actions.c:68
 msgid "Open _Recent"
 msgstr "Open _Recent"
 
-#: ../app/actions/file-actions.c:66
-msgid "Acq_uire"
-msgstr "Acq_uire"
-
-#: ../app/actions/file-actions.c:69
+#: ../app/actions/file-actions.c:71
 msgid "_Open..."
 msgstr "_Open..."
 
-#: ../app/actions/file-actions.c:70
+#: ../app/actions/file-actions.c:72
 msgid "Open an image file"
 msgstr "Open an image file"
 
-#: ../app/actions/file-actions.c:75
+#: ../app/actions/file-actions.c:77
 msgid "Op_en as Layers..."
 msgstr "Op_en as Layers..."
 
-#: ../app/actions/file-actions.c:76
+#: ../app/actions/file-actions.c:78
 msgid "Open an image file as layers"
 msgstr "Open an image file as layers"
 
-#: ../app/actions/file-actions.c:81
+#: ../app/actions/file-actions.c:83
 msgid "Open _Location..."
 msgstr "Open _Location..."
 
-#: ../app/actions/file-actions.c:82
+#: ../app/actions/file-actions.c:84
 msgid "Open an image file from a specified location"
 msgstr "Open an image file from a specified location"
 
-#: ../app/actions/file-actions.c:87
+#: ../app/actions/file-actions.c:89
 msgid "Save as _Template..."
 msgstr "Save as _Template..."
 
-#: ../app/actions/file-actions.c:88
+#: ../app/actions/file-actions.c:90
 msgid "Create a new template from this image"
 msgstr "Create a new template from this image"
 
-#: ../app/actions/file-actions.c:93
+#: ../app/actions/file-actions.c:95
 msgid "Re_vert"
 msgstr "Re_vert"
 
-#: ../app/actions/file-actions.c:94
+#: ../app/actions/file-actions.c:96
 msgid "Reload the image file from disk"
 msgstr "Reload the image file from disk"
 
-#: ../app/actions/file-actions.c:99
+#: ../app/actions/file-actions.c:101
 msgid "Close all"
 msgstr "Close all"
 
-#: ../app/actions/file-actions.c:100
+#: ../app/actions/file-actions.c:102
 msgid "Close all opened images"
 msgstr "Close all opened images"
 
-#: ../app/actions/file-actions.c:105
+#: ../app/actions/file-actions.c:107
 msgid "_Quit"
 msgstr "_Quit"
 
-#: ../app/actions/file-actions.c:106
+#: ../app/actions/file-actions.c:108
 msgid "Quit the GNU Image Manipulation Program"
 msgstr "Quit the GNU Image Manipulation Program"
 
-#: ../app/actions/file-actions.c:114
+#: ../app/actions/file-actions.c:116
 msgid "_Save"
 msgstr "_Save"
 
-#: ../app/actions/file-actions.c:115
+#: ../app/actions/file-actions.c:117
 msgid "Save this image"
 msgstr "Save this image"
 
-#: ../app/actions/file-actions.c:120
+#: ../app/actions/file-actions.c:122
 msgid "Save _As..."
 msgstr "Save _As..."
 
-#: ../app/actions/file-actions.c:121
+#: ../app/actions/file-actions.c:123
 msgid "Save this image with a different name"
 msgstr "Save this image with a different name"
 
-#: ../app/actions/file-actions.c:126
+#: ../app/actions/file-actions.c:128
 msgid "Save a Cop_y..."
 msgstr "Save a Cop_y..."
 
-#: ../app/actions/file-actions.c:127
+#: ../app/actions/file-actions.c:129
 msgid "Save this image with a different name, but keep its current name"
 msgstr "Save this image with a different name, but keep its current name"
 
-#: ../app/actions/file-actions.c:132
+#: ../app/actions/file-actions.c:134
 msgid "Save and Close..."
 msgstr "Save and Close..."
 
-#: ../app/actions/file-actions.c:133
+#: ../app/actions/file-actions.c:135
 msgid "Save this image and close its window"
 msgstr "Save this image and close its window"
 
-#: ../app/actions/file-commands.c:247
+#: ../app/actions/file-commands.c:104 ../app/actions/file-commands.c:456
+#: ../app/dialogs/file-open-dialog.c:76
+msgid "Open Image"
+msgstr "Open Image"
+
+#: ../app/actions/file-commands.c:125
+msgid "Open Image as Layers"
+msgstr "Open Image as Layers"
+
+#: ../app/actions/file-commands.c:266
 msgid "Saving canceled"
 msgstr "Saving cancelled"
 
-#: ../app/actions/file-commands.c:256 ../app/dialogs/file-save-dialog.c:504
+#: ../app/actions/file-commands.c:275 ../app/dialogs/file-save-dialog.c:513
 #: ../app/widgets/gimpdnd-xds.c:173
 #, c-format
 msgid ""
@@ -1871,36 +1877,40 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/file-commands.c:286 ../app/dialogs/file-save-dialog.c:87
+#: ../app/actions/file-commands.c:300
+msgid "No changes need to be saved"
+msgstr "No changes need to be saved"
+
+#: ../app/actions/file-commands.c:307 ../app/dialogs/file-save-dialog.c:88
 msgid "Save Image"
 msgstr "Save Image"
 
-#: ../app/actions/file-commands.c:292
+#: ../app/actions/file-commands.c:313
 msgid "Save a Copy of the Image"
 msgstr "Save a Copy of the Image"
 
-#: ../app/actions/file-commands.c:312
+#: ../app/actions/file-commands.c:333
 msgid "Create New Template"
 msgstr "Create New Template"
 
-#: ../app/actions/file-commands.c:316
+#: ../app/actions/file-commands.c:337
 msgid "Enter a name for this template"
 msgstr "Enter a name for this template"
 
-#: ../app/actions/file-commands.c:342
+#: ../app/actions/file-commands.c:363
 msgid "Revert failed. No file name associated with this image."
 msgstr "Revert failed. No file name associated with this image."
 
-#: ../app/actions/file-commands.c:355
+#: ../app/actions/file-commands.c:376
 msgid "Revert Image"
 msgstr "Revert Image"
 
-#: ../app/actions/file-commands.c:381
+#: ../app/actions/file-commands.c:402
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "Revert '%s' to '%s'?"
 
-#: ../app/actions/file-commands.c:387
+#: ../app/actions/file-commands.c:408
 msgid ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
@@ -1908,19 +1918,11 @@ msgstr ""
 "By reverting the image to the state saved on disk, you will lose all "
 "changes, including all undo information."
 
-#: ../app/actions/file-commands.c:459
-msgid "Open Image as Layers"
-msgstr "Open Image as Layers"
-
-#: ../app/actions/file-commands.c:464 ../app/dialogs/file-open-dialog.c:75
-msgid "Open Image"
-msgstr "Open Image"
-
-#: ../app/actions/file-commands.c:539
+#: ../app/actions/file-commands.c:563
 msgid "(Unnamed Template)"
 msgstr "(Unnamed Template)"
 
-#: ../app/actions/file-commands.c:587
+#: ../app/actions/file-commands.c:611
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -2065,7 +2067,7 @@ msgid "(Varies)"
 msgstr "(Varies)"
 
 #: ../app/actions/gradient-editor-actions.c:347
-#: ../app/actions/image-actions.c:153
+#: ../app/actions/image-actions.c:141
 msgid "_RGB"
 msgstr "_RGB"
 
@@ -2349,231 +2351,225 @@ msgstr "_Context Help"
 msgid "Show the help for a specific user interface item"
 msgstr "Show the help for a specific user interface item"
 
-#: ../app/actions/image-actions.c:47
-msgid "Toolbox Menu"
-msgstr "Toolbox Menu"
-
-#: ../app/actions/image-actions.c:51 ../app/actions/image-actions.c:55
+#: ../app/actions/image-actions.c:47 ../app/actions/image-actions.c:51
 msgid "Image Menu"
 msgstr "Image Menu"
 
-#: ../app/actions/image-actions.c:58
-msgid "_Xtns"
-msgstr "_Xtns"
-
-#: ../app/actions/image-actions.c:60
+#: ../app/actions/image-actions.c:54
 msgid "_Image"
 msgstr "_Image"
 
-#: ../app/actions/image-actions.c:61
+#: ../app/actions/image-actions.c:55
 msgid "_Mode"
 msgstr "_Mode"
 
-#: ../app/actions/image-actions.c:62 ../app/actions/layers-actions.c:56
+#: ../app/actions/image-actions.c:56 ../app/actions/layers-actions.c:56
 msgid "_Transform"
 msgstr "_Transform"
 
-#: ../app/actions/image-actions.c:63
+#: ../app/actions/image-actions.c:57
 msgid "_Guides"
 msgstr "_Guides"
 
-#: ../app/actions/image-actions.c:66
+#: ../app/actions/image-actions.c:60
 msgid "I_nfo"
 msgstr "I_nfo"
 
-#: ../app/actions/image-actions.c:67 ../app/tools/gimplevelstool.c:648
-#: ../app/tools/gimpthresholdtool.c:261
+#: ../app/actions/image-actions.c:61 ../app/tools/gimplevelstool.c:653
+#: ../app/tools/gimpthresholdtool.c:264
 msgid "_Auto"
 msgstr "_Auto"
 
-#: ../app/actions/image-actions.c:68 ../app/actions/plug-in-actions.c:94
+#: ../app/actions/image-actions.c:62 ../app/actions/plug-in-actions.c:95
 msgid "_Map"
 msgstr "_Map"
 
-#: ../app/actions/image-actions.c:69
+#: ../app/actions/image-actions.c:63
 msgid "C_omponents"
 msgstr "C_omponents"
 
-#: ../app/actions/image-actions.c:72 ../app/actions/image-actions.c:78
+#: ../app/actions/image-actions.c:66
 msgid "_New..."
 msgstr "_New..."
 
-#: ../app/actions/image-actions.c:73 ../app/actions/image-actions.c:79
+#: ../app/actions/image-actions.c:67
 msgid "Create a new image"
 msgstr "Create a new image"
 
-#: ../app/actions/image-actions.c:84
+#: ../app/actions/image-actions.c:72
 msgid "Can_vas Size..."
 msgstr "Can_vas Size..."
 
-#: ../app/actions/image-actions.c:85
+#: ../app/actions/image-actions.c:73
 msgid "Adjust the image dimensions"
 msgstr "Adjust the image dimensions"
 
-#: ../app/actions/image-actions.c:90
+#: ../app/actions/image-actions.c:78
 msgid "F_it Canvas to Layers"
 msgstr "F_it Canvas to Layers"
 
-#: ../app/actions/image-actions.c:91
+#: ../app/actions/image-actions.c:79
 msgid "Resize the image to enclose all layers"
 msgstr "Resize the image to enclose all layers"
 
-#: ../app/actions/image-actions.c:96
+#: ../app/actions/image-actions.c:84
 msgid "F_it Canvas to Selection"
 msgstr "F_it Canvas to Selection"
 
-#: ../app/actions/image-actions.c:97
+#: ../app/actions/image-actions.c:85
 msgid "Resize the image to the extents of the selection"
 msgstr "Resize the image to the extents of the selection"
 
-#: ../app/actions/image-actions.c:102
+#: ../app/actions/image-actions.c:90
 msgid "_Print Size..."
 msgstr "_Print Size..."
 
-#: ../app/actions/image-actions.c:103
+#: ../app/actions/image-actions.c:91
 msgid "Adjust the print resolution"
 msgstr "Adjust the print resolution"
 
-#: ../app/actions/image-actions.c:108
+#: ../app/actions/image-actions.c:96
 msgid "_Scale Image..."
 msgstr "_Scale Image..."
 
-#: ../app/actions/image-actions.c:109
+#: ../app/actions/image-actions.c:97
 msgid "Change the size of the image content"
 msgstr "Change the size of the image content"
 
-#: ../app/actions/image-actions.c:114 ../app/actions/layers-actions.c:182
+#: ../app/actions/image-actions.c:102 ../app/actions/layers-actions.c:188
 msgid "_Crop to Selection"
 msgstr "_Crop to Selection"
 
-#: ../app/actions/image-actions.c:115
+#: ../app/actions/image-actions.c:103
 msgid "Crop the image to the extents of the selection"
 msgstr "Crop the image to the extents of the selection"
 
-#: ../app/actions/image-actions.c:120
+#: ../app/actions/image-actions.c:108
 msgid "_Duplicate"
 msgstr "_Duplicate"
 
-#: ../app/actions/image-actions.c:121
+#: ../app/actions/image-actions.c:109
 msgid "Create a duplicate of this image"
 msgstr "Create a duplicate of this image"
 
-#: ../app/actions/image-actions.c:126
+#: ../app/actions/image-actions.c:114
 msgid "Merge Visible _Layers..."
 msgstr "Merge Visible _Layers..."
 
-#: ../app/actions/image-actions.c:127 ../app/actions/layers-actions.c:135
+#: ../app/actions/image-actions.c:115 ../app/actions/layers-actions.c:141
 msgid "Merge all visible layers into one layer"
 msgstr "Merge all visible layers into one layer"
 
-#: ../app/actions/image-actions.c:132 ../app/actions/layers-actions.c:140
+#: ../app/actions/image-actions.c:120 ../app/actions/layers-actions.c:146
 msgid "_Flatten Image"
 msgstr "_Flatten Image"
 
-#: ../app/actions/image-actions.c:133 ../app/actions/layers-actions.c:141
+#: ../app/actions/image-actions.c:121 ../app/actions/layers-actions.c:147
 msgid "Merge all layers into one and remove transparency"
 msgstr "Merge all layers into one and remove transparency"
 
-#: ../app/actions/image-actions.c:138
+#: ../app/actions/image-actions.c:126
 msgid "Configure G_rid..."
 msgstr "Configure G_rid..."
 
-#: ../app/actions/image-actions.c:139
+#: ../app/actions/image-actions.c:127
 msgid "Configure the grid for this image"
 msgstr "Configure the grid for this image"
 
-#: ../app/actions/image-actions.c:144
+#: ../app/actions/image-actions.c:132
 msgid "Image Pr_operties"
 msgstr "Image Pr_operties"
 
-#: ../app/actions/image-actions.c:145
+#: ../app/actions/image-actions.c:133
 msgid "Display information about this image"
 msgstr "Display information about this image"
 
-#: ../app/actions/image-actions.c:154
+#: ../app/actions/image-actions.c:142
 msgid "Convert the image to the RGB colorspace"
 msgstr "Convert the image to the RGB colourspace"
 
-#: ../app/actions/image-actions.c:158
+#: ../app/actions/image-actions.c:146
 msgid "_Grayscale"
 msgstr "_Greyscale"
 
-#: ../app/actions/image-actions.c:159
+#: ../app/actions/image-actions.c:147
 msgid "Convert the image to grayscale"
 msgstr "Convert the image to greyscale"
 
-#: ../app/actions/image-actions.c:163
+#: ../app/actions/image-actions.c:151
 msgid "_Indexed..."
 msgstr "_Indexed..."
 
-#: ../app/actions/image-actions.c:164
+#: ../app/actions/image-actions.c:152
 msgid "Convert the image to indexed colors"
 msgstr "Convert the image to indexed colours"
 
-#: ../app/actions/image-actions.c:172
+#: ../app/actions/image-actions.c:160
 msgid "Flip image horizontally"
 msgstr "Flip image horizontally"
 
-#: ../app/actions/image-actions.c:178
+#: ../app/actions/image-actions.c:166
 msgid "Flip image vertically"
 msgstr "Flip image vertically"
 
-#: ../app/actions/image-actions.c:187
+#: ../app/actions/image-actions.c:175
 msgid "Rotate the image 90 degrees to the right"
 msgstr "Rotate the image 90 degrees to the right"
 
-#: ../app/actions/image-actions.c:193
+#: ../app/actions/image-actions.c:181
 msgid "Turn the image upside-down"
 msgstr "Turn the image upside-down"
 
-#: ../app/actions/image-actions.c:199
+#: ../app/actions/image-actions.c:187
 msgid "Rotate the image 90 degrees to the left"
 msgstr "Rotate the image 90 degrees to the left"
 
-#: ../app/actions/image-commands.c:255
+#: ../app/actions/image-commands.c:235
 msgid "Set Image Canvas Size"
 msgstr "Set Image Canvas Size"
 
-#: ../app/actions/image-commands.c:281 ../app/actions/image-commands.c:302
-#: ../app/actions/image-commands.c:579
+#: ../app/actions/image-commands.c:261 ../app/actions/image-commands.c:282
+#: ../app/actions/image-commands.c:559
 msgid "Resizing"
 msgstr "Resizing"
 
-#: ../app/actions/image-commands.c:326
+#: ../app/actions/image-commands.c:306
 msgid "Set Image Print Resolution"
 msgstr "Set Image Print Resolution"
 
-#: ../app/actions/image-commands.c:382
-#: ../app/pdb/drawable_transform_cmds.c:147
-#: ../app/pdb/drawable_transform_cmds.c:221
+#: ../app/actions/image-commands.c:362
+#: ../app/pdb/drawable-transform-cmds.c:148
+#: ../app/pdb/drawable-transform-cmds.c:223
 msgid "Flipping"
 msgstr "Flipping"
 
-#: ../app/actions/image-commands.c:403
-#: ../app/pdb/drawable_transform_cmds.c:519
-#: ../app/pdb/drawable_transform_cmds.c:597
-#: ../app/pdb/transform_tools_cmds.c:213 ../app/tools/gimprotatetool.c:114
+#: ../app/actions/image-commands.c:383
+#: ../app/pdb/drawable-transform-cmds.c:525
+#: ../app/pdb/drawable-transform-cmds.c:604 ../app/pdb/image-cmds.c:533
+#: ../app/pdb/transform-tools-cmds.c:215 ../app/tools/gimprotatetool.c:122
 msgid "Rotating"
 msgstr "Rotating"
 
-#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:617
+#: ../app/actions/image-commands.c:408 ../app/actions/layers-commands.c:639
 msgid "Cannot crop because the current selection is empty."
 msgstr "Cannot crop because the current selection is empty."
 
-#: ../app/actions/image-commands.c:626
+#: ../app/actions/image-commands.c:606
 msgid "Change Print Size"
 msgstr "Change Print Size"
 
-#: ../app/actions/image-commands.c:667 ../app/core/gimpimage-scale.c:80
+#: ../app/actions/image-commands.c:647 ../app/core/gimpimage-scale.c:82
 msgid "Scale Image"
 msgstr "Scale Image"
 
 #. Scaling
-#: ../app/actions/image-commands.c:678 ../app/actions/layers-commands.c:1079
-#: ../app/dialogs/preferences-dialog.c:1891
-#: ../app/pdb/drawable_transform_cmds.c:674
-#: ../app/pdb/drawable_transform_cmds.c:749
-#: ../app/pdb/transform_tools_cmds.c:288 ../app/tools/gimpscaletool.c:107
+#: ../app/actions/image-commands.c:658 ../app/actions/layers-commands.c:1101
+#: ../app/dialogs/preferences-dialog.c:1925
+#: ../app/pdb/drawable-transform-cmds.c:682
+#: ../app/pdb/drawable-transform-cmds.c:758 ../app/pdb/image-cmds.c:405
+#: ../app/pdb/image-cmds.c:441 ../app/pdb/layer-cmds.c:289
+#: ../app/pdb/layer-cmds.c:334 ../app/pdb/transform-tools-cmds.c:291
+#: ../app/tools/gimpscaletool.c:107
 msgid "Scaling"
 msgstr "Scaling"
 
@@ -2670,333 +2666,345 @@ msgid "Create a new layer with last used values"
 msgstr "Create a new layer with last used values"
 
 #: ../app/actions/layers-actions.c:86
+msgid "New from _Visible"
+msgstr "New from _Visible"
+
+#: ../app/actions/layers-actions.c:87
+msgid "Create a new layer from what is visible in this image"
+msgstr "Create a new layer from what is visible in this image"
+
+#: ../app/actions/layers-actions.c:92
 msgid "D_uplicate Layer"
 msgstr "D_uplicate Layer"
 
-#: ../app/actions/layers-actions.c:87
+#: ../app/actions/layers-actions.c:93
 msgid "Create a duplicate of the layer and add it to the image"
 msgstr "Create a duplicate of the layer and add it to the image"
 
-#: ../app/actions/layers-actions.c:92
+#: ../app/actions/layers-actions.c:98
 msgid "_Delete Layer"
 msgstr "_Delete Layer"
 
-#: ../app/actions/layers-actions.c:93
+#: ../app/actions/layers-actions.c:99
 msgid "Delete this layer"
 msgstr "Delete this layer"
 
-#: ../app/actions/layers-actions.c:98
+#: ../app/actions/layers-actions.c:104
 msgid "_Raise Layer"
 msgstr "_Raise Layer"
 
-#: ../app/actions/layers-actions.c:99
+#: ../app/actions/layers-actions.c:105
 msgid "Raise this layer one step in the layer stack"
 msgstr "Raise this layer one step in the layer stack"
 
-#: ../app/actions/layers-actions.c:104
+#: ../app/actions/layers-actions.c:110
 msgid "Layer to _Top"
 msgstr "Layer to _Top"
 
-#: ../app/actions/layers-actions.c:105
+#: ../app/actions/layers-actions.c:111
 msgid "Move this layer to the top of the layer stack"
 msgstr "Move this layer to the top of the layer stack"
 
-#: ../app/actions/layers-actions.c:110
+#: ../app/actions/layers-actions.c:116
 msgid "_Lower Layer"
 msgstr "_Lower Layer"
 
-#: ../app/actions/layers-actions.c:111
+#: ../app/actions/layers-actions.c:117
 msgid "Lower this layer one step in the layer stack"
 msgstr "Lower this layer one step in the layer stack"
 
-#: ../app/actions/layers-actions.c:116
+#: ../app/actions/layers-actions.c:122
 msgid "Layer to _Bottom"
 msgstr "Layer to _Bottom"
 
-#: ../app/actions/layers-actions.c:117
+#: ../app/actions/layers-actions.c:123
 msgid "Move this layer to the bottom of the layer stack"
 msgstr "Move this layer to the bottom of the layer stack"
 
-#: ../app/actions/layers-actions.c:122
+#: ../app/actions/layers-actions.c:128
 msgid "_Anchor Layer"
 msgstr "_Anchor Layer"
 
-#: ../app/actions/layers-actions.c:123
+#: ../app/actions/layers-actions.c:129
 msgid "Anchor the floating layer"
 msgstr "Anchor the floating layer"
 
-#: ../app/actions/layers-actions.c:128
+#: ../app/actions/layers-actions.c:134
 msgid "Merge Do_wn"
 msgstr "Merge Do_wn"
 
-#: ../app/actions/layers-actions.c:129
+#: ../app/actions/layers-actions.c:135
 msgid "Merge this layer with the one below it"
 msgstr "Merge this layer with the one below it"
 
-#: ../app/actions/layers-actions.c:134
+#: ../app/actions/layers-actions.c:140
 msgid "Merge _Visible Layers..."
 msgstr "Merge _Visible Layers..."
 
-#: ../app/actions/layers-actions.c:146
+#: ../app/actions/layers-actions.c:152
 msgid "_Discard Text Information"
 msgstr "_Discard Text Information"
 
-#: ../app/actions/layers-actions.c:147
+#: ../app/actions/layers-actions.c:153
 msgid "Turn this text layer into a normal layer"
 msgstr "Turn this text layer into a normal layer"
 
-#: ../app/actions/layers-actions.c:152
+#: ../app/actions/layers-actions.c:158
 msgid "Text to _Path"
 msgstr "Text to _Path"
 
-#: ../app/actions/layers-actions.c:153
+#: ../app/actions/layers-actions.c:159
 msgid "Create a path from this text layer"
 msgstr "Create a path from this text layer"
 
-#: ../app/actions/layers-actions.c:158
+#: ../app/actions/layers-actions.c:164
 msgid "Text alon_g Path"
 msgstr "Text alon_g Path"
 
-#: ../app/actions/layers-actions.c:159
+#: ../app/actions/layers-actions.c:165
 msgid "Warp this layer's text along the current path"
 msgstr "Warp this layer's text along the current path"
 
-#: ../app/actions/layers-actions.c:164
+#: ../app/actions/layers-actions.c:170
 msgid "Layer B_oundary Size..."
 msgstr "Layer B_oundary Size..."
 
-#: ../app/actions/layers-actions.c:165
+#: ../app/actions/layers-actions.c:171
 msgid "Adjust the layer dimensions"
 msgstr "Adjust the layer dimensions"
 
-#: ../app/actions/layers-actions.c:170
+#: ../app/actions/layers-actions.c:176
 msgid "Layer to _Image Size"
 msgstr "Layer to _Image Size"
 
-#: ../app/actions/layers-actions.c:171
+#: ../app/actions/layers-actions.c:177
 msgid "Resize the layer to the size of the image"
 msgstr "Resize the layer to the size of the image"
 
-#: ../app/actions/layers-actions.c:176
+#: ../app/actions/layers-actions.c:182
 msgid "_Scale Layer..."
 msgstr "_Scale Layer..."
 
-#: ../app/actions/layers-actions.c:177
+#: ../app/actions/layers-actions.c:183
 msgid "Change the size of the layer content"
 msgstr "Change the size of the layer content"
 
-#: ../app/actions/layers-actions.c:183
+#: ../app/actions/layers-actions.c:189
 msgid "Crop the layer to the extents of the selection"
 msgstr "Crop the layer to the extents of the selection"
 
-#: ../app/actions/layers-actions.c:188
+#: ../app/actions/layers-actions.c:194
 msgid "Add La_yer Mask..."
 msgstr "Add La_yer Mask..."
 
-#: ../app/actions/layers-actions.c:189
+#: ../app/actions/layers-actions.c:195
 msgid "Add a mask that allows non-destructive editing of transparency"
 msgstr "Add a mask that allows non-destructive editing of transparency"
 
-#: ../app/actions/layers-actions.c:194
+#: ../app/actions/layers-actions.c:200
 msgid "Add Alpha C_hannel"
 msgstr "Add Alpha C_hannel"
 
-#: ../app/actions/layers-actions.c:195
+#: ../app/actions/layers-actions.c:201
 msgid "Add transparency information to the layer"
 msgstr "Add transparency information to the layer"
 
-#: ../app/actions/layers-actions.c:200
+#: ../app/actions/layers-actions.c:206
 msgid "_Remove Alpha Channel"
 msgstr "_Remove Alpha Channel"
 
-#: ../app/actions/layers-actions.c:201
+#: ../app/actions/layers-actions.c:207
 msgid "Remove transparency information from the layer"
 msgstr "Remove transparency information from the layer"
 
-#: ../app/actions/layers-actions.c:209
+#: ../app/actions/layers-actions.c:215
 msgid "Lock Alph_a Channel"
 msgstr "Lock Alph_a Channel"
 
-#: ../app/actions/layers-actions.c:210
+#: ../app/actions/layers-actions.c:216
 msgid "Keep transparency information on this layer from being modified"
 msgstr "Keep transparency information on this layer from being modified"
 
-#: ../app/actions/layers-actions.c:216
+#: ../app/actions/layers-actions.c:222
 msgid "_Edit Layer Mask"
 msgstr "_Edit Layer Mask"
 
-#: ../app/actions/layers-actions.c:217
+#: ../app/actions/layers-actions.c:223
 msgid "Work on the layer mask"
 msgstr "Work on the layer mask"
 
-#: ../app/actions/layers-actions.c:223
+#: ../app/actions/layers-actions.c:229
 msgid "S_how Layer Mask"
 msgstr "S_how Layer Mask"
 
-#: ../app/actions/layers-actions.c:229
+#: ../app/actions/layers-actions.c:235
 msgid "_Disable Layer Mask"
 msgstr "_Disable Layer Mask"
 
-#: ../app/actions/layers-actions.c:230
+#: ../app/actions/layers-actions.c:236
 msgid "Dismiss the effect of the layer mask"
 msgstr "Dismiss the effect of the layer mask"
 
-#: ../app/actions/layers-actions.c:239
+#: ../app/actions/layers-actions.c:245
 msgid "Apply Layer _Mask"
 msgstr "Apply Layer _Mask"
 
-#: ../app/actions/layers-actions.c:240
+#: ../app/actions/layers-actions.c:246
 msgid "Apply the effect of the layer mask and remove it"
 msgstr "Apply the effect of the layer mask and remove it"
 
-#: ../app/actions/layers-actions.c:245
+#: ../app/actions/layers-actions.c:251
 msgid "Delete Layer Mas_k"
 msgstr "Delete Layer Mas_k"
 
-#: ../app/actions/layers-actions.c:246
+#: ../app/actions/layers-actions.c:252
 msgid "Remove the layer mask and its effect"
 msgstr "Remove the layer mask and its effect"
 
-#: ../app/actions/layers-actions.c:254
+#: ../app/actions/layers-actions.c:260
 msgid "_Mask to Selection"
 msgstr "_Mask to Selection"
 
-#: ../app/actions/layers-actions.c:255
+#: ../app/actions/layers-actions.c:261
 msgid "Replace the selection with the layer mask"
 msgstr "Replace the selection with the layer mask"
 
-#: ../app/actions/layers-actions.c:261
+#: ../app/actions/layers-actions.c:267
 msgid "Add the layer mask to the current selection"
 msgstr "Add the layer mask to the current selection"
 
-#: ../app/actions/layers-actions.c:267
+#: ../app/actions/layers-actions.c:273
 msgid "Subtract the layer mask from the current selection"
 msgstr "Subtract the layer mask from the current selection"
 
-#: ../app/actions/layers-actions.c:273
+#: ../app/actions/layers-actions.c:279
 msgid "Intersect the layer mask with the current selection"
 msgstr "Intersect the layer mask with the current selection"
 
-#: ../app/actions/layers-actions.c:281
+#: ../app/actions/layers-actions.c:287
 msgid "Al_pha to Selection"
 msgstr "Al_pha to Selection"
 
-#: ../app/actions/layers-actions.c:282
+#: ../app/actions/layers-actions.c:288
 msgid "Replace the selection with the layer's alpha channel"
 msgstr "Replace the selection with the layer's alpha channel"
 
-#: ../app/actions/layers-actions.c:287 ../app/actions/layers-actions.c:314
+#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
 msgid "A_dd to Selection"
 msgstr "A_dd to Selection"
 
-#: ../app/actions/layers-actions.c:288
+#: ../app/actions/layers-actions.c:294
 msgid "Add the layer's alpha channel to the current selection"
 msgstr "Add the layer's alpha channel to the current selection"
 
-#: ../app/actions/layers-actions.c:294
+#: ../app/actions/layers-actions.c:300
 msgid "Subtract the layer's alpha channel from the current selection"
 msgstr "Subtract the layer's alpha channel from the current selection"
 
-#: ../app/actions/layers-actions.c:300
+#: ../app/actions/layers-actions.c:306
 msgid "Intersect the layer's alpha channel with the current selection"
 msgstr "Intersect the layer's alpha channel with the current selection"
 
-#: ../app/actions/layers-actions.c:308
+#: ../app/actions/layers-actions.c:314
 msgid "_Text to Selection"
 msgstr "_Text to Selection"
 
-#: ../app/actions/layers-actions.c:309
+#: ../app/actions/layers-actions.c:315
 msgid "Replace the selection with the text layer's outline"
 msgstr "Replace the selection with the text layer's outline"
 
-#: ../app/actions/layers-actions.c:315
+#: ../app/actions/layers-actions.c:321
 msgid "Add the text layer's outline to the current selection"
 msgstr "Add the text layer's outline to the current selection"
 
-#: ../app/actions/layers-actions.c:321
+#: ../app/actions/layers-actions.c:327
 msgid "Subtract the text layer's outline from the current selection"
 msgstr "Subtract the text layer's outline from the current selection"
 
-#: ../app/actions/layers-actions.c:327
+#: ../app/actions/layers-actions.c:333
 msgid "Intersect the text layer's outline with the current selection"
 msgstr "Intersect the text layer's outline with the current selection"
 
-#: ../app/actions/layers-actions.c:335
+#: ../app/actions/layers-actions.c:341
 msgid "Select _Top Layer"
 msgstr "Select _Top Layer"
 
-#: ../app/actions/layers-actions.c:336
+#: ../app/actions/layers-actions.c:342
 msgid "Select the topmost layer"
 msgstr "Select the topmost layer"
 
-#: ../app/actions/layers-actions.c:341
+#: ../app/actions/layers-actions.c:347
 msgid "Select _Bottom Layer"
 msgstr "Select _Bottom Layer"
 
-#: ../app/actions/layers-actions.c:342
+#: ../app/actions/layers-actions.c:348
 msgid "Select the bottommost layer"
 msgstr "Select the bottommost layer"
 
-#: ../app/actions/layers-actions.c:347
+#: ../app/actions/layers-actions.c:353
 msgid "Select _Previous Layer"
 msgstr "Select _Previous Layer"
 
-#: ../app/actions/layers-actions.c:348
+#: ../app/actions/layers-actions.c:354
 msgid "Select the layer above the current layer"
 msgstr "Select the layer above the current layer"
 
-#: ../app/actions/layers-actions.c:353
+#: ../app/actions/layers-actions.c:359
 msgid "Select _Next Layer"
 msgstr "Select _Next Layer"
 
-#: ../app/actions/layers-actions.c:354
+#: ../app/actions/layers-actions.c:360
 msgid "Select the layer below the current layer"
 msgstr "Select the layer below the current layer"
 
-#: ../app/actions/layers-actions.c:362
+#: ../app/actions/layers-actions.c:368
 msgid "Set Opacity"
 msgstr "Set Opacity"
 
-#: ../app/actions/layers-commands.c:202
+#: ../app/actions/layers-commands.c:203
 msgid "Layer Attributes"
 msgstr "Layer Attributes"
 
-#: ../app/actions/layers-commands.c:205
+#: ../app/actions/layers-commands.c:206
 msgid "Edit Layer Attributes"
 msgstr "Edit Layer Attributes"
 
-#: ../app/actions/layers-commands.c:248 ../app/actions/layers-commands.c:250
-#: ../app/actions/layers-commands.c:318 ../app/actions/layers-commands.c:322
+#: ../app/actions/layers-commands.c:249 ../app/actions/layers-commands.c:251
+#: ../app/actions/layers-commands.c:319 ../app/actions/layers-commands.c:323
 #: ../app/widgets/gimpdrawabletreeview.c:326
-#: ../app/widgets/gimplayertreeview.c:836
+#: ../app/widgets/gimplayertreeview.c:835
 msgid "New Layer"
 msgstr "New Layer"
 
-#: ../app/actions/layers-commands.c:253
+#: ../app/actions/layers-commands.c:254
 msgid "Create a New Layer"
 msgstr "Create a New Layer"
 
-#: ../app/actions/layers-commands.c:549
+#: ../app/actions/layers-commands.c:352
+msgid "Visible"
+msgstr "Visible"
+
+#: ../app/actions/layers-commands.c:571
 msgid "Set Layer Boundary Size"
 msgstr "Set Layer Boundary Size"
 
-#: ../app/actions/layers-commands.c:590 ../app/core/gimplayer.c:251
+#: ../app/actions/layers-commands.c:612 ../app/core/gimplayer.c:251
 msgid "Scale Layer"
 msgstr "Scale Layer"
 
-#: ../app/actions/layers-commands.c:627
+#: ../app/actions/layers-commands.c:649
 msgid "Crop Layer"
 msgstr "Crop Layer"
 
-#: ../app/actions/layers-commands.c:766
+#: ../app/actions/layers-commands.c:788
 msgid "Layer Mask to Selection"
 msgstr "Layer Mask to Selection"
 
-#: ../app/actions/layers-commands.c:1014
+#: ../app/actions/layers-commands.c:1036
 msgid "Please select a channel first"
 msgstr "Please select a channel first"
 
-#: ../app/actions/layers-commands.c:1022 ../app/core/gimplayer.c:1277
+#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1283
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "Add Layer Mask"
@@ -3023,7 +3031,7 @@ msgstr "New Colour from _FG"
 
 #: ../app/actions/palette-editor-actions.c:73
 msgid "New color from foreground color"
-msgstr "New color from foreground colour"
+msgstr "New colour from foreground colour"
 
 #: ../app/actions/palette-editor-actions.c:78
 msgid "New Color from _BG"
@@ -3031,7 +3039,7 @@ msgstr "New Colour from _BG"
 
 #: ../app/actions/palette-editor-actions.c:79
 msgid "New color from background color"
-msgstr "New color from background colour"
+msgstr "New colour from background colour"
 
 #: ../app/actions/palette-editor-actions.c:87
 #: ../app/actions/view-actions.c:261
@@ -3235,65 +3243,69 @@ msgstr "_Distorts"
 msgid "_Artistic"
 msgstr "_Artistic"
 
-#: ../app/actions/plug-in-actions.c:95
+#: ../app/actions/plug-in-actions.c:94
+msgid "_Decor"
+msgstr "_Decor"
+
+#: ../app/actions/plug-in-actions.c:96
 msgid "_Render"
 msgstr "_Render"
 
-#: ../app/actions/plug-in-actions.c:96
+#: ../app/actions/plug-in-actions.c:97
 msgid "_Clouds"
 msgstr "_Clouds"
 
-#: ../app/actions/plug-in-actions.c:97
+#: ../app/actions/plug-in-actions.c:98
 msgid "_Nature"
 msgstr "_Nature"
 
-#: ../app/actions/plug-in-actions.c:99
+#: ../app/actions/plug-in-actions.c:100
 msgid "_Web"
 msgstr "_Web"
 
-#: ../app/actions/plug-in-actions.c:100
+#: ../app/actions/plug-in-actions.c:101
 msgid "An_imation"
 msgstr "An_imation"
 
-#: ../app/actions/plug-in-actions.c:103
+#: ../app/actions/plug-in-actions.c:104
 msgid "Reset all _Filters"
 msgstr "Reset all _Filters"
 
-#: ../app/actions/plug-in-actions.c:104
+#: ../app/actions/plug-in-actions.c:105
 msgid "Reset all plug-ins to their default settings"
 msgstr "Reset all plug-ins to their default settings"
 
-#: ../app/actions/plug-in-actions.c:112
+#: ../app/actions/plug-in-actions.c:113
 msgid "Re_peat Last"
 msgstr "Re_peat Last"
 
-#: ../app/actions/plug-in-actions.c:113
+#: ../app/actions/plug-in-actions.c:114
 msgid "Rerun the last used plug-in using the same settings"
 msgstr "Rerun the last used plug-in using the same settings"
 
-#: ../app/actions/plug-in-actions.c:118
+#: ../app/actions/plug-in-actions.c:119
 msgid "R_e-Show Last"
 msgstr "R_e-Show Last"
 
-#: ../app/actions/plug-in-actions.c:119
+#: ../app/actions/plug-in-actions.c:120
 msgid "Show the last used plug-in dialog again"
 msgstr "Show the last used plug-in dialogue again"
 
-#: ../app/actions/plug-in-actions.c:502
+#: ../app/actions/plug-in-actions.c:503
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "Re_peat \"%s\""
 
-#: ../app/actions/plug-in-actions.c:503
+#: ../app/actions/plug-in-actions.c:504
 #, c-format
 msgid "R_e-Show \"%s\""
 msgstr "R_e-Show \"%s\""
 
-#: ../app/actions/plug-in-actions.c:517
+#: ../app/actions/plug-in-actions.c:520
 msgid "Repeat Last"
 msgstr "Repeat Last"
 
-#: ../app/actions/plug-in-actions.c:519
+#: ../app/actions/plug-in-actions.c:522
 msgid "Re-Show Last"
 msgstr "Re-Show Last"
 
@@ -3318,7 +3330,7 @@ msgid "Toggle _Quick Mask"
 msgstr "Toggle _Quick Mask"
 
 #: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplayshell.c:1169
 msgid "Toggle Quick Mask"
 msgstr "Toggle Quick Mask"
 
@@ -3502,7 +3514,7 @@ msgstr "_Lock selection to image edges"
 
 #: ../app/actions/select-commands.c:330 ../app/actions/select-commands.c:362
 #: ../app/actions/vectors-commands.c:379 ../app/actions/vectors-commands.c:412
-#: ../app/dialogs/stroke-dialog.c:285
+#: ../app/dialogs/stroke-dialog.c:299
 msgid "There is no active layer or channel to stroke to."
 msgstr "There is no active layer or channel to stroke to."
 
@@ -3515,8 +3527,8 @@ msgid "Templates Menu"
 msgstr "Templates Menu"
 
 #: ../app/actions/templates-actions.c:46
-msgid "_Create Image from Template..."
-msgstr "_Create Image from Template..."
+msgid "_Create Image from Template"
+msgstr "_Create Image from Template"
 
 #: ../app/actions/templates-actions.c:47
 msgid "Create a new image from the selected template"
@@ -3554,24 +3566,24 @@ msgstr "_Delete Template"
 msgid "Delete the selected template"
 msgstr "Delete the selected template"
 
-#: ../app/actions/templates-commands.c:121
+#: ../app/actions/templates-commands.c:113
 msgid "New Template"
 msgstr "New Template"
 
-#: ../app/actions/templates-commands.c:124
+#: ../app/actions/templates-commands.c:116
 msgid "Create a New Template"
 msgstr "Create a New Template"
 
-#: ../app/actions/templates-commands.c:183
-#: ../app/actions/templates-commands.c:186
+#: ../app/actions/templates-commands.c:175
+#: ../app/actions/templates-commands.c:178
 msgid "Edit Template"
 msgstr "Edit Template"
 
-#: ../app/actions/templates-commands.c:221
+#: ../app/actions/templates-commands.c:213
 msgid "Delete Template"
 msgstr "Delete Template"
 
-#: ../app/actions/templates-commands.c:247
+#: ../app/actions/templates-commands.c:239
 #, c-format
 msgid ""
 "Are you sure you want to delete template '%s' from the list and from disk?"
@@ -3598,7 +3610,7 @@ msgstr "Clear all text"
 msgid "LTR"
 msgstr "LTR"
 
-#: ../app/actions/text-editor-actions.c:60 ../app/text/text-enums.c:51
+#: ../app/actions/text-editor-actions.c:60
 msgid "From left to right"
 msgstr "From left to right"
 
@@ -3606,7 +3618,7 @@ msgstr "From left to right"
 msgid "RTL"
 msgstr "RTL"
 
-#: ../app/actions/text-editor-actions.c:66 ../app/text/text-enums.c:52
+#: ../app/actions/text-editor-actions.c:66
 msgid "From right to left"
 msgstr "From right to left"
 
@@ -3617,12 +3629,13 @@ msgstr "Open Text File (UTF-8)"
 #: ../app/actions/text-editor-commands.c:144
 #: ../app/config/gimpconfig-file.c:59 ../app/core/gimpbrush-load.c:140
 #: ../app/core/gimpbrush-load.c:420 ../app/core/gimpbrushgenerated-load.c:73
-#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:56
+#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:55
 #: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:271 ../app/core/gimppalette-load.c:315
-#: ../app/core/gimppalette-load.c:369 ../app/core/gimppalette-load.c:457
-#: ../app/core/gimppalette-load.c:600 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpimagemaptool.c:837 ../app/xcf/xcf.c:329
+#: ../app/core/gimppalette-load.c:270 ../app/core/gimppalette-load.c:314
+#: ../app/core/gimppalette-load.c:368 ../app/core/gimppalette-load.c:456
+#: ../app/core/gimppalette-load.c:599 ../app/core/gimppattern-load.c:76
+#: ../app/tools/gimpcurvestool.c:623 ../app/tools/gimplevelstool.c:743
+#: ../app/xcf/xcf.c:329
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "Could not open '%s' for reading: %s"
@@ -3901,7 +3914,7 @@ msgstr "I_mport Path..."
 msgid "Path to Sele_ction"
 msgstr "Path to Sele_ction"
 
-#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1876
+#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1912
 msgid "Path to selection"
 msgstr "Path to selection"
 
@@ -3958,13 +3971,13 @@ msgstr "New Path"
 msgid "New Path Options"
 msgstr "New Path Options"
 
-#: ../app/actions/vectors-commands.c:305 ../app/pdb/paths_cmds.c:627
-#: ../app/pdb/vectors_cmds.c:1145
+#: ../app/actions/vectors-commands.c:305 ../app/pdb/paths-cmds.c:640
+#: ../app/pdb/vectors-cmds.c:1253
 msgid "Path to Selection"
 msgstr "Path to Selection"
 
 #: ../app/actions/vectors-commands.c:385 ../app/tools/gimpvectoroptions.c:199
-#: ../app/tools/gimpvectortool.c:1909 ../app/vectors/gimpvectors.c:199
+#: ../app/tools/gimpvectortool.c:1945 ../app/vectors/gimpvectors.c:200
 msgid "Stroke Path"
 msgstr "Stroke Path"
 
@@ -4012,7 +4025,7 @@ msgstr "Fi_ll Window"
 msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr "Adjust the zoom ratio so that the entire window is used"
 
-#: ../app/actions/view-actions.c:99 ../app/actions/view-actions.c:575
+#: ../app/actions/view-actions.c:99 ../app/actions/view-actions.c:579
 msgid "Re_vert Zoom"
 msgstr "Re_vert Zoom"
 
@@ -4284,26 +4297,26 @@ msgstr "As in _Preferences"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "Reset padding colour to what's configured in preferences"
 
-#: ../app/actions/view-actions.c:567
+#: ../app/actions/view-actions.c:571
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "Re_vert Zoom (%d%%)"
 
-#: ../app/actions/view-actions.c:704
+#: ../app/actions/view-actions.c:708
 #, c-format
 msgid "Othe_r (%s)..."
 msgstr "Othe_r (%s)..."
 
-#: ../app/actions/view-actions.c:713
+#: ../app/actions/view-actions.c:717
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "_Zoom (%s)"
 
-#: ../app/actions/view-commands.c:586
+#: ../app/actions/view-commands.c:613
 msgid "Set Canvas Padding Color"
 msgstr "Set Canvas Padding Colour"
 
-#: ../app/actions/view-commands.c:588
+#: ../app/actions/view-commands.c:615
 msgid "Set Custom Canvas Padding Color"
 msgstr "Set Custom Canvas Padding Colour"
 
@@ -4317,6 +4330,26 @@ msgstr "Screen %s"
 msgid "Move this window to screen %s"
 msgstr "Move this window to screen %s"
 
+#: ../app/actions/windows-actions.c:79
+msgid "_Windows"
+msgstr "_Windows"
+
+#: ../app/actions/windows-actions.c:80
+msgid "_Recently Closed Docks"
+msgstr "_Recently Closed Docks"
+
+#: ../app/actions/windows-actions.c:81
+msgid "_Dockable Dialogs"
+msgstr "_Dockable Dialogues"
+
+#: ../app/actions/windows-actions.c:84
+msgid "Tool_box"
+msgstr "Tool_box"
+
+#: ../app/actions/windows-actions.c:85
+msgid "Raise the toolbox"
+msgstr "Raise the toolbox"
+
 #: ../app/base/base-enums.c:23
 msgid "Smooth"
 msgstr "Smooth"
@@ -4331,20 +4364,20 @@ msgid "Value"
 msgstr "Value"
 
 #: ../app/base/base-enums.c:56 ../app/core/core-enums.c:1197
-#: ../app/tools/gimpcolorbalancetool.c:290
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimpcolorbalancetool.c:296
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "Red"
 msgstr "Red"
 
 #: ../app/base/base-enums.c:57 ../app/core/core-enums.c:1198
-#: ../app/tools/gimpcolorbalancetool.c:299
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimpcolorbalancetool.c:305
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "Green"
 msgstr "Green"
 
 #: ../app/base/base-enums.c:58 ../app/core/core-enums.c:1199
-#: ../app/tools/gimpcolorbalancetool.c:308
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimpcolorbalancetool.c:314
+#: ../app/tools/gimphuesaturationtool.c:256
 msgid "Blue"
 msgstr "Blue"
 
@@ -4352,7 +4385,7 @@ msgstr "Blue"
 msgid "Alpha"
 msgstr "Alpha"
 
-#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:226
+#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:233
 #: ../app/widgets/widgets-enums.c:84
 msgid "RGB"
 msgstr "RGB"
@@ -4405,7 +4438,7 @@ msgstr "Hue"
 msgid "Saturation"
 msgstr "Saturation"
 
-#: ../app/base/base-enums.c:124 ../app/tools/gimppaintoptions-gui.c:313
+#: ../app/base/base-enums.c:124 ../app/tools/gimppaintoptions-gui.c:174
 msgid "Color"
 msgstr "Colour"
 
@@ -4473,8 +4506,9 @@ msgstr "Failed to resize swap file: %s"
 #: ../app/config/gimpconfig-file.c:68 ../app/core/gimpbrushgenerated-save.c:63
 #: ../app/core/gimpcurve-save.c:53 ../app/core/gimpgradient-save.c:51
 #: ../app/core/gimpgradient-save.c:145 ../app/core/gimppalette-save.c:56
-#: ../app/gui/themes.c:239 ../app/tools/gimpimagemaptool.c:836
-#: ../app/vectors/gimpvectors-export.c:83 ../app/xcf/xcf.c:421
+#: ../app/gui/themes.c:239 ../app/tools/gimpcurvestool.c:676
+#: ../app/tools/gimplevelstool.c:796 ../app/vectors/gimpvectors-export.c:83
+#: ../app/xcf/xcf.c:422
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Could not open '%s' for writing: %s"
@@ -4484,7 +4518,7 @@ msgstr "Could not open '%s' for writing: %s"
 msgid "Error writing '%s': %s"
 msgstr "Error writing '%s': %s"
 
-#: ../app/config/gimpconfig-file.c:90 ../app/tools/gimpimagemaptool.c:869
+#: ../app/config/gimpconfig-file.c:90
 #, c-format
 msgid "Error reading '%s': %s"
 msgstr "Error reading '%s': %s"
@@ -4720,7 +4754,7 @@ msgid ""
 "down when working with large images."
 msgstr ""
 "Sets whether GIMP should create previews of layers and channels. Previews in "
-"the layers and channels dialog are nice to have but they can slow things "
+"the layers and channels dialogue are nice to have but they can slow things "
 "down when working with large images."
 
 #: ../app/config/gimprc-blurbs.h:250
@@ -4755,21 +4789,25 @@ msgstr "Let GIMP try to restore your last saved session on each startup."
 msgid ""
 "Remember the current tool, pattern, color, and brush across GIMP sessions."
 msgstr ""
-"Remember the current tool, pattern, colour, and brush across GIMP sessions."
+"Remember the current tool, pattern, colour and brush across GIMP sessions."
 
 #: ../app/config/gimprc-blurbs.h:269
-msgid "Add all opened and saved files to the document history on disk."
-msgstr "Add all opened and saved files to the document history on disk."
+msgid ""
+"Keep a permanent record of all opened and saved files in the Recent "
+"Documents list."
+msgstr ""
+"Keep a permanent record of all opened and saved files in the Recent "
+"Documents list."
 
-#: ../app/config/gimprc-blurbs.h:272
+#: ../app/config/gimprc-blurbs.h:273
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "Save the positions and sizes of the main dialogues when GIMP exits."
 
-#: ../app/config/gimprc-blurbs.h:275
+#: ../app/config/gimprc-blurbs.h:276
 msgid "Save the tool options when GIMP exits."
 msgstr "Save the tool options when GIMP exits."
 
-#: ../app/config/gimprc-blurbs.h:281
+#: ../app/config/gimprc-blurbs.h:282
 msgid ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
@@ -4777,7 +4815,7 @@ msgstr ""
 "When enabled, all paint tools will show a preview of the current brush's "
 "outline."
 
-#: ../app/config/gimprc-blurbs.h:285
+#: ../app/config/gimprc-blurbs.h:286
 msgid ""
 "When enabled, dialogs will show a help button that gives access to the "
 "related help page.  Without this button, the help page can still be reached "
@@ -4787,7 +4825,7 @@ msgstr ""
 "related help page.  Without this button, the help page can still be reached "
 "by pressing F1."
 
-#: ../app/config/gimprc-blurbs.h:290
+#: ../app/config/gimprc-blurbs.h:291
 msgid ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
@@ -4795,7 +4833,7 @@ msgstr ""
 "When enabled, the mouse pointer will be shown over the image while using a "
 "paint tool."
 
-#: ../app/config/gimprc-blurbs.h:294
+#: ../app/config/gimprc-blurbs.h:295
 msgid ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
@@ -4803,7 +4841,7 @@ msgstr ""
 "When enabled, the menubar is visible by default. This can also be toggled "
 "with the \"View->Show Menubar\" command."
 
-#: ../app/config/gimprc-blurbs.h:298
+#: ../app/config/gimprc-blurbs.h:299
 msgid ""
 "When enabled, the rulers are visible by default. This can also be toggled "
 "with the \"View->Show Rulers\" command."
@@ -4811,7 +4849,7 @@ msgstr ""
 "When enabled, the rulers are visible by default. This can also be toggled "
 "with the \"View->Show Rulers\" command."
 
-#: ../app/config/gimprc-blurbs.h:302
+#: ../app/config/gimprc-blurbs.h:303
 msgid ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
@@ -4819,7 +4857,7 @@ msgstr ""
 "When enabled, the scrollbars are visible by default. This can also be "
 "toggled with the \"View->Show Scrollbars\" command."
 
-#: ../app/config/gimprc-blurbs.h:306
+#: ../app/config/gimprc-blurbs.h:307
 msgid ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
@@ -4827,7 +4865,7 @@ msgstr ""
 "When enabled, the statusbar is visible by default. This can also be toggled "
 "with the \"View->Show Statusbar\" command."
 
-#: ../app/config/gimprc-blurbs.h:310
+#: ../app/config/gimprc-blurbs.h:311
 msgid ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
@@ -4835,7 +4873,7 @@ msgstr ""
 "When enabled, the selection is visible by default. This can also be toggled "
 "with the \"View->Show Selection\" command."
 
-#: ../app/config/gimprc-blurbs.h:314
+#: ../app/config/gimprc-blurbs.h:315
 msgid ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
@@ -4843,7 +4881,7 @@ msgstr ""
 "When enabled, the layer boundary is visible by default. This can also be "
 "toggled with the \"View->Show Layer Boundary\" command."
 
-#: ../app/config/gimprc-blurbs.h:318
+#: ../app/config/gimprc-blurbs.h:319
 msgid ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
@@ -4851,7 +4889,7 @@ msgstr ""
 "When enabled, the guides are visible by default. This can also be toggled "
 "with the \"View->Show Guides\" command."
 
-#: ../app/config/gimprc-blurbs.h:322
+#: ../app/config/gimprc-blurbs.h:323
 msgid ""
 "When enabled, the grid is visible by default. This can also be toggled with "
 "the \"View->Show Grid\" command."
@@ -4859,7 +4897,7 @@ msgstr ""
 "When enabled, the grid is visible by default. This can also be toggled with "
 "the \"View->Show Grid\" command."
 
-#: ../app/config/gimprc-blurbs.h:326
+#: ../app/config/gimprc-blurbs.h:327
 msgid ""
 "When enabled, the sample points are visible by default. This can also be "
 "toggled with the \"View->Show Sample Points\" command."
@@ -4867,19 +4905,15 @@ msgstr ""
 "When enabled, the sample points are visible by default. This can also be "
 "toggled with the \"View->Show Sample Points\" command."
 
-#: ../app/config/gimprc-blurbs.h:330
-msgid "Enable displaying a handy GIMP tip on startup."
-msgstr "Enable displaying a handy GIMP tip on startup."
-
-#: ../app/config/gimprc-blurbs.h:333
+#: ../app/config/gimprc-blurbs.h:331
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "Show a tooltip when the pointer hovers over an item."
 
-#: ../app/config/gimprc-blurbs.h:336
+#: ../app/config/gimprc-blurbs.h:334
 msgid "What to do when the space bar is pressed in the image window."
 msgstr "What to do when the space bar is pressed in the image window."
 
-#: ../app/config/gimprc-blurbs.h:339
+#: ../app/config/gimprc-blurbs.h:337
 msgid ""
 "Sets the swap file location. GIMP uses a tile based memory allocation "
 "scheme. The swap file is used to quickly and easily swap tiles out to disk "
@@ -4895,11 +4929,11 @@ msgstr ""
 "file is created on a folder that is mounted over NFS.  For these reasons, it "
 "may be desirable to put your swap file in \"/tmp\"."
 
-#: ../app/config/gimprc-blurbs.h:348
+#: ../app/config/gimprc-blurbs.h:346
 msgid "When enabled, menus can be torn off."
 msgstr "When enabled, menus can be torn off."
 
-#: ../app/config/gimprc-blurbs.h:351
+#: ../app/config/gimprc-blurbs.h:349
 msgid ""
 "When enabled, dock windows (the toolbox and palettes) are set to be "
 "transient to the active image window. Most window managers will keep the "
@@ -4909,7 +4943,7 @@ msgstr ""
 "transient to the active image window. Most window managers will keep the "
 "dock windows above the image window then, but it may also have other effects."
 
-#: ../app/config/gimprc-blurbs.h:357
+#: ../app/config/gimprc-blurbs.h:355
 msgid ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
@@ -4917,15 +4951,15 @@ msgstr ""
 "When enabled, you can change keyboard shortcuts for menu items by hitting a "
 "key combination while the menu item is highlighted."
 
-#: ../app/config/gimprc-blurbs.h:361
+#: ../app/config/gimprc-blurbs.h:359
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "Save changed keyboard shortcuts when GIMP exits."
 
-#: ../app/config/gimprc-blurbs.h:364
+#: ../app/config/gimprc-blurbs.h:362
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "Restore saved keyboard shortcuts on each GIMP startup."
 
-#: ../app/config/gimprc-blurbs.h:367
+#: ../app/config/gimprc-blurbs.h:365
 msgid ""
 "Sets the folder for temporary storage. Files will appear here during the "
 "course of running GIMP.  Most files will disappear when GIMP exits, but some "
@@ -4937,11 +4971,11 @@ msgstr ""
 "files are likely to remain, so it is best if this folder not be one that is "
 "shared by other users."
 
-#: ../app/config/gimprc-blurbs.h:379
+#: ../app/config/gimprc-blurbs.h:377
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "Sets the size of the thumbnail shown in the Open dialogue."
 
-#: ../app/config/gimprc-blurbs.h:382
+#: ../app/config/gimprc-blurbs.h:380
 msgid ""
 "The thumbnail in the Open dialog will be automatically updated if the file "
 "being previewed is smaller than the size set here."
@@ -4949,7 +4983,7 @@ msgstr ""
 "The thumbnail in the Open dialogue will be automatically updated if the file "
 "being previewed is smaller than the size set here."
 
-#: ../app/config/gimprc-blurbs.h:386
+#: ../app/config/gimprc-blurbs.h:384
 msgid ""
 "When the amount of pixel data exceeds this limit, GIMP will start to swap "
 "tiles to disk.  This is a lot slower but it makes it possible to work on "
@@ -4961,7 +4995,20 @@ msgstr ""
 "images that wouldn't fit into memory otherwise.  If you have a lot of RAM, "
 "you may want to set this to a higher value."
 
+#: ../app/config/gimprc-blurbs.h:390
+msgid "Show the current foreground and background colors in the toolbox."
+msgstr "Show the current foreground and background colours in the toolbox."
+
+#: ../app/config/gimprc-blurbs.h:393
+msgid "Show the currently selected brush, pattern and gradient in the toolbox."
+msgstr ""
+"Show the currently selected brush, pattern and gradient in the toolbox."
+
 #: ../app/config/gimprc-blurbs.h:396
+msgid "Show the currently active image in the toolbox."
+msgstr "Show the currently active image in the toolbox."
+
+#: ../app/config/gimprc-blurbs.h:402
 msgid ""
 "The window type hint that is set on the toolbox. This may affect how your "
 "window manager decorates and handles the toolbox window."
@@ -4969,15 +5016,15 @@ msgstr ""
 "The window type hint that is set on the toolbox. This may affect how your "
 "window manager decorates and handles the toolbox window."
 
-#: ../app/config/gimprc-blurbs.h:400
+#: ../app/config/gimprc-blurbs.h:406
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "Sets the manner in which transparency is displayed in images."
 
-#: ../app/config/gimprc-blurbs.h:403
+#: ../app/config/gimprc-blurbs.h:409
 msgid "Sets the size of the checkerboard used to display transparency."
 msgstr "Sets the size of the chequerboard used to display transparency."
 
-#: ../app/config/gimprc-blurbs.h:406
+#: ../app/config/gimprc-blurbs.h:412
 msgid ""
 "When enabled, GIMP will not save an image if it has not been changed since "
 "it was opened."
@@ -4985,7 +5032,7 @@ msgstr ""
 "When enabled, GIMP will not save an image if it has not been changed since "
 "it was opened."
 
-#: ../app/config/gimprc-blurbs.h:410
+#: ../app/config/gimprc-blurbs.h:416
 msgid ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
@@ -4993,7 +5040,7 @@ msgstr ""
 "Sets the minimal number of operations that can be undone. More undo levels "
 "are kept available until the undo-size limit is reached."
 
-#: ../app/config/gimprc-blurbs.h:414
+#: ../app/config/gimprc-blurbs.h:420
 msgid ""
 "Sets an upper limit to the memory that is used per image to keep operations "
 "on the undo stack. Regardless of this setting, at least as many undo-levels "
@@ -5003,15 +5050,15 @@ msgstr ""
 "on the undo stack. Regardless of this setting, at least as many undo-levels "
 "as configured can be undone."
 
-#: ../app/config/gimprc-blurbs.h:419
+#: ../app/config/gimprc-blurbs.h:425
 msgid "Sets the size of the previews in the Undo History."
 msgstr "Sets the size of the previews in the Undo History."
 
-#: ../app/config/gimprc-blurbs.h:422
+#: ../app/config/gimprc-blurbs.h:428
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "When enabled, pressing F1 will open the help browser."
 
-#: ../app/config/gimprc-blurbs.h:425
+#: ../app/config/gimprc-blurbs.h:439
 #, c-format
 msgid ""
 "Sets the external web browser to be used.  This can be an absolute path or "
@@ -5024,13 +5071,13 @@ msgstr ""
 "contains '%s' it will be replaced with the URL, else the URL will be "
 "appended to the command with a space separating the two."
 
-#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:134
-#: ../app/core/gimp-units.c:164 ../app/gui/session.c:160
+#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:134
+#: ../app/core/gimp-units.c:164 ../app/gui/session.c:206
 #: ../app/plug-in/plug-in-rc.c:213
 msgid "fatal parse error"
 msgstr "fatal parse error"
 
-#: ../app/config/gimprc-deserialize.c:164
+#: ../app/config/gimprc-deserialize.c:163
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "value for token %s is not a valid UTF-8 string"
@@ -5048,7 +5095,7 @@ msgstr "Floyd-Steinberg (normal)"
 
 #: ../app/core/core-enums.c:55
 msgid "Floyd-Steinberg (reduced color bleeding)"
-msgstr "Floyd-Steinberg (reduced color bleeding)"
+msgstr "Floyd-Steinberg (reduced colour bleeding)"
 
 #: ../app/core/core-enums.c:56
 msgid "Positioned"
@@ -5060,7 +5107,7 @@ msgstr "Generate optimum palette"
 
 #: ../app/core/core-enums.c:86
 msgid "Use web-optimized palette"
-msgstr "Use web-optimized palette"
+msgstr "Use web-optimised palette"
 
 #: ../app/core/core-enums.c:87
 msgid "Use black and white (1-bit) palette"
@@ -5074,7 +5121,7 @@ msgstr "Use custom palette"
 msgid "First item"
 msgstr "First item"
 
-#: ../app/core/core-enums.c:213 ../app/dialogs/dialogs.c:190
+#: ../app/core/core-enums.c:213 ../app/dialogs/dialogs.c:198
 #: ../app/tools/tools-enums.c:210
 msgid "Selection"
 msgstr "Selection"
@@ -5104,7 +5151,7 @@ msgid "White"
 msgstr "White"
 
 #. Transparency
-#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2277
+#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2311
 msgid "Transparency"
 msgstr "Transparency"
 
@@ -5196,11 +5243,11 @@ msgstr "Circle"
 msgid "Diamond"
 msgstr "Diamond"
 
-#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2309
+#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2343
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2311
+#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2345
 msgid "Vertical"
 msgstr "Vertical"
 
@@ -5406,18 +5453,18 @@ msgstr "Paste"
 msgid "Cut"
 msgstr "Cut"
 
-#: ../app/core/core-enums.c:882 ../app/tools/gimptexttool.c:141
+#: ../app/core/core-enums.c:882 ../app/tools/gimptexttool.c:160
 #: ../app/widgets/widgets-enums.c:265
 msgid "Text"
 msgstr "Text"
 
 #: ../app/core/core-enums.c:883 ../app/core/core-enums.c:926
-#: ../app/core/gimpdrawable-transform.c:566
+#: ../app/core/gimpdrawable-transform.c:567
 msgid "Transform"
 msgstr "Transform"
 
 #: ../app/core/core-enums.c:884 ../app/core/core-enums.c:927
-#: ../app/paint/gimppaintcore.c:134
+#: ../app/paint/gimppaintcore.c:137
 msgid "Paint"
 msgstr "Paint"
 
@@ -5433,7 +5480,7 @@ msgstr "Remove parasite"
 msgid "Import paths"
 msgstr "Import paths"
 
-#: ../app/core/core-enums.c:888 ../app/pdb/drawable_cmds.c:820
+#: ../app/core/core-enums.c:888 ../app/pdb/drawable-cmds.c:885
 msgid "Plug-In"
 msgstr "Plug-In"
 
@@ -5511,7 +5558,7 @@ msgstr "Reposition channel"
 
 #: ../app/core/core-enums.c:918
 msgid "Channel color"
-msgstr "Channel color"
+msgstr "Channel colour"
 
 #: ../app/core/core-enums.c:919
 msgid "New path"
@@ -5526,12 +5573,12 @@ msgid "Reposition path"
 msgstr "Reposition path"
 
 #: ../app/core/core-enums.c:924
-msgid "FS rigor"
-msgstr "FS rigor"
+msgid "Rigor floating selection"
+msgstr "Rigor floating selection"
 
 #: ../app/core/core-enums.c:925
-msgid "FS relax"
-msgstr "FS relax"
+msgid "Relax floating selection"
+msgstr "Relax floating selection"
 
 #: ../app/core/core-enums.c:928 ../app/paint/gimpink.c:95
 #: ../app/tools/gimpinktool.c:55
@@ -5543,8 +5590,8 @@ msgid "Select foreground"
 msgstr "Select foreground"
 
 #: ../app/core/core-enums.c:932
-msgid "EEK: can't undo"
-msgstr "EEK: can't undo"
+msgid "Not undoable"
+msgstr "Not undoable"
 
 #: ../app/core/core-enums.c:1196
 msgid "Composite"
@@ -5574,8 +5621,8 @@ msgstr "Keep embedded profile"
 msgid "Convert to RGB workspace"
 msgstr "Convert to RGB workspace"
 
-#: ../app/core/gimp-contexts.c:155 ../app/core/gimptooloptions.c:239
-#: ../app/gui/session.c:257 ../app/menus/menus.c:430
+#: ../app/core/gimp-contexts.c:155 ../app/core/gimptooloptions.c:231
+#: ../app/gui/session.c:307 ../app/menus/menus.c:433
 #: ../app/widgets/gimpdevices.c:258
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
@@ -5625,7 +5672,7 @@ msgstr "FG to BG (HSV clockwise hue)"
 msgid "FG to Transparent"
 msgstr "FG to Transparent"
 
-#: ../app/core/gimp-user-install.c:154
+#: ../app/core/gimp-user-install.c:153
 #, c-format
 msgid ""
 "It seems you have used GIMP %s before.  GIMP will now migrate your user "
@@ -5634,7 +5681,7 @@ msgstr ""
 "It seems you have used GIMP %s before.  GIMP will now migrate your user "
 "settings to '%s'."
 
-#: ../app/core/gimp-user-install.c:159
+#: ../app/core/gimp-user-install.c:158
 #, c-format
 msgid ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
@@ -5643,51 +5690,46 @@ msgstr ""
 "It appears that you are using GIMP for the first time.  GIMP will now create "
 "a folder named '%s' and copy some files to it."
 
-#: ../app/core/gimp-user-install.c:310
+#: ../app/core/gimp-user-install.c:309
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "Copying file '%s' from '%s'..."
 
-#: ../app/core/gimp-user-install.c:325 ../app/core/gimp-user-install.c:351
+#: ../app/core/gimp-user-install.c:324 ../app/core/gimp-user-install.c:350
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "Creating folder '%s'..."
 
-#: ../app/core/gimp-user-install.c:336 ../app/core/gimp-user-install.c:362
+#: ../app/core/gimp-user-install.c:335 ../app/core/gimp-user-install.c:361
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Cannot create folder '%s': %s"
 
-#: ../app/core/gimp.c:528
+#: ../app/core/gimp.c:543
 msgid "Initialization"
 msgstr "Initialisation"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:603
+#: ../app/core/gimp.c:618
 msgid "Internal Procedures"
 msgstr "Internal Procedures"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:828
+#: ../app/core/gimp.c:834
 msgid "Looking for data files"
 msgstr "Looking for data files"
 
-#: ../app/core/gimp.c:828
+#: ../app/core/gimp.c:834
 msgid "Parasites"
 msgstr "Parasites"
 
 #. initialize the list of fonts
-#: ../app/core/gimp.c:848
+#: ../app/core/gimp.c:854
 msgid "Fonts (this may take a while)"
 msgstr "Fonts (this may take a while)"
 
-#. initialize the document history
-#: ../app/core/gimp.c:853
-msgid "Documents"
-msgstr "Documents"
-
 #. initialize the module list
-#: ../app/core/gimp.c:865 ../app/dialogs/preferences-dialog.c:2738
+#: ../app/core/gimp.c:863 ../app/dialogs/preferences-dialog.c:2772
 msgid "Modules"
 msgstr "Modules"
 
@@ -5736,7 +5778,7 @@ msgstr "Invalid UTF-8 string in brush file '%s'."
 #: ../app/core/gimpbrush-load.c:283 ../app/core/gimpitem.c:505
 #: ../app/core/gimppattern-load.c:146
 #: ../app/dialogs/template-options-dialog.c:83
-#: ../app/tools/gimpvectortool.c:296
+#: ../app/tools/gimpvectortool.c:299
 msgid "Unnamed"
 msgstr "Unnamed"
 
@@ -5761,11 +5803,6 @@ msgstr ""
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "Fatal parse error in brush file '%s': Wide brushes are not supported."
 
-#: ../app/core/gimpbrushclipboard.c:181 ../app/core/gimppatternclipboard.c:181
-#: ../app/widgets/gimpclipboard.c:296
-msgid "Clipboard"
-msgstr "Clipboard"
-
 #: ../app/core/gimpbrushgenerated-load.c:87
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
@@ -5806,34 +5843,39 @@ msgstr "Error while reading brush file '%s': %s"
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr "Fatal parse error in brush file '%s': File is corrupt."
 
-#: ../app/core/gimpchannel-select.c:58
-msgid "command|Rectangle Select"
+#: ../app/core/gimpchannel-select.c:60
+msgctxt "command"
+msgid "Rectangle Select"
 msgstr "Rectangle Select"
 
-#: ../app/core/gimpchannel-select.c:109
-msgid "command|Ellipse Select"
+#: ../app/core/gimpchannel-select.c:111
+msgctxt "command"
+msgid "Ellipse Select"
 msgstr "Ellipse Select"
 
-#: ../app/core/gimpchannel-select.c:163
-msgid "command|Rounded Rectangle Select"
+#: ../app/core/gimpchannel-select.c:165
+msgctxt "command"
+msgid "Rounded Rectangle Select"
 msgstr "Rounded Rectangle Select"
 
-#: ../app/core/gimpchannel-select.c:432
+#: ../app/core/gimpchannel-select.c:434
 msgid "Alpha to Selection"
 msgstr "Alpha to Selection"
 
-#: ../app/core/gimpchannel-select.c:470
+#: ../app/core/gimpchannel-select.c:472
 #, c-format
 msgid "%s Channel to Selection"
 msgstr "%s Channel to Selection"
 
-#: ../app/core/gimpchannel-select.c:518 ../app/tools/gimpfuzzyselecttool.c:78
-msgid "command|Fuzzy Select"
+#: ../app/core/gimpchannel-select.c:520 ../app/tools/gimpfuzzyselecttool.c:80
+msgctxt "command"
+msgid "Fuzzy Select"
 msgstr "Fuzzy Select"
 
-#: ../app/core/gimpchannel-select.c:565
-#: ../app/tools/gimpbycolorselecttool.c:80
-msgid "command|Select by Color"
+#: ../app/core/gimpchannel-select.c:567
+#: ../app/tools/gimpbycolorselecttool.c:82
+msgctxt "command"
+msgid "Select by Color"
 msgstr "Select by Colour"
 
 #: ../app/core/gimpchannel.c:257
@@ -5864,7 +5906,7 @@ msgstr "Flip Channel"
 msgid "Rotate Channel"
 msgstr "Rotate Channel"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:840
+#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:886
 msgid "Transform Channel"
 msgstr "Transform Channel"
 
@@ -5904,24 +5946,24 @@ msgstr "Grow Channel"
 msgid "Shrink Channel"
 msgstr "Shrink Channel"
 
-#: ../app/core/gimpchannel.c:691
+#: ../app/core/gimpchannel.c:710
 #, c-format
 msgid "Cannot stroke empty channel."
 msgstr "Cannot stroke empty channel."
 
-#: ../app/core/gimpchannel.c:1612
+#: ../app/core/gimpchannel.c:1631
 msgid "Set Channel Color"
 msgstr "Set Channel Colour"
 
-#: ../app/core/gimpchannel.c:1660
+#: ../app/core/gimpchannel.c:1679
 msgid "Set Channel Opacity"
 msgstr "Set Channel Opacity"
 
-#: ../app/core/gimpchannel.c:1728 ../app/core/gimpselection.c:520
+#: ../app/core/gimpchannel.c:1747 ../app/core/gimpselection.c:520
 msgid "Selection Mask"
 msgstr "Selection Mask"
 
-#: ../app/core/gimpdata.c:525 ../app/core/gimptoolpresets.c:297
+#: ../app/core/gimpdata.c:526 ../app/core/gimptoolpresets.c:279
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "Could not delete '%s': %s"
@@ -5963,51 +6005,52 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:245 ../app/tools/gimpblendtool.c:108
+#: ../app/core/gimpdrawable-blend.c:245 ../app/tools/gimpblendtool.c:107
 msgid "Blend"
 msgstr "Blend"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:72
+#: ../app/core/gimpdrawable-brightness-contrast.c:76
 msgid "Brightness_Contrast"
 msgstr "Brightness_Contrast"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:102
-#: ../app/tools/gimpbrightnesscontrasttool.c:106
+#: ../app/core/gimpdrawable-brightness-contrast.c:87
+#: ../app/tools/gimpbrightnesscontrasttool.c:111
 msgid "Brightness-Contrast"
 msgstr "Brightness-Contrast"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:89
+#: ../app/core/gimpdrawable-bucket-fill.c:91
 #, c-format
 msgid "No patterns available for this operation."
 msgstr "No patterns available for this operation."
 
-#: ../app/core/gimpdrawable-bucket-fill.c:284
-msgid "command|Bucket Fill"
+#: ../app/core/gimpdrawable-bucket-fill.c:286
+msgctxt "command"
+msgid "Bucket Fill"
 msgstr "Bucket Fill"
 
-#: ../app/core/gimpdrawable-color-balance.c:82
-#: ../app/core/gimpdrawable-color-balance.c:106
+#: ../app/core/gimpdrawable-color-balance.c:80
+#: ../app/core/gimpdrawable-color-balance.c:90
 #: ../app/tools/gimpcolorbalancetool.c:94
 msgid "Color Balance"
 msgstr "Colour Balance"
 
-#: ../app/core/gimpdrawable-colorize.c:75
-#: ../app/core/gimpdrawable-colorize.c:99 ../app/tools/gimpcolorizetool.c:89
+#: ../app/core/gimpdrawable-colorize.c:73
+#: ../app/core/gimpdrawable-colorize.c:85 ../app/tools/gimpcolorizetool.c:90
 msgid "Colorize"
 msgstr "Colourise"
 
-#: ../app/core/gimpdrawable-curves.c:167 ../app/core/gimpdrawable-curves.c:203
-#: ../app/tools/gimpcurvestool.c:130
+#: ../app/core/gimpdrawable-curves.c:165 ../app/core/gimpdrawable-curves.c:182
+#: ../app/tools/gimpcurvestool.c:140
 msgid "Curves"
 msgstr "Curves"
 
-#: ../app/core/gimpdrawable-desaturate.c:75
-#: ../app/core/gimpdrawable-desaturate.c:120
-#: ../app/dialogs/desaturate-dialog.c:63
+#: ../app/core/gimpdrawable-desaturate.c:71
+#: ../app/core/gimpdrawable-desaturate.c:77
+#: ../app/tools/gimpdesaturatetool.c:77
 msgid "Desaturate"
 msgstr "Desaturate"
 
-#: ../app/core/gimpdrawable-equalize.c:77
+#: ../app/core/gimpdrawable-equalize.c:53
 msgid "Equalize"
 msgstr "Equalise"
 
@@ -6015,22 +6058,21 @@ msgstr "Equalise"
 msgid "Foreground Extraction"
 msgstr "Foreground Extraction"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:80
+#: ../app/core/gimpdrawable-hue-saturation.c:78
 #: ../app/tools/gimphuesaturationtool.c:102
 msgid "Hue-Saturation"
 msgstr "Hue-Saturation"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:104
+#: ../app/core/gimpdrawable-hue-saturation.c:88
 msgid "Hue_Saturation"
 msgstr "Hue_Saturation"
 
-#: ../app/core/gimpdrawable-invert.c:59 ../app/core/gimpdrawable-invert.c:84
+#: ../app/core/gimpdrawable-invert.c:60 ../app/core/gimpdrawable-invert.c:68
 msgid "Invert"
 msgstr "Invert"
 
-#: ../app/core/gimpdrawable-levels.c:102 ../app/core/gimpdrawable-levels.c:136
-#: ../app/core/gimpdrawable-levels.c:184 ../app/core/gimpdrawable-levels.c:213
-#: ../app/tools/gimplevelstool.c:137
+#: ../app/core/gimpdrawable-levels.c:154 ../app/core/gimpdrawable-levels.c:170
+#: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "Levels"
 
@@ -6038,8 +6080,8 @@ msgstr "Levels"
 msgid "Offset Drawable"
 msgstr "Offset Drawable"
 
-#: ../app/core/gimpdrawable-posterize.c:72
-#: ../app/core/gimpdrawable-posterize.c:99 ../app/tools/gimpposterizetool.c:84
+#: ../app/core/gimpdrawable-posterize.c:70
+#: ../app/core/gimpdrawable-posterize.c:80 ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
 msgstr "Posterise"
 
@@ -6047,24 +6089,26 @@ msgstr "Posterise"
 msgid "Render Stroke"
 msgstr "Render Stroke"
 
-#: ../app/core/gimpdrawable-threshold.c:73
-#: ../app/core/gimpdrawable-threshold.c:98 ../app/tools/gimpthresholdtool.c:90
+#: ../app/core/gimpdrawable-threshold.c:71
+#: ../app/core/gimpdrawable-threshold.c:82 ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "Threshold"
 
-#: ../app/core/gimpdrawable-transform.c:627 ../app/tools/gimpfliptool.c:112
-msgid "command|Flip"
+#: ../app/core/gimpdrawable-transform.c:645 ../app/tools/gimpfliptool.c:116
+msgctxt "command"
+msgid "Flip"
 msgstr "Flip"
 
-#: ../app/core/gimpdrawable-transform.c:713 ../app/tools/gimprotatetool.c:113
-msgid "command|Rotate"
+#: ../app/core/gimpdrawable-transform.c:745 ../app/tools/gimprotatetool.c:121
+msgctxt "command"
+msgid "Rotate"
 msgstr "Rotate"
 
-#: ../app/core/gimpdrawable-transform.c:838 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:884 ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "Transform Layer"
 
-#: ../app/core/gimpdrawable-transform.c:853
+#: ../app/core/gimpdrawable-transform.c:899
 msgid "Transformation"
 msgstr "Transformation"
 
@@ -6158,36 +6202,37 @@ msgstr "Change Colourmap entry"
 msgid "Add Color to Colormap"
 msgstr "Add Colour to Colourmap"
 
-#: ../app/core/gimpimage-convert.c:790
+#: ../app/core/gimpimage-convert.c:792
 #, c-format
 msgid "Cannot convert image: palette is empty."
 msgstr "Cannot convert image: palette is empty."
 
-#: ../app/core/gimpimage-convert.c:804
+#: ../app/core/gimpimage-convert.c:806
 msgid "Convert Image to RGB"
 msgstr "Convert Image to RGB"
 
-#: ../app/core/gimpimage-convert.c:808
+#: ../app/core/gimpimage-convert.c:810
 msgid "Convert Image to Grayscale"
 msgstr "Convert Image to Greyscale"
 
-#: ../app/core/gimpimage-convert.c:812
+#: ../app/core/gimpimage-convert.c:814
 msgid "Convert Image to Indexed"
 msgstr "Convert Image to Indexed"
 
-#: ../app/core/gimpimage-convert.c:894
+#: ../app/core/gimpimage-convert.c:896
 msgid "Converting to indexed colors (stage 2)"
 msgstr "Converting to indexed colours (stage 2)"
 
-#: ../app/core/gimpimage-convert.c:939
+#: ../app/core/gimpimage-convert.c:941
 msgid "Converting to indexed colors (stage 3)"
 msgstr "Converting to indexed colours (stage 3)"
 
-#: ../app/core/gimpimage-crop.c:126
-msgid "command|Crop Image"
+#: ../app/core/gimpimage-crop.c:130
+msgctxt "command"
+msgid "Crop Image"
 msgstr "Crop Image"
 
-#: ../app/core/gimpimage-crop.c:129 ../app/core/gimpimage-resize.c:90
+#: ../app/core/gimpimage-crop.c:133 ../app/core/gimpimage-resize.c:90
 msgid "Resize Image"
 msgstr "Resize Image"
 
@@ -6199,7 +6244,7 @@ msgstr "Add Horizontal Guide"
 msgid "Add Vertical Guide"
 msgstr "Add Vertical Guide"
 
-#: ../app/core/gimpimage-guides.c:115 ../app/tools/gimpmovetool.c:546
+#: ../app/core/gimpimage-guides.c:115 ../app/tools/gimpmovetool.c:564
 msgid "Remove Guide"
 msgstr "Remove Guide"
 
@@ -6256,7 +6301,7 @@ msgstr "Disable Quick Mask"
 msgid "Add Sample Point"
 msgstr "Add Sample Point"
 
-#: ../app/core/gimpimage-sample-points.c:98 ../app/tools/gimpcolortool.c:425
+#: ../app/core/gimpimage-sample-points.c:98 ../app/tools/gimpcolortool.c:429
 msgid "Remove Sample Point"
 msgstr "Remove Sample Point"
 
@@ -6264,188 +6309,172 @@ msgstr "Remove Sample Point"
 msgid "Move Sample Point"
 msgstr "Move Sample Point"
 
-#: ../app/core/gimpimage-undo-push.c:855
+#: ../app/core/gimpimage-undo-push.c:863
 #, c-format
 msgid "Can't undo %s"
 msgstr "Can't undo %s"
 
-#: ../app/core/gimpimage.c:1475
+#: ../app/core/gimpimage.c:1506
 msgid "Change Image Resolution"
 msgstr "Change Image Resolution"
 
-#: ../app/core/gimpimage.c:1515
+#: ../app/core/gimpimage.c:1550
 msgid "Change Image Unit"
 msgstr "Change Image Unit"
 
-#: ../app/core/gimpimage.c:2363
+#: ../app/core/gimpimage.c:2384
 msgid "Attach Parasite to Image"
 msgstr "Attach Parasite to Image"
 
-#: ../app/core/gimpimage.c:2401
+#: ../app/core/gimpimage.c:2422
 msgid "Remove Parasite from Image"
 msgstr "Remove Parasite from Image"
 
-#: ../app/core/gimpimage.c:2860
+#: ../app/core/gimpimage.c:2875
 msgid "Add Layer"
 msgstr "Add Layer"
 
-#: ../app/core/gimpimage.c:2925 ../app/core/gimpimage.c:2938
+#: ../app/core/gimpimage.c:2935 ../app/core/gimpimage.c:2948
 msgid "Remove Layer"
 msgstr "Remove Layer"
 
-#: ../app/core/gimpimage.c:3080
+#: ../app/core/gimpimage.c:3092
 msgid "Layer cannot be raised higher."
 msgstr "Layer cannot be raised higher."
 
-#: ../app/core/gimpimage.c:3085
+#: ../app/core/gimpimage.c:3097
 msgid "Raise Layer"
 msgstr "Raise Layer"
 
-#: ../app/core/gimpimage.c:3102
+#: ../app/core/gimpimage.c:3116
 msgid "Layer cannot be lowered more."
 msgstr "Layer cannot be lowered more."
 
-#: ../app/core/gimpimage.c:3107
+#: ../app/core/gimpimage.c:3121
 msgid "Lower Layer"
 msgstr "Lower Layer"
 
-#: ../app/core/gimpimage.c:3118
+#: ../app/core/gimpimage.c:3132
 msgid "Raise Layer to Top"
 msgstr "Raise Layer to Top"
 
-#: ../app/core/gimpimage.c:3133
+#: ../app/core/gimpimage.c:3147
 msgid "Lower Layer to Bottom"
 msgstr "Lower Layer to Bottom"
 
-#: ../app/core/gimpimage.c:3205
+#: ../app/core/gimpimage.c:3209
 msgid "Add Channel"
 msgstr "Add Channel"
 
-#: ../app/core/gimpimage.c:3250 ../app/core/gimpimage.c:3261
+#: ../app/core/gimpimage.c:3252 ../app/core/gimpimage.c:3263
 msgid "Remove Channel"
 msgstr "Remove Channel"
 
-#: ../app/core/gimpimage.c:3308
+#: ../app/core/gimpimage.c:3312
 msgid "Channel cannot be raised higher."
 msgstr "Channel cannot be raised higher."
 
-#: ../app/core/gimpimage.c:3313
+#: ../app/core/gimpimage.c:3317
 msgid "Raise Channel"
 msgstr "Raise Channel"
 
-#: ../app/core/gimpimage.c:3330
-msgid "Channel is already on top."
-msgstr "Channel is already on top."
-
-#: ../app/core/gimpimage.c:3335
+#: ../app/core/gimpimage.c:3328
 msgid "Raise Channel to Top"
 msgstr "Raise Channel to Top"
 
-#: ../app/core/gimpimage.c:3352
+#: ../app/core/gimpimage.c:3348
 msgid "Channel cannot be lowered more."
 msgstr "Channel cannot be lowered more."
 
-#: ../app/core/gimpimage.c:3357
+#: ../app/core/gimpimage.c:3353
 msgid "Lower Channel"
 msgstr "Lower Channel"
 
-#: ../app/core/gimpimage.c:3377
-msgid "Channel is already on the bottom."
-msgstr "Channel is already on the bottom."
-
-#: ../app/core/gimpimage.c:3382
+#: ../app/core/gimpimage.c:3368
 msgid "Lower Channel to Bottom"
 msgstr "Lower Channel to Bottom"
 
-#: ../app/core/gimpimage.c:3456
+#: ../app/core/gimpimage.c:3432
 msgid "Add Path"
 msgstr "Add Path"
 
-#: ../app/core/gimpimage.c:3502
+#: ../app/core/gimpimage.c:3476
 msgid "Remove Path"
 msgstr "Remove Path"
 
-#: ../app/core/gimpimage.c:3546
+#: ../app/core/gimpimage.c:3522
 msgid "Path cannot be raised higher."
 msgstr "Path cannot be raised higher."
 
-#: ../app/core/gimpimage.c:3551
+#: ../app/core/gimpimage.c:3527
 msgid "Raise Path"
 msgstr "Raise Path"
 
-#: ../app/core/gimpimage.c:3568
-msgid "Path is already on top."
-msgstr "Path is already on top."
-
-#: ../app/core/gimpimage.c:3573
+#: ../app/core/gimpimage.c:3538
 msgid "Raise Path to Top"
 msgstr "Raise Path to Top"
 
-#: ../app/core/gimpimage.c:3590
+#: ../app/core/gimpimage.c:3557
 msgid "Path cannot be lowered more."
 msgstr "Path cannot be lowered more."
 
-#: ../app/core/gimpimage.c:3595
+#: ../app/core/gimpimage.c:3562
 msgid "Lower Path"
 msgstr "Lower Path"
 
-#: ../app/core/gimpimage.c:3615
-msgid "Path is already on the bottom."
-msgstr "Path is already on the bottom."
-
-#: ../app/core/gimpimage.c:3620
+#: ../app/core/gimpimage.c:3577
 msgid "Lower Path to Bottom"
 msgstr "Lower Path to Bottom"
 
-#: ../app/core/gimpimagefile.c:547 ../app/dialogs/preferences-dialog.c:1736
+#: ../app/core/gimpimagefile.c:528 ../app/dialogs/preferences-dialog.c:1727
 msgid "Folder"
 msgstr "Folder"
 
-#: ../app/core/gimpimagefile.c:552
+#: ../app/core/gimpimagefile.c:533
 msgid "Special File"
 msgstr "Special File"
 
-#: ../app/core/gimpimagefile.c:568
+#: ../app/core/gimpimagefile.c:549
 msgid "Remote File"
 msgstr "Remote File"
 
-#: ../app/core/gimpimagefile.c:587
+#: ../app/core/gimpimagefile.c:568
 msgid "Click to create preview"
 msgstr "Click to create preview"
 
-#: ../app/core/gimpimagefile.c:593
+#: ../app/core/gimpimagefile.c:574
 msgid "Loading preview..."
 msgstr "Loading preview..."
 
-#: ../app/core/gimpimagefile.c:599
+#: ../app/core/gimpimagefile.c:580
 msgid "Preview is out of date"
 msgstr "Preview is out of date"
 
-#: ../app/core/gimpimagefile.c:605
+#: ../app/core/gimpimagefile.c:586
 msgid "Cannot create preview"
 msgstr "Cannot create preview"
 
-#: ../app/core/gimpimagefile.c:615
+#: ../app/core/gimpimagefile.c:596
 msgid "(Preview may be out of date)"
 msgstr "(Preview may be out of date)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:624 ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:438 ../app/widgets/gimptemplateeditor.c:564
+#: ../app/core/gimpimagefile.c:605 ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:438 ../app/widgets/gimptemplateeditor.c:566
 #, c-format
 msgid "%d × %d pixel"
 msgid_plural "%d × %d pixels"
 msgstr[0] "%d × %d pixel"
 msgstr[1] "%d × %d pixels"
 
-#: ../app/core/gimpimagefile.c:647 ../app/display/gimpdisplayshell-title.c:318
+#: ../app/core/gimpimagefile.c:628 ../app/display/gimpdisplayshell-title.c:325
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d layer"
 msgstr[1] "%d layers"
 
-#: ../app/core/gimpimagefile.c:694
+#: ../app/core/gimpimagefile.c:675
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "Could not open thumbnail '%s': %s"
@@ -6491,8 +6520,8 @@ msgstr "Layer"
 msgid "Rename Layer"
 msgstr "Rename Layer"
 
-#: ../app/core/gimplayer.c:250 ../app/pdb/layer_cmds.c:330
-#: ../app/pdb/layer_cmds.c:365
+#: ../app/core/gimplayer.c:250 ../app/pdb/layer-cmds.c:434
+#: ../app/pdb/layer-cmds.c:470
 msgid "Move Layer"
 msgstr "Move Layer"
 
@@ -6508,7 +6537,7 @@ msgstr "Flip Layer"
 msgid "Rotate Layer"
 msgstr "Rotate Layer"
 
-#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1324
+#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1330
 #: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
@@ -6523,39 +6552,37 @@ msgstr ""
 "Floating Selection\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1254
-msgid "Cannot add layer mask to layer which is not part of an image."
-msgstr "Cannot add layer mask to layer which is not part of an image."
-
-#: ../app/core/gimplayer.c:1261
+#: ../app/core/gimplayer.c:1266
+#, c-format
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "Unable to add a layer mask since the layer already has one."
 
-#: ../app/core/gimplayer.c:1271
+#: ../app/core/gimplayer.c:1277
+#, c-format
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "Cannot add layer mask of different dimensions than specified layer."
 
-#: ../app/core/gimplayer.c:1379
+#: ../app/core/gimplayer.c:1385
 msgid "Transfer Alpha to Mask"
 msgstr "Transfer Alpha to Mask"
 
-#: ../app/core/gimplayer.c:1551 ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:1557 ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "Apply Layer Mask"
 
-#: ../app/core/gimplayer.c:1552
+#: ../app/core/gimplayer.c:1558
 msgid "Delete Layer Mask"
 msgstr "Delete Layer Mask"
 
-#: ../app/core/gimplayer.c:1664
+#: ../app/core/gimplayer.c:1670
 msgid "Add Alpha Channel"
 msgstr "Add Alpha Channel"
 
-#: ../app/core/gimplayer.c:1718
+#: ../app/core/gimplayer.c:1724
 msgid "Remove Alpha Channel"
 msgstr "Remove Alpha Channel"
 
-#: ../app/core/gimplayer.c:1740
+#: ../app/core/gimplayer.c:1746
 msgid "Layer to Image Size"
 msgstr "Layer to Image Size"
 
@@ -6585,7 +6612,7 @@ msgstr "Unknown type of palette file: %s"
 
 #: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:110
 #: ../app/core/gimppalette-load.c:131 ../app/core/gimppalette-load.c:160
-#: ../app/core/gimppalette-load.c:237
+#: ../app/core/gimppalette-load.c:236
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
 msgstr "Fatal parse error in palette file '%s': Read error in line %d."
@@ -6609,23 +6636,22 @@ msgstr ""
 "Reading palette file '%s': Invalid number of columns in line %d. Using "
 "default value."
 
-#. maybe we should just abort?
-#: ../app/core/gimppalette-load.c:184
+#: ../app/core/gimppalette-load.c:183
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "Reading palette file '%s': Missing RED component in line %d."
 
-#: ../app/core/gimppalette-load.c:192
+#: ../app/core/gimppalette-load.c:191
 #, c-format
-msgid "Reading palette '%s': Missing GREEN component in line %d."
-msgstr "Reading palette '%s': Missing GREEN component in line %d."
+msgid "Reading palette file '%s': Missing GREEN component in line %d."
+msgstr "Reading palette file '%s': Missing GREEN component in line %d."
 
-#: ../app/core/gimppalette-load.c:200
+#: ../app/core/gimppalette-load.c:199
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "Reading palette file '%s': Missing BLUE component in line %d."
 
-#: ../app/core/gimppalette-load.c:210
+#: ../app/core/gimppalette-load.c:209
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
 msgstr "Reading palette file '%s': RGB value out of range in line %d."
@@ -6666,7 +6692,7 @@ msgstr "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgid "Please wait"
 msgstr "Please wait"
 
-#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:199
+#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:240
 msgid "Move Selection"
 msgstr "Move Selection"
 
@@ -6696,16 +6722,16 @@ msgstr "There is no selection to stroke."
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "Unable to cut or copy because the selected region is empty."
 
-#: ../app/core/gimpselection.c:817
+#: ../app/core/gimpselection.c:814
 #, c-format
 msgid "Cannot float selection because the selected region is empty."
 msgstr "Cannot float selection because the selected region is empty."
 
-#: ../app/core/gimpselection.c:824
+#: ../app/core/gimpselection.c:821
 msgid "Float Selection"
 msgstr "Float Selection"
 
-#: ../app/core/gimpselection.c:841
+#: ../app/core/gimpselection.c:837
 msgid "Floated Layer"
 msgstr "Floated Layer"
 
@@ -6717,19 +6743,19 @@ msgstr ""
 "Convert a mitred join to a bevelled join if the mitre would extend to a "
 "distance of more than mitre-limit * line-width from the actual join point."
 
-#: ../app/core/gimptemplate.c:119
+#: ../app/core/gimptemplate.c:106
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr "The unit used for coordinate display when not in dot-for-dot mode."
 
-#: ../app/core/gimptemplate.c:126
+#: ../app/core/gimptemplate.c:113
 msgid "The horizontal image resolution."
 msgstr "The horizontal image resolution."
 
-#: ../app/core/gimptemplate.c:131
+#: ../app/core/gimptemplate.c:119
 msgid "The vertical image resolution."
 msgstr "The vertical image resolution."
 
-#: ../app/core/gimptemplate.c:416 ../app/widgets/widgets-enums.c:24
+#: ../app/core/gimptemplate.c:405 ../app/widgets/widgets-enums.c:24
 msgid "Background"
 msgstr "Background"
 
@@ -6738,9 +6764,9 @@ msgstr "Background"
 msgid "pixel"
 msgstr "pixel"
 
-#: ../app/core/gimpunit.c:56 ../app/tools/gimpmeasuretool.c:874
-#: ../app/tools/gimpmeasuretool.c:1017 ../app/tools/gimpmeasuretool.c:1073
-#: ../app/tools/gimpmeasuretool.c:1101 ../app/tools/gimppainttool.c:604
+#: ../app/core/gimpunit.c:56 ../app/tools/gimpmeasuretool.c:877
+#: ../app/tools/gimpmeasuretool.c:1020 ../app/tools/gimpmeasuretool.c:1076
+#: ../app/tools/gimpmeasuretool.c:1104 ../app/tools/gimppainttool.c:615
 msgid "pixels"
 msgstr "pixels"
 
@@ -6790,15 +6816,14 @@ msgstr "percent"
 msgid "Visit the GIMP website"
 msgstr "Visit the GIMP website"
 
-#. Translators: insert your names here,
-#. * separated by newline
-#.
-#: ../app/dialogs/about-dialog.c:130
+#. Translators: insert your names here, separated by newline
+#: ../app/dialogs/about-dialog.c:128
 msgid "translator-credits"
 msgstr ""
 "Robert Brady\n"
 "Piers Cornwell\n"
-"Gareth Owen"
+"Gareth Owen\n"
+"Bruce Cowan"
 
 #: ../app/dialogs/about-dialog.c:529
 msgid "GIMP is brought to you by"
@@ -6837,7 +6862,7 @@ msgid "_Remove unused colors from colormap"
 msgstr "_Remove unused colours from colourmap"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:232 ../app/tools/gimpblendoptions.c:237
+#: ../app/dialogs/convert-dialog.c:232 ../app/tools/gimpblendoptions.c:247
 msgid "Dithering"
 msgstr "Dithering"
 
@@ -6853,76 +6878,65 @@ msgstr "Enable dithering of _transparency"
 msgid "Converting to indexed colors"
 msgstr "Converting to indexed colours"
 
-#: ../app/dialogs/convert-dialog.c:414
+#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:150
+#, c-format
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "Cannot convert to a palette with more than 256 colours."
 
-#: ../app/dialogs/desaturate-dialog.c:65
-msgid "Remove Colors"
-msgstr "Remove Colours"
-
-#: ../app/dialogs/desaturate-dialog.c:75
-msgid "_Desaturate"
-msgstr "_Desaturate"
-
-#: ../app/dialogs/desaturate-dialog.c:97
-msgid "Choose shade of gray based on:"
-msgstr "Choose shade of grey based on:"
-
-#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:171
-#: ../app/gui/gui-message.c:146
+#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:161
+#: ../app/gui/gui-message.c:148
 msgid "GIMP Message"
 msgstr "GIMP Message"
 
-#: ../app/dialogs/dialogs.c:134
+#: ../app/dialogs/dialogs.c:142
 msgid "Devices"
 msgstr "Devices"
 
-#: ../app/dialogs/dialogs.c:134
+#: ../app/dialogs/dialogs.c:142
 msgid "Device Status"
 msgstr "Device Status"
 
-#: ../app/dialogs/dialogs.c:138
+#: ../app/dialogs/dialogs.c:146
 msgid "Errors"
 msgstr "Errors"
 
-#: ../app/dialogs/dialogs.c:163
+#: ../app/dialogs/dialogs.c:171
 msgid "History"
 msgstr "History"
 
-#: ../app/dialogs/dialogs.c:165
+#: ../app/dialogs/dialogs.c:173
 msgid "Image Templates"
 msgstr "Image Templates"
 
-#: ../app/dialogs/dialogs.c:186
+#: ../app/dialogs/dialogs.c:194
 msgid "Histogram"
 msgstr "Histogram"
 
-#: ../app/dialogs/dialogs.c:190
+#: ../app/dialogs/dialogs.c:198
 msgid "Selection Editor"
 msgstr "Selection Editor"
 
-#: ../app/dialogs/dialogs.c:194
+#: ../app/dialogs/dialogs.c:202
 msgid "Undo"
 msgstr "Undo"
 
-#: ../app/dialogs/dialogs.c:194
+#: ../app/dialogs/dialogs.c:202
 msgid "Undo History"
 msgstr "Undo History"
 
-#: ../app/dialogs/dialogs.c:204
+#: ../app/dialogs/dialogs.c:212
 msgid "Navigation"
 msgstr "Navigation"
 
-#: ../app/dialogs/dialogs.c:204
+#: ../app/dialogs/dialogs.c:212
 msgid "Display Navigation"
 msgstr "Display Navigation"
 
-#: ../app/dialogs/dialogs.c:210
+#: ../app/dialogs/dialogs.c:218
 msgid "FG/BG"
 msgstr "FG/BG"
 
-#: ../app/dialogs/dialogs.c:210
+#: ../app/dialogs/dialogs.c:218
 msgid "FG/BG Color"
 msgstr "FG/BG Colour"
 
@@ -6943,7 +6957,7 @@ msgstr "_Mode:"
 msgid "_Opacity:"
 msgstr "_Opacity:"
 
-#: ../app/dialogs/file-open-dialog.c:230
+#: ../app/dialogs/file-open-dialog.c:253
 msgid "Open layers"
 msgstr "Open layers"
 
@@ -6955,7 +6969,7 @@ msgstr "Open Location"
 msgid "Enter location (URI):"
 msgstr "Enter location (URI):"
 
-#: ../app/dialogs/file-save-dialog.c:293 ../app/dialogs/file-save-dialog.c:329
+#: ../app/dialogs/file-save-dialog.c:302 ../app/dialogs/file-save-dialog.c:338
 msgid ""
 "The given filename does not have any known file extension. Please enter a "
 "known file extension or select a file format from the file format list."
@@ -6963,7 +6977,7 @@ msgstr ""
 "The given filename does not have any known file extension. Please enter a "
 "known file extension or select a file format from the file format list."
 
-#: ../app/dialogs/file-save-dialog.c:362
+#: ../app/dialogs/file-save-dialog.c:371
 msgid ""
 "Saving remote files needs to determine the file format from the file "
 "extension. Please enter a file extension that matches the selected file "
@@ -6973,15 +6987,15 @@ msgstr ""
 "extension. Please enter a file extension that matches the selected file "
 "format or enter no file extension at all."
 
-#: ../app/dialogs/file-save-dialog.c:419
+#: ../app/dialogs/file-save-dialog.c:428
 msgid "Extension Mismatch"
 msgstr "Extension Mismatch"
 
-#: ../app/dialogs/file-save-dialog.c:435
+#: ../app/dialogs/file-save-dialog.c:444
 msgid "The given file extension does not match the chosen file type."
 msgstr "The given file extension does not match the chosen file type."
 
-#: ../app/dialogs/file-save-dialog.c:439
+#: ../app/dialogs/file-save-dialog.c:448
 msgid "Do you want to save the image using this name anyway?"
 msgstr "Do you want to save the image using this name anyway?"
 
@@ -7030,21 +7044,21 @@ msgid "Create a New Image"
 msgstr "Create a New Image"
 
 #: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:1987
+#: ../app/dialogs/preferences-dialog.c:2021
 msgid "_Template:"
 msgstr "_Template:"
 
-#: ../app/dialogs/image-new-dialog.c:292
+#: ../app/dialogs/image-new-dialog.c:299
 msgid "Confirm Image Size"
 msgstr "Confirm Image Size"
 
-#: ../app/dialogs/image-new-dialog.c:314
-#: ../app/dialogs/image-scale-dialog.c:237
+#: ../app/dialogs/image-new-dialog.c:321
+#: ../app/dialogs/image-scale-dialog.c:239
 #, c-format
 msgid "You are trying to create an image with a size of %s."
 msgstr "You are trying to create an image with a size of %s."
 
-#: ../app/dialogs/image-new-dialog.c:321
+#: ../app/dialogs/image-new-dialog.c:328
 #, c-format
 msgid ""
 "An image of the chosen size will use more memory than what is configured as "
@@ -7070,15 +7084,16 @@ msgstr "Colour Profile"
 msgid "Comment"
 msgstr "Comment"
 
-#: ../app/dialogs/image-scale-dialog.c:109
-msgid "dialog-title|Scale Image"
+#: ../app/dialogs/image-scale-dialog.c:111
+msgctxt "dialog-title"
+msgid "Scale Image"
 msgstr "Scale Image"
 
-#: ../app/dialogs/image-scale-dialog.c:203
+#: ../app/dialogs/image-scale-dialog.c:205
 msgid "Confirm Scaling"
 msgstr "Confirm Scaling"
 
-#: ../app/dialogs/image-scale-dialog.c:243
+#: ../app/dialogs/image-scale-dialog.c:245
 #, c-format
 msgid ""
 "Scaling the image to the chosen size will make it use more memory than what "
@@ -7089,21 +7104,21 @@ msgstr ""
 "is configured as \"Maximum Image Size\" in the Preferences dialogue "
 "(currently %s)."
 
-#: ../app/dialogs/image-scale-dialog.c:258
+#: ../app/dialogs/image-scale-dialog.c:260
 msgid ""
 "Scaling the image to the chosen size will shrink some layers completely away."
 msgstr ""
 "Scaling the image to the chosen size will shrink some layers completely away."
 
-#: ../app/dialogs/image-scale-dialog.c:262
+#: ../app/dialogs/image-scale-dialog.c:264
 msgid "Is this what you want to do?"
 msgstr "Is this what you want to do?"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:50
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:49
 msgid "Configure Keyboard Shortcuts"
 msgstr "Configure Keyboard Shortcuts"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:83
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:73
 msgid ""
 "To edit a shortcut key, click on the corresponding row and type a new "
 "accelerator, or press backspace to clear."
@@ -7111,10 +7126,9 @@ msgstr ""
 "To edit a shortcut key, click on the corresponding row and type a new "
 "accelerator, or press backspace to clear."
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:91
-#: ../app/dialogs/preferences-dialog.c:1660
-msgid "_Save keyboard shortcuts on exit"
-msgstr "_Save keyboard shortcuts on exit"
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:81
+msgid "S_ave keyboard shortcuts on exit"
+msgstr "S_ave keyboard shortcuts on exit"
 
 #: ../app/dialogs/layer-add-mask-dialog.c:83
 msgid "Add a Mask to the Layer"
@@ -7124,7 +7138,7 @@ msgstr "Add a Mask to the Layer"
 msgid "Initialize Layer Mask to:"
 msgstr "Initialise Layer Mask to:"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:140
+#: ../app/dialogs/layer-add-mask-dialog.c:138
 msgid "In_vert mask"
 msgstr "In_vert mask"
 
@@ -7134,12 +7148,12 @@ msgstr "Layer _name:"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1062
+#: ../app/tools/gimpmeasuretool.c:1065
 msgid "Width:"
 msgstr "Width:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1090
+#: ../app/tools/gimpmeasuretool.c:1093
 msgid "Height:"
 msgstr "Height:"
 
@@ -7151,83 +7165,46 @@ msgstr "Layer Fill Type"
 msgid "Set name from _text"
 msgstr "Set name from _text"
 
-#: ../app/dialogs/module-dialog.c:118
-msgid "Manage Loadable Modules"
-msgstr "Manage Loadable Modules"
+#: ../app/dialogs/module-dialog.c:127
+msgid "Module Manager"
+msgstr "Module Manager"
 
-#: ../app/dialogs/module-dialog.c:167
-msgid "Autoload"
-msgstr "Autoload"
+#: ../app/dialogs/module-dialog.c:150
+msgid "You will have to restart GIMP for the changes to take effect."
+msgstr "You will have to restart GIMP for the changes to take effect."
 
-#: ../app/dialogs/module-dialog.c:174
-msgid "Module Path"
-msgstr "Module Path"
+#: ../app/dialogs/module-dialog.c:191
+msgid "Module"
+msgstr "Module"
 
-#: ../app/dialogs/module-dialog.c:424
-msgid ""
-msgstr ""
-
-#: ../app/dialogs/module-dialog.c:436 ../app/dialogs/module-dialog.c:445
-msgid "On disk"
-msgstr "On disk"
-
-#: ../app/dialogs/module-dialog.c:436
+#: ../app/dialogs/module-dialog.c:464
 msgid "Only in memory"
 msgstr "Only in memory"
 
-#: ../app/dialogs/module-dialog.c:445
+#: ../app/dialogs/module-dialog.c:469
 msgid "No longer available"
 msgstr "No longer available"
 
-#: ../app/dialogs/module-dialog.c:481
-msgid "Load"
-msgstr "Load"
-
-#: ../app/dialogs/module-dialog.c:483
-msgid "Query"
-msgstr "Query"
-
-#: ../app/dialogs/module-dialog.c:490
-msgid "Unload"
-msgstr "Unload"
-
-#: ../app/dialogs/module-dialog.c:505
-msgid "Purpose:"
-msgstr "Purpose:"
-
-#: ../app/dialogs/module-dialog.c:506
+#: ../app/dialogs/module-dialog.c:498
 msgid "Author:"
 msgstr "Author:"
 
-#: ../app/dialogs/module-dialog.c:507
+#: ../app/dialogs/module-dialog.c:499
 msgid "Version:"
 msgstr "Version:"
 
-#: ../app/dialogs/module-dialog.c:508
-msgid "Copyright:"
-msgstr "Copyright:"
-
-#: ../app/dialogs/module-dialog.c:509
+#: ../app/dialogs/module-dialog.c:500
 msgid "Date:"
 msgstr "Date:"
 
-#: ../app/dialogs/module-dialog.c:510
+#: ../app/dialogs/module-dialog.c:501
+msgid "Copyright:"
+msgstr "Copyright:"
+
+#: ../app/dialogs/module-dialog.c:502
 msgid "Location:"
 msgstr "Location:"
 
-#: ../app/dialogs/module-dialog.c:511
-#: ../app/widgets/gimpcontrollereditor.c:233
-msgid "State:"
-msgstr "State:"
-
-#: ../app/dialogs/module-dialog.c:512
-msgid "Last error:"
-msgstr "Last error:"
-
-#: ../app/dialogs/module-dialog.c:513
-msgid "Available types:"
-msgstr "Available types:"
-
 #: ../app/dialogs/offset-dialog.c:108
 msgid "Offset Layer"
 msgstr "Offset Layer"
@@ -7242,7 +7219,7 @@ msgstr "Offset Channel"
 
 #. The offset frame
 #: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:268
+#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:276
 msgid "Offset"
 msgstr "Offset"
 
@@ -7348,24 +7325,24 @@ msgstr "Preview"
 msgid "The selected source contains no colors."
 msgstr "The selected source contains no colours."
 
-#: ../app/dialogs/preferences-dialog.c:265
+#: ../app/dialogs/preferences-dialog.c:267
 msgid "Reset All Preferences"
 msgstr "Reset All Preferences"
 
-#: ../app/dialogs/preferences-dialog.c:283
+#: ../app/dialogs/preferences-dialog.c:285
 msgid "Do you really want to reset all preferences to default values?"
 msgstr "Do you really want to reset all preferences to default values?"
 
-#: ../app/dialogs/preferences-dialog.c:353
+#: ../app/dialogs/preferences-dialog.c:355
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr ""
 "You will have to restart GIMP for the following changes to take effect:"
 
-#: ../app/dialogs/preferences-dialog.c:492
+#: ../app/dialogs/preferences-dialog.c:500
 msgid "Configure Input Devices"
 msgstr "Configure Input Devices"
 
-#: ../app/dialogs/preferences-dialog.c:569
+#: ../app/dialogs/preferences-dialog.c:577
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
@@ -7373,15 +7350,15 @@ msgstr ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:580
+#: ../app/dialogs/preferences-dialog.c:588
 msgid "Remove all Keyboard Shortcuts"
 msgstr "Remove all Keyboard Shortcuts"
 
-#: ../app/dialogs/preferences-dialog.c:602
+#: ../app/dialogs/preferences-dialog.c:610
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "Do you really want to remove all keyboard shortcuts from all menus?"
 
-#: ../app/dialogs/preferences-dialog.c:643
+#: ../app/dialogs/preferences-dialog.c:651
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
@@ -7389,7 +7366,7 @@ msgstr ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:678
+#: ../app/dialogs/preferences-dialog.c:686
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
@@ -7397,7 +7374,7 @@ msgstr ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:713
+#: ../app/dialogs/preferences-dialog.c:721
 msgid ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
@@ -7405,704 +7382,724 @@ msgstr ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:1298
+#: ../app/dialogs/preferences-dialog.c:1289
 msgid "Show _menubar"
 msgstr "Show _menubar"
 
-#: ../app/dialogs/preferences-dialog.c:1302
+#: ../app/dialogs/preferences-dialog.c:1293
 msgid "Show _rulers"
 msgstr "Show _rulers"
 
-#: ../app/dialogs/preferences-dialog.c:1305
+#: ../app/dialogs/preferences-dialog.c:1296
 msgid "Show scroll_bars"
 msgstr "Show scroll_bars"
 
-#: ../app/dialogs/preferences-dialog.c:1308
+#: ../app/dialogs/preferences-dialog.c:1299
 msgid "Show s_tatusbar"
 msgstr "Show s_tatusbar"
 
-#: ../app/dialogs/preferences-dialog.c:1316
+#: ../app/dialogs/preferences-dialog.c:1307
 msgid "Show s_election"
 msgstr "Show s_election"
 
-#: ../app/dialogs/preferences-dialog.c:1319
+#: ../app/dialogs/preferences-dialog.c:1310
 msgid "Show _layer boundary"
 msgstr "Show _layer boundary"
 
-#: ../app/dialogs/preferences-dialog.c:1322
+#: ../app/dialogs/preferences-dialog.c:1313
 msgid "Show _guides"
 msgstr "Show _guides"
 
-#: ../app/dialogs/preferences-dialog.c:1325
+#: ../app/dialogs/preferences-dialog.c:1316
 msgid "Show gri_d"
 msgstr "Show gri_d"
 
-#: ../app/dialogs/preferences-dialog.c:1331
+#: ../app/dialogs/preferences-dialog.c:1322
 msgid "Canvas _padding mode:"
 msgstr "Canvas _padding mode:"
 
-#: ../app/dialogs/preferences-dialog.c:1336
+#: ../app/dialogs/preferences-dialog.c:1327
 msgid "Custom p_adding color:"
 msgstr "Custom p_adding colour:"
 
-#: ../app/dialogs/preferences-dialog.c:1337
+#: ../app/dialogs/preferences-dialog.c:1328
 msgid "Select Custom Canvas Padding Color"
 msgstr "Select Custom Canvas Padding Colour"
 
-#: ../app/dialogs/preferences-dialog.c:1426
+#: ../app/dialogs/preferences-dialog.c:1417
 msgid "Preferences"
 msgstr "Preferences"
 
-#: ../app/dialogs/preferences-dialog.c:1538
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:1529
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment"
 msgstr "Environment"
 
-#: ../app/dialogs/preferences-dialog.c:1552
+#: ../app/dialogs/preferences-dialog.c:1543
 msgid "Resource Consumption"
 msgstr "Resource Consumption"
 
-#: ../app/dialogs/preferences-dialog.c:1562
+#: ../app/dialogs/preferences-dialog.c:1553
 msgid "Minimal number of _undo levels:"
 msgstr "Minimal number of _undo levels:"
 
-#: ../app/dialogs/preferences-dialog.c:1565
+#: ../app/dialogs/preferences-dialog.c:1556
 msgid "Maximum undo _memory:"
 msgstr "Maximum undo _memory:"
 
-#: ../app/dialogs/preferences-dialog.c:1568
+#: ../app/dialogs/preferences-dialog.c:1559
 msgid "Tile cache _size:"
 msgstr "Tile cache _size:"
 
-#: ../app/dialogs/preferences-dialog.c:1571
+#: ../app/dialogs/preferences-dialog.c:1562
 msgid "Maximum _new image size:"
 msgstr "Maximum _new image size:"
 
-#: ../app/dialogs/preferences-dialog.c:1576
+#: ../app/dialogs/preferences-dialog.c:1567
 msgid "Number of _processors to use:"
 msgstr "Number of _processors to use:"
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1581
+#: ../app/dialogs/preferences-dialog.c:1572
 msgid "Image Thumbnails"
 msgstr "Image Thumbnails"
 
-#: ../app/dialogs/preferences-dialog.c:1586
+#: ../app/dialogs/preferences-dialog.c:1577
 msgid "Size of _thumbnails:"
 msgstr "Size of _thumbnails:"
 
-#: ../app/dialogs/preferences-dialog.c:1590
+#: ../app/dialogs/preferences-dialog.c:1581
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "Maximum _filesize for thumbnailing:"
 
 #. File Saving
-#: ../app/dialogs/preferences-dialog.c:1594
+#: ../app/dialogs/preferences-dialog.c:1585
 msgid "Saving Images"
 msgstr "Saving Images"
 
-#: ../app/dialogs/preferences-dialog.c:1597
+#: ../app/dialogs/preferences-dialog.c:1588
 msgid "Confirm closing of unsa_ved images"
 msgstr "Confirm closing of unsa_ved images"
 
-#: ../app/dialogs/preferences-dialog.c:1607
-msgid "Save document _history on exit"
-msgstr "Save document _history on exit"
+#: ../app/dialogs/preferences-dialog.c:1598
+msgid "Keep record of used files in the Recent Documents list"
+msgstr "Keep record of used files in the Recent Documents list"
 
-#: ../app/dialogs/preferences-dialog.c:1616
+#: ../app/dialogs/preferences-dialog.c:1607
 msgid "User Interface"
 msgstr "User Interface"
 
-#: ../app/dialogs/preferences-dialog.c:1619
+#: ../app/dialogs/preferences-dialog.c:1610
 msgid "Interface"
 msgstr "Interface"
 
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1626
+#: ../app/dialogs/preferences-dialog.c:1617
 msgid "Previews"
 msgstr "Previews"
 
-#: ../app/dialogs/preferences-dialog.c:1629
+#: ../app/dialogs/preferences-dialog.c:1620
 msgid "_Enable layer & channel previews"
 msgstr "_Enable layer & channel previews"
 
-#: ../app/dialogs/preferences-dialog.c:1635
+#: ../app/dialogs/preferences-dialog.c:1626
 msgid "_Default layer & channel preview size:"
 msgstr "_Default layer & channel preview size:"
 
-#: ../app/dialogs/preferences-dialog.c:1638
+#: ../app/dialogs/preferences-dialog.c:1629
 msgid "Na_vigation preview size:"
 msgstr "Na_vigation preview size:"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1642
+#: ../app/dialogs/preferences-dialog.c:1633
 msgid "Keyboard Shortcuts"
 msgstr "Keyboard Shortcuts"
 
-#: ../app/dialogs/preferences-dialog.c:1646
+#: ../app/dialogs/preferences-dialog.c:1637
 msgid "Show menu _mnemonics (access keys)"
 msgstr "Show menu _mnemonics (access keys)"
 
-#: ../app/dialogs/preferences-dialog.c:1649
+#: ../app/dialogs/preferences-dialog.c:1640
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "_Use dynamic keyboard shortcuts"
 
-#: ../app/dialogs/preferences-dialog.c:1653
+#: ../app/dialogs/preferences-dialog.c:1644
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "Configure _Keyboard Shortcuts..."
 
-#: ../app/dialogs/preferences-dialog.c:1664
+#: ../app/dialogs/preferences-dialog.c:1651
+msgid "_Save keyboard shortcuts on exit"
+msgstr "_Save keyboard shortcuts on exit"
+
+#: ../app/dialogs/preferences-dialog.c:1655
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "Save Keyboard Shortcuts _Now"
 
-#: ../app/dialogs/preferences-dialog.c:1671
+#: ../app/dialogs/preferences-dialog.c:1662
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "_Reset Keyboard Shortcuts to Default Values"
 
-#: ../app/dialogs/preferences-dialog.c:1680
+#: ../app/dialogs/preferences-dialog.c:1671
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "Remove _All Keyboard Shortcuts"
 
-#: ../app/dialogs/preferences-dialog.c:1692
-#: ../app/dialogs/preferences-dialog.c:1731
+#: ../app/dialogs/preferences-dialog.c:1683
+#: ../app/dialogs/preferences-dialog.c:1722
 msgid "Theme"
 msgstr "Theme"
 
-#: ../app/dialogs/preferences-dialog.c:1701
+#: ../app/dialogs/preferences-dialog.c:1692
 msgid "Select Theme"
 msgstr "Select Theme"
 
-#: ../app/dialogs/preferences-dialog.c:1783
+#: ../app/dialogs/preferences-dialog.c:1774
 msgid "Reload C_urrent Theme"
 msgstr "Reload C_urrent Theme"
 
-#: ../app/dialogs/preferences-dialog.c:1795
+#: ../app/dialogs/preferences-dialog.c:1786
 msgid "Help System"
 msgstr "Help System"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1807
-#: ../app/dialogs/preferences-dialog.c:1858
-#: ../app/dialogs/preferences-dialog.c:2045
-#: ../app/widgets/gimpcontrollereditor.c:188
+#: ../app/dialogs/preferences-dialog.c:1798
+#: ../app/dialogs/preferences-dialog.c:1892
+#: ../app/dialogs/preferences-dialog.c:2079
+#: ../app/widgets/gimpcontrollereditor.c:189
 msgid "General"
 msgstr "General"
 
-#: ../app/dialogs/preferences-dialog.c:1810
+#: ../app/dialogs/preferences-dialog.c:1801
 msgid "Show _tooltips"
 msgstr "Show _tooltips"
 
-#: ../app/dialogs/preferences-dialog.c:1813
+#: ../app/dialogs/preferences-dialog.c:1804
 msgid "Show help _buttons"
 msgstr "Show help _buttons"
 
-#: ../app/dialogs/preferences-dialog.c:1816
-msgid "Show tips on _startup"
-msgstr "Show tips on _startup"
+#: ../app/dialogs/preferences-dialog.c:1817
+msgid "Use the online version"
+msgstr "Use the online version"
+
+#: ../app/dialogs/preferences-dialog.c:1818
+msgid "Use a locally installed copy"
+msgstr "Use a locally installed copy"
+
+#: ../app/dialogs/preferences-dialog.c:1819
+msgid "User manual:"
+msgstr "User manual:"
+
+#: ../app/dialogs/preferences-dialog.c:1826
+msgid "There's a local installation of the user manual."
+msgstr "There's a local installation of the user manual."
+
+#: ../app/dialogs/preferences-dialog.c:1831
+msgid "The user manual is not installed locally."
+msgstr "The user manual is not installed locally."
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1820
+#: ../app/dialogs/preferences-dialog.c:1854
 msgid "Help Browser"
 msgstr "Help Browser"
 
-#: ../app/dialogs/preferences-dialog.c:1824
+#: ../app/dialogs/preferences-dialog.c:1858
 msgid "H_elp browser to use:"
 msgstr "H_elp browser to use:"
 
-#: ../app/dialogs/preferences-dialog.c:1829
+#: ../app/dialogs/preferences-dialog.c:1863
 msgid "Web Browser"
 msgstr "Web Browser"
 
-#: ../app/dialogs/preferences-dialog.c:1833
+#: ../app/dialogs/preferences-dialog.c:1867
 msgid "_Web browser to use:"
 msgstr "_Web browser to use:"
 
-#: ../app/dialogs/preferences-dialog.c:1861
+#: ../app/dialogs/preferences-dialog.c:1895
 msgid "_Save tool options on exit"
 msgstr "_Save tool options on exit"
 
-#: ../app/dialogs/preferences-dialog.c:1865
+#: ../app/dialogs/preferences-dialog.c:1899
 msgid "Save Tool Options _Now"
 msgstr "Save Tool Options _Now"
 
-#: ../app/dialogs/preferences-dialog.c:1872
+#: ../app/dialogs/preferences-dialog.c:1906
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "_Reset Saved Tool Options to Default Values"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1882
+#: ../app/dialogs/preferences-dialog.c:1916
 msgid "Guide & Grid Snapping"
 msgstr "Guide & Grid Snapping"
 
-#: ../app/dialogs/preferences-dialog.c:1887
+#: ../app/dialogs/preferences-dialog.c:1921
 msgid "_Snap distance:"
 msgstr "_Snap distance:"
 
-#: ../app/dialogs/preferences-dialog.c:1895
+#: ../app/dialogs/preferences-dialog.c:1929
 msgid "Default _interpolation:"
 msgstr "Default _interpolation:"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1902
+#: ../app/dialogs/preferences-dialog.c:1936
 msgid "Paint Options Shared Between Tools"
 msgstr "Paint Options Shared Between Tools"
 
-#: ../app/dialogs/preferences-dialog.c:1915
+#: ../app/dialogs/preferences-dialog.c:1949
 msgid "Move Tool"
 msgstr "Move Tool"
 
-#: ../app/dialogs/preferences-dialog.c:1919
+#: ../app/dialogs/preferences-dialog.c:1953
 msgid "Set layer or path as active"
 msgstr "Set layer or path as active"
 
-#: ../app/dialogs/preferences-dialog.c:1932
+#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:633
 msgid "Toolbox"
 msgstr "Toolbox"
 
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1944
-#: ../app/dialogs/preferences-dialog.c:2118
-#: ../app/widgets/gimpgrideditor.c:196
+#: ../app/dialogs/preferences-dialog.c:1978
+#: ../app/dialogs/preferences-dialog.c:2152
+#: ../app/widgets/gimpgrideditor.c:204
 msgid "Appearance"
 msgstr "Appearance"
 
-#: ../app/dialogs/preferences-dialog.c:1948
+#: ../app/dialogs/preferences-dialog.c:1982
 msgid "Show _foreground & background color"
 msgstr "Show _foreground & background colour"
 
-#: ../app/dialogs/preferences-dialog.c:1952
+#: ../app/dialogs/preferences-dialog.c:1986
 msgid "Show active _brush, pattern & gradient"
 msgstr "Show active _brush, pattern & gradient"
 
-#: ../app/dialogs/preferences-dialog.c:1956
+#: ../app/dialogs/preferences-dialog.c:1990
 msgid "Show active _image"
 msgstr "Show active _image"
 
-#: ../app/dialogs/preferences-dialog.c:1969
+#: ../app/dialogs/preferences-dialog.c:2003
 msgid "Default New Image"
 msgstr "Default New Image"
 
-#: ../app/dialogs/preferences-dialog.c:1972
+#: ../app/dialogs/preferences-dialog.c:2006
 msgid "Default Image"
 msgstr "Default Image"
 
-#: ../app/dialogs/preferences-dialog.c:2009
+#: ../app/dialogs/preferences-dialog.c:2043
 msgid "Default Image Grid"
 msgstr "Default Image Grid"
 
-#: ../app/dialogs/preferences-dialog.c:2012
+#: ../app/dialogs/preferences-dialog.c:2046
 msgid "Default Grid"
 msgstr "Default Grid"
 
-#: ../app/dialogs/preferences-dialog.c:2033
+#: ../app/dialogs/preferences-dialog.c:2067
 msgid "Image Windows"
 msgstr "Image Windows"
 
-#: ../app/dialogs/preferences-dialog.c:2048
+#: ../app/dialogs/preferences-dialog.c:2082
 msgid "Use \"_Dot for dot\" by default"
 msgstr "Use \"_Dot for dot\" by default"
 
-#: ../app/dialogs/preferences-dialog.c:2054
+#: ../app/dialogs/preferences-dialog.c:2088
 msgid "Marching _ants speed:"
 msgstr "Marching _ants speed:"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2058
+#: ../app/dialogs/preferences-dialog.c:2092
 msgid "Zoom & Resize Behavior"
-msgstr "Zoom & Resize Behavior"
+msgstr "Zoom & Resize Behaviour"
 
-#: ../app/dialogs/preferences-dialog.c:2062
+#: ../app/dialogs/preferences-dialog.c:2096
 msgid "Resize window on _zoom"
 msgstr "Resize window on _zoom"
 
-#: ../app/dialogs/preferences-dialog.c:2065
+#: ../app/dialogs/preferences-dialog.c:2099
 msgid "Resize window on image _size change"
 msgstr "Resize window on image _size change"
 
-#: ../app/dialogs/preferences-dialog.c:2071
+#: ../app/dialogs/preferences-dialog.c:2105
 msgid "Fit to window"
 msgstr "Fit to window"
 
-#: ../app/dialogs/preferences-dialog.c:2073
+#: ../app/dialogs/preferences-dialog.c:2107
 msgid "Initial zoom _ratio:"
 msgstr "Initial zoom _ratio:"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2077
+#: ../app/dialogs/preferences-dialog.c:2111
 msgid "Space Bar"
 msgstr "Space Bar"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2117
 msgid "_While space bar is pressed:"
 msgstr "_While space bar is pressed:"
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2087
+#: ../app/dialogs/preferences-dialog.c:2121
 msgid "Mouse Pointers"
 msgstr "Mouse Pointers"
 
-#: ../app/dialogs/preferences-dialog.c:2091
+#: ../app/dialogs/preferences-dialog.c:2125
 msgid "Show _brush outline"
 msgstr "Show _brush outline"
 
-#: ../app/dialogs/preferences-dialog.c:2094
+#: ../app/dialogs/preferences-dialog.c:2128
 msgid "Show pointer for paint _tools"
 msgstr "Show pointer for paint _tools"
 
-#: ../app/dialogs/preferences-dialog.c:2100
+#: ../app/dialogs/preferences-dialog.c:2134
 msgid "Pointer _mode:"
 msgstr "Pointer _mode:"
 
-#: ../app/dialogs/preferences-dialog.c:2103
+#: ../app/dialogs/preferences-dialog.c:2137
 msgid "Pointer re_ndering:"
 msgstr "Pointer re_ndering:"
 
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2149
 msgid "Image Window Appearance"
 msgstr "Image Window Appearance"
 
-#: ../app/dialogs/preferences-dialog.c:2126
+#: ../app/dialogs/preferences-dialog.c:2160
 msgid "Default Appearance in Normal Mode"
 msgstr "Default Appearance in Normal Mode"
 
-#: ../app/dialogs/preferences-dialog.c:2131
+#: ../app/dialogs/preferences-dialog.c:2165
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "Default Appearance in Fullscreen Mode"
 
-#: ../app/dialogs/preferences-dialog.c:2140
+#: ../app/dialogs/preferences-dialog.c:2174
 msgid "Image Title & Statusbar Format"
 msgstr "Image Title & Statusbar Format"
 
-#: ../app/dialogs/preferences-dialog.c:2143
+#: ../app/dialogs/preferences-dialog.c:2177
 msgid "Title & Status"
 msgstr "Title & Status"
 
-#: ../app/dialogs/preferences-dialog.c:2161
+#: ../app/dialogs/preferences-dialog.c:2195
 msgid "Current format"
 msgstr "Current format"
 
-#: ../app/dialogs/preferences-dialog.c:2162
+#: ../app/dialogs/preferences-dialog.c:2196
 msgid "Default format"
 msgstr "Default format"
 
-#: ../app/dialogs/preferences-dialog.c:2163
+#: ../app/dialogs/preferences-dialog.c:2197
 msgid "Show zoom percentage"
 msgstr "Show zoom percentage"
 
-#: ../app/dialogs/preferences-dialog.c:2164
+#: ../app/dialogs/preferences-dialog.c:2198
 msgid "Show zoom ratio"
 msgstr "Show zoom ratio"
 
-#: ../app/dialogs/preferences-dialog.c:2165
+#: ../app/dialogs/preferences-dialog.c:2199
 msgid "Show image size"
 msgstr "Show image size"
 
-#: ../app/dialogs/preferences-dialog.c:2178
+#: ../app/dialogs/preferences-dialog.c:2212
 msgid "Image Title Format"
 msgstr "Image Title Format"
 
-#: ../app/dialogs/preferences-dialog.c:2180
+#: ../app/dialogs/preferences-dialog.c:2214
 msgid "Image Statusbar Format"
 msgstr "Image Statusbar Format"
 
-#: ../app/dialogs/preferences-dialog.c:2265
+#: ../app/dialogs/preferences-dialog.c:2299
 msgid "Display"
 msgstr "Display"
 
-#: ../app/dialogs/preferences-dialog.c:2281
+#: ../app/dialogs/preferences-dialog.c:2315
 msgid "_Check style:"
 msgstr "_Check style:"
 
-#: ../app/dialogs/preferences-dialog.c:2284
+#: ../app/dialogs/preferences-dialog.c:2318
 msgid "Check _size:"
 msgstr "Check _size:"
 
-#: ../app/dialogs/preferences-dialog.c:2287
+#: ../app/dialogs/preferences-dialog.c:2321
 msgid "Monitor Resolution"
 msgstr "Monitor Resolution"
 
-#: ../app/dialogs/preferences-dialog.c:2291
-#: ../app/widgets/gimpcursorview.c:124 ../app/widgets/gimpgrideditor.c:261
-#: ../app/widgets/gimpgrideditor.c:293
+#: ../app/dialogs/preferences-dialog.c:2325
+#: ../app/widgets/gimpcursorview.c:124 ../app/widgets/gimpgrideditor.c:269
+#: ../app/widgets/gimpgrideditor.c:301
 msgid "Pixels"
 msgstr "Pixels"
 
-#: ../app/dialogs/preferences-dialog.c:2313
+#: ../app/dialogs/preferences-dialog.c:2347
 #: ../app/widgets/gimpimagepropview.c:476
 msgid "ppi"
 msgstr "ppi"
 
-#: ../app/dialogs/preferences-dialog.c:2329
+#: ../app/dialogs/preferences-dialog.c:2363
 #, c-format
 msgid "_Detect automatically (currently %d × %d ppi)"
 msgstr "_Detect automatically (currently %d × %d ppi)"
 
-#: ../app/dialogs/preferences-dialog.c:2349
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "_Enter manually"
 msgstr "_Enter manually"
 
-#: ../app/dialogs/preferences-dialog.c:2364
+#: ../app/dialogs/preferences-dialog.c:2398
 msgid "C_alibrate..."
 msgstr "C_alibrate..."
 
-#: ../app/dialogs/preferences-dialog.c:2387
+#: ../app/dialogs/preferences-dialog.c:2421
 msgid "Color Management"
 msgstr "Colour Management"
 
-#: ../app/dialogs/preferences-dialog.c:2407
+#: ../app/dialogs/preferences-dialog.c:2441
 msgid "_RGB profile:"
 msgstr "_RGB profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2408
+#: ../app/dialogs/preferences-dialog.c:2442
 msgid "Select RGB Color Profile"
 msgstr "Select RGB Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2409
+#: ../app/dialogs/preferences-dialog.c:2443
 msgid "_CMYK profile:"
 msgstr "_CMYK profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2410
+#: ../app/dialogs/preferences-dialog.c:2444
 msgid "Select CMYK Color Profile"
 msgstr "Select CMYK Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2411
+#: ../app/dialogs/preferences-dialog.c:2445
 msgid "_Monitor profile:"
 msgstr "_Monitor profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2412
+#: ../app/dialogs/preferences-dialog.c:2446
 msgid "Select Monitor Color Profile"
 msgstr "Select Monitor Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2413
+#: ../app/dialogs/preferences-dialog.c:2447
 msgid "_Print simulation profile:"
 msgstr "_Print simulation profile:"
 
-#: ../app/dialogs/preferences-dialog.c:2414
+#: ../app/dialogs/preferences-dialog.c:2448
 msgid "Select Printer Color Profile"
 msgstr "Select Printer Colour Profile"
 
-#: ../app/dialogs/preferences-dialog.c:2425
+#: ../app/dialogs/preferences-dialog.c:2459
 msgid "_Mode of operation:"
 msgstr "_Mode of operation:"
 
-#: ../app/dialogs/preferences-dialog.c:2455
+#: ../app/dialogs/preferences-dialog.c:2489
 msgid "_Try to use the system monitor profile"
 msgstr "_Try to use the system monitor profile"
 
-#: ../app/dialogs/preferences-dialog.c:2465
+#: ../app/dialogs/preferences-dialog.c:2499
 msgid "_Display rendering intent:"
 msgstr "_Display rendering intent:"
 
-#: ../app/dialogs/preferences-dialog.c:2474
+#: ../app/dialogs/preferences-dialog.c:2508
 msgid "_Softproof rendering intent:"
 msgstr "_Softproof rendering intent:"
 
-#: ../app/dialogs/preferences-dialog.c:2487
+#: ../app/dialogs/preferences-dialog.c:2521
 msgid "Mark out of gamut colors"
 msgstr "Mark out of gamut colours"
 
-#: ../app/dialogs/preferences-dialog.c:2492
+#: ../app/dialogs/preferences-dialog.c:2526
 msgid "Select Warning Color"
 msgstr "Select Warning Colour"
 
-#: ../app/dialogs/preferences-dialog.c:2505
+#: ../app/dialogs/preferences-dialog.c:2539
 msgid "File Open behaviour:"
 msgstr "File Open behaviour:"
 
-#: ../app/dialogs/preferences-dialog.c:2517
+#: ../app/dialogs/preferences-dialog.c:2551
 msgid "Input Devices"
 msgstr "Input Devices"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2527
+#: ../app/dialogs/preferences-dialog.c:2561
 msgid "Extended Input Devices"
 msgstr "Extended Input Devices"
 
-#: ../app/dialogs/preferences-dialog.c:2531
+#: ../app/dialogs/preferences-dialog.c:2565
 msgid "Configure E_xtended Input Devices..."
 msgstr "Configure E_xtended Input Devices..."
 
-#: ../app/dialogs/preferences-dialog.c:2538
+#: ../app/dialogs/preferences-dialog.c:2572
 msgid "_Save input device settings on exit"
 msgstr "_Save input device settings on exit"
 
-#: ../app/dialogs/preferences-dialog.c:2542
+#: ../app/dialogs/preferences-dialog.c:2576
 msgid "Save Input Device Settings _Now"
 msgstr "Save Input Device Settings _Now"
 
-#: ../app/dialogs/preferences-dialog.c:2549
+#: ../app/dialogs/preferences-dialog.c:2583
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "_Reset Saved Input Device Settings to Default Values"
 
-#: ../app/dialogs/preferences-dialog.c:2564
+#: ../app/dialogs/preferences-dialog.c:2598
 msgid "Additional Input Controllers"
 msgstr "Additional Input Controllers"
 
-#: ../app/dialogs/preferences-dialog.c:2567
+#: ../app/dialogs/preferences-dialog.c:2601
 msgid "Input Controllers"
 msgstr "Input Controllers"
 
-#: ../app/dialogs/preferences-dialog.c:2583
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Window Management"
 msgstr "Window Management"
 
-#: ../app/dialogs/preferences-dialog.c:2592
+#: ../app/dialogs/preferences-dialog.c:2626
 msgid "Window Manager Hints"
 msgstr "Window Manager Hints"
 
-#: ../app/dialogs/preferences-dialog.c:2598
+#: ../app/dialogs/preferences-dialog.c:2632
 msgid "Hint for the _toolbox:"
 msgstr "Hint for the _toolbox:"
 
-#: ../app/dialogs/preferences-dialog.c:2602
+#: ../app/dialogs/preferences-dialog.c:2636
 msgid "Hint for other _docks:"
 msgstr "Hint for other _docks:"
 
-#: ../app/dialogs/preferences-dialog.c:2607
+#: ../app/dialogs/preferences-dialog.c:2641
 msgid "Toolbox and other docks are transient to the active image window"
 msgstr "Toolbox and other docks are transient to the active image window"
 
-#: ../app/dialogs/preferences-dialog.c:2612
+#: ../app/dialogs/preferences-dialog.c:2646
 msgid "Focus"
 msgstr "Focus"
 
-#: ../app/dialogs/preferences-dialog.c:2616
+#: ../app/dialogs/preferences-dialog.c:2650
 msgid "Activate the _focused image"
 msgstr "Activate the _focused image"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2620
+#: ../app/dialogs/preferences-dialog.c:2654
 msgid "Window Positions"
 msgstr "Window Positions"
 
-#: ../app/dialogs/preferences-dialog.c:2623
+#: ../app/dialogs/preferences-dialog.c:2657
 msgid "_Save window positions on exit"
 msgstr "_Save window positions on exit"
 
-#: ../app/dialogs/preferences-dialog.c:2627
+#: ../app/dialogs/preferences-dialog.c:2661
 msgid "Save Window Positions _Now"
 msgstr "Save Window Positions _Now"
 
-#: ../app/dialogs/preferences-dialog.c:2634
+#: ../app/dialogs/preferences-dialog.c:2668
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "_Reset Saved Window Positions to Default Values"
 
-#: ../app/dialogs/preferences-dialog.c:2649
+#: ../app/dialogs/preferences-dialog.c:2683
 msgid "Folders"
 msgstr "Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2669
+#: ../app/dialogs/preferences-dialog.c:2703
 msgid "Temporary folder:"
 msgstr "Temporary folder:"
 
-#: ../app/dialogs/preferences-dialog.c:2670
+#: ../app/dialogs/preferences-dialog.c:2704
 msgid "Select Folder for Temporary Files"
 msgstr "Select Folder for Temporary Files"
 
-#: ../app/dialogs/preferences-dialog.c:2674
+#: ../app/dialogs/preferences-dialog.c:2708
 msgid "Swap folder:"
 msgstr "Swap folder:"
 
-#: ../app/dialogs/preferences-dialog.c:2675
+#: ../app/dialogs/preferences-dialog.c:2709
 msgid "Select Swap Folder"
 msgstr "Select Swap Folder"
 
-#: ../app/dialogs/preferences-dialog.c:2710
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Brush Folders"
 msgstr "Brush Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2712
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Select Brush Folders"
 msgstr "Select Brush Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2714
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Pattern Folders"
 msgstr "Pattern Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2716
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Select Pattern Folders"
 msgstr "Select Pattern Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2718
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Palette Folders"
 msgstr "Palette Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Select Palette Folders"
 msgstr "Select Palette Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradient Folders"
 msgstr "Gradient Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2724
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Select Gradient Folders"
 msgstr "Select Gradient Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Font Folders"
 msgstr "Font Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Select Font Folders"
 msgstr "Select Font Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-In Folders"
 msgstr "Plug-In Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Select Plug-In Folders"
 msgstr "Select Plug-In Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Scripts"
 msgstr "Scripts"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Script-Fu Folders"
 msgstr "Script-Fu Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2770
 msgid "Select Script-Fu Folders"
 msgstr "Select Script-Fu Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2772
 msgid "Module Folders"
 msgstr "Module Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2774
 msgid "Select Module Folders"
 msgstr "Select Module Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreters"
 msgstr "Interpreters"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreter Folders"
 msgstr "Interpreter Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2778
 msgid "Select Interpreter Folders"
 msgstr "Select Interpreter Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment Folders"
 msgstr "Environment Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2782
 msgid "Select Environment Folders"
 msgstr "Select Environment Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Themes"
 msgstr "Themes"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Theme Folders"
 msgstr "Theme Folders"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2786
 msgid "Select Theme Folders"
 msgstr "Select Theme Folders"
 
@@ -8218,45 +8215,54 @@ msgstr ""
 msgid "Choose Stroke Style"
 msgstr "Choose Stroke Style"
 
-#: ../app/dialogs/stroke-dialog.c:217
+#: ../app/dialogs/stroke-dialog.c:225
 msgid "Paint tool:"
 msgstr "Paint tool:"
 
-#: ../app/dialogs/tips-dialog.c:90
-msgid "Your GIMP tips file appears to be missing!"
-msgstr "Your GIMP tips file appears to be missing!"
+#: ../app/dialogs/stroke-dialog.c:246
+msgid "_Emulate brush dynamics"
+msgstr "_Emulate brush dynamics"
 
-#: ../app/dialogs/tips-dialog.c:92
+#: ../app/dialogs/tips-dialog.c:89
+msgid "The GIMP tips file is empty!"
+msgstr "The GIMP tips file is empty!"
+
+#: ../app/dialogs/tips-dialog.c:93
+msgid "The GIMP tips file appears to be missing!"
+msgstr "The GIMP tips file appears to be missing!"
+
+#: ../app/dialogs/tips-dialog.c:95
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
 msgstr "There should be a file called '%s'. Please check your installation."
 
-#: ../app/dialogs/tips-dialog.c:98
+#: ../app/dialogs/tips-dialog.c:101
 msgid "The GIMP tips file could not be parsed!"
 msgstr "The GIMP tips file could not be parsed!"
 
-#: ../app/dialogs/tips-dialog.c:127
+#: ../app/dialogs/tips-dialog.c:129
 msgid "GIMP Tip of the Day"
 msgstr "GIMP Tip of the Day"
 
-#: ../app/dialogs/tips-dialog.c:133
+#: ../app/dialogs/tips-dialog.c:135
 msgid "_Previous Tip"
 msgstr "_Previous Tip"
 
-#: ../app/dialogs/tips-dialog.c:139
+#: ../app/dialogs/tips-dialog.c:141
 msgid "_Next Tip"
 msgstr "_Next Tip"
 
-#: ../app/dialogs/tips-dialog.c:205
-msgid "Show tip next time GIMP starts"
-msgstr "Show tip next time GIMP starts"
+#. a link to the related section in the user manual
+#: ../app/dialogs/tips-dialog.c:194
+msgid "Learn more"
+msgstr "Learn more"
 
 #. This is a special string to specify the language identifier to
 #. look for in the gimp-tips.xml file. Please translate the C in it
 #. according to the name of the po file used for gimp-tips.xml.
 #. E.g. for the german translation, that would be "tips-locale:de".
 #.
-#: ../app/dialogs/tips-parser.c:189
+#: ../app/dialogs/tips-parser.c:188
 msgid "tips-locale:C"
 msgstr "tips-locale:en_GB"
 
@@ -8325,75 +8331,80 @@ msgstr "Tool icon with crosshair"
 msgid "Crosshair only"
 msgstr "Crosshair only"
 
-#: ../app/display/display-enums.c:55
+#: ../app/display/display-enums.c:85
 msgid "From theme"
 msgstr "From theme"
 
-#: ../app/display/display-enums.c:56
+#: ../app/display/display-enums.c:86
 msgid "Light check color"
 msgstr "Light check colour"
 
-#: ../app/display/display-enums.c:57
+#: ../app/display/display-enums.c:87
 msgid "Dark check color"
 msgstr "Dark check colour"
 
-#: ../app/display/display-enums.c:58
+#: ../app/display/display-enums.c:88
 msgid "Custom color"
 msgstr "Custom colour"
 
-#: ../app/display/display-enums.c:86
+#: ../app/display/display-enums.c:116
 msgid "No action"
 msgstr "No action"
 
-#: ../app/display/display-enums.c:87
+#: ../app/display/display-enums.c:117
 msgid "Pan view"
 msgstr "Pan view"
 
-#: ../app/display/display-enums.c:88
+#: ../app/display/display-enums.c:118
 msgid "Switch to Move tool"
 msgstr "Switch to Move tool"
 
-#: ../app/display/display-enums.c:115
+#: ../app/display/display-enums.c:145
 msgid "quality|Low"
 msgstr "quality|Low"
 
-#: ../app/display/display-enums.c:116
+#: ../app/display/display-enums.c:146
 msgid "quality|High"
 msgstr "quality|High"
 
-#: ../app/display/gimpdisplay-handlers.c:155
+#: ../app/display/gimpdisplay-handlers.c:160
 #, c-format
 msgid "Image saved to '%s'"
 msgstr "Image saved to '%s'"
 
-#: ../app/display/gimpdisplayshell.c:895
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "Access the image menu"
 
-#: ../app/display/gimpdisplayshell.c:1004
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "Zoom image when window size changes"
 
-#: ../app/display/gimpdisplayshell.c:1054
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "Navigate the image display"
 
-#: ../app/display/gimpdisplayshell-close.c:125
-#: ../app/display/gimpdisplayshell-close.c:202
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375 ../app/widgets/gimptoolbox.c:222
+msgid "Drop image files here to open them"
+msgstr "Drop image files here to open them"
+
+#: ../app/display/gimpdisplayshell-close.c:147
+#: ../app/display/gimpdisplayshell-close.c:224
 #, c-format
 msgid "Close %s"
 msgstr "Close %s"
 
-#: ../app/display/gimpdisplayshell-close.c:137
+#: ../app/display/gimpdisplayshell-close.c:159
 msgid "Do_n't Save"
 msgstr "Do_n't Save"
 
-#: ../app/display/gimpdisplayshell-close.c:209
+#: ../app/display/gimpdisplayshell-close.c:231
 #, c-format
 msgid "Save the changes to image '%s' before closing?"
 msgstr "Save the changes to image '%s' before closing?"
 
-#: ../app/display/gimpdisplayshell-close.c:232
+#: ../app/display/gimpdisplayshell-close.c:254
 #, c-format
 msgid "If you don't save the image, changes from the last hour will be lost."
 msgid_plural ""
@@ -8403,7 +8414,7 @@ msgstr[0] ""
 msgstr[1] ""
 "If you don't save the image, changes from the last %d hours will be lost."
 
-#: ../app/display/gimpdisplayshell-close.c:242
+#: ../app/display/gimpdisplayshell-close.c:264
 #, c-format
 msgid ""
 "If you don't save the image, changes from the last hour and %d minute will "
@@ -8418,7 +8429,7 @@ msgstr[1] ""
 "If you don't save the image, changes from the last hour and %d minutes will "
 "be lost."
 
-#: ../app/display/gimpdisplayshell-close.c:253
+#: ../app/display/gimpdisplayshell-close.c:275
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
 msgid_plural ""
@@ -8428,31 +8439,31 @@ msgstr[0] ""
 msgstr[1] ""
 "If you don't save the image, changes from the last %d minutes will be lost."
 
-#: ../app/display/gimpdisplayshell-dnd.c:209
-#: ../app/display/gimpdisplayshell-dnd.c:491
-#: ../app/display/gimpdisplayshell-dnd.c:541
+#: ../app/display/gimpdisplayshell-dnd.c:255
+#: ../app/display/gimpdisplayshell-dnd.c:587
+#: ../app/display/gimpdisplayshell-dnd.c:658
 msgid "Drop New Layer"
 msgstr "Drop New Layer"
 
-#: ../app/display/gimpdisplayshell-dnd.c:254
+#: ../app/display/gimpdisplayshell-dnd.c:301
 msgid "Drop New Path"
 msgstr "Drop New Path"
 
-#: ../app/display/gimpdisplayshell-dnd.c:433
-#: ../app/widgets/gimplayertreeview.c:720
+#: ../app/display/gimpdisplayshell-dnd.c:497
+#: ../app/widgets/gimplayertreeview.c:719
 msgid "Drop layers"
 msgstr "Drop layers"
 
-#: ../app/display/gimpdisplayshell-dnd.c:529
-#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:361
+#: ../app/display/gimpdisplayshell-dnd.c:648
+#: ../app/widgets/gimplayertreeview.c:801 ../app/widgets/gimptoolbox-dnd.c:361
 msgid "Dropped Buffer"
 msgstr "Dropped Buffer"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:78
+#: ../app/display/gimpdisplayshell-filter-dialog.c:75
 msgid "Color Display Filters"
 msgstr "Colour Display Filters"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:81
+#: ../app/display/gimpdisplayshell-filter-dialog.c:78
 msgid "Configure Color Display Filters"
 msgstr "Configure Colour Display Filters"
 
@@ -8460,63 +8471,60 @@ msgstr "Configure Colour Display Filters"
 msgid "Layer Select"
 msgstr "Layer Select"
 
-#: ../app/display/gimpdisplayshell-scale.c:616
+#: ../app/display/gimpdisplayshell-scale-dialog.c:114
 msgid "Zoom Ratio"
 msgstr "Zoom Ratio"
 
-#: ../app/display/gimpdisplayshell-scale.c:618
+#: ../app/display/gimpdisplayshell-scale-dialog.c:116
 msgid "Select Zoom Ratio"
 msgstr "Select Zoom Ratio"
 
-#: ../app/display/gimpdisplayshell-scale.c:661
+#: ../app/display/gimpdisplayshell-scale-dialog.c:159
 msgid "Zoom ratio:"
 msgstr "Zoom ratio:"
 
-#: ../app/display/gimpdisplayshell-scale.c:686
+#: ../app/display/gimpdisplayshell-scale-dialog.c:184
 msgid "Zoom:"
 msgstr "Zoom:"
 
-#: ../app/display/gimpdisplayshell-title.c:226
+#: ../app/display/gimpdisplayshell-title.c:233
 msgid "RGB-empty"
 msgstr "RGB-empty"
 
-#: ../app/display/gimpdisplayshell-title.c:229
+#: ../app/display/gimpdisplayshell-title.c:236
 msgid "grayscale-empty"
 msgstr "greyscale-empty"
 
-#: ../app/display/gimpdisplayshell-title.c:229
+#: ../app/display/gimpdisplayshell-title.c:236
 msgid "grayscale"
 msgstr "greyscale"
 
-#: ../app/display/gimpdisplayshell-title.c:232
+#: ../app/display/gimpdisplayshell-title.c:239
 msgid "indexed-empty"
 msgstr "indexed-empty"
 
-#: ../app/display/gimpdisplayshell-title.c:232
+#: ../app/display/gimpdisplayshell-title.c:239
 msgid "indexed"
 msgstr "indexed"
 
-#: ../app/display/gimpdisplayshell-title.c:286
+#: ../app/display/gimpdisplayshell-title.c:293
 msgid "(modified)"
 msgstr "(modified)"
 
-#: ../app/display/gimpdisplayshell-title.c:291
+#: ../app/display/gimpdisplayshell-title.c:298
 msgid "(clean)"
 msgstr "(clean)"
 
-#: ../app/display/gimpdisplayshell-title.c:330
-#: ../app/display/gimpdisplayshell-title.c:342
-#: ../app/widgets/gimpactiongroup.c:803
+#: ../app/display/gimpdisplayshell-title.c:346
+#: ../app/display/gimpdisplayshell-title.c:359
+#: ../app/widgets/gimpactiongroup.c:805
 msgid "(none)"
 msgstr "(none)"
 
-#: ../app/display/gimpstatusbar.c:223
-msgid "Cancel"
-msgstr "Cancel"
-
-#: ../app/display/gimpstatusbar.c:491
-msgid "Other..."
-msgstr "Other..."
+#: ../app/display/gimpstatusbar.c:346
+#, c-format
+msgid "Cancel %s"
+msgstr "Cancel %s"
 
 #: ../app/file/file-open.c:131 ../app/file/file-save.c:111
 #, c-format
@@ -8533,17 +8541,17 @@ msgstr "%s plug-in returned SUCCESS but did not return an image"
 msgid "%s plug-In could not open image"
 msgstr "%s plug-In could not open image"
 
-#: ../app/file/file-open.c:458
+#: ../app/file/file-open.c:455
 #, c-format
 msgid "Image doesn't contain any layers"
 msgstr "Image doesn't contain any layers"
 
-#: ../app/file/file-open.c:507
+#: ../app/file/file-open.c:505
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "Opening '%s' failed: %s"
 
-#: ../app/file/file-open.c:615
+#: ../app/file/file-open.c:613
 msgid ""
 "Color management has been disabled. It can be enabled again in the "
 "Preferences dialog."
@@ -8556,7 +8564,7 @@ msgstr ""
 msgid "Unknown file type"
 msgstr "Unknown file type"
 
-#: ../app/file/file-save.c:195
+#: ../app/file/file-save.c:192
 #, c-format
 msgid "%s plug-in could not save image"
 msgstr "%s plug-in could not save image"
@@ -8571,22 +8579,27 @@ msgstr "'%s:' is not a valid URI scheme"
 msgid "Invalid character sequence in URI"
 msgstr "Invalid character sequence in URI"
 
-#: ../app/gegl/gimpcurvesconfig.c:347
+#: ../app/gegl/gimpcurvesconfig.c:384
 #, c-format
 msgid "not a GIMP Curves file"
 msgstr "not a GIMP Curves file"
 
-#: ../app/gegl/gimpcurvesconfig.c:361 ../app/gegl/gimplevelsconfig.c:596
+#: ../app/gegl/gimpcurvesconfig.c:398 ../app/gegl/gimplevelsconfig.c:711
 #, c-format
 msgid "parse error"
 msgstr "parse error"
 
-#: ../app/gegl/gimplevelsconfig.c:549
+#: ../app/gegl/gimplevelsconfig.c:664
 #, c-format
 msgid "not a GIMP Levels file"
 msgstr "not a GIMP Levels file"
 
-#: ../app/gui/splash.c:117
+#. initialize the document history
+#: ../app/gui/gui.c:426
+msgid "Documents"
+msgstr "Documents"
+
+#: ../app/gui/splash.c:116
 msgid "GIMP Startup"
 msgstr "GIMP Startup"
 
@@ -8594,7 +8607,7 @@ msgstr "GIMP Startup"
 msgid "Airbrush"
 msgstr "Airbrush"
 
-#: ../app/paint/gimpbrushcore.c:354
+#: ../app/paint/gimpbrushcore.c:353
 #, c-format
 msgid "No brushes available for use with this tool."
 msgstr "No brushes available for use with this tool."
@@ -8608,7 +8621,7 @@ msgstr "Clone"
 msgid "No patterns available for use with this tool."
 msgstr "No patterns available for use with this tool."
 
-#: ../app/paint/gimpconvolve.c:75
+#: ../app/paint/gimpconvolve.c:77
 msgid "Convolve"
 msgstr "Convolve"
 
@@ -8633,16 +8646,21 @@ msgstr "Healing does not operate on indexed layers."
 msgid "Paintbrush"
 msgstr "Paintbrush"
 
+#: ../app/paint/gimppaintcore-stroke.c:332
+#, c-format
+msgid "Not enough points to stroke"
+msgstr "Not enough points to stroke"
+
 #: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
 msgid "Pencil"
 msgstr "Pencil"
 
-#: ../app/paint/gimpperspectiveclone.c:95 ../app/paint/paint-enums.c:52
-#: ../app/tools/gimpperspectiveclonetool.c:127
+#: ../app/paint/gimpperspectiveclone.c:97 ../app/paint/paint-enums.c:52
+#: ../app/tools/gimpperspectiveclonetool.c:126
 msgid "Perspective Clone"
 msgstr "Perspective Clone"
 
-#: ../app/paint/gimpperspectiveclone.c:160
+#: ../app/paint/gimpperspectiveclone.c:162
 #, c-format
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "Perspective Clone does not operate on indexed layers."
@@ -8680,48 +8698,48 @@ msgstr "Blur"
 msgid "Sharpen"
 msgstr "Sharpen"
 
-#: ../app/pdb/channel_cmds.c:180
+#: ../app/pdb/channel-cmds.c:183
 msgid "Combine Masks"
 msgstr "Combine Masks"
 
-#: ../app/pdb/drawable_transform_cmds.c:307
-#: ../app/pdb/drawable_transform_cmds.c:391
-#: ../app/pdb/transform_tools_cmds.c:145 ../app/tools/gimpperspectivetool.c:67
+#: ../app/pdb/drawable-transform-cmds.c:310
+#: ../app/pdb/drawable-transform-cmds.c:395
+#: ../app/pdb/transform-tools-cmds.c:146 ../app/tools/gimpperspectivetool.c:69
 msgid "Perspective"
 msgstr "Perspective"
 
-#: ../app/pdb/drawable_transform_cmds.c:822
-#: ../app/pdb/drawable_transform_cmds.c:893
-#: ../app/pdb/transform_tools_cmds.c:358 ../app/tools/gimpsheartool.c:110
+#: ../app/pdb/drawable-transform-cmds.c:832
+#: ../app/pdb/drawable-transform-cmds.c:904
+#: ../app/pdb/transform-tools-cmds.c:362 ../app/tools/gimpsheartool.c:111
 msgid "Shearing"
 msgstr "Shearing"
 
-#: ../app/pdb/drawable_transform_cmds.c:977
-#: ../app/pdb/transform_tools_cmds.c:433
+#: ../app/pdb/drawable-transform-cmds.c:989
+#: ../app/pdb/transform-tools-cmds.c:438
 msgid "2D Transform"
 msgstr "2D Transform"
 
-#: ../app/pdb/drawable_transform_cmds.c:1059
-#: ../app/pdb/drawable_transform_cmds.c:1151
-#: ../app/pdb/drawable_transform_cmds.c:1241
+#: ../app/pdb/drawable-transform-cmds.c:1072
+#: ../app/pdb/drawable-transform-cmds.c:1165
+#: ../app/pdb/drawable-transform-cmds.c:1256
 msgid "2D Transforming"
 msgstr "2D Transforming"
 
-#: ../app/pdb/edit_cmds.c:695 ../app/tools/gimpblendtool.c:224
+#: ../app/pdb/edit-cmds.c:709 ../app/tools/gimpblendtool.c:225
 msgid "Blending"
 msgstr "Blending"
 
-#: ../app/pdb/floating_sel_cmds.c:63
+#: ../app/pdb/floating-sel-cmds.c:63
 #, c-format
 msgid "Cannot remove this layer because it is not a floating selection."
 msgstr "Cannot remove this layer because it is not a floating selection."
 
-#: ../app/pdb/floating_sel_cmds.c:94
+#: ../app/pdb/floating-sel-cmds.c:95
 #, c-format
 msgid "Cannot anchor this layer because it is not a floating selection."
 msgstr "Cannot anchor this layer because it is not a floating selection."
 
-#: ../app/pdb/floating_sel_cmds.c:125
+#: ../app/pdb/floating-sel-cmds.c:127
 #, c-format
 msgid ""
 "Cannot convert this layer to a normal layer because it is not a floating "
@@ -8730,141 +8748,164 @@ msgstr ""
 "Cannot convert this layer to a normal layer because it is not a floating "
 "selection."
 
-#: ../app/pdb/floating_sel_cmds.c:184
+#: ../app/pdb/floating-sel-cmds.c:188
 #, c-format
 msgid "Cannot rigor this layer because it is not a floating selection."
 msgstr "Cannot rigor this layer because it is not a floating selection."
 
-#: ../app/pdb/floating_sel_cmds.c:217
+#: ../app/pdb/floating-sel-cmds.c:222
 #, c-format
 msgid "Cannot relax this layer because it is not a floating selection."
 msgstr "Cannot relax this layer because it is not a floating selection."
 
-#: ../app/pdb/gimppdb-query.c:300
+#: ../app/pdb/gimppdb-query.c:300 ../app/pdb/gimppdb.c:307
+#: ../app/pdb/gimppdb.c:377
 #, c-format
 msgid "Procedure '%s' not found"
 msgstr "Procedure '%s' not found"
 
-#: ../app/pdb/gimppdb-utils.c:55
+#: ../app/pdb/gimppdb-utils.c:61
 #, c-format
 msgid "Invalid empty brush name"
 msgstr "Invalid empty brush name"
 
-#: ../app/pdb/gimppdb-utils.c:65
+#: ../app/pdb/gimppdb-utils.c:71
 #, c-format
 msgid "Brush '%s' not found"
 msgstr "Brush '%s' not found"
 
-#: ../app/pdb/gimppdb-utils.c:70
+#: ../app/pdb/gimppdb-utils.c:76
 #, c-format
 msgid "Brush '%s' is not editable"
 msgstr "Brush '%s' is not editable"
 
-#: ../app/pdb/gimppdb-utils.c:96
+#: ../app/pdb/gimppdb-utils.c:102
 #, c-format
 msgid "Brush '%s' is not a generated brush"
 msgstr "Brush '%s' is not a generated brush"
 
-#: ../app/pdb/gimppdb-utils.c:116
+#: ../app/pdb/gimppdb-utils.c:122
 #, c-format
 msgid "Invalid empty pattern name"
 msgstr "Invalid empty pattern name"
 
-#: ../app/pdb/gimppdb-utils.c:126
+#: ../app/pdb/gimppdb-utils.c:132
 #, c-format
 msgid "Pattern '%s' not found"
 msgstr "Pattern '%s' not found"
 
-#: ../app/pdb/gimppdb-utils.c:146
+#: ../app/pdb/gimppdb-utils.c:152
 #, c-format
 msgid "Invalid empty gradient name"
 msgstr "Invalid empty gradient name"
 
-#: ../app/pdb/gimppdb-utils.c:156
+#: ../app/pdb/gimppdb-utils.c:162
 #, c-format
 msgid "Gradient '%s' not found"
 msgstr "Gradient '%s' not found"
 
-#: ../app/pdb/gimppdb-utils.c:161
+#: ../app/pdb/gimppdb-utils.c:167
 #, c-format
 msgid "Gradient '%s' is not editable"
 msgstr "Gradient '%s' is not editable"
 
-#: ../app/pdb/gimppdb-utils.c:182
+#: ../app/pdb/gimppdb-utils.c:188
 #, c-format
 msgid "Invalid empty palette name"
 msgstr "Invalid empty palette name"
 
-#: ../app/pdb/gimppdb-utils.c:192
+#: ../app/pdb/gimppdb-utils.c:198
 #, c-format
 msgid "Palette '%s' not found"
 msgstr "Palette '%s' not found"
 
-#: ../app/pdb/gimppdb-utils.c:197
+#: ../app/pdb/gimppdb-utils.c:203
 #, c-format
 msgid "Palette '%s' is not editable"
 msgstr "Palette '%s' is not editable"
 
-#: ../app/pdb/gimppdb-utils.c:217
+#: ../app/pdb/gimppdb-utils.c:223
 #, c-format
 msgid "Invalid empty font name"
 msgstr "Invalid empty font name"
 
-#: ../app/pdb/gimppdb-utils.c:227
+#: ../app/pdb/gimppdb-utils.c:233
 #, c-format
 msgid "Font '%s' not found"
 msgstr "Font '%s' not found"
 
-#: ../app/pdb/gimppdb-utils.c:246
+#: ../app/pdb/gimppdb-utils.c:252
 #, c-format
 msgid "Invalid empty buffer name"
 msgstr "Invalid empty buffer name"
 
-#: ../app/pdb/gimppdb-utils.c:256
+#: ../app/pdb/gimppdb-utils.c:262
 #, c-format
 msgid "Named buffer '%s' not found"
 msgstr "Named buffer '%s' not found"
 
-#: ../app/pdb/gimppdb-utils.c:275
+#: ../app/pdb/gimppdb-utils.c:281
 #, c-format
 msgid "Invalid empty paint method name"
 msgstr "Invalid empty paint method name"
 
-#: ../app/pdb/gimppdb-utils.c:285
+#: ../app/pdb/gimppdb-utils.c:291
 #, c-format
 msgid "Paint method '%s' does not exist"
 msgstr "Paint method '%s' does not exist"
 
-#: ../app/pdb/gimppdb-utils.c:301
+#: ../app/pdb/gimppdb-utils.c:307
 #, c-format
-msgid "Item '%s' (%d) cannot be used because it has not been added to an image"
+msgid ""
+"Item '%s' (%d) can not be used because it has not been added to an image"
 msgstr ""
-"Item '%s' (%d) cannot be used because it has not been added to an image"
+"Item '%s' (%d) can not be used because it has not been added to an image"
 
-#: ../app/pdb/gimppdb-utils.c:327
+#: ../app/pdb/gimppdb-utils.c:329
+#, c-format
+msgid "Item '%s' (%d) has already been added to an image"
+msgstr "Item '%s' (%d) has already been added to an image"
+
+#: ../app/pdb/gimppdb-utils.c:337
+#, c-format
+msgid "Trying to add item '%s' (%d) to wrong image"
+msgstr "Trying to add item '%s' (%d) to wrong image"
+
+#: ../app/pdb/gimppdb-utils.c:356
+#, c-format
+msgid "Layer '%s' (%d) can not be used because it is not a text layer"
+msgstr "Layer '%s' (%d) can not be used because it is not a text layer"
+
+#: ../app/pdb/gimppdb-utils.c:401
+#, c-format
+msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
+msgstr "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
+
+#: ../app/pdb/gimppdb-utils.c:430
+#, c-format
+msgid "Image '%s' (%d) is already of type '%s'"
+msgstr "Image '%s' (%d) is already of type '%s'"
+
+#: ../app/pdb/gimppdb-utils.c:455
 #, c-format
 msgid "Vectors object %d does not contain stroke with ID %d"
 msgstr "Vectors object %d does not contain stroke with ID %d"
 
-#: ../app/pdb/gimppdb.c:306 ../app/pdb/gimppdb.c:376
+#: ../app/pdb/gimppdb.c:411
 #, c-format
 msgid ""
-"PDB calling error:\n"
-"Procedure '%s' not found"
+"Procedure '%s' has been called with a wrong type for argument #%d. Expected %"
+"s, got %s."
 msgstr ""
-"PDB calling error:\n"
-"Procedure '%s' not found"
+"Procedure '%s' has been called with a wrong type for argument #%d. Expected %"
+"s, got %s."
 
-#: ../app/pdb/gimppdb.c:410
+#: ../app/pdb/gimpprocedure.c:361 ../app/plug-in/gimppluginprocframe.c:209
 #, c-format
-msgid ""
-"PDB calling error for procedure '%s':\n"
-"Argument #%d type mismatch (expected %s, got %s)"
-msgstr ""
-"PDB calling error for procedure '%s':\n"
-"Argument #%d type mismatch (expected %s, got %s)"
+msgid "Procedure '%s' returned no return values"
+msgstr "Procedure '%s' returned no return values"
 
-#: ../app/pdb/gimpprocedure.c:515
+#: ../app/pdb/gimpprocedure.c:585
 #, c-format
 msgid ""
 "Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
@@ -8873,7 +8914,7 @@ msgstr ""
 "Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
 "Expected %s, got %s."
 
-#: ../app/pdb/gimpprocedure.c:526
+#: ../app/pdb/gimpprocedure.c:597
 #, c-format
 msgid ""
 "Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
@@ -8882,7 +8923,7 @@ msgstr ""
 "Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
 "d). Expected %s, got %s."
 
-#: ../app/pdb/gimpprocedure.c:558
+#: ../app/pdb/gimpprocedure.c:629
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -8891,7 +8932,7 @@ msgstr ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
 "in is trying to work on a layer that doesn't exist any longer."
 
-#: ../app/pdb/gimpprocedure.c:570
+#: ../app/pdb/gimpprocedure.c:641
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -8900,7 +8941,7 @@ msgstr ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
 "likely a plug-in is trying to work on a layer that doesn't exist any longer."
 
-#: ../app/pdb/gimpprocedure.c:586
+#: ../app/pdb/gimpprocedure.c:657
 #, c-format
 msgid ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
@@ -8909,7 +8950,7 @@ msgstr ""
 "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
 "in is trying to work on an image that doesn't exist any longer."
 
-#: ../app/pdb/gimpprocedure.c:598
+#: ../app/pdb/gimpprocedure.c:669
 #, c-format
 msgid ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
@@ -8918,7 +8959,7 @@ msgstr ""
 "Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
 "likely a plug-in is trying to work on an image that doesn't exist any longer."
 
-#: ../app/pdb/gimpprocedure.c:618
+#: ../app/pdb/gimpprocedure.c:689
 #, c-format
 msgid ""
 "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
@@ -8927,7 +8968,7 @@ msgstr ""
 "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
 "is out of range."
 
-#: ../app/pdb/gimpprocedure.c:631
+#: ../app/pdb/gimpprocedure.c:702
 #, c-format
 msgid ""
 "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %"
@@ -8936,17 +8977,32 @@ msgstr ""
 "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %"
 "s). This value is out of range."
 
-#: ../app/pdb/image_cmds.c:2131
+#: ../app/pdb/image-cmds.c:2268
 #, c-format
 msgid ""
 "Image resolution is out of bounds, using the default resolution instead."
 msgstr ""
 "Image resolution is out of bounds, using the default resolution instead."
 
-#: ../app/pdb/selection_tools_cmds.c:215 ../app/tools/gimpfreeselecttool.c:97
+#: ../app/pdb/selection-tools-cmds.c:218 ../app/tools/gimpfreeselecttool.c:197
 msgid "Free Select"
 msgstr "Free Select"
 
+#: ../app/pdb/text-layer-cmds.c:90
+#, c-format
+msgid "Failed to create text layer"
+msgstr "Failed to create text layer"
+
+#: ../app/pdb/text-layer-cmds.c:163 ../app/pdb/text-layer-cmds.c:235
+#: ../app/pdb/text-layer-cmds.c:314 ../app/pdb/text-layer-cmds.c:394
+#: ../app/pdb/text-layer-cmds.c:467 ../app/pdb/text-layer-cmds.c:539
+#: ../app/pdb/text-layer-cmds.c:611 ../app/pdb/text-layer-cmds.c:683
+#: ../app/pdb/text-layer-cmds.c:755 ../app/pdb/text-layer-cmds.c:825
+#: ../app/pdb/text-layer-cmds.c:897 ../app/pdb/text-layer-cmds.c:969
+#: ../app/pdb/text-layer-cmds.c:1041
+msgid "Set text layer attribute"
+msgstr "Set text layer attribute"
+
 #: ../app/plug-in/gimpenvirontable.c:282
 #, c-format
 msgid "Empty variable name in environment file %s"
@@ -8962,21 +9018,34 @@ msgstr "Illegal variable name in environment file %s: %s"
 msgid "Bad interpreter referenced in interpreter file %s: %s"
 msgstr "Bad interpreter referenced in interpreter file %s: %s"
 
-#: ../app/plug-in/gimpinterpreterdb.c:322
+#: ../app/plug-in/gimpinterpreterdb.c:323
 #, c-format
 msgid "Bad binary format string in interpreter file %s"
 msgstr "Bad binary format string in interpreter file %s"
 
-#: ../app/plug-in/gimpplugin-message.c:451
+#: ../app/plug-in/gimpplugin-message.c:423
 #, c-format
 msgid ""
-"PDB calling error for procedure '%s':\n"
+"Calling error for procedure '%s':\n"
 "%s"
 msgstr ""
-"PDB calling error for procedure '%s':\n"
+"Calling error for procedure '%s':\n"
 "%s"
 
-#: ../app/plug-in/gimpplugin.c:635
+#: ../app/plug-in/gimpplugin-message.c:432
+#, c-format
+msgid ""
+"Execution error for procedure '%s':\n"
+"%s"
+msgstr ""
+"Execution error for procedure '%s':\n"
+"%s"
+
+#: ../app/plug-in/gimpplugin-progress.c:330
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#: ../app/plug-in/gimpplugin.c:639
 #, c-format
 msgid ""
 "Plug-in crashed: \"%s\"\n"
@@ -8991,6 +9060,13 @@ msgstr ""
 "The dying plug-in may have messed up GIMP's internal state. You may want to "
 "save your images and restart GIMP to be on the safe side."
 
+#: ../app/plug-in/gimppluginmanager-call.c:173
+#: ../app/plug-in/gimppluginmanager-call.c:223
+#: ../app/plug-in/gimppluginmanager-call.c:321
+#, c-format
+msgid "Failed to run plug-in \"%s\""
+msgstr "Failed to run plug-in \"%s\""
+
 #: ../app/plug-in/gimppluginmanager-restore.c:222
 msgid "Searching Plug-Ins"
 msgstr "Searching Plug-Ins"
@@ -9019,6 +9095,24 @@ msgstr "Plug-In Interpreters"
 msgid "Plug-In Environment"
 msgstr "Plug-In Environment"
 
+#: ../app/plug-in/gimppluginprocedure.c:989
+#, c-format
+msgid ""
+"Calling error for '%s':\n"
+"%s"
+msgstr ""
+"Calling error for '%s':\n"
+"%s"
+
+#: ../app/plug-in/gimppluginprocedure.c:1001
+#, c-format
+msgid ""
+"Execution error for '%s':\n"
+"%s"
+msgstr ""
+"Execution error for '%s':\n"
+"%s"
+
 #: ../app/plug-in/plug-in-icc-profile.c:113
 #: ../app/plug-in/plug-in-icc-profile.c:188
 #: ../app/plug-in/plug-in-icc-profile.c:247
@@ -9048,22 +9142,6 @@ msgstr "invalid value '%s' for icon type"
 msgid "invalid value '%ld' for icon type"
 msgstr "invalid value '%ld' for icon type"
 
-#: ../app/text/text-enums.c:81
-msgid "Left justified"
-msgstr "Left justified"
-
-#: ../app/text/text-enums.c:82
-msgid "Right justified"
-msgstr "Right justified"
-
-#: ../app/text/text-enums.c:83
-msgid "Centered"
-msgstr "Centred"
-
-#: ../app/text/text-enums.c:84
-msgid "Filled"
-msgstr "Filled"
-
 #. This is a so-called pangram; it's supposed to
 #. contain all characters found in the alphabet.
 #: ../app/text/gimpfont.c:45
@@ -9074,7 +9152,7 @@ msgstr ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 
-#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:706
+#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:879
 msgid "Add Text Layer"
 msgstr "Add Text Layer"
 
@@ -9137,7 +9215,7 @@ msgstr ""
 "Some text properties may be wrong. Unless you want to edit the text layer, "
 "you don't need to worry about this."
 
-#: ../app/tools/gimp-tools.c:325
+#: ../app/tools/gimp-tools.c:327
 msgid ""
 "This tool has\n"
 "no options."
@@ -9158,11 +9236,11 @@ msgstr "_Airbrush"
 msgid "Rate:"
 msgstr "Rate:"
 
-#: ../app/tools/gimpairbrushtool.c:98
+#: ../app/tools/gimpairbrushtool.c:98 ../app/tools/gimppaintoptions-gui.c:198
 msgid "Pressure:"
 msgstr "Pressure:"
 
-#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:752
+#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:766
 msgid "Align"
 msgstr "Align"
 
@@ -9174,167 +9252,184 @@ msgstr "Alignment Tool: Align or arrange layers and other objects"
 msgid "_Align"
 msgstr "_Align"
 
-#: ../app/tools/gimpaligntool.c:585
+#: ../app/tools/gimpaligntool.c:599
 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
 msgstr "Click on a layer, path or guide, or Click-Drag to pick several layers"
 
-#: ../app/tools/gimpaligntool.c:594
+#: ../app/tools/gimpaligntool.c:608
 msgid "Click to pick this layer as first item"
 msgstr "Click to pick this layer as first item"
 
-#: ../app/tools/gimpaligntool.c:602
+#: ../app/tools/gimpaligntool.c:616
 msgid "Click to add this layer to the list"
 msgstr "Click to add this layer to the list"
 
-#: ../app/tools/gimpaligntool.c:606
+#: ../app/tools/gimpaligntool.c:620
 msgid "Click to pick this guide as first item"
 msgstr "Click to pick this guide as first item"
 
-#: ../app/tools/gimpaligntool.c:614
+#: ../app/tools/gimpaligntool.c:628
 msgid "Click to add this guide to the list"
 msgstr "Click to add this guide to the list"
 
-#: ../app/tools/gimpaligntool.c:618
+#: ../app/tools/gimpaligntool.c:632
 msgid "Click to pick this path as first item"
 msgstr "Click to pick this path as first item"
 
-#: ../app/tools/gimpaligntool.c:626
+#: ../app/tools/gimpaligntool.c:640
 msgid "Click to add this path to the list"
 msgstr "Click to add this path to the list"
 
-#: ../app/tools/gimpaligntool.c:764
+#: ../app/tools/gimpaligntool.c:778
 msgid "Relative to:"
 msgstr "Relative to:"
 
-#: ../app/tools/gimpaligntool.c:782
+#: ../app/tools/gimpaligntool.c:796
 msgid "Align left edge of target"
 msgstr "Align left edge of target"
 
-#: ../app/tools/gimpaligntool.c:788
+#: ../app/tools/gimpaligntool.c:802
 msgid "Align center of target"
 msgstr "Align centre of target"
 
-#: ../app/tools/gimpaligntool.c:794
+#: ../app/tools/gimpaligntool.c:808
 msgid "Align right edge of target"
 msgstr "Align right edge of target"
 
-#: ../app/tools/gimpaligntool.c:804
+#: ../app/tools/gimpaligntool.c:818
 msgid "Align top edge of target"
 msgstr "Align top edge of target"
 
-#: ../app/tools/gimpaligntool.c:810
+#: ../app/tools/gimpaligntool.c:824
 msgid "Align middle of target"
 msgstr "Align middle of target"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpaligntool.c:830
 msgid "Align bottom of target"
 msgstr "Align bottom of target"
 
-#: ../app/tools/gimpaligntool.c:820
+#: ../app/tools/gimpaligntool.c:834
 msgid "Distribute"
 msgstr "Distribute"
 
-#: ../app/tools/gimpaligntool.c:834
+#: ../app/tools/gimpaligntool.c:848
 msgid "Distribute left edges of targets"
 msgstr "Distribute left edges of targets"
 
-#: ../app/tools/gimpaligntool.c:841
+#: ../app/tools/gimpaligntool.c:855
 msgid "Distribute horizontal centers of targets"
 msgstr "Distribute horizontal centres of targets"
 
-#: ../app/tools/gimpaligntool.c:848
+#: ../app/tools/gimpaligntool.c:862
 msgid "Distribute right edges of targets"
 msgstr "Distribute right edges of targets"
 
-#: ../app/tools/gimpaligntool.c:858
+#: ../app/tools/gimpaligntool.c:872
 msgid "Distribute top edges of targets"
 msgstr "Distribute top edges of targets"
 
-#: ../app/tools/gimpaligntool.c:865
+#: ../app/tools/gimpaligntool.c:879
 msgid "Distribute vertical centers of targets"
 msgstr "Distribute vertical centres of targets"
 
-#: ../app/tools/gimpaligntool.c:871
+#: ../app/tools/gimpaligntool.c:885
 msgid "Distribute bottoms of targets"
 msgstr "Distribute bottoms of targets"
 
-#: ../app/tools/gimpaligntool.c:879 ../app/tools/gimpblendoptions.c:212
+#: ../app/tools/gimpaligntool.c:893 ../app/tools/gimpblendoptions.c:222
 msgid "Offset:"
 msgstr "Offset:"
 
-#: ../app/tools/gimpblendoptions.c:222 ../app/widgets/gimpbrusheditor.c:146
+#: ../app/tools/gimpblendoptions.c:216 ../app/tools/gimppaintoptions-gui.c:648
+msgid "Gradient:"
+msgstr "Gradient:"
+
+#: ../app/tools/gimpblendoptions.c:232 ../app/widgets/gimpbrusheditor.c:146
 msgid "Shape:"
 msgstr "Shape:"
 
-#: ../app/tools/gimpblendoptions.c:229 ../app/tools/gimppaintoptions-gui.c:456
+#: ../app/tools/gimpblendoptions.c:239 ../app/tools/gimppaintoptions-gui.c:672
 msgid "Repeat:"
 msgstr "Repeat:"
 
-#: ../app/tools/gimpblendoptions.c:247
+#: ../app/tools/gimpblendoptions.c:257
 msgid "Adaptive supersampling"
 msgstr "Adaptive supersampling"
 
-#: ../app/tools/gimpblendoptions.c:255
+#: ../app/tools/gimpblendoptions.c:265
 msgid "Max depth:"
 msgstr "Max depth:"
 
-#: ../app/tools/gimpblendoptions.c:262
+#: ../app/tools/gimpblendoptions.c:272
 #: ../app/tools/gimpbucketfilloptions.c:287
+#: ../app/tools/gimpregionselectoptions.c:220
 msgid "Threshold:"
 msgstr "Threshold:"
 
-#: ../app/tools/gimpblendtool.c:109
+#: ../app/tools/gimpblendtool.c:108
 msgid "Blend Tool: Fill selected area with a color gradient"
 msgstr "Blend Tool: Fill selected area with a colour gradient"
 
-#: ../app/tools/gimpblendtool.c:110
+#: ../app/tools/gimpblendtool.c:109
 msgid "Blen_d"
 msgstr "Blen_d"
 
-#: ../app/tools/gimpblendtool.c:163
+#: ../app/tools/gimpblendtool.c:164
 #, c-format
 msgid "Blend does not operate on indexed layers."
 msgstr "Blend does not operate on indexed layers."
 
-#: ../app/tools/gimpblendtool.c:400 ../app/tools/gimppainttool.c:595
+#: ../app/tools/gimpblendtool.c:402 ../app/tools/gimppainttool.c:606
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s for constrained angles"
 
-#: ../app/tools/gimpblendtool.c:401
+#: ../app/tools/gimpblendtool.c:403
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s to move the whole line"
 
-#: ../app/tools/gimpblendtool.c:403
+#: ../app/tools/gimpblendtool.c:407
 msgid "Blend: "
 msgstr "Blend: "
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:107
+#: ../app/tools/gimpbrightnesscontrasttool.c:112
 msgid "Brightness/Contrast Tool: Adjust brightness and contrast"
 msgstr "Brightness/Contrast Tool: Adjust brightness and contrast"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:108
+#: ../app/tools/gimpbrightnesscontrasttool.c:113
 msgid "B_rightness-Contrast..."
 msgstr "B_rightness-Contrast..."
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:128
+#: ../app/tools/gimpbrightnesscontrasttool.c:133
 msgid "Adjust Brightness and Contrast"
 msgstr "Adjust Brightness and Contrast"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:176
+#: ../app/tools/gimpbrightnesscontrasttool.c:135
+msgid "Import Brightness-Contrast settings"
+msgstr "Import Brightness-Contrast settings"
+
+#: ../app/tools/gimpbrightnesscontrasttool.c:136
+msgid "Export Brightness-Contrast settings"
+msgstr "Export Brightness-Contrast settings"
+
+#: ../app/tools/gimpbrightnesscontrasttool.c:184
 #, c-format
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "Brightness-Contrast does not operate on indexed layers."
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:307
+#: ../app/tools/gimpbrightnesscontrasttool.c:325
 msgid "_Brightness:"
 msgstr "_Brightness:"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:322
+#: ../app/tools/gimpbrightnesscontrasttool.c:340
 msgid "Con_trast:"
 msgstr "Con_trast:"
 
+#: ../app/tools/gimpbrightnesscontrasttool.c:354
+msgid "Edit these Settings as Levels"
+msgstr "Edit these Settings as Levels"
+
 #: ../app/tools/gimpbucketfilloptions.c:100
 msgid "Allow completely transparent regions to be filled"
 msgstr "Allow completely transparent regions to be filled"
@@ -9344,6 +9439,7 @@ msgid "Base filled area on all visible layers"
 msgstr "Base filled area on all visible layers"
 
 #: ../app/tools/gimpbucketfilloptions.c:112
+#: ../app/tools/gimpregionselectoptions.c:96
 msgid "Maximum color difference"
 msgstr "Maximum colour difference"
 
@@ -9376,8 +9472,9 @@ msgid "Fill transparent areas"
 msgstr "Fill transparent areas"
 
 #: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:114
-#: ../app/tools/gimpcolorpickeroptions.c:160 ../app/tools/gimphealtool.c:99
-#: ../app/tools/gimpperspectiveclonetool.c:965
+#: ../app/tools/gimpcolorpickeroptions.c:151 ../app/tools/gimphealtool.c:99
+#: ../app/tools/gimpperspectiveclonetool.c:941
+#: ../app/tools/gimpregionselectoptions.c:208
 msgid "Sample merged"
 msgstr "Sample merged"
 
@@ -9397,15 +9494,15 @@ msgstr "Bucket Fill Tool: Fill selected area with a colour or pattern"
 msgid "_Bucket Fill"
 msgstr "_Bucket Fill"
 
-#: ../app/tools/gimpbycolorselecttool.c:65
+#: ../app/tools/gimpbycolorselecttool.c:67
 msgid "Select by Color"
 msgstr "Select by Colour"
 
-#: ../app/tools/gimpbycolorselecttool.c:66
+#: ../app/tools/gimpbycolorselecttool.c:68
 msgid "Select by Color Tool: Select regions with similar colors"
 msgstr "Select by Colour Tool: Select regions with similar colours"
 
-#: ../app/tools/gimpbycolorselecttool.c:67
+#: ../app/tools/gimpbycolorselecttool.c:69
 msgid "_By Color Select"
 msgstr "_By Colour Select"
 
@@ -9431,12 +9528,12 @@ msgid "Click to set a new clone source"
 msgstr "Click to set a new clone source"
 
 #: ../app/tools/gimpclonetool.c:109
-#: ../app/tools/gimpperspectiveclonetool.c:960
+#: ../app/tools/gimpperspectiveclonetool.c:936
 msgid "Source"
 msgstr "Source"
 
 #: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:111
-#: ../app/tools/gimpperspectiveclonetool.c:979
+#: ../app/tools/gimpperspectiveclonetool.c:955
 msgid "Alignment:"
 msgstr "Alignment:"
 
@@ -9452,75 +9549,91 @@ msgstr "Colour _Balance..."
 msgid "Adjust Color Balance"
 msgstr "Adjust Colour Balance"
 
-#: ../app/tools/gimpcolorbalancetool.c:160
+#: ../app/tools/gimpcolorbalancetool.c:115
+msgid "Import Color Balance Settings"
+msgstr "Import Colour Balance Settings"
+
+#: ../app/tools/gimpcolorbalancetool.c:116
+msgid "Export Color Balance Settings"
+msgstr "Export Colour Balance Settings"
+
+#: ../app/tools/gimpcolorbalancetool.c:163
 #, c-format
 msgid "Color Balance operates only on RGB color layers."
 msgstr "Colour Balance operates only on RGB colour layers."
 
-#: ../app/tools/gimpcolorbalancetool.c:264
+#: ../app/tools/gimpcolorbalancetool.c:270
 msgid "Select Range to Adjust"
 msgstr "Select Range to Adjust"
 
-#: ../app/tools/gimpcolorbalancetool.c:273 ../app/tools/gimplevelstool.c:159
+#: ../app/tools/gimpcolorbalancetool.c:279 ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr "Adjust Colour Levels"
 
-#: ../app/tools/gimpcolorbalancetool.c:290
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimpcolorbalancetool.c:296
+#: ../app/tools/gimphuesaturationtool.c:255
 msgid "Cyan"
 msgstr "Cyan"
 
-#: ../app/tools/gimpcolorbalancetool.c:299
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimpcolorbalancetool.c:305
+#: ../app/tools/gimphuesaturationtool.c:257
 msgid "Magenta"
 msgstr "Magenta"
 
-#: ../app/tools/gimpcolorbalancetool.c:308
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimpcolorbalancetool.c:314
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "Yellow"
 msgstr "Yellow"
 
-#: ../app/tools/gimpcolorbalancetool.c:319
+#: ../app/tools/gimpcolorbalancetool.c:325
 msgid "R_eset Range"
 msgstr "R_eset Range"
 
-#: ../app/tools/gimpcolorbalancetool.c:328
+#: ../app/tools/gimpcolorbalancetool.c:334
 msgid "Preserve _luminosity"
 msgstr "Preserve _luminosity"
 
-#: ../app/tools/gimpcolorizetool.c:90
+#: ../app/tools/gimpcolorizetool.c:91
 msgid "Colorize Tool: Colorize the image"
 msgstr "Colourise Tool: Colourise the image"
 
-#: ../app/tools/gimpcolorizetool.c:91
+#: ../app/tools/gimpcolorizetool.c:92
 msgid "Colori_ze..."
 msgstr "Colouri_se..."
 
-#: ../app/tools/gimpcolorizetool.c:108
+#: ../app/tools/gimpcolorizetool.c:109
 msgid "Colorize the Image"
 msgstr "Colourise the Image"
 
-#: ../app/tools/gimpcolorizetool.c:152
+#: ../app/tools/gimpcolorizetool.c:111
+msgid "Import Colorize Settings"
+msgstr "Import Colourise Settings"
+
+#: ../app/tools/gimpcolorizetool.c:112
+msgid "Export Colorize Settings"
+msgstr "Export Colourise Settings"
+
+#: ../app/tools/gimpcolorizetool.c:156
 #, c-format
 msgid "Colorize operates only on RGB color layers."
 msgstr "Colourise operates only on RGB colour layers."
 
-#: ../app/tools/gimpcolorizetool.c:214
+#: ../app/tools/gimpcolorizetool.c:221
 msgid "Select Color"
 msgstr "Select Colour"
 
-#: ../app/tools/gimpcolorizetool.c:232
-#: ../app/tools/gimphuesaturationtool.c:384
+#: ../app/tools/gimpcolorizetool.c:238
+#: ../app/tools/gimphuesaturationtool.c:388
 msgid "_Hue:"
 msgstr "_Hue:"
 
-#: ../app/tools/gimpcolorizetool.c:247
-#: ../app/tools/gimphuesaturationtool.c:422
+#: ../app/tools/gimpcolorizetool.c:253
+#: ../app/tools/gimphuesaturationtool.c:426
 msgid "_Saturation:"
 msgstr "_Saturation:"
 
-#: ../app/tools/gimpcolorizetool.c:262
-#: ../app/tools/gimphuesaturationtool.c:403
+#: ../app/tools/gimpcolorizetool.c:268
+#: ../app/tools/gimphuesaturationtool.c:407
 msgid "_Lightness:"
 msgstr "_Lightness:"
 
@@ -9529,20 +9642,20 @@ msgid "Sample average"
 msgstr "Sample average"
 
 #: ../app/tools/gimpcoloroptions.c:171
-#: ../app/tools/gimprectangleselectoptions.c:167
+#: ../app/tools/gimprectangleselectoptions.c:176
 #: ../app/tools/gimpselectionoptions.c:281
 #: ../app/widgets/gimpbrusheditor.c:154
 msgid "Radius:"
 msgstr "Radius:"
 
 #. the pick FG/BG frame
-#: ../app/tools/gimpcolorpickeroptions.c:165
+#: ../app/tools/gimpcolorpickeroptions.c:156
 #, c-format
 msgid "Pick Mode  (%s)"
 msgstr "Pick Mode  (%s)"
 
 #. the use_info_window toggle button
-#: ../app/tools/gimpcolorpickeroptions.c:174
+#: ../app/tools/gimpcolorpickeroptions.c:165
 #, c-format
 msgid "Use info window  (%s)"
 msgstr "Use info window  (%s)"
@@ -9563,11 +9676,11 @@ msgstr "C_olour Picker"
 msgid "Click in any image to view its color"
 msgstr "Click in any image to view its colour"
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:498
+#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:509
 msgid "Click in any image to pick the foreground color"
 msgstr "Click in any image to pick the foreground colour"
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:504
+#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:515
 msgid "Click in any image to pick the background color"
 msgstr "Click in any image to pick the background colour"
 
@@ -9580,15 +9693,15 @@ msgstr "Click in any image to add the colour to the palette"
 msgid "Color Picker Information"
 msgstr "Colour Picker Information"
 
-#: ../app/tools/gimpcolortool.c:255 ../app/tools/gimpcolortool.c:432
+#: ../app/tools/gimpcolortool.c:258 ../app/tools/gimpcolortool.c:437
 msgid "Move Sample Point: "
 msgstr "Move Sample Point: "
 
-#: ../app/tools/gimpcolortool.c:426
+#: ../app/tools/gimpcolortool.c:430
 msgid "Cancel Sample Point"
 msgstr "Cancel Sample Point"
 
-#: ../app/tools/gimpcolortool.c:433
+#: ../app/tools/gimpcolortool.c:438
 msgid "Add Sample Point: "
 msgstr "Add Sample Point: "
 
@@ -9636,89 +9749,104 @@ msgstr "%s to blur"
 msgid "Convolve Type  (%s)"
 msgstr "Convolve Type  (%s)"
 
-#: ../app/tools/gimpcropoptions.c:148
+#: ../app/tools/gimpcropoptions.c:161
 msgid "Current layer only"
 msgstr "Current layer only"
 
-#: ../app/tools/gimpcropoptions.c:154
+#: ../app/tools/gimpcropoptions.c:167
 msgid "Allow growing"
 msgstr "Allow growing"
 
-#: ../app/tools/gimpcroptool.c:115
+#: ../app/tools/gimpcroptool.c:126
 msgid "Crop"
 msgstr "Crop"
 
-#: ../app/tools/gimpcroptool.c:116
+#: ../app/tools/gimpcroptool.c:127
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr "Crop Tool: Remove edge areas from image or layer"
 
-#: ../app/tools/gimpcroptool.c:117
+#: ../app/tools/gimpcroptool.c:128
 msgid "_Crop"
 msgstr "_Crop"
 
-#: ../app/tools/gimpcroptool.c:244
+#: ../app/tools/gimpcroptool.c:269
 msgid "Click or press Enter to crop"
 msgstr "Click or press Enter to crop"
 
-#: ../app/tools/gimpcurvestool.c:131
+#: ../app/tools/gimpcurvestool.c:141
 msgid "Curves Tool: Adjust color curves"
 msgstr "Curves Tool: Adjust colour curves"
 
-#: ../app/tools/gimpcurvestool.c:132
+#: ../app/tools/gimpcurvestool.c:142
 msgid "_Curves..."
 msgstr "_Curves..."
 
-#: ../app/tools/gimpcurvestool.c:158
+#: ../app/tools/gimpcurvestool.c:168
 msgid "Adjust Color Curves"
 msgstr "Adjust Colour Curves"
 
-#: ../app/tools/gimpcurvestool.c:160
-msgid "Load Curves"
-msgstr "Load Curves"
+#: ../app/tools/gimpcurvestool.c:170
+msgid "Import Curves"
+msgstr "Import Curves"
 
-#: ../app/tools/gimpcurvestool.c:161
-msgid "Load curves settings from file"
-msgstr "Load curves settings from file"
+#: ../app/tools/gimpcurvestool.c:171
+msgid "Export Curves"
+msgstr "Export Curves"
 
-#: ../app/tools/gimpcurvestool.c:162
-msgid "Save Curves"
-msgstr "Save Curves"
-
-#: ../app/tools/gimpcurvestool.c:163
-msgid "Save curves settings to file"
-msgstr "Save curves settings to file"
-
-#: ../app/tools/gimpcurvestool.c:213
+#: ../app/tools/gimpcurvestool.c:221
 #, c-format
 msgid "Curves does not operate on indexed layers."
 msgstr "Curves does not operate on indexed layers."
 
-#: ../app/tools/gimpcurvestool.c:315
+#: ../app/tools/gimpcurvestool.c:323
 msgid "Click to add a control point"
 msgstr "Click to add a control point"
 
-#: ../app/tools/gimpcurvestool.c:320
+#: ../app/tools/gimpcurvestool.c:328
 msgid "Click to add control points to all channels"
 msgstr "Click to add control points to all channels"
 
-#: ../app/tools/gimpcurvestool.c:428 ../app/tools/gimplevelstool.c:361
+#: ../app/tools/gimpcurvestool.c:441 ../app/tools/gimplevelstool.c:380
 msgid "Cha_nnel:"
 msgstr "Cha_nnel:"
 
-#: ../app/tools/gimpcurvestool.c:452 ../app/tools/gimplevelstool.c:383
+#: ../app/tools/gimpcurvestool.c:467 ../app/tools/gimplevelstool.c:404
 msgid "R_eset Channel"
 msgstr "R_eset Channel"
 
-#. Horizontal button box for load / save
-#. all channels frame
-#: ../app/tools/gimpcurvestool.c:544 ../app/tools/gimplevelstool.c:622
-msgid "All Channels"
-msgstr "All Channels"
+#: ../app/tools/gimpcurvestool.c:557
+msgid "Curve _type:"
+msgstr "Curve _type:"
 
-#. The radio box for selecting the curve type
-#: ../app/tools/gimpcurvestool.c:562
-msgid "Curve Type"
-msgstr "Curve Type"
+#: ../app/tools/gimpcurvestool.c:632 ../app/tools/gimplevelstool.c:752
+#, c-format
+msgid "Could not read header from '%s': %s"
+msgstr "Could not read header from '%s': %s"
+
+#: ../app/tools/gimpcurvestool.c:705
+msgid "Use _old curves file format"
+msgstr "Use _old curves file format"
+
+#: ../app/tools/gimpdesaturatetool.c:78
+msgid "Desaturate Tool: Turn colors into shades of gray"
+msgstr "Desaturate Tool: Turn colours into shades of grey"
+
+#: ../app/tools/gimpdesaturatetool.c:79
+msgid "_Desaturate..."
+msgstr "_Desaturate..."
+
+#: ../app/tools/gimpdesaturatetool.c:93
+msgid "Desaturate (Remove Colors)"
+msgstr "Desaturate (Remove Colours)"
+
+#: ../app/tools/gimpdesaturatetool.c:125
+#, c-format
+msgid "Desaturate does only operate on RGB layers."
+msgstr "Desaturate does only operate on RGB layers."
+
+#: ../app/tools/gimpdesaturatetool.c:191
+msgid "Choose shade of gray based on:"
+msgstr "Choose shade of grey based on:"
 
 #: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn"
@@ -9764,22 +9892,22 @@ msgstr "%s to dodge"
 msgid "Type  (%s)"
 msgstr "Type  (%s)"
 
-#: ../app/tools/gimpdodgeburntool.c:214
-#: ../app/tools/gimpperspectiveclonetool.c:952
-msgid "Mode"
-msgstr "Mode"
+#. mode (highlights, midtones, or shadows)
+#: ../app/tools/gimpdodgeburntool.c:213
+msgid "Range"
+msgstr "Range"
 
-#: ../app/tools/gimpdodgeburntool.c:226
+#: ../app/tools/gimpdodgeburntool.c:225
 msgid "Exposure:"
 msgstr "Exposure:"
 
-#: ../app/tools/gimpeditselectiontool.c:203
-#: ../app/tools/gimpeditselectiontool.c:1173
+#: ../app/tools/gimpeditselectiontool.c:244
+#: ../app/tools/gimpeditselectiontool.c:1229
 msgid "Move Floating Selection"
 msgstr "Move Floating Selection"
 
-#: ../app/tools/gimpeditselectiontool.c:411
-#: ../app/tools/gimpeditselectiontool.c:679
+#: ../app/tools/gimpeditselectiontool.c:457
+#: ../app/tools/gimpeditselectiontool.c:726
 msgid "Move: "
 msgstr "Move: "
 
@@ -9832,17 +9960,17 @@ msgstr "Affect:"
 msgid "Flip Type  (%s)"
 msgstr "Flip Type  (%s)"
 
-#: ../app/tools/gimpfliptool.c:77
+#: ../app/tools/gimpfliptool.c:79
 msgid "Flip"
 msgstr "Flip"
 
-#: ../app/tools/gimpfliptool.c:78
+#: ../app/tools/gimpfliptool.c:80
 msgid ""
 "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 msgstr ""
 "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 
-#: ../app/tools/gimpfliptool.c:80
+#: ../app/tools/gimpfliptool.c:82
 msgid "_Flip"
 msgstr "_Flip"
 
@@ -9931,46 +10059,92 @@ msgstr "Foreground Select Tool: Select a region containing foreground objects"
 msgid "F_oreground Select"
 msgstr "F_oreground Select"
 
-#: ../app/tools/gimpforegroundselecttool.c:310
+#: ../app/tools/gimpforegroundselecttool.c:314
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr "Add more strokes or press Enter to accept the selection"
 
-#: ../app/tools/gimpforegroundselecttool.c:312
+#: ../app/tools/gimpforegroundselecttool.c:316
 msgid "Mark foreground by painting on the object to extract"
 msgstr "Mark foreground by painting on the object to extract"
 
-#: ../app/tools/gimpforegroundselecttool.c:323
-msgid "Draw a rough circle around the object to extract"
-msgstr "Draw a rough circle around the object to extract"
+#: ../app/tools/gimpforegroundselecttool.c:327
+msgid "Rougly outline the object to extract"
+msgstr "Roughly outline the object to extract"
 
-#: ../app/tools/gimpforegroundselecttool.c:745
-msgid "command|Foreground Select"
+#: ../app/tools/gimpforegroundselecttool.c:766
+msgctxt "command"
+msgid "Foreground Select"
 msgstr "Foreground Select"
 
-#: ../app/tools/gimpfreeselecttool.c:98
-msgid "Free Select Tool: Select a hand-drawn region"
-msgstr "Free Select Tool: Select a hand-drawn region"
+#: ../app/tools/gimpfreeselecttool.c:198
+msgid ""
+"Free Select Tool: Select a hand-drawn region with free and polygonal segments"
+msgstr ""
+"Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 
-#: ../app/tools/gimpfreeselecttool.c:99
+#: ../app/tools/gimpfreeselecttool.c:199
 msgid "_Free Select"
 msgstr "_Free Select"
 
-#: ../app/tools/gimpfreeselecttool.c:311
-msgid "command|Free Select"
+#: ../app/tools/gimpfreeselecttool.c:1116
+msgid "Click to complete selection"
+msgstr "Click to complete selection"
+
+#: ../app/tools/gimpfreeselecttool.c:1120
+msgid "Click-Drag to move segment vertex"
+msgstr "Click-Drag to move segment vertex"
+
+#: ../app/tools/gimpfreeselecttool.c:1125
+msgid "Return commits, Escape cancels, Backspace removes last segment"
+msgstr "Return commits, Escape cancels, Backspace removes last segment"
+
+#: ../app/tools/gimpfreeselecttool.c:1129
+msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
+msgstr "Click-Drag adds a free segment, Click adds a polygonal segment"
+
+#: ../app/tools/gimpfreeselecttool.c:1581
+msgctxt "command"
+msgid "Free Select"
 msgstr "Free Select"
 
-#: ../app/tools/gimpfuzzyselecttool.c:63
+#: ../app/tools/gimpfuzzyselecttool.c:65
 msgid "Fuzzy Select"
 msgstr "Fuzzy Select"
 
-#: ../app/tools/gimpfuzzyselecttool.c:64
+#: ../app/tools/gimpfuzzyselecttool.c:66
 msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color"
 msgstr "Fuzzy Select Tool: Select a contiguous region on the basis of colour"
 
-#: ../app/tools/gimpfuzzyselecttool.c:65
+#: ../app/tools/gimpfuzzyselecttool.c:67
 msgid "Fu_zzy Select"
 msgstr "Fu_zzy Select"
 
+#: ../app/tools/gimpgegltool.c:92 ../app/tools/gimpgegltool.c:111
+msgid "GEGL Operation"
+msgstr "GEGL Operation"
+
+#: ../app/tools/gimpgegltool.c:93
+msgid "GEGL Tool: Use an arbitrary GEGL operation"
+msgstr "GEGL Tool: Use an arbitrary GEGL operation"
+
+#: ../app/tools/gimpgegltool.c:94
+msgid "_GEGL Operation..."
+msgstr "_GEGL Operation..."
+
+#: ../app/tools/gimpgegltool.c:158
+#, c-format
+msgid "GEGL operations do not operate on indexed layers."
+msgstr "GEGL operations do not operate on indexed layers."
+
+#: ../app/tools/gimpgegltool.c:338
+msgid "_Operation:"
+msgstr "_Operation:"
+
+#. The options vbox
+#: ../app/tools/gimpgegltool.c:411
+msgid "Operation Settings"
+msgstr "Operation Settings"
+
 #: ../app/tools/gimphealtool.c:54
 msgid "Healing Tool: Heal image irregularities"
 msgstr "Healing Tool: Heal image irregularities"
@@ -9998,7 +10172,7 @@ msgstr "Histogram Scale"
 
 #: ../app/tools/gimphuesaturationtool.c:103
 msgid "Hue-Saturation Tool: Adjust hue, saturation, and lightness"
-msgstr "Hue-Saturation Tool: Adjust hue, saturation, and lightness"
+msgstr "Hue-Saturation Tool: Adjust hue, saturation and lightness"
 
 #: ../app/tools/gimphuesaturationtool.c:104
 msgid "Hue-_Saturation..."
@@ -10008,95 +10182,91 @@ msgstr "Hue-_Saturation..."
 msgid "Adjust Hue / Lightness / Saturation"
 msgstr "Adjust Hue / Lightness / Saturation"
 
-#: ../app/tools/gimphuesaturationtool.c:168
+#: ../app/tools/gimphuesaturationtool.c:123
+msgid "Import Hue-Saturation Settings"
+msgstr "Import Hue-Saturation Settings"
+
+#: ../app/tools/gimphuesaturationtool.c:124
+msgid "Export Hue-Saturation Settings"
+msgstr "Export Hue-Saturation Settings"
+
+#: ../app/tools/gimphuesaturationtool.c:171
 #, c-format
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "Hue-Saturation operates only on RGB colour layers."
 
-#: ../app/tools/gimphuesaturationtool.c:247
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "M_aster"
 msgstr "M_aster"
 
-#: ../app/tools/gimphuesaturationtool.c:247
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "Adjust all colors"
 msgstr "Adjust all colours"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "_R"
 msgstr "_R"
 
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "_Y"
 msgstr "_Y"
 
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "_G"
 msgstr "_G"
 
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimphuesaturationtool.c:255
 msgid "_C"
 msgstr "_C"
 
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimphuesaturationtool.c:256
 msgid "_B"
 msgstr "_B"
 
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimphuesaturationtool.c:257
 msgid "_M"
 msgstr "_M"
 
-#: ../app/tools/gimphuesaturationtool.c:256
+#: ../app/tools/gimphuesaturationtool.c:262
 msgid "Select Primary Color to Adjust"
 msgstr "Select Primary Colour to Adjust"
 
-#: ../app/tools/gimphuesaturationtool.c:347
+#: ../app/tools/gimphuesaturationtool.c:352
 msgid "_Overlap:"
 msgstr "_Overlap:"
 
-#: ../app/tools/gimphuesaturationtool.c:366
+#: ../app/tools/gimphuesaturationtool.c:371
 msgid "Adjust Selected Color"
 msgstr "Adjust Selected Colour"
 
-#: ../app/tools/gimphuesaturationtool.c:443
+#: ../app/tools/gimphuesaturationtool.c:447
 msgid "R_eset Color"
 msgstr "R_eset Colour"
 
-#: ../app/tools/gimpimagemaptool.c:335
-msgid "Recent Settings:"
-msgstr "Recent Settings:"
+#: ../app/tools/gimpimagemaptool-settings.c:81
+msgid "Pre_sets:"
+msgstr "Pre_sets:"
 
-#: ../app/tools/gimpimagemaptool.c:345
-msgid "Pick a setting from the list"
-msgstr "Pick a setting from the list"
-
-#: ../app/tools/gimpimagemaptool.c:356
-msgid "_Preview"
-msgstr "_Preview"
-
-#: ../app/tools/gimpimagemaptool.c:388
-msgid "Quick Load"
-msgstr "Quick Load"
-
-#: ../app/tools/gimpimagemaptool.c:417
-msgid "Quick Save"
-msgstr "Quick Save"
-
-#: ../app/tools/gimpimagemaptool.c:860
+#: ../app/tools/gimpimagemaptool-settings.c:221
 #, c-format
 msgid "Settings saved to '%s'"
 msgstr "Settings saved to '%s'"
 
+#: ../app/tools/gimpimagemaptool.c:318
+msgid "_Preview"
+msgstr "_Preview"
+
 #. adjust sliders
 #: ../app/tools/gimpinkoptions-gui.c:56
 msgid "Adjustment"
 msgstr "Adjustment"
 
 #: ../app/tools/gimpinkoptions-gui.c:68 ../app/tools/gimpinkoptions-gui.c:93
-#: ../app/tools/gimprectangleoptions.c:983 ../app/tools/gimptextoptions.c:436
+#: ../app/tools/gimprectangleoptions.c:973 ../app/tools/gimptextoptions.c:452
 msgid "Size:"
 msgstr "Size:"
 
-#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1034
+#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1037
 #: ../app/widgets/gimpbrusheditor.c:208
 msgid "Angle:"
 msgstr "Angle:"
@@ -10119,7 +10289,7 @@ msgid "Type"
 msgstr "Type"
 
 #. Blob shape widget
-#: ../app/tools/gimpinkoptions-gui.c:148
+#: ../app/tools/gimpinkoptions-gui.c:149
 msgid "Shape"
 msgstr "Shape"
 
@@ -10131,6 +10301,10 @@ msgstr "Ink Tool: Calligraphy-style painting"
 msgid "In_k"
 msgstr "In_k"
 
+#: ../app/tools/gimpiscissorsoptions.c:126
+msgid "Interactive boundary"
+msgstr "Interactive boundary"
+
 #: ../app/tools/gimpiscissorstool.c:278
 msgid "Scissors"
 msgstr "Scissors"
@@ -10143,94 +10317,99 @@ msgstr "Scissors Select Tool: Select shapes using intelligent edge-fitting"
 msgid "Intelligent _Scissors"
 msgstr "Intelligent _Scissors"
 
-#: ../app/tools/gimpiscissorstool.c:926 ../app/tools/gimpmeasuretool.c:606
+#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpmeasuretool.c:609
 msgid "Click-Drag to move this point"
 msgstr "Click-Drag to move this point"
 
-#: ../app/tools/gimpiscissorstool.c:928 ../app/tools/gimpiscissorstool.c:993
+#: ../app/tools/gimpiscissorstool.c:942 ../app/tools/gimpiscissorstool.c:1007
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%s: disable auto-snap"
 
-#: ../app/tools/gimpiscissorstool.c:945
+#: ../app/tools/gimpiscissorstool.c:959
 msgid "Click to close the curve"
 msgstr "Click to close the curve"
 
-#: ../app/tools/gimpiscissorstool.c:951
+#: ../app/tools/gimpiscissorstool.c:965
 msgid "Click to add a point on this segment"
 msgstr "Click to add a point on this segment"
 
-#: ../app/tools/gimpiscissorstool.c:965
+#: ../app/tools/gimpiscissorstool.c:979
 msgid "Click or press Enter to convert to a selection"
 msgstr "Click or press Enter to convert to a selection"
 
-#: ../app/tools/gimpiscissorstool.c:975
+#: ../app/tools/gimpiscissorstool.c:989
 msgid "Press Enter to convert to a selection"
 msgstr "Press Enter to convert to a selection"
 
-#: ../app/tools/gimpiscissorstool.c:990
+#: ../app/tools/gimpiscissorstool.c:1004
 msgid "Click or Click-Drag to add a point"
 msgstr "Click or Click-Drag to add a point"
 
-#: ../app/tools/gimplevelstool.c:138
+#: ../app/tools/gimplevelstool.c:151
 msgid "Levels Tool: Adjust color levels"
 msgstr "Levels Tool: Adjust colour levels"
 
-#: ../app/tools/gimplevelstool.c:139
+#: ../app/tools/gimplevelstool.c:152
 msgid "_Levels..."
 msgstr "_Levels..."
 
-#: ../app/tools/gimplevelstool.c:161
-msgid "Load Levels"
-msgstr "Load Levels"
+#: ../app/tools/gimplevelstool.c:174
+msgid "Import Levels"
+msgstr "Import Levels"
 
-#: ../app/tools/gimplevelstool.c:162
-msgid "Load levels settings from file"
-msgstr "Load levels settings from file"
+#: ../app/tools/gimplevelstool.c:175
+msgid "Export Levels"
+msgstr "Export Levels"
 
-#: ../app/tools/gimplevelstool.c:163
-msgid "Save Levels"
-msgstr "Save Levels"
-
-#: ../app/tools/gimplevelstool.c:164
-msgid "Save levels settings to file"
-msgstr "Save levels settings to file"
-
-#: ../app/tools/gimplevelstool.c:217
+#: ../app/tools/gimplevelstool.c:228
 #, c-format
 msgid "Levels does not operate on indexed layers."
 msgstr "Levels does not operate on indexed layers."
 
-#: ../app/tools/gimplevelstool.c:299
+#: ../app/tools/gimplevelstool.c:310
 msgid "Pick black point"
 msgstr "Pick black point"
 
-#: ../app/tools/gimplevelstool.c:303
+#: ../app/tools/gimplevelstool.c:314
 msgid "Pick gray point"
 msgstr "Pick gray point"
 
-#: ../app/tools/gimplevelstool.c:307
+#: ../app/tools/gimplevelstool.c:318
 msgid "Pick white point"
 msgstr "Pick white point"
 
 #. Input levels frame
-#: ../app/tools/gimplevelstool.c:398
+#: ../app/tools/gimplevelstool.c:419
 msgid "Input Levels"
 msgstr "Input Levels"
 
-#: ../app/tools/gimplevelstool.c:502
+#: ../app/tools/gimplevelstool.c:522
 msgid "Gamma"
 msgstr "Gamma"
 
 #. Output levels frame
-#: ../app/tools/gimplevelstool.c:544
+#: ../app/tools/gimplevelstool.c:564
 msgid "Output Levels"
 msgstr "Output Levels"
 
-#: ../app/tools/gimplevelstool.c:650
+#. all channels frame
+#: ../app/tools/gimplevelstool.c:641
+msgid "All Channels"
+msgstr "All Channels"
+
+#: ../app/tools/gimplevelstool.c:655
 msgid "Adjust levels automatically"
 msgstr "Adjust levels automatically"
 
+#: ../app/tools/gimplevelstool.c:682
+msgid "Edit these Settings as Curves"
+msgstr "Edit these Settings as Curves"
+
+#: ../app/tools/gimplevelstool.c:825
+msgid "Use _old levels file format"
+msgstr "Use _old levels file format"
+
 #: ../app/tools/gimpmagnifyoptions.c:167
 msgid "Auto-resize window"
 msgstr "Auto-resize window"
@@ -10269,36 +10448,36 @@ msgstr "Measure Tool: Measure distances and angles"
 msgid "_Measure"
 msgstr "_Measure"
 
-#: ../app/tools/gimpmeasuretool.c:238
+#: ../app/tools/gimpmeasuretool.c:241
 msgid "Add Guides"
 msgstr "Add Guides"
 
-#: ../app/tools/gimpmeasuretool.c:558
+#: ../app/tools/gimpmeasuretool.c:561
 msgid "Click to place vertical and horizontal guides"
 msgstr "Click to place vertical and horizontal guides"
 
-#: ../app/tools/gimpmeasuretool.c:567
+#: ../app/tools/gimpmeasuretool.c:570
 msgid "Click to place a horizontal guide"
 msgstr "Click to place a horizontal guide"
 
-#: ../app/tools/gimpmeasuretool.c:581
+#: ../app/tools/gimpmeasuretool.c:584
 msgid "Click to place a vertical guide"
 msgstr "Click to place a vertical guide"
 
-#: ../app/tools/gimpmeasuretool.c:595
+#: ../app/tools/gimpmeasuretool.c:598
 msgid "Click-Drag to add a new point"
 msgstr "Click-Drag to add a new point"
 
-#: ../app/tools/gimpmeasuretool.c:625
+#: ../app/tools/gimpmeasuretool.c:628
 msgid "Click-Drag to move all points"
 msgstr "Click-Drag to move all points"
 
 #. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:986
+#: ../app/tools/gimpmeasuretool.c:989
 msgid "Measure Distances and Angles"
 msgstr "Measure Distances and Angles"
 
-#: ../app/tools/gimpmeasuretool.c:1006
+#: ../app/tools/gimpmeasuretool.c:1009
 msgid "Distance:"
 msgstr "Distance:"
 
@@ -10326,27 +10505,28 @@ msgstr "Move the active path"
 msgid "Move:"
 msgstr "Move:"
 
-#: ../app/tools/gimpmovetool.c:125
-msgid "tool|Move"
+#: ../app/tools/gimpmovetool.c:127
+msgctxt "tool"
+msgid "Move"
 msgstr "Move"
 
-#: ../app/tools/gimpmovetool.c:126
+#: ../app/tools/gimpmovetool.c:128
 msgid "Move Tool: Move layers, selections, and other objects"
-msgstr "Move Tool: Move layers, selections, and other objects"
+msgstr "Move Tool: Move layers, selections and other objects"
 
-#: ../app/tools/gimpmovetool.c:127
+#: ../app/tools/gimpmovetool.c:129
 msgid "_Move"
 msgstr "_Move"
 
-#: ../app/tools/gimpmovetool.c:271 ../app/tools/gimpmovetool.c:552
+#: ../app/tools/gimpmovetool.c:276 ../app/tools/gimpmovetool.c:570
 msgid "Move Guide: "
 msgstr "Move Guide: "
 
-#: ../app/tools/gimpmovetool.c:546
+#: ../app/tools/gimpmovetool.c:564
 msgid "Cancel Guide"
 msgstr "Cancel Guide"
 
-#: ../app/tools/gimpmovetool.c:552
+#: ../app/tools/gimpmovetool.c:570
 msgid "Add Guide: "
 msgstr "Add Guide: "
 
@@ -10358,95 +10538,97 @@ msgstr "Paintbrush Tool: Paint smooth strokes using a brush"
 msgid "_Paintbrush"
 msgstr "_Paintbrush"
 
-#: ../app/tools/gimppaintoptions-gui.c:99
+#: ../app/tools/gimppaintoptions-gui.c:112
 #: ../app/tools/gimpselectionoptions.c:211
 #: ../app/widgets/gimpbrushselect.c:191 ../app/widgets/gimplayertreeview.c:269
 msgid "Mode:"
 msgstr "Mode:"
 
-#: ../app/tools/gimppaintoptions-gui.c:114
+#: ../app/tools/gimppaintoptions-gui.c:127
 #: ../app/tools/gimptransformoptions.c:348
 #: ../app/widgets/gimpbrushselect.c:178 ../app/widgets/gimplayertreeview.c:284
 msgid "Opacity:"
 msgstr "Opacity:"
 
-#: ../app/tools/gimppaintoptions-gui.c:124
+#: ../app/tools/gimppaintoptions-gui.c:137
 msgid "Brush:"
 msgstr "Brush:"
 
-#: ../app/tools/gimppaintoptions-gui.c:129
+#: ../app/tools/gimppaintoptions-gui.c:142
 msgid "Scale:"
 msgstr "Scale:"
 
-#: ../app/tools/gimppaintoptions-gui.c:143
-#: ../app/tools/gimppaintoptions-gui.c:432
-msgid "Gradient:"
-msgstr "Gradient:"
-
-#: ../app/tools/gimppaintoptions-gui.c:179
-msgid "Incremental"
-msgstr "Incremental"
-
-#: ../app/tools/gimppaintoptions-gui.c:195
-msgid "Hard edge"
-msgstr "Hard edge"
-
-#: ../app/tools/gimppaintoptions-gui.c:231
-msgid "Pressure sensitivity"
-msgstr "Pressure sensitivity"
-
-#: ../app/tools/gimppaintoptions-gui.c:252
+#: ../app/tools/gimppaintoptions-gui.c:150
 msgid "Opacity"
 msgstr "Opacity"
 
-#: ../app/tools/gimppaintoptions-gui.c:268
+#: ../app/tools/gimppaintoptions-gui.c:156
 msgid "Hardness"
 msgstr "Hardness"
 
-#: ../app/tools/gimppaintoptions-gui.c:279
+#: ../app/tools/gimppaintoptions-gui.c:162
 msgid "Rate"
 msgstr "Rate"
 
-#: ../app/tools/gimppaintoptions-gui.c:295
-#: ../app/tools/gimppaintoptions-gui.c:304 ../app/tools/tools-enums.c:151
+#: ../app/tools/gimppaintoptions-gui.c:168 ../app/tools/tools-enums.c:151
 msgid "Size"
 msgstr "Size"
 
-#: ../app/tools/gimppaintoptions-gui.c:339
+#: ../app/tools/gimppaintoptions-gui.c:186
+msgid "Brush Dynamics"
+msgstr "Brush Dynamics"
+
+#: ../app/tools/gimppaintoptions-gui.c:204
+msgid "Velocity:"
+msgstr "Velocity:"
+
+#: ../app/tools/gimppaintoptions-gui.c:210
+msgid "Random:"
+msgstr "Random:"
+
+#: ../app/tools/gimppaintoptions-gui.c:264
+msgid "Incremental"
+msgstr "Incremental"
+
+#: ../app/tools/gimppaintoptions-gui.c:280
+msgid "Hard edge"
+msgstr "Hard edge"
+
+#: ../app/tools/gimppaintoptions-gui.c:565
 msgid "Fade out"
 msgstr "Fade out"
 
-#: ../app/tools/gimppaintoptions-gui.c:348
-#: ../app/tools/gimppaintoptions-gui.c:441
+#: ../app/tools/gimppaintoptions-gui.c:574
+#: ../app/tools/gimppaintoptions-gui.c:657
 msgid "Length:"
 msgstr "Length:"
 
-#: ../app/tools/gimppaintoptions-gui.c:380
+#: ../app/tools/gimppaintoptions-gui.c:601
 msgid "Apply Jitter"
 msgstr "Apply Jitter"
 
-#: ../app/tools/gimppaintoptions-gui.c:385
+#: ../app/tools/gimppaintoptions-gui.c:606
 msgid "Amount:"
 msgstr "Amount:"
 
-#: ../app/tools/gimppaintoptions-gui.c:415
+#: ../app/tools/gimppaintoptions-gui.c:631
 msgid "Use color from gradient"
 msgstr "Use colour from gradient"
 
-#: ../app/tools/gimppainttool.c:132
+#: ../app/tools/gimppainttool.c:136
 msgid "Click to paint"
 msgstr "Click to paint"
 
-#: ../app/tools/gimppainttool.c:133
+#: ../app/tools/gimppainttool.c:137
 msgid "Click to draw the line"
 msgstr "Click to draw the line"
 
-#: ../app/tools/gimppainttool.c:134
+#: ../app/tools/gimppainttool.c:138
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s to pick a colour"
 
-#: ../app/tools/gimppainttool.c:651
+#: ../app/tools/gimppainttool.c:662
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s for a straight line"
@@ -10459,7 +10641,7 @@ msgstr "Pencil Tool: Hard edge painting using a brush"
 msgid "Pe_ncil"
 msgstr "Pe_ncil"
 
-#: ../app/tools/gimpperspectiveclonetool.c:128
+#: ../app/tools/gimpperspectiveclonetool.c:127
 msgid ""
 "Perspective Clone Tool: Clone from an image source after applying a "
 "perspective transformation"
@@ -10467,53 +10649,38 @@ msgstr ""
 "Perspective Clone Tool: Clone from an image source after applying a "
 "perspective transformation"
 
-#: ../app/tools/gimpperspectiveclonetool.c:130
+#: ../app/tools/gimpperspectiveclonetool.c:129
 msgid "_Perspective Clone"
 msgstr "_Perspective Clone"
 
-#: ../app/tools/gimpperspectiveclonetool.c:701
+#: ../app/tools/gimpperspectiveclonetool.c:692
 msgid "Ctrl-Click to set a clone source"
 msgstr "Ctrl-Click to set a clone source"
 
-#: ../app/tools/gimpperspectivetool.c:68
+#: ../app/tools/gimpperspectivetool.c:70
 msgid "Perspective Tool: Change perspective of the layer, selection or path"
 msgstr "Perspective Tool: Change perspective of the layer, selection or path"
 
-#: ../app/tools/gimpperspectivetool.c:70
+#: ../app/tools/gimpperspectivetool.c:72
 msgid "_Perspective"
 msgstr "_Perspective"
 
-#: ../app/tools/gimpperspectivetool.c:97
-msgid "command|Perspective"
+#: ../app/tools/gimpperspectivetool.c:99
+msgctxt "command"
+msgid "Perspective"
 msgstr "Perspective"
 
-#: ../app/tools/gimpperspectivetool.c:98
+#: ../app/tools/gimpperspectivetool.c:100
 msgid "Perspective transformation"
 msgstr "Perspective transformation"
 
-#: ../app/tools/gimpperspectivetool.c:113
+#: ../app/tools/gimpperspectivetool.c:115
 msgid "Transformation Matrix"
 msgstr "Transformation Matrix"
 
-#: ../app/tools/gimppolygonselecttool.c:162
-msgid "Polygon Select"
-msgstr "Polygon Select"
-
-#: ../app/tools/gimppolygonselecttool.c:163
-msgid "Polygon Select Tool: Select a hand-drawn polygon"
-msgstr "Polygon Select Tool: Select a hand-drawn polygon"
-
-#: ../app/tools/gimppolygonselecttool.c:164
-msgid "_Polygon Select"
-msgstr "_Polygon Select"
-
-#: ../app/tools/gimppolygonselecttool.c:575
-msgid "command|Polygon Select"
-msgstr "command|Polygon Select"
-
 #: ../app/tools/gimpposterizetool.c:85
 msgid "Posterize Tool: Reduce to a limited set of colors"
-msgstr "Posterize Tool: Reduce to a limited set of colours"
+msgstr "Posterise Tool: Reduce to a limited set of colours"
 
 #: ../app/tools/gimpposterizetool.c:86
 msgid "_Posterize..."
@@ -10528,7 +10695,7 @@ msgstr "Posterise (Reduce Number of Colours)"
 msgid "Posterize does not operate on indexed layers."
 msgstr "Posterise does not operate on indexed layers."
 
-#: ../app/tools/gimpposterizetool.c:224
+#: ../app/tools/gimpposterizetool.c:226
 msgid "Posterize _levels:"
 msgstr "Posterise _levels:"
 
@@ -10537,80 +10704,96 @@ msgid "Use all visible layers when shrinking the selection"
 msgstr "Use all visible layers when shrinking the selection"
 
 #. Current, as in what is currently in use.
-#: ../app/tools/gimprectangleoptions.c:739
+#: ../app/tools/gimprectangleoptions.c:729
 msgid "Current"
 msgstr "Current"
 
-#: ../app/tools/gimprectangleoptions.c:817
+#: ../app/tools/gimprectangleoptions.c:807
 msgid "Expand from center"
 msgstr "Expand from centre"
 
-#: ../app/tools/gimprectangleoptions.c:840
+#: ../app/tools/gimprectangleoptions.c:830
 msgid "Fixed:"
 msgstr "Fixed:"
 
-#: ../app/tools/gimprectangleoptions.c:973
+#: ../app/tools/gimprectangleoptions.c:963
 msgid "Position:"
 msgstr "Position:"
 
-#: ../app/tools/gimprectangleoptions.c:991
+#: ../app/tools/gimprectangleoptions.c:981
 msgid "Highlight"
 msgstr "Highlight"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:1001
+#: ../app/tools/gimprectangleoptions.c:991
 msgid "Auto Shrink"
 msgstr "Auto Shrink"
 
-#: ../app/tools/gimprectangleoptions.c:1008
+#: ../app/tools/gimprectangleoptions.c:998
 msgid "Shrink merged"
 msgstr "Shrink merged"
 
-#: ../app/tools/gimprectangleselectoptions.c:155
+#: ../app/tools/gimprectangleselectoptions.c:164
 msgid "Rounded corners"
 msgstr "Rounded corners"
 
-#: ../app/tools/gimprectangleselecttool.c:165
+#: ../app/tools/gimprectangleselecttool.c:167
 msgid "Rectangle Select"
 msgstr "Rectangle Select"
 
-#: ../app/tools/gimprectangleselecttool.c:166
+#: ../app/tools/gimprectangleselecttool.c:168
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr "Rectangle Select Tool: Select a rectangular region"
 
-#: ../app/tools/gimprectangleselecttool.c:167
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "_Rectangle Select"
 msgstr "_Rectangle Select"
 
-#: ../app/tools/gimprectangletool.c:1068 ../app/tools/gimprectangletool.c:1943
+#: ../app/tools/gimprectangletool.c:1085 ../app/tools/gimprectangletool.c:1981
 msgid "Rectangle: "
 msgstr "Rectangle: "
 
+#: ../app/tools/gimpregionselectoptions.c:83
+msgid "Allow completely transparent regions to be selected"
+msgstr "Allow completely transparent regions to be selected"
+
+#: ../app/tools/gimpregionselectoptions.c:90
+msgid "Base region_select on all visible layers"
+msgstr "Base region_select on all visible layers"
+
+#: ../app/tools/gimpregionselectoptions.c:202
+msgid "Select transparent areas"
+msgstr "Select transparent areas"
+
+#: ../app/tools/gimpregionselectoptions.c:227
+msgid "Select by:"
+msgstr "Select by:"
+
 #: ../app/tools/gimpregionselecttool.c:162
 msgid "Move the mouse to change threshold"
 msgstr "Move the mouse to change threshold"
 
-#: ../app/tools/gimprotatetool.c:85
+#: ../app/tools/gimprotatetool.c:90
 msgid "Rotate"
 msgstr "Rotate"
 
-#: ../app/tools/gimprotatetool.c:86
+#: ../app/tools/gimprotatetool.c:91
 msgid "Rotate Tool: Rotate the layer, selection or path"
 msgstr "Rotate Tool: Rotate the layer, selection or path"
 
-#: ../app/tools/gimprotatetool.c:87
+#: ../app/tools/gimprotatetool.c:92
 msgid "_Rotate"
 msgstr "_Rotate"
 
-#: ../app/tools/gimprotatetool.c:142
+#: ../app/tools/gimprotatetool.c:188
 msgid "_Angle:"
 msgstr "_Angle:"
 
-#: ../app/tools/gimprotatetool.c:157
+#: ../app/tools/gimprotatetool.c:204
 msgid "Center _X:"
 msgstr "Centre _X:"
 
-#: ../app/tools/gimprotatetool.c:166
+#: ../app/tools/gimprotatetool.c:213
 msgid "Center _Y:"
 msgstr "Centre _Y:"
 
@@ -10627,10 +10810,11 @@ msgid "_Scale"
 msgstr "_Scale"
 
 #: ../app/tools/gimpscaletool.c:106
-msgid "command|Scale"
+msgctxt "command"
+msgid "Scale"
 msgstr "Scale"
 
-#: ../app/tools/gimpselectionoptions.c:258 ../app/tools/gimptextoptions.c:457
+#: ../app/tools/gimpselectionoptions.c:258 ../app/tools/gimptextoptions.c:473
 msgid "Antialiasing"
 msgstr "Antialiasing"
 
@@ -10674,27 +10858,28 @@ msgstr "Click-Drag to move a copy of the selected pixels"
 msgid "Click to anchor the floating selection"
 msgstr "Click to anchor the floating selection"
 
-#: ../app/tools/gimpsheartool.c:81
+#: ../app/tools/gimpsheartool.c:82
 msgid "Shear"
 msgstr "Shear"
 
-#: ../app/tools/gimpsheartool.c:82
+#: ../app/tools/gimpsheartool.c:83
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "Shear Tool: Shear the layer, selection or path"
 
-#: ../app/tools/gimpsheartool.c:83
+#: ../app/tools/gimpsheartool.c:84
 msgid "S_hear"
 msgstr "S_hear"
 
-#: ../app/tools/gimpsheartool.c:109
-msgid "command|Shear"
+#: ../app/tools/gimpsheartool.c:110
+msgctxt "command"
+msgid "Shear"
 msgstr "Shear"
 
-#: ../app/tools/gimpsheartool.c:133
+#: ../app/tools/gimpsheartool.c:134
 msgid "Shear magnitude _X:"
 msgstr "Shear magnitude _X:"
 
-#: ../app/tools/gimpsheartool.c:143
+#: ../app/tools/gimpsheartool.c:144
 msgid "Shear magnitude _Y:"
 msgstr "Shear magnitude _Y:"
 
@@ -10714,13 +10899,13 @@ msgstr "Click to smudge"
 msgid "Click to smudge the line"
 msgstr "Click to smudge the line"
 
-#: ../app/tools/gimptextoptions.c:114
+#: ../app/tools/gimptextoptions.c:127
 msgid ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 msgstr ""
 "Hinting alters the font outline to produce a crisp bitmap at small sizes"
 
-#: ../app/tools/gimptextoptions.c:121
+#: ../app/tools/gimptextoptions.c:134
 msgid ""
 "If available, hints from the font are used but you may prefer to always use "
 "the automatic hinter"
@@ -10728,68 +10913,72 @@ msgstr ""
 "If available, hints from the font are used but you may prefer to always use "
 "the automatic hinter"
 
-#: ../app/tools/gimptextoptions.c:146
+#: ../app/tools/gimptextoptions.c:159
 msgid "Indentation of the first line"
 msgstr "Indentation of the first line"
 
-#: ../app/tools/gimptextoptions.c:152
+#: ../app/tools/gimptextoptions.c:165
 msgid "Adjust line spacing"
 msgstr "Adjust line spacing"
 
-#: ../app/tools/gimptextoptions.c:158
+#: ../app/tools/gimptextoptions.c:171
 msgid "Adjust letter spacing"
 msgstr "Adjust letter spacing"
 
-#: ../app/tools/gimptextoptions.c:429
+#: ../app/tools/gimptextoptions.c:445
 msgid "Font:"
 msgstr "Font:"
 
-#: ../app/tools/gimptextoptions.c:441
+#: ../app/tools/gimptextoptions.c:461
 msgid "Hinting"
 msgstr "Hinting"
 
-#: ../app/tools/gimptextoptions.c:448
+#: ../app/tools/gimptextoptions.c:466
 msgid "Force auto-hinter"
 msgstr "Force auto-hinter"
 
-#: ../app/tools/gimptextoptions.c:465
+#: ../app/tools/gimptextoptions.c:487
 msgid "Text Color"
 msgstr "Text Colour"
 
-#: ../app/tools/gimptextoptions.c:470
+#: ../app/tools/gimptextoptions.c:492
 msgid "Color:"
 msgstr "Colour:"
 
-#: ../app/tools/gimptextoptions.c:476
+#: ../app/tools/gimptextoptions.c:498
 msgid "Justify:"
 msgstr "Justify:"
 
 #. Create a path from the current text
-#: ../app/tools/gimptextoptions.c:498
+#: ../app/tools/gimptextoptions.c:520
 msgid "Path from Text"
 msgstr "Path from Text"
 
-#: ../app/tools/gimptextoptions.c:505
+#: ../app/tools/gimptextoptions.c:527
 msgid "Text along Path"
 msgstr "Text along Path"
 
-#: ../app/tools/gimptexttool.c:142
+#: ../app/tools/gimptexttool.c:161
 msgid "Text Tool: Create or edit text layers"
 msgstr "Text Tool: Create or edit text layers"
 
-#: ../app/tools/gimptexttool.c:143
+#: ../app/tools/gimptexttool.c:162
 msgid "Te_xt"
 msgstr "Te_xt"
 
-#: ../app/tools/gimptexttool.c:753
+#: ../app/tools/gimptexttool.c:956
 msgid "GIMP Text Editor"
 msgstr "GIMP Text Editor"
 
-#: ../app/tools/gimptexttool.c:864 ../app/tools/gimptexttool.c:867
+#: ../app/tools/gimptexttool.c:1072 ../app/tools/gimptexttool.c:1075
 msgid "Confirm Text Editing"
 msgstr "Confirm Text Editing"
 
-#: ../app/tools/gimptexttool.c:896
+#: ../app/tools/gimptexttool.c:1079
+msgid "Create _New Layer"
+msgstr "Create _New Layer"
+
+#: ../app/tools/gimptexttool.c:1103
 msgid ""
 "The layer you selected is a text layer but it has been modified using other "
 "tools. Editing the layer with the text tool will discard these "
@@ -10803,6 +10992,10 @@ msgstr ""
 "\n"
 "You can edit the layer or create a new text layer from its text attributes."
 
+#: ../app/tools/gimptexttool.c:1315
+msgid "Reshape Text Layer"
+msgstr "Reshape Text Layer"
+
 #: ../app/tools/gimpthresholdtool.c:91
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
 msgstr "Threshold Tool: Reduce image to two colours using a threshold"
@@ -10815,12 +11008,20 @@ msgstr "_Threshold..."
 msgid "Apply Threshold"
 msgstr "Apply Threshold"
 
-#: ../app/tools/gimpthresholdtool.c:158
+#: ../app/tools/gimpthresholdtool.c:111
+msgid "Import Threshold Settings"
+msgstr "Import Threshold Settings"
+
+#: ../app/tools/gimpthresholdtool.c:112
+msgid "Export Threshold Settings"
+msgstr "Export Threshold Settings"
+
+#: ../app/tools/gimpthresholdtool.c:161
 #, c-format
 msgid "Threshold does not operate on indexed layers."
 msgstr "Threshold does not operate on indexed layers."
 
-#: ../app/tools/gimpthresholdtool.c:263
+#: ../app/tools/gimpthresholdtool.c:266
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "Automatically adjust to optimal binarisation threshold"
 
@@ -10855,15 +11056,15 @@ msgstr "15 degrees  (%s)"
 msgid "Keep aspect  (%s)"
 msgstr "Keep aspect  (%s)"
 
-#: ../app/tools/gimptransformtool.c:236
+#: ../app/tools/gimptransformtool.c:238
 msgid "Transforming"
 msgstr "Transforming"
 
-#: ../app/tools/gimptransformtool.c:1162
+#: ../app/tools/gimptransformtool.c:1165
 msgid "There is no layer to transform."
 msgstr "There is no layer to transform."
 
-#: ../app/tools/gimptransformtool.c:1173
+#: ../app/tools/gimptransformtool.c:1176
 msgid "There is no path to transform."
 msgstr "There is no path to transform."
 
@@ -10905,128 +11106,128 @@ msgstr "Paths Tool: Create and edit paths"
 msgid "Pat_hs"
 msgstr "Pat_hs"
 
-#: ../app/tools/gimpvectortool.c:320
+#: ../app/tools/gimpvectortool.c:322
 msgid "Add Stroke"
 msgstr "Add Stroke"
 
-#: ../app/tools/gimpvectortool.c:338
+#: ../app/tools/gimpvectortool.c:345
 msgid "Add Anchor"
 msgstr "Add Anchor"
 
-#: ../app/tools/gimpvectortool.c:361
+#: ../app/tools/gimpvectortool.c:370
 msgid "Insert Anchor"
 msgstr "Insert Anchor"
 
-#: ../app/tools/gimpvectortool.c:390
+#: ../app/tools/gimpvectortool.c:400
 msgid "Drag Handle"
 msgstr "Drag Handle"
 
-#: ../app/tools/gimpvectortool.c:419
+#: ../app/tools/gimpvectortool.c:429
 msgid "Drag Anchor"
 msgstr "Drag Anchor"
 
-#: ../app/tools/gimpvectortool.c:436
+#: ../app/tools/gimpvectortool.c:446
 msgid "Drag Anchors"
 msgstr "Drag Anchors"
 
-#: ../app/tools/gimpvectortool.c:456
+#: ../app/tools/gimpvectortool.c:468
 msgid "Drag Curve"
 msgstr "Drag Curve"
 
-#: ../app/tools/gimpvectortool.c:484
+#: ../app/tools/gimpvectortool.c:496
 msgid "Connect Strokes"
 msgstr "Connect Strokes"
 
-#: ../app/tools/gimpvectortool.c:514
+#: ../app/tools/gimpvectortool.c:527
 msgid "Drag Path"
 msgstr "Drag Path"
 
-#: ../app/tools/gimpvectortool.c:524
+#: ../app/tools/gimpvectortool.c:537
 msgid "Convert Edge"
 msgstr "Convert Edge"
 
-#: ../app/tools/gimpvectortool.c:554
+#: ../app/tools/gimpvectortool.c:567
 msgid "Delete Anchor"
 msgstr "Delete Anchor"
 
-#: ../app/tools/gimpvectortool.c:576
+#: ../app/tools/gimpvectortool.c:589
 msgid "Delete Segment"
 msgstr "Delete Segment"
 
-#: ../app/tools/gimpvectortool.c:788
+#: ../app/tools/gimpvectortool.c:807
 msgid "Move Anchors"
 msgstr "Move Anchors"
 
-#: ../app/tools/gimpvectortool.c:1146
+#: ../app/tools/gimpvectortool.c:1167
 msgid "Click to pick path to edit"
 msgstr "Click to pick path to edit"
 
-#: ../app/tools/gimpvectortool.c:1149
+#: ../app/tools/gimpvectortool.c:1171
 msgid "Click to create a new path"
 msgstr "Click to create a new path"
 
-#: ../app/tools/gimpvectortool.c:1152
+#: ../app/tools/gimpvectortool.c:1175
 msgid "Click to create a new component of the path"
 msgstr "Click to create a new component of the path"
 
-#: ../app/tools/gimpvectortool.c:1155
+#: ../app/tools/gimpvectortool.c:1179
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "Click or Click-Drag to create a new anchor"
 
-#: ../app/tools/gimpvectortool.c:1164 ../app/tools/gimpvectortool.c:1171
+#: ../app/tools/gimpvectortool.c:1189 ../app/tools/gimpvectortool.c:1196
 msgid "Click-Drag to move the anchor around"
 msgstr "Click-Drag to move the anchor around"
 
-#: ../app/tools/gimpvectortool.c:1174 ../app/tools/gimpvectortool.c:1185
+#: ../app/tools/gimpvectortool.c:1200 ../app/tools/gimpvectortool.c:1213
 msgid "Click-Drag to move the anchors around"
 msgstr "Click-Drag to move the anchors around"
 
-#: ../app/tools/gimpvectortool.c:1177
+#: ../app/tools/gimpvectortool.c:1204
 msgid "Click-Drag to move the handle around"
 msgstr "Click-Drag to move the handle around"
 
-#: ../app/tools/gimpvectortool.c:1190
+#: ../app/tools/gimpvectortool.c:1218
 msgid "Click-Drag to change the shape of the curve"
 msgstr "Click-Drag to change the shape of the curve"
 
-#: ../app/tools/gimpvectortool.c:1193
+#: ../app/tools/gimpvectortool.c:1221
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%s: symmetrical"
 
-#: ../app/tools/gimpvectortool.c:1197
+#: ../app/tools/gimpvectortool.c:1226
 msgid "Click-Drag to move the component around"
 msgstr "Click-Drag to move the component around"
 
-#: ../app/tools/gimpvectortool.c:1204
+#: ../app/tools/gimpvectortool.c:1234
 msgid "Click-Drag to move the path around"
 msgstr "Click-Drag to move the path around"
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1238
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "Click-Drag to insert an anchor on the path"
 
-#: ../app/tools/gimpvectortool.c:1214
+#: ../app/tools/gimpvectortool.c:1246
 msgid "Click to delete this anchor"
 msgstr "Click to delete this anchor"
 
-#: ../app/tools/gimpvectortool.c:1217
+#: ../app/tools/gimpvectortool.c:1250
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "Click to connect this anchor with the selected endpoint"
 
-#: ../app/tools/gimpvectortool.c:1221
+#: ../app/tools/gimpvectortool.c:1255
 msgid "Click to open up the path"
 msgstr "Click to open up the path"
 
-#: ../app/tools/gimpvectortool.c:1224
+#: ../app/tools/gimpvectortool.c:1259
 msgid "Click to make this node angular"
 msgstr "Click to make this node angular"
 
-#: ../app/tools/gimpvectortool.c:1730
+#: ../app/tools/gimpvectortool.c:1766
 msgid "Delete Anchors"
 msgstr "Delete Anchors"
 
-#: ../app/tools/gimpvectortool.c:1903
+#: ../app/tools/gimpvectortool.c:1939
 msgid "There is no active layer or channel to stroke to"
 msgstr "There is no active layer or channel to stroke to"
 
@@ -11050,13 +11251,13 @@ msgstr "Golden sections"
 msgid "Aspect ratio"
 msgstr "Aspect ratio"
 
-#: ../app/tools/tools-enums.c:149 ../app/widgets/gimpgrideditor.c:257
-#: ../app/widgets/gimpgrideditor.c:289
+#: ../app/tools/tools-enums.c:149 ../app/widgets/gimpgrideditor.c:265
+#: ../app/widgets/gimpgrideditor.c:297
 msgid "Width"
 msgstr "Width"
 
-#: ../app/tools/tools-enums.c:150 ../app/widgets/gimpgrideditor.c:259
-#: ../app/widgets/gimpgrideditor.c:291
+#: ../app/tools/tools-enums.c:150 ../app/widgets/gimpgrideditor.c:267
+#: ../app/widgets/gimpgrideditor.c:299
 msgid "Height"
 msgstr "Height"
 
@@ -11072,7 +11273,7 @@ msgstr "Fixed size"
 msgid "Fixed aspect ratio"
 msgstr "Fixed aspect ratio"
 
-#: ../app/tools/tools-enums.c:211 ../app/vectors/gimpvectors.c:191
+#: ../app/tools/tools-enums.c:211 ../app/vectors/gimpvectors.c:192
 msgid "Path"
 msgstr "Path"
 
@@ -11100,31 +11301,31 @@ msgstr "Design"
 msgid "Move"
 msgstr "Move"
 
-#: ../app/vectors/gimpvectors.c:192
+#: ../app/vectors/gimpvectors.c:193
 msgid "Rename Path"
 msgstr "Rename Path"
 
-#: ../app/vectors/gimpvectors.c:193 ../app/vectors/gimpvectors.c:315
+#: ../app/vectors/gimpvectors.c:194 ../app/vectors/gimpvectors.c:316
 msgid "Move Path"
 msgstr "Move Path"
 
-#: ../app/vectors/gimpvectors.c:194
+#: ../app/vectors/gimpvectors.c:195
 msgid "Scale Path"
 msgstr "Scale Path"
 
-#: ../app/vectors/gimpvectors.c:195
+#: ../app/vectors/gimpvectors.c:196
 msgid "Resize Path"
 msgstr "Resize Path"
 
-#: ../app/vectors/gimpvectors.c:196 ../app/vectors/gimpvectors.c:414
+#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:415
 msgid "Flip Path"
 msgstr "Flip Path"
 
-#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:445
+#: ../app/vectors/gimpvectors.c:198 ../app/vectors/gimpvectors.c:446
 msgid "Rotate Path"
 msgstr "Rotate Path"
 
-#: ../app/vectors/gimpvectors.c:198 ../app/vectors/gimpvectors.c:475
+#: ../app/vectors/gimpvectors.c:199 ../app/vectors/gimpvectors.c:476
 msgid "Transform Path"
 msgstr "Transform Path"
 
@@ -11156,51 +11357,55 @@ msgstr "No paths found in the buffer"
 msgid "Failed to import paths from '%s': %s"
 msgstr "Failed to import paths from '%s': %s"
 
-#: ../app/widgets/gimpactiongroup.c:800
+#: ../app/widgets/gimpactioneditor.c:71
+msgid "_Search:"
+msgstr "_Search:"
+
+#: ../app/widgets/gimpactiongroup.c:802
 #, c-format
 msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpactionview.c:312
-#: ../app/widgets/gimpcontrollereditor.c:347
+#: ../app/widgets/gimpactionview.c:346
+#: ../app/widgets/gimpcontrollereditor.c:348
 msgid "Action"
 msgstr "Action"
 
-#: ../app/widgets/gimpactionview.c:341
+#: ../app/widgets/gimpactionview.c:375
 msgid "Shortcut"
 msgstr "Shortcut"
 
-#: ../app/widgets/gimpactionview.c:365
+#: ../app/widgets/gimpactionview.c:401
 msgid "Name"
 msgstr "Name"
 
-#: ../app/widgets/gimpactionview.c:497 ../app/widgets/gimpactionview.c:701
+#: ../app/widgets/gimpactionview.c:641 ../app/widgets/gimpactionview.c:846
 msgid "Changing shortcut failed."
 msgstr "Changing shortcut failed."
 
-#: ../app/widgets/gimpactionview.c:539
+#: ../app/widgets/gimpactionview.c:683
 msgid "Conflicting Shortcuts"
 msgstr "Conflicting Shortcuts"
 
-#: ../app/widgets/gimpactionview.c:545
+#: ../app/widgets/gimpactionview.c:689
 msgid "_Reassign shortcut"
 msgstr "_Reassign shortcut"
 
-#: ../app/widgets/gimpactionview.c:560
+#: ../app/widgets/gimpactionview.c:704
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
 msgstr "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
 
-#: ../app/widgets/gimpactionview.c:564
+#: ../app/widgets/gimpactionview.c:708
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
 msgstr "Reassigning the shortcut will cause it to be removed from \"%s\"."
 
-#: ../app/widgets/gimpactionview.c:637
+#: ../app/widgets/gimpactionview.c:781
 msgid "Invalid shortcut."
 msgstr "Invalid shortcut."
 
-#: ../app/widgets/gimpactionview.c:725
+#: ../app/widgets/gimpactionview.c:870
 msgid "Removing shortcut failed."
 msgstr "Removing shortcut failed."
 
@@ -11227,7 +11432,7 @@ msgid "Percentage of width of brush"
 msgstr "Percentage of width of brush"
 
 #: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:744
+#: ../app/widgets/gimpeditor.c:754
 msgid "(None)"
 msgstr "(None)"
 
@@ -11339,21 +11544,21 @@ msgstr "Alpha:"
 
 #: ../app/widgets/gimpcolorframe.c:623 ../app/widgets/gimpcursorview.c:134
 #: ../app/widgets/gimpcursorview.c:140 ../app/widgets/gimpcursorview.c:156
-#: ../app/widgets/gimpcursorview.c:162 ../app/widgets/gimpcursorview.c:445
-#: ../app/widgets/gimpcursorview.c:446 ../app/widgets/gimpcursorview.c:447
-#: ../app/widgets/gimpcursorview.c:448
+#: ../app/widgets/gimpcursorview.c:162 ../app/widgets/gimpcursorview.c:444
+#: ../app/widgets/gimpcursorview.c:445 ../app/widgets/gimpcursorview.c:446
+#: ../app/widgets/gimpcursorview.c:447
 msgid "n/a"
 msgstr "n/a"
 
-#: ../app/widgets/gimpcolormapeditor.c:226
+#: ../app/widgets/gimpcolormapeditor.c:225
 msgid "Color index:"
 msgstr "Colour index:"
 
-#: ../app/widgets/gimpcolormapeditor.c:236
+#: ../app/widgets/gimpcolormapeditor.c:235
 msgid "HTML notation:"
 msgstr "HTML notation:"
 
-#: ../app/widgets/gimpcolormapeditor.c:493
+#: ../app/widgets/gimpcolormapeditor.c:492
 msgid "Only indexed images have a colormap."
 msgstr "Only indexed images have a colourmap."
 
@@ -11361,44 +11566,48 @@ msgstr "Only indexed images have a colourmap."
 msgid "Palette"
 msgstr "Palette"
 
-#: ../app/widgets/gimpcontainerpopup.c:538
+#: ../app/widgets/gimpcontainerpopup.c:540
 msgid "Smaller Previews"
 msgstr "Smaller Previews"
 
-#: ../app/widgets/gimpcontainerpopup.c:543
+#: ../app/widgets/gimpcontainerpopup.c:545
 msgid "Larger Previews"
 msgstr "Larger Previews"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:202
 msgid "_Dump events from this controller"
 msgstr "_Dump events from this controller"
 
-#: ../app/widgets/gimpcontrollereditor.c:206
+#: ../app/widgets/gimpcontrollereditor.c:207
 msgid "_Enable this controller"
 msgstr "_Enable this controller"
 
-#: ../app/widgets/gimpcontrollereditor.c:227
+#: ../app/widgets/gimpcontrollereditor.c:228
 msgid "Name:"
 msgstr "Name:"
 
-#: ../app/widgets/gimpcontrollereditor.c:341
+#: ../app/widgets/gimpcontrollereditor.c:234
+msgid "State:"
+msgstr "State:"
+
+#: ../app/widgets/gimpcontrollereditor.c:342
 msgid "Event"
 msgstr "Event"
 
-#: ../app/widgets/gimpcontrollereditor.c:366
+#: ../app/widgets/gimpcontrollereditor.c:367
 msgid "_Grab event"
 msgstr "_Grab event"
 
-#: ../app/widgets/gimpcontrollereditor.c:376
+#: ../app/widgets/gimpcontrollereditor.c:377
 msgid "Select the next event arriving from the controller"
 msgstr "Select the next event arriving from the controller"
 
-#: ../app/widgets/gimpcontrollereditor.c:534
+#: ../app/widgets/gimpcontrollereditor.c:535
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "Remove the action assigned to '%s'"
 
-#: ../app/widgets/gimpcontrollereditor.c:539
+#: ../app/widgets/gimpcontrollereditor.c:540
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "Assign an action to '%s'"
@@ -11489,17 +11698,17 @@ msgstr "Move the selected controller up"
 msgid "Move the selected controller down"
 msgstr "Move the selected controller down"
 
-#: ../app/widgets/gimpcontrollerlist.c:428
+#: ../app/widgets/gimpcontrollerlist.c:430
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "Add '%s' to the list of active controllers"
 
-#: ../app/widgets/gimpcontrollerlist.c:479
+#: ../app/widgets/gimpcontrollerlist.c:481
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "Remove '%s' from the list of active controllers"
 
-#: ../app/widgets/gimpcontrollerlist.c:512
+#: ../app/widgets/gimpcontrollerlist.c:514
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -11509,7 +11718,7 @@ msgstr ""
 "\n"
 "You already have a keyboard controller in your list of active controllers."
 
-#: ../app/widgets/gimpcontrollerlist.c:522
+#: ../app/widgets/gimpcontrollerlist.c:524
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -11519,24 +11728,24 @@ msgstr ""
 "\n"
 "You already have a wheel controller in your list of active controllers."
 
-#: ../app/widgets/gimpcontrollerlist.c:549
+#: ../app/widgets/gimpcontrollerlist.c:551
 msgid "Remove Controller?"
 msgstr "Remove Controller?"
 
-#: ../app/widgets/gimpcontrollerlist.c:554
+#: ../app/widgets/gimpcontrollerlist.c:556
 msgid "Disable Controller"
 msgstr "Disable Controller"
 
-#: ../app/widgets/gimpcontrollerlist.c:556
+#: ../app/widgets/gimpcontrollerlist.c:558
 msgid "Remove Controller"
 msgstr "Remove Controller"
 
-#: ../app/widgets/gimpcontrollerlist.c:567
+#: ../app/widgets/gimpcontrollerlist.c:569
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "Remove Controller '%s'?"
 
-#: ../app/widgets/gimpcontrollerlist.c:571
+#: ../app/widgets/gimpcontrollerlist.c:573
 #, c-format
 msgid ""
 "Removing this controller from the list of active controllers will "
@@ -11551,7 +11760,7 @@ msgstr ""
 "Selecting \"Disable Controller\" will disable the controller without "
 "removing it."
 
-#: ../app/widgets/gimpcontrollerlist.c:631
+#: ../app/widgets/gimpcontrollerlist.c:633
 msgid "Configure Input Controller"
 msgstr "Configure Input Controller"
 
@@ -11627,7 +11836,7 @@ msgstr "Save"
 msgid "Revert"
 msgstr "Revert"
 
-#: ../app/widgets/gimpdataeditor.c:445
+#: ../app/widgets/gimpdataeditor.c:444
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (read only)"
@@ -11667,32 +11876,7 @@ msgstr "A file named '%s' already exists."
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "Do you want to replace it with the image you are saving?"
 
-#: ../app/widgets/gimpdock.c:287
-msgid "Close all Tabs?"
-msgstr "Close all Tabs?"
-
-#: ../app/widgets/gimpdock.c:293
-msgid "Close all Tabs"
-msgstr "Close all Tabs"
-
-#: ../app/widgets/gimpdock.c:303
-msgid "Close all tabs?"
-msgstr "Close all tabs?"
-
-#: ../app/widgets/gimpdock.c:306
-#, c-format
-msgid ""
-"This window has %d tab open. Closing the window will also close all its tabs."
-msgid_plural ""
-"This window has %d tabs open. Closing the window will also close all its "
-"tabs."
-msgstr[0] ""
-"This window has %d tab open. Closing the window will also close all its tabs."
-msgstr[1] ""
-"This window has %d tabs open. Closing the window will also close all its "
-"tabs."
-
-#: ../app/widgets/gimpdockable.c:166
+#: ../app/widgets/gimpdockable.c:194
 msgid "Configure this tab"
 msgstr "Configure this tab"
 
@@ -11713,23 +11897,23 @@ msgstr "Messages are redirected to stderr."
 msgid "%s Message"
 msgstr "%s Message"
 
-#: ../app/widgets/gimpfiledialog.c:273
+#: ../app/widgets/gimpfiledialog.c:310
 msgid "Automatically Detected"
 msgstr "Automatically Detected"
 
-#: ../app/widgets/gimpfiledialog.c:283
+#: ../app/widgets/gimpfiledialog.c:320
 msgid "By Extension"
 msgstr "By Extension"
 
-#: ../app/widgets/gimpfiledialog.c:542
+#: ../app/widgets/gimpfiledialog.c:652
 msgid "All files"
 msgstr "All files"
 
-#: ../app/widgets/gimpfiledialog.c:547
+#: ../app/widgets/gimpfiledialog.c:657
 msgid "All images"
 msgstr "All images"
 
-#: ../app/widgets/gimpfiledialog.c:676
+#: ../app/widgets/gimpfiledialog.c:786
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "Select File _Type (%s)"
@@ -11757,127 +11941,149 @@ msgstr "Zoom factor: %d:1"
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "Displaying [%0.4f, %0.4f]"
 
-#: ../app/widgets/gimpgradienteditor.c:996
+#: ../app/widgets/gimpgradienteditor.c:997
 #, c-format
 msgid "Position: %0.4f"
 msgstr "Position: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:997
+#: ../app/widgets/gimpgradienteditor.c:998
 #, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
 msgstr "RGB (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:999
+#: ../app/widgets/gimpgradienteditor.c:1000
 #, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1001
+#: ../app/widgets/gimpgradienteditor.c:1002
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "Luminance: %0.1f    Opacity: %0.1f"
 
-#: ../app/widgets/gimpgradienteditor.c:1032
+#: ../app/widgets/gimpgradienteditor.c:1033
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%d, %d, %d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1043
+#: ../app/widgets/gimpgradienteditor.c:1044
 msgid "Foreground color set to:"
 msgstr "Foreground colour set to:"
 
-#: ../app/widgets/gimpgradienteditor.c:1050
+#: ../app/widgets/gimpgradienteditor.c:1051
 msgid "Background color set to:"
 msgstr "Background colour set to:"
 
-#: ../app/widgets/gimpgradienteditor.c:1282
-#: ../app/widgets/gimpgradienteditor.c:1348
+#: ../app/widgets/gimpgradienteditor.c:1285
+#: ../app/widgets/gimpgradienteditor.c:1351
 #, c-format
 msgid "%s%sDrag: move & compress"
 msgstr "%s%sDrag: move & compress"
 
-#: ../app/widgets/gimpgradienteditor.c:1288
+#: ../app/widgets/gimpgradienteditor.c:1291
 msgid "Drag: move"
 msgstr "Drag: move"
 
-#: ../app/widgets/gimpgradienteditor.c:1295
-#: ../app/widgets/gimpgradienteditor.c:1309
-#: ../app/widgets/gimpgradienteditor.c:1323
-#: ../app/widgets/gimpgradienteditor.c:1345
+#: ../app/widgets/gimpgradienteditor.c:1298
+#: ../app/widgets/gimpgradienteditor.c:1312
+#: ../app/widgets/gimpgradienteditor.c:1326
+#: ../app/widgets/gimpgradienteditor.c:1348
 #, c-format
 msgid "%s%sClick: extend selection"
 msgstr "%s%sClick: extend selection"
 
-#: ../app/widgets/gimpgradienteditor.c:1301
-#: ../app/widgets/gimpgradienteditor.c:1315
+#: ../app/widgets/gimpgradienteditor.c:1304
+#: ../app/widgets/gimpgradienteditor.c:1318
 msgid "Click: select"
 msgstr "Click: select"
 
-#: ../app/widgets/gimpgradienteditor.c:1329
-#: ../app/widgets/gimpgradienteditor.c:1353
+#: ../app/widgets/gimpgradienteditor.c:1332
+#: ../app/widgets/gimpgradienteditor.c:1356
 msgid "Click: select    Drag: move"
 msgstr "Click: select    Drag: move"
 
-#: ../app/widgets/gimpgradienteditor.c:1568
-#: ../app/widgets/gimpgradienteditor.c:1576
+#: ../app/widgets/gimpgradienteditor.c:1571
+#: ../app/widgets/gimpgradienteditor.c:1579
 #, c-format
 msgid "Handle position: %0.4f"
 msgstr "Handle position: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:1593
+#: ../app/widgets/gimpgradienteditor.c:1596
 #, c-format
 msgid "Distance: %0.4f"
 msgstr "Distance: %0.4f"
 
-#: ../app/widgets/gimpgrideditor.c:209
+#: ../app/widgets/gimpgrideditor.c:217
 msgid "Line _style:"
 msgstr "Line _style:"
 
-#: ../app/widgets/gimpgrideditor.c:213
+#: ../app/widgets/gimpgrideditor.c:221
 msgid "Change grid foreground color"
 msgstr "Change grid foreground colour"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:228
 msgid "_Foreground color:"
 msgstr "_Foreground colour:"
 
-#: ../app/widgets/gimpgrideditor.c:224
+#: ../app/widgets/gimpgrideditor.c:232
 msgid "Change grid background color"
 msgstr "Change grid background colour"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:239
 msgid "_Background color:"
 msgstr "_Background colour:"
 
-#: ../app/widgets/gimpgrideditor.c:236
+#: ../app/widgets/gimpgrideditor.c:244
 msgid "Spacing"
 msgstr "Spacing"
 
-#: ../app/widgets/gimphelp.c:189
-msgid "Help browser not found"
-msgstr "Help browser not found"
+#: ../app/widgets/gimphelp.c:294
+msgid "Help browser is missing"
+msgstr "Help browser is missing"
 
-#: ../app/widgets/gimphelp.c:190
-msgid "Could not find GIMP help browser."
-msgstr "Could not find GIMP help browser."
+#: ../app/widgets/gimphelp.c:295
+msgid "The GIMP help browser is not available."
+msgstr "The GIMP help browser is not available."
 
-#: ../app/widgets/gimphelp.c:191
+#: ../app/widgets/gimphelp.c:296
 msgid ""
-"The GIMP help browser plug-in appears to be missing from your installation."
+"The GIMP help browser plug-in appears to be missing from your installation. "
+"You may instead use the web browser for reading the help pages."
 msgstr ""
-"The GIMP help browser plug-in appears to be missing from your installation."
+"The GIMP help browser plug-in appears to be missing from your installation. "
+"You may instead use the web browser for reading the help pages."
 
-#: ../app/widgets/gimphelp.c:232
+#: ../app/widgets/gimphelp.c:337
 msgid "Help browser doesn't start"
 msgstr "Help browser doesn't start"
 
-#: ../app/widgets/gimphelp.c:233
+#: ../app/widgets/gimphelp.c:338
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "Could not start the GIMP help browser plug-in."
 
-#: ../app/widgets/gimphelp.c:259
-msgid "Use _web browser instead"
-msgstr "Use _web browser instead"
+#: ../app/widgets/gimphelp.c:365
+msgid "Use _Web Browser"
+msgstr "Use _Web Browser"
+
+#: ../app/widgets/gimphelp.c:614
+msgid "GIMP user manual is missing"
+msgstr "GIMP user manual is missing"
+
+#: ../app/widgets/gimphelp.c:621
+msgid "_Read Online"
+msgstr "_Read Online"
+
+#: ../app/widgets/gimphelp.c:645
+msgid "The GIMP user manual is not installed on your computer."
+msgstr "The GIMP user manual is not installed on your computer."
+
+#: ../app/widgets/gimphelp.c:648
+msgid ""
+"You may either install the additional help package or change your "
+"preferences to use the online version."
+msgstr ""
+"You may either install the additional help package or change your "
+"preferences to use the online version."
 
 #: ../app/widgets/gimphistogrameditor.c:99
 msgid "Mean:"
@@ -11981,11 +12187,11 @@ msgstr "%g × %g %s"
 msgid "colors"
 msgstr "Colours"
 
-#: ../app/widgets/gimpitemtreeview.c:983
+#: ../app/widgets/gimpitemtreeview.c:980
 msgid "Set Item Exclusive Visible"
 msgstr "Set Item Exclusive Visible"
 
-#: ../app/widgets/gimpitemtreeview.c:991
+#: ../app/widgets/gimpitemtreeview.c:988
 msgid "Set Item Exclusive Linked"
 msgstr "Set Item Exclusive Linked"
 
@@ -12001,7 +12207,7 @@ msgstr "Lock alpha channel"
 msgid "Lock:"
 msgstr "Lock:"
 
-#: ../app/widgets/gimplayertreeview.c:842
+#: ../app/widgets/gimplayertreeview.c:841
 msgid "Empty Layer"
 msgstr "Empty Layer"
 
@@ -12013,14 +12219,14 @@ msgstr "Auto"
 msgid ""
 "When enabled the dialog automatically follows the image you are working on."
 msgstr ""
-"When enabled the dialog automatically follows the image you are working on."
+"When enabled the dialogue automatically follows the image you are working on."
 
-#: ../app/widgets/gimpmessagebox.c:437
+#: ../app/widgets/gimpmessagebox.c:443
 #, c-format
 msgid "Message repeated %d times."
 msgstr "Message repeated %d times."
 
-#: ../app/widgets/gimpmessagebox.c:439
+#: ../app/widgets/gimpmessagebox.c:445
 msgid "Message repeated once."
 msgstr "Message repeated once."
 
@@ -12041,7 +12247,7 @@ msgstr "ICC colour profile (*.icc, *.icm)"
 msgid "Progress"
 msgstr "Progress"
 
-#: ../app/widgets/gimpselectiondata.c:241
+#: ../app/widgets/gimpselectiondata.c:242
 #, c-format
 msgid ""
 "The filename '%s' couldn't be converted to a valid URI:\n"
@@ -12052,10 +12258,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/widgets/gimpselectiondata.c:245
+#: ../app/widgets/gimpselectiondata.c:246
 msgid "Invalid UTF-8"
 msgstr "Invalid UTF-8"
 
+#: ../app/widgets/gimpsettingsbox.c:239
+msgid "Pick a setting from the list"
+msgstr "Pick a setting from the list"
+
+#: ../app/widgets/gimpsettingsbox.c:260
+msgid "Add settings to favorites"
+msgstr "Add settings to favourites"
+
+#: ../app/widgets/gimpsettingsbox.c:288
+msgid "_Import Settings from File..."
+msgstr "_Import Settings from File..."
+
+#: ../app/widgets/gimpsettingsbox.c:294
+msgid "_Export Settings to File..."
+msgstr "_Export Settings to File..."
+
+#: ../app/widgets/gimpsettingsbox.c:301
+msgid "_Manage Settings..."
+msgstr "_Manage Settings..."
+
+#: ../app/widgets/gimpsettingsbox.c:588
+msgid "Add Settings to Favorites"
+msgstr "Add Settings to Favourites"
+
+#: ../app/widgets/gimpsettingsbox.c:591
+msgid "Enter a name for the settings"
+msgstr "Enter a name for the settings"
+
+#: ../app/widgets/gimpsettingsbox.c:592
+msgid "Saved Settings"
+msgstr "Saved Settings"
+
+#: ../app/widgets/gimpsettingsbox.c:627
+msgid "Manage Saved Settings"
+msgstr "Manage Saved Settings"
+
+#: ../app/widgets/gimpsettingseditor.c:174
+msgid "Import settings from a file"
+msgstr "Import settings from a file"
+
+#: ../app/widgets/gimpsettingseditor.c:183
+msgid "Export the selected settings to a file"
+msgstr "Export the selected settings to a file"
+
+#: ../app/widgets/gimpsettingseditor.c:192
+msgid "Delete the selected settings"
+msgstr "Delete the selected settings"
+
 #: ../app/widgets/gimpsizebox.c:464
 #, c-format
 msgid "%d × %d ppi"
@@ -12119,33 +12373,33 @@ msgstr "_Fill with:"
 msgid "Comme_nt:"
 msgstr "Comme_nt:"
 
-#: ../app/widgets/gimptemplateeditor.c:528
+#: ../app/widgets/gimptemplateeditor.c:530
 msgid "_Name:"
 msgstr "_Name:"
 
-#: ../app/widgets/gimptemplateeditor.c:541
+#: ../app/widgets/gimptemplateeditor.c:543
 msgid "_Icon:"
 msgstr "_Icon:"
 
-#: ../app/widgets/gimptemplateeditor.c:668
+#: ../app/widgets/gimptemplateeditor.c:671
 #, c-format
 msgid "%d × %d ppi, %s"
 msgstr "%d × %d ppi, %s"
 
-#: ../app/widgets/gimptemplateeditor.c:670
+#: ../app/widgets/gimptemplateeditor.c:673
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppi, %s"
 
-#: ../app/widgets/gimptexteditor.c:185
+#: ../app/widgets/gimptexteditor.c:188
 msgid "_Language:"
 msgstr "_Language:"
 
-#: ../app/widgets/gimptexteditor.c:230
+#: ../app/widgets/gimptexteditor.c:234
 msgid "_Use selected font"
 msgstr "_Use selected font"
 
-#: ../app/widgets/gimpthumbbox.c:329
+#: ../app/widgets/gimpthumbbox.c:344
 #, c-format
 msgid ""
 "Click to update preview\n"
@@ -12154,20 +12408,20 @@ msgstr ""
 "Click to update preview\n"
 "%s%sClick to force update even if preview is up-to-date"
 
-#: ../app/widgets/gimpthumbbox.c:347
+#: ../app/widgets/gimpthumbbox.c:362
 msgid "Pr_eview"
 msgstr "Pr_eview"
 
-#: ../app/widgets/gimpthumbbox.c:402 ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:417 ../app/widgets/gimpthumbbox.c:481
 msgid "No selection"
 msgstr "No selection"
 
-#: ../app/widgets/gimpthumbbox.c:595 ../app/widgets/gimpthumbbox.c:616
+#: ../app/widgets/gimpthumbbox.c:609 ../app/widgets/gimpthumbbox.c:630
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "Thumbnail %d of %d"
 
-#: ../app/widgets/gimpthumbbox.c:729 ../app/widgets/gimpthumbbox.c:739
+#: ../app/widgets/gimpthumbbox.c:743 ../app/widgets/gimpthumbbox.c:753
 msgid "Creating preview..."
 msgstr "Creating preview..."
 
@@ -12245,15 +12499,15 @@ msgstr "Delete saved options..."
 msgid "Error saving tool options presets: %s"
 msgstr "Error saving tool options presets: %s"
 
-#: ../app/widgets/gimpuimanager.c:736
+#: ../app/widgets/gimpuimanager.c:738
 msgid "Your GIMP installation is incomplete:"
 msgstr "Your GIMP installation is incomplete:"
 
-#: ../app/widgets/gimpuimanager.c:738
+#: ../app/widgets/gimpuimanager.c:740
 msgid "Plase make sure the menu XML files are correctly installed."
 msgstr "Plase make sure the menu XML files are correctly installed."
 
-#: ../app/widgets/gimpuimanager.c:744
+#: ../app/widgets/gimpuimanager.c:746
 #, c-format
 msgid "There was an error parsing the menu definition from %s: %s"
 msgstr "There was an error parsing the menu definition from %s: %s"
@@ -12294,27 +12548,27 @@ msgstr "Open the palette selection dialogue"
 msgid "Open the font selection dialog"
 msgstr "Open the font selection dialogue"
 
-#: ../app/widgets/gimpwidgets-utils.c:604
+#: ../app/widgets/gimpwidgets-utils.c:608
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (try %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:604
+#: ../app/widgets/gimpwidgets-utils.c:608
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:608
+#: ../app/widgets/gimpwidgets-utils.c:612
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (try %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:612
+#: ../app/widgets/gimpwidgets-utils.c:616
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (try %s, %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:878
+#: ../app/widgets/gimpwidgets-utils.c:882
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "Invalid UTF-8 data in file '%s'."
@@ -12368,12 +12622,12 @@ msgid "Web browser"
 msgstr "Web browser"
 
 #: ../app/widgets/widgets-enums.c:229
-msgid "Linear"
-msgstr "Linear"
+msgid "Linear histogram"
+msgstr "Linear histogram"
 
 #: ../app/widgets/widgets-enums.c:230
-msgid "Logarithmic"
-msgstr "Logarithmic"
+msgid "Logarithmic histogram"
+msgstr "Logarithmic histogram"
 
 #: ../app/widgets/widgets-enums.c:263
 msgid "Icon"
@@ -12415,7 +12669,7 @@ msgstr "Utility window"
 msgid "Keep above"
 msgstr "Keep above"
 
-#: ../app/xcf/xcf-load.c:276
+#: ../app/xcf/xcf-load.c:277
 msgid ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
@@ -12423,7 +12677,7 @@ msgstr ""
 "This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
 "incomplete."
 
-#: ../app/xcf/xcf-load.c:285
+#: ../app/xcf/xcf-load.c:286
 #, c-format
 msgid ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
@@ -12432,7 +12686,7 @@ msgstr ""
 "This XCF file is corrupt!  I could not even salvage any partial image data "
 "from it."
 
-#: ../app/xcf/xcf-load.c:323
+#: ../app/xcf/xcf-load.c:324
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -12470,12 +12724,12 @@ msgstr "Opening '%s'"
 msgid "XCF error: unsupported XCF file version %d encountered"
 msgstr "XCF error: unsupported XCF file version %d encountered"
 
-#: ../app/xcf/xcf.c:382
+#: ../app/xcf/xcf.c:383
 #, c-format
 msgid "Saving '%s'"
 msgstr "Saving '%s'"
 
-#: ../app/xcf/xcf.c:402
+#: ../app/xcf/xcf.c:403
 #, c-format
 msgid "Error saving XCF file: %s"
 msgstr "Error saving XCF file: %s"
@@ -12518,6 +12772,273 @@ msgstr "Make sure that the Toolbox is visible!"
 msgid "Couldn't start '%s': %s"
 msgstr "Couldn't start '%s': %s"
 
+#~ msgid "_Dialogs"
+#~ msgstr "_Dialogues"
+
+#~ msgid "Create New Doc_k"
+#~ msgstr "Create New Doc_k"
+
+#~ msgid "_Layers, Channels & Paths"
+#~ msgstr "_Layers, Channels & Paths"
+
+#~ msgid "Open a Layers, Channels & Paths dock"
+#~ msgstr "Open a Layers, Channels & Paths dock"
+
+#~ msgid "_Brushes, Patterns & Gradients"
+#~ msgstr "_Brushes, Patterns & Gradients"
+
+#~ msgid "Open a Brushes, Patterns & Gradients dock"
+#~ msgstr "Open a Brushes, Patterns & Gradients dock"
+
+#~ msgid "_Misc. Stuff"
+#~ msgstr "_Misc. Stuff"
+
+#~ msgid "Open a dock containing miscellaneous dialogs"
+#~ msgstr "Open a dock containing miscellaneous dialogues"
+
+#~ msgid "_Module Manager"
+#~ msgstr "_Module Manager"
+
+#~ msgid "Show the tip of the day"
+#~ msgstr "Show the tip of the day"
+
+#~ msgid "Remove all entries from the document history?"
+#~ msgstr "Remove all entries from the document history?"
+
+#~ msgid "Copy the selected region to the clipboard"
+#~ msgstr "Copy the selected region to the clipboard"
+
+#~ msgid "Paste as New"
+#~ msgstr "Paste as New"
+
+#~ msgid "Acq_uire"
+#~ msgstr "Acq_uire"
+
+#~ msgid "Toolbox Menu"
+#~ msgstr "Toolbox Menu"
+
+#~ msgid "_Xtns"
+#~ msgstr "_Xtns"
+
+#~ msgid "Enable displaying a handy GIMP tip on startup."
+#~ msgstr "Enable displaying a handy GIMP tip on startup."
+
+#~ msgid "FS rigor"
+#~ msgstr "FS rigor"
+
+#~ msgid "FS relax"
+#~ msgstr "FS relax"
+
+#~ msgid "EEK: can't undo"
+#~ msgstr "EEK: can't undo"
+
+#~ msgid "command|Rectangle Select"
+#~ msgstr "Rectangle Select"
+
+#~ msgid "command|Ellipse Select"
+#~ msgstr "Ellipse Select"
+
+#~ msgid "command|Fuzzy Select"
+#~ msgstr "Fuzzy Select"
+
+#~ msgid "command|Select by Color"
+#~ msgstr "Select by Colour"
+
+#~ msgid "command|Bucket Fill"
+#~ msgstr "Bucket Fill"
+
+#~ msgid "command|Flip"
+#~ msgstr "Flip"
+
+#~ msgid "command|Rotate"
+#~ msgstr "Rotate"
+
+#~ msgid "command|Crop Image"
+#~ msgstr "Crop Image"
+
+#~ msgid "Channel is already on top."
+#~ msgstr "Channel is already on top."
+
+#~ msgid "Channel is already on the bottom."
+#~ msgstr "Channel is already on the bottom."
+
+#~ msgid "Path is already on top."
+#~ msgstr "Path is already on top."
+
+#~ msgid "Path is already on the bottom."
+#~ msgstr "Path is already on the bottom."
+
+#~ msgid "Cannot add layer mask to layer which is not part of an image."
+#~ msgstr "Cannot add layer mask to layer which is not part of an image."
+
+#~ msgid "Reading palette '%s': Missing GREEN component in line %d."
+#~ msgstr "Reading palette '%s': Missing GREEN component in line %d."
+
+#~ msgid "_Desaturate"
+#~ msgstr "_Desaturate"
+
+#~ msgid "dialog-title|Scale Image"
+#~ msgstr "Scale Image"
+
+#~ msgid "Manage Loadable Modules"
+#~ msgstr "Manage Loadable Modules"
+
+#~ msgid "Autoload"
+#~ msgstr "Autoload"
+
+#~ msgid "Module Path"
+#~ msgstr "Module Path"
+
+#~ msgid ""
+#~ msgstr ""
+
+#~ msgid "On disk"
+#~ msgstr "On disk"
+
+#~ msgid "Load"
+#~ msgstr "Load"
+
+#~ msgid "Query"
+#~ msgstr "Query"
+
+#~ msgid "Unload"
+#~ msgstr "Unload"
+
+#~ msgid "Purpose:"
+#~ msgstr "Purpose:"
+
+#~ msgid "Last error:"
+#~ msgstr "Last error:"
+
+#~ msgid "Available types:"
+#~ msgstr "Available types:"
+
+#~ msgid "Save document _history on exit"
+#~ msgstr "Save document _history on exit"
+
+#~ msgid "Show tips on _startup"
+#~ msgstr "Show tips on _startup"
+
+#~ msgid "Show tip next time GIMP starts"
+#~ msgstr "Show tip next time GIMP starts"
+
+#~ msgid "Other..."
+#~ msgstr "Other..."
+
+#~ msgid ""
+#~ "PDB calling error:\n"
+#~ "Procedure '%s' not found"
+#~ msgstr ""
+#~ "PDB calling error:\n"
+#~ "Procedure '%s' not found"
+
+#~ msgid ""
+#~ "PDB calling error for procedure '%s':\n"
+#~ "Argument #%d type mismatch (expected %s, got %s)"
+#~ msgstr ""
+#~ "PDB calling error for procedure '%s':\n"
+#~ "Argument #%d type mismatch (expected %s, got %s)"
+
+#~ msgid "Left justified"
+#~ msgstr "Left justified"
+
+#~ msgid "Right justified"
+#~ msgstr "Right justified"
+
+#~ msgid "Centered"
+#~ msgstr "Centred"
+
+#~ msgid "Filled"
+#~ msgstr "Filled"
+
+#~ msgid "Save Curves"
+#~ msgstr "Save Curves"
+
+#~ msgid "Mode"
+#~ msgstr "Mode"
+
+#~ msgid "command|Foreground Select"
+#~ msgstr "Foreground Select"
+
+#~ msgid "command|Free Select"
+#~ msgstr "Free Select"
+
+#~ msgid "Quick Load"
+#~ msgstr "Quick Load"
+
+#~ msgid "Quick Save"
+#~ msgstr "Quick Save"
+
+#~ msgid "Load Levels"
+#~ msgstr "Load Levels"
+
+#~ msgid "Load levels settings from file"
+#~ msgstr "Load levels settings from file"
+
+#~ msgid "Save Levels"
+#~ msgstr "Save Levels"
+
+#~ msgid "tool|Move"
+#~ msgstr "Move"
+
+#~ msgid "Pressure sensitivity"
+#~ msgstr "Pressure sensitivity"
+
+#~ msgid "command|Perspective"
+#~ msgstr "Perspective"
+
+#~ msgid "Polygon Select"
+#~ msgstr "Polygon Select"
+
+#~ msgid "Polygon Select Tool: Select a hand-drawn polygon"
+#~ msgstr "Polygon Select Tool: Select a hand-drawn polygon"
+
+#~ msgid "_Polygon Select"
+#~ msgstr "_Polygon Select"
+
+#~ msgid "command|Polygon Select"
+#~ msgstr "command|Polygon Select"
+
+#~ msgid "command|Scale"
+#~ msgstr "Scale"
+
+#~ msgid "command|Shear"
+#~ msgstr "Shear"
+
+#~ msgid "Close all Tabs?"
+#~ msgstr "Close all Tabs?"
+
+#~ msgid "Close all Tabs"
+#~ msgstr "Close all Tabs"
+
+#~ msgid "Close all tabs?"
+#~ msgstr "Close all tabs?"
+
+#~ msgid ""
+#~ "This window has %d tab open. Closing the window will also close all its "
+#~ "tabs."
+#~ msgid_plural ""
+#~ "This window has %d tabs open. Closing the window will also close all its "
+#~ "tabs."
+#~ msgstr[0] ""
+#~ "This window has %d tab open. Closing the window will also close all its "
+#~ "tabs."
+#~ msgstr[1] ""
+#~ "This window has %d tabs open. Closing the window will also close all its "
+#~ "tabs."
+
+#~ msgid "Help browser not found"
+#~ msgstr "Help browser not found"
+
+#~ msgid "Could not find GIMP help browser."
+#~ msgstr "Could not find GIMP help browser."
+
+#~ msgid "Use _web browser instead"
+#~ msgstr "Use _web browser instead"
+
+#~ msgid "Linear"
+#~ msgstr "Linear"
+
 #~ msgid ""
 #~ "If you don't save the image, changes from the last hour will be lost.If "
 #~ "you don't save the image, changes from the last %d hours will be lost."
@@ -12534,9 +13055,6 @@ msgstr "Couldn't start '%s': %s"
 #~ "will be lost.If you don't save the image, changes from the last hour and %"
 #~ "d minutes will be lost."
 
-#~ msgid "_Crop Image"
-#~ msgstr "_Crop Image"
-
 #~ msgid "_Crop Layer"
 #~ msgstr "_Crop Layer"
 
@@ -12574,21 +13092,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Auto Shrink Selection"
 #~ msgstr "Auto Shrink Selection"
 
-#~ msgid "Allow completely transparent regions to be selected"
-#~ msgstr "Allow completely transparent regions to be selected"
-
-#~ msgid "Base selection on all visible layers"
-#~ msgstr "Base selection on all visible layers"
-
-#~ msgid "Show interactive boundary"
-#~ msgstr "Show interactive boundary"
-
-#~ msgid "Select transparent areas"
-#~ msgstr "Select transparent areas"
-
-#~ msgid "Select by:"
-#~ msgstr "Select by:"
-
 #~ msgid "Supersampling"
 #~ msgstr "Supersampling"
 
@@ -13305,9 +13808,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Set Name from _Text"
 #~ msgstr "Set Name from _Text"
 
-#~ msgid "Module Manager"
-#~ msgstr "Module Manager"
-
 #~ msgid "Module path"
 #~ msgstr "Module path"
 
@@ -13797,9 +14297,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Edit procedures"
 #~ msgstr "Edit procedures"
 
-#~ msgid "File Operations"
-#~ msgstr "File Operations"
-
 #~ msgid "Floating selections"
 #~ msgstr "Floating selections"
 
@@ -13977,9 +14474,6 @@ msgstr "Couldn't start '%s': %s"
 #~ msgid "Center X"
 #~ msgstr "Centre X"
 
-#~ msgid "Center"
-#~ msgstr "Centre"
-
 #~ msgid "Selection: ADD"
 #~ msgstr "Selection: ADD"
 
@@ -14314,9 +14808,6 @@ msgstr "Couldn't start '%s': %s"
 #~ "Usage: %s [option ... ] [file ... ]\n"
 #~ "\n"
 
-#~ msgid "Options:\n"
-#~ msgstr "Options:\n"
-
 #~ msgid "  -h, --help               Output this help.\n"
 #~ msgstr "  -h, --help               Output this help.\n"
 
diff --git a/po/fr.po b/po/fr.po
index c374ab0d66..b87aca21b6 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -19,9 +19,10 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: The GIMP HEAD\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-05 22:53+0100\n"
-"PO-Revision-Date: 2009-03-02 21:07+0100\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=general\n"
+"POT-Creation-Date: 2009-07-08 19:34+0000\n"
+"PO-Revision-Date: 2009-07-23 21:07+0100\n"
 "Last-Translator: Julien Hardelin \n"
 "Language-Team: GNOME French Team \n"
 "MIME-Version: 1.0\n"
@@ -221,7 +222,7 @@ msgstr "(saisissez n'importe quel caractère pour fermer cette fenêtre)\n"
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "Sortie GIMP. Vous pouvez réduire cette fenêtre mais ne la fermez pas."
 
-#: ../app/sanity.c:342
+#: ../app/sanity.c:365
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -233,7 +234,7 @@ msgstr ""
 "\n"
 "Vérifiez la valeur de la variable d'environnement G_FILENAME_ENCODING."
 
-#: ../app/sanity.c:361
+#: ../app/sanity.c:384
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -415,7 +416,7 @@ msgid "Text Editor"
 msgstr "Éditeur de texte"
 
 #: ../app/actions/actions.c:200 ../app/dialogs/dialogs.c:138
-#: ../app/dialogs/preferences-dialog.c:1880 ../app/gui/gui.c:423
+#: ../app/dialogs/preferences-dialog.c:1880 ../app/gui/gui.c:429
 msgid "Tool Options"
 msgstr "Options des outils"
 
@@ -855,7 +856,7 @@ msgstr "Échantillonner sur tous les calques"
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:537
 #: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
-#: ../app/widgets/gimptoolbox.c:979
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -891,11 +892,11 @@ msgstr "Voulez-vous vraiment supprimer « %s » de la liste et du disque ?"
 
 #: ../app/actions/dialogs-actions.c:39
 msgid "Tool _Options"
-msgstr "Options des ou_tils"
+msgstr "Options de l'ou_til"
 
 #: ../app/actions/dialogs-actions.c:40
 msgid "Open the tool options dialog"
-msgstr "Ouvre la boîte de dialogue Options des outils"
+msgstr "Ouvre la boîte de dialogue des options de l'outil"
 
 #: ../app/actions/dialogs-actions.c:45
 msgid "_Device Status"
@@ -1130,7 +1131,7 @@ msgid "_About"
 msgstr "À _propos"
 
 #: ../app/actions/dialogs-actions.c:231 ../app/dialogs/about-dialog.c:114
-#: ../app/gui/gui.c:473
+#: ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "À propos de GIMP"
 
@@ -1240,7 +1241,7 @@ msgstr "_État & Texte"
 
 #: ../app/actions/dockable-actions.c:108
 msgid "Loc_k Tab to Dock"
-msgstr "_Verrouille l'onglet à la fenêtre ancrable"
+msgstr "_Verrouille l'onglet au groupe de fenêtres"
 
 #: ../app/actions/dockable-actions.c:109
 msgid "Protect this tab from being dragged with the mouse pointer"
@@ -1252,11 +1253,11 @@ msgstr "Afficher la ba_rre des boutons"
 
 #: ../app/actions/dockable-actions.c:124
 msgid "View as _List"
-msgstr "Voir comme une _liste"
+msgstr "Afficher en _liste"
 
 #: ../app/actions/dockable-actions.c:129
 msgid "View as _Grid"
-msgstr "Voir comme une _grille"
+msgstr "Afficher en _grille"
 
 #: ../app/actions/documents-actions.c:42
 msgid "Documents Menu"
@@ -2405,7 +2406,7 @@ msgstr "_Auto"
 
 #: ../app/actions/image-actions.c:62 ../app/actions/plug-in-actions.c:95
 msgid "_Map"
-msgstr "Cart_e"
+msgstr "Mappag_e"
 
 #: ../app/actions/image-actions.c:63
 msgid "C_omponents"
@@ -2413,7 +2414,7 @@ msgstr "C_omposants"
 
 #: ../app/actions/image-actions.c:66
 msgid "_New..."
-msgstr "_Nouveau..."
+msgstr "_Nouvelle image..."
 
 #: ../app/actions/image-actions.c:67
 msgid "Create a new image"
@@ -2425,7 +2426,7 @@ msgstr "Taille du _canevas..."
 
 #: ../app/actions/image-actions.c:73
 msgid "Adjust the image dimensions"
-msgstr "Ajuster les dimensions de l'image"
+msgstr "Ajuste de ce fait les dimensions de l'image"
 
 #: ../app/actions/image-actions.c:78
 msgid "F_it Canvas to Layers"
@@ -3357,7 +3358,7 @@ msgid "Toggle _Quick Mask"
 msgstr "(Dés)activ_er le masque rapide"
 
 #: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1167
+#: ../app/display/gimpdisplayshell.c:1169
 msgid "Toggle Quick Mask"
 msgstr "(Dés)activer le masque rapide"
 
@@ -6006,7 +6007,7 @@ msgstr "Retourner le canal"
 msgid "Rotate Channel"
 msgstr "Rotation du canal"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:843
+#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:886
 msgid "Transform Channel"
 msgstr "Transformation du canal"
 
@@ -6195,21 +6196,21 @@ msgstr "Tracer"
 msgid "Threshold"
 msgstr "Seuil"
 
-#: ../app/core/gimpdrawable-transform.c:629 ../app/tools/gimpfliptool.c:116
+#: ../app/core/gimpdrawable-transform.c:645 ../app/tools/gimpfliptool.c:116
 msgctxt "command"
 msgid "Flip"
 msgstr "Retourner"
 
-#: ../app/core/gimpdrawable-transform.c:716 ../app/tools/gimprotatetool.c:121
+#: ../app/core/gimpdrawable-transform.c:745 ../app/tools/gimprotatetool.c:121
 msgctxt "command"
 msgid "Rotate"
 msgstr "Rotation"
 
-#: ../app/core/gimpdrawable-transform.c:841 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:884 ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "Transformation du calque"
 
-#: ../app/core/gimpdrawable-transform.c:856
+#: ../app/core/gimpdrawable-transform.c:899
 msgid "Transformation"
 msgstr "Transformation"
 
@@ -7033,7 +7034,7 @@ msgstr "Convertir en couleurs indexées"
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "Impossible de convertir vers une palette ayant plus de 256 couleurs."
 
-#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:158
+#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:161
 #: ../app/gui/gui-message.c:148
 msgid "GIMP Message"
 msgstr "Message de GIMP"
@@ -7807,7 +7808,7 @@ msgstr "Outil de déplacement"
 msgid "Set layer or path as active"
 msgstr "Définir le calque ou le chemin comme actif"
 
-#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:631
+#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:633
 msgid "Toolbox"
 msgstr "Boîte à outils"
 
@@ -8536,20 +8537,20 @@ msgstr "Élevée"
 msgid "Image saved to '%s'"
 msgstr "Image enregistrée comme %s"
 
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "Accéder au menu d'image"
 
-#: ../app/display/gimpdisplayshell.c:1138
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "Zoom l'image quand la fenêtre change de taille"
 
-#: ../app/display/gimpdisplayshell.c:1188
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "Naviguer dans l'affichage d'image"
 
-#: ../app/display/gimpdisplayshell.c:1283
-#: ../app/display/gimpdisplayshell.c:1373 ../app/widgets/gimptoolbox.c:222
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375 ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
 msgstr "Déposer les fichiers d'images ici pour les ouvrir"
 
@@ -8765,7 +8766,7 @@ msgid "not a GIMP Levels file"
 msgstr "pas un fichier de niveaux GIMP"
 
 #. initialize the document history
-#: ../app/gui/gui.c:420
+#: ../app/gui/gui.c:426
 msgid "Documents"
 msgstr "Documents"
 
@@ -10784,7 +10785,7 @@ msgstr "Brosse :"
 
 #: ../app/tools/gimppaintoptions-gui.c:142
 msgid "Scale:"
-msgstr "Étirer ou rétrécir :"
+msgstr "Échelle :"
 
 #: ../app/tools/gimppaintoptions-gui.c:150
 msgid "Opacity"
@@ -11293,7 +11294,7 @@ msgstr "15 degrés (%s)"
 #: ../app/tools/gimptransformoptions.c:393
 #, c-format
 msgid "Keep aspect  (%s)"
-msgstr "Conserver le rapport (%s)"
+msgstr "Conserver les proportions (%s)"
 
 #: ../app/tools/gimptransformtool.c:238
 msgid "Transforming"
@@ -12278,15 +12279,15 @@ msgstr "_Arrière-plan :"
 msgid "Spacing"
 msgstr "Espacement"
 
-#: ../app/widgets/gimphelp.c:276
+#: ../app/widgets/gimphelp.c:294
 msgid "Help browser is missing"
 msgstr "Le navigateur d'aide est manquant."
 
-#: ../app/widgets/gimphelp.c:277
+#: ../app/widgets/gimphelp.c:295
 msgid "The GIMP help browser is not available."
 msgstr "Le navigateur d'aide GIMP n'est pas disponible."
 
-#: ../app/widgets/gimphelp.c:278
+#: ../app/widgets/gimphelp.c:296
 msgid ""
 "The GIMP help browser plug-in appears to be missing from your installation. "
 "You may instead use the web browser for reading the help pages."
@@ -12295,32 +12296,32 @@ msgstr ""
 "Vous pouvez utiliser un navigateur Web à la place pour consulter l'aide en "
 "ligne."
 
-#: ../app/widgets/gimphelp.c:319
+#: ../app/widgets/gimphelp.c:337
 msgid "Help browser doesn't start"
 msgstr "Le navigateur d'aide ne démarre pas"
 
-#: ../app/widgets/gimphelp.c:320
+#: ../app/widgets/gimphelp.c:338
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "Impossible de démarrer le greffon du navigateur d'aide de GIMP"
 
-#: ../app/widgets/gimphelp.c:347
+#: ../app/widgets/gimphelp.c:365
 msgid "Use _Web Browser"
 msgstr "Utiliser un navigateur _Web"
 
-#: ../app/widgets/gimphelp.c:596
+#: ../app/widgets/gimphelp.c:614
 msgid "GIMP user manual is missing"
 msgstr "Le manuel de l'utilisateur de GIMP est manquant"
 
-#: ../app/widgets/gimphelp.c:603
+#: ../app/widgets/gimphelp.c:621
 msgid "_Read Online"
 msgstr "_Consulter en ligne"
 
-#: ../app/widgets/gimphelp.c:627
+#: ../app/widgets/gimphelp.c:645
 msgid "The GIMP user manual is not installed on your computer."
 msgstr ""
 "Le manuel de l'utilisateur de GIMP n'est pas installé sur votre ordinateur."
 
-#: ../app/widgets/gimphelp.c:630
+#: ../app/widgets/gimphelp.c:648
 msgid ""
 "You may either install the additional help package or change your "
 "preferences to use the online version."
diff --git a/po/it.po b/po/it.po
index 5ca3d47bd8..fd3f2b1788 100644
--- a/po/it.po
+++ b/po/it.po
@@ -29,8 +29,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-18 09:15+0100\n"
-"PO-Revision-Date: 2009-03-11 16:12+0100\n"
+"POT-Creation-Date: 2009-11-30 12:19+0100\n"
+"PO-Revision-Date: 2009-11-30 12:20+0100\n"
 "Last-Translator: Marco Ciampa \n"
 "Language-Team: gimp@erlug.linux.it\n"
 "MIME-Version: 1.0\n"
@@ -228,7 +228,7 @@ msgstr ""
 "Messaggi di GIMP. È possibile ridurre a icona questa finestra ma non "
 "chiuderla."
 
-#: ../app/sanity.c:342
+#: ../app/sanity.c:365
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -240,7 +240,7 @@ msgstr ""
 "\n"
 "Controllare il valore della variabile ambiente G_FILENAME_ENCODING."
 
-#: ../app/sanity.c:361
+#: ../app/sanity.c:384
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -860,7 +860,7 @@ msgstr "Campionamento diffuso"
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:537
 #: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
-#: ../app/widgets/gimptoolbox.c:979
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -3037,7 +3037,7 @@ msgstr "Maschera livello a selezione"
 msgid "Please select a channel first"
 msgstr "Selezionare prima un canale"
 
-#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1282
+#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1283
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "Aggiungi maschera di livello"
@@ -3363,7 +3363,7 @@ msgid "Toggle _Quick Mask"
 msgstr "Commuta maschera _veloce"
 
 #: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1167
+#: ../app/display/gimpdisplayshell.c:1169
 msgid "Toggle Quick Mask"
 msgstr "Commuta maschera veloce"
 
@@ -5984,7 +5984,7 @@ msgstr "Rifletti canale"
 msgid "Rotate Channel"
 msgstr "Ruota canale"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:843
+#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:886
 msgid "Transform Channel"
 msgstr "Trasforma canale"
 
@@ -6172,21 +6172,21 @@ msgstr "Disegna il delineato"
 msgid "Threshold"
 msgstr "Soglia"
 
-#: ../app/core/gimpdrawable-transform.c:629 ../app/tools/gimpfliptool.c:116
+#: ../app/core/gimpdrawable-transform.c:645 ../app/tools/gimpfliptool.c:116
 msgctxt "command"
 msgid "Flip"
 msgstr "Rifletti"
 
-#: ../app/core/gimpdrawable-transform.c:716 ../app/tools/gimprotatetool.c:121
+#: ../app/core/gimpdrawable-transform.c:745 ../app/tools/gimprotatetool.c:121
 msgctxt "command"
 msgid "Rotate"
 msgstr "Ruota"
 
-#: ../app/core/gimpdrawable-transform.c:841 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:884 ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "Trasforma livello"
 
-#: ../app/core/gimpdrawable-transform.c:856
+#: ../app/core/gimpdrawable-transform.c:899
 msgid "Transformation"
 msgstr "Trasformazione"
 
@@ -6629,7 +6629,7 @@ msgstr "Rifletti livello"
 msgid "Rotate Layer"
 msgstr "Ruota livello"
 
-#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1329
+#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1330
 #: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
@@ -6644,41 +6644,41 @@ msgstr ""
 "Selezione fluttuante\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1265
+#: ../app/core/gimplayer.c:1266
 #, c-format
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr ""
 "Impossibile aggiungere una maschera di livello dato che il livello ne ha già "
 "una."
 
-#: ../app/core/gimplayer.c:1276
+#: ../app/core/gimplayer.c:1277
 #, c-format
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr ""
 "Impossibile aggiungere maschera livello con dimensioni diverse dal livello "
 "specificato."
 
-#: ../app/core/gimplayer.c:1384
+#: ../app/core/gimplayer.c:1385
 msgid "Transfer Alpha to Mask"
 msgstr "Trasferimento alfa su maschera"
 
-#: ../app/core/gimplayer.c:1556 ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:1557 ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "Applica maschera di livello"
 
-#: ../app/core/gimplayer.c:1557
+#: ../app/core/gimplayer.c:1558
 msgid "Delete Layer Mask"
 msgstr "Elimina maschera di livello"
 
-#: ../app/core/gimplayer.c:1669
+#: ../app/core/gimplayer.c:1670
 msgid "Add Alpha Channel"
 msgstr "Aggiunta canale alfa"
 
-#: ../app/core/gimplayer.c:1723
+#: ../app/core/gimplayer.c:1724
 msgid "Remove Alpha Channel"
 msgstr "Rimuovi canale alfa"
 
-#: ../app/core/gimplayer.c:1745
+#: ../app/core/gimplayer.c:1746
 msgid "Layer to Image Size"
 msgstr "Livello a dimensione dell'immagine"
 
@@ -7765,7 +7765,7 @@ msgstr "Strumento sposta"
 msgid "Set layer or path as active"
 msgstr "Imposta il livello o il tracciato come attivo"
 
-#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:631
+#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:633
 msgid "Toolbox"
 msgstr "Strumenti"
 
@@ -8489,20 +8489,20 @@ msgstr "alta"
 msgid "Image saved to '%s'"
 msgstr "Immagine salvata su \"%s\""
 
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "Accedi al menu immagine"
 
-#: ../app/display/gimpdisplayshell.c:1138
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "Zooma l'immagine quando cambia la dimensione della finestra"
 
-#: ../app/display/gimpdisplayshell.c:1188
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "Naviga nella finestra immagine"
 
-#: ../app/display/gimpdisplayshell.c:1283
-#: ../app/display/gimpdisplayshell.c:1373 ../app/widgets/gimptoolbox.c:222
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375 ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
 msgstr "Trascina e rilascia qui i file immagine per aprirli"
 
@@ -10876,7 +10876,7 @@ msgstr "Espandi dal centro"
 
 #: ../app/tools/gimprectangleoptions.c:830
 msgid "Fixed:"
-msgstr "Fisso:"
+msgstr "Blocca:"
 
 #: ../app/tools/gimprectangleoptions.c:963
 msgid "Position:"
diff --git a/po/ja.po b/po/ja.po
index 5e12de73f0..afa5ddeafb 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,23 +1,24 @@
 # Japanese message table for GIMP 2.0
-# Copyright (C) 1998-2005,2008 Free Software Foundation, Inc.
+# Copyright (C) 1998-2005,2008,2009 Free Software Foundation, Inc.
 # SHIRASAKI Yasuhiro , 1998-2001, 2004.
 # Ryoichi INAGAKI , 2003, 2004.
 # Tadashi Jokagi , 2005.
 # OKANO Takayoshi , 2005.
-# Nishibori Kiyotaka , 2008
+# Nishibori Kiyotaka , 2008-2009.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: gimp trunk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-11-24 09:21+0900\n"
-"PO-Revision-Date: 2008-11-22 09:50+0900\n"
+"Project-Id-Version: gimp gimp-2-6\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gimp&component=Internationalisation\n"
+"POT-Creation-Date: 2009-10-03 19:34+0900\n"
+"PO-Revision-Date: 2009-10-03 21:29+0900\n"
 "Last-Translator: Nishibori Kiyotaka \n"
 "Language-Team: Japanese \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 "X-Poedit-Bookmarks: 625,206,-1,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../app/about.h:24
@@ -216,7 +217,7 @@ msgstr ""
 "（GIMP output.） このウィンドウを最小化しても構いませんが、閉じないでくださ"
 "い。"
 
-#: ../app/sanity.c:342
+#: ../app/sanity.c:365
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -230,7 +231,7 @@ msgstr ""
 "\n"
 "環境変数 G_FILENAME_ENCODING の値を確認してください"
 
-#: ../app/sanity.c:361
+#: ../app/sanity.c:384
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -267,7 +268,7 @@ msgstr "ブラシエディタ"
 
 #. initialize the list of gimp brushes
 #: ../app/actions/actions.c:104 ../app/core/gimp.c:838
-#: ../app/dialogs/dialogs.c:157 ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/dialogs.c:157 ../app/dialogs/preferences-dialog.c:2744
 msgid "Brushes"
 msgstr "ブラシ"
 
@@ -314,7 +315,7 @@ msgstr "ドック可能"
 
 #. Document History
 #: ../app/actions/actions.c:137 ../app/dialogs/dialogs.c:171
-#: ../app/dialogs/preferences-dialog.c:1589
+#: ../app/dialogs/preferences-dialog.c:1595
 msgid "Document History"
 msgstr "最近開いた画像ドキュメント"
 
@@ -335,7 +336,7 @@ msgid "File"
 msgstr "ファイル"
 
 #: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:165
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Fonts"
 msgstr "フォント"
 
@@ -346,7 +347,7 @@ msgstr "グラデーションエディタ"
 
 #. initialize the list of gimp gradients
 #: ../app/actions/actions.c:158 ../app/core/gimp.c:850
-#: ../app/dialogs/dialogs.c:161 ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/dialogs.c:161 ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradients"
 msgstr "グラデーション"
 
@@ -376,17 +377,17 @@ msgstr "パレット編集"
 
 #. initialize the list of gimp palettes
 #: ../app/actions/actions.c:176 ../app/core/gimp.c:846
-#: ../app/dialogs/dialogs.c:163 ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/dialogs.c:163 ../app/dialogs/preferences-dialog.c:2752
 msgid "Palettes"
 msgstr "パレット"
 
 #. initialize the list of gimp patterns
 #: ../app/actions/actions.c:179 ../app/core/gimp.c:842
-#: ../app/dialogs/dialogs.c:159 ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/dialogs.c:159 ../app/dialogs/preferences-dialog.c:2748
 msgid "Patterns"
 msgstr "パターン"
 
-#: ../app/actions/actions.c:182 ../app/dialogs/preferences-dialog.c:2758
+#: ../app/actions/actions.c:182 ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-Ins"
 msgstr "プラグイン"
 
@@ -414,7 +415,7 @@ msgid "Text Editor"
 msgstr "テキストエディタ"
 
 #: ../app/actions/actions.c:200 ../app/dialogs/dialogs.c:138
-#: ../app/dialogs/preferences-dialog.c:1874 ../app/gui/gui.c:423
+#: ../app/dialogs/preferences-dialog.c:1880 ../app/gui/gui.c:429
 msgid "Tool Options"
 msgstr "ツールオプション"
 
@@ -769,12 +770,12 @@ msgid "_Tool"
 msgstr "ツール(_T)"
 
 #: ../app/actions/context-actions.c:51
-#: ../app/dialogs/preferences-dialog.c:1934
+#: ../app/dialogs/preferences-dialog.c:1940
 msgid "_Brush"
 msgstr "ブラシ(_B)"
 
 #: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:99
-#: ../app/dialogs/preferences-dialog.c:1937
+#: ../app/dialogs/preferences-dialog.c:1943
 msgid "_Pattern"
 msgstr "パターン(_P)"
 
@@ -784,7 +785,7 @@ msgstr "パレット(_P)"
 
 #: ../app/actions/context-actions.c:54
 #: ../app/dialogs/palette-import-dialog.c:216
-#: ../app/dialogs/preferences-dialog.c:1940
+#: ../app/dialogs/preferences-dialog.c:1946
 msgid "_Gradient"
 msgstr "グラデーション(_G)"
 
@@ -854,7 +855,7 @@ msgstr "レイヤー結合色"
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:537
 #: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
-#: ../app/widgets/gimptoolbox.c:979
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -1208,7 +1209,7 @@ msgid "_About"
 msgstr "GIMP について(_A)"
 
 #: ../app/actions/dialogs-actions.c:231 ../app/dialogs/about-dialog.c:114
-#: ../app/gui/gui.c:473
+#: ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "GIMP について"
 
@@ -1568,21 +1569,27 @@ msgstr "やり直す(_R)"
 msgid "Redo the last operation that was undone"
 msgstr "取り消した操作をやり直して 1 段階進めます"
 
+# (要査読)
 #: ../app/actions/edit-actions.c:84
 msgid "Strong Undo"
-msgstr ""
+msgstr "元に戻す(スキップあり)"
 
 #: ../app/actions/edit-actions.c:85
 msgid "Undo the last operation, skipping visibility changes"
 msgstr ""
+"直前の作業を取り消して 1 段階戻ります。直前の作業が視覚的な変更の場合は、さら"
+"に 1 段階戻ります。"
 
+# (要査読)
 #: ../app/actions/edit-actions.c:90
 msgid "Strong Redo"
-msgstr ""
+msgstr "やり直す(スキップあり)"
 
 #: ../app/actions/edit-actions.c:91
 msgid "Redo the last operation that was undone, skipping visibility changes"
 msgstr ""
+"取り消した作業をやり直して 1 段階進めます。やり直すべき作業が視覚的な変更の場"
+"合は、さらに 1段階進めます。"
 
 #: ../app/actions/edit-actions.c:96
 msgid "_Clear Undo History"
@@ -2684,7 +2691,7 @@ msgstr "画像の拡大・縮小"
 
 #. Scaling
 #: ../app/actions/image-commands.c:658 ../app/actions/layers-commands.c:1101
-#: ../app/dialogs/preferences-dialog.c:1919
+#: ../app/dialogs/preferences-dialog.c:1925
 #: ../app/pdb/drawable-transform-cmds.c:682
 #: ../app/pdb/drawable-transform-cmds.c:758 ../app/pdb/image-cmds.c:405
 #: ../app/pdb/image-cmds.c:441 ../app/pdb/layer-cmds.c:289
@@ -3457,7 +3464,7 @@ msgid "Toggle _Quick Mask"
 msgstr "クイックマスクの切り替え(_Q)"
 
 #: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1167
+#: ../app/display/gimpdisplayshell.c:1169
 msgid "Toggle Quick Mask"
 msgstr "クイックマスクの切り替え"
 
@@ -5314,7 +5321,7 @@ msgid "White"
 msgstr "白"
 
 #. Transparency
-#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2305
+#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2311
 msgid "Transparency"
 msgstr "透明"
 
@@ -5406,11 +5413,11 @@ msgstr "丸"
 msgid "Diamond"
 msgstr "ひし形"
 
-#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2337
+#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2343
 msgid "Horizontal"
 msgstr "水平"
 
-#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2339
+#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2345
 msgid "Vertical"
 msgstr "垂直"
 
@@ -5627,7 +5634,7 @@ msgid "Transform"
 msgstr "変形"
 
 #: ../app/core/core-enums.c:884 ../app/core/core-enums.c:927
-#: ../app/paint/gimppaintcore.c:135
+#: ../app/paint/gimppaintcore.c:137
 msgid "Paint"
 msgstr "描画"
 
@@ -5902,7 +5909,7 @@ msgid "Fonts (this may take a while)"
 msgstr "フォント"
 
 #. initialize the module list
-#: ../app/core/gimp.c:863 ../app/dialogs/preferences-dialog.c:2766
+#: ../app/core/gimp.c:863 ../app/dialogs/preferences-dialog.c:2772
 msgid "Modules"
 msgstr "モジュール"
 
@@ -6090,7 +6097,7 @@ msgstr "チャンネルの反転"
 msgid "Rotate Channel"
 msgstr "チャンネルの回転"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:843
+#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:886
 msgid "Transform Channel"
 msgstr "チャンネルの変換"
 
@@ -6282,21 +6289,21 @@ msgstr "ストローク描画"
 msgid "Threshold"
 msgstr "しきい値"
 
-#: ../app/core/gimpdrawable-transform.c:629 ../app/tools/gimpfliptool.c:116
+#: ../app/core/gimpdrawable-transform.c:645 ../app/tools/gimpfliptool.c:116
 msgctxt "command"
 msgid "Flip"
 msgstr "鏡像反転"
 
-#: ../app/core/gimpdrawable-transform.c:716 ../app/tools/gimprotatetool.c:121
+#: ../app/core/gimpdrawable-transform.c:745 ../app/tools/gimprotatetool.c:121
 msgctxt "command"
 msgid "Rotate"
 msgstr "回転"
 
-#: ../app/core/gimpdrawable-transform.c:841 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:884 ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "変換レイヤー"
 
-#: ../app/core/gimpdrawable-transform.c:856
+#: ../app/core/gimpdrawable-transform.c:899
 msgid "Transformation"
 msgstr "変換"
 
@@ -6620,7 +6627,7 @@ msgstr "パスを背面へ"
 msgid "Lower Path to Bottom"
 msgstr "パスを最背面へ"
 
-#: ../app/core/gimpimagefile.c:528 ../app/dialogs/preferences-dialog.c:1721
+#: ../app/core/gimpimagefile.c:528 ../app/dialogs/preferences-dialog.c:1727
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -6659,14 +6666,12 @@ msgstr "(プレビューが古すぎます)"
 msgid "%d × %d pixel"
 msgid_plural "%d × %d pixels"
 msgstr[0] "%d × %d ピクセル"
-msgstr[1] "%d × %d ピクセル"
 
 #: ../app/core/gimpimagefile.c:628 ../app/display/gimpdisplayshell-title.c:325
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "%d枚のレイヤー"
-msgstr[1] "%d枚のレイヤー"
 
 #: ../app/core/gimpimagefile.c:675
 #, c-format
@@ -6894,7 +6899,7 @@ msgstr ""
 msgid "Please wait"
 msgstr "お待ち下さい"
 
-#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:242
+#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:240
 msgid "Move Selection"
 msgstr "選択範囲を移動"
 
@@ -6969,9 +6974,9 @@ msgstr "背景"
 msgid "pixel"
 msgstr "ピクセル"
 
-#: ../app/core/gimpunit.c:56 ../app/tools/gimpmeasuretool.c:874
-#: ../app/tools/gimpmeasuretool.c:1017 ../app/tools/gimpmeasuretool.c:1073
-#: ../app/tools/gimpmeasuretool.c:1101 ../app/tools/gimppainttool.c:615
+#: ../app/core/gimpunit.c:56 ../app/tools/gimpmeasuretool.c:877
+#: ../app/tools/gimpmeasuretool.c:1020 ../app/tools/gimpmeasuretool.c:1076
+#: ../app/tools/gimpmeasuretool.c:1104 ../app/tools/gimppainttool.c:615
 msgid "pixels"
 msgstr "ピクセル"
 
@@ -7027,6 +7032,10 @@ msgid "translator-credits"
 msgstr ""
 "SHIRASAKI Yasuhiro\n"
 "Ryoichi INAGAKI\n"
+"Tadashi Jokagi\n"
+"OKANO Takayoshi\n"
+"Takashi Kido\n"
+"KAMAGASAKO Masatoshi\n"
 "NISHIBORI Kiyotaka"
 
 #: ../app/dialogs/about-dialog.c:529
@@ -7089,7 +7098,7 @@ msgstr "インデックスカラーに変換"
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "256 色より多いパレットを変換することはできません。"
 
-#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:158
+#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:161
 #: ../app/gui/gui-message.c:148
 msgid "GIMP Message"
 msgstr "GIMP メッセージ"
@@ -7250,21 +7259,21 @@ msgid "Create a New Image"
 msgstr "新しい画像を作成"
 
 #: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:2015
+#: ../app/dialogs/preferences-dialog.c:2021
 msgid "_Template:"
 msgstr "テンプレート(_T): "
 
-#: ../app/dialogs/image-new-dialog.c:295
+#: ../app/dialogs/image-new-dialog.c:299
 msgid "Confirm Image Size"
 msgstr "画像サイズの確認"
 
-#: ../app/dialogs/image-new-dialog.c:317
+#: ../app/dialogs/image-new-dialog.c:321
 #: ../app/dialogs/image-scale-dialog.c:239
 #, c-format
 msgid "You are trying to create an image with a size of %s."
 msgstr "大きさが %s の画像を作成しようとしています。"
 
-#: ../app/dialogs/image-new-dialog.c:324
+#: ../app/dialogs/image-new-dialog.c:328
 #, c-format
 msgid ""
 "An image of the chosen size will use more memory than what is configured as "
@@ -7356,12 +7365,12 @@ msgstr "レイヤー名(_N): "
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1062
+#: ../app/tools/gimpmeasuretool.c:1065
 msgid "Width:"
 msgstr "幅: "
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1090
+#: ../app/tools/gimpmeasuretool.c:1093
 msgid "Height:"
 msgstr "高さ: "
 
@@ -7545,11 +7554,11 @@ msgstr "環境設定をリセットし、すべての設定を初期値に戻し
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "次に示される変更を有効にするには GIMP を再起動する必要があります。"
 
-#: ../app/dialogs/preferences-dialog.c:494
+#: ../app/dialogs/preferences-dialog.c:500
 msgid "Configure Input Devices"
 msgstr "入力デバイスの設定"
 
-#: ../app/dialogs/preferences-dialog.c:571
+#: ../app/dialogs/preferences-dialog.c:577
 msgid ""
 "Your keyboard shortcuts will be reset to default values the next time you "
 "start GIMP."
@@ -7557,753 +7566,753 @@ msgstr ""
 "割り当てられていたキーボードショートカットは、次回 GIMP 起動時にデフォルト値"
 "にリセットされます。"
 
-#: ../app/dialogs/preferences-dialog.c:582
+#: ../app/dialogs/preferences-dialog.c:588
 msgid "Remove all Keyboard Shortcuts"
 msgstr "キーボードショートカットをすべて消去"
 
-#: ../app/dialogs/preferences-dialog.c:604
+#: ../app/dialogs/preferences-dialog.c:610
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "キーボードショートカットをすべて消去してもよろしいですか？"
 
-#: ../app/dialogs/preferences-dialog.c:645
+#: ../app/dialogs/preferences-dialog.c:651
 msgid ""
 "Your window setup will be reset to default values the next time you start "
 "GIMP."
 msgstr "ウィンドウの設定は、次回 GIMP 起動時にデフォルト値にリセットされます。"
 
-#: ../app/dialogs/preferences-dialog.c:680
+#: ../app/dialogs/preferences-dialog.c:686
 msgid ""
 "Your input device settings will be reset to default values the next time you "
 "start GIMP."
 msgstr ""
 "入力デバイスの設定は、次回 GIMP 起動時にデフォルト値にリセットされます。"
 
-#: ../app/dialogs/preferences-dialog.c:715
+#: ../app/dialogs/preferences-dialog.c:721
 msgid ""
 "Your tool options will be reset to default values the next time you start "
 "GIMP."
 msgstr "次回の GIMP 起動時に、ツールオプションの設定が既定値に戻ります"
 
-#: ../app/dialogs/preferences-dialog.c:1283
+#: ../app/dialogs/preferences-dialog.c:1289
 msgid "Show _menubar"
 msgstr "メニューバー(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:1287
+#: ../app/dialogs/preferences-dialog.c:1293
 msgid "Show _rulers"
 msgstr "ルーラー(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1290
+#: ../app/dialogs/preferences-dialog.c:1296
 msgid "Show scroll_bars"
 msgstr "スクロールバー(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1293
+#: ../app/dialogs/preferences-dialog.c:1299
 msgid "Show s_tatusbar"
 msgstr "ステータスバー(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1301
+#: ../app/dialogs/preferences-dialog.c:1307
 msgid "Show s_election"
 msgstr "選択範囲の境界線(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1304
+#: ../app/dialogs/preferences-dialog.c:1310
 msgid "Show _layer boundary"
 msgstr "レイヤーの境界線(_L)"
 
-#: ../app/dialogs/preferences-dialog.c:1307
+#: ../app/dialogs/preferences-dialog.c:1313
 msgid "Show _guides"
 msgstr "ガイド(_G)"
 
-#: ../app/dialogs/preferences-dialog.c:1310
+#: ../app/dialogs/preferences-dialog.c:1316
 msgid "Show gri_d"
 msgstr "グリッド(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1316
+#: ../app/dialogs/preferences-dialog.c:1322
 msgid "Canvas _padding mode:"
 msgstr "キャンバス周辺の表示モード(_P): "
 
-#: ../app/dialogs/preferences-dialog.c:1321
+#: ../app/dialogs/preferences-dialog.c:1327
 msgid "Custom p_adding color:"
 msgstr "カスタムカラー(_A): "
 
-#: ../app/dialogs/preferences-dialog.c:1322
+#: ../app/dialogs/preferences-dialog.c:1328
 msgid "Select Custom Canvas Padding Color"
 msgstr "キャンバス周辺のカスタムカラー"
 
-#: ../app/dialogs/preferences-dialog.c:1411
+#: ../app/dialogs/preferences-dialog.c:1417
 msgid "Preferences"
 msgstr "環境設定"
 
-#: ../app/dialogs/preferences-dialog.c:1523
-#: ../app/dialogs/preferences-dialog.c:2774
+#: ../app/dialogs/preferences-dialog.c:1529
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment"
 msgstr "環境"
 
-#: ../app/dialogs/preferences-dialog.c:1537
+#: ../app/dialogs/preferences-dialog.c:1543
 msgid "Resource Consumption"
 msgstr "リソースの使い方"
 
-#: ../app/dialogs/preferences-dialog.c:1547
+#: ../app/dialogs/preferences-dialog.c:1553
 msgid "Minimal number of _undo levels:"
 msgstr "操作履歴の最小エントリ数(_U): "
 
-#: ../app/dialogs/preferences-dialog.c:1550
+#: ../app/dialogs/preferences-dialog.c:1556
 msgid "Maximum undo _memory:"
 msgstr "操作履歴のメモリサイズ(_M): "
 
-#: ../app/dialogs/preferences-dialog.c:1553
+#: ../app/dialogs/preferences-dialog.c:1559
 msgid "Tile cache _size:"
 msgstr "タイルキャッシュサイズ(_S): "
 
-#: ../app/dialogs/preferences-dialog.c:1556
+#: ../app/dialogs/preferences-dialog.c:1562
 msgid "Maximum _new image size:"
 msgstr "新しい画像の最大サイズ(_N): "
 
-#: ../app/dialogs/preferences-dialog.c:1561
+#: ../app/dialogs/preferences-dialog.c:1567
 msgid "Number of _processors to use:"
 msgstr "使用するプロセッサの数(_P): "
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1566
+#: ../app/dialogs/preferences-dialog.c:1572
 msgid "Image Thumbnails"
 msgstr "画像サムネイル"
 
-#: ../app/dialogs/preferences-dialog.c:1571
+#: ../app/dialogs/preferences-dialog.c:1577
 msgid "Size of _thumbnails:"
 msgstr "サムネイルのサイズ(_T): "
 
-#: ../app/dialogs/preferences-dialog.c:1575
+#: ../app/dialogs/preferences-dialog.c:1581
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "サムネイルの最大ファイルサイズ(_F): "
 
 #. File Saving
-#: ../app/dialogs/preferences-dialog.c:1579
+#: ../app/dialogs/preferences-dialog.c:1585
 msgid "Saving Images"
 msgstr "画像の保存"
 
-#: ../app/dialogs/preferences-dialog.c:1582
+#: ../app/dialogs/preferences-dialog.c:1588
 msgid "Confirm closing of unsa_ved images"
 msgstr "未保存の画像を閉じるときに確認(_V)"
 
-#: ../app/dialogs/preferences-dialog.c:1592
+#: ../app/dialogs/preferences-dialog.c:1598
 msgid "Keep record of used files in the Recent Documents list"
 msgstr "システムの「最近開いたドキュメント」にも記録・反映"
 
-#: ../app/dialogs/preferences-dialog.c:1601
+#: ../app/dialogs/preferences-dialog.c:1607
 msgid "User Interface"
 msgstr "ユーザーインタフェース"
 
-#: ../app/dialogs/preferences-dialog.c:1604
+#: ../app/dialogs/preferences-dialog.c:1610
 msgid "Interface"
 msgstr "ユーザーインタフェース"
 
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1611
+#: ../app/dialogs/preferences-dialog.c:1617
 msgid "Previews"
 msgstr "プレビュー"
 
-#: ../app/dialogs/preferences-dialog.c:1614
+#: ../app/dialogs/preferences-dialog.c:1620
 msgid "_Enable layer & channel previews"
 msgstr "レイヤーとチャンネルのプレビューを表示(_E)"
 
-#: ../app/dialogs/preferences-dialog.c:1620
+#: ../app/dialogs/preferences-dialog.c:1626
 msgid "_Default layer & channel preview size:"
 msgstr "プレビューサイズの既定値(_D): "
 
-#: ../app/dialogs/preferences-dialog.c:1623
+#: ../app/dialogs/preferences-dialog.c:1629
 msgid "Na_vigation preview size:"
 msgstr "ナビゲーションのプレビューサイズ(_V): "
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1627
+#: ../app/dialogs/preferences-dialog.c:1633
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: ../app/dialogs/preferences-dialog.c:1631
+#: ../app/dialogs/preferences-dialog.c:1637
 msgid "Show menu _mnemonics (access keys)"
 msgstr "メニューにニーモニック (アクセスキー) を表示(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:1634
+#: ../app/dialogs/preferences-dialog.c:1640
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "動的なキーボードショートカットを使用(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:1638
+#: ../app/dialogs/preferences-dialog.c:1644
 msgid "Configure _Keyboard Shortcuts..."
 msgstr "キーボードショートカット設定(_K)..."
 
-#: ../app/dialogs/preferences-dialog.c:1645
+#: ../app/dialogs/preferences-dialog.c:1651
 msgid "_Save keyboard shortcuts on exit"
 msgstr "終了時にキーボードショートカットを保存(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1649
+#: ../app/dialogs/preferences-dialog.c:1655
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "現在のキーボードショートカットを保存(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:1656
+#: ../app/dialogs/preferences-dialog.c:1662
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "キーボードショートカットをリセット(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:1665
+#: ../app/dialogs/preferences-dialog.c:1671
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "すべてのキーボードショートカットを消去(_A)"
 
-#: ../app/dialogs/preferences-dialog.c:1677
-#: ../app/dialogs/preferences-dialog.c:1716
+#: ../app/dialogs/preferences-dialog.c:1683
+#: ../app/dialogs/preferences-dialog.c:1722
 msgid "Theme"
 msgstr "テーマ"
 
-#: ../app/dialogs/preferences-dialog.c:1686
+#: ../app/dialogs/preferences-dialog.c:1692
 msgid "Select Theme"
 msgstr "テーマの選択"
 
-#: ../app/dialogs/preferences-dialog.c:1768
+#: ../app/dialogs/preferences-dialog.c:1774
 msgid "Reload C_urrent Theme"
 msgstr "現在のテーマの再読み込み(_U)"
 
-#: ../app/dialogs/preferences-dialog.c:1780
+#: ../app/dialogs/preferences-dialog.c:1786
 msgid "Help System"
 msgstr "ヘルプ"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1792
-#: ../app/dialogs/preferences-dialog.c:1886
-#: ../app/dialogs/preferences-dialog.c:2073
+#: ../app/dialogs/preferences-dialog.c:1798
+#: ../app/dialogs/preferences-dialog.c:1892
+#: ../app/dialogs/preferences-dialog.c:2079
 #: ../app/widgets/gimpcontrollereditor.c:189
 msgid "General"
 msgstr "一般"
 
-#: ../app/dialogs/preferences-dialog.c:1795
+#: ../app/dialogs/preferences-dialog.c:1801
 msgid "Show _tooltips"
 msgstr "ツールチップを表示(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:1798
+#: ../app/dialogs/preferences-dialog.c:1804
 msgid "Show help _buttons"
 msgstr "ヘルプボタンを表示(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1811
+#: ../app/dialogs/preferences-dialog.c:1817
 msgid "Use the online version"
 msgstr "オンライン版"
 
-#: ../app/dialogs/preferences-dialog.c:1812
+#: ../app/dialogs/preferences-dialog.c:1818
 msgid "Use a locally installed copy"
 msgstr "インストール版"
 
-#: ../app/dialogs/preferences-dialog.c:1813
+#: ../app/dialogs/preferences-dialog.c:1819
 msgid "User manual:"
 msgstr "使用するユーザーマニュアル: "
 
-#: ../app/dialogs/preferences-dialog.c:1820
+#: ../app/dialogs/preferences-dialog.c:1826
 msgid "There's a local installation of the user manual."
 msgstr "ユーザーマニュアルはインストール済です。"
 
-#: ../app/dialogs/preferences-dialog.c:1825
+#: ../app/dialogs/preferences-dialog.c:1831
 msgid "The user manual is not installed locally."
 msgstr "ユーザーマニュアルはインストールされていません。"
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1848
+#: ../app/dialogs/preferences-dialog.c:1854
 msgid "Help Browser"
 msgstr "ヘルプブラウザ"
 
-#: ../app/dialogs/preferences-dialog.c:1852
+#: ../app/dialogs/preferences-dialog.c:1858
 msgid "H_elp browser to use:"
 msgstr "使用するヘルプブラウザ(_E): "
 
-#: ../app/dialogs/preferences-dialog.c:1857
+#: ../app/dialogs/preferences-dialog.c:1863
 msgid "Web Browser"
 msgstr "ウェブブラウザ"
 
-#: ../app/dialogs/preferences-dialog.c:1861
+#: ../app/dialogs/preferences-dialog.c:1867
 msgid "_Web browser to use:"
 msgstr "使用するウェブブラウザ(_W): "
 
-#: ../app/dialogs/preferences-dialog.c:1889
+#: ../app/dialogs/preferences-dialog.c:1895
 msgid "_Save tool options on exit"
 msgstr "終了時にツールオプション設定を保存(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:1893
+#: ../app/dialogs/preferences-dialog.c:1899
 msgid "Save Tool Options _Now"
 msgstr "現在のツールオプション設定を保存"
 
-#: ../app/dialogs/preferences-dialog.c:1900
+#: ../app/dialogs/preferences-dialog.c:1906
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "ツールオプション設定をリセット(_R)"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1910
+#: ../app/dialogs/preferences-dialog.c:1916
 msgid "Guide & Grid Snapping"
 msgstr "ガイドとグリッドにスナップ"
 
-#: ../app/dialogs/preferences-dialog.c:1915
+#: ../app/dialogs/preferences-dialog.c:1921
 msgid "_Snap distance:"
 msgstr "スナップ距離(_S): "
 
-#: ../app/dialogs/preferences-dialog.c:1923
+#: ../app/dialogs/preferences-dialog.c:1929
 msgid "Default _interpolation:"
 msgstr "既定の補間方法(_I): "
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1930
+#: ../app/dialogs/preferences-dialog.c:1936
 msgid "Paint Options Shared Between Tools"
 msgstr "ツール共有の描画オプション"
 
-#: ../app/dialogs/preferences-dialog.c:1943
+#: ../app/dialogs/preferences-dialog.c:1949
 msgid "Move Tool"
 msgstr "移動ツール"
 
-#: ../app/dialogs/preferences-dialog.c:1947
+#: ../app/dialogs/preferences-dialog.c:1953
 msgid "Set layer or path as active"
 msgstr "つかんだレイヤーやパスをアクティブに"
 
-#: ../app/dialogs/preferences-dialog.c:1960 ../app/widgets/gimptoolbox.c:631
+#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:633
 msgid "Toolbox"
 msgstr "ツールボックス"
 
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1972
-#: ../app/dialogs/preferences-dialog.c:2146
+#: ../app/dialogs/preferences-dialog.c:1978
+#: ../app/dialogs/preferences-dialog.c:2152
 #: ../app/widgets/gimpgrideditor.c:204
 msgid "Appearance"
 msgstr "表示形式"
 
-#: ../app/dialogs/preferences-dialog.c:1976
+#: ../app/dialogs/preferences-dialog.c:1982
 msgid "Show _foreground & background color"
 msgstr "描画色と背景色(_F)"
 
-#: ../app/dialogs/preferences-dialog.c:1980
+#: ../app/dialogs/preferences-dialog.c:1986
 msgid "Show active _brush, pattern & gradient"
 msgstr "アクティブなブラシ・パターン・グラデーション(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:1984
+#: ../app/dialogs/preferences-dialog.c:1990
 msgid "Show active _image"
 msgstr "アクティブな画像(_I)"
 
-#: ../app/dialogs/preferences-dialog.c:1997
+#: ../app/dialogs/preferences-dialog.c:2003
 msgid "Default New Image"
 msgstr "新しい画像作成時の初期設定"
 
-#: ../app/dialogs/preferences-dialog.c:2000
+#: ../app/dialogs/preferences-dialog.c:2006
 msgid "Default Image"
 msgstr "新しい画像の設定"
 
-#: ../app/dialogs/preferences-dialog.c:2037
+#: ../app/dialogs/preferences-dialog.c:2043
 msgid "Default Image Grid"
 msgstr "グリッドの設定"
 
-#: ../app/dialogs/preferences-dialog.c:2040
+#: ../app/dialogs/preferences-dialog.c:2046
 msgid "Default Grid"
 msgstr "グリッド"
 
-#: ../app/dialogs/preferences-dialog.c:2061
+#: ../app/dialogs/preferences-dialog.c:2067
 msgid "Image Windows"
 msgstr "画像ウィンドウ"
 
-#: ../app/dialogs/preferences-dialog.c:2076
+#: ../app/dialogs/preferences-dialog.c:2082
 msgid "Use \"_Dot for dot\" by default"
 msgstr "画像上のピクセルと画面上のピクセルを１対１で表示(_D)"
 
-#: ../app/dialogs/preferences-dialog.c:2082
+#: ../app/dialogs/preferences-dialog.c:2088
 msgid "Marching _ants speed:"
 msgstr "蟻の行進速度(_A): "
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2086
+#: ../app/dialogs/preferences-dialog.c:2092
 msgid "Zoom & Resize Behavior"
 msgstr "ズームとウィンドウサイズ変更"
 
-#: ../app/dialogs/preferences-dialog.c:2090
+#: ../app/dialogs/preferences-dialog.c:2096
 msgid "Resize window on _zoom"
 msgstr "ズーム時にウィンドウサイズを変更(_Z)"
 
-#: ../app/dialogs/preferences-dialog.c:2093
+#: ../app/dialogs/preferences-dialog.c:2099
 msgid "Resize window on image _size change"
 msgstr "キャンバスサイズ変更時にウィンドウサイズを変更(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2099
+#: ../app/dialogs/preferences-dialog.c:2105
 msgid "Fit to window"
 msgstr "ウィンドウに合わせる"
 
-#: ../app/dialogs/preferences-dialog.c:2101
+#: ../app/dialogs/preferences-dialog.c:2107
 msgid "Initial zoom _ratio:"
 msgstr "既定の表示倍率(_R): "
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2105
+#: ../app/dialogs/preferences-dialog.c:2111
 msgid "Space Bar"
 msgstr "スペースキー"
 
-#: ../app/dialogs/preferences-dialog.c:2111
+#: ../app/dialogs/preferences-dialog.c:2117
 msgid "_While space bar is pressed:"
 msgstr "スペースキーが押されている時: "
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2121
 msgid "Mouse Pointers"
 msgstr "マウスポインタ"
 
-#: ../app/dialogs/preferences-dialog.c:2119
+#: ../app/dialogs/preferences-dialog.c:2125
 msgid "Show _brush outline"
 msgstr "ブラシの輪郭を表示(_B)"
 
-#: ../app/dialogs/preferences-dialog.c:2122
+#: ../app/dialogs/preferences-dialog.c:2128
 msgid "Show pointer for paint _tools"
 msgstr "描画ツールのポインタを表示(_T)"
 
-#: ../app/dialogs/preferences-dialog.c:2128
+#: ../app/dialogs/preferences-dialog.c:2134
 msgid "Pointer _mode:"
 msgstr "ポインタのモード(_M): "
 
-#: ../app/dialogs/preferences-dialog.c:2131
+#: ../app/dialogs/preferences-dialog.c:2137
 msgid "Pointer re_ndering:"
 msgstr "ポインタの表現方法(_N): "
 
-#: ../app/dialogs/preferences-dialog.c:2143
+#: ../app/dialogs/preferences-dialog.c:2149
 msgid "Image Window Appearance"
 msgstr "画像ウィンドウの表示形式"
 
-#: ../app/dialogs/preferences-dialog.c:2154
+#: ../app/dialogs/preferences-dialog.c:2160
 msgid "Default Appearance in Normal Mode"
 msgstr "ノーマルモード時の表示アイテム"
 
-#: ../app/dialogs/preferences-dialog.c:2159
+#: ../app/dialogs/preferences-dialog.c:2165
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "フルスクリーンモード時の表示アイテム"
 
-#: ../app/dialogs/preferences-dialog.c:2168
+#: ../app/dialogs/preferences-dialog.c:2174
 msgid "Image Title & Statusbar Format"
 msgstr "画像タイトルとフォーマットの形式"
 
-#: ../app/dialogs/preferences-dialog.c:2171
+#: ../app/dialogs/preferences-dialog.c:2177
 msgid "Title & Status"
 msgstr "タイトル & ステータスバー"
 
-#: ../app/dialogs/preferences-dialog.c:2189
+#: ../app/dialogs/preferences-dialog.c:2195
 msgid "Current format"
 msgstr "現在のフォーマット"
 
-#: ../app/dialogs/preferences-dialog.c:2190
+#: ../app/dialogs/preferences-dialog.c:2196
 msgid "Default format"
 msgstr "既定のフォーマット"
 
-#: ../app/dialogs/preferences-dialog.c:2191
+#: ../app/dialogs/preferences-dialog.c:2197
 msgid "Show zoom percentage"
 msgstr "表示倍率(パーセント)を表示"
 
-#: ../app/dialogs/preferences-dialog.c:2192
+#: ../app/dialogs/preferences-dialog.c:2198
 msgid "Show zoom ratio"
 msgstr "表示倍率(比率)を表示"
 
-#: ../app/dialogs/preferences-dialog.c:2193
+#: ../app/dialogs/preferences-dialog.c:2199
 msgid "Show image size"
 msgstr "キャンバスサイズを表示"
 
-#: ../app/dialogs/preferences-dialog.c:2206
+#: ../app/dialogs/preferences-dialog.c:2212
 msgid "Image Title Format"
 msgstr "画像タイトル形式: "
 
-#: ../app/dialogs/preferences-dialog.c:2208
+#: ../app/dialogs/preferences-dialog.c:2214
 msgid "Image Statusbar Format"
 msgstr "画像ステータスバー形式: "
 
-#: ../app/dialogs/preferences-dialog.c:2293
+#: ../app/dialogs/preferences-dialog.c:2299
 msgid "Display"
 msgstr "ディスプレイ"
 
-#: ../app/dialogs/preferences-dialog.c:2309
+#: ../app/dialogs/preferences-dialog.c:2315
 msgid "_Check style:"
 msgstr "透明部分の表示方法(_C): "
 
-#: ../app/dialogs/preferences-dialog.c:2312
+#: ../app/dialogs/preferences-dialog.c:2318
 msgid "Check _size:"
 msgstr "市松模様の大きさ(_S): "
 
-#: ../app/dialogs/preferences-dialog.c:2315
+#: ../app/dialogs/preferences-dialog.c:2321
 msgid "Monitor Resolution"
 msgstr "モニタ解像度"
 
-#: ../app/dialogs/preferences-dialog.c:2319
+#: ../app/dialogs/preferences-dialog.c:2325
 #: ../app/widgets/gimpcursorview.c:124 ../app/widgets/gimpgrideditor.c:269
 #: ../app/widgets/gimpgrideditor.c:301
 msgid "Pixels"
 msgstr "ピクセル"
 
-#: ../app/dialogs/preferences-dialog.c:2341
+#: ../app/dialogs/preferences-dialog.c:2347
 #: ../app/widgets/gimpimagepropview.c:476
 msgid "ppi"
 msgstr "dpi"
 
-#: ../app/dialogs/preferences-dialog.c:2357
+#: ../app/dialogs/preferences-dialog.c:2363
 #, c-format
 msgid "_Detect automatically (currently %d × %d ppi)"
 msgstr "自動検出(現在 %d × %d dpi)"
 
-#: ../app/dialogs/preferences-dialog.c:2377
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "_Enter manually"
 msgstr "手動設定(_M)"
 
-#: ../app/dialogs/preferences-dialog.c:2392
+#: ../app/dialogs/preferences-dialog.c:2398
 msgid "C_alibrate..."
 msgstr "測定(_A)..."
 
-#: ../app/dialogs/preferences-dialog.c:2415
+#: ../app/dialogs/preferences-dialog.c:2421
 msgid "Color Management"
 msgstr "カラーマネジメント"
 
-#: ../app/dialogs/preferences-dialog.c:2435
+#: ../app/dialogs/preferences-dialog.c:2441
 msgid "_RGB profile:"
 msgstr "RGB プロファイル(_R): "
 
-#: ../app/dialogs/preferences-dialog.c:2436
+#: ../app/dialogs/preferences-dialog.c:2442
 msgid "Select RGB Color Profile"
 msgstr "RGB カラープロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2437
+#: ../app/dialogs/preferences-dialog.c:2443
 msgid "_CMYK profile:"
 msgstr "CMYK プロファイル(_C): "
 
-#: ../app/dialogs/preferences-dialog.c:2438
+#: ../app/dialogs/preferences-dialog.c:2444
 msgid "Select CMYK Color Profile"
 msgstr "CMYK カラープロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2439
+#: ../app/dialogs/preferences-dialog.c:2445
 msgid "_Monitor profile:"
 msgstr "モニタープロファイル(_M): "
 
-#: ../app/dialogs/preferences-dialog.c:2440
+#: ../app/dialogs/preferences-dialog.c:2446
 msgid "Select Monitor Color Profile"
 msgstr "モニターカラープロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2441
+#: ../app/dialogs/preferences-dialog.c:2447
 msgid "_Print simulation profile:"
 msgstr "印刷プロファイル(_P): "
 
-#: ../app/dialogs/preferences-dialog.c:2442
+#: ../app/dialogs/preferences-dialog.c:2448
 msgid "Select Printer Color Profile"
 msgstr "印刷プロファイルの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2453
+#: ../app/dialogs/preferences-dialog.c:2459
 msgid "_Mode of operation:"
 msgstr "操作モード(_M): "
 
-#: ../app/dialogs/preferences-dialog.c:2483
+#: ../app/dialogs/preferences-dialog.c:2489
 msgid "_Try to use the system monitor profile"
 msgstr "システムのモニタプロファイル使用を優先"
 
-#: ../app/dialogs/preferences-dialog.c:2493
+#: ../app/dialogs/preferences-dialog.c:2499
 msgid "_Display rendering intent:"
 msgstr "ディスプレイ描画方法(_D): "
 
-#: ../app/dialogs/preferences-dialog.c:2502
+#: ../app/dialogs/preferences-dialog.c:2508
 msgid "_Softproof rendering intent:"
 msgstr "ソフトプルーフ描画方法(_S): "
 
-#: ../app/dialogs/preferences-dialog.c:2515
+#: ../app/dialogs/preferences-dialog.c:2521
 msgid "Mark out of gamut colors"
 msgstr "表現不可能な色領域をマーキング"
 
-#: ../app/dialogs/preferences-dialog.c:2520
+#: ../app/dialogs/preferences-dialog.c:2526
 msgid "Select Warning Color"
 msgstr "マーキング色の選択"
 
-#: ../app/dialogs/preferences-dialog.c:2533
+#: ../app/dialogs/preferences-dialog.c:2539
 msgid "File Open behaviour:"
 msgstr "ファイルを開く時の挙動: "
 
-#: ../app/dialogs/preferences-dialog.c:2545
+#: ../app/dialogs/preferences-dialog.c:2551
 msgid "Input Devices"
 msgstr "入力デバイス"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2555
+#: ../app/dialogs/preferences-dialog.c:2561
 msgid "Extended Input Devices"
 msgstr "追加入力デバイス"
 
-#: ../app/dialogs/preferences-dialog.c:2559
+#: ../app/dialogs/preferences-dialog.c:2565
 msgid "Configure E_xtended Input Devices..."
 msgstr "追加された入力デバイスの設定(_X)..."
 
-#: ../app/dialogs/preferences-dialog.c:2566
+#: ../app/dialogs/preferences-dialog.c:2572
 msgid "_Save input device settings on exit"
 msgstr "入力デバイスの設定を終了時に保存(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2570
+#: ../app/dialogs/preferences-dialog.c:2576
 msgid "Save Input Device Settings _Now"
 msgstr "現在の入力デバイスの設定を保存(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2577
+#: ../app/dialogs/preferences-dialog.c:2583
 msgid "_Reset Saved Input Device Settings to Default Values"
 msgstr "入力デバイスの設定をリセット(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2592
+#: ../app/dialogs/preferences-dialog.c:2598
 msgid "Additional Input Controllers"
 msgstr "入力コントローラの追加"
 
-#: ../app/dialogs/preferences-dialog.c:2595
+#: ../app/dialogs/preferences-dialog.c:2601
 msgid "Input Controllers"
 msgstr "入力コントローラ"
 
-#: ../app/dialogs/preferences-dialog.c:2611
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Window Management"
 msgstr "ウィンドウ・マネジメント"
 
-#: ../app/dialogs/preferences-dialog.c:2620
+#: ../app/dialogs/preferences-dialog.c:2626
 msgid "Window Manager Hints"
 msgstr "ウィンドウマネージャのヒント"
 
-#: ../app/dialogs/preferences-dialog.c:2626
+#: ../app/dialogs/preferences-dialog.c:2632
 msgid "Hint for the _toolbox:"
 msgstr "ツールボックスのヒント(_T): "
 
-#: ../app/dialogs/preferences-dialog.c:2630
+#: ../app/dialogs/preferences-dialog.c:2636
 msgid "Hint for other _docks:"
 msgstr "ドックのヒント(_D): "
 
-#: ../app/dialogs/preferences-dialog.c:2635
+#: ../app/dialogs/preferences-dialog.c:2641
 msgid "Toolbox and other docks are transient to the active image window"
 msgstr ""
 "ツールボックスウィンドウやドックウィンドウを\n"
 "アクティブな画像ウィンドウより前面に表示"
 
-#: ../app/dialogs/preferences-dialog.c:2640
+#: ../app/dialogs/preferences-dialog.c:2646
 msgid "Focus"
 msgstr "フォーカス"
 
-#: ../app/dialogs/preferences-dialog.c:2644
+#: ../app/dialogs/preferences-dialog.c:2650
 msgid "Activate the _focused image"
 msgstr "フォーカスされた画像をアクティブに(_F)"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2648
+#: ../app/dialogs/preferences-dialog.c:2654
 msgid "Window Positions"
 msgstr "ウィンドウ位置"
 
-#: ../app/dialogs/preferences-dialog.c:2651
+#: ../app/dialogs/preferences-dialog.c:2657
 msgid "_Save window positions on exit"
 msgstr "終了時にウィンドウの位置を保存(_S)"
 
-#: ../app/dialogs/preferences-dialog.c:2655
+#: ../app/dialogs/preferences-dialog.c:2661
 msgid "Save Window Positions _Now"
 msgstr "現在のウィンドウ位置を保存(_N)"
 
-#: ../app/dialogs/preferences-dialog.c:2662
+#: ../app/dialogs/preferences-dialog.c:2668
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "保存されているウィンドウ位置をリセット(_R)"
 
-#: ../app/dialogs/preferences-dialog.c:2677
+#: ../app/dialogs/preferences-dialog.c:2683
 msgid "Folders"
 msgstr "フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2697
+#: ../app/dialogs/preferences-dialog.c:2703
 msgid "Temporary folder:"
 msgstr "テンポラリフォルダ: "
 
-#: ../app/dialogs/preferences-dialog.c:2698
+#: ../app/dialogs/preferences-dialog.c:2704
 msgid "Select Folder for Temporary Files"
 msgstr "テンポラリ用フォルダを選択します"
 
-#: ../app/dialogs/preferences-dialog.c:2702
+#: ../app/dialogs/preferences-dialog.c:2708
 msgid "Swap folder:"
 msgstr "スワップ用フォルダ: "
 
-#: ../app/dialogs/preferences-dialog.c:2703
+#: ../app/dialogs/preferences-dialog.c:2709
 msgid "Select Swap Folder"
 msgstr "スワップ用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Brush Folders"
 msgstr "ブラシ用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Select Brush Folders"
 msgstr "ブラシ用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Pattern Folders"
 msgstr "パターン用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Select Pattern Folders"
 msgstr "パターン用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Palette Folders"
 msgstr "パレット用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Select Palette Folders"
 msgstr "パレット用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradient Folders"
 msgstr "グラデーション用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Select Gradient Folders"
 msgstr "グラデーション用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2754
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Font Folders"
 msgstr "フォント用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2756
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Select Font Folders"
 msgstr "フォント用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2758
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-In Folders"
 msgstr "プラグイン用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2760
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Select Plug-In Folders"
 msgstr "プラグイン用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Scripts"
 msgstr "スクリプト"
 
-#: ../app/dialogs/preferences-dialog.c:2762
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Script-Fu Folders"
 msgstr "スクリプト用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2764
+#: ../app/dialogs/preferences-dialog.c:2770
 msgid "Select Script-Fu Folders"
 msgstr "スクリプト用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2766
+#: ../app/dialogs/preferences-dialog.c:2772
 msgid "Module Folders"
 msgstr "モジュール用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2768
+#: ../app/dialogs/preferences-dialog.c:2774
 msgid "Select Module Folders"
 msgstr "モジュール用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2770
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreters"
 msgstr "インタプリタ"
 
-#: ../app/dialogs/preferences-dialog.c:2770
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreter Folders"
 msgstr "インタプリタ用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2772
+#: ../app/dialogs/preferences-dialog.c:2778
 msgid "Select Interpreter Folders"
 msgstr "インタプリタ用フォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2774
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment Folders"
 msgstr "環境設定保存フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2776
+#: ../app/dialogs/preferences-dialog.c:2782
 msgid "Select Environment Folders"
 msgstr "環境設定を保存するフォルダの選択"
 
-#: ../app/dialogs/preferences-dialog.c:2778
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Themes"
 msgstr "テーマ"
 
-#: ../app/dialogs/preferences-dialog.c:2778
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Theme Folders"
 msgstr "テーマ用フォルダ"
 
-#: ../app/dialogs/preferences-dialog.c:2780
+#: ../app/dialogs/preferences-dialog.c:2786
 msgid "Select Theme Folders"
 msgstr "テーマ用フォルダの選択"
 
@@ -8359,8 +8368,7 @@ msgstr "このまま画像を閉じると、変更が破棄されます。"
 #, c-format
 msgid "There is one image with unsaved changes:"
 msgid_plural "There are %d images with unsaved changes:"
-msgstr[0] "保存されていない画像があります。"
-msgstr[1] "%d 個の保存されていない画像があります。"
+msgstr[0] "%d 個の保存されていない画像があります。"
 
 #: ../app/dialogs/quit-dialog.c:238
 msgid "_Discard Changes"
@@ -8463,7 +8471,7 @@ msgstr "次の技(_N)"
 #. a link to the related section in the user manual
 #: ../app/dialogs/tips-dialog.c:194
 msgid "Learn more"
-msgstr "詳しくはコチラ(英語)"
+msgstr "詳しくはコチラ"
 
 #. This is a special string to specify the language identifier to
 #. look for in the gimp-tips.xml file. Please translate the C in it
@@ -8581,20 +8589,20 @@ msgstr "高品位"
 msgid "Image saved to '%s'"
 msgstr "画像は、ファイル '%s' に保存されました"
 
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "画像メニューにアクセス"
 
-#: ../app/display/gimpdisplayshell.c:1138
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "ウィンドウサイズ変更時に画像をズーム"
 
-#: ../app/display/gimpdisplayshell.c:1188
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "この画像のナビゲーションプレビューを表示します"
 
-#: ../app/display/gimpdisplayshell.c:1283
-#: ../app/display/gimpdisplayshell.c:1373 ../app/widgets/gimptoolbox.c:222
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375 ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
 msgstr ""
 "ここに画像ドキュメント・アイコンをドロップすると、その画像を開きます。（ツー"
@@ -8623,8 +8631,7 @@ msgstr "画像 '%s' の変更を保存しますか?"
 msgid "If you don't save the image, changes from the last hour will be lost."
 msgid_plural ""
 "If you don't save the image, changes from the last %d hours will be lost."
-msgstr[0] "保存しない場合は 1 時間前からの変更が破棄されます。"
-msgstr[1] "保存しない場合は %d 時間前からの変更が破棄されます。"
+msgstr[0] "保存しない場合は %d 時間前からの変更が破棄されます。"
 
 #: ../app/display/gimpdisplayshell-close.c:264
 #, c-format
@@ -8635,15 +8642,13 @@ msgid_plural ""
 "If you don't save the image, changes from the last hour and %d minutes will "
 "be lost."
 msgstr[0] "保存しない場合は 1 時間 %d 分前からの変更が破棄されます。"
-msgstr[1] "保存しない場合は 1 時間 %d 分前からの変更が破棄されます。"
 
 #: ../app/display/gimpdisplayshell-close.c:275
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
 msgid_plural ""
 "If you don't save the image, changes from the last %d minutes will be lost."
-msgstr[0] "保存しない場合は 1 分前からの変更が破棄されます。"
-msgstr[1] "保存しない場合は %d 分前からの変更が破棄されます。"
+msgstr[0] "保存しない場合は %d 分前からの変更が破棄されます。"
 
 #: ../app/display/gimpdisplayshell-dnd.c:255
 #: ../app/display/gimpdisplayshell-dnd.c:587
@@ -8805,7 +8810,7 @@ msgid "not a GIMP Levels file"
 msgstr "GIMP の色レベル設定ファイルではありません。"
 
 #. initialize the document history
-#: ../app/gui/gui.c:420
+#: ../app/gui/gui.c:426
 msgid "Documents"
 msgstr "画像ドキュメント"
 
@@ -8935,7 +8940,7 @@ msgstr "2D 変換しています"
 msgid "2D Transforming"
 msgstr "2D 変換しています..."
 
-#: ../app/pdb/edit-cmds.c:709 ../app/tools/gimpblendtool.c:223
+#: ../app/pdb/edit-cmds.c:709 ../app/tools/gimpblendtool.c:225
 msgid "Blending"
 msgstr "ブレンドしています..."
 
@@ -9373,7 +9378,7 @@ msgstr ""
 "Pack my box with\n"
 "five dozen liquor jugs."
 
-#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:877
+#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:879
 msgid "Add Text Layer"
 msgstr "テキストレイヤーを追加"
 
@@ -9463,7 +9468,7 @@ msgstr "割合: "
 msgid "Pressure:"
 msgstr "筆圧感知: "
 
-#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:754
+#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:766
 msgid "Align"
 msgstr "整列"
 
@@ -9477,93 +9482,93 @@ msgstr ""
 msgid "_Align"
 msgstr "整列(_A)"
 
-#: ../app/tools/gimpaligntool.c:587
+#: ../app/tools/gimpaligntool.c:599
 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
 msgstr ""
 "クリックでレイヤー、パスまたはガイドを、クリック-ドラッグで複数のレイヤーを整"
 "列対象にします"
 
-#: ../app/tools/gimpaligntool.c:596
+#: ../app/tools/gimpaligntool.c:608
 msgid "Click to pick this layer as first item"
 msgstr "クリックでこのレイヤーを「最初のアイテム」にします"
 
-#: ../app/tools/gimpaligntool.c:604
+#: ../app/tools/gimpaligntool.c:616
 msgid "Click to add this layer to the list"
 msgstr "クリックでこのレイヤーを対象に加えます"
 
-#: ../app/tools/gimpaligntool.c:608
+#: ../app/tools/gimpaligntool.c:620
 msgid "Click to pick this guide as first item"
 msgstr "クリックでこのガイドを「最初のアイテム」にします"
 
-#: ../app/tools/gimpaligntool.c:616
+#: ../app/tools/gimpaligntool.c:628
 msgid "Click to add this guide to the list"
 msgstr "クリックでこのガイドを対象に加えます"
 
-#: ../app/tools/gimpaligntool.c:620
+#: ../app/tools/gimpaligntool.c:632
 msgid "Click to pick this path as first item"
 msgstr "クリックでこのパスを「最初のアイテム」にします"
 
-#: ../app/tools/gimpaligntool.c:628
+#: ../app/tools/gimpaligntool.c:640
 msgid "Click to add this path to the list"
 msgstr "クリックでこのアイテムを対象に加えます"
 
-#: ../app/tools/gimpaligntool.c:766
+#: ../app/tools/gimpaligntool.c:778
 msgid "Relative to:"
 msgstr "基準: "
 
-#: ../app/tools/gimpaligntool.c:784
+#: ../app/tools/gimpaligntool.c:796
 msgid "Align left edge of target"
 msgstr "左揃え"
 
-#: ../app/tools/gimpaligntool.c:790
+#: ../app/tools/gimpaligntool.c:802
 msgid "Align center of target"
 msgstr "中央揃え(水平方向の)"
 
-#: ../app/tools/gimpaligntool.c:796
+#: ../app/tools/gimpaligntool.c:808
 msgid "Align right edge of target"
 msgstr "右揃え"
 
-#: ../app/tools/gimpaligntool.c:806
+#: ../app/tools/gimpaligntool.c:818
 msgid "Align top edge of target"
 msgstr "上揃え"
 
-#: ../app/tools/gimpaligntool.c:812
+#: ../app/tools/gimpaligntool.c:824
 msgid "Align middle of target"
 msgstr "中央揃え(垂直方向の)"
 
-#: ../app/tools/gimpaligntool.c:818
+#: ../app/tools/gimpaligntool.c:830
 msgid "Align bottom of target"
 msgstr "下揃え"
 
-#: ../app/tools/gimpaligntool.c:822
+#: ../app/tools/gimpaligntool.c:834
 msgid "Distribute"
 msgstr "並べる"
 
-#: ../app/tools/gimpaligntool.c:836
+#: ../app/tools/gimpaligntool.c:848
 msgid "Distribute left edges of targets"
 msgstr "左端を基準に並べる"
 
-#: ../app/tools/gimpaligntool.c:843
+#: ../app/tools/gimpaligntool.c:855
 msgid "Distribute horizontal centers of targets"
 msgstr "中央(水平方向)を基準に並べる"
 
-#: ../app/tools/gimpaligntool.c:850
+#: ../app/tools/gimpaligntool.c:862
 msgid "Distribute right edges of targets"
 msgstr "右端を基準に並べる"
 
-#: ../app/tools/gimpaligntool.c:860
+#: ../app/tools/gimpaligntool.c:872
 msgid "Distribute top edges of targets"
 msgstr "上端を基準に並べる"
 
-#: ../app/tools/gimpaligntool.c:867
+#: ../app/tools/gimpaligntool.c:879
 msgid "Distribute vertical centers of targets"
 msgstr "中央(垂直方向)を基準に並べる"
 
-#: ../app/tools/gimpaligntool.c:873
+#: ../app/tools/gimpaligntool.c:885
 msgid "Distribute bottoms of targets"
 msgstr "下端を基準に並べる"
 
-#: ../app/tools/gimpaligntool.c:881 ../app/tools/gimpblendoptions.c:222
+#: ../app/tools/gimpaligntool.c:893 ../app/tools/gimpblendoptions.c:222
 msgid "Offset:"
 msgstr "オフセット: "
 
@@ -9603,22 +9608,22 @@ msgstr ""
 msgid "Blen_d"
 msgstr "ブレンド(_D)"
 
-#: ../app/tools/gimpblendtool.c:162
+#: ../app/tools/gimpblendtool.c:164
 #, c-format
 msgid "Blend does not operate on indexed layers."
 msgstr "インデックスレイヤーでは、グラデーションは使えません"
 
-#: ../app/tools/gimpblendtool.c:400 ../app/tools/gimppainttool.c:606
+#: ../app/tools/gimpblendtool.c:402 ../app/tools/gimppainttool.c:606
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%sで、15 度毎に角度をスナップ"
 
-#: ../app/tools/gimpblendtool.c:401
+#: ../app/tools/gimpblendtool.c:403
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s を押しながらドラッグでベクトルを移動"
 
-#: ../app/tools/gimpblendtool.c:405
+#: ../app/tools/gimpblendtool.c:407
 msgid "Blend: "
 msgstr "ブレンド: "
 
@@ -10158,13 +10163,13 @@ msgstr "範囲"
 msgid "Exposure:"
 msgstr "露出: "
 
-#: ../app/tools/gimpeditselectiontool.c:246
-#: ../app/tools/gimpeditselectiontool.c:1231
+#: ../app/tools/gimpeditselectiontool.c:244
+#: ../app/tools/gimpeditselectiontool.c:1229
 msgid "Move Floating Selection"
 msgstr "フローティング選択範囲の移動"
 
-#: ../app/tools/gimpeditselectiontool.c:459
-#: ../app/tools/gimpeditselectiontool.c:728
+#: ../app/tools/gimpeditselectiontool.c:457
+#: ../app/tools/gimpeditselectiontool.c:726
 msgid "Move: "
 msgstr "移動: "
 
@@ -10544,7 +10549,7 @@ msgstr "補正"
 msgid "Size:"
 msgstr "大きさ"
 
-#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1034
+#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1037
 #: ../app/widgets/gimpbrusheditor.c:208
 msgid "Angle:"
 msgstr "角度: "
@@ -10599,7 +10604,7 @@ msgstr ""
 msgid "Intelligent _Scissors"
 msgstr "電脳はさみ(_S)"
 
-#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpmeasuretool.c:606
+#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpmeasuretool.c:609
 msgid "Click-Drag to move this point"
 msgstr "クリック-ドラッグでこのポイントを移動します"
 
@@ -10736,36 +10741,36 @@ msgstr ""
 msgid "_Measure"
 msgstr "定規(_M)"
 
-#: ../app/tools/gimpmeasuretool.c:238
+#: ../app/tools/gimpmeasuretool.c:241
 msgid "Add Guides"
 msgstr "ガイドを追加"
 
-#: ../app/tools/gimpmeasuretool.c:558
+#: ../app/tools/gimpmeasuretool.c:561
 msgid "Click to place vertical and horizontal guides"
 msgstr "クリックで垂直方向・水平方向のガイドを配置します"
 
-#: ../app/tools/gimpmeasuretool.c:567
+#: ../app/tools/gimpmeasuretool.c:570
 msgid "Click to place a horizontal guide"
 msgstr "クリックでこの位置に水平ガイドを置きます"
 
-#: ../app/tools/gimpmeasuretool.c:581
+#: ../app/tools/gimpmeasuretool.c:584
 msgid "Click to place a vertical guide"
 msgstr "クリックでこの位置に垂直ガイドを置きます"
 
-#: ../app/tools/gimpmeasuretool.c:595
+#: ../app/tools/gimpmeasuretool.c:598
 msgid "Click-Drag to add a new point"
 msgstr "クリック-ドラッグで新たなポイントを追加します"
 
-#: ../app/tools/gimpmeasuretool.c:625
+#: ../app/tools/gimpmeasuretool.c:628
 msgid "Click-Drag to move all points"
 msgstr "クリック-ドラッグすべてのポイントを移動します"
 
 #. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:986
+#: ../app/tools/gimpmeasuretool.c:989
 msgid "Measure Distances and Angles"
 msgstr "距離と角度を測ります"
 
-#: ../app/tools/gimpmeasuretool.c:1006
+#: ../app/tools/gimpmeasuretool.c:1009
 msgid "Distance:"
 msgstr "距離: "
 
@@ -11281,19 +11286,19 @@ msgstr ""
 msgid "Te_xt"
 msgstr "テキスト(_X)"
 
-#: ../app/tools/gimptexttool.c:954
+#: ../app/tools/gimptexttool.c:956
 msgid "GIMP Text Editor"
 msgstr "GIMP テキストエディタ"
 
-#: ../app/tools/gimptexttool.c:1070 ../app/tools/gimptexttool.c:1073
+#: ../app/tools/gimptexttool.c:1072 ../app/tools/gimptexttool.c:1075
 msgid "Confirm Text Editing"
 msgstr "文字編集確認"
 
-#: ../app/tools/gimptexttool.c:1077
+#: ../app/tools/gimptexttool.c:1079
 msgid "Create _New Layer"
 msgstr "新しいテキストレイヤーを追加(_N)"
 
-#: ../app/tools/gimptexttool.c:1101
+#: ../app/tools/gimptexttool.c:1103
 msgid ""
 "The layer you selected is a text layer but it has been modified using other "
 "tools. Editing the layer with the text tool will discard these "
@@ -11307,7 +11312,7 @@ msgstr ""
 "このレイヤーを編集することも、文字アトリビュートを用いて新しいテキストレイ"
 "ヤーを生成することもできます。"
 
-#: ../app/tools/gimptexttool.c:1313
+#: ../app/tools/gimptexttool.c:1315
 msgid "Reshape Text Layer"
 msgstr "テキストレイヤーの変形"
 
@@ -12368,15 +12373,15 @@ msgstr "背景色(_B): "
 msgid "Spacing"
 msgstr "間隔: "
 
-#: ../app/widgets/gimphelp.c:276
+#: ../app/widgets/gimphelp.c:294
 msgid "Help browser is missing"
 msgstr "ヘルプブラウザが見つかりません"
 
-#: ../app/widgets/gimphelp.c:277
+#: ../app/widgets/gimphelp.c:295
 msgid "The GIMP help browser is not available."
 msgstr "ヘルプブラウザは現在利用できません。"
 
-#: ../app/widgets/gimphelp.c:278
+#: ../app/widgets/gimphelp.c:296
 msgid ""
 "The GIMP help browser plug-in appears to be missing from your installation. "
 "You may instead use the web browser for reading the help pages."
@@ -12384,41 +12389,39 @@ msgstr ""
 "このインストールには GIMP ヘルプブラウザ・プラグインが見つかりません。ユー"
 "ザーマニュアルを表示するにはウェブブラウザを使用してください。"
 
-#: ../app/widgets/gimphelp.c:319
+#: ../app/widgets/gimphelp.c:337
 msgid "Help browser doesn't start"
 msgstr "ヘルプブラウザが起動しません"
 
-#: ../app/widgets/gimphelp.c:320
+#: ../app/widgets/gimphelp.c:338
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "GIMP ヘルプブラウザ・プラグインが起動できませんでした"
 
-#: ../app/widgets/gimphelp.c:347
+#: ../app/widgets/gimphelp.c:365
 msgid "Use _Web Browser"
 msgstr "ウェブブラウザを使用"
 
-#: ../app/widgets/gimphelp.c:596
+#: ../app/widgets/gimphelp.c:614
 msgid "GIMP user manual is missing"
 msgstr "GIMP ユーザーマニュアルが見つかりません"
 
-#: ../app/widgets/gimphelp.c:603
+#: ../app/widgets/gimphelp.c:621
 msgid "_Read Online"
 msgstr "オンライン版を参照"
 
-#: ../app/widgets/gimphelp.c:627
+#: ../app/widgets/gimphelp.c:645
 msgid "The GIMP user manual is not installed on your computer."
 msgstr ""
 "GIMP ユーザーマニュアルが\n"
 "インストールされていません。"
 
-#: ../app/widgets/gimphelp.c:630
+#: ../app/widgets/gimphelp.c:648
 msgid ""
 "You may either install the additional help package or change your "
 "preferences to use the online version."
 msgstr ""
 "GIMP ヘルプパッケージを追加インストールするか、環境設定のヘルプの項目で、使用"
-"するユーザーマニュアルを「オンライン版」に設定変更すれば利用可能です。（ただ"
-"し、どちらの場合も日本語に翻訳されたユーザーマニュアルは用意されていませ"
-"ん。）"
+"するユーザーマニュアルを「オンライン版」に設定変更すれば利用可能です。"
 
 #: ../app/widgets/gimphistogrameditor.c:99
 msgid "Mean:"
@@ -13437,9 +13440,6 @@ msgstr ""
 #~ msgstr[0] ""
 #~ "このウィンドウには %d個のタブが開いています\n"
 #~ "ウィンドウを閉じるとこのタブも閉じられます"
-#~ msgstr[1] ""
-#~ "このウィンドウには %d個のタブが開いています\n"
-#~ "ウィンドウを閉じるとこれらのタブもすべて閉じられます"
 
 #~ msgid "_Dialogs"
 #~ msgstr "ダイアログ(_D)"
diff --git a/po/nn.po b/po/nn.po
index 4c24436653..a835a19b15 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1,12 +1,11 @@
-#  Kolbjørn Stuestøl 
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp 2.4\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-12 15:26+0100\n"
-"PO-Revision-Date: 2008-11-14 08:23+0100\n"
-"Last-Translator: Kolbjørn Stuestøl \n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gimp&component=general\n"
+"POT-Creation-Date: 2009-04-17 09:11+0000\n"
+"PO-Revision-Date: 2009-09-14 16:44+0100\n"
+"Last-Translator: Kolbjørn Stuestøl \n"
 "Language-Team: Kolbjørn Stuestøl \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +18,12 @@ msgstr ""
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:27 ../desktop/gimp.desktop.in.in.h:2
+#: ../app/about.h:27
+#: ../desktop/gimp.desktop.in.in.h:2
 msgid "GNU Image Manipulation Program"
 msgstr "GNU biletbehandlingsprogram"
 
 #: ../app/about.h:30
-#, fuzzy
 msgid ""
 "Copyright © 1995-2008\n"
 "Spencer Kimball, Peter Mattis and the GIMP Development Team"
@@ -34,152 +33,136 @@ msgstr ""
 
 #: ../app/about.h:34
 msgid ""
-"GIMP is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
+"GIMP is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
 "\n"
-"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details.\n"
+"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with "
-"GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - "
-"Suite 330, Boston, MA 02111-1307, USA."
+"You should have received a copy of the GNU General Public License along with GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-"GIMP er fri programvare. Du kan distribuere det vidare og/eller endre det "
-"under vilkåra gitt i GNU General Public License som er utgitt av Free "
-"Software Foundation, anten versjon 2 av lisensen eller seinare versjon.\n"
+"GIMP er fri programvare. Du kan distribuere det vidare og/eller endre det under vilkåra gitt i GNU General Public License som er utgitt av Free Software Foundation, anten versjon 2 av lisensen eller seinare versjon.\n"
 "\n"
-"GIMP blir distribuert i håp om at det kan kome til nytte for noen, men UTAN "
-"NOE SOM HELST GARANTI. Ikkje eingong med garanti for å vere MARKNADSDYKTIG "
-"eller TILPASSA BESTEMTE BEHOV. Sjå GNU General Public License for nærare "
-"informasjon.\n"
+"GIMP blir distribuert i håp om at det kan kome til nytte for noen, men UTAN NOE SOM HELST GARANTI. Ikkje eingong med garanti for å vere MARKNADSDYKTIG eller TILPASSA BESTEMTE BEHOV. Sjå GNU General Public License for nærare informasjon.\n"
 "\n"
-"Du skal ha tatt i mot ein kopi av GNU General Public License saman med dette "
-"programmet. Dersom denne manglar, kan du skrive til Free Software Foundation "
-"Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+"Du skal ha tatt i mot ein kopi av GNU General Public License saman med dette programmet. Dersom denne manglar, kan du skrive til Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: ../app/app.c:211
+#: ../app/app.c:214
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
 "\n"
-"To avoid data loss, please check the location and permissions of the swap "
-"directory defined in your Preferences (currently \"%s\")."
+"To avoid data loss, please check the location and permissions of the swap directory defined in your Preferences (currently \"%s\")."
 msgstr ""
 "Kan ikkje opna testfila i mellomlageret.\n"
 "\n"
-"For å unngå tap av data, kontroller plasseringa og rettane for "
-"mellomlagringsmappa i brukarinnstillingane. (Nå  sett til «%s»)"
+"For å unngå tap av data, kontroller plasseringa og rettane for mellomlagringsmappa i brukarinnstillingane. (Nå  sett til «%s»)"
 
 #: ../app/batch.c:75
 #, c-format
 msgid "No batch interpreter specified, using the default '%s'.\n"
 msgstr "Mengdetolkar ikkje spesifisert, bruker «%s».\n"
 
-#: ../app/batch.c:93 ../app/batch.c:111
+#: ../app/batch.c:93
+#: ../app/batch.c:111
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
 msgstr "Mengdetolkaren «%s» er ikkje tilgjengeleg, mengdemodus er slått av."
 
-#: ../app/main.c:156 ../tools/gimp-remote.c:60
+#: ../app/main.c:144
+#: ../tools/gimp-remote.c:60
 msgid "Show version information and exit"
 msgstr "Vis versjonsinformasjonen og slutt av"
 
-#: ../app/main.c:161
+#: ../app/main.c:149
 msgid "Show license information and exit"
 msgstr "Vis lisensinformasjonen og slutt av"
 
-#: ../app/main.c:166
+#: ../app/main.c:154
 msgid "Be more verbose"
 msgstr "Forklar nærare"
 
-#: ../app/main.c:171
+#: ../app/main.c:159
 msgid "Start a new GIMP instance"
 msgstr "Start ei ny økt av GIMP"
 
-#: ../app/main.c:176
+#: ../app/main.c:164
 msgid "Open images as new"
 msgstr "Opna bilete som nytt"
 
-#: ../app/main.c:181
+#: ../app/main.c:169
 msgid "Run without a user interface"
 msgstr "Køyr utan brukargrensesnitt."
 
-#: ../app/main.c:186
+#: ../app/main.c:174
 msgid "Do not load brushes, gradients, patterns, ..."
-msgstr "Ikkje last inn penslar, fargeovergangar, mønsterelement..."
+msgstr "Ikkje last inn penslar, fargeovergangar, mønsterelement …"
 
-#: ../app/main.c:191
+#: ../app/main.c:179
 msgid "Do not load any fonts"
 msgstr "Ikkje last skrifttypar."
 
-#: ../app/main.c:196
+#: ../app/main.c:184
 msgid "Do not show a startup window"
 msgstr "Ikkje vis oppstartsvindauget"
 
-#: ../app/main.c:201
+#: ../app/main.c:189
 msgid "Do not use shared memory between GIMP and plugins"
 msgstr "Ikkje bruk delt minne mellom GIMP og programtillegga."
 
-#: ../app/main.c:206
+#: ../app/main.c:194
 msgid "Do not use special CPU acceleration functions"
 msgstr "Ikkje bruk CPU-akseleratorar"
 
-#: ../app/main.c:211
+#: ../app/main.c:199
 msgid "Use an alternate sessionrc file"
 msgstr "Bruk ei alternativ sessionrc-fil."
 
-#: ../app/main.c:216
+#: ../app/main.c:204
 msgid "Use an alternate user gimprc file"
 msgstr "Bruk ei alternativ brukar-gimprc-fil."
 
-#: ../app/main.c:221
+#: ../app/main.c:209
 msgid "Use an alternate system gimprc file"
 msgstr "Bruk ei alternativ system-gimprc-fil."
 
-#: ../app/main.c:226
+#: ../app/main.c:214
 msgid "Batch command to run (can be used multiple times)"
 msgstr "Mengdetolkar som skal brukast (kan bli brukt fleire gonger)"
 
-#: ../app/main.c:231
+#: ../app/main.c:219
 msgid "The procedure to process batch commands with"
-msgstr ""
-"Prosedyren som blir brukt for å køyre mengdetolkarane (batch kommandoane)."
+msgstr "Prosedyren som blir brukt for å køyre mengdetolkarane (batch kommandoane)."
 
-#: ../app/main.c:236
+#: ../app/main.c:224
 msgid "Send messages to console instead of using a dialog"
 msgstr "Vis meldingane på konsollen i staden for i eit dialogvindauge."
 
 #. don't translate the mode names (off|on|warn)
-#: ../app/main.c:242
+#: ../app/main.c:230
 msgid "PDB compatibility mode (off|on|warn)"
 msgstr "PDB kompatibilitetsmodus (off|on|warn)"
 
 #. don't translate the mode names (never|query|always)
-#: ../app/main.c:248
+#: ../app/main.c:236
 msgid "Debug in case of a crash (never|query|always)"
 msgstr "Feilfinning i tilfelle krasj (never|query|always)"
 
-#: ../app/main.c:253
+#: ../app/main.c:241
 msgid "Enable non-fatal debugging signal handlers"
 msgstr "Slå på signalhandterarane for ikkje-fatale feil."
 
-#: ../app/main.c:258
+#: ../app/main.c:246
 msgid "Make all warnings fatal"
 msgstr "Gjer alle varslingane fatale"
 
-#: ../app/main.c:263
+#: ../app/main.c:251
 msgid "Output a gimprc file with default settings"
 msgstr "Skriv ut ei gimprc-fil med standardinnstillingane"
 
-#: ../app/main.c:357
+#: ../app/main.c:355
 msgid "[FILE|URI...]"
-msgstr "[FIL|URI...]"
+msgstr "[FIL|URI …]"
 
-#: ../app/main.c:375
+#: ../app/main.c:373
 msgid ""
 "GIMP could not initialize the graphical user interface.\n"
 "Make sure a proper setup for your display environment exists."
@@ -187,24 +170,24 @@ msgstr ""
 "GIMP klarte ikkje å sette opp det grafiske brukargrensesnittet.\n"
 "Kontroller oppsettet for skjermen og skjermdrivarane."
 
-#: ../app/main.c:453
+#: ../app/main.c:392
+msgid "Another GIMP instance is already running."
+msgstr "Ei anna økt av GIMP er aktivert"
+
+#: ../app/main.c:462
 msgid "GIMP output. Type any character to close this window."
 msgstr "GIMP-melding. Trykk ein tast for å lukke vindauget"
 
-#: ../app/main.c:454
+#: ../app/main.c:463
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(Trykk ein tast for å lukke vindauget)\n"
 
-#: ../app/main.c:471
+#: ../app/main.c:480
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "GIMP-melding. Du kan forminske dette vindauget, men ikkje lukke det."
 
-#: ../app/main.c:792
-msgid "Another GIMP instance is already running."
-msgstr "Ei anna økt av GIMP er aktivisert"
-
-#: ../app/sanity.c:257
+#: ../app/sanity.c:342
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -215,201 +198,240 @@ msgstr ""
 "\n"
 "Kontroller verdiane sett i omgivnadsvariabelen G_FILENAME_ENCODING."
 
-#: ../app/sanity.c:276
+#: ../app/sanity.c:361
 #, c-format
 msgid ""
-"The name of the directory holding the GIMP user configuration cannot be "
-"converted to UTF-8: %s\n"
+"The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n"
 "\n"
-"Your filesystem probably stores files in an encoding other than UTF-8 and "
-"you didn't tell GLib about this. Please set the environment variable "
-"G_FILENAME_ENCODING."
+"Your filesystem probably stores files in an encoding other than UTF-8 and you didn't tell GLib about this. Please set the environment variable G_FILENAME_ENCODING."
 msgstr ""
-"Namnet på mappa med brukarinnstillingane for GIMP kan ikkje konverterast til "
-"UTF-8: %s\n"
+"Namnet på mappa med brukarinnstillingane for GIMP kan ikkje konverterast til UTF-8: %s\n"
 "\n"
-"Det ser ut til at filsystemet lagrar filer i eit anna format enn UTF-8 og at "
-"du ikkje har fortald GLib om dette. Set omgivnadsvariabelen "
-"G_FILENAME_ENCODING."
+"Det ser ut til at filsystemet lagrar filer i eit anna format enn UTF-8 og at du ikkje har fortald GLib om dette. Set omgivnadsvariabelen G_FILENAME_ENCODING."
 
 #. show versions of libraries used by GIMP
 #: ../app/version.c:64
 #, c-format
-msgid "using %s, compiled against version %s, running against version %s"
-msgstr "Bruker «%s», kompilert mot versjon %s, køyrer mot versjon %s"
+#| msgid "using %s, compiled against version %s, running against version %s"
+msgid "using %s version %s (compiled against version %s)"
+msgstr "bruker %s versjon %s (kompilert mot versjon %s)"
 
-#: ../app/version.c:128 ../tools/gimp-remote.c:95
+#: ../app/version.c:127
+#: ../tools/gimp-remote.c:95
 #, c-format
 msgid "%s version %s"
 msgstr "%s versjon %s"
 
-#: ../app/actions/actions.c:99 ../app/dialogs/dialogs.c:216
+#: ../app/actions/actions.c:101
+#: ../app/actions/dialogs-actions.c:123
+#: ../app/dialogs/dialogs.c:224
 #: ../app/widgets/gimpbrusheditor.c:90
 msgid "Brush Editor"
 msgstr "Penselredigering"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:102 ../app/core/gimp.c:832
-#: ../app/dialogs/dialogs.c:149 ../app/dialogs/preferences-dialog.c:2710
+#: ../app/actions/actions.c:104
+#: ../app/core/gimp.c:838
+#: ../app/dialogs/dialogs.c:157
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Brushes"
 msgstr "Penslar"
 
-#: ../app/actions/actions.c:105 ../app/dialogs/dialogs.c:161
+#: ../app/actions/actions.c:107
+#: ../app/dialogs/dialogs.c:169
 msgid "Buffers"
 msgstr "Bufferar"
 
-#: ../app/actions/actions.c:108 ../app/dialogs/dialogs.c:174
+#: ../app/actions/actions.c:110
+#: ../app/dialogs/dialogs.c:182
 msgid "Channels"
 msgstr "Kanalar"
 
-#: ../app/actions/actions.c:111 ../app/dialogs/convert-dialog.c:174
-#: ../app/dialogs/dialogs.c:182
+#: ../app/actions/actions.c:113
+#: ../app/dialogs/convert-dialog.c:174
+#: ../app/dialogs/dialogs.c:190
 msgid "Colormap"
 msgstr "Fargekart"
 
-#: ../app/actions/actions.c:114
+#: ../app/actions/actions.c:116
+#| msgid "Resource configuration"
+msgid "Configuration"
+msgstr "Konfigurering"
+
+#: ../app/actions/actions.c:119
 msgid "Context"
 msgstr "Samanhang"
 
-#: ../app/actions/actions.c:117 ../app/dialogs/dialogs.c:142
+#: ../app/actions/actions.c:122
+#: ../app/dialogs/dialogs.c:150
 msgid "Pointer Information"
 msgstr "Peikarinformasjon"
 
-#: ../app/actions/actions.c:120
+#: ../app/actions/actions.c:125
 msgid "Debug"
 msgstr "Avlusing"
 
-#: ../app/actions/actions.c:123
+#: ../app/actions/actions.c:128
 msgid "Dialogs"
 msgstr "Dialogar"
 
-#: ../app/actions/actions.c:126
+#: ../app/actions/actions.c:131
 msgid "Dock"
 msgstr "Samlevindauge"
 
-#: ../app/actions/actions.c:129
+#: ../app/actions/actions.c:134
 msgid "Dockable"
 msgstr "Kan limast inn"
 
 #. Document History
-#: ../app/actions/actions.c:132 ../app/dialogs/dialogs.c:163
-#: ../app/dialogs/preferences-dialog.c:1604
+#: ../app/actions/actions.c:137
+#: ../app/dialogs/dialogs.c:171
+#: ../app/dialogs/preferences-dialog.c:1595
 msgid "Document History"
 msgstr "Dokumentlogg"
 
-#: ../app/actions/actions.c:135
+#: ../app/actions/actions.c:140
 msgid "Drawable"
 msgstr "Teikneobjekt"
 
-#: ../app/actions/actions.c:138 ../app/tools/tools-enums.c:300
+#: ../app/actions/actions.c:143
+#: ../app/tools/tools-enums.c:300
 msgid "Edit"
 msgstr "Rediger"
 
-#: ../app/actions/actions.c:141 ../app/dialogs/dialogs.c:138
+#: ../app/actions/actions.c:146
+#: ../app/dialogs/dialogs.c:146
 msgid "Error Console"
 msgstr "Feilkonsoll"
 
-#: ../app/actions/actions.c:144
+#: ../app/actions/actions.c:149
 msgid "File"
 msgstr "Fil"
 
-#: ../app/actions/actions.c:147 ../app/dialogs/dialogs.c:157
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/actions/actions.c:152
+#: ../app/dialogs/dialogs.c:165
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Fonts"
 msgstr "Skrifttypar"
 
-#: ../app/actions/actions.c:150 ../app/dialogs/dialogs.c:220
+#: ../app/actions/actions.c:155
+#: ../app/actions/dialogs-actions.c:141
+#: ../app/dialogs/dialogs.c:228
 #: ../app/widgets/gimpgradienteditor.c:276
 msgid "Gradient Editor"
 msgstr "Fargeovergangsredigering"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:153 ../app/core/gimp.c:844
-#: ../app/dialogs/dialogs.c:153 ../app/dialogs/preferences-dialog.c:2722
+#: ../app/actions/actions.c:158
+#: ../app/core/gimp.c:850
+#: ../app/dialogs/dialogs.c:161
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradients"
 msgstr "Fargeovergangar"
 
-#: ../app/actions/actions.c:156
+#: ../app/actions/actions.c:161
 msgid "Help"
 msgstr "Hjelp"
 
-#: ../app/actions/actions.c:159 ../app/core/core-enums.c:212
+#: ../app/actions/actions.c:164
+#: ../app/core/core-enums.c:212
 #: ../app/tools/tools-enums.c:242
 msgid "Image"
 msgstr "Bilete"
 
 #. list & grid views
-#: ../app/actions/actions.c:162 ../app/dialogs/dialogs.c:147
+#: ../app/actions/actions.c:167
+#: ../app/dialogs/dialogs.c:155
 msgid "Images"
 msgstr "Bilete"
 
-#: ../app/actions/actions.c:165 ../app/dialogs/dialogs.c:170
+#: ../app/actions/actions.c:170
+#: ../app/dialogs/dialogs.c:178
 #: ../app/dialogs/resize-dialog.c:286
 msgid "Layers"
 msgstr "Lag"
 
-#: ../app/actions/actions.c:168 ../app/dialogs/dialogs.c:224
+#: ../app/actions/actions.c:173
+#: ../app/actions/dialogs-actions.c:153
+#: ../app/dialogs/dialogs.c:232
 #: ../app/widgets/gimppaletteeditor.c:155
 msgid "Palette Editor"
 msgstr "Palettredigering"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:171 ../app/core/gimp.c:840
-#: ../app/dialogs/dialogs.c:155 ../app/dialogs/preferences-dialog.c:2718
+#: ../app/actions/actions.c:176
+#: ../app/core/gimp.c:846
+#: ../app/dialogs/dialogs.c:163
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Palettes"
 msgstr "Palettar"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:174 ../app/core/gimp.c:836
-#: ../app/dialogs/dialogs.c:151 ../app/dialogs/preferences-dialog.c:2714
+#: ../app/actions/actions.c:179
+#: ../app/core/gimp.c:842
+#: ../app/dialogs/dialogs.c:159
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Patterns"
 msgstr "Mønsterelement"
 
-#: ../app/actions/actions.c:177 ../app/dialogs/preferences-dialog.c:2730
+#: ../app/actions/actions.c:182
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-Ins"
 msgstr "Programtillegg"
 
-#: ../app/actions/actions.c:180 ../app/core/core-enums.c:860
+#: ../app/actions/actions.c:185
+#: ../app/core/core-enums.c:860
 #: ../app/core/gimpchannel.c:362
 msgid "Quick Mask"
 msgstr "Snarmaske"
 
-#: ../app/actions/actions.c:183 ../app/dialogs/dialogs.c:198
+#: ../app/actions/actions.c:188
+#: ../app/dialogs/dialogs.c:206
 msgid "Sample Points"
 msgstr "Prøvepunkt"
 
-#: ../app/actions/actions.c:186
+#: ../app/actions/actions.c:191
 msgid "Select"
-msgstr "Vel"
+msgstr "Utval"
 
 #. initialize the template list
-#: ../app/actions/actions.c:189 ../app/core/gimp.c:861
-#: ../app/dialogs/dialogs.c:165
+#: ../app/actions/actions.c:194
+#: ../app/core/gimp.c:859
+#: ../app/dialogs/dialogs.c:173
 msgid "Templates"
 msgstr "Malar"
 
-#: ../app/actions/actions.c:192
+#: ../app/actions/actions.c:197
 msgid "Text Editor"
 msgstr "Tekstbehandlar"
 
-#: ../app/actions/actions.c:195 ../app/dialogs/dialogs.c:130
-#: ../app/dialogs/preferences-dialog.c:1846 ../app/gui/gui.c:439
+#: ../app/actions/actions.c:200
+#: ../app/dialogs/dialogs.c:138
+#: ../app/dialogs/preferences-dialog.c:1880
+#: ../app/gui/gui.c:429
 msgid "Tool Options"
 msgstr "Verktøyinnstillingar"
 
-#: ../app/actions/actions.c:198 ../app/dialogs/dialogs.c:159
+#: ../app/actions/actions.c:203
+#: ../app/dialogs/dialogs.c:167
 msgid "Tools"
 msgstr "Verktøy"
 
-#: ../app/actions/actions.c:201 ../app/dialogs/dialogs.c:178
+#: ../app/actions/actions.c:206
+#: ../app/dialogs/dialogs.c:186
 #: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "Banar"
 
-#: ../app/actions/actions.c:204
+#: ../app/actions/actions.c:209
 msgid "View"
 msgstr "Vis"
 
+#: ../app/actions/actions.c:212
+#| msgid "Image Windows"
+msgid "Windows"
+msgstr "Vindauge"
+
 #: ../app/actions/brush-editor-actions.c:43
 msgid "Brush Editor Menu"
 msgstr "Meny for penselredigering"
@@ -472,7 +494,7 @@ msgstr "Oppdater penslane"
 
 #: ../app/actions/brushes-actions.c:86
 msgid "_Edit Brush..."
-msgstr "R_ediger penselen..."
+msgstr "R_ediger penselen …"
 
 #: ../app/actions/brushes-actions.c:87
 msgid "Edit brush"
@@ -520,7 +542,7 @@ msgstr "Kanalmeny"
 
 #: ../app/actions/channels-actions.c:48
 msgid "_Edit Channel Attributes..."
-msgstr "R_ediger kanalattributta..."
+msgstr "R_ediger kanalattributta …"
 
 #: ../app/actions/channels-actions.c:49
 msgid "Edit the channel's name, color and opacity"
@@ -528,7 +550,7 @@ msgstr "Rediger namn, farge og dekkevne for kanalen"
 
 #: ../app/actions/channels-actions.c:54
 msgid "_New Channel..."
-msgstr "_Ny kanal..."
+msgstr "_Ny kanal …"
 
 #: ../app/actions/channels-actions.c:55
 msgid "Create a new channel"
@@ -598,7 +620,8 @@ msgstr "_Kanal til utval"
 msgid "Replace the selection with this channel"
 msgstr "Bytt ut utvalet med denne kanalen"
 
-#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:260
+#: ../app/actions/channels-actions.c:111
+#: ../app/actions/layers-actions.c:266
 #: ../app/actions/vectors-actions.c:173
 msgid "_Add to Selection"
 msgstr "_Legg til i utvalet"
@@ -607,8 +630,10 @@ msgstr "_Legg til i utvalet"
 msgid "Add this channel to the current selection"
 msgstr "Legg denne kanalen til det aktive utvalet"
 
-#: ../app/actions/channels-actions.c:117 ../app/actions/layers-actions.c:266
-#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
+#: ../app/actions/channels-actions.c:117
+#: ../app/actions/layers-actions.c:272
+#: ../app/actions/layers-actions.c:299
+#: ../app/actions/layers-actions.c:326
 #: ../app/actions/vectors-actions.c:179
 msgid "_Subtract from Selection"
 msgstr "_Trekk frå utvalet"
@@ -617,8 +642,10 @@ msgstr "_Trekk frå utvalet"
 msgid "Subtract this channel from the current selection"
 msgstr "Trekk denne kanalen frå det aktive utvalet"
 
-#: ../app/actions/channels-actions.c:123 ../app/actions/layers-actions.c:272
-#: ../app/actions/layers-actions.c:299 ../app/actions/layers-actions.c:326
+#: ../app/actions/channels-actions.c:123
+#: ../app/actions/layers-actions.c:278
+#: ../app/actions/layers-actions.c:305
+#: ../app/actions/layers-actions.c:332
 #: ../app/actions/vectors-actions.c:185
 msgid "_Intersect with Selection"
 msgstr "_Snitt med utvalet"
@@ -662,15 +689,18 @@ msgid "New Channel Color"
 msgstr "Farge på ny kanal"
 
 #: ../app/actions/channels-commands.c:243
-#: ../app/display/gimpdisplayshell-dnd.c:488
+#: ../app/display/gimpdisplayshell-dnd.c:584
 #: ../app/widgets/gimpchanneltreeview.c:249
-#: ../app/widgets/gimplayertreeview.c:774 ../app/widgets/gimptoolbox-dnd.c:313
+#: ../app/widgets/gimplayertreeview.c:773
+#: ../app/widgets/gimptoolbox-dnd.c:313
 #, c-format
 msgid "%s Channel Copy"
 msgstr "%s-kanalkopi"
 
-#: ../app/actions/channels-commands.c:307 ../app/core/gimpselection.c:549
-#: ../app/pdb/selection_cmds.c:440 ../app/pdb/selection_cmds.c:505
+#: ../app/actions/channels-commands.c:307
+#: ../app/core/gimpselection.c:549
+#: ../app/pdb/selection-cmds.c:454
+#: ../app/pdb/selection-cmds.c:521
 msgid "Channel to Selection"
 msgstr "Kanal til utval"
 
@@ -681,7 +711,7 @@ msgstr "Fargekartmeny"
 #: ../app/actions/colormap-actions.c:48
 #: ../app/actions/palette-editor-actions.c:48
 msgid "_Edit Color..."
-msgstr "R_ediger farge..."
+msgstr "R_ediger farge …"
 
 #: ../app/actions/colormap-actions.c:49
 #: ../app/actions/palette-editor-actions.c:49
@@ -713,15 +743,25 @@ msgstr "Rediger fargekartoppføring nr. %d"
 msgid "Edit Colormap Entry"
 msgstr "Rediger fargekartoppføringa"
 
+#: ../app/actions/config-actions.c:39
+msgid "Use _GEGL"
+msgstr "Bruk _GEGL"
+
+#: ../app/actions/config-actions.c:40
+msgid "If possible, use GEGL for image processing"
+msgstr "Dersom det er mogleg, bruk GEGL (32 bits RGBA) for bilethandteringa"
+
 #: ../app/actions/context-actions.c:46
 msgid "_Context"
 msgstr "_Samanheng"
 
-#: ../app/actions/context-actions.c:47 ../app/actions/image-actions.c:65
+#: ../app/actions/context-actions.c:47
+#: ../app/actions/image-actions.c:59
 msgid "_Colors"
 msgstr "_Fargar"
 
-#: ../app/actions/context-actions.c:48 ../app/actions/layers-actions.c:58
+#: ../app/actions/context-actions.c:48
+#: ../app/actions/layers-actions.c:58
 msgid "_Opacity"
 msgstr "_Dekkevne"
 
@@ -734,12 +774,13 @@ msgid "_Tool"
 msgstr "Verk_tøy"
 
 #: ../app/actions/context-actions.c:51
-#: ../app/dialogs/preferences-dialog.c:1906
+#: ../app/dialogs/preferences-dialog.c:1940
 msgid "_Brush"
 msgstr "_Pensel"
 
-#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:98
-#: ../app/dialogs/preferences-dialog.c:1909
+#: ../app/actions/context-actions.c:52
+#: ../app/actions/plug-in-actions.c:99
+#: ../app/dialogs/preferences-dialog.c:1943
 msgid "_Pattern"
 msgstr "_Mønsterelement"
 
@@ -749,7 +790,7 @@ msgstr "_Palett"
 
 #: ../app/actions/context-actions.c:54
 #: ../app/dialogs/palette-import-dialog.c:216
-#: ../app/dialogs/preferences-dialog.c:1912
+#: ../app/dialogs/preferences-dialog.c:1946
 msgid "_Gradient"
 msgstr "_Fargeovergang"
 
@@ -812,14 +853,17 @@ msgstr "_Flett synlege"
 msgid "Sample Merged"
 msgstr "Flett saman synlege"
 
-#: ../app/actions/data-commands.c:107 ../app/actions/documents-commands.c:320
-#: ../app/actions/file-commands.c:170 ../app/dialogs/file-open-dialog.c:197
-#: ../app/dialogs/file-open-dialog.c:243
+#: ../app/actions/data-commands.c:107
+#: ../app/actions/documents-commands.c:344
+#: ../app/actions/file-commands.c:184
+#: ../app/dialogs/file-open-dialog.c:220
+#: ../app/dialogs/file-open-dialog.c:264
 #: ../app/dialogs/file-open-location-dialog.c:213
 #: ../app/dialogs/file-open-location-dialog.c:225
-#: ../app/display/gimpdisplayshell-dnd.c:443
-#: ../app/widgets/gimplayertreeview.c:731 ../app/widgets/gimptoolbox-dnd.c:158
-#: ../app/widgets/gimptoolbox.c:900
+#: ../app/display/gimpdisplayshell-dnd.c:537
+#: ../app/widgets/gimplayertreeview.c:730
+#: ../app/widgets/gimptoolbox-dnd.c:158
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -831,10 +875,14 @@ msgstr ""
 "%s"
 
 #: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1388
-#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:223
-#: ../app/core/gimppalette.c:333 ../app/dialogs/palette-import-dialog.c:770
-#: ../app/pdb/image_cmds.c:2063 ../app/widgets/gimpdnd-xds.c:92
+#: ../app/core/gimpbrushgenerated-load.c:125
+#: ../app/core/gimpimage.c:1419
+#: ../app/core/gimppalette-import.c:211
+#: ../app/core/gimppalette-load.c:222
+#: ../app/core/gimppalette.c:333
+#: ../app/dialogs/palette-import-dialog.c:774
+#: ../app/pdb/image-cmds.c:2198
+#: ../app/widgets/gimpdnd-xds.c:92
 msgid "Untitled"
 msgstr "Utan namn"
 
@@ -849,280 +897,257 @@ msgstr "Slett «%s»?"
 
 #: ../app/actions/data-commands.c:257
 #, c-format
-msgid ""
-"Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgid "Are you sure you want to remove '%s' from the list and delete it on disk?"
 msgstr "Er du sikker på at du vil slette «%s» frå lista og frå disken?"
 
-#: ../app/actions/dialogs-actions.c:38
-msgid "_Dialogs"
-msgstr "_Dialogar"
-
 #: ../app/actions/dialogs-actions.c:39
-msgid "Create New Doc_k"
-msgstr "Opprett nytt samle_vindauge"
-
-#: ../app/actions/dialogs-actions.c:42
-msgid "_Layers, Channels & Paths"
-msgstr "_Lag, kanalar og banar"
-
-#: ../app/actions/dialogs-actions.c:43
-msgid "Open a Layers, Channels & Paths dock"
-msgstr "Opna eit samlevindauge med lag, kanalar og banar."
-
-#: ../app/actions/dialogs-actions.c:48
-msgid "_Brushes, Patterns & Gradients"
-msgstr "_Penslar, mønsterelement og fargeovergangar"
-
-#: ../app/actions/dialogs-actions.c:49
-msgid "Open a Brushes, Patterns & Gradients dock"
-msgstr "Opna eit samlevindauge med  penslar, mønsterelement og fargeovergangar"
-
-#: ../app/actions/dialogs-actions.c:54
-msgid "_Misc. Stuff"
-msgstr "D_iverse"
-
-#: ../app/actions/dialogs-actions.c:55
-msgid "Open a dock containing miscellaneous dialogs"
-msgstr "Opna eit samlevindauge med ymse dialogar."
-
-#: ../app/actions/dialogs-actions.c:60
-msgid "Tool_box"
-msgstr "Verktøykassa"
-
-#: ../app/actions/dialogs-actions.c:61
-msgid "Raise the toolbox"
-msgstr "Løft verktøykassa på skjermen"
-
-#: ../app/actions/dialogs-actions.c:69
 msgid "Tool _Options"
 msgstr "Verktøy_innstillingar"
 
-#: ../app/actions/dialogs-actions.c:70
+#: ../app/actions/dialogs-actions.c:40
 msgid "Open the tool options dialog"
 msgstr "Opna dialogvindauget for  verktøyinnstillingane"
 
-#: ../app/actions/dialogs-actions.c:75
+#: ../app/actions/dialogs-actions.c:45
 msgid "_Device Status"
-msgstr "_Einingsstatus"
+msgstr "Utst_yrstatus"
 
-#: ../app/actions/dialogs-actions.c:76
+#: ../app/actions/dialogs-actions.c:46
 msgid "Open the device status dialog"
 msgstr "Opna dialog for eininhsstatus"
 
-#: ../app/actions/dialogs-actions.c:81
+#: ../app/actions/dialogs-actions.c:51
 msgid "_Layers"
 msgstr "_Lag"
 
-#: ../app/actions/dialogs-actions.c:82
+#: ../app/actions/dialogs-actions.c:52
 msgid "Open the layers dialog"
 msgstr "Opna lagdialogen"
 
-#: ../app/actions/dialogs-actions.c:87
+#: ../app/actions/dialogs-actions.c:57
 msgid "_Channels"
 msgstr "_Kanalar"
 
-#: ../app/actions/dialogs-actions.c:88
+#: ../app/actions/dialogs-actions.c:58
 msgid "Open the channels dialog"
 msgstr "Opna kanaldialogen"
 
-#: ../app/actions/dialogs-actions.c:93
+#: ../app/actions/dialogs-actions.c:63
 msgid "_Paths"
 msgstr "_Banar"
 
-#: ../app/actions/dialogs-actions.c:94
+#: ../app/actions/dialogs-actions.c:64
 msgid "Open the paths dialog"
 msgstr "Opna banedialogen"
 
-#: ../app/actions/dialogs-actions.c:99
+#: ../app/actions/dialogs-actions.c:69
 msgid "Color_map"
 msgstr "_Fargekart"
 
-#: ../app/actions/dialogs-actions.c:100
+#: ../app/actions/dialogs-actions.c:70
 msgid "Open the colormap dialog"
 msgstr "Opna fargekartdialogen"
 
-#: ../app/actions/dialogs-actions.c:105
+#: ../app/actions/dialogs-actions.c:75
 msgid "Histogra_m"
 msgstr "_Histogram"
 
-#: ../app/actions/dialogs-actions.c:106
+#: ../app/actions/dialogs-actions.c:76
 msgid "Open the histogram dialog"
 msgstr "Opna histogramdialogen"
 
-#: ../app/actions/dialogs-actions.c:111
+#: ../app/actions/dialogs-actions.c:81
 msgid "_Selection Editor"
-msgstr "_Utvalsbehandlar"
+msgstr "_Utvalshandterar"
 
-#: ../app/actions/dialogs-actions.c:112
+#: ../app/actions/dialogs-actions.c:82
 msgid "Open the selection editor"
 msgstr "Opna utvalsbehandlaren"
 
-#: ../app/actions/dialogs-actions.c:117
+#: ../app/actions/dialogs-actions.c:87
 msgid "Na_vigation"
 msgstr "Na_vigering"
 
-#: ../app/actions/dialogs-actions.c:118
+#: ../app/actions/dialogs-actions.c:88
 msgid "Open the display navigation dialog"
 msgstr "Opna dialogen for skjermnavigeringa"
 
-#: ../app/actions/dialogs-actions.c:123
+#: ../app/actions/dialogs-actions.c:93
 msgid "Undo _History"
 msgstr "Angre_logg"
 
-#: ../app/actions/dialogs-actions.c:124
+#: ../app/actions/dialogs-actions.c:94
 msgid "Open the undo history dialog"
 msgstr "Opna dialogvindauget for angreloggen"
 
-#: ../app/actions/dialogs-actions.c:129 ../app/dialogs/dialogs.c:142
+#: ../app/actions/dialogs-actions.c:99
+#: ../app/dialogs/dialogs.c:150
 msgid "Pointer"
 msgstr "Peikar"
 
-#: ../app/actions/dialogs-actions.c:130
+#: ../app/actions/dialogs-actions.c:100
 msgid "Open the pointer information dialog"
 msgstr "Opna peikardialogen"
 
-#: ../app/actions/dialogs-actions.c:135
+#: ../app/actions/dialogs-actions.c:105
 msgid "_Sample Points"
 msgstr "_Prøvepunkt"
 
-#: ../app/actions/dialogs-actions.c:136
+#: ../app/actions/dialogs-actions.c:106
 msgid "Open the sample points dialog"
 msgstr "Opna dialogvindauget for prøvepunkta"
 
-#: ../app/actions/dialogs-actions.c:141
+#: ../app/actions/dialogs-actions.c:111
 msgid "Colo_rs"
 msgstr "_Fargar"
 
-#: ../app/actions/dialogs-actions.c:142
+#: ../app/actions/dialogs-actions.c:112
 msgid "Open the FG/BG color dialog"
 msgstr "Opna fargedialogvindauget for FG/BG"
 
-#: ../app/actions/dialogs-actions.c:147
+#: ../app/actions/dialogs-actions.c:117
 msgid "_Brushes"
 msgstr "_Penslar"
 
-#: ../app/actions/dialogs-actions.c:148
+#: ../app/actions/dialogs-actions.c:118
 msgid "Open the brushes dialog"
 msgstr "Opna penseldialogen"
 
-#: ../app/actions/dialogs-actions.c:153
+#: ../app/actions/dialogs-actions.c:124
+#| msgid "Open the brushes dialog"
+msgid "Open the brush editor"
+msgstr "Opna penselredigeringa"
+
+#: ../app/actions/dialogs-actions.c:129
 msgid "P_atterns"
 msgstr "_Mønsterelement"
 
-#: ../app/actions/dialogs-actions.c:154
+#: ../app/actions/dialogs-actions.c:130
 msgid "Open the patterns dialog"
 msgstr "Opna mønsterdialogen"
 
-#: ../app/actions/dialogs-actions.c:159
+#: ../app/actions/dialogs-actions.c:135
 msgid "_Gradients"
 msgstr "Farge_overgangar"
 
-#: ../app/actions/dialogs-actions.c:160
+#: ../app/actions/dialogs-actions.c:136
 msgid "Open the gradients dialog"
 msgstr "Opna overgangsdialogen"
 
-#: ../app/actions/dialogs-actions.c:165
+#: ../app/actions/dialogs-actions.c:142
+#| msgid "Open the gradients dialog"
+msgid "Open the gradient editor"
+msgstr "Opna overgangsredigeringa"
+
+#: ../app/actions/dialogs-actions.c:147
 msgid "Pal_ettes"
 msgstr "Pal_ettar"
 
-#: ../app/actions/dialogs-actions.c:166
+#: ../app/actions/dialogs-actions.c:148
 msgid "Open the palettes dialog"
 msgstr "Opna palettdialogen"
 
-#: ../app/actions/dialogs-actions.c:171
+#: ../app/actions/dialogs-actions.c:154
+#| msgid "Open the palettes dialog"
+msgid "Open the palette editor"
+msgstr "Opna palettredigeringa"
+
+#: ../app/actions/dialogs-actions.c:159
 msgid "_Fonts"
 msgstr "_Skrifttypar"
 
-#: ../app/actions/dialogs-actions.c:172
+#: ../app/actions/dialogs-actions.c:160
 msgid "Open the fonts dialog"
 msgstr "Opna dialogen for skrifttypar"
 
-#: ../app/actions/dialogs-actions.c:177
+#: ../app/actions/dialogs-actions.c:165
 msgid "B_uffers"
 msgstr "B_ufferar"
 
-#: ../app/actions/dialogs-actions.c:178
+#: ../app/actions/dialogs-actions.c:166
 msgid "Open the named buffers dialog"
 msgstr "Opna dialogen for namngitte bufferar"
 
-#: ../app/actions/dialogs-actions.c:183
+#: ../app/actions/dialogs-actions.c:171
 msgid "_Images"
 msgstr "_Bilete"
 
-#: ../app/actions/dialogs-actions.c:184
+#: ../app/actions/dialogs-actions.c:172
 msgid "Open the images dialog"
 msgstr "Opna biletdialogen"
 
-#: ../app/actions/dialogs-actions.c:189
+#: ../app/actions/dialogs-actions.c:177
 msgid "Document Histor_y"
 msgstr "Dokument_logg"
 
-#: ../app/actions/dialogs-actions.c:190
+#: ../app/actions/dialogs-actions.c:178
 msgid "Open the document history dialog"
 msgstr "Opna dialogen for dokumentloggen"
 
-#: ../app/actions/dialogs-actions.c:195
+#: ../app/actions/dialogs-actions.c:183
 msgid "_Templates"
 msgstr "Biletm_alar"
 
-#: ../app/actions/dialogs-actions.c:196
+#: ../app/actions/dialogs-actions.c:184
 msgid "Open the image templates dialog"
 msgstr "Opnar dialogvindauget for biletmalane"
 
-#: ../app/actions/dialogs-actions.c:201
+#: ../app/actions/dialogs-actions.c:189
 msgid "T_ools"
 msgstr "Verk_tøy"
 
-#: ../app/actions/dialogs-actions.c:202
+#: ../app/actions/dialogs-actions.c:190
 msgid "Open the tools dialog"
 msgstr "Opna verktøydialogen"
 
-#: ../app/actions/dialogs-actions.c:207
+#: ../app/actions/dialogs-actions.c:195
 msgid "Error Co_nsole"
 msgstr "Feil_konsoll"
 
-#: ../app/actions/dialogs-actions.c:208
+#: ../app/actions/dialogs-actions.c:196
 msgid "Open the error console"
 msgstr "Opna feilkonsollen"
 
-#: ../app/actions/dialogs-actions.c:218
+#: ../app/actions/dialogs-actions.c:206
 msgid "_Preferences"
 msgstr "_Brukarinnstillingar"
 
-#: ../app/actions/dialogs-actions.c:219
+#: ../app/actions/dialogs-actions.c:207
 msgid "Open the preferences dialog"
 msgstr "Opnar dialogen for brukarinnstillingar"
 
-#: ../app/actions/dialogs-actions.c:224
+#: ../app/actions/dialogs-actions.c:212
 msgid "_Keyboard Shortcuts"
 msgstr "_Tastatursnarvegar"
 
-#: ../app/actions/dialogs-actions.c:225
+#: ../app/actions/dialogs-actions.c:213
 msgid "Open the keyboard shortcuts editor"
 msgstr "Opnar behandlaren for tastatursnarvegar"
 
-#: ../app/actions/dialogs-actions.c:230
-msgid "_Module Manager"
-msgstr "_Modulhandterar"
+#: ../app/actions/dialogs-actions.c:218
+#| msgid "Modules"
+msgid "_Modules"
+msgstr "_Modular"
 
-#: ../app/actions/dialogs-actions.c:231
+#: ../app/actions/dialogs-actions.c:219
 msgid "Open the module manager dialog"
 msgstr "Opna dialog for modulhandteraren"
 
-#: ../app/actions/dialogs-actions.c:236
+#: ../app/actions/dialogs-actions.c:224
 msgid "_Tip of the Day"
 msgstr "_Dagens tips"
 
-#: ../app/actions/dialogs-actions.c:237
-msgid "Show the tip of the day"
-msgstr "Vis dagens tips"
+#: ../app/actions/dialogs-actions.c:225
+msgid "Show some helpful tips on using GIMP"
+msgstr "Viser tips som kan vere til hjelp når du bruker GIMP"
 
-#: ../app/actions/dialogs-actions.c:242
+#: ../app/actions/dialogs-actions.c:230
 msgid "_About"
 msgstr "_Om"
 
-#: ../app/actions/dialogs-actions.c:243 ../app/dialogs/about-dialog.c:114
-#: ../app/gui/gui.c:488
+#: ../app/actions/dialogs-actions.c:231
+#: ../app/dialogs/about-dialog.c:114
+#: ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "Om GIMP"
 
@@ -1134,11 +1159,13 @@ msgstr "_Flytt til skjermen"
 msgid "Close Dock"
 msgstr "Lukk samlevindauget"
 
-#: ../app/actions/dock-actions.c:52 ../app/actions/view-actions.c:123
+#: ../app/actions/dock-actions.c:52
+#: ../app/actions/view-actions.c:123
 msgid "_Open Display..."
-msgstr "_Opna skjerm..."
+msgstr "_Opna skjerm …"
 
-#: ../app/actions/dock-actions.c:53 ../app/actions/view-actions.c:124
+#: ../app/actions/dock-actions.c:53
+#: ../app/actions/view-actions.c:124
 msgid "Connect to another display"
 msgstr "Kopla til ein annan skjerm"
 
@@ -1231,14 +1258,22 @@ msgid "St_atus & Text"
 msgstr "St_atus og tekst"
 
 #: ../app/actions/dockable-actions.c:108
+msgid "Loc_k Tab to Dock"
+msgstr "_Lås fanen til samlevindauget"
+
+#: ../app/actions/dockable-actions.c:109
+msgid "Protect this tab from being dragged with the mouse pointer"
+msgstr "Vern denne fanen mot å bli flytt på med musepeikaren"
+
+#: ../app/actions/dockable-actions.c:115
 msgid "Show _Button Bar"
 msgstr "Vis _knapperekka"
 
-#: ../app/actions/dockable-actions.c:117
+#: ../app/actions/dockable-actions.c:124
 msgid "View as _List"
 msgstr "Vis som _liste"
 
-#: ../app/actions/dockable-actions.c:122
+#: ../app/actions/dockable-actions.c:129
 msgid "View as _Grid"
 msgstr "Vis som _tabell"
 
@@ -1318,129 +1353,126 @@ msgstr "Fjern _hengande oppføringar"
 msgid "Remove dangling entries"
 msgstr "Fjerner hengande oppføringar"
 
-#: ../app/actions/documents-commands.c:187
+#: ../app/actions/documents-commands.c:198
 msgid "Clear Document History"
 msgstr "Tøm dokumentloggen"
 
-#: ../app/actions/documents-commands.c:210
-msgid "Remove all entries from the document history?"
-msgstr "Fjern alle oppføringane frå dokumentloggen"
+#: ../app/actions/documents-commands.c:221
+#| msgid "Clear the entire document history"
+msgid "Clear the Recent Documents list?"
+msgstr "Fjerne den gjeldande dokumentloggen?"
 
-#: ../app/actions/documents-commands.c:214
-msgid ""
-"Clearing the document history will permanently remove all currently listed "
-"entries."
-msgstr "Tømmer du dokumentloggen vil innhaldet forsvinna for alltid"
+#: ../app/actions/documents-commands.c:224
+#| msgid ""
+#| "Clearing the document history will permanently remove all currently "
+#| "listed entries."
+msgid "Clearing the document history will permanently remove all items from the recent documents list in all applications."
+msgstr "Tømmer du dokumentloggen, vil alle oppføringane forsvinne frå loggen for alltid i alle oppsett"
 
 #: ../app/actions/drawable-actions.c:45
-msgid "_Desaturate..."
-msgstr "_Mindre metning"
-
-#: ../app/actions/drawable-actions.c:46
-msgid "Turn colors into shades of gray"
-msgstr "Gjer fargane om til gråtoner"
-
-#: ../app/actions/drawable-actions.c:51
 msgid "_Equalize"
 msgstr "_Jamn ut"
 
-#: ../app/actions/drawable-actions.c:52
+#: ../app/actions/drawable-actions.c:46
 msgid "Automatic contrast enhancement"
 msgstr "Automatisk forbetring av kontrast"
 
-#: ../app/actions/drawable-actions.c:57
+#: ../app/actions/drawable-actions.c:51
 msgid "In_vert"
 msgstr "_Inverter"
 
-#: ../app/actions/drawable-actions.c:58
+#: ../app/actions/drawable-actions.c:52
 msgid "Invert the colors"
 msgstr "Inverter fargane"
 
-#: ../app/actions/drawable-actions.c:63
+#: ../app/actions/drawable-actions.c:57
 msgid "_White Balance"
 msgstr "_Kvitbalanse"
 
-#: ../app/actions/drawable-actions.c:64
+#: ../app/actions/drawable-actions.c:58
 msgid "Automatic white balance correction"
 msgstr "Automatisk korrektsjon av kvitbalanse"
 
-#: ../app/actions/drawable-actions.c:69
+#: ../app/actions/drawable-actions.c:63
 msgid "_Offset..."
-msgstr "Forskyving..."
+msgstr "Forskyving …"
 
-#: ../app/actions/drawable-actions.c:70
+#: ../app/actions/drawable-actions.c:64
 msgid "Shift the pixels, optionally wrapping them at the borders"
 msgstr "Flytt pikslane, eventuelt med linjebryting"
 
-#: ../app/actions/drawable-actions.c:78 ../app/actions/vectors-actions.c:153
+#: ../app/actions/drawable-actions.c:72
+#: ../app/actions/vectors-actions.c:153
 msgid "_Linked"
 msgstr "_Lenka"
 
-#: ../app/actions/drawable-actions.c:79
+#: ../app/actions/drawable-actions.c:73
 msgid "Toggle the linked state"
 msgstr "Bytt lenkestatus"
 
-#: ../app/actions/drawable-actions.c:85 ../app/actions/vectors-actions.c:147
+#: ../app/actions/drawable-actions.c:79
+#: ../app/actions/vectors-actions.c:147
 msgid "_Visible"
 msgstr "_Synleg"
 
-#: ../app/actions/drawable-actions.c:86
+#: ../app/actions/drawable-actions.c:80
 msgid "Toggle visibility"
 msgstr "Bytt synlegstatus"
 
-#: ../app/actions/drawable-actions.c:95 ../app/actions/image-actions.c:171
+#: ../app/actions/drawable-actions.c:89
+#: ../app/actions/image-actions.c:159
 msgid "Flip _Horizontally"
 msgstr "Spegelvend _horisontalt"
 
-#: ../app/actions/drawable-actions.c:96
+#: ../app/actions/drawable-actions.c:90
 msgid "Flip horizontally"
 msgstr "Spegelvender horisontalt"
 
-#: ../app/actions/drawable-actions.c:101 ../app/actions/image-actions.c:177
+#: ../app/actions/drawable-actions.c:95
+#: ../app/actions/image-actions.c:165
 msgid "Flip _Vertically"
 msgstr "Spegelvend _vertikalt"
 
-#: ../app/actions/drawable-actions.c:102
+#: ../app/actions/drawable-actions.c:96
 msgid "Flip vertically"
 msgstr "Spegelvender vertikalt"
 
-#: ../app/actions/drawable-actions.c:110 ../app/actions/image-actions.c:186
+#: ../app/actions/drawable-actions.c:104
+#: ../app/actions/image-actions.c:174
 msgid "Rotate 90° _clockwise"
 msgstr "Roter 90° _med klokka"
 
-#: ../app/actions/drawable-actions.c:111
+#: ../app/actions/drawable-actions.c:105
 msgid "Rotate 90 degrees to the right"
 msgstr "Roter 90° mot høgre"
 
-#: ../app/actions/drawable-actions.c:116 ../app/actions/image-actions.c:192
+#: ../app/actions/drawable-actions.c:110
+#: ../app/actions/image-actions.c:180
 msgid "Rotate _180°"
 msgstr "Roter _180°"
 
-#: ../app/actions/drawable-actions.c:117
+#: ../app/actions/drawable-actions.c:111
 msgid "Turn upside-down"
 msgstr "Snu opp/ned"
 
-#: ../app/actions/drawable-actions.c:122 ../app/actions/image-actions.c:198
+#: ../app/actions/drawable-actions.c:116
+#: ../app/actions/image-actions.c:186
 msgid "Rotate 90° counter-clock_wise"
 msgstr "Roter 90° mot klokka"
 
-#: ../app/actions/drawable-actions.c:123
+#: ../app/actions/drawable-actions.c:117
 msgid "Rotate 90 degrees to the left"
 msgstr "Roter 90° mot venstre"
 
-#: ../app/actions/drawable-commands.c:76
-msgid "Desaturate operates only on RGB color layers."
-msgstr "«Mindre metning» verkar bare på RGB-fargelag."
-
-#: ../app/actions/drawable-commands.c:104
+#: ../app/actions/drawable-commands.c:62
 msgid "Equalize does not operate on indexed layers."
 msgstr "«Utjamning» verkar ikkje på indekserte lag."
 
-#: ../app/actions/drawable-commands.c:127
+#: ../app/actions/drawable-commands.c:85
 msgid "Invert does not operate on indexed layers."
 msgstr "«Invertering» verkar ikkje på indekserte lag."
 
-#: ../app/actions/drawable-commands.c:150
+#: ../app/actions/drawable-commands.c:108
 msgid "White Balance operates only on RGB color layers."
 msgstr "«Kvitbalanse» verkar bare på lag i RGB-farge."
 
@@ -1460,7 +1492,8 @@ msgstr "_Buffer"
 msgid "Undo History Menu"
 msgstr "Meny for angreloggen"
 
-#: ../app/actions/edit-actions.c:72 ../app/actions/edit-actions.c:302
+#: ../app/actions/edit-actions.c:72
+#: ../app/actions/edit-actions.c:313
 msgid "_Undo"
 msgstr "_Angre"
 
@@ -1468,7 +1501,8 @@ msgstr "_Angre"
 msgid "Undo the last operation"
 msgstr "Angra siste operasjon"
 
-#: ../app/actions/edit-actions.c:78 ../app/actions/edit-actions.c:303
+#: ../app/actions/edit-actions.c:78
+#: ../app/actions/edit-actions.c:314
 msgid "_Redo"
 msgstr "_Gjenta"
 
@@ -1490,8 +1524,7 @@ msgstr "Sterk gjenta"
 
 #: ../app/actions/edit-actions.c:91
 msgid "Redo the last operation that was undone, skipping visibility changes"
-msgstr ""
-"Gjenta den siste operasjonen du angra men hopp over endringar i visinga"
+msgstr "Gjenta den siste operasjonen du angra men hopp over endringar i visinga"
 
 #: ../app/actions/edit-actions.c:96
 msgid "_Clear Undo History"
@@ -1501,9 +1534,10 @@ msgstr "_Tøm angreloggen"
 msgid "Remove all operations from the undo history"
 msgstr "Fjern alle operasjonane frå angreloggen"
 
-#: ../app/actions/edit-actions.c:102 ../app/actions/edit-actions.c:304
+#: ../app/actions/edit-actions.c:102
+#: ../app/actions/edit-actions.c:315
 msgid "_Fade..."
-msgstr "_Ton inn/ut..."
+msgstr "_Ton inn/ut …"
 
 #: ../app/actions/edit-actions.c:103
 msgid "Modify paint mode and opacity of the last pixel manipulation"
@@ -1531,8 +1565,9 @@ msgid "Copy _Visible"
 msgstr "Kopier _synlege"
 
 #: ../app/actions/edit-actions.c:121
-msgid "Copy the selected region to the clipboard"
-msgstr "Kopier det valde området til utklippstavla"
+#| msgid "Cannot float selection because the selected region is empty."
+msgid "Copy what is visible in the selected region"
+msgstr "Kopier det som er synleg i det valde området"
 
 #: ../app/actions/edit-actions.c:126
 msgid "_Paste"
@@ -1551,10 +1586,12 @@ msgid "Paste the content of the clipboard into the current selection"
 msgstr "Lim innhaldet av utklippstavla inn i det aktive utvalet"
 
 #: ../app/actions/edit-actions.c:138
-msgid "Paste as New"
-msgstr "Lim inn som nytt"
+#| msgid "Clipboard"
+msgid "From _Clipboard"
+msgstr "frå _utklippstavla"
 
-#: ../app/actions/edit-actions.c:139 ../app/actions/edit-actions.c:145
+#: ../app/actions/edit-actions.c:139
+#: ../app/actions/edit-actions.c:145
 msgid "Create a new image from the content of the clipboard"
 msgstr "Opprett eit nytt bilete med innhaldet frå utklippstavla"
 
@@ -1563,137 +1600,159 @@ msgid "_New Image"
 msgstr "_Nytt bilete"
 
 #: ../app/actions/edit-actions.c:150
+#| msgid "New Layer"
+msgid "New _Layer"
+msgstr "nytt _lag"
+
+#: ../app/actions/edit-actions.c:151
+#| msgid "Create a new image from the content of the clipboard"
+msgid "Create a new layer from the content of the clipboard"
+msgstr "Opprett eit nytt lag med innhaldet frå utklippstavla"
+
+#: ../app/actions/edit-actions.c:156
 msgid "Cu_t Named..."
 msgstr "Klipp _ut namngitt"
 
-#: ../app/actions/edit-actions.c:151
+#: ../app/actions/edit-actions.c:157
 msgid "Move the selected pixels to a named buffer"
 msgstr "Flytt dei valde pikslane til ein namngitt buffer"
 
-#: ../app/actions/edit-actions.c:156
+#: ../app/actions/edit-actions.c:162
 msgid "_Copy Named..."
 msgstr "_Kopier namngitt"
 
-#: ../app/actions/edit-actions.c:157
+#: ../app/actions/edit-actions.c:163
 msgid "Copy the selected pixels to a named buffer"
 msgstr "Kopier dei valde pikslane til ein namngitt buffer"
 
 #. GIMP_STOCK_COPY_VISIBLE,
-#: ../app/actions/edit-actions.c:162
+#: ../app/actions/edit-actions.c:168
 msgid "Copy _Visible Named..."
-msgstr "Kopier _synlege namngitt..."
+msgstr "Kopier _synlege namngitt …"
 
-#: ../app/actions/edit-actions.c:163
+#: ../app/actions/edit-actions.c:169
 msgid "Copy the selected region to a named buffer"
 msgstr "Kopier det valde området til ein namngitt buffer"
 
-#: ../app/actions/edit-actions.c:168
+#: ../app/actions/edit-actions.c:174
 msgid "_Paste Named..."
-msgstr "_Lim inn namngitt..."
+msgstr "_Lim inn namngitt …"
 
-#: ../app/actions/edit-actions.c:169
+#: ../app/actions/edit-actions.c:175
 msgid "Paste the content of a named buffer"
 msgstr "Lim inn innhaldet frå ein namngitt buffer"
 
-#: ../app/actions/edit-actions.c:174
+#: ../app/actions/edit-actions.c:180
 msgid "Cl_ear"
 msgstr "Tøm _utvalet"
 
-#: ../app/actions/edit-actions.c:175
+#: ../app/actions/edit-actions.c:181
 msgid "Clear the selected pixels"
 msgstr "Tøm utvalet for pikslar"
 
-#: ../app/actions/edit-actions.c:183
+#: ../app/actions/edit-actions.c:189
 msgid "Fill with _FG Color"
 msgstr "Fyll med _forgrunnsfarge"
 
-#: ../app/actions/edit-actions.c:184
+#: ../app/actions/edit-actions.c:190
 msgid "Fill the selection using the foreground color"
 msgstr "Fyll utvalet med forgrunnsfargen"
 
-#: ../app/actions/edit-actions.c:189
+#: ../app/actions/edit-actions.c:195
 msgid "Fill with B_G Color"
 msgstr "Fyll med _bakgrunnsfarge"
 
-#: ../app/actions/edit-actions.c:190
+#: ../app/actions/edit-actions.c:196
 msgid "Fill the selection using the background color"
 msgstr "Fyll utvalet med bakgrunnsfargen"
 
-#: ../app/actions/edit-actions.c:195
+#: ../app/actions/edit-actions.c:201
 msgid "Fill with P_attern"
 msgstr "Fyll med _mønsterelement"
 
-#: ../app/actions/edit-actions.c:196
+#: ../app/actions/edit-actions.c:202
 msgid "Fill the selection using the active pattern"
 msgstr "Fyll utvalet med det aktive mønsterelementet"
 
-#: ../app/actions/edit-actions.c:275
+#: ../app/actions/edit-actions.c:279
 #, c-format
 msgid "_Undo %s"
 msgstr "_Angre %s"
 
-#: ../app/actions/edit-actions.c:280
+#: ../app/actions/edit-actions.c:286
 #, c-format
 msgid "_Redo %s"
 msgstr "_Gjenta %s"
 
-#: ../app/actions/edit-actions.c:291
+#: ../app/actions/edit-actions.c:301
 #, c-format
 msgid "_Fade %s..."
-msgstr "_Ton inn/ut %s..."
+msgstr "_Ton inn/ut %s …"
 
-#: ../app/actions/edit-commands.c:133
+#: ../app/actions/edit-commands.c:134
 msgid "Clear Undo History"
 msgstr "Tøm angreloggen"
 
-#: ../app/actions/edit-commands.c:159
+#: ../app/actions/edit-commands.c:160
 msgid "Really clear image's undo history?"
 msgstr "Er du sikker på at du vil tømme angreloggen for biletet?"
 
-#: ../app/actions/edit-commands.c:171
+#: ../app/actions/edit-commands.c:172
 #, c-format
 msgid "Clearing the undo history of this image will gain %s of memory."
 msgstr "Tømmer du angreloggen for dette biletet, vil du få frigjort %s minne."
 
-#: ../app/actions/edit-commands.c:200
+#: ../app/actions/edit-commands.c:201
 msgid "Cut pixels to the clipboard"
 msgstr "Klipp ut pikslar til utklippstavla"
 
-#: ../app/actions/edit-commands.c:227 ../app/actions/edit-commands.c:253
+#: ../app/actions/edit-commands.c:228
+#: ../app/actions/edit-commands.c:254
 msgid "Copied pixels to the clipboard"
 msgstr "Kopierte pikslar til utklippstavla"
 
-#: ../app/actions/edit-commands.c:315 ../app/actions/edit-commands.c:491
+#: ../app/actions/edit-commands.c:315
+#: ../app/actions/edit-commands.c:349
+#: ../app/actions/edit-commands.c:525
 msgid "There is no image data in the clipboard to paste."
 msgstr "Det er ingen bilete i utklippstavla å lime inn"
 
-#: ../app/actions/edit-commands.c:329
+#: ../app/actions/edit-commands.c:338
+#: ../app/core/gimpbrushclipboard.c:181
+#: ../app/core/gimppatternclipboard.c:181
+#: ../app/widgets/gimpclipboard.c:296
+msgid "Clipboard"
+msgstr "Utklippstavle"
+
+#: ../app/actions/edit-commands.c:363
 msgid "Cut Named"
 msgstr "Klipp ut namngitt"
 
-#: ../app/actions/edit-commands.c:332 ../app/actions/edit-commands.c:373
-#: ../app/actions/edit-commands.c:393
+#: ../app/actions/edit-commands.c:366
+#: ../app/actions/edit-commands.c:407
+#: ../app/actions/edit-commands.c:427
 msgid "Enter a name for this buffer"
 msgstr "Skriv inn eit namn for denne bufferen"
 
-#: ../app/actions/edit-commands.c:370
+#: ../app/actions/edit-commands.c:404
 msgid "Copy Named"
 msgstr "Kopier namngitt"
 
-#: ../app/actions/edit-commands.c:390
+#: ../app/actions/edit-commands.c:424
 msgid "Copy Visible Named "
 msgstr "Kopier synlege namngitt"
 
-#: ../app/actions/edit-commands.c:508
+#: ../app/actions/edit-commands.c:542
 msgid "There is no active layer or channel to cut from."
 msgstr "Det er ingen aktive lag eller kanalar å klippe frå."
 
-#: ../app/actions/edit-commands.c:513 ../app/actions/edit-commands.c:545
-#: ../app/actions/edit-commands.c:569
+#: ../app/actions/edit-commands.c:547
+#: ../app/actions/edit-commands.c:579
+#: ../app/actions/edit-commands.c:603
 msgid "(Unnamed Buffer)"
 msgstr "(Buffer utan namn)"
 
-#: ../app/actions/edit-commands.c:540
+#: ../app/actions/edit-commands.c:574
 msgid "There is no active layer or channel to copy from."
 msgstr "Det er ingen aktive lag eller kanalar å kopiere frå."
 
@@ -1719,7 +1778,7 @@ msgstr "Marker alle feila"
 
 #: ../app/actions/error-console-actions.c:59
 msgid "_Save Error Log to File..."
-msgstr "_Lagra feilloggen til fil..."
+msgstr "_Lagra feilloggen til fil …"
 
 #: ../app/actions/error-console-actions.c:60
 msgid "Save error log"
@@ -1727,7 +1786,7 @@ msgstr "Lagra feilloggen"
 
 #: ../app/actions/error-console-actions.c:65
 msgid "Save S_election to File..."
-msgstr "Lagra _utvalet i ei fil..."
+msgstr "Lagra _utvalet i ei fil …"
 
 #: ../app/actions/error-console-actions.c:66
 msgid "Save selection"
@@ -1750,113 +1809,123 @@ msgstr ""
 "Feil ved skriving til fila «%s»:\n"
 "%s"
 
-#: ../app/actions/file-actions.c:64
+#: ../app/actions/file-actions.c:66
 msgid "_File"
 msgstr "_Fil"
 
-#: ../app/actions/file-actions.c:65
+#: ../app/actions/file-actions.c:67
+#| msgid "Current"
+msgid "Create"
+msgstr "_Hent inn"
+
+#: ../app/actions/file-actions.c:68
 msgid "Open _Recent"
-msgstr "Opna ny_leg brukte"
+msgstr "Opna _tidlegare brukte"
 
-#: ../app/actions/file-actions.c:66
-msgid "Acq_uire"
-msgstr "_Hent"
-
-#: ../app/actions/file-actions.c:69
+#: ../app/actions/file-actions.c:71
 msgid "_Open..."
-msgstr "_Opna..."
+msgstr "_Opna …"
 
-#: ../app/actions/file-actions.c:70
+#: ../app/actions/file-actions.c:72
 msgid "Open an image file"
 msgstr "Opna ei biletfil"
 
-#: ../app/actions/file-actions.c:75
+#: ../app/actions/file-actions.c:77
 msgid "Op_en as Layers..."
-msgstr "Op_na som lag..."
+msgstr "Op_na som lag …"
 
-#: ../app/actions/file-actions.c:76
+#: ../app/actions/file-actions.c:78
 msgid "Open an image file as layers"
 msgstr "Opna ei biletfil som lag"
 
-#: ../app/actions/file-actions.c:81
+#: ../app/actions/file-actions.c:83
 msgid "Open _Location..."
-msgstr "O_pna ei adresse..."
+msgstr "O_pna ei adresse …"
 
-#: ../app/actions/file-actions.c:82
+#: ../app/actions/file-actions.c:84
 msgid "Open an image file from a specified location"
 msgstr "Opna ei biletfil frå ei spesifisert adresse"
 
-#: ../app/actions/file-actions.c:87
+#: ../app/actions/file-actions.c:89
 msgid "Save as _Template..."
-msgstr "Lagra som _mal..."
+msgstr "Lagra som _mal …"
 
-#: ../app/actions/file-actions.c:88
+#: ../app/actions/file-actions.c:90
 msgid "Create a new template from this image"
 msgstr "Opprett ein ny mal frå dette biletet"
 
-#: ../app/actions/file-actions.c:93
+#: ../app/actions/file-actions.c:95
 msgid "Re_vert"
 msgstr "_Tilbakestill"
 
-#: ../app/actions/file-actions.c:94
+#: ../app/actions/file-actions.c:96
 msgid "Reload the image file from disk"
 msgstr "Hent biletet på nytt frå disk"
 
-#: ../app/actions/file-actions.c:99
+#: ../app/actions/file-actions.c:101
 msgid "Close all"
 msgstr "Lukk alle"
 
-#: ../app/actions/file-actions.c:100
+#: ../app/actions/file-actions.c:102
 msgid "Close all opened images"
 msgstr "Lukk alle opne biletvindauge"
 
-#: ../app/actions/file-actions.c:105
+#: ../app/actions/file-actions.c:107
 msgid "_Quit"
 msgstr "_Avslutt"
 
-#: ../app/actions/file-actions.c:106
+#: ../app/actions/file-actions.c:108
 msgid "Quit the GNU Image Manipulation Program"
 msgstr "Avslutt GIMP"
 
-#: ../app/actions/file-actions.c:114
+#: ../app/actions/file-actions.c:116
 msgid "_Save"
 msgstr "_Lagra"
 
-#: ../app/actions/file-actions.c:115
+#: ../app/actions/file-actions.c:117
 msgid "Save this image"
 msgstr "Lagra dette biletet"
 
-#: ../app/actions/file-actions.c:120
+#: ../app/actions/file-actions.c:122
 msgid "Save _As..."
-msgstr "L_agra som..."
+msgstr "L_agra som …"
 
-#: ../app/actions/file-actions.c:121
+#: ../app/actions/file-actions.c:123
 msgid "Save this image with a different name"
 msgstr "Lagra dette biletet med eit anna namn"
 
-#: ../app/actions/file-actions.c:126
+#: ../app/actions/file-actions.c:128
 msgid "Save a Cop_y..."
-msgstr "Lagra ein _kopi..."
+msgstr "Lagra ein _kopi …"
 
-#: ../app/actions/file-actions.c:127
+#: ../app/actions/file-actions.c:129
 msgid "Save this image with a different name, but keep its current name"
-msgstr ""
-"Lagra ein kopi av dette biletet med eit anna namn utan å endra nåverande "
-"namn på biletet"
+msgstr "Lagra ein kopi av dette biletet med eit anna namn utan å endra nåverande namn på biletet"
 
-#: ../app/actions/file-actions.c:132
+#: ../app/actions/file-actions.c:134
 msgid "Save and Close..."
-msgstr "Lagra og lukk..."
+msgstr "Lagra og lukk …"
 
-#: ../app/actions/file-actions.c:133
+#: ../app/actions/file-actions.c:135
 msgid "Save this image and close its window"
 msgstr "Lagra dette biletet og lukk biletvindauget"
 
-#: ../app/actions/file-commands.c:247
+#: ../app/actions/file-commands.c:104
+#: ../app/actions/file-commands.c:456
+#: ../app/dialogs/file-open-dialog.c:76
+msgid "Open Image"
+msgstr "Opna biletet"
+
+#: ../app/actions/file-commands.c:125
+msgid "Open Image as Layers"
+msgstr "Opna biletet som lag"
+
+#: ../app/actions/file-commands.c:266
 msgid "Saving canceled"
 msgstr "Lagringa avbrote"
 
-#: ../app/actions/file-commands.c:256 ../app/dialogs/file-save-dialog.c:504
+#: ../app/actions/file-commands.c:275
+#: ../app/dialogs/file-save-dialog.c:513
 #: ../app/widgets/gimpdnd-xds.c:173
 #, c-format
 msgid ""
@@ -1868,56 +1937,49 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/actions/file-commands.c:286 ../app/dialogs/file-save-dialog.c:87
+#: ../app/actions/file-commands.c:300
+msgid "No changes need to be saved"
+msgstr "Det er ingen endringar som treng lagrast"
+
+#: ../app/actions/file-commands.c:307
+#: ../app/dialogs/file-save-dialog.c:88
 msgid "Save Image"
 msgstr "Lagra biletet"
 
-#: ../app/actions/file-commands.c:292
+#: ../app/actions/file-commands.c:313
 msgid "Save a Copy of the Image"
 msgstr "Lagra ein kopi av biletet"
 
-#: ../app/actions/file-commands.c:312
+#: ../app/actions/file-commands.c:333
 msgid "Create New Template"
 msgstr "Opprett ny mal"
 
-#: ../app/actions/file-commands.c:316
+#: ../app/actions/file-commands.c:337
 msgid "Enter a name for this template"
 msgstr "Skriv inn eit namn på denne malen"
 
-#: ../app/actions/file-commands.c:342
+#: ../app/actions/file-commands.c:363
 msgid "Revert failed. No file name associated with this image."
 msgstr "Tilbakestillinga mislukka. Finn ingen filer med dette namnet."
 
-#: ../app/actions/file-commands.c:355
+#: ../app/actions/file-commands.c:376
 msgid "Revert Image"
 msgstr "Tilbakestill biletet"
 
-#: ../app/actions/file-commands.c:381
+#: ../app/actions/file-commands.c:402
 #, c-format
 msgid "Revert '%s' to '%s'?"
 msgstr "Tilbakestill «%s» til «%s»?"
 
-#: ../app/actions/file-commands.c:387
-msgid ""
-"By reverting the image to the state saved on disk, you will lose all "
-"changes, including all undo information."
-msgstr ""
-"Ved å tilbakestilla biletet til førre lagring, mister du alle endringane, "
-"inkludert angreinformasjonen."
+#: ../app/actions/file-commands.c:408
+msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information."
+msgstr "Ved å tilbakestilla biletet til førre lagring, mister du alle endringane, inkludert angreinformasjonen."
 
-#: ../app/actions/file-commands.c:459
-msgid "Open Image as Layers"
-msgstr "Opna biletet som lag"
-
-#: ../app/actions/file-commands.c:464 ../app/dialogs/file-open-dialog.c:75
-msgid "Open Image"
-msgstr "Opna biletet"
-
-#: ../app/actions/file-commands.c:539
+#: ../app/actions/file-commands.c:563
 msgid "(Unnamed Template)"
 msgstr "(Mal utan namn)"
 
-#: ../app/actions/file-commands.c:587
+#: ../app/actions/file-commands.c:611
 #, c-format
 msgid ""
 "Reverting to '%s' failed:\n"
@@ -1970,7 +2032,7 @@ msgstr "Lagra h_øgre farge til"
 
 #: ../app/actions/gradient-editor-actions.c:67
 msgid "L_eft Endpoint's Color..."
-msgstr "Farge for ve_nstre endepunkt..."
+msgstr "Farge for ve_nstre endepunkt …"
 
 #: ../app/actions/gradient-editor-actions.c:72
 msgid "R_ight Endpoint's Color..."
@@ -2062,7 +2124,7 @@ msgid "(Varies)"
 msgstr "(Varierar)"
 
 #: ../app/actions/gradient-editor-actions.c:347
-#: ../app/actions/image-actions.c:153
+#: ../app/actions/image-actions.c:141
 msgid "_RGB"
 msgstr "_RGB"
 
@@ -2081,7 +2143,8 @@ msgstr "Forstørr"
 
 #: ../app/actions/gradient-editor-actions.c:371
 #: ../app/actions/palette-editor-actions.c:88
-#: ../app/actions/view-actions.c:262 ../app/actions/view-actions.c:274
+#: ../app/actions/view-actions.c:262
+#: ../app/actions/view-actions.c:274
 msgid "Zoom in"
 msgstr "Forstørr"
 
@@ -2092,7 +2155,8 @@ msgstr "Forminsk"
 
 #: ../app/actions/gradient-editor-actions.c:377
 #: ../app/actions/palette-editor-actions.c:94
-#: ../app/actions/view-actions.c:256 ../app/actions/view-actions.c:268
+#: ../app/actions/view-actions.c:256
+#: ../app/actions/view-actions.c:268
 msgid "Zoom out"
 msgstr "Forminsk"
 
@@ -2119,7 +2183,7 @@ msgstr "Spegel_vend segment"
 
 #: ../app/actions/gradient-editor-actions.c:780
 msgid "_Replicate Segment..."
-msgstr "_Kopier segment..."
+msgstr "_Kopier segment …"
 
 #: ../app/actions/gradient-editor-actions.c:782
 msgid "Split Segment at _Midpoint"
@@ -2127,7 +2191,7 @@ msgstr "Del segmentet ved _midtpunktet"
 
 #: ../app/actions/gradient-editor-actions.c:784
 msgid "Split Segment _Uniformly..."
-msgstr "Del segmentet i _like delar..."
+msgstr "Del segmentet i _like delar …"
 
 #: ../app/actions/gradient-editor-actions.c:786
 msgid "_Delete Segment"
@@ -2155,7 +2219,7 @@ msgstr "Spegel_vend utvalet"
 
 #: ../app/actions/gradient-editor-actions.c:802
 msgid "_Replicate Selection..."
-msgstr "_Kopier utvalet..."
+msgstr "_Kopier utvalet …"
 
 #: ../app/actions/gradient-editor-actions.c:804
 msgid "Split Segments at _Midpoints"
@@ -2163,7 +2227,7 @@ msgstr "Del segmenta ved _midtpunkta"
 
 #: ../app/actions/gradient-editor-actions.c:806
 msgid "Split Segments _Uniformly..."
-msgstr "Del segmenta _likt..."
+msgstr "Del segmenta _likt …"
 
 #: ../app/actions/gradient-editor-actions.c:808
 msgid "_Delete Selection"
@@ -2179,7 +2243,7 @@ msgstr "_Omfordel handtaka i utvalet"
 
 #: ../app/actions/gradient-editor-commands.c:86
 msgid "Left Endpoint Color"
-msgstr "Farge på det _venstre endepunktet..."
+msgstr "Farge på det _venstre endepunktet …"
 
 #: ../app/actions/gradient-editor-commands.c:88
 msgid "Gradient Segment's Left Endpoint Color"
@@ -2295,7 +2359,7 @@ msgstr "Kopier filadressa for fargeovergangen til utklippstavla"
 
 #: ../app/actions/gradients-actions.c:66
 msgid "Save as _POV-Ray..."
-msgstr "Lagra som _POV-Ray..."
+msgstr "Lagra som _POV-Ray …"
 
 #: ../app/actions/gradients-actions.c:67
 msgid "Save gradient as POV-Ray"
@@ -2319,7 +2383,7 @@ msgstr "Oppdater fargeovergangane"
 
 #: ../app/actions/gradients-actions.c:87
 msgid "_Edit Gradient..."
-msgstr "R_ediger fargeovergang..."
+msgstr "R_ediger fargeovergang …"
 
 #: ../app/actions/gradients-actions.c:88
 msgid "Edit gradient"
@@ -2330,7 +2394,8 @@ msgstr "Rediger fargeovergang"
 msgid "Save '%s' as POV-Ray"
 msgstr "Lagra «%s» som POV-Ray"
 
-#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41
+#: ../app/actions/help-actions.c:38
+#: ../app/actions/help-actions.c:41
 msgid "_Help"
 msgstr "_Hjelp"
 
@@ -2340,237 +2405,248 @@ msgstr "Opna GIMP-handboka"
 
 #: ../app/actions/help-actions.c:47
 msgid "_Context Help"
-msgstr "_Aktiv hjelp"
+msgstr "_Menyhjelp"
 
 #: ../app/actions/help-actions.c:48
 msgid "Show the help for a specific user interface item"
-msgstr "Vis hjelp for bestemte element i GIMP"
+msgstr "Vis hjelp for eit bestemte element i GIMP"
 
 #: ../app/actions/image-actions.c:47
-msgid "Toolbox Menu"
-msgstr "Meny for verktøykassa"
-
-#: ../app/actions/image-actions.c:51 ../app/actions/image-actions.c:55
+#: ../app/actions/image-actions.c:51
 msgid "Image Menu"
 msgstr "Biletmeny"
 
-#: ../app/actions/image-actions.c:58
-msgid "_Xtns"
-msgstr "_Utvidingar"
-
-#: ../app/actions/image-actions.c:60
+#: ../app/actions/image-actions.c:54
 msgid "_Image"
 msgstr "_Bilete"
 
-#: ../app/actions/image-actions.c:61
+#: ../app/actions/image-actions.c:55
 msgid "_Mode"
 msgstr "_Modus"
 
-#: ../app/actions/image-actions.c:62 ../app/actions/layers-actions.c:56
+#: ../app/actions/image-actions.c:56
+#: ../app/actions/layers-actions.c:56
 msgid "_Transform"
 msgstr "_Transformer"
 
-#: ../app/actions/image-actions.c:63
+#: ../app/actions/image-actions.c:57
 msgid "_Guides"
 msgstr "Hjelpe_linjer"
 
-#: ../app/actions/image-actions.c:66
+#: ../app/actions/image-actions.c:60
 msgid "I_nfo"
 msgstr "I_nfo"
 
-#: ../app/actions/image-actions.c:67 ../app/tools/gimplevelstool.c:648
-#: ../app/tools/gimpthresholdtool.c:261
+#: ../app/actions/image-actions.c:61
+#: ../app/tools/gimplevelstool.c:653
+#: ../app/tools/gimpthresholdtool.c:264
 msgid "_Auto"
 msgstr "_Auto"
 
-#: ../app/actions/image-actions.c:68 ../app/actions/plug-in-actions.c:94
+#: ../app/actions/image-actions.c:62
+#: ../app/actions/plug-in-actions.c:95
 msgid "_Map"
-msgstr "Kar_t"
+msgstr "Ka_rt"
 
-#: ../app/actions/image-actions.c:69
+#: ../app/actions/image-actions.c:63
 msgid "C_omponents"
 msgstr "K_omponentar"
 
-#: ../app/actions/image-actions.c:72 ../app/actions/image-actions.c:78
+#: ../app/actions/image-actions.c:66
 msgid "_New..."
-msgstr "_Nytt..."
+msgstr "_Nytt …"
 
-#: ../app/actions/image-actions.c:73 ../app/actions/image-actions.c:79
+#: ../app/actions/image-actions.c:67
 msgid "Create a new image"
 msgstr "Opprett eit nytt bilete "
 
-#: ../app/actions/image-actions.c:84
+#: ../app/actions/image-actions.c:72
 msgid "Can_vas Size..."
 msgstr "_Lerretformat"
 
-#: ../app/actions/image-actions.c:85
+#: ../app/actions/image-actions.c:73
 msgid "Adjust the image dimensions"
 msgstr "Juster biletdimensjonane"
 
-#: ../app/actions/image-actions.c:90
+#: ../app/actions/image-actions.c:78
 msgid "F_it Canvas to Layers"
 msgstr "_Tilpass lerret til lag"
 
-#: ../app/actions/image-actions.c:91
+#: ../app/actions/image-actions.c:79
 msgid "Resize the image to enclose all layers"
 msgstr "Set biletformatet slik at alle laga kjem innføre biletet"
 
-#: ../app/actions/image-actions.c:96
+#: ../app/actions/image-actions.c:84
 msgid "F_it Canvas to Selection"
 msgstr "_Tilpass lerret til utvalet"
 
-#: ../app/actions/image-actions.c:97
+#: ../app/actions/image-actions.c:85
 msgid "Resize the image to the extents of the selection"
 msgstr "Set biletet til same storleik som utvalet"
 
-#: ../app/actions/image-actions.c:102
+#: ../app/actions/image-actions.c:90
 msgid "_Print Size..."
-msgstr "_Utskriftformat..."
+msgstr "_Utskriftformat …"
 
-#: ../app/actions/image-actions.c:103
+#: ../app/actions/image-actions.c:91
 msgid "Adjust the print resolution"
 msgstr "Juster utskriftsoppløysinga"
 
-#: ../app/actions/image-actions.c:108
+#: ../app/actions/image-actions.c:96
 msgid "_Scale Image..."
-msgstr "_Skaler biletet..."
+msgstr "_Skaler biletet …"
 
-#: ../app/actions/image-actions.c:109
+#: ../app/actions/image-actions.c:97
 msgid "Change the size of the image content"
 msgstr "Endre biletformatet"
 
-#: ../app/actions/image-actions.c:114 ../app/actions/layers-actions.c:182
+#: ../app/actions/image-actions.c:102
+#: ../app/actions/layers-actions.c:188
 msgid "_Crop to Selection"
 msgstr "_Beskjer til utvalet"
 
-#: ../app/actions/image-actions.c:115
+#: ../app/actions/image-actions.c:103
 msgid "Crop the image to the extents of the selection"
 msgstr "Beskjer biletet til same storleik som utvalet"
 
-#: ../app/actions/image-actions.c:120
+#: ../app/actions/image-actions.c:108
 msgid "_Duplicate"
 msgstr "_Dupliser"
 
-#: ../app/actions/image-actions.c:121
+#: ../app/actions/image-actions.c:109
 msgid "Create a duplicate of this image"
 msgstr "Opprett eit duplikat av dette biletet"
 
-#: ../app/actions/image-actions.c:126
+#: ../app/actions/image-actions.c:114
 msgid "Merge Visible _Layers..."
 msgstr "Fle_tt saman synlege lag"
 
-#: ../app/actions/image-actions.c:127 ../app/actions/layers-actions.c:135
+#: ../app/actions/image-actions.c:115
+#: ../app/actions/layers-actions.c:141
 msgid "Merge all visible layers into one layer"
 msgstr "Flett saman alle synlege lag til eitt lag"
 
-#: ../app/actions/image-actions.c:132 ../app/actions/layers-actions.c:140
+#: ../app/actions/image-actions.c:120
+#: ../app/actions/layers-actions.c:146
 msgid "_Flatten Image"
 msgstr "_Flat ut biletet"
 
-#: ../app/actions/image-actions.c:133 ../app/actions/layers-actions.c:141
+#: ../app/actions/image-actions.c:121
+#: ../app/actions/layers-actions.c:147
 msgid "Merge all layers into one and remove transparency"
 msgstr "Flett saman alle synlege lag til eitt lag og fjern gjennomsikt"
 
-#: ../app/actions/image-actions.c:138
+#: ../app/actions/image-actions.c:126
 msgid "Configure G_rid..."
-msgstr "Innstillingar for _rutenettet..."
+msgstr "Innstillingar for _rutenettet …"
 
-#: ../app/actions/image-actions.c:139
+#: ../app/actions/image-actions.c:127
 msgid "Configure the grid for this image"
 msgstr "Set innstillingane for rutenettet brukt i dette biletet"
 
-#: ../app/actions/image-actions.c:144
+#: ../app/actions/image-actions.c:132
 msgid "Image Pr_operties"
 msgstr "Bilet_eigenskapar"
 
-#: ../app/actions/image-actions.c:145
+#: ../app/actions/image-actions.c:133
 msgid "Display information about this image"
 msgstr "Vis informasjon om dette biletet"
 
-#: ../app/actions/image-actions.c:154
+#: ../app/actions/image-actions.c:142
 msgid "Convert the image to the RGB colorspace"
 msgstr "Konverter bildet til RGB-fargemodell"
 
-#: ../app/actions/image-actions.c:158
+#: ../app/actions/image-actions.c:146
 msgid "_Grayscale"
 msgstr "_Gråtone"
 
-#: ../app/actions/image-actions.c:159
+#: ../app/actions/image-actions.c:147
 msgid "Convert the image to grayscale"
 msgstr "Konverter biletet til gråtoner"
 
-#: ../app/actions/image-actions.c:163
+#: ../app/actions/image-actions.c:151
 msgid "_Indexed..."
-msgstr "_Indeksert..."
+msgstr "_Indeksert …"
 
-#: ../app/actions/image-actions.c:164
+#: ../app/actions/image-actions.c:152
 msgid "Convert the image to indexed colors"
 msgstr "Konverter biletet til indekserte fargar"
 
-#: ../app/actions/image-actions.c:172
+#: ../app/actions/image-actions.c:160
 msgid "Flip image horizontally"
 msgstr "Spegelvend biletet horisontalt"
 
-#: ../app/actions/image-actions.c:178
+#: ../app/actions/image-actions.c:166
 msgid "Flip image vertically"
 msgstr "Spegelvend biletet vertikalt"
 
-#: ../app/actions/image-actions.c:187
+#: ../app/actions/image-actions.c:175
 msgid "Rotate the image 90 degrees to the right"
 msgstr "Roter biletet 90° mot høgre"
 
-#: ../app/actions/image-actions.c:193
+#: ../app/actions/image-actions.c:181
 msgid "Turn the image upside-down"
 msgstr "Snu biletet opp/ned"
 
-#: ../app/actions/image-actions.c:199
+#: ../app/actions/image-actions.c:187
 msgid "Rotate the image 90 degrees to the left"
 msgstr "Roter biletet 90° mot venstre"
 
-#: ../app/actions/image-commands.c:255
+#: ../app/actions/image-commands.c:235
 msgid "Set Image Canvas Size"
 msgstr "Set format på biletlerretet"
 
-#: ../app/actions/image-commands.c:281 ../app/actions/image-commands.c:302
-#: ../app/actions/image-commands.c:579
+#: ../app/actions/image-commands.c:261
+#: ../app/actions/image-commands.c:282
+#: ../app/actions/image-commands.c:559
 msgid "Resizing"
 msgstr "Tilbakestill storleiken"
 
-#: ../app/actions/image-commands.c:326
+#: ../app/actions/image-commands.c:306
 msgid "Set Image Print Resolution"
 msgstr "Vel utskriftoppløysinga for biletet"
 
-#: ../app/actions/image-commands.c:382
-#: ../app/pdb/drawable_transform_cmds.c:147
-#: ../app/pdb/drawable_transform_cmds.c:221
+#: ../app/actions/image-commands.c:362
+#: ../app/pdb/drawable-transform-cmds.c:148
+#: ../app/pdb/drawable-transform-cmds.c:223
 msgid "Flipping"
 msgstr "Spegelvender"
 
-#: ../app/actions/image-commands.c:403
-#: ../app/pdb/drawable_transform_cmds.c:519
-#: ../app/pdb/drawable_transform_cmds.c:597
-#: ../app/pdb/transform_tools_cmds.c:213 ../app/tools/gimprotatetool.c:114
+#: ../app/actions/image-commands.c:383
+#: ../app/pdb/drawable-transform-cmds.c:525
+#: ../app/pdb/drawable-transform-cmds.c:604
+#: ../app/pdb/image-cmds.c:533
+#: ../app/pdb/transform-tools-cmds.c:215
+#: ../app/tools/gimprotatetool.c:122
 msgid "Rotating"
 msgstr "Roterer"
 
-#: ../app/actions/image-commands.c:428 ../app/actions/layers-commands.c:617
+#: ../app/actions/image-commands.c:408
+#: ../app/actions/layers-commands.c:639
 msgid "Cannot crop because the current selection is empty."
 msgstr "Kunne ikkje beskjere fordi dette utvalet er tomt."
 
-#: ../app/actions/image-commands.c:626
+#: ../app/actions/image-commands.c:606
 msgid "Change Print Size"
 msgstr "Endre utskriftstorleik"
 
-#: ../app/actions/image-commands.c:667 ../app/core/gimpimage-scale.c:80
+#: ../app/actions/image-commands.c:647
+#: ../app/core/gimpimage-scale.c:82
 msgid "Scale Image"
 msgstr "Skaler biletet"
 
 #. Scaling
-#: ../app/actions/image-commands.c:678 ../app/actions/layers-commands.c:1079
-#: ../app/dialogs/preferences-dialog.c:1891
-#: ../app/pdb/drawable_transform_cmds.c:674
-#: ../app/pdb/drawable_transform_cmds.c:749
-#: ../app/pdb/transform_tools_cmds.c:288 ../app/tools/gimpscaletool.c:107
+#: ../app/actions/image-commands.c:658
+#: ../app/actions/layers-commands.c:1101
+#: ../app/dialogs/preferences-dialog.c:1925
+#: ../app/pdb/drawable-transform-cmds.c:682
+#: ../app/pdb/drawable-transform-cmds.c:758
+#: ../app/pdb/image-cmds.c:405
+#: ../app/pdb/image-cmds.c:441
+#: ../app/pdb/layer-cmds.c:289
+#: ../app/pdb/layer-cmds.c:334
+#: ../app/pdb/transform-tools-cmds.c:291
+#: ../app/tools/gimpscaletool.c:107
 msgid "Scaling"
 msgstr "Skalering"
 
@@ -2586,7 +2662,8 @@ msgstr "_Løft visingar"
 msgid "Raise this image's displays"
 msgstr "Løft visinga av dette biletet"
 
-#: ../app/actions/images-actions.c:53 ../app/actions/view-actions.c:75
+#: ../app/actions/images-actions.c:53
+#: ../app/actions/view-actions.c:75
 msgid "_New View"
 msgstr "_Ny vising"
 
@@ -2644,7 +2721,7 @@ msgstr "Aktiver tekstverktøyet for dette tekstlaget"
 
 #: ../app/actions/layers-actions.c:68
 msgid "_Edit Layer Attributes..."
-msgstr "R_ediger lagattributta..."
+msgstr "R_ediger lagattributta …"
 
 #: ../app/actions/layers-actions.c:69
 msgid "Edit the layer's name"
@@ -2652,7 +2729,7 @@ msgstr "Rediger lagnamnet"
 
 #: ../app/actions/layers-actions.c:74
 msgid "_New Layer..."
-msgstr "_Nytt lag..."
+msgstr "_Nytt lag …"
 
 #: ../app/actions/layers-actions.c:75
 msgid "Create a new layer and add it to the image"
@@ -2667,334 +2744,353 @@ msgid "Create a new layer with last used values"
 msgstr "Opprett eit nytt lag med same verdiane som blei brukte sist"
 
 #: ../app/actions/layers-actions.c:86
+#| msgid "Copy _Visible"
+msgid "New from _Visible"
+msgstr "Nytt frå _synlege"
+
+#: ../app/actions/layers-actions.c:87
+#| msgid "Create a new template from this image"
+msgid "Create a new layer from what is visible in this image"
+msgstr "Opprett eit nytt lag av det som er synleg i dette biletet"
+
+#: ../app/actions/layers-actions.c:92
 msgid "D_uplicate Layer"
 msgstr "_Dupliser laget"
 
-#: ../app/actions/layers-actions.c:87
+#: ../app/actions/layers-actions.c:93
 msgid "Create a duplicate of the layer and add it to the image"
 msgstr "Opprett eit duplikat av laget og legg dette inn i biletet"
 
-#: ../app/actions/layers-actions.c:92
+#: ../app/actions/layers-actions.c:98
 msgid "_Delete Layer"
 msgstr "_Slett laget"
 
-#: ../app/actions/layers-actions.c:93
+#: ../app/actions/layers-actions.c:99
 msgid "Delete this layer"
 msgstr "Slett dette laget"
 
-#: ../app/actions/layers-actions.c:98
+#: ../app/actions/layers-actions.c:104
 msgid "_Raise Layer"
 msgstr "_Løft laget"
 
-#: ../app/actions/layers-actions.c:99
+#: ../app/actions/layers-actions.c:105
 msgid "Raise this layer one step in the layer stack"
 msgstr "Flytt laget opp eit hakk i lagstabelen"
 
-#: ../app/actions/layers-actions.c:104
+#: ../app/actions/layers-actions.c:110
 msgid "Layer to _Top"
 msgstr "Laget til _toppen"
 
-#: ../app/actions/layers-actions.c:105
+#: ../app/actions/layers-actions.c:111
 msgid "Move this layer to the top of the layer stack"
 msgstr "Flytt dette laget til øvst i lagstabelen"
 
-#: ../app/actions/layers-actions.c:110
+#: ../app/actions/layers-actions.c:116
 msgid "_Lower Layer"
 msgstr "_Senk laget"
 
-#: ../app/actions/layers-actions.c:111
+#: ../app/actions/layers-actions.c:117
 msgid "Lower this layer one step in the layer stack"
 msgstr "Flytt laget ned eit hakk i lagstabelen"
 
-#: ../app/actions/layers-actions.c:116
+#: ../app/actions/layers-actions.c:122
 msgid "Layer to _Bottom"
 msgstr "Laget til _botnen"
 
-#: ../app/actions/layers-actions.c:117
+#: ../app/actions/layers-actions.c:123
 msgid "Move this layer to the bottom of the layer stack"
 msgstr "Flytt laget til nedst i lagstabelen"
 
-#: ../app/actions/layers-actions.c:122
+#: ../app/actions/layers-actions.c:128
 msgid "_Anchor Layer"
 msgstr "For_ankre laget"
 
-#: ../app/actions/layers-actions.c:123
+#: ../app/actions/layers-actions.c:129
 msgid "Anchor the floating layer"
 msgstr "Forankre det flytande laget"
 
-#: ../app/actions/layers-actions.c:128
+#: ../app/actions/layers-actions.c:134
 msgid "Merge Do_wn"
 msgstr "Flett saman _nedover"
 
-#: ../app/actions/layers-actions.c:129
+#: ../app/actions/layers-actions.c:135
 msgid "Merge this layer with the one below it"
 msgstr "Flett dette lagaet saman med laget under"
 
-#: ../app/actions/layers-actions.c:134
+#: ../app/actions/layers-actions.c:140
 msgid "Merge _Visible Layers..."
 msgstr "Flett saman _synlege lag"
 
-#: ../app/actions/layers-actions.c:146
+#: ../app/actions/layers-actions.c:152
 msgid "_Discard Text Information"
 msgstr "_Fjern tekstinformasjon"
 
-#: ../app/actions/layers-actions.c:147
+#: ../app/actions/layers-actions.c:153
 msgid "Turn this text layer into a normal layer"
 msgstr "Gjer dette tekstlaget om til eit vanleg lag"
 
-#: ../app/actions/layers-actions.c:152
+#: ../app/actions/layers-actions.c:158
 msgid "Text to _Path"
 msgstr "Tekst til bane"
 
-#: ../app/actions/layers-actions.c:153
+#: ../app/actions/layers-actions.c:159
 msgid "Create a path from this text layer"
 msgstr "Opprett ein bane frå dette tekstlaget"
 
-#: ../app/actions/layers-actions.c:158
+#: ../app/actions/layers-actions.c:164
 msgid "Text alon_g Path"
 msgstr "Tekst langs bane"
 
-#: ../app/actions/layers-actions.c:159
+#: ../app/actions/layers-actions.c:165
 msgid "Warp this layer's text along the current path"
 msgstr "Snurr teksten i dette laget langs den aktive banen "
 
-#: ../app/actions/layers-actions.c:164
+#: ../app/actions/layers-actions.c:170
 msgid "Layer B_oundary Size..."
-msgstr "_Set laggrensene..."
+msgstr "_Set laggrensene …"
 
-#: ../app/actions/layers-actions.c:165
+#: ../app/actions/layers-actions.c:171
 msgid "Adjust the layer dimensions"
 msgstr "Juster lagdimensjonane"
 
-#: ../app/actions/layers-actions.c:170
+#: ../app/actions/layers-actions.c:176
 msgid "Layer to _Image Size"
 msgstr "Laget til _biletformatet"
 
-#: ../app/actions/layers-actions.c:171
+#: ../app/actions/layers-actions.c:177
 msgid "Resize the layer to the size of the image"
 msgstr "Set laget til biletstorleiken"
 
-#: ../app/actions/layers-actions.c:176
+#: ../app/actions/layers-actions.c:182
 msgid "_Scale Layer..."
-msgstr "_Skaler laget..."
+msgstr "_Skaler laget …"
 
-#: ../app/actions/layers-actions.c:177
+#: ../app/actions/layers-actions.c:183
 msgid "Change the size of the layer content"
 msgstr "Endre storleiken på innhaldet i biletet"
 
-#: ../app/actions/layers-actions.c:183
+#: ../app/actions/layers-actions.c:189
 msgid "Crop the layer to the extents of the selection"
 msgstr "Beskjer laget til omrisset av utvalet"
 
-#: ../app/actions/layers-actions.c:188
-msgid "Add La_yer Mask..."
-msgstr "Legg til lag_maske..."
-
-#: ../app/actions/layers-actions.c:189
-msgid "Add a mask that allows non-destructive editing of transparency"
-msgstr ""
-"Legg til ei maske som tillet ikkje-øydeleggande redigering av gjennomsikt"
-
 #: ../app/actions/layers-actions.c:194
+msgid "Add La_yer Mask..."
+msgstr "Legg til lag_maske …"
+
+#: ../app/actions/layers-actions.c:195
+msgid "Add a mask that allows non-destructive editing of transparency"
+msgstr "Legg til ei maske som tillet ikkje-øydeleggande redigering av gjennomsikt"
+
+#: ../app/actions/layers-actions.c:200
 msgid "Add Alpha C_hannel"
 msgstr "Legg til _alfakanal"
 
-#: ../app/actions/layers-actions.c:195
+#: ../app/actions/layers-actions.c:201
 msgid "Add transparency information to the layer"
 msgstr "Legg informasjon om gjennomsikt til laget"
 
-#: ../app/actions/layers-actions.c:200
+#: ../app/actions/layers-actions.c:206
 msgid "_Remove Alpha Channel"
 msgstr "Fje_rn alfakanal"
 
-#: ../app/actions/layers-actions.c:201
+#: ../app/actions/layers-actions.c:207
 msgid "Remove transparency information from the layer"
 msgstr "Fjern informasjon om gjennomsikt frå laget"
 
-#: ../app/actions/layers-actions.c:209
+#: ../app/actions/layers-actions.c:215
 msgid "Lock Alph_a Channel"
 msgstr "Lås _alfakanal"
 
-#: ../app/actions/layers-actions.c:210
+#: ../app/actions/layers-actions.c:216
 msgid "Keep transparency information on this layer from being modified"
 msgstr "Sperr informasjon om gjennomsikt for laget mot å bli endra"
 
-#: ../app/actions/layers-actions.c:216
+#: ../app/actions/layers-actions.c:222
 msgid "_Edit Layer Mask"
 msgstr "Redier lagmaska"
 
-#: ../app/actions/layers-actions.c:217
+#: ../app/actions/layers-actions.c:223
 msgid "Work on the layer mask"
 msgstr "Arbeid på lagmaska"
 
-#: ../app/actions/layers-actions.c:223
+#: ../app/actions/layers-actions.c:229
 msgid "S_how Layer Mask"
 msgstr "_Vis lagmaske"
 
-#: ../app/actions/layers-actions.c:229
+#: ../app/actions/layers-actions.c:235
 msgid "_Disable Layer Mask"
 msgstr "Slå _av lagmaska"
 
-#: ../app/actions/layers-actions.c:230
+#: ../app/actions/layers-actions.c:236
 msgid "Dismiss the effect of the layer mask"
 msgstr "Slå av effekten av lagmaska"
 
-#: ../app/actions/layers-actions.c:239
+#: ../app/actions/layers-actions.c:245
 msgid "Apply Layer _Mask"
 msgstr "Bruk lag_maske"
 
-#: ../app/actions/layers-actions.c:240
+#: ../app/actions/layers-actions.c:246
 msgid "Apply the effect of the layer mask and remove it"
 msgstr "Bruk effekten av lagmaska og fjern maska"
 
-#: ../app/actions/layers-actions.c:245
+#: ../app/actions/layers-actions.c:251
 msgid "Delete Layer Mas_k"
 msgstr "_Slett lagmaska"
 
-#: ../app/actions/layers-actions.c:246
+#: ../app/actions/layers-actions.c:252
 msgid "Remove the layer mask and its effect"
 msgstr "Fjern lagmaska og effekten av maska"
 
-#: ../app/actions/layers-actions.c:254
+#: ../app/actions/layers-actions.c:260
 msgid "_Mask to Selection"
 msgstr "Maske til _utval"
 
-#: ../app/actions/layers-actions.c:255
+#: ../app/actions/layers-actions.c:261
 msgid "Replace the selection with the layer mask"
 msgstr "Bytt ut utvalet med lagmaska"
 
-#: ../app/actions/layers-actions.c:261
+#: ../app/actions/layers-actions.c:267
 msgid "Add the layer mask to the current selection"
 msgstr "Legg lagmaska til det gjeldande utvalet"
 
-#: ../app/actions/layers-actions.c:267
+#: ../app/actions/layers-actions.c:273
 msgid "Subtract the layer mask from the current selection"
 msgstr "Trekk lagmaska frå det gjeldande utvalet"
 
-#: ../app/actions/layers-actions.c:273
+#: ../app/actions/layers-actions.c:279
 msgid "Intersect the layer mask with the current selection"
 msgstr "Lag snitt mellom lagmaska og det gjeldande utvalet"
 
-#: ../app/actions/layers-actions.c:281
+#: ../app/actions/layers-actions.c:287
 msgid "Al_pha to Selection"
 msgstr "Al_fa til utval"
 
-#: ../app/actions/layers-actions.c:282
+#: ../app/actions/layers-actions.c:288
 msgid "Replace the selection with the layer's alpha channel"
 msgstr "Erstatt utvalet med alfakanalen i laget"
 
-#: ../app/actions/layers-actions.c:287 ../app/actions/layers-actions.c:314
+#: ../app/actions/layers-actions.c:293
+#: ../app/actions/layers-actions.c:320
 msgid "A_dd to Selection"
 msgstr "_Legg til i utvalet"
 
-#: ../app/actions/layers-actions.c:288
+#: ../app/actions/layers-actions.c:294
 msgid "Add the layer's alpha channel to the current selection"
 msgstr "Legg alfakanalen for laget til det aktive utvalet"
 
-#: ../app/actions/layers-actions.c:294
+#: ../app/actions/layers-actions.c:300
 msgid "Subtract the layer's alpha channel from the current selection"
 msgstr "Trekk alfakanalen for laget frå det aktive utvalet"
 
-#: ../app/actions/layers-actions.c:300
+#: ../app/actions/layers-actions.c:306
 msgid "Intersect the layer's alpha channel with the current selection"
 msgstr "Lag snitt mellom alfakanalen for laget og det aktive utvalet"
 
-#: ../app/actions/layers-actions.c:308
+#: ../app/actions/layers-actions.c:314
 msgid "_Text to Selection"
 msgstr "_Tekst til utval"
 
-#: ../app/actions/layers-actions.c:309
+#: ../app/actions/layers-actions.c:315
 msgid "Replace the selection with the text layer's outline"
 msgstr "Bytt ut utvalet med omrisset av tekstlaget"
 
-#: ../app/actions/layers-actions.c:315
+#: ../app/actions/layers-actions.c:321
 msgid "Add the text layer's outline to the current selection"
 msgstr "Legg omrisset av tekstlaget til det aktive utvalet"
 
-#: ../app/actions/layers-actions.c:321
+#: ../app/actions/layers-actions.c:327
 msgid "Subtract the text layer's outline from the current selection"
 msgstr "Trekk omrisset av tekstlaget frå det aktive utvalet"
 
-#: ../app/actions/layers-actions.c:327
+#: ../app/actions/layers-actions.c:333
 msgid "Intersect the text layer's outline with the current selection"
 msgstr "Lag snitt melom omrisset av tekstlaget og det aktive utvalet"
 
-#: ../app/actions/layers-actions.c:335
+#: ../app/actions/layers-actions.c:341
 msgid "Select _Top Layer"
 msgstr "Vel det _øvste laget"
 
-#: ../app/actions/layers-actions.c:336
+#: ../app/actions/layers-actions.c:342
 msgid "Select the topmost layer"
 msgstr "Vel det øvste laget"
 
-#: ../app/actions/layers-actions.c:341
+#: ../app/actions/layers-actions.c:347
 msgid "Select _Bottom Layer"
 msgstr "Vel det n_edste laget"
 
-#: ../app/actions/layers-actions.c:342
+#: ../app/actions/layers-actions.c:348
 msgid "Select the bottommost layer"
 msgstr "Vel det n_edste laget"
 
-#: ../app/actions/layers-actions.c:347
+#: ../app/actions/layers-actions.c:353
 msgid "Select _Previous Layer"
 msgstr "Vel det _førre laget"
 
-#: ../app/actions/layers-actions.c:348
+#: ../app/actions/layers-actions.c:354
 msgid "Select the layer above the current layer"
 msgstr "Vel laget over det gjeldande laget"
 
-#: ../app/actions/layers-actions.c:353
+#: ../app/actions/layers-actions.c:359
 msgid "Select _Next Layer"
 msgstr "Vel det _neste laget"
 
-#: ../app/actions/layers-actions.c:354
+#: ../app/actions/layers-actions.c:360
 msgid "Select the layer below the current layer"
 msgstr "Vel laget under det gjeldande laget"
 
-#: ../app/actions/layers-actions.c:362
+#: ../app/actions/layers-actions.c:368
 msgid "Set Opacity"
 msgstr "Set dekkevne"
 
-#: ../app/actions/layers-commands.c:202
+#: ../app/actions/layers-commands.c:203
 msgid "Layer Attributes"
 msgstr "Laginnstillingane"
 
-#: ../app/actions/layers-commands.c:205
+#: ../app/actions/layers-commands.c:206
 msgid "Edit Layer Attributes"
 msgstr "Rediger lagattributta"
 
-#: ../app/actions/layers-commands.c:248 ../app/actions/layers-commands.c:250
-#: ../app/actions/layers-commands.c:318 ../app/actions/layers-commands.c:322
+#: ../app/actions/layers-commands.c:249
+#: ../app/actions/layers-commands.c:251
+#: ../app/actions/layers-commands.c:319
+#: ../app/actions/layers-commands.c:323
 #: ../app/widgets/gimpdrawabletreeview.c:326
-#: ../app/widgets/gimplayertreeview.c:836
+#: ../app/widgets/gimplayertreeview.c:835
 msgid "New Layer"
 msgstr "Nytt lag"
 
-#: ../app/actions/layers-commands.c:253
+#: ../app/actions/layers-commands.c:254
 msgid "Create a New Layer"
 msgstr "Opprett eit nytt lag"
 
-#: ../app/actions/layers-commands.c:549
+#: ../app/actions/layers-commands.c:352
+#| msgid "_Visible"
+msgid "Visible"
+msgstr "Synleg"
+
+#: ../app/actions/layers-commands.c:571
 msgid "Set Layer Boundary Size"
 msgstr "Skriv storleik på laggrense"
 
-#: ../app/actions/layers-commands.c:590 ../app/core/gimplayer.c:251
+#: ../app/actions/layers-commands.c:612
+#: ../app/core/gimplayer.c:251
 msgid "Scale Layer"
 msgstr "Skaler laget"
 
-#: ../app/actions/layers-commands.c:627
+#: ../app/actions/layers-commands.c:649
 msgid "Crop Layer"
 msgstr "Beskjer laget"
 
-#: ../app/actions/layers-commands.c:766
+#: ../app/actions/layers-commands.c:788
 msgid "Layer Mask to Selection"
 msgstr "Lagmaske til utval"
 
-#: ../app/actions/layers-commands.c:1014
+#: ../app/actions/layers-commands.c:1036
 msgid "Please select a channel first"
 msgstr "Vel først ein kanal"
 
-#: ../app/actions/layers-commands.c:1022 ../app/core/gimplayer.c:1277
+#: ../app/actions/layers-commands.c:1044
+#: ../app/core/gimplayer.c:1282
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "Legg til lagmaske"
@@ -3067,7 +3163,7 @@ msgstr "Ny palett"
 
 #: ../app/actions/palettes-actions.c:54
 msgid "_Import Palette..."
-msgstr "_Importer palett..."
+msgstr "_Importer palett …"
 
 #: ../app/actions/palettes-actions.c:55
 msgid "Import palette"
@@ -3083,7 +3179,7 @@ msgstr "Dupliser paletten"
 
 #: ../app/actions/palettes-actions.c:66
 msgid "_Merge Palettes..."
-msgstr "_Flett saman palettane..."
+msgstr "_Flett saman palettane …"
 
 #: ../app/actions/palettes-actions.c:67
 msgid "Merge palettes"
@@ -3115,7 +3211,7 @@ msgstr "Oppdater palettane"
 
 #: ../app/actions/palettes-actions.c:93
 msgid "_Edit Palette..."
-msgstr "R_ediger paletten..."
+msgstr "R_ediger paletten …"
 
 #: ../app/actions/palettes-actions.c:94
 msgid "Edit palette"
@@ -3183,7 +3279,7 @@ msgstr "Oppdater mønsterelementa"
 
 #: ../app/actions/patterns-actions.c:86
 msgid "_Edit Pattern..."
-msgstr "R_ediger mønsterelementet..."
+msgstr "R_ediger mønsterelementet …"
 
 #: ../app/actions/patterns-actions.c:87
 msgid "Edit pattern"
@@ -3195,7 +3291,7 @@ msgstr "Filt_er"
 
 #: ../app/actions/plug-in-actions.c:84
 msgid "Recently Used"
-msgstr "Nyleg brukte"
+msgstr "Tidlegare brukte"
 
 #: ../app/actions/plug-in-actions.c:85
 msgid "_Blur"
@@ -3203,7 +3299,7 @@ msgstr "_Sløring"
 
 #: ../app/actions/plug-in-actions.c:86
 msgid "_Noise"
-msgstr "_Støy"
+msgstr "Stø_y"
 
 #: ../app/actions/plug-in-actions.c:87
 msgid "Edge-De_tect"
@@ -3219,7 +3315,7 @@ msgstr "K_ombiner"
 
 #: ../app/actions/plug-in-actions.c:90
 msgid "_Generic"
-msgstr "Ge_nerelt"
+msgstr "_Uspesifiserte"
 
 #: ../app/actions/plug-in-actions.c:91
 msgid "_Light and Shadow"
@@ -3233,65 +3329,69 @@ msgstr "For_vrengningar"
 msgid "_Artistic"
 msgstr "_Artistisk"
 
-#: ../app/actions/plug-in-actions.c:95
+#: ../app/actions/plug-in-actions.c:94
+msgid "_Decor"
+msgstr "_Dekor"
+
+#: ../app/actions/plug-in-actions.c:96
 msgid "_Render"
 msgstr "_Teikningar"
 
-#: ../app/actions/plug-in-actions.c:96
+#: ../app/actions/plug-in-actions.c:97
 msgid "_Clouds"
 msgstr "_Skyer"
 
-#: ../app/actions/plug-in-actions.c:97
+#: ../app/actions/plug-in-actions.c:98
 msgid "_Nature"
 msgstr "N_atur"
 
-#: ../app/actions/plug-in-actions.c:99
+#: ../app/actions/plug-in-actions.c:100
 msgid "_Web"
 msgstr "_Nettsider"
 
-#: ../app/actions/plug-in-actions.c:100
+#: ../app/actions/plug-in-actions.c:101
 msgid "An_imation"
-msgstr "An_imasjon"
-
-#: ../app/actions/plug-in-actions.c:103
-msgid "Reset all _Filters"
-msgstr "Tilbakestill _alle filtra"
+msgstr "Ani_masjon"
 
 #: ../app/actions/plug-in-actions.c:104
+msgid "Reset all _Filters"
+msgstr "Tilbakestill alle _filtra"
+
+#: ../app/actions/plug-in-actions.c:105
 msgid "Reset all plug-ins to their default settings"
 msgstr "Tilbakestill alle programtillegga til standardinnstillingane"
 
-#: ../app/actions/plug-in-actions.c:112
+#: ../app/actions/plug-in-actions.c:113
 msgid "Re_peat Last"
 msgstr "_Gjenta siste"
 
-#: ../app/actions/plug-in-actions.c:113
+#: ../app/actions/plug-in-actions.c:114
 msgid "Rerun the last used plug-in using the same settings"
 msgstr "Køyr det sist brukte programtillegget med dei same innstillingane"
 
-#: ../app/actions/plug-in-actions.c:118
+#: ../app/actions/plug-in-actions.c:119
 msgid "R_e-Show Last"
 msgstr "Vis siste _igjen"
 
-#: ../app/actions/plug-in-actions.c:119
+#: ../app/actions/plug-in-actions.c:120
 msgid "Show the last used plug-in dialog again"
 msgstr "Vis dialogvindauget for det sist brukte programtillegget igjen"
 
-#: ../app/actions/plug-in-actions.c:502
+#: ../app/actions/plug-in-actions.c:503
 #, c-format
 msgid "Re_peat \"%s\""
 msgstr "_Gjenta «%s»"
 
-#: ../app/actions/plug-in-actions.c:503
+#: ../app/actions/plug-in-actions.c:504
 #, c-format
 msgid "R_e-Show \"%s\""
 msgstr "Vis «%s» igjen"
 
-#: ../app/actions/plug-in-actions.c:517
+#: ../app/actions/plug-in-actions.c:520
 msgid "Repeat Last"
 msgstr "Gjenta siste"
 
-#: ../app/actions/plug-in-actions.c:519
+#: ../app/actions/plug-in-actions.c:522
 msgid "Re-Show Last"
 msgstr "Vis siste igjen"
 
@@ -3301,8 +3401,7 @@ msgstr "Tilbakestill alle filtra"
 
 #: ../app/actions/plug-in-commands.c:281
 msgid "Do you really want to reset all filters to default values?"
-msgstr ""
-"Er du sikker på at du vil setje alle filtra tilbake til standardverdiane?"
+msgstr "Er du sikker på at du vil setje alle filtra tilbake til standardverdiane?"
 
 #: ../app/actions/quick-mask-actions.c:42
 msgid "Quick Mask Menu"
@@ -3310,14 +3409,14 @@ msgstr "Snarmaskemeny"
 
 #: ../app/actions/quick-mask-actions.c:46
 msgid "_Configure Color and Opacity..."
-msgstr "_Still inn farge og dekkevne..."
+msgstr "_Still inn farge og dekkevne …"
 
 #: ../app/actions/quick-mask-actions.c:54
 msgid "Toggle _Quick Mask"
 msgstr "Slå  _snarmaska av/på"
 
 #: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplayshell.c:1169
 msgid "Toggle Quick Mask"
 msgstr "Slå av/på snarmaske"
 
@@ -3351,15 +3450,15 @@ msgstr "Menyen for prøvepunkta"
 
 #: ../app/actions/select-actions.c:44
 msgid "Selection Editor Menu"
-msgstr "Meny for utvalsbehandlaren"
+msgstr "Meny for utvalshandteraren"
 
 #: ../app/actions/select-actions.c:47
 msgid "_Select"
-msgstr "_Vel"
+msgstr "_Utval"
 
 #: ../app/actions/select-actions.c:50
 msgid "select|_All"
-msgstr "_Alt"
+msgstr "Vel _alt"
 
 #: ../app/actions/select-actions.c:51
 msgid "Select everything"
@@ -3367,7 +3466,7 @@ msgstr "Vel allt"
 
 #: ../app/actions/select-actions.c:56
 msgid "select|_None"
-msgstr "_Ingen"
+msgstr "Vel _ingen"
 
 #: ../app/actions/select-actions.c:57
 msgid "Dismiss the selection"
@@ -3391,7 +3490,7 @@ msgstr "Opprett eit flytande utval"
 
 #: ../app/actions/select-actions.c:74
 msgid "Fea_ther..."
-msgstr "F_jørkant..."
+msgstr "_Mjuk kant …"
 
 #: ../app/actions/select-actions.c:75
 msgid "Blur the selection border so that it fades out smoothly"
@@ -3407,7 +3506,7 @@ msgstr "Gjer utvalet skarpare ved å fjerna uskarpe område"
 
 #: ../app/actions/select-actions.c:86
 msgid "S_hrink..."
-msgstr "_Krymp..."
+msgstr "_Krymp …"
 
 #: ../app/actions/select-actions.c:87
 msgid "Contract the selection"
@@ -3415,7 +3514,7 @@ msgstr "Trekk saman utvalet"
 
 #: ../app/actions/select-actions.c:92
 msgid "_Grow..."
-msgstr "_Auk..."
+msgstr "_Auk …"
 
 #: ../app/actions/select-actions.c:93
 msgid "Enlarge the selection"
@@ -3423,7 +3522,7 @@ msgstr "Forstørr utvalet"
 
 #: ../app/actions/select-actions.c:98
 msgid "Bo_rder..."
-msgstr "_Ramme..."
+msgstr "_Ramme …"
 
 #: ../app/actions/select-actions.c:99
 msgid "Replace the selection by its border"
@@ -3439,7 +3538,7 @@ msgstr "Lagra utvalet til kanal"
 
 #: ../app/actions/select-actions.c:110
 msgid "_Stroke Selection..."
-msgstr "_Strek opp utvalet..."
+msgstr "_Strek opp utvalet …"
 
 #: ../app/actions/select-actions.c:111
 msgid "Paint along the selection outline"
@@ -3453,15 +3552,17 @@ msgstr "_Strek opp utvalet"
 msgid "Stroke the selection with last used values"
 msgstr "Strek opp utvalet med dei sist brukte verdiane"
 
-#: ../app/actions/select-commands.c:153 ../app/core/gimpselection.c:167
+#: ../app/actions/select-commands.c:153
+#: ../app/core/gimpselection.c:167
 msgid "Feather Selection"
-msgstr "Fjørkant"
+msgstr "Mjuke kantar"
 
 #: ../app/actions/select-commands.c:157
 msgid "Feather selection by"
-msgstr "Breidda på fjørkanten"
+msgstr "Breidda på den mjuke kanten"
 
-#: ../app/actions/select-commands.c:191 ../app/core/gimpselection.c:174
+#: ../app/actions/select-commands.c:191
+#: ../app/core/gimpselection.c:174
 msgid "Shrink Selection"
 msgstr "Krymp utvalet"
 
@@ -3473,7 +3574,8 @@ msgstr "Krymp utvalet med"
 msgid "_Shrink from image border"
 msgstr "Krymp frå biletetkanten"
 
-#: ../app/actions/select-commands.c:228 ../app/core/gimpselection.c:173
+#: ../app/actions/select-commands.c:228
+#: ../app/core/gimpselection.c:173
 msgid "Grow Selection"
 msgstr "Auk utvalet"
 
@@ -3481,7 +3583,8 @@ msgstr "Auk utvalet"
 msgid "Grow selection by"
 msgstr "Auk utvalet med"
 
-#: ../app/actions/select-commands.c:255 ../app/core/gimpselection.c:172
+#: ../app/actions/select-commands.c:255
+#: ../app/core/gimpselection.c:172
 msgid "Border Selection"
 msgstr "Lag ramme av utvalet"
 
@@ -3492,20 +3595,23 @@ msgstr "Rammebreidde"
 #. Feather button
 #: ../app/actions/select-commands.c:268
 msgid "_Feather border"
-msgstr "_Fjørkant"
+msgstr "_Mjuk kant"
 
 #. Edge lock button
 #: ../app/actions/select-commands.c:281
 msgid "_Lock selection to image edges"
 msgstr "_Lås utvalet til biletkantane"
 
-#: ../app/actions/select-commands.c:330 ../app/actions/select-commands.c:362
-#: ../app/actions/vectors-commands.c:379 ../app/actions/vectors-commands.c:412
-#: ../app/dialogs/stroke-dialog.c:285
+#: ../app/actions/select-commands.c:330
+#: ../app/actions/select-commands.c:362
+#: ../app/actions/vectors-commands.c:379
+#: ../app/actions/vectors-commands.c:412
+#: ../app/dialogs/stroke-dialog.c:299
 msgid "There is no active layer or channel to stroke to."
 msgstr "Det er ingen aktive lag eller kanalar å teikna på."
 
-#: ../app/actions/select-commands.c:336 ../app/core/gimpselection.c:151
+#: ../app/actions/select-commands.c:336
+#: ../app/core/gimpselection.c:151
 msgid "Stroke Selection"
 msgstr "Strek opp utvalet"
 
@@ -3514,8 +3620,9 @@ msgid "Templates Menu"
 msgstr "Malmeny"
 
 #: ../app/actions/templates-actions.c:46
-msgid "_Create Image from Template..."
-msgstr "_Opprett bilete frå mal..."
+#| msgid "_Create Image from Template..."
+msgid "_Create Image from Template"
+msgstr "_Opprett bilete frå mal"
 
 #: ../app/actions/templates-actions.c:47
 msgid "Create a new image from the selected template"
@@ -3523,7 +3630,7 @@ msgstr "Opprett eit nytt bilete frå den valde malen"
 
 #: ../app/actions/templates-actions.c:52
 msgid "_New Template..."
-msgstr "_Ny mal..."
+msgstr "_Ny mal …"
 
 #: ../app/actions/templates-actions.c:53
 msgid "Create a new template"
@@ -3531,7 +3638,7 @@ msgstr "Opprett ein ny mal"
 
 #: ../app/actions/templates-actions.c:58
 msgid "D_uplicate Template..."
-msgstr "_Dupliser malen..."
+msgstr "_Dupliser malen …"
 
 #: ../app/actions/templates-actions.c:59
 msgid "Duplicate the selected template"
@@ -3539,7 +3646,7 @@ msgstr "Dupliser den valde malen"
 
 #: ../app/actions/templates-actions.c:64
 msgid "_Edit Template..."
-msgstr "_Rediger malen..."
+msgstr "_Rediger malen …"
 
 #: ../app/actions/templates-actions.c:65
 msgid "Edit the selected template"
@@ -3553,27 +3660,26 @@ msgstr "_Slett malen"
 msgid "Delete the selected template"
 msgstr "Slett den valde malen"
 
-#: ../app/actions/templates-commands.c:121
+#: ../app/actions/templates-commands.c:113
 msgid "New Template"
 msgstr "Ny mal"
 
-#: ../app/actions/templates-commands.c:124
+#: ../app/actions/templates-commands.c:116
 msgid "Create a New Template"
 msgstr "Opprett ein ny mal"
 
-#: ../app/actions/templates-commands.c:183
-#: ../app/actions/templates-commands.c:186
+#: ../app/actions/templates-commands.c:175
+#: ../app/actions/templates-commands.c:178
 msgid "Edit Template"
 msgstr "Rediger mal"
 
-#: ../app/actions/templates-commands.c:221
+#: ../app/actions/templates-commands.c:213
 msgid "Delete Template"
 msgstr "Slett malen"
 
-#: ../app/actions/templates-commands.c:247
+#: ../app/actions/templates-commands.c:239
 #, c-format
-msgid ""
-"Are you sure you want to delete template '%s' from the list and from disk?"
+msgid "Are you sure you want to delete template '%s' from the list and from disk?"
 msgstr "Er du sikker på at du vil slette malen «%s» frå lista og frå disken?"
 
 #: ../app/actions/text-editor-actions.c:44
@@ -3584,7 +3690,8 @@ msgstr "Opna"
 msgid "Load text from file"
 msgstr "Hent tekst frå fil"
 
-#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:445
+#: ../app/actions/text-editor-actions.c:50
+#: ../app/core/gimp-edit.c:445
 msgid "Clear"
 msgstr "Tøm"
 
@@ -3596,7 +3703,7 @@ msgstr "Fjern all tekst"
 msgid "LTR"
 msgstr "VTH"
 
-#: ../app/actions/text-editor-actions.c:60 ../app/text/text-enums.c:51
+#: ../app/actions/text-editor-actions.c:60
 msgid "From left to right"
 msgstr "Frå venstre til høgre"
 
@@ -3604,7 +3711,7 @@ msgstr "Frå venstre til høgre"
 msgid "RTL"
 msgstr "HTV"
 
-#: ../app/actions/text-editor-actions.c:66 ../app/text/text-enums.c:52
+#: ../app/actions/text-editor-actions.c:66
 msgid "From right to left"
 msgstr "Frå høgre til venstre"
 
@@ -3613,14 +3720,23 @@ msgid "Open Text File (UTF-8)"
 msgstr "Opna tekstfil (UTF-8)"
 
 #: ../app/actions/text-editor-commands.c:144
-#: ../app/config/gimpconfig-file.c:59 ../app/core/gimpbrush-load.c:140
-#: ../app/core/gimpbrush-load.c:420 ../app/core/gimpbrushgenerated-load.c:73
-#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:56
-#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:271 ../app/core/gimppalette-load.c:315
-#: ../app/core/gimppalette-load.c:369 ../app/core/gimppalette-load.c:457
-#: ../app/core/gimppalette-load.c:600 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpimagemaptool.c:837 ../app/xcf/xcf.c:329
+#: ../app/config/gimpconfig-file.c:59
+#: ../app/core/gimpbrush-load.c:140
+#: ../app/core/gimpbrush-load.c:420
+#: ../app/core/gimpbrushgenerated-load.c:73
+#: ../app/core/gimpbrushpipe-load.c:81
+#: ../app/core/gimpcurve-load.c:55
+#: ../app/core/gimpgradient-load.c:62
+#: ../app/core/gimppalette-load.c:76
+#: ../app/core/gimppalette-load.c:270
+#: ../app/core/gimppalette-load.c:314
+#: ../app/core/gimppalette-load.c:368
+#: ../app/core/gimppalette-load.c:456
+#: ../app/core/gimppalette-load.c:599
+#: ../app/core/gimppattern-load.c:76
+#: ../app/tools/gimpcurvestool.c:623
+#: ../app/tools/gimplevelstool.c:743
+#: ../app/xcf/xcf.c:329
 #, c-format
 msgid "Could not open '%s' for reading: %s"
 msgstr "Kunne ikkje opna «%s» for lesing: %s"
@@ -3647,7 +3763,7 @@ msgstr "_Slett lagra innstillingar"
 
 #: ../app/actions/tool-options-actions.c:76
 msgid "_New Entry..."
-msgstr "_Nytt innslag..."
+msgstr "_Nytt innslag …"
 
 #: ../app/actions/tool-options-actions.c:81
 msgid "R_eset Tool Options"
@@ -3659,7 +3775,7 @@ msgstr "Tilbakestill til dei førevalde verdiane"
 
 #: ../app/actions/tool-options-actions.c:87
 msgid "Reset _all Tool Options"
-msgstr "Tilbakestill _alle verktøyinnstillingane..."
+msgstr "Tilbakestill _alle verktøyinnstillingane …"
 
 #: ../app/actions/tool-options-actions.c:88
 msgid "Reset all tool options"
@@ -3693,9 +3809,7 @@ msgstr "Tilbakestill verktøyinnstillingane"
 
 #: ../app/actions/tool-options-commands.c:210
 msgid "Do you really want to reset all tool options to default values?"
-msgstr ""
-"Er du sikker på at du vil setje alle verktøyinnstillingane tilbake til dei "
-"førevalde verdiane?"
+msgstr "Er du sikker på at du vil setje alle verktøyinnstillingane tilbake til dei førevalde verdiane?"
 
 #: ../app/actions/tools-actions.c:47
 msgid "Tools Menu"
@@ -3775,7 +3889,7 @@ msgstr "Vel område med liknande fargar"
 
 #: ../app/actions/tools-actions.c:105
 msgid "_Arbitrary Rotation..."
-msgstr "_Valfri rotasjon..."
+msgstr "_Valfri rotasjon …"
 
 #: ../app/actions/tools-actions.c:106
 msgid "Rotate by an arbitrary angle"
@@ -3791,7 +3905,7 @@ msgstr "_Baneverktøyet"
 
 #: ../app/actions/vectors-actions.c:53
 msgid "_Edit Path Attributes..."
-msgstr "R_ediger baneattributta..."
+msgstr "R_ediger baneattributta …"
 
 #: ../app/actions/vectors-actions.c:54
 msgid "Edit path attributes"
@@ -3799,11 +3913,11 @@ msgstr "Rediger baneattributta"
 
 #: ../app/actions/vectors-actions.c:59
 msgid "_New Path..."
-msgstr "_Ny bane..."
+msgstr "_Ny bane …"
 
 #: ../app/actions/vectors-actions.c:60
 msgid "New path..."
-msgstr "Ny bane..."
+msgstr "Ny bane …"
 
 #: ../app/actions/vectors-actions.c:65
 msgid "_New Path"
@@ -3825,7 +3939,8 @@ msgstr "Dupliser banen"
 msgid "_Delete Path"
 msgstr "_Slett bane"
 
-#: ../app/actions/vectors-actions.c:78 ../app/core/core-enums.c:920
+#: ../app/actions/vectors-actions.c:78
+#: ../app/core/core-enums.c:920
 msgid "Delete path"
 msgstr "Slett bane"
 
@@ -3867,7 +3982,7 @@ msgstr "Senk banen til botnen"
 
 #: ../app/actions/vectors-actions.c:112
 msgid "Stro_ke Path..."
-msgstr "_Strek opp banen..."
+msgstr "_Strek opp banen …"
 
 #: ../app/actions/vectors-actions.c:113
 msgid "Paint along the path"
@@ -3891,17 +4006,18 @@ msgstr "Lim inn _banen"
 
 #: ../app/actions/vectors-actions.c:134
 msgid "E_xport Path..."
-msgstr "_Eksporter banen..."
+msgstr "_Eksporter banen …"
 
 #: ../app/actions/vectors-actions.c:139
 msgid "I_mport Path..."
-msgstr "_Importer bane..."
+msgstr "_Importer bane …"
 
 #: ../app/actions/vectors-actions.c:162
 msgid "Path to Sele_ction"
 msgstr "Bane til _utval"
 
-#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1876
+#: ../app/actions/vectors-actions.c:163
+#: ../app/tools/gimpvectortool.c:1912
 msgid "Path to selection"
 msgstr "Bane til utval"
 
@@ -3913,7 +4029,8 @@ msgstr "_Frå bane"
 msgid "Add"
 msgstr "Legg til"
 
-#: ../app/actions/vectors-actions.c:180 ../app/base/base-enums.c:119
+#: ../app/actions/vectors-actions.c:180
+#: ../app/base/base-enums.c:119
 msgid "Subtract"
 msgstr "Trekk frå"
 
@@ -3925,7 +4042,8 @@ msgstr "Snitt"
 msgid "Selecti_on to Path"
 msgstr "Utval til _bane"
 
-#: ../app/actions/vectors-actions.c:195 ../app/actions/vectors-actions.c:201
+#: ../app/actions/vectors-actions.c:195
+#: ../app/actions/vectors-actions.c:201
 msgid "Selection to path"
 msgstr "Utval til bane"
 
@@ -3949,7 +4067,8 @@ msgstr "Baneeigenskapane"
 msgid "Edit Path Attributes"
 msgstr "Rediger baneeigenskapane"
 
-#: ../app/actions/vectors-commands.c:165 ../app/actions/vectors-commands.c:166
+#: ../app/actions/vectors-commands.c:165
+#: ../app/actions/vectors-commands.c:166
 #: ../app/actions/vectors-commands.c:188
 msgid "New Path"
 msgstr "Ny bane"
@@ -3958,13 +4077,16 @@ msgstr "Ny bane"
 msgid "New Path Options"
 msgstr "Innstillingar for ny bane"
 
-#: ../app/actions/vectors-commands.c:305 ../app/pdb/paths_cmds.c:627
-#: ../app/pdb/vectors_cmds.c:1145
+#: ../app/actions/vectors-commands.c:305
+#: ../app/pdb/paths-cmds.c:640
+#: ../app/pdb/vectors-cmds.c:1253
 msgid "Path to Selection"
 msgstr "Bane til utval"
 
-#: ../app/actions/vectors-commands.c:385 ../app/tools/gimpvectoroptions.c:199
-#: ../app/tools/gimpvectortool.c:1909 ../app/vectors/gimpvectors.c:199
+#: ../app/actions/vectors-commands.c:385
+#: ../app/tools/gimpvectoroptions.c:199
+#: ../app/tools/gimpvectortool.c:1945
+#: ../app/vectors/gimpvectors.c:200
 msgid "Stroke Path"
 msgstr "Strek opp bane"
 
@@ -4009,11 +4131,11 @@ msgid "Fi_ll Window"
 msgstr "Fy_ll vindauget"
 
 #: ../app/actions/view-actions.c:94
-#, fuzzy
 msgid "Adjust the zoom ratio so that the entire window is used"
 msgstr "Tilpass forstørringa slik at heile vindauget blir brukt"
 
-#: ../app/actions/view-actions.c:99 ../app/actions/view-actions.c:575
+#: ../app/actions/view-actions.c:99
+#: ../app/actions/view-actions.c:579
 msgid "Re_vert Zoom"
 msgstr "Tilbakestill _forstørringa"
 
@@ -4031,7 +4153,7 @@ msgstr "Vis eit oversynsvindauge for dette biletet"
 
 #: ../app/actions/view-actions.c:111
 msgid "Display _Filters..."
-msgstr "_Visingsfiltra..."
+msgstr "_Visingsfiltra …"
 
 #: ../app/actions/view-actions.c:112
 msgid "Configure filters applied to this view"
@@ -4271,7 +4393,7 @@ msgstr "Bruk farge frå dei mørke sjakkrutene"
 
 #: ../app/actions/view-actions.c:373
 msgid "Select _Custom Color..."
-msgstr "Vel _eigendefinert farge..."
+msgstr "Vel _eigendefinert farge …"
 
 #: ../app/actions/view-actions.c:374
 msgid "Use an arbitrary color"
@@ -4285,26 +4407,26 @@ msgstr "Som i _brukarvalet"
 msgid "Reset padding color to what's configured in preferences"
 msgstr "Set fyllfargen til slik han er sett opp i  brukarinnstillingane"
 
-#: ../app/actions/view-actions.c:567
+#: ../app/actions/view-actions.c:571
 #, c-format
 msgid "Re_vert Zoom (%d%%)"
 msgstr "_Tilbakestill forstørringa (%d%%)"
 
-#: ../app/actions/view-actions.c:704
+#: ../app/actions/view-actions.c:708
 #, c-format
 msgid "Othe_r (%s)..."
-msgstr "And_re (%s)..."
+msgstr "And_re (%s) …"
 
-#: ../app/actions/view-actions.c:713
+#: ../app/actions/view-actions.c:717
 #, c-format
 msgid "_Zoom (%s)"
 msgstr "_Forstørr (%s)"
 
-#: ../app/actions/view-commands.c:586
+#: ../app/actions/view-commands.c:613
 msgid "Set Canvas Padding Color"
 msgstr "Set lerretfargen"
 
-#: ../app/actions/view-commands.c:588
+#: ../app/actions/view-commands.c:615
 msgid "Set Custom Canvas Padding Color"
 msgstr "Vel eigendefinert lerretfarge"
 
@@ -4318,6 +4440,29 @@ msgstr "Skjerm %s"
 msgid "Move this window to screen %s"
 msgstr "Flytt dette vindauget til skjerm %s"
 
+#: ../app/actions/windows-actions.c:79
+#| msgid "Fi_ll Window"
+msgid "_Windows"
+msgstr "Vin_dauge"
+
+#: ../app/actions/windows-actions.c:80
+#| msgid "Recently Used"
+msgid "_Recently Closed Docks"
+msgstr "_Tidlegare lukka samlevindauge"
+
+#: ../app/actions/windows-actions.c:81
+#| msgid "Dockable"
+msgid "_Dockable Dialogs"
+msgstr "_Dialogvindauge"
+
+#: ../app/actions/windows-actions.c:84
+msgid "Tool_box"
+msgstr "Verktøykassa"
+
+#: ../app/actions/windows-actions.c:85
+msgid "Raise the toolbox"
+msgstr "Løft verktøykassa på skjermen"
+
 #: ../app/base/base-enums.c:23
 msgid "Smooth"
 msgstr "Glatt"
@@ -4326,26 +4471,30 @@ msgstr "Glatt"
 msgid "Freehand"
 msgstr "Frihand"
 
-#: ../app/base/base-enums.c:55 ../app/base/base-enums.c:125
+#: ../app/base/base-enums.c:55
+#: ../app/base/base-enums.c:125
 #: ../app/core/core-enums.c:1202
 msgid "Value"
 msgstr "Verdi"
 
-#: ../app/base/base-enums.c:56 ../app/core/core-enums.c:1197
-#: ../app/tools/gimpcolorbalancetool.c:290
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/base/base-enums.c:56
+#: ../app/core/core-enums.c:1197
+#: ../app/tools/gimpcolorbalancetool.c:296
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "Red"
 msgstr "Raud"
 
-#: ../app/base/base-enums.c:57 ../app/core/core-enums.c:1198
-#: ../app/tools/gimpcolorbalancetool.c:299
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/base/base-enums.c:57
+#: ../app/core/core-enums.c:1198
+#: ../app/tools/gimpcolorbalancetool.c:305
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "Green"
 msgstr "Grøn"
 
-#: ../app/base/base-enums.c:58 ../app/core/core-enums.c:1199
-#: ../app/tools/gimpcolorbalancetool.c:308
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/base/base-enums.c:58
+#: ../app/core/core-enums.c:1199
+#: ../app/tools/gimpcolorbalancetool.c:314
+#: ../app/tools/gimphuesaturationtool.c:256
 msgid "Blue"
 msgstr "Blå"
 
@@ -4353,7 +4502,8 @@ msgstr "Blå"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:226
+#: ../app/base/base-enums.c:60
+#: ../app/display/gimpdisplayshell-title.c:233
 #: ../app/widgets/widgets-enums.c:84
 msgid "RGB"
 msgstr "RGB"
@@ -4398,15 +4548,18 @@ msgstr "Gjer bare mørkare"
 msgid "Lighten only"
 msgstr "Gjer bare lysare"
 
-#: ../app/base/base-enums.c:122 ../app/core/core-enums.c:1200
+#: ../app/base/base-enums.c:122
+#: ../app/core/core-enums.c:1200
 msgid "Hue"
 msgstr "Kulør"
 
-#: ../app/base/base-enums.c:123 ../app/core/core-enums.c:1201
+#: ../app/base/base-enums.c:123
+#: ../app/core/core-enums.c:1201
 msgid "Saturation"
 msgstr "Metning"
 
-#: ../app/base/base-enums.c:124 ../app/tools/gimppaintoptions-gui.c:313
+#: ../app/base/base-enums.c:124
+#: ../app/tools/gimppaintoptions-gui.c:174
 msgid "Color"
 msgstr "Farge"
 
@@ -4455,67 +4608,55 @@ msgid "Anti erase"
 msgstr "Visk inn"
 
 #: ../app/base/tile-swap.c:553
-msgid ""
-"Unable to open swap file. GIMP has run out of memory and cannot use the swap "
-"file. Some parts of your images may be corrupted. Try to save your work "
-"using different filenames, restart GIMP and check the location of the swap "
-"directory in your Preferences."
-msgstr ""
-"Fekk ikkje opna mellomlagringsfila. GIMP har gått tom for minne og sidan "
-"mellomlagringsfila er utilgjengeleg kan deler av biletet vere øydelagte. "
-"Prøv å lagra alt arbeidet ved å bruke eit anna filnamn og start GIMP på "
-"nytt. Kontroller deretter innstillingane dine for mellomlagringsmappa."
+msgid "Unable to open swap file. GIMP has run out of memory and cannot use the swap file. Some parts of your images may be corrupted. Try to save your work using different filenames, restart GIMP and check the location of the swap directory in your Preferences."
+msgstr "Fekk ikkje opna mellomlagringsfila. GIMP har gått tom for minne og sidan mellomlagringsfila er utilgjengeleg kan deler av biletet vere øydelagte. Prøv å lagra alt arbeidet ved å bruke eit anna filnamn og start GIMP på nytt. Kontroller deretter innstillingane dine for mellomlagringsmappa."
 
 #: ../app/base/tile-swap.c:568
 #, c-format
 msgid "Failed to resize swap file: %s"
 msgstr "Kunne ikkje tilbakestilla storleiken på mellomlagringsfila: %s"
 
-#: ../app/config/gimpconfig-file.c:68 ../app/core/gimpbrushgenerated-save.c:63
-#: ../app/core/gimpcurve-save.c:53 ../app/core/gimpgradient-save.c:51
-#: ../app/core/gimpgradient-save.c:145 ../app/core/gimppalette-save.c:56
-#: ../app/gui/themes.c:239 ../app/tools/gimpimagemaptool.c:836
-#: ../app/vectors/gimpvectors-export.c:83 ../app/xcf/xcf.c:421
+#: ../app/config/gimpconfig-file.c:68
+#: ../app/core/gimpbrushgenerated-save.c:63
+#: ../app/core/gimpcurve-save.c:53
+#: ../app/core/gimpgradient-save.c:51
+#: ../app/core/gimpgradient-save.c:145
+#: ../app/core/gimppalette-save.c:56
+#: ../app/gui/themes.c:239
+#: ../app/tools/gimpcurvestool.c:676
+#: ../app/tools/gimplevelstool.c:796
+#: ../app/vectors/gimpvectors-export.c:83
+#: ../app/xcf/xcf.c:422
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Kan ikkje opna «%s» for skriving: %s"
 
-#: ../app/config/gimpconfig-file.c:79 ../app/config/gimpconfig-file.c:102
+#: ../app/config/gimpconfig-file.c:79
+#: ../app/config/gimpconfig-file.c:102
 #, c-format
 msgid "Error writing '%s': %s"
 msgstr "Feil ved skriving til «%s»: %s"
 
-#: ../app/config/gimpconfig-file.c:90 ../app/tools/gimpimagemaptool.c:869
+#: ../app/config/gimpconfig-file.c:90
 #, c-format
 msgid "Error reading '%s': %s"
 msgstr "Feil ved lesing av «%s»: %s"
 
 #: ../app/config/gimpconfig-file.c:132
 #, c-format
-msgid ""
-"There was an error parsing your '%s' file. Default values will be used. A "
-"backup of your configuration has been created at '%s'."
-msgstr ""
-"Det oppsto ein feil ved tolkinga av «%s»-fila. Bruker standardverdiar i "
-"staden. Det er laga ein reservekopi av innstillingane på «%s»."
+msgid "There was an error parsing your '%s' file. Default values will be used. A backup of your configuration has been created at '%s'."
+msgstr "Det oppsto ein feil ved tolkinga av «%s»-fila. Bruker standardverdiar i staden. Det er laga ein reservekopi av innstillingane på «%s»."
 
 #. Not all strings defined here are used in the user interface
 #. *  (the preferences dialog mainly) and only those that are should
 #. *  be marked for translation.
 #.
 #: ../app/config/gimprc-blurbs.h:13
-msgid ""
-"When enabled, an image will become the active image when its image window "
-"receives the focus. This is useful for window managers using \"click to focus"
-"\"."
-msgstr ""
-"Dersom denne er aktivisert, vil eit bilete bli det aktive bilete når det får "
-"fokus. Kan vere nyttig når vindaugehandteraren bruker «klikk for fokus»."
+msgid "When enabled, an image will become the active image when its image window receives the focus. This is useful for window managers using \"click to focus\"."
+msgstr "Dersom denne er aktivert, vil eit bilete bli det aktive bilete når det får fokus. Kan vere nyttig når vindaugehandteraren bruker «klikk for fokus»."
 
 #: ../app/config/gimprc-blurbs.h:23
-msgid ""
-"Sets the canvas padding color used if the padding mode is set to custom "
-"color."
+msgid "Sets the canvas padding color used if the padding mode is set to custom color."
 msgstr "Set lerretfargen dersom lerretmodus er sett til brukervald farge."
 
 #: ../app/config/gimprc-blurbs.h:27
@@ -4539,48 +4680,24 @@ msgid "Sets the type of mouse pointers to use."
 msgstr "Set kva type musepeikar som skal brukast"
 
 #: ../app/config/gimprc-blurbs.h:45
-msgid ""
-"Context-dependent mouse pointers are helpful.  They are enabled by default.  "
-"However, they require overhead that you may want to do without."
-msgstr ""
-"Markørar som viser innhaldet er greie å bruka. Dette er også standard. Dei "
-"krev likevel litt ekstra resursar, og du kan kople ut denne visinga dersom "
-"maskinen har problem."
+msgid "Context-dependent mouse pointers are helpful.  They are enabled by default.  However, they require overhead that you may want to do without."
+msgstr "Markørar som viser innhaldet er greie å bruka. Dette er også standard. Dei krev likevel litt ekstra resursar, og du kan kople ut denne visinga dersom maskinen har problem."
 
 #: ../app/config/gimprc-blurbs.h:53
-msgid ""
-"When enabled, this will ensure that each pixel of an image gets mapped to a "
-"pixel on the screen."
-msgstr ""
-"Dersom denne er aktivert, vil kvar piksel i biletet bli kopla til ein piksel "
-"på skjermen."
+msgid "When enabled, this will ensure that each pixel of an image gets mapped to a pixel on the screen."
+msgstr "Dersom denne er aktivert, vil kvar piksel i biletet bli kopla til ein piksel på skjermen."
 
 #: ../app/config/gimprc-blurbs.h:75
 msgid "This is the distance in pixels where Guide and Grid snapping activates."
-msgstr ""
-"Dette er avstanden (i pikslar) som skal til for å aktivere snapping til "
-"hjelpelinjene og rutenettet."
+msgstr "Dette er avstanden (i pikslar) som skal til for å aktivere snapping til hjelpelinjene og rutenettet."
 
 #: ../app/config/gimprc-blurbs.h:79
-msgid ""
-"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill "
-"algorithm.  The seed fill starts at the initially selected pixel and "
-"progresses in all directions until the difference of pixel intensity from "
-"the original is greater than a specified threshold. This value represents "
-"the default threshold."
-msgstr ""
-"Verktøy som tryllestaven og fargefylling finn områda ut frå ein "
-"«frøfyllingsalgoritme». Frøfyllinga byrjar på den valde pikselen og utvidar "
-"området i alle retningane til skilnaden mellom biletpikslane og "
-"originalpikselen blir større enn terskelverdien du har sett på førehand."
+msgid "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill algorithm.  The seed fill starts at the initially selected pixel and progresses in all directions until the difference of pixel intensity from the original is greater than a specified threshold. This value represents the default threshold."
+msgstr "Verktøy som tryllestaven og fargefylling finn områda ut frå ein «frøfyllingsalgoritme». Frøfyllinga byrjar på den valde pikselen og utvidar området i alle retningane til skilnaden mellom biletpikslane og originalpikselen blir større enn terskelverdien du har sett på førehand."
 
 #: ../app/config/gimprc-blurbs.h:92
-msgid ""
-"The window type hint that is set on dock windows. This may affect the way "
-"your window manager decorates and handles dock windows."
-msgstr ""
-"Tipset som dukkar opp i samlevindauge. Dette kan påverka måten "
-"vindaugehandteraren set opp og handterar desse vindauga på."
+msgid "The window type hint that is set on dock windows. This may affect the way your window manager decorates and handles dock windows."
+msgstr "Vindaugetype for samlevindauge. Dette kan påverka måten vindaugehandteraren set opp og handterar desse vindauga på."
 
 #: ../app/config/gimprc-blurbs.h:123
 msgid "When enabled, the selected brush will be used for all tools."
@@ -4607,436 +4724,263 @@ msgid "Sets the text to appear in image window titles."
 msgstr "Viser teksten som kjem fram i tittelfeltet for biletvindauget."
 
 #: ../app/config/gimprc-blurbs.h:160
-msgid ""
-"When enabled, this will ensure that the full image is visible after a file "
-"is opened, otherwise it will be displayed with a scale of 1:1."
-msgstr ""
-"Sikrar at heile biletet er synleg når det blir opna. Elles vil det bli vist "
-"i skala 1:1."
+msgid "When enabled, this will ensure that the full image is visible after a file is opened, otherwise it will be displayed with a scale of 1:1."
+msgstr "Sikrar at heile biletet er synleg når det blir opna. Elles vil det bli vist i skala 1:1."
 
 #: ../app/config/gimprc-blurbs.h:164
-msgid ""
-"Install a private colormap; might be useful on 8-bit (256 colors) displays."
-msgstr ""
-"Installer eit privat fargekart. Kan vere nyttig på 8-bit (256 fargar) skjerm."
+msgid "Install a private colormap; might be useful on 8-bit (256 colors) displays."
+msgstr "Installer eit privat fargekart. Kan vere nyttig på 8-bit (256 fargar) skjerm."
 
 #: ../app/config/gimprc-blurbs.h:167
-msgid ""
-"Sets the level of interpolation used for scaling and other transformations."
-msgstr ""
-"Bestemmer kva for interpolasjonsnivå brukt ved skalering og andre "
-"transformasjonar."
+msgid "Sets the level of interpolation used for scaling and other transformations."
+msgstr "Bestemmer kva for interpolasjonsnivå brukt ved skalering og andre transformasjonar."
 
 #: ../app/config/gimprc-blurbs.h:174
 msgid "How many recently opened image filenames to keep on the File menu."
-msgstr "Kor mange filnamn det skal visast i menyen for nyleg brukte filer."
+msgstr "Kor mange filnamn det skal visast i menyen for tidlegare brukte filer."
 
 #: ../app/config/gimprc-blurbs.h:177
-msgid ""
-"Speed of marching ants in the selection outline.  This value is in "
-"milliseconds (less time indicates faster marching)."
-msgstr ""
-"Farten til dei marsjerande maura i utvalsomrisset. Verdien blir oppgitt i "
-"millisekund (lågare verdi gir raskare marsjering)."
+msgid "Speed of marching ants in the selection outline.  This value is in milliseconds (less time indicates faster marching)."
+msgstr "Farten til dei marsjerande maura i utvalsomrisset. Verdien blir oppgitt i millisekund (lågare verdi gir raskare marsjering)."
 
 #: ../app/config/gimprc-blurbs.h:181
-msgid ""
-"GIMP will warn the user if an attempt is made to create an image that would "
-"take more memory than the size specified here."
-msgstr ""
-"GIMP vil åtvare brukaren om at det er forsøkt å oppretta eit bilete som vil "
-"bruke meir minne enn det som er spesifisert."
+msgid "GIMP will warn the user if an attempt is made to create an image that would take more memory than the size specified here."
+msgstr "GIMP vil åtvare brukaren om at det er forsøkt å oppretta eit bilete som vil bruke meir minne enn det som er spesifisert."
 
 #: ../app/config/gimprc-blurbs.h:185
 msgid "When enabled, GIMP will show mnemonics in menus."
 msgstr "Gjer at GIMP vil vise snarvegstastar i menyar."
 
 #: ../app/config/gimprc-blurbs.h:188
-msgid ""
-"Generally only a concern for 8-bit displays, this sets the minimum number of "
-"system colors allocated for GIMP."
-msgstr ""
-"Generelt bare for 8-bit-skjermar. Dette set minimum systemfargar som GIMP "
-"skal bruke."
+msgid "Generally only a concern for 8-bit displays, this sets the minimum number of system colors allocated for GIMP."
+msgstr "Generelt bare for 8-bit-skjermar. Dette set minimum systemfargar som GIMP skal bruke."
 
 #: ../app/config/gimprc-blurbs.h:198
-msgid ""
-"Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, "
-"forces the X server to be queried for both horizontal and vertical "
-"resolution information."
-msgstr ""
-"Set den horisontale oppløysinga til skjermen i punkt per tomme (dpi). Dersom "
-"denne blir sett til 0, blir X-tenaren bli tvungen til å spørje om "
-"informasjon både om horisontal og vertikal oppløysing."
+msgid "Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
+msgstr "Set den horisontale oppløysinga til skjermen i punkt per tomme (dpi). Dersom denne blir sett til 0, blir X-tenaren bli tvungen til å spørje om informasjon både om horisontal og vertikal oppløysing."
 
 #: ../app/config/gimprc-blurbs.h:203
-msgid ""
-"Sets the monitor's vertical resolution, in dots per inch.  If set to 0, "
-"forces the X server to be queried for both horizontal and vertical "
-"resolution information."
-msgstr ""
-"Set den vertikale oppløysinga til skjermen i punkt per tomme (dpi). Dersom "
-"denne blir sett til 0, blir X-tenaren bli tvungen til å spørje om "
-"informasjon både om horisontal og vertikal oppløysing."
+msgid "Sets the monitor's vertical resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
+msgstr "Set den vertikale oppløysinga til skjermen i punkt per tomme (dpi). Dersom denne blir sett til 0, blir X-tenaren bli tvungen til å spørje om informasjon både om horisontal og vertikal oppløysing."
 
 #: ../app/config/gimprc-blurbs.h:208
-msgid ""
-"If enabled, the move tool sets the edited layer or path as active.  This "
-"used to be the default behaviour in older versions."
-msgstr ""
-"Gjer at  flytteverktøyet set laget eller banen du redigerer til den den "
-"aktive. Dette var normalinnstillinga i tidlegare versjonar av GIMP."
+msgid "If enabled, the move tool sets the edited layer or path as active.  This used to be the default behaviour in older versions."
+msgstr "Gjer at  flytteverktøyet set laget eller banen du redigerer til den den aktive. Dette var normalinnstillinga i tidlegare versjonar av GIMP."
 
 #: ../app/config/gimprc-blurbs.h:212
-msgid ""
-"Sets the size of the navigation preview available in the lower right corner "
-"of the image window."
-msgstr ""
-"Storleiken på navigeringsvisinga som er synleg i det nedre, høgre hjørnet av "
-"biletvindauget."
+msgid "Sets the size of the navigation preview available in the lower right corner of the image window."
+msgstr "Storleiken på navigeringsvisinga som er synleg i det nedre, høgre hjørnet av biletvindauget."
 
 #: ../app/config/gimprc-blurbs.h:216
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "Bestemmer kor mange prosessorar GIMP skal prøve å bruke samstundes."
 
 #: ../app/config/gimprc-blurbs.h:229
-msgid ""
-"When enabled, the X server is queried for the mouse's current position on "
-"each motion event, rather than relying on the position hint.  This means "
-"painting with large brushes should be more accurate, but it may be slower.  "
-"Perversely, on some X servers enabling this option results in faster "
-"painting."
-msgstr ""
-"Er denne aktivert, vil x-tenaren bli spurd om posisjonen til musepeikaren "
-"ved kvar einaste rørsle i staden for å stole på posisjonshintet. Dette skal "
-"føre til at teikning med store penslar blir meir nøyaktig. Som oftast vil "
-"farten gå noe ned, men på enkelte x-tenarar aukar snodig nok farten. "
+msgid "When enabled, the X server is queried for the mouse's current position on each motion event, rather than relying on the position hint.  This means painting with large brushes should be more accurate, but it may be slower.  Perversely, on some X servers enabling this option results in faster painting."
+msgstr "Er denne aktivert, vil x-tenaren bli spurd om posisjonen til musepeikaren ved kvar einaste rørsle i staden for å stole på posisjonshintet. Dette skal føre til at teikning med store penslar blir meir nøyaktig. Som oftast vil farten gå noe ned, men på enkelte x-tenarar aukar snodig nok farten. "
 
 #: ../app/config/gimprc-blurbs.h:245
-msgid ""
-"Sets whether GIMP should create previews of layers and channels. Previews in "
-"the layers and channels dialog are nice to have but they can slow things "
-"down when working with large images."
-msgstr ""
-"Bestemmer om GIMP skal lage førehandsvisingar av lag og kanalar. Det kan "
-"vere greitt å ha førehandsvisingar i lag- og kanaldialogvindauget, men dei "
-"kan gjere at ting går tregare, særleg ved arbeid på store bilete."
+msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images."
+msgstr "Bestemmer om GIMP skal lage førehandsvisingar av lag og kanalar. Det kan vere greitt å ha førehandsvisingar i lag- og kanaldialogvindauget, men dei kan gjere at ting går tregare, særleg ved arbeid på store bilete."
 
 #: ../app/config/gimprc-blurbs.h:250
-msgid ""
-"Sets the preview size used for layers and channel previews in newly created "
-"dialogs."
-msgstr ""
-"Bestemmer standardstorleik på førehandsvising av lag og kanalar i nyoppretta "
-"dialogar."
+msgid "Sets the preview size used for layers and channel previews in newly created dialogs."
+msgstr "Bestemmer standardstorleik på førehandsvising av lag og kanalar i nyoppretta dialogar."
 
 #: ../app/config/gimprc-blurbs.h:254
-msgid ""
-"When enabled, the image window will automatically resize itself whenever the "
-"physical image size changes."
-msgstr ""
-"Biletvindauget vil endre storleiken automatisk i høve til storleiken på det "
-"fysiske biletet."
+msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes."
+msgstr "Biletvindauget vil endre storleiken automatisk i høve til storleiken på det fysiske biletet."
 
 #: ../app/config/gimprc-blurbs.h:258
-msgid ""
-"When enabled, the image window will automatically resize itself when zooming "
-"into and out of images."
-msgstr ""
-"Biletvindauget vil endrar storleiken automatisk når du forstørrer eller "
-"forminskar biletvisinga."
+msgid "When enabled, the image window will automatically resize itself when zooming into and out of images."
+msgstr "Biletvindauget vil endrar storleiken automatisk når du forstørrer eller forminskar biletvisinga."
 
 #: ../app/config/gimprc-blurbs.h:262
 msgid "Let GIMP try to restore your last saved session on each startup."
-msgstr ""
-"La GIMP prøve å byggja opp igjen den sist lagra økta di ved ny oppstart."
+msgstr "La GIMP prøve å byggja opp igjen den sist lagra økta di ved ny oppstart."
 
 #: ../app/config/gimprc-blurbs.h:265
-msgid ""
-"Remember the current tool, pattern, color, and brush across GIMP sessions."
-msgstr ""
-"Hugs gjeldande verktøy, mønsterelement, farge og pensel mellom GIMP-øktene."
+msgid "Remember the current tool, pattern, color, and brush across GIMP sessions."
+msgstr "Hugs gjeldande verktøy, mønsterelement, farge og pensel mellom GIMP-øktene."
 
 #: ../app/config/gimprc-blurbs.h:269
-msgid "Add all opened and saved files to the document history on disk."
-msgstr "Legg alle opna og lagra filer i dokumentloggen på disk."
+#| msgid "Add all opened and saved files to the document history on disk."
+msgid "Keep a permanent record of all opened and saved files in the Recent Documents list."
+msgstr "Lager ei permanent liste over alle nyleg opna og lagra filer i dokumentloggen"
 
-#: ../app/config/gimprc-blurbs.h:272
+#: ../app/config/gimprc-blurbs.h:273
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
 msgstr "Lagra posisjon og storleik på menyane når du avsluttar  GIMP."
 
-#: ../app/config/gimprc-blurbs.h:275
+#: ../app/config/gimprc-blurbs.h:276
 msgid "Save the tool options when GIMP exits."
 msgstr "Lagra verktøyinnstillingane når GIMP blir avslutta."
 
-#: ../app/config/gimprc-blurbs.h:281
-msgid ""
-"When enabled, all paint tools will show a preview of the current brush's "
-"outline."
+#: ../app/config/gimprc-blurbs.h:282
+msgid "When enabled, all paint tools will show a preview of the current brush's outline."
 msgstr "Gjer at alle teikneverktøya viser omrisset til penselen."
 
-#: ../app/config/gimprc-blurbs.h:285
-msgid ""
-"When enabled, dialogs will show a help button that gives access to the "
-"related help page.  Without this button, the help page can still be reached "
-"by pressing F1."
-msgstr ""
-"Når denne er aktivisert vil dialogvindauga syne ein hjelpknapp som fører til "
-"den aktuelle hjelpsida. Du kan likevel nå desse sidene utan denne knappen "
-"ved å trykke tasten F1."
+#: ../app/config/gimprc-blurbs.h:286
+msgid "When enabled, dialogs will show a help button that gives access to the related help page.  Without this button, the help page can still be reached by pressing F1."
+msgstr "Når denne er aktivert vil dialogvindauga syne ein hjelpknapp som fører til den aktuelle hjelpsida. Du kan likevel nå desse sidene utan denne knappen ved å trykke tasten F1."
 
-#: ../app/config/gimprc-blurbs.h:290
-msgid ""
-"When enabled, the mouse pointer will be shown over the image while using a "
-"paint tool."
-msgstr ""
-"Når denne er aktivisert, vil musepeikaren bli vist over biletet når du "
-"bruker teikneverktøya."
+#: ../app/config/gimprc-blurbs.h:291
+msgid "When enabled, the mouse pointer will be shown over the image while using a paint tool."
+msgstr "Når denne er aktivert, vil musepeikaren bli vist over biletet når du bruker teikneverktøya."
 
-#: ../app/config/gimprc-blurbs.h:294
-msgid ""
-"When enabled, the menubar is visible by default. This can also be toggled "
-"with the \"View->Show Menubar\" command."
-msgstr ""
-"Gjer at menylinja er synlege som standard. Du kan likevel slå visinga av "
-"menylinja av og på med kommandoen «Vis->Vis menylija»."
+#: ../app/config/gimprc-blurbs.h:295
+msgid "When enabled, the menubar is visible by default. This can also be toggled with the \"View->Show Menubar\" command."
+msgstr "Gjer at menylinja er synlege som standard. Du kan likevel slå visinga av menylinja av og på med kommandoen «Vis->Vis menylija»."
 
-#: ../app/config/gimprc-blurbs.h:298
-msgid ""
-"When enabled, the rulers are visible by default. This can also be toggled "
-"with the \"View->Show Rulers\" command."
-msgstr ""
-"Gjer at linjalane normalt er synlege. Du kan likevel slå visinga av "
-"linjalane av og på med kommandoen «Vis->Vis linjalar»."
+#: ../app/config/gimprc-blurbs.h:299
+msgid "When enabled, the rulers are visible by default. This can also be toggled with the \"View->Show Rulers\" command."
+msgstr "Gjer at linjalane normalt er synlege. Du kan likevel slå visinga av linjalane av og på med kommandoen «Vis->Vis linjalar»."
 
-#: ../app/config/gimprc-blurbs.h:302
-msgid ""
-"When enabled, the scrollbars are visible by default. This can also be "
-"toggled with the \"View->Show Scrollbars\" command."
-msgstr ""
-"Gjer at rullefelta er synlege som standard. Dette kan du også endre med "
-"kommandoen «Vis->Vis rullefelt»."
+#: ../app/config/gimprc-blurbs.h:303
+msgid "When enabled, the scrollbars are visible by default. This can also be toggled with the \"View->Show Scrollbars\" command."
+msgstr "Gjer at rullefelta er synlege som standard. Dette kan du også endre med kommandoen «Vis->Vis rullefelt»."
 
-#: ../app/config/gimprc-blurbs.h:306
-msgid ""
-"When enabled, the statusbar is visible by default. This can also be toggled "
-"with the \"View->Show Statusbar\" command."
-msgstr ""
-"Gjer at statuslinja er synlege som standard. Dette kan du også endre med "
-"kommandoen «Vis->Vis statuslinje»."
+#: ../app/config/gimprc-blurbs.h:307
+msgid "When enabled, the statusbar is visible by default. This can also be toggled with the \"View->Show Statusbar\" command."
+msgstr "Gjer at statuslinja er synlege som standard. Dette kan du også endre med kommandoen «Vis->Vis statuslinje»."
 
-#: ../app/config/gimprc-blurbs.h:310
-msgid ""
-"When enabled, the selection is visible by default. This can also be toggled "
-"with the \"View->Show Selection\" command."
-msgstr ""
-"Gjer at utvalsgrensene normalt er synlege. Dette kan du likevel endre med "
-"kommandoen «Vis -> Vis utval»."
+#: ../app/config/gimprc-blurbs.h:311
+msgid "When enabled, the selection is visible by default. This can also be toggled with the \"View->Show Selection\" command."
+msgstr "Gjer at utvalsgrensene normalt er synlege. Dette kan du likevel endre med kommandoen «Vis -> Vis utval»."
 
-#: ../app/config/gimprc-blurbs.h:314
-msgid ""
-"When enabled, the layer boundary is visible by default. This can also be "
-"toggled with the \"View->Show Layer Boundary\" command."
-msgstr ""
-"Gjer at laggrensene er synlege som standard. Dette kan du også endre med "
-"kommandoen «Vis->Vis laggrense»."
+#: ../app/config/gimprc-blurbs.h:315
+msgid "When enabled, the layer boundary is visible by default. This can also be toggled with the \"View->Show Layer Boundary\" command."
+msgstr "Gjer at laggrensene er synlege som standard. Dette kan du også endre med kommandoen «Vis->Vis laggrense»."
 
-#: ../app/config/gimprc-blurbs.h:318
-msgid ""
-"When enabled, the guides are visible by default. This can also be toggled "
-"with the \"View->Show Guides\" command."
-msgstr ""
-"Gjer at hjelpelinjene er synlege som standard. Dette kan du også endre med "
-"kommandoen «Vis->Vis hjelpelinjer»."
+#: ../app/config/gimprc-blurbs.h:319
+msgid "When enabled, the guides are visible by default. This can also be toggled with the \"View->Show Guides\" command."
+msgstr "Gjer at hjelpelinjene er synlege som standard. Dette kan du også endre med kommandoen «Vis->Vis hjelpelinjer»."
 
-#: ../app/config/gimprc-blurbs.h:322
-msgid ""
-"When enabled, the grid is visible by default. This can also be toggled with "
-"the \"View->Show Grid\" command."
-msgstr ""
-"Gjer at rutenettet er synlege som standard. Dette kan du også endre med "
-"kommandoen «Vis->Vis rutenett»."
+#: ../app/config/gimprc-blurbs.h:323
+msgid "When enabled, the grid is visible by default. This can also be toggled with the \"View->Show Grid\" command."
+msgstr "Gjer at rutenettet er synlege som standard. Dette kan du også endre med kommandoen «Vis->Vis rutenett»."
 
-#: ../app/config/gimprc-blurbs.h:326
-msgid ""
-"When enabled, the sample points are visible by default. This can also be "
-"toggled with the \"View->Show Sample Points\" command."
-msgstr ""
-"Prøvepunkta er normalt sett til å vere synlege. Du kan likevel slå visinga "
-"av og på med kommandoen «Vis -> Vis prøvepunkt». "
+#: ../app/config/gimprc-blurbs.h:327
+msgid "When enabled, the sample points are visible by default. This can also be toggled with the \"View->Show Sample Points\" command."
+msgstr "Prøvepunkta er normalt sett til å vere synlege. Du kan likevel slå visinga av og på med kommandoen «Vis -> Vis prøvepunkt». "
 
-#: ../app/config/gimprc-blurbs.h:330
-msgid "Enable displaying a handy GIMP tip on startup."
-msgstr "Vil vise «Dagens tips» ved start av GIMP."
-
-#: ../app/config/gimprc-blurbs.h:333
+#: ../app/config/gimprc-blurbs.h:331
 msgid "Show a tooltip when the pointer hovers over an item."
 msgstr "Viser verktøytips når peikaren er over ein post."
 
-#: ../app/config/gimprc-blurbs.h:336
+#: ../app/config/gimprc-blurbs.h:334
 msgid "What to do when the space bar is pressed in the image window."
 msgstr "Kva som skal skje når du held nede mellomromstasten i biletvindauget."
 
-#: ../app/config/gimprc-blurbs.h:339
-msgid ""
-"Sets the swap file location. GIMP uses a tile based memory allocation "
-"scheme. The swap file is used to quickly and easily swap tiles out to disk "
-"and back in. Be aware that the swap file can easily get very large if GIMP "
-"is used with large images. Also, things can get horribly slow if the swap "
-"file is created on a folder that is mounted over NFS.  For these reasons, it "
-"may be desirable to put your swap file in \"/tmp\"."
-msgstr ""
-"Set adressa til mellomlagringsfila. GIMP bruker flisbasert reservering av "
-"minne. Mellomlagringsfila er ein rask og lett måte å hente eller lagra filer "
-"frå eller til harddisken. Mellomlagringsfila kan bli svært stor når du "
-"arbeider med store bilete. Dersom fila i tillegg er oppretta på ein harddisk "
-"utanfor maskinen, t.d. eit nettverk, vil dette redusera ytingane merkbart. "
-"Det beste er difor å legge mellomlagringsfila på eigen maskin, gjerne i "
-"mappa «/tmp» (Linux)."
+#: ../app/config/gimprc-blurbs.h:337
+msgid "Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, things can get horribly slow if the swap file is created on a folder that is mounted over NFS.  For these reasons, it may be desirable to put your swap file in \"/tmp\"."
+msgstr "Set adressa til mellomlagringsfila. GIMP bruker flisbasert reservering av minne. Mellomlagringsfila er ein rask og lett måte å hente eller lagra filer frå eller til harddisken. Mellomlagringsfila kan bli svært stor når du arbeider med store bilete. Dersom fila i tillegg er oppretta på ein harddisk utanfor maskinen, t.d. eit nettverk, vil dette redusera ytingane merkbart. Det beste er difor å legge mellomlagringsfila på eigen maskin, gjerne i mappa «/tmp» (Linux)."
 
-#: ../app/config/gimprc-blurbs.h:348
+#: ../app/config/gimprc-blurbs.h:346
 msgid "When enabled, menus can be torn off."
 msgstr "Gjer at menyar kan løysast."
 
-#: ../app/config/gimprc-blurbs.h:351
-msgid ""
-"When enabled, dock windows (the toolbox and palettes) are set to be "
-"transient to the active image window. Most window managers will keep the "
-"dock windows above the image window then, but it may also have other effects."
-msgstr ""
-"Gjer at samlevindauga (verktøy og palettar) vil følgje det aktive "
-"biletvindauget. Dei fleste vindaugehandterarane vil halde samlevindauget "
-"over biletvindauget, men kan også ha andre tilleggseffektar."
+#: ../app/config/gimprc-blurbs.h:349
+msgid "When enabled, dock windows (the toolbox and palettes) are set to be transient to the active image window. Most window managers will keep the dock windows above the image window then, but it may also have other effects."
+msgstr "Gjer at samlevindauga (verktøy og palettar) vil følgje det aktive biletvindauget. Dei fleste vindaugehandterarane vil halde samlevindauget over biletvindauget, men kan også ha andre tilleggseffektar."
 
-#: ../app/config/gimprc-blurbs.h:357
-msgid ""
-"When enabled, you can change keyboard shortcuts for menu items by hitting a "
-"key combination while the menu item is highlighted."
-msgstr ""
-"Gjer at du kan endre snarvegtastar for menyvala ved å trykke ein "
-"tastekombinasjon medan menyvalet er utheva."
+#: ../app/config/gimprc-blurbs.h:355
+msgid "When enabled, you can change keyboard shortcuts for menu items by hitting a key combination while the menu item is highlighted."
+msgstr "Gjer at du kan endre snarvegtastar for menyvala ved å trykke ein tastekombinasjon medan menyvalet er utheva."
 
-#: ../app/config/gimprc-blurbs.h:361
+#: ../app/config/gimprc-blurbs.h:359
 msgid "Save changed keyboard shortcuts when GIMP exits."
 msgstr "Lagra endra snarvegtastar når GIMP blir avslutta."
 
-#: ../app/config/gimprc-blurbs.h:364
+#: ../app/config/gimprc-blurbs.h:362
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
 msgstr "Bygg opp igjen lagra snarvegtastar når GIMP startar opp."
 
-#: ../app/config/gimprc-blurbs.h:367
-msgid ""
-"Sets the folder for temporary storage. Files will appear here during the "
-"course of running GIMP.  Most files will disappear when GIMP exits, but some "
-"files are likely to remain, so it is best if this folder not be one that is "
-"shared by other users."
-msgstr ""
-"Lager mappa som GIMP bruker under køyringa for mellombels lagring av filer. "
-"Som oftast blir desse filene fjerna når GIMP blir avslutta, men ikkje "
-"alltid. Difor er det best å ikkje dela denne mappa med andre. "
+#: ../app/config/gimprc-blurbs.h:365
+msgid "Sets the folder for temporary storage. Files will appear here during the course of running GIMP.  Most files will disappear when GIMP exits, but some files are likely to remain, so it is best if this folder not be one that is shared by other users."
+msgstr "Lager mappa som GIMP bruker under køyringa for mellombels lagring av filer. Som oftast blir desse filene fjerna når GIMP blir avslutta, men ikkje alltid. Difor er det best å ikkje dela denne mappa med andre. "
 
-#: ../app/config/gimprc-blurbs.h:379
+#: ../app/config/gimprc-blurbs.h:377
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "Bestemmer storeliken på miniatyren vist i opningsdialogen"
 
-#: ../app/config/gimprc-blurbs.h:382
-msgid ""
-"The thumbnail in the Open dialog will be automatically updated if the file "
-"being previewed is smaller than the size set here."
-msgstr ""
-"Miniatyrbiletet i dialogvindauget for å opna filer vil bli oppdatert "
-"automatisk dersom fila som blir vist er mindre enn storleiken som er sett "
-"her."
+#: ../app/config/gimprc-blurbs.h:380
+msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here."
+msgstr "Miniatyrbiletet i dialogvindauget for å opna filer vil bli oppdatert automatisk dersom fila som blir vist er mindre enn storleiken som er sett her."
 
-#: ../app/config/gimprc-blurbs.h:386
-msgid ""
-"When the amount of pixel data exceeds this limit, GIMP will start to swap "
-"tiles to disk.  This is a lot slower but it makes it possible to work on "
-"images that wouldn't fit into memory otherwise.  If you have a lot of RAM, "
-"you may want to set this to a higher value."
-msgstr ""
-"Når mengda av pikslar overskrid denne grensa, vil GIMP sende fliser til "
-"harddisken. Dette seinkar arbeidet, men gjer det mogleg å arbeida med bilete "
-"som er for store for minnet. Har du mykje RAM, kan du gjerne setje denne "
-"verdien høgare."
+#: ../app/config/gimprc-blurbs.h:384
+msgid "When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk.  This is a lot slower but it makes it possible to work on images that wouldn't fit into memory otherwise.  If you have a lot of RAM, you may want to set this to a higher value."
+msgstr "Når mengda av pikslar overskrid denne grensa, vil GIMP sende fliser til harddisken. Dette seinkar arbeidet, men gjer det mogleg å arbeida med bilete som er for store for minnet. Har du mykje RAM, kan du gjerne setje denne verdien høgare."
+
+#: ../app/config/gimprc-blurbs.h:390
+#| msgid "Exchange foreground and background colors"
+msgid "Show the current foreground and background colors in the toolbox."
+msgstr "Vis gjeldane forgrunns- og bakgrunnsfarge i verktøykassa"
+
+#: ../app/config/gimprc-blurbs.h:393
+#| msgid "Show active _brush, pattern & gradient"
+msgid "Show the currently selected brush, pattern and gradient in the toolbox."
+msgstr "Vis aktive penslar, mønsterelement og fargeovergangar i verktøykassa"
 
 #: ../app/config/gimprc-blurbs.h:396
-msgid ""
-"The window type hint that is set on the toolbox. This may affect how your "
-"window manager decorates and handles the toolbox window."
-msgstr ""
-"Vindaugetypeforslag sett i verktøykassa. Dette kan påverka korleis "
-"vindaugehandteraren set opp og handterer vindauget for verktøykassa."
+msgid "Show the currently active image in the toolbox."
+msgstr "Vis det for tida aktive biletet i verktøykassa"
 
-#: ../app/config/gimprc-blurbs.h:400
+#: ../app/config/gimprc-blurbs.h:402
+msgid "The window type hint that is set on the toolbox. This may affect how your window manager decorates and handles the toolbox window."
+msgstr "Vindaugetype for verktøykassa. Dette kan påverka korleis vindaugehandteraren set opp og handterer vindauget for verktøykassa."
+
+#: ../app/config/gimprc-blurbs.h:406
 msgid "Sets the manner in which transparency is displayed in images."
 msgstr "Bestemmer korleis gjennomsikt skal visast i bileta."
 
-#: ../app/config/gimprc-blurbs.h:403
+#: ../app/config/gimprc-blurbs.h:409
 msgid "Sets the size of the checkerboard used to display transparency."
-msgstr ""
-"Bestemmer storleiken på sjakkbrettet som blir brukt for å vise gjennomsikt."
+msgstr "Bestemmer storleiken på sjakkbrettet som blir brukt for å vise gjennomsikt."
 
-#: ../app/config/gimprc-blurbs.h:406
-msgid ""
-"When enabled, GIMP will not save an image if it has not been changed since "
-"it was opened."
-msgstr ""
-"Gjer at GIMP ikkje vil lagra eit bilete som det ikkje er gjort endringar i."
+#: ../app/config/gimprc-blurbs.h:412
+msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened."
+msgstr "Gjer at GIMP ikkje vil lagra eit bilete som det ikkje er gjort endringar i."
 
-#: ../app/config/gimprc-blurbs.h:410
-msgid ""
-"Sets the minimal number of operations that can be undone. More undo levels "
-"are kept available until the undo-size limit is reached."
-msgstr ""
-"Set det det minste talet på operasjonar som kan angrast. Fleire angrenivå er "
-"tilgjengelege heilt til angregrensa er nådd."
+#: ../app/config/gimprc-blurbs.h:416
+msgid "Sets the minimal number of operations that can be undone. More undo levels are kept available until the undo-size limit is reached."
+msgstr "Set det det minste talet på operasjonar som kan angrast. Fleire angrenivå er tilgjengelege heilt til angregrensa er nådd."
 
-#: ../app/config/gimprc-blurbs.h:414
-msgid ""
-"Sets an upper limit to the memory that is used per image to keep operations "
-"on the undo stack. Regardless of this setting, at least as many undo-levels "
-"as configured can be undone."
-msgstr ""
-"Set øvre grensa for kor mykje minne som blir brukt til angreloggen for kvart "
-"bilete. Du vil alltid, uavhengig av denne innstillinga, kunne angre så mange "
-"gonger som er sett i innstillinga for dette."
+#: ../app/config/gimprc-blurbs.h:420
+msgid "Sets an upper limit to the memory that is used per image to keep operations on the undo stack. Regardless of this setting, at least as many undo-levels as configured can be undone."
+msgstr "Set øvre grensa for kor mykje minne som blir brukt til angreloggen for kvart bilete. Du vil alltid, uavhengig av denne innstillinga, kunne angre så mange gonger som er sett i innstillinga for dette."
 
-#: ../app/config/gimprc-blurbs.h:419
+#: ../app/config/gimprc-blurbs.h:425
 msgid "Sets the size of the previews in the Undo History."
 msgstr "Set storleiken på førehandsvisingane i angreloggen."
 
-#: ../app/config/gimprc-blurbs.h:422
+#: ../app/config/gimprc-blurbs.h:428
 msgid "When enabled, pressing F1 will open the help browser."
 msgstr "Gjer at F1-knappen opnar hjelplesaren."
 
-#: ../app/config/gimprc-blurbs.h:425
+#: ../app/config/gimprc-blurbs.h:439
 #, c-format
-msgid ""
-"Sets the external web browser to be used.  This can be an absolute path or "
-"the name of an executable to search for in the user's PATH. If the command "
-"contains '%s' it will be replaced with the URL, else the URL will be "
-"appended to the command with a space separating the two."
-msgstr ""
-"Bestemmer kva for ekstern nettlesar som skal brukast. Dette kan vere ein "
-"absolutt filstig eller namnet på ei køyrbar fil i søkestigen. Dersom "
-"kommandoen inneheld «%s» vil han bli erstatta av URL, elles vil URL bli lagt "
-"til kommandoen med eit mellomrom mellom dei to."
+msgid "Sets the external web browser to be used.  This can be an absolute path or the name of an executable to search for in the user's PATH. If the command contains '%s' it will be replaced with the URL, else the URL will be appended to the command with a space separating the two."
+msgstr "Bestemmer kva for ekstern nettlesar som skal brukast. Dette kan vere ein absolutt filstig eller namnet på ei køyrbar fil i søkestigen. Dersom kommandoen inneheld «%s» vil han bli erstatta av URL, elles vil URL bli lagt til kommandoen med eit mellomrom mellom dei to."
 
-#: ../app/config/gimprc-deserialize.c:136 ../app/core/gimp-modules.c:134
-#: ../app/core/gimp-units.c:164 ../app/gui/session.c:160
+#: ../app/config/gimprc-deserialize.c:135
+#: ../app/core/gimp-modules.c:134
+#: ../app/core/gimp-units.c:164
+#: ../app/gui/session.c:206
 #: ../app/plug-in/plug-in-rc.c:213
 msgid "fatal parse error"
 msgstr "fatal feil i tolkinga"
 
-#: ../app/config/gimprc-deserialize.c:164
+#: ../app/config/gimprc-deserialize.c:163
 #, c-format
 msgid "value for token %s is not a valid UTF-8 string"
 msgstr "verdien for teiknet %s er ikkje ein gyldig UTF-8-streng"
 
 #. no undo (or redo) steps available
-#: ../app/core/core-enums.c:53 ../app/core/core-enums.c:252
-#: ../app/core/core-enums.c:504 ../app/paint/paint-enums.c:81
+#: ../app/core/core-enums.c:53
+#: ../app/core/core-enums.c:252
+#: ../app/core/core-enums.c:504
+#: ../app/paint/paint-enums.c:81
 #: ../app/widgets/gimpimagepropview.c:416
 msgid "None"
 msgstr "Ingen"
@@ -5073,7 +5017,8 @@ msgstr "Bruk eigendefinert palett"
 msgid "First item"
 msgstr "Første element"
 
-#: ../app/core/core-enums.c:213 ../app/dialogs/dialogs.c:190
+#: ../app/core/core-enums.c:213
+#: ../app/dialogs/dialogs.c:198
 #: ../app/tools/tools-enums.c:210
 msgid "Selection"
 msgstr "Utval"
@@ -5103,11 +5048,13 @@ msgid "White"
 msgstr "Kvit"
 
 #. Transparency
-#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2277
+#: ../app/core/core-enums.c:250
+#: ../app/dialogs/preferences-dialog.c:2311
 msgid "Transparency"
 msgstr "Gjennomsikt"
 
-#: ../app/core/core-enums.c:251 ../app/core/core-enums.c:308
+#: ../app/core/core-enums.c:251
+#: ../app/core/core-enums.c:308
 msgid "Pattern"
 msgstr "Mønster"
 
@@ -5127,7 +5074,8 @@ msgstr "Einsfarga"
 msgid "Miter"
 msgstr "Skarp"
 
-#: ../app/core/core-enums.c:337 ../app/core/core-enums.c:367
+#: ../app/core/core-enums.c:337
+#: ../app/core/core-enums.c:367
 msgid "Round"
 msgstr "Rund"
 
@@ -5139,7 +5087,8 @@ msgstr "Skrå"
 msgid "Butt"
 msgstr "Butt"
 
-#: ../app/core/core-enums.c:368 ../app/core/core-enums.c:443
+#: ../app/core/core-enums.c:368
+#: ../app/core/core-enums.c:443
 msgid "Square"
 msgstr "Firkanta"
 
@@ -5195,11 +5144,13 @@ msgstr "Sirkel"
 msgid "Diamond"
 msgstr "Rombe"
 
-#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2309
+#: ../app/core/core-enums.c:472
+#: ../app/dialogs/preferences-dialog.c:2343
 msgid "Horizontal"
 msgstr "Horisontal"
 
-#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2311
+#: ../app/core/core-enums.c:473
+#: ../app/dialogs/preferences-dialog.c:2345
 msgid "Vertical"
 msgstr "Vertikal"
 
@@ -5319,37 +5270,46 @@ msgstr "Flett samman lag"
 msgid "Merge paths"
 msgstr "Føy saman stigane"
 
-#: ../app/core/core-enums.c:861 ../app/core/core-enums.c:892
-#: ../app/core/gimpimage-grid.c:58 ../app/dialogs/grid-dialog.c:152
+#: ../app/core/core-enums.c:861
+#: ../app/core/core-enums.c:892
+#: ../app/core/gimpimage-grid.c:58
+#: ../app/dialogs/grid-dialog.c:152
 #: ../app/tools/tools-enums.c:241
 msgid "Grid"
 msgstr "Rutenett"
 
-#: ../app/core/core-enums.c:862 ../app/core/core-enums.c:894
+#: ../app/core/core-enums.c:862
+#: ../app/core/core-enums.c:894
 msgid "Guide"
 msgstr "Hjelpelinje"
 
-#: ../app/core/core-enums.c:863 ../app/core/core-enums.c:895
+#: ../app/core/core-enums.c:863
+#: ../app/core/core-enums.c:895
 msgid "Sample Point"
 msgstr "Prøvepunkt"
 
-#: ../app/core/core-enums.c:864 ../app/core/core-enums.c:896
+#: ../app/core/core-enums.c:864
+#: ../app/core/core-enums.c:896
 msgid "Layer/Channel"
 msgstr "Laget/kanal"
 
-#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:897
+#: ../app/core/core-enums.c:865
+#: ../app/core/core-enums.c:897
 msgid "Layer/Channel modification"
 msgstr "Endre lag/kanal"
 
-#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:898
+#: ../app/core/core-enums.c:866
+#: ../app/core/core-enums.c:898
 msgid "Selection mask"
 msgstr "Utvalsmaske"
 
-#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:901
+#: ../app/core/core-enums.c:867
+#: ../app/core/core-enums.c:901
 msgid "Item visibility"
 msgstr "Endra elementvisinga"
 
-#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:902
+#: ../app/core/core-enums.c:868
+#: ../app/core/core-enums.c:902
 msgid "Link/Unlink item"
 msgstr "Lenk element til eller frå"
 
@@ -5357,7 +5317,8 @@ msgstr "Lenk element til eller frå"
 msgid "Item properties"
 msgstr " Eigenskapar for element"
 
-#: ../app/core/core-enums.c:870 ../app/core/core-enums.c:900
+#: ../app/core/core-enums.c:870
+#: ../app/core/core-enums.c:900
 msgid "Move item"
 msgstr "Flytt element"
 
@@ -5373,15 +5334,18 @@ msgstr "Tilbakestill elementet"
 msgid "Add layer"
 msgstr "Legg til lag"
 
-#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:911
+#: ../app/core/core-enums.c:874
+#: ../app/core/core-enums.c:911
 msgid "Add layer mask"
 msgstr "Legg til lagmaske"
 
-#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:913
+#: ../app/core/core-enums.c:875
+#: ../app/core/core-enums.c:913
 msgid "Apply layer mask"
 msgstr "Bruk lagmaske"
 
-#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:923
+#: ../app/core/core-enums.c:876
+#: ../app/core/core-enums.c:923
 msgid "Floating selection to layer"
 msgstr "Flytande utval til lag"
 
@@ -5397,34 +5361,41 @@ msgstr "Forankre flytande utval"
 msgid "Remove floating selection"
 msgstr "Fjern flytande utval"
 
-#: ../app/core/core-enums.c:880 ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:880
+#: ../app/core/gimp-edit.c:262
 msgid "Paste"
 msgstr "Lim inn"
 
-#: ../app/core/core-enums.c:881 ../app/core/gimp-edit.c:557
+#: ../app/core/core-enums.c:881
+#: ../app/core/gimp-edit.c:557
 msgid "Cut"
 msgstr "Klipp ut"
 
-#: ../app/core/core-enums.c:882 ../app/tools/gimptexttool.c:141
+#: ../app/core/core-enums.c:882
+#: ../app/tools/gimptexttool.c:160
 #: ../app/widgets/widgets-enums.c:265
 msgid "Text"
 msgstr "Tekst"
 
-#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:926
-#: ../app/core/gimpdrawable-transform.c:566
+#: ../app/core/core-enums.c:883
+#: ../app/core/core-enums.c:926
+#: ../app/core/gimpdrawable-transform.c:567
 msgid "Transform"
 msgstr "Transformer"
 
-#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:927
-#: ../app/paint/gimppaintcore.c:134
+#: ../app/core/core-enums.c:884
+#: ../app/core/core-enums.c:927
+#: ../app/paint/gimppaintcore.c:137
 msgid "Paint"
 msgstr "Mal"
 
-#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:930
+#: ../app/core/core-enums.c:885
+#: ../app/core/core-enums.c:930
 msgid "Attach parasite"
 msgstr "Fest parasitt"
 
-#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:931
+#: ../app/core/core-enums.c:886
+#: ../app/core/core-enums.c:931
 msgid "Remove parasite"
 msgstr "Fjern parasitt"
 
@@ -5432,7 +5403,8 @@ msgstr "Fjern parasitt"
 msgid "Import paths"
 msgstr "Importer banar"
 
-#: ../app/core/core-enums.c:888 ../app/pdb/drawable_cmds.c:820
+#: ../app/core/core-enums.c:888
+#: ../app/pdb/drawable-cmds.c:885
 msgid "Plug-In"
 msgstr "Programtillegg"
 
@@ -5525,14 +5497,19 @@ msgid "Reposition path"
 msgstr "Flytt banen"
 
 #: ../app/core/core-enums.c:924
-msgid "FS rigor"
-msgstr "FS stram inn"
+#, fuzzy
+#| msgid "Anchor floating selection"
+msgid "Rigor floating selection"
+msgstr "Forankre det flytande utvalet"
 
 #: ../app/core/core-enums.c:925
-msgid "FS relax"
-msgstr "FS løysne"
+#, fuzzy
+#| msgid "Remove floating selection"
+msgid "Relax floating selection"
+msgstr "Forankre det flytande utvalet"
 
-#: ../app/core/core-enums.c:928 ../app/paint/gimpink.c:95
+#: ../app/core/core-enums.c:928
+#: ../app/paint/gimpink.c:95
 #: ../app/tools/gimpinktool.c:55
 msgid "Ink"
 msgstr "Penn"
@@ -5542,8 +5519,8 @@ msgid "Select foreground"
 msgstr "Vel forgrunn"
 
 #: ../app/core/core-enums.c:932
-msgid "EEK: can't undo"
-msgstr "Uff: Kan ikkje angra"
+msgid "Not undoable"
+msgstr "Kan ikkje angrast"
 
 #: ../app/core/core-enums.c:1196
 msgid "Composite"
@@ -5573,14 +5550,17 @@ msgstr "Behald innlagt profil"
 msgid "Convert to RGB workspace"
 msgstr "Konverter til RGB-fargeområdet"
 
-#: ../app/core/gimp-contexts.c:155 ../app/core/gimptooloptions.c:239
-#: ../app/gui/session.c:257 ../app/menus/menus.c:430
+#: ../app/core/gimp-contexts.c:155
+#: ../app/core/gimptooloptions.c:231
+#: ../app/gui/session.c:307
+#: ../app/menus/menus.c:433
 #: ../app/widgets/gimpdevices.c:258
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "Sletting av «%s» feila: %s"
 
-#: ../app/core/gimp-edit.c:190 ../app/core/gimp-edit.c:326
+#: ../app/core/gimp-edit.c:190
+#: ../app/core/gimp-edit.c:326
 msgid "Pasted Layer"
 msgstr "Innlimt lag"
 
@@ -5624,69 +5604,59 @@ msgstr "Forgrunn til bakgrunn (HSV kulør med klokka)"
 msgid "FG to Transparent"
 msgstr "Forgrunn til gjennomsikt"
 
-#: ../app/core/gimp-user-install.c:154
+#: ../app/core/gimp-user-install.c:153
 #, c-format
-msgid ""
-"It seems you have used GIMP %s before.  GIMP will now migrate your user "
-"settings to '%s'."
-msgstr ""
-"Det ser ut til at du har brukt GIMP %s tidlegare. GIMP vil nå flytte "
-"brukarinnstillingane dine til «%s»."
+msgid "It seems you have used GIMP %s before.  GIMP will now migrate your user settings to '%s'."
+msgstr "Det ser ut til at du har brukt GIMP %s tidlegare. GIMP vil nå flytte brukarinnstillingane dine til «%s»."
 
-#: ../app/core/gimp-user-install.c:159
+#: ../app/core/gimp-user-install.c:158
 #, c-format
-msgid ""
-"It appears that you are using GIMP for the first time.  GIMP will now create "
-"a folder named '%s' and copy some files to it."
-msgstr ""
-"Det ser ut til at dette er første gongen dy køyrer GIMP. GIMP vil difor lage "
-"ei ny mappe,  «%s», og kopiere noen filer dit. "
+msgid "It appears that you are using GIMP for the first time.  GIMP will now create a folder named '%s' and copy some files to it."
+msgstr "Det ser ut til at dette er første gongen dy køyrer GIMP. GIMP vil difor lage ei ny mappe,  «%s», og kopiere noen filer dit. "
 
-#: ../app/core/gimp-user-install.c:310
+#: ../app/core/gimp-user-install.c:309
 #, c-format
 msgid "Copying file '%s' from '%s'..."
-msgstr "Kopierer fila «%s» frå «%s»..."
+msgstr "Kopierer fila «%s» frå «%s» …"
 
-#: ../app/core/gimp-user-install.c:325 ../app/core/gimp-user-install.c:351
+#: ../app/core/gimp-user-install.c:324
+#: ../app/core/gimp-user-install.c:350
 #, c-format
 msgid "Creating folder '%s'..."
-msgstr "Oppretter mappa «%s»..."
+msgstr "Oppretter mappa «%s» …"
 
-#: ../app/core/gimp-user-install.c:336 ../app/core/gimp-user-install.c:362
+#: ../app/core/gimp-user-install.c:335
+#: ../app/core/gimp-user-install.c:361
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Kan ikkje opprette mappa «%s»: %s"
 
-#: ../app/core/gimp.c:528
+#: ../app/core/gimp.c:543
 msgid "Initialization"
 msgstr "Oppstart"
 
 #. register all internal procedures
-#: ../app/core/gimp.c:603
+#: ../app/core/gimp.c:618
 msgid "Internal Procedures"
 msgstr "Interne prosedyrer"
 
 #. initialize  the global parasite table
-#: ../app/core/gimp.c:828
+#: ../app/core/gimp.c:834
 msgid "Looking for data files"
 msgstr "Ser etter datafiler"
 
-#: ../app/core/gimp.c:828
+#: ../app/core/gimp.c:834
 msgid "Parasites"
 msgstr "Parasitter"
 
 #. initialize the list of fonts
-#: ../app/core/gimp.c:848
+#: ../app/core/gimp.c:854
 msgid "Fonts (this may take a while)"
 msgstr "Skrifttypar (Dette kan ta litt tid)"
 
-#. initialize the document history
-#: ../app/core/gimp.c:853
-msgid "Documents"
-msgstr "Dokument"
-
 #. initialize the module list
-#: ../app/core/gimp.c:865 ../app/dialogs/preferences-dialog.c:2738
+#: ../app/core/gimp.c:863
+#: ../app/dialogs/preferences-dialog.c:2772
 msgid "Modules"
 msgstr "Modular"
 
@@ -5720,22 +5690,25 @@ msgstr "Fatal tolkingsfeil i penselfila «%s»: Ukjent djupn %d."
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
 msgstr "Fatal tolkingsfeil i penselfila «%s»: Ukjent versjon %d."
 
-#: ../app/core/gimpbrush-load.c:268 ../app/core/gimpbrush-load.c:388
+#: ../app/core/gimpbrush-load.c:268
+#: ../app/core/gimpbrush-load.c:388
 #: ../app/core/gimpbrush-load.c:720
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
 msgstr "Fatal tolkingsfeil i penselfila «%s»: Det ser ut som fila er avkutta."
 
-#: ../app/core/gimpbrush-load.c:276 ../app/core/gimpbrushgenerated-load.c:128
+#: ../app/core/gimpbrush-load.c:276
+#: ../app/core/gimpbrushgenerated-load.c:128
 #: ../app/core/gimpbrushpipe-load.c:97
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "Ugyldig UTF-8-streng i penselfila «%s»"
 
-#: ../app/core/gimpbrush-load.c:283 ../app/core/gimpitem.c:505
+#: ../app/core/gimpbrush-load.c:283
+#: ../app/core/gimpitem.c:505
 #: ../app/core/gimppattern-load.c:146
 #: ../app/dialogs/template-options-dialog.c:83
-#: ../app/tools/gimpvectortool.c:296
+#: ../app/tools/gimpvectortool.c:299
 msgid "Unnamed"
 msgstr "Utan namn"
 
@@ -5750,43 +5723,28 @@ msgstr ""
 
 #: ../app/core/gimpbrush-load.c:448
 #, c-format
-msgid ""
-"Fatal parse error in brush file '%s': unable to decode abr format version %d."
-msgstr ""
-"Fatal tolkingsfeil i penselfila «%s»: Kunne ikkje dekode abr formatversjon %"
-"d."
+msgid "Fatal parse error in brush file '%s': unable to decode abr format version %d."
+msgstr "Fatal tolkingsfeil i penselfila «%s»: Kunne ikkje dekode abr formatversjon %d."
 
 #: ../app/core/gimpbrush-load.c:615
 #, c-format
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
 msgstr "Fatal tolkingsfeil i penselfila «%s»: Ikkje støtte for breie penslar."
 
-#: ../app/core/gimpbrushclipboard.c:181 ../app/core/gimppatternclipboard.c:181
-#: ../app/widgets/gimpclipboard.c:296
-msgid "Clipboard"
-msgstr "Utklippstavle"
-
 #: ../app/core/gimpbrushgenerated-load.c:87
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
-msgstr ""
-"Fatal tolkingsfeil i penselfila «%s»: Dette er ikkje ei penselfil for GIMP."
+msgstr "Fatal tolkingsfeil i penselfila «%s»: Dette er ikkje ei penselfil for GIMP."
 
 #: ../app/core/gimpbrushgenerated-load.c:104
 #, c-format
-msgid ""
-"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
-msgstr ""
-"Fatal tolkingsfeil i penselfila «%s»: Penselversjonen i linje %d er ukjent "
-"for GIMP."
+msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
+msgstr "Fatal tolkingsfeil i penselfila «%s»: Penselversjonen i linje %d er ukjent for GIMP."
 
 #: ../app/core/gimpbrushgenerated-load.c:150
 #, c-format
-msgid ""
-"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
-msgstr ""
-"Fatal tolkingsfeil i penselfila «%s»: Penselformatet i linje %d er ukjent "
-"for GIMP."
+msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
+msgstr "Fatal tolkingsfeil i penselfila «%s»: Penselformatet i linje %d er ukjent for GIMP."
 
 #: ../app/core/gimpbrushgenerated-load.c:226
 #, c-format
@@ -5803,41 +5761,53 @@ msgstr "Fila er klipt av i linje %d"
 msgid "Error while reading brush file '%s': %s"
 msgstr "Feil under lesing av penselfila «%s»: %s"
 
-#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
+#: ../app/core/gimpbrushpipe-load.c:113
+#: ../app/core/gimpbrushpipe-load.c:133
 #: ../app/core/gimpbrushpipe-load.c:223
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
 msgstr "Fatal feil i penselfila «%s»: Fila er øydelagt."
 
-#: ../app/core/gimpchannel-select.c:58
-msgid "command|Rectangle Select"
-msgstr "Kommando: Rektangelutval"
+#: ../app/core/gimpchannel-select.c:60
+#| msgid "Rectangle Select"
+msgctxt "command"
+msgid "Rectangle Select"
+msgstr "Rektangelutval"
 
-#: ../app/core/gimpchannel-select.c:109
-msgid "command|Ellipse Select"
-msgstr "Kommando: Ellipseutval"
+#: ../app/core/gimpchannel-select.c:111
+#| msgid "Ellipse Select"
+msgctxt "command"
+msgid "Ellipse Select"
+msgstr "Ellipseutval"
 
-#: ../app/core/gimpchannel-select.c:163
-msgid "command|Rounded Rectangle Select"
-msgstr "Kommando: Avrunda rektangelutval"
+#: ../app/core/gimpchannel-select.c:165
+#| msgid "command|Rounded Rectangle Select"
+msgctxt "command"
+msgid "Rounded Rectangle Select"
+msgstr "Avrunda rektangelutval"
 
-#: ../app/core/gimpchannel-select.c:432
+#: ../app/core/gimpchannel-select.c:434
 msgid "Alpha to Selection"
 msgstr "Alfa til utval"
 
-#: ../app/core/gimpchannel-select.c:470
+#: ../app/core/gimpchannel-select.c:472
 #, c-format
 msgid "%s Channel to Selection"
 msgstr "%s-kanal til utval"
 
-#: ../app/core/gimpchannel-select.c:518 ../app/tools/gimpfuzzyselecttool.c:78
-msgid "command|Fuzzy Select"
-msgstr "Kommando: Tryllestaven"
+#: ../app/core/gimpchannel-select.c:520
+#: ../app/tools/gimpfuzzyselecttool.c:80
+#| msgid "Fuzzy Select"
+msgctxt "command"
+msgid "Fuzzy Select"
+msgstr "Tryllestaven"
 
-#: ../app/core/gimpchannel-select.c:565
-#: ../app/tools/gimpbycolorselecttool.c:80
-msgid "command|Select by Color"
-msgstr "Kommando: Vel etter farge"
+#: ../app/core/gimpchannel-select.c:567
+#: ../app/tools/gimpbycolorselecttool.c:82
+#| msgid "Select by Color"
+msgctxt "command"
+msgid "Select by Color"
+msgstr "Vel etter farge"
 
 #: ../app/core/gimpchannel.c:257
 msgid "Channel"
@@ -5867,7 +5837,8 @@ msgstr "Spegelvend kanalen"
 msgid "Rotate Channel"
 msgstr "Roter kanalen"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:840
+#: ../app/core/gimpchannel.c:264
+#: ../app/core/gimpdrawable-transform.c:843
 msgid "Transform Channel"
 msgstr "Transformer kanalen"
 
@@ -5877,7 +5848,7 @@ msgstr "Strek opp kanalen"
 
 #: ../app/core/gimpchannel.c:286
 msgid "Feather Channel"
-msgstr "Bruk fjørkant på kanalen"
+msgstr "Bruk mjuk kant på kanalen"
 
 #: ../app/core/gimpchannel.c:287
 msgid "Sharpen Channel"
@@ -5907,29 +5878,32 @@ msgstr "Auk kanal"
 msgid "Shrink Channel"
 msgstr "Krymp kanal"
 
-#: ../app/core/gimpchannel.c:691
+#: ../app/core/gimpchannel.c:710
 #, c-format
 msgid "Cannot stroke empty channel."
 msgstr "Kan ikkje teikna på tom kanal."
 
-#: ../app/core/gimpchannel.c:1612
+#: ../app/core/gimpchannel.c:1631
 msgid "Set Channel Color"
 msgstr "Set kanalfarge"
 
-#: ../app/core/gimpchannel.c:1660
+#: ../app/core/gimpchannel.c:1679
 msgid "Set Channel Opacity"
 msgstr "Set dekkevne for kanalen"
 
-#: ../app/core/gimpchannel.c:1728 ../app/core/gimpselection.c:520
+#: ../app/core/gimpchannel.c:1747
+#: ../app/core/gimpselection.c:520
 msgid "Selection Mask"
 msgstr "Utvalsmaske"
 
-#: ../app/core/gimpdata.c:525 ../app/core/gimptoolpresets.c:297
+#: ../app/core/gimpdata.c:526
+#: ../app/core/gimptoolpresets.c:279
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "Kunne ikkje slette «%s»: %s"
 
-#: ../app/core/gimpdatafactory.c:415 ../app/core/gimpdatafactory.c:575
+#: ../app/core/gimpdatafactory.c:415
+#: ../app/core/gimpdatafactory.c:575
 #: ../app/core/gimpdatafactory.c:595
 #, c-format
 msgid ""
@@ -5941,12 +5915,15 @@ msgstr ""
 "\n"
 "«%s»"
 
-#: ../app/core/gimpdatafactory.c:494 ../app/core/gimpdatafactory.c:497
-#: ../app/core/gimpitem.c:312 ../app/core/gimpitem.c:315
+#: ../app/core/gimpdatafactory.c:494
+#: ../app/core/gimpdatafactory.c:497
+#: ../app/core/gimpitem.c:312
+#: ../app/core/gimpitem.c:315
 msgid "copy"
 msgstr "kopier"
 
-#: ../app/core/gimpdatafactory.c:506 ../app/core/gimpitem.c:324
+#: ../app/core/gimpdatafactory.c:506
+#: ../app/core/gimpitem.c:324
 #, c-format
 msgid "%s copy"
 msgstr "Kopi av «%s»"
@@ -5966,51 +5943,56 @@ msgstr ""
 "\n"
 "«%s»"
 
-#: ../app/core/gimpdrawable-blend.c:245 ../app/tools/gimpblendtool.c:108
+#: ../app/core/gimpdrawable-blend.c:245
+#: ../app/tools/gimpblendtool.c:107
 msgid "Blend"
 msgstr "Bland"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:72
+#: ../app/core/gimpdrawable-brightness-contrast.c:76
 msgid "Brightness_Contrast"
 msgstr "Lysstyrke/_Kontrast"
 
-#: ../app/core/gimpdrawable-brightness-contrast.c:102
-#: ../app/tools/gimpbrightnesscontrasttool.c:106
+#: ../app/core/gimpdrawable-brightness-contrast.c:87
+#: ../app/tools/gimpbrightnesscontrasttool.c:111
 msgid "Brightness-Contrast"
 msgstr "Lysstyrke-Kontrast"
 
-#: ../app/core/gimpdrawable-bucket-fill.c:89
+#: ../app/core/gimpdrawable-bucket-fill.c:91
 #, c-format
 msgid "No patterns available for this operation."
 msgstr "Ingen mønsterelement tilgjengelege for denne operasjonen."
 
-#: ../app/core/gimpdrawable-bucket-fill.c:284
-msgid "command|Bucket Fill"
-msgstr "Kommando: Fyll"
+#: ../app/core/gimpdrawable-bucket-fill.c:286
+#| msgid "Bucket Fill"
+msgctxt "command"
+msgid "Bucket Fill"
+msgstr "Fyll"
 
-#: ../app/core/gimpdrawable-color-balance.c:82
-#: ../app/core/gimpdrawable-color-balance.c:106
+#: ../app/core/gimpdrawable-color-balance.c:80
+#: ../app/core/gimpdrawable-color-balance.c:90
 #: ../app/tools/gimpcolorbalancetool.c:94
 msgid "Color Balance"
 msgstr "Fargebalanse"
 
-#: ../app/core/gimpdrawable-colorize.c:75
-#: ../app/core/gimpdrawable-colorize.c:99 ../app/tools/gimpcolorizetool.c:89
+#: ../app/core/gimpdrawable-colorize.c:73
+#: ../app/core/gimpdrawable-colorize.c:85
+#: ../app/tools/gimpcolorizetool.c:90
 msgid "Colorize"
 msgstr "Innfarging"
 
-#: ../app/core/gimpdrawable-curves.c:167 ../app/core/gimpdrawable-curves.c:203
-#: ../app/tools/gimpcurvestool.c:130
+#: ../app/core/gimpdrawable-curves.c:165
+#: ../app/core/gimpdrawable-curves.c:182
+#: ../app/tools/gimpcurvestool.c:140
 msgid "Curves"
 msgstr "Kurver"
 
-#: ../app/core/gimpdrawable-desaturate.c:75
-#: ../app/core/gimpdrawable-desaturate.c:120
-#: ../app/dialogs/desaturate-dialog.c:63
+#: ../app/core/gimpdrawable-desaturate.c:71
+#: ../app/core/gimpdrawable-desaturate.c:77
+#: ../app/tools/gimpdesaturatetool.c:77
 msgid "Desaturate"
 msgstr "Mindre metning"
 
-#: ../app/core/gimpdrawable-equalize.c:77
+#: ../app/core/gimpdrawable-equalize.c:53
 msgid "Equalize"
 msgstr "Jamn ut"
 
@@ -6018,22 +6000,23 @@ msgstr "Jamn ut"
 msgid "Foreground Extraction"
 msgstr "Trekk ut forgrunnen"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:80
+#: ../app/core/gimpdrawable-hue-saturation.c:78
 #: ../app/tools/gimphuesaturationtool.c:102
 msgid "Hue-Saturation"
 msgstr "Kulør/Metning"
 
-#: ../app/core/gimpdrawable-hue-saturation.c:104
+#: ../app/core/gimpdrawable-hue-saturation.c:88
 msgid "Hue_Saturation"
 msgstr "Kulør/_Metning"
 
-#: ../app/core/gimpdrawable-invert.c:59 ../app/core/gimpdrawable-invert.c:84
+#: ../app/core/gimpdrawable-invert.c:60
+#: ../app/core/gimpdrawable-invert.c:68
 msgid "Invert"
 msgstr "Inverter"
 
-#: ../app/core/gimpdrawable-levels.c:102 ../app/core/gimpdrawable-levels.c:136
-#: ../app/core/gimpdrawable-levels.c:184 ../app/core/gimpdrawable-levels.c:213
-#: ../app/tools/gimplevelstool.c:137
+#: ../app/core/gimpdrawable-levels.c:154
+#: ../app/core/gimpdrawable-levels.c:170
+#: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "Nivå"
 
@@ -6041,8 +6024,9 @@ msgstr "Nivå"
 msgid "Offset Drawable"
 msgstr "Forskyv teiknemediet"
 
-#: ../app/core/gimpdrawable-posterize.c:72
-#: ../app/core/gimpdrawable-posterize.c:99 ../app/tools/gimpposterizetool.c:84
+#: ../app/core/gimpdrawable-posterize.c:70
+#: ../app/core/gimpdrawable-posterize.c:80
+#: ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
 msgstr "Posterisering"
 
@@ -6050,29 +6034,39 @@ msgstr "Posterisering"
 msgid "Render Stroke"
 msgstr "Teikne strøk"
 
-#: ../app/core/gimpdrawable-threshold.c:73
-#: ../app/core/gimpdrawable-threshold.c:98 ../app/tools/gimpthresholdtool.c:90
+#: ../app/core/gimpdrawable-threshold.c:71
+#: ../app/core/gimpdrawable-threshold.c:82
+#: ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "Terskel"
 
-#: ../app/core/gimpdrawable-transform.c:627 ../app/tools/gimpfliptool.c:112
-msgid "command|Flip"
-msgstr "Kommando: Spegelvend"
+#: ../app/core/gimpdrawable-transform.c:629
+#: ../app/tools/gimpfliptool.c:116
+#| msgid "Flip"
+msgctxt "command"
+msgid "Flip"
+msgstr "Spegelvend"
 
-#: ../app/core/gimpdrawable-transform.c:713 ../app/tools/gimprotatetool.c:113
-msgid "command|Rotate"
-msgstr "Kommando: Roter"
+#: ../app/core/gimpdrawable-transform.c:716
+#: ../app/tools/gimprotatetool.c:121
+#| msgid "Rotate"
+msgctxt "command"
+msgid "Rotate"
+msgstr "Roter"
 
-#: ../app/core/gimpdrawable-transform.c:838 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:841
+#: ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "Transformasjonslag"
 
-#: ../app/core/gimpdrawable-transform.c:853
+#: ../app/core/gimpdrawable-transform.c:856
 msgid "Transformation"
 msgstr "Transformasjon"
 
-#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
-#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
+#: ../app/core/gimpgradient-load.c:71
+#: ../app/core/gimpgradient-load.c:96
+#: ../app/core/gimpgradient-load.c:117
+#: ../app/core/gimpgradient-load.c:168
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
 msgstr "Fatal tolkingsfeil i fargeovergangsfila «%s»: Lesefeil i linje %d."
@@ -6080,8 +6074,7 @@ msgstr "Fatal tolkingsfeil i fargeovergangsfila «%s»: Lesefeil i linje %d."
 #: ../app/core/gimpgradient-load.c:81
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
-msgstr ""
-"Fatal tolkingsfeil i fila «%s»: Dette er ikkje ei fargeovergangsfil for GIMP."
+msgstr "Fatal tolkingsfeil i fila «%s»: Dette er ikkje ei fargeovergangsfil for GIMP."
 
 #: ../app/core/gimpgradient-load.c:109
 #, c-format
@@ -6091,20 +6084,19 @@ msgstr "Ugyldig UTF-8-streng i fargeovergangsfila «%s»."
 #: ../app/core/gimpgradient-load.c:136
 #, c-format
 msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
-msgstr ""
-"Fatal tolkingsfeil i fargeovergangsfila «%s»: Fila er øydelagt i linje %d."
+msgstr "Fatal tolkingsfeil i fargeovergangsfila «%s»: Fila er øydelagt i linje %d."
 
-#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
+#: ../app/core/gimpgradient-load.c:218
+#: ../app/core/gimpgradient-load.c:229
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
-msgstr ""
-"Fatal tolkingsfeil i fargeovergangsfila «%s»: Øydelagt segment %d i linje %d."
+msgstr "Fatal tolkingsfeil i fargeovergangsfila «%s»: Øydelagt segment %d i linje %d."
 
-#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
+#: ../app/core/gimpgradient-load.c:241
+#: ../app/core/gimpgradient-load.c:255
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
-msgstr ""
-"Fargeovergangsfila  «%s» er øydelagt: Segmenta ikkje innføre området 0-1."
+msgstr "Fargeovergangsfila  «%s» er øydelagt: Segmenta ikkje innføre området 0-1."
 
 #: ../app/core/gimpgradient-load.c:334
 #, c-format
@@ -6125,8 +6117,7 @@ msgid "The foreground color of the grid."
 msgstr "Forgrunnsfargen for rutenettet."
 
 #: ../app/core/gimpgrid.c:95
-msgid ""
-"The background color of the grid; only used in double dashed line style."
+msgid "The background color of the grid; only used in double dashed line style."
 msgstr "Bakgrunnsfargen for rutenettet. Blir bare brukt ved dobbeltstreking."
 
 #: ../app/core/gimpgrid.c:101
@@ -6138,17 +6129,12 @@ msgid "Vertical spacing of grid lines."
 msgstr "Vertikal linjeavstand for rutenettet."
 
 #: ../app/core/gimpgrid.c:115
-msgid ""
-"Horizontal offset of the first grid line; this may be a negative number."
-msgstr ""
-"Horisontal forskyving av den første linja i rutenettet. Dette kan vere eit "
-"negativt tal."
+msgid "Horizontal offset of the first grid line; this may be a negative number."
+msgstr "Horisontal forskyving av den første linja i rutenettet. Dette kan vere eit negativt tal."
 
 #: ../app/core/gimpgrid.c:122
 msgid "Vertical offset of the first grid line; this may be a negative number."
-msgstr ""
-"Vertikal forskyving av den første linja i rutenettet. Dette kan vere eit "
-"negativt tal."
+msgstr "Vertikal forskyving av den første linja i rutenettet. Dette kan vere eit negativt tal."
 
 #: ../app/core/gimpimage-arrange.c:143
 msgid "Arrange Objects"
@@ -6166,36 +6152,39 @@ msgstr "Endre fargekartinnslag"
 msgid "Add Color to Colormap"
 msgstr "Legg farge til fargekartet"
 
-#: ../app/core/gimpimage-convert.c:790
+#: ../app/core/gimpimage-convert.c:792
 #, c-format
 msgid "Cannot convert image: palette is empty."
 msgstr "Kan ikkje konvertere biletet fordi paletten er tom."
 
-#: ../app/core/gimpimage-convert.c:804
+#: ../app/core/gimpimage-convert.c:806
 msgid "Convert Image to RGB"
 msgstr "Konverter biletet til RGB"
 
-#: ../app/core/gimpimage-convert.c:808
+#: ../app/core/gimpimage-convert.c:810
 msgid "Convert Image to Grayscale"
 msgstr "Konverter biletet til gråtoner"
 
-#: ../app/core/gimpimage-convert.c:812
+#: ../app/core/gimpimage-convert.c:814
 msgid "Convert Image to Indexed"
 msgstr "Konverter biletet til indeksert"
 
-#: ../app/core/gimpimage-convert.c:894
+#: ../app/core/gimpimage-convert.c:896
 msgid "Converting to indexed colors (stage 2)"
 msgstr "Konverterer til indekserte fargar (steg 2)"
 
-#: ../app/core/gimpimage-convert.c:939
+#: ../app/core/gimpimage-convert.c:941
 msgid "Converting to indexed colors (stage 3)"
 msgstr "Konverterer til indekserte fargar (steg 3)"
 
-#: ../app/core/gimpimage-crop.c:126
-msgid "command|Crop Image"
-msgstr "Kommando: Beskjer biletet"
+#: ../app/core/gimpimage-crop.c:130
+#| msgid "Crop image"
+msgctxt "command"
+msgid "Crop Image"
+msgstr "Beskjer bilete"
 
-#: ../app/core/gimpimage-crop.c:129 ../app/core/gimpimage-resize.c:90
+#: ../app/core/gimpimage-crop.c:133
+#: ../app/core/gimpimage-resize.c:90
 msgid "Resize Image"
 msgstr "Tilbakestill biletet"
 
@@ -6207,7 +6196,8 @@ msgstr "Legg til horisontal hjelpelinje"
 msgid "Add Vertical Guide"
 msgstr "Legg til vertikal hjelpelinje"
 
-#: ../app/core/gimpimage-guides.c:115 ../app/tools/gimpmovetool.c:546
+#: ../app/core/gimpimage-guides.c:115
+#: ../app/tools/gimpmovetool.c:564
 msgid "Remove Guide"
 msgstr "Fjern hjelpelinje"
 
@@ -6231,7 +6221,8 @@ msgstr "Roter elementa"
 msgid "Transform Items"
 msgstr "Transformer elementa"
 
-#: ../app/core/gimpimage-merge.c:102 ../app/core/gimpimage-merge.c:114
+#: ../app/core/gimpimage-merge.c:102
+#: ../app/core/gimpimage-merge.c:114
 msgid "Merge Visible Layers"
 msgstr "Flett saman synlege lag"
 
@@ -6264,7 +6255,8 @@ msgstr "Slå av snarmaske"
 msgid "Add Sample Point"
 msgstr "Legg til prøvepunkt"
 
-#: ../app/core/gimpimage-sample-points.c:98 ../app/tools/gimpcolortool.c:425
+#: ../app/core/gimpimage-sample-points.c:98
+#: ../app/tools/gimpcolortool.c:429
 msgid "Remove Sample Point"
 msgstr "Fjern prøvepunktet"
 
@@ -6272,188 +6264,178 @@ msgstr "Fjern prøvepunktet"
 msgid "Move Sample Point"
 msgstr "Flytt prøvepunktet"
 
-#: ../app/core/gimpimage-undo-push.c:855
+#: ../app/core/gimpimage-undo-push.c:863
 #, c-format
 msgid "Can't undo %s"
 msgstr "Kan ikkje angra %s"
 
-#: ../app/core/gimpimage.c:1475
+#: ../app/core/gimpimage.c:1506
 msgid "Change Image Resolution"
 msgstr "Endre oppløysinga for biletet"
 
-#: ../app/core/gimpimage.c:1515
+#: ../app/core/gimpimage.c:1550
 msgid "Change Image Unit"
 msgstr "Endre bileteining"
 
-#: ../app/core/gimpimage.c:2363
+#: ../app/core/gimpimage.c:2384
 msgid "Attach Parasite to Image"
 msgstr "Fest parasitt til biletet"
 
-#: ../app/core/gimpimage.c:2401
+#: ../app/core/gimpimage.c:2422
 msgid "Remove Parasite from Image"
 msgstr "Fjern parasitt frå biletet"
 
-#: ../app/core/gimpimage.c:2860
+#: ../app/core/gimpimage.c:2875
 msgid "Add Layer"
 msgstr "Legg til lag"
 
-#: ../app/core/gimpimage.c:2925 ../app/core/gimpimage.c:2938
+#: ../app/core/gimpimage.c:2935
+#: ../app/core/gimpimage.c:2948
 msgid "Remove Layer"
 msgstr "Fjern lag"
 
-#: ../app/core/gimpimage.c:3080
+#: ../app/core/gimpimage.c:3092
 msgid "Layer cannot be raised higher."
 msgstr "Laget kan ikkje løftast høgare."
 
-#: ../app/core/gimpimage.c:3085
+#: ../app/core/gimpimage.c:3097
 msgid "Raise Layer"
 msgstr "Løft lag"
 
-#: ../app/core/gimpimage.c:3102
+#: ../app/core/gimpimage.c:3116
 msgid "Layer cannot be lowered more."
 msgstr "Laget kan ikkje senkast lågare."
 
-#: ../app/core/gimpimage.c:3107
+#: ../app/core/gimpimage.c:3121
 msgid "Lower Layer"
 msgstr "Senk lag"
 
-#: ../app/core/gimpimage.c:3118
+#: ../app/core/gimpimage.c:3132
 msgid "Raise Layer to Top"
 msgstr "Løft lag til toppen"
 
-#: ../app/core/gimpimage.c:3133
+#: ../app/core/gimpimage.c:3147
 msgid "Lower Layer to Bottom"
 msgstr "Senk lag til botnen"
 
-#: ../app/core/gimpimage.c:3205
+#: ../app/core/gimpimage.c:3209
 msgid "Add Channel"
 msgstr "Legg til kanal"
 
-#: ../app/core/gimpimage.c:3250 ../app/core/gimpimage.c:3261
+#: ../app/core/gimpimage.c:3252
+#: ../app/core/gimpimage.c:3263
 msgid "Remove Channel"
 msgstr "Fjern kanal"
 
-#: ../app/core/gimpimage.c:3308
+#: ../app/core/gimpimage.c:3312
 msgid "Channel cannot be raised higher."
 msgstr "Kanalen kan ikkje løftast høgare."
 
-#: ../app/core/gimpimage.c:3313
+#: ../app/core/gimpimage.c:3317
 msgid "Raise Channel"
 msgstr "Løft kanal"
 
-#: ../app/core/gimpimage.c:3330
-msgid "Channel is already on top."
-msgstr "Kanalen er alt øvst."
-
-#: ../app/core/gimpimage.c:3335
+#: ../app/core/gimpimage.c:3328
 msgid "Raise Channel to Top"
 msgstr "Løft kanal til toppen"
 
-#: ../app/core/gimpimage.c:3352
+#: ../app/core/gimpimage.c:3348
 msgid "Channel cannot be lowered more."
 msgstr "Kanalen kan ikkje senkast lågare."
 
-#: ../app/core/gimpimage.c:3357
+#: ../app/core/gimpimage.c:3353
 msgid "Lower Channel"
 msgstr "Senk kanal"
 
-#: ../app/core/gimpimage.c:3377
-msgid "Channel is already on the bottom."
-msgstr "Kanalen er alt nedst."
-
-#: ../app/core/gimpimage.c:3382
+#: ../app/core/gimpimage.c:3368
 msgid "Lower Channel to Bottom"
 msgstr "Senk kanal til botnen"
 
-#: ../app/core/gimpimage.c:3456
+#: ../app/core/gimpimage.c:3432
 msgid "Add Path"
 msgstr "Legg til bane"
 
-#: ../app/core/gimpimage.c:3502
+#: ../app/core/gimpimage.c:3476
 msgid "Remove Path"
 msgstr "Fjern bane"
 
-#: ../app/core/gimpimage.c:3546
+#: ../app/core/gimpimage.c:3522
 msgid "Path cannot be raised higher."
 msgstr "Banen kan ikkje løftast høgare."
 
-#: ../app/core/gimpimage.c:3551
+#: ../app/core/gimpimage.c:3527
 msgid "Raise Path"
 msgstr "Løft bane"
 
-#: ../app/core/gimpimage.c:3568
-msgid "Path is already on top."
-msgstr "Banen er alt øvst."
-
-#: ../app/core/gimpimage.c:3573
+#: ../app/core/gimpimage.c:3538
 msgid "Raise Path to Top"
 msgstr "Løft banen til toppen"
 
-#: ../app/core/gimpimage.c:3590
+#: ../app/core/gimpimage.c:3557
 msgid "Path cannot be lowered more."
 msgstr "Banen kan ikkje senkast lågare."
 
-#: ../app/core/gimpimage.c:3595
+#: ../app/core/gimpimage.c:3562
 msgid "Lower Path"
 msgstr "Senk bane"
 
-#: ../app/core/gimpimage.c:3615
-msgid "Path is already on the bottom."
-msgstr "Banen er alt på botnen."
-
-#: ../app/core/gimpimage.c:3620
+#: ../app/core/gimpimage.c:3577
 msgid "Lower Path to Bottom"
 msgstr "Senk banen til botnen"
 
-#: ../app/core/gimpimagefile.c:547 ../app/dialogs/preferences-dialog.c:1736
+#: ../app/core/gimpimagefile.c:528
+#: ../app/dialogs/preferences-dialog.c:1727
 msgid "Folder"
 msgstr "Mappe"
 
-#: ../app/core/gimpimagefile.c:552
+#: ../app/core/gimpimagefile.c:533
 msgid "Special File"
 msgstr "Spesiell fil"
 
-#: ../app/core/gimpimagefile.c:568
+#: ../app/core/gimpimagefile.c:549
 msgid "Remote File"
 msgstr "Nettverksfil"
 
-#: ../app/core/gimpimagefile.c:587
+#: ../app/core/gimpimagefile.c:568
 msgid "Click to create preview"
 msgstr "Klikk for å lage førehandsvising"
 
-#: ../app/core/gimpimagefile.c:593
+#: ../app/core/gimpimagefile.c:574
 msgid "Loading preview..."
-msgstr "Laster førehandsvising..."
+msgstr "Laster førehandsvising …"
 
-#: ../app/core/gimpimagefile.c:599
+#: ../app/core/gimpimagefile.c:580
 msgid "Preview is out of date"
 msgstr "Førehandsvisinga er utdatert"
 
-#: ../app/core/gimpimagefile.c:605
+#: ../app/core/gimpimagefile.c:586
 msgid "Cannot create preview"
 msgstr "Kan ikkje lage førehandsvising"
 
-#: ../app/core/gimpimagefile.c:615
+#: ../app/core/gimpimagefile.c:596
 msgid "(Preview may be out of date)"
 msgstr "(Førehandsvisinga kan vere utdatert)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:624 ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:438 ../app/widgets/gimptemplateeditor.c:564
+#: ../app/core/gimpimagefile.c:605
+#: ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:438
+#: ../app/widgets/gimptemplateeditor.c:566
 #, c-format
 msgid "%d × %d pixel"
 msgid_plural "%d × %d pixels"
 msgstr[0] "%d × %d piksel"
 msgstr[1] "%d × %d pikslar"
 
-#: ../app/core/gimpimagefile.c:647 ../app/display/gimpdisplayshell-title.c:318
+#: ../app/core/gimpimagefile.c:628
+#: ../app/display/gimpdisplayshell-title.c:325
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
 msgstr[0] "1 lag"
 msgstr[1] "%d lag"
 
-#: ../app/core/gimpimagefile.c:694
+#: ../app/core/gimpimagefile.c:675
 #, c-format
 msgid "Could not open thumbnail '%s': %s"
 msgstr "Kunne ikkje opna miniatyren «%s»: %s"
@@ -6466,7 +6448,8 @@ msgstr "Fest parasitt"
 msgid "Attach Parasite to Item"
 msgstr "Fest parasitt til element"
 
-#: ../app/core/gimpitem.c:1190 ../app/core/gimpitem.c:1197
+#: ../app/core/gimpitem.c:1190
+#: ../app/core/gimpitem.c:1197
 msgid "Remove Parasite from Item"
 msgstr "Fjern parasitt frå element"
 
@@ -6478,20 +6461,18 @@ msgstr "Fjern det flytande utvalet"
 msgid "Anchor Floating Selection"
 msgstr "Forankre det flytande utvalet"
 
-#: ../app/core/gimplayer-floating-sel.c:205 ../app/core/gimplayer.c:643
+#: ../app/core/gimplayer-floating-sel.c:205
+#: ../app/core/gimplayer.c:643
 #, c-format
-msgid ""
-"Cannot create a new layer from the floating selection because it belongs to "
-"a layer mask or channel."
-msgstr ""
-"Kan ikkje oppretta nytt lag frå det flytande utvalet fordi dette høyrer til "
-"ei lagmaske eller ein kanal."
+msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel."
+msgstr "Kan ikkje oppretta nytt lag frå det flytande utvalet fordi dette høyrer til ei lagmaske eller ein kanal."
 
 #: ../app/core/gimplayer-floating-sel.c:211
 msgid "Floating Selection to Layer"
 msgstr "Flytande utval til lag"
 
-#: ../app/core/gimplayer.c:248 ../app/tools/tools-enums.c:209
+#: ../app/core/gimplayer.c:248
+#: ../app/tools/tools-enums.c:209
 msgid "Layer"
 msgstr "Lag"
 
@@ -6499,8 +6480,9 @@ msgstr "Lag"
 msgid "Rename Layer"
 msgstr "Gi laget nytt namn"
 
-#: ../app/core/gimplayer.c:250 ../app/pdb/layer_cmds.c:330
-#: ../app/pdb/layer_cmds.c:365
+#: ../app/core/gimplayer.c:250
+#: ../app/pdb/layer-cmds.c:434
+#: ../app/pdb/layer-cmds.c:470
 msgid "Move Layer"
 msgstr "Flytt laget"
 
@@ -6516,7 +6498,8 @@ msgstr "Spegelvend laget"
 msgid "Rotate Layer"
 msgstr "Roter laget"
 
-#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1324
+#: ../app/core/gimplayer.c:405
+#: ../app/core/gimplayer.c:1329
 #: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
@@ -6531,42 +6514,38 @@ msgstr ""
 "Flytande utval\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1254
-msgid "Cannot add layer mask to layer which is not part of an image."
-msgstr ""
-"Kan ikkje legge ei lagmaske til eit lag som ikkje er ein del av eit bilete."
-
-#: ../app/core/gimplayer.c:1261
+#: ../app/core/gimplayer.c:1265
+#, c-format
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "Kan ikkje legge til ei lagmaske fordi laget har ei slik maske frå før."
 
-#: ../app/core/gimplayer.c:1271
+#: ../app/core/gimplayer.c:1276
+#, c-format
 msgid "Cannot add layer mask of different dimensions than specified layer."
-msgstr ""
-"Kan ikkje legge til lagmaske med andre dimensjonar enn det det spesifiserte "
-"laget har."
+msgstr "Kan ikkje legge til lagmaske med andre dimensjonar enn det det spesifiserte laget har."
 
-#: ../app/core/gimplayer.c:1379
+#: ../app/core/gimplayer.c:1384
 msgid "Transfer Alpha to Mask"
 msgstr "Overfør alfa til maske"
 
-#: ../app/core/gimplayer.c:1551 ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:1556
+#: ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "Legg til lagmaske"
 
-#: ../app/core/gimplayer.c:1552
+#: ../app/core/gimplayer.c:1557
 msgid "Delete Layer Mask"
 msgstr "Slett lagmaske"
 
-#: ../app/core/gimplayer.c:1664
+#: ../app/core/gimplayer.c:1669
 msgid "Add Alpha Channel"
 msgstr "Legg til alfakanal"
 
-#: ../app/core/gimplayer.c:1718
+#: ../app/core/gimplayer.c:1723
 msgid "Remove Alpha Channel"
 msgstr "Fjern alfakanal"
 
-#: ../app/core/gimplayer.c:1740
+#: ../app/core/gimplayer.c:1745
 msgid "Layer to Image Size"
 msgstr "Laget til biletstorleik"
 
@@ -6594,9 +6573,11 @@ msgstr "Indeks %d"
 msgid "Unknown type of palette file: %s"
 msgstr "Ukjent type palettfil: %s"
 
-#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:110
-#: ../app/core/gimppalette-load.c:131 ../app/core/gimppalette-load.c:160
-#: ../app/core/gimppalette-load.c:237
+#: ../app/core/gimppalette-load.c:85
+#: ../app/core/gimppalette-load.c:110
+#: ../app/core/gimppalette-load.c:131
+#: ../app/core/gimppalette-load.c:160
+#: ../app/core/gimppalette-load.c:236
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
 msgstr "Fatal feil i palettfil «%s»: Lesefeil i linje %d."
@@ -6613,35 +6594,32 @@ msgstr "Ugyldig UTF-8-streng i palettfil «%s»"
 
 #: ../app/core/gimppalette-load.c:147
 #, c-format
-msgid ""
-"Reading palette file '%s': Invalid number of columns in line %d. Using "
-"default value."
-msgstr ""
-"Les palettfila «%s»: Ugyldig tal på kolonner i linje %d. Bruker "
-"standardverdi."
+msgid "Reading palette file '%s': Invalid number of columns in line %d. Using default value."
+msgstr "Les palettfila «%s»: Ugyldig tal på kolonner i linje %d. Bruker standardverdi."
 
-#. maybe we should just abort?
-#: ../app/core/gimppalette-load.c:184
+#: ../app/core/gimppalette-load.c:183
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
 msgstr "Les palettfila «%s»: Manglar RAUD komponent på linje %d."
 
-#: ../app/core/gimppalette-load.c:192
+#: ../app/core/gimppalette-load.c:191
 #, c-format
-msgid "Reading palette '%s': Missing GREEN component in line %d."
-msgstr "Les palettfila «%s»: Manglar GRØN komponent på linje %d."
+#| msgid "Reading palette file '%s': Missing RED component in line %d."
+msgid "Reading palette file '%s': Missing GREEN component in line %d."
+msgstr "Les palettfila «%s»: Manglar GRØN komponent i linje %d."
 
-#: ../app/core/gimppalette-load.c:200
+#: ../app/core/gimppalette-load.c:199
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
 msgstr "Les palettfila «%s»: Manglar BLÅ komponent på linje %d."
 
-#: ../app/core/gimppalette-load.c:210
+#: ../app/core/gimppalette-load.c:209
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
 msgstr "Les palettfila «%s»: RGB-verdi utanfor gyldig område på linje %d."
 
-#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131
+#: ../app/core/gimppattern-load.c:85
+#: ../app/core/gimppattern-load.c:131
 #: ../app/core/gimppattern-load.c:162
 #, c-format
 msgid "Fatal parse error in pattern file '%s': File appears truncated."
@@ -6649,8 +6627,7 @@ msgstr "Fatal feil i penselfila «%s»: Det ser ut som fila er avkutta."
 
 #: ../app/core/gimppattern-load.c:104
 #, c-format
-msgid ""
-"Fatal parse error in pattern file '%s': Unknown pattern format version %d."
+msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d."
 msgstr "Fatal feil i mønsterfil «%s»: Ukjent mønsterformatversjon %d."
 
 #: ../app/core/gimppattern-load.c:114
@@ -6667,16 +6644,19 @@ msgstr ""
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "Ugyldig UTF-8-streng i mønsterfila «%s»."
 
-#: ../app/core/gimppdbprogress.c:288 ../app/widgets/gimppdbdialog.c:352
+#: ../app/core/gimppdbprogress.c:288
+#: ../app/widgets/gimppdbdialog.c:352
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
 msgstr "Kan ikkje køyre  %s ein gong till. Programtillegget kan ka krasja."
 
-#: ../app/core/gimpprogress.c:107 ../app/core/gimpprogress.c:154
+#: ../app/core/gimpprogress.c:107
+#: ../app/core/gimpprogress.c:154
 msgid "Please wait"
-msgstr "Vent litt ..."
+msgstr "Vent litt …"
 
-#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:199
+#: ../app/core/gimpselection.c:150
+#: ../app/tools/gimpeditselectiontool.c:240
 msgid "Move Selection"
 msgstr "Flytt utvalet"
 
@@ -6706,40 +6686,37 @@ msgstr "Det er ingen utval å streke opp"
 msgid "Unable to cut or copy because the selected region is empty."
 msgstr "Kunne ikkje klippe ut eller kopiere fordi det valde området er tomt."
 
-#: ../app/core/gimpselection.c:817
+#: ../app/core/gimpselection.c:814
 #, c-format
 msgid "Cannot float selection because the selected region is empty."
 msgstr "Kan ikkje gjere utvalet flytande fordi det valde området er tomt."
 
-#: ../app/core/gimpselection.c:824
+#: ../app/core/gimpselection.c:821
 msgid "Float Selection"
 msgstr "Flytande utval"
 
-#: ../app/core/gimpselection.c:841
+#: ../app/core/gimpselection.c:837
 msgid "Floated Layer"
 msgstr "Flytande lag"
 
 #: ../app/core/gimpstrokeoptions.c:119
-msgid ""
-"Convert a mitered join to a bevelled join if the miter would extend to a "
-"distance of more than miter-limit * line-width from the actual join point."
-msgstr ""
-"Omform ei hjørnekopling til spissvinkelkopling dersom hjørnet blir utvida "
-"til meir enn hjørnegrense * linjebreidde frå det aktuelle koplingspunktet"
+msgid "Convert a mitered join to a bevelled join if the miter would extend to a distance of more than miter-limit * line-width from the actual join point."
+msgstr "Omform ei hjørnekopling til spissvinkelkopling dersom hjørnet blir utvida til meir enn hjørnegrense * linjebreidde frå det aktuelle koplingspunktet"
 
-#: ../app/core/gimptemplate.c:119
+#: ../app/core/gimptemplate.c:106
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
 msgstr "Eining brukt på koordinata når ikkje punkt-for-ppunkt-modus er i bruk."
 
-#: ../app/core/gimptemplate.c:126
+#: ../app/core/gimptemplate.c:113
 msgid "The horizontal image resolution."
 msgstr "Horisontal biletoppløysing"
 
-#: ../app/core/gimptemplate.c:131
+#: ../app/core/gimptemplate.c:119
 msgid "The vertical image resolution."
 msgstr "Vertikal bileteoppløysing"
 
-#: ../app/core/gimptemplate.c:416 ../app/widgets/widgets-enums.c:24
+#: ../app/core/gimptemplate.c:405
+#: ../app/widgets/widgets-enums.c:24
 msgid "Background"
 msgstr "Bakgrunn"
 
@@ -6748,9 +6725,12 @@ msgstr "Bakgrunn"
 msgid "pixel"
 msgstr "piksel"
 
-#: ../app/core/gimpunit.c:56 ../app/tools/gimpmeasuretool.c:874
-#: ../app/tools/gimpmeasuretool.c:1017 ../app/tools/gimpmeasuretool.c:1073
-#: ../app/tools/gimpmeasuretool.c:1101 ../app/tools/gimppainttool.c:604
+#: ../app/core/gimpunit.c:56
+#: ../app/tools/gimpmeasuretool.c:877
+#: ../app/tools/gimpmeasuretool.c:1020
+#: ../app/tools/gimpmeasuretool.c:1076
+#: ../app/tools/gimpmeasuretool.c:1104
+#: ../app/tools/gimppainttool.c:615
 msgid "pixels"
 msgstr "pikslar"
 
@@ -6800,10 +6780,8 @@ msgstr "plural|prosent"
 msgid "Visit the GIMP website"
 msgstr "Besøk GIMP si nettside"
 
-#. Translators: insert your names here,
-#. * separated by newline
-#.
-#: ../app/dialogs/about-dialog.c:130
+#. Translators: insert your names here, separated by newline
+#: ../app/dialogs/about-dialog.c:128
 msgid "translator-credits"
 msgstr ""
 "Kolbjørn Stuestøl\n"
@@ -6848,7 +6826,8 @@ msgid "_Remove unused colors from colormap"
 msgstr "_Fjern ubrukte fargar frå fargekartet"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:232 ../app/tools/gimpblendoptions.c:237
+#: ../app/dialogs/convert-dialog.c:232
+#: ../app/tools/gimpblendoptions.c:247
 msgid "Dithering"
 msgstr "Utjamning"
 
@@ -6865,75 +6844,66 @@ msgid "Converting to indexed colors"
 msgstr "Konverterer til indekserte fargar"
 
 #: ../app/dialogs/convert-dialog.c:414
+#: ../app/pdb/convert-cmds.c:150
+#, c-format
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "Kan ikkje konvertere ein palett med over 256 fargar."
 
-#: ../app/dialogs/desaturate-dialog.c:65
-msgid "Remove Colors"
-msgstr "Fjern fargane"
-
-#: ../app/dialogs/desaturate-dialog.c:75
-msgid "_Desaturate"
-msgstr "_Mindre metning"
-
-#: ../app/dialogs/desaturate-dialog.c:97
-msgid "Choose shade of gray based on:"
-msgstr "Lag gråtonene ut frå"
-
-#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:171
-#: ../app/gui/gui-message.c:146
+#: ../app/dialogs/dialogs-constructors.c:184
+#: ../app/gui/gui.c:161
+#: ../app/gui/gui-message.c:148
 msgid "GIMP Message"
 msgstr "GIMP-melding"
 
-#: ../app/dialogs/dialogs.c:134
+#: ../app/dialogs/dialogs.c:142
 msgid "Devices"
-msgstr "Einingar"
+msgstr "Utstyr"
 
-#: ../app/dialogs/dialogs.c:134
+#: ../app/dialogs/dialogs.c:142
 msgid "Device Status"
-msgstr "Einingsstatus"
+msgstr "Utstyrstatus"
 
-#: ../app/dialogs/dialogs.c:138
+#: ../app/dialogs/dialogs.c:146
 msgid "Errors"
 msgstr "Feil"
 
-#: ../app/dialogs/dialogs.c:163
+#: ../app/dialogs/dialogs.c:171
 msgid "History"
 msgstr "Logg"
 
-#: ../app/dialogs/dialogs.c:165
+#: ../app/dialogs/dialogs.c:173
 msgid "Image Templates"
 msgstr "Biletmalar"
 
-#: ../app/dialogs/dialogs.c:186
+#: ../app/dialogs/dialogs.c:194
 msgid "Histogram"
 msgstr "Histogram"
 
-#: ../app/dialogs/dialogs.c:190
+#: ../app/dialogs/dialogs.c:198
 msgid "Selection Editor"
 msgstr "Utvalsbehandlar"
 
-#: ../app/dialogs/dialogs.c:194
+#: ../app/dialogs/dialogs.c:202
 msgid "Undo"
 msgstr "Angre"
 
-#: ../app/dialogs/dialogs.c:194
+#: ../app/dialogs/dialogs.c:202
 msgid "Undo History"
 msgstr "Angrelogg"
 
-#: ../app/dialogs/dialogs.c:204
+#: ../app/dialogs/dialogs.c:212
 msgid "Navigation"
 msgstr "Navigering"
 
-#: ../app/dialogs/dialogs.c:204
+#: ../app/dialogs/dialogs.c:212
 msgid "Display Navigation"
 msgstr "Vis navigering"
 
-#: ../app/dialogs/dialogs.c:210
+#: ../app/dialogs/dialogs.c:218
 msgid "FG/BG"
 msgstr "Forgrunn/bakgrunn"
 
-#: ../app/dialogs/dialogs.c:210
+#: ../app/dialogs/dialogs.c:218
 msgid "FG/BG Color"
 msgstr "Forgrunns-/bakgrunnsfarge"
 
@@ -6944,7 +6914,7 @@ msgstr "Ton ut %s"
 
 #: ../app/dialogs/fade-dialog.c:123
 msgid "_Fade"
-msgstr "_Uttoning..."
+msgstr "_Uttoning …"
 
 #: ../app/dialogs/fade-dialog.c:157
 msgid "_Mode:"
@@ -6954,7 +6924,7 @@ msgstr "_Modus:"
 msgid "_Opacity:"
 msgstr "_Dekkevne:"
 
-#: ../app/dialogs/file-open-dialog.c:230
+#: ../app/dialogs/file-open-dialog.c:253
 msgid "Open layers"
 msgstr "Opna lag"
 
@@ -6966,33 +6936,24 @@ msgstr "Opna adressa"
 msgid "Enter location (URI):"
 msgstr "Skriv inn nettadressa (URI):"
 
-#: ../app/dialogs/file-save-dialog.c:293 ../app/dialogs/file-save-dialog.c:329
-msgid ""
-"The given filename does not have any known file extension. Please enter a "
-"known file extension or select a file format from the file format list."
-msgstr ""
-"Filnamnet har ukjend filutviding. Legg til eit kjent etternamn eller vel frå "
-"filformatlista."
+#: ../app/dialogs/file-save-dialog.c:302
+#: ../app/dialogs/file-save-dialog.c:338
+msgid "The given filename does not have any known file extension. Please enter a known file extension or select a file format from the file format list."
+msgstr "Filnamnet har ukjend filutviding. Legg til eit kjent etternamn eller vel frå filformatlista."
 
-#: ../app/dialogs/file-save-dialog.c:362
-msgid ""
-"Saving remote files needs to determine the file format from the file "
-"extension. Please enter a file extension that matches the selected file "
-"format or enter no file extension at all."
-msgstr ""
-"Når du lagrar over eit nettverk, må systemet kunne bestemma filtypen ut frå "
-"filendinga. Skriv inn ei filending som passar med det valde filformatet, "
-"eller ikkje noe filending i det heile."
+#: ../app/dialogs/file-save-dialog.c:371
+msgid "Saving remote files needs to determine the file format from the file extension. Please enter a file extension that matches the selected file format or enter no file extension at all."
+msgstr "Når du lagrar over eit nettverk, må systemet kunne bestemma filtypen ut frå filendinga. Skriv inn ei filending som passar med det valde filformatet, eller ikkje noe filending i det heile."
 
-#: ../app/dialogs/file-save-dialog.c:419
+#: ../app/dialogs/file-save-dialog.c:428
 msgid "Extension Mismatch"
 msgstr "Filutvidinga er feil"
 
-#: ../app/dialogs/file-save-dialog.c:435
+#: ../app/dialogs/file-save-dialog.c:444
 msgid "The given file extension does not match the chosen file type."
 msgstr "Filutvidinga passar ikkje med vald filtype"
 
-#: ../app/dialogs/file-save-dialog.c:439
+#: ../app/dialogs/file-save-dialog.c:448
 msgid "Do you want to save the image using this name anyway?"
 msgstr "Vil du likevel lagre biletet med dette namnet?"
 
@@ -7041,28 +7002,24 @@ msgid "Create a New Image"
 msgstr "Lage eit nytt bilete"
 
 #: ../app/dialogs/image-new-dialog.c:144
-#: ../app/dialogs/preferences-dialog.c:1987
+#: ../app/dialogs/preferences-dialog.c:2021
 msgid "_Template:"
 msgstr "_Mal:"
 
-#: ../app/dialogs/image-new-dialog.c:292
+#: ../app/dialogs/image-new-dialog.c:299
 msgid "Confirm Image Size"
 msgstr "Bekreft storleiken på biletet"
 
-#: ../app/dialogs/image-new-dialog.c:314
-#: ../app/dialogs/image-scale-dialog.c:237
+#: ../app/dialogs/image-new-dialog.c:321
+#: ../app/dialogs/image-scale-dialog.c:239
 #, c-format
 msgid "You are trying to create an image with a size of %s."
 msgstr "Du prøver å opprette eit bilete med storleiken %s."
 
-#: ../app/dialogs/image-new-dialog.c:321
+#: ../app/dialogs/image-new-dialog.c:328
 #, c-format
-msgid ""
-"An image of the chosen size will use more memory than what is configured as "
-"\"Maximum Image Size\" in the Preferences dialog (currently %s)."
-msgstr ""
-"Eit bilete i denne storleiken vil bruke meir minne enn det som er sett i  "
-"«maksimal biletstorleik» i innstillingsvindauget (gjeldande verdi er %s)."
+msgid "An image of the chosen size will use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
+msgstr "Eit bilete i denne storleiken vil bruke meir minne enn det som er sett i  «maksimal biletstorleik» i innstillingsvindauget (gjeldande verdi er %s)."
 
 #: ../app/dialogs/image-properties-dialog.c:60
 #: ../app/dialogs/image-properties-dialog.c:63
@@ -7081,52 +7038,41 @@ msgstr "Fargeprofil"
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../app/dialogs/image-scale-dialog.c:109
-msgid "dialog-title|Scale Image"
+#: ../app/dialogs/image-scale-dialog.c:111
+#| msgid "Scale Image"
+msgctxt "dialog-title"
+msgid "Scale Image"
 msgstr "Skaler biletet"
 
-#: ../app/dialogs/image-scale-dialog.c:203
+#: ../app/dialogs/image-scale-dialog.c:205
 msgid "Confirm Scaling"
 msgstr "Bekreft skalering"
 
-#: ../app/dialogs/image-scale-dialog.c:243
+#: ../app/dialogs/image-scale-dialog.c:245
 #, c-format
-msgid ""
-"Scaling the image to the chosen size will make it use more memory than what "
-"is configured as \"Maximum Image Size\" in the Preferences dialog (currently "
-"%s)."
-msgstr ""
-"Å skalere biletet til denne storleiken vil bruke meir minne enn det som er "
-"sett i  «maksimal biletstorleik» i innstillingsvindauget (gjeldande verdi er "
-"%s)."
+msgid "Scaling the image to the chosen size will make it use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
+msgstr "Å skalere biletet til denne storleiken vil bruke meir minne enn det som er sett i  «maksimal biletstorleik» i innstillingsvindauget (gjeldande verdi er %s)."
 
-#: ../app/dialogs/image-scale-dialog.c:258
-msgid ""
-"Scaling the image to the chosen size will shrink some layers completely away."
-msgstr ""
-"Skalering av biletet til denne storleiken vil føre til at noen av laga blir "
-"krympa heilt bort."
+#: ../app/dialogs/image-scale-dialog.c:260
+msgid "Scaling the image to the chosen size will shrink some layers completely away."
+msgstr "Skalering av biletet til denne storleiken vil føre til at noen av laga blir krympa heilt bort."
 
-#: ../app/dialogs/image-scale-dialog.c:262
+#: ../app/dialogs/image-scale-dialog.c:264
 msgid "Is this what you want to do?"
 msgstr "Er det dette du ønskjer å gjere?"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:50
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:49
 msgid "Configure Keyboard Shortcuts"
 msgstr "Set opp tastatursnarvegane"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:83
-msgid ""
-"To edit a shortcut key, click on the corresponding row and type a new "
-"accelerator, or press backspace to clear."
-msgstr ""
-"For å endre ein snarvegtast klikkar du i ei rad og trykker ønskt tast eller "
-"trykk «Tilbake»-tasten for å slette"
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:73
+msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear."
+msgstr "For å endre ein snarvegtast klikkar du i ei rad og trykker ønskt tast eller trykk «Tilbake»-tasten for å slette"
 
-#: ../app/dialogs/keyboard-shortcuts-dialog.c:91
-#: ../app/dialogs/preferences-dialog.c:1660
-msgid "_Save keyboard shortcuts on exit"
-msgstr "_Lagra tastatursnarvegane ved avslutning"
+#: ../app/dialogs/keyboard-shortcuts-dialog.c:81
+#| msgid "_Save keyboard shortcuts on exit"
+msgid "S_ave keyboard shortcuts on exit"
+msgstr "_Lagra tastesnarvegane ved avslutning"
 
 #: ../app/dialogs/layer-add-mask-dialog.c:83
 msgid "Add a Mask to the Layer"
@@ -7136,7 +7082,7 @@ msgstr "Legg ei lagmaske til laget"
 msgid "Initialize Layer Mask to:"
 msgstr "Set startverdien for lagmaska til:"
 
-#: ../app/dialogs/layer-add-mask-dialog.c:140
+#: ../app/dialogs/layer-add-mask-dialog.c:138
 msgid "In_vert mask"
 msgstr "In_verter maska"
 
@@ -7146,12 +7092,12 @@ msgstr "_Namn på lag:"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1062
+#: ../app/tools/gimpmeasuretool.c:1065
 msgid "Width:"
 msgstr "Breidde:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1090
+#: ../app/tools/gimpmeasuretool.c:1093
 msgid "Height:"
 msgstr "Høgde:"
 
@@ -7163,83 +7109,50 @@ msgstr "Fylltype for laget"
 msgid "Set name from _text"
 msgstr "Opprett namn frå _tekst"
 
-#: ../app/dialogs/module-dialog.c:118
-msgid "Manage Loadable Modules"
-msgstr "Handtere lastbare modular"
+#: ../app/dialogs/module-dialog.c:127
+#| msgid "_Module Manager"
+msgid "Module Manager"
+msgstr "Modulhandterar"
 
-#: ../app/dialogs/module-dialog.c:167
-msgid "Autoload"
-msgstr "Autolast"
+#: ../app/dialogs/module-dialog.c:150
+#| msgid ""
+#| "You will have to restart GIMP for the following changes to take effect:"
+msgid "You will have to restart GIMP for the changes to take effect."
+msgstr "Du må starte GIMP på nytt for at endringar skal tre i kraft."
 
-#: ../app/dialogs/module-dialog.c:174
-msgid "Module Path"
-msgstr "Modulbane"
+#: ../app/dialogs/module-dialog.c:191
+#| msgid "Modules"
+msgid "Module"
+msgstr "Modul"
 
-#: ../app/dialogs/module-dialog.c:424
-msgid ""
-msgstr ""
-
-#: ../app/dialogs/module-dialog.c:436 ../app/dialogs/module-dialog.c:445
-msgid "On disk"
-msgstr "På disk"
-
-#: ../app/dialogs/module-dialog.c:436
+#: ../app/dialogs/module-dialog.c:464
 msgid "Only in memory"
 msgstr "Bare i minne"
 
-#: ../app/dialogs/module-dialog.c:445
+#: ../app/dialogs/module-dialog.c:469
 msgid "No longer available"
 msgstr "Ikkje lenger tilgjengeleg"
 
-#: ../app/dialogs/module-dialog.c:481
-msgid "Load"
-msgstr "Last"
-
-#: ../app/dialogs/module-dialog.c:483
-msgid "Query"
-msgstr "Spørring"
-
-#: ../app/dialogs/module-dialog.c:490
-msgid "Unload"
-msgstr "Frigi"
-
-#: ../app/dialogs/module-dialog.c:505
-msgid "Purpose:"
-msgstr "Beskriving:"
-
-#: ../app/dialogs/module-dialog.c:506
+#: ../app/dialogs/module-dialog.c:498
 msgid "Author:"
 msgstr "Forfattar:"
 
-#: ../app/dialogs/module-dialog.c:507
+#: ../app/dialogs/module-dialog.c:499
 msgid "Version:"
 msgstr "Versjon:"
 
-#: ../app/dialogs/module-dialog.c:508
-msgid "Copyright:"
-msgstr "Opphavsrett:"
-
-#: ../app/dialogs/module-dialog.c:509
+#: ../app/dialogs/module-dialog.c:500
 msgid "Date:"
 msgstr "Dato:"
 
-#: ../app/dialogs/module-dialog.c:510
+#: ../app/dialogs/module-dialog.c:501
+msgid "Copyright:"
+msgstr "Opphavsrett:"
+
+#: ../app/dialogs/module-dialog.c:502
 msgid "Location:"
 msgstr "Adresse:"
 
-#: ../app/dialogs/module-dialog.c:511
-#: ../app/widgets/gimpcontrollereditor.c:233
-msgid "State:"
-msgstr "Tilstand:"
-
-#: ../app/dialogs/module-dialog.c:512
-msgid "Last error:"
-msgstr "Siste feil:"
-
-#: ../app/dialogs/module-dialog.c:513
-msgid "Available types:"
-msgstr "Tilgjengelege typar:"
-
 #: ../app/dialogs/offset-dialog.c:108
 msgid "Offset Layer"
 msgstr "Forskyv laget"
@@ -7253,8 +7166,10 @@ msgid "Offset Channel"
 msgstr "Forskyv kanalen"
 
 #. The offset frame
-#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:268
+#: ../app/dialogs/offset-dialog.c:118
+#: ../app/dialogs/offset-dialog.c:152
+#: ../app/dialogs/resize-dialog.c:197
+#: ../app/widgets/gimpgrideditor.c:276
 msgid "Offset"
 msgstr "Forskyving"
 
@@ -7263,11 +7178,13 @@ msgstr "Forskyving"
 msgid "_Offset"
 msgstr "_Forskyving"
 
-#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:226
+#: ../app/dialogs/offset-dialog.c:184
+#: ../app/dialogs/resize-dialog.c:226
 msgid "_X:"
 msgstr "_X:"
 
-#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:227
+#: ../app/dialogs/offset-dialog.c:186
+#: ../app/dialogs/resize-dialog.c:227
 msgid "_Y:"
 msgstr "_Y:"
 
@@ -7360,763 +7277,767 @@ msgstr "Førehandsvis"
 msgid "The selected source contains no colors."
 msgstr "Den valde kjelda inneheld ingen fargar"
 
-#: ../app/dialogs/preferences-dialog.c:265
+#: ../app/dialogs/preferences-dialog.c:267
 msgid "Reset All Preferences"
 msgstr "Tilbakestill alle innstillingane"
 
-#: ../app/dialogs/preferences-dialog.c:283
+#: ../app/dialogs/preferences-dialog.c:285
 msgid "Do you really want to reset all preferences to default values?"
-msgstr ""
-"Er du sikker på at du vil setje alle innstillingane til standardverdiane?"
+msgstr "Er du sikker på at du vil setje alle innstillingane til standardverdiane?"
 
-#: ../app/dialogs/preferences-dialog.c:353
+#: ../app/dialogs/preferences-dialog.c:355
 msgid "You will have to restart GIMP for the following changes to take effect:"
 msgstr "Du må starte GIMP på nytt for at følgjande endringar skal tre i kraft:"
 
-#: ../app/dialogs/preferences-dialog.c:492
+#: ../app/dialogs/preferences-dialog.c:500
 msgid "Configure Input Devices"
-msgstr "Set opp _utvida inndataeiningar..."
+msgstr "Set opp _utvida inndataeiningar …"
 
-#: ../app/dialogs/preferences-dialog.c:569
-msgid ""
-"Your keyboard shortcuts will be reset to default values the next time you "
-"start GIMP."
-msgstr ""
-"Tastatursnarvegane dine blir tilbakestilte til standardverdiane neste gang "
-"du opnar GIMP."
+#: ../app/dialogs/preferences-dialog.c:577
+msgid "Your keyboard shortcuts will be reset to default values the next time you start GIMP."
+msgstr "Tastatursnarvegane dine blir tilbakestilte til standardverdiane neste gang du opnar GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:580
+#: ../app/dialogs/preferences-dialog.c:588
 msgid "Remove all Keyboard Shortcuts"
 msgstr "Fjern alle snarvegtastane"
 
-#: ../app/dialogs/preferences-dialog.c:602
+#: ../app/dialogs/preferences-dialog.c:610
 msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "Vil du verkeleg fjerne alle snarvegtastane frå alle menyane?"
 
-#: ../app/dialogs/preferences-dialog.c:643
-msgid ""
-"Your window setup will be reset to default values the next time you start "
-"GIMP."
-msgstr ""
-"Vidaugeinnstillingane dine vil bli sett tilbake til standardverdiane neste "
-"gong du opnar GIMP."
+#: ../app/dialogs/preferences-dialog.c:651
+msgid "Your window setup will be reset to default values the next time you start GIMP."
+msgstr "Vidaugeinnstillingane dine vil bli sett tilbake til standardverdiane neste gong du opnar GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:678
-msgid ""
-"Your input device settings will be reset to default values the next time you "
-"start GIMP."
-msgstr ""
-"Innstillingane dine for inndataeiningane blir sett til standardverdiane "
-"neste gang du opnar GIMP."
+#: ../app/dialogs/preferences-dialog.c:686
+msgid "Your input device settings will be reset to default values the next time you start GIMP."
+msgstr "Innstillingane dine for inndataeiningane blir sett til standardverdiane neste gang du opnar GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:713
-msgid ""
-"Your tool options will be reset to default values the next time you start "
-"GIMP."
-msgstr ""
-"Verktøyinnstillingane dine blir tilbakestilte til standardverdiane neste "
-"gang du opnar GIMP."
+#: ../app/dialogs/preferences-dialog.c:721
+msgid "Your tool options will be reset to default values the next time you start GIMP."
+msgstr "Verktøyinnstillingane dine blir tilbakestilte til standardverdiane neste gang du opnar GIMP."
 
-#: ../app/dialogs/preferences-dialog.c:1298
+#: ../app/dialogs/preferences-dialog.c:1289
 msgid "Show _menubar"
 msgstr "Vis _menylinja"
 
-#: ../app/dialogs/preferences-dialog.c:1302
+#: ../app/dialogs/preferences-dialog.c:1293
 msgid "Show _rulers"
 msgstr "Vis _linjalane"
 
-#: ../app/dialogs/preferences-dialog.c:1305
+#: ../app/dialogs/preferences-dialog.c:1296
 msgid "Show scroll_bars"
 msgstr "Vis _rullefelta"
 
-#: ../app/dialogs/preferences-dialog.c:1308
+#: ../app/dialogs/preferences-dialog.c:1299
 msgid "Show s_tatusbar"
 msgstr "Vis _statuslinja"
 
-#: ../app/dialogs/preferences-dialog.c:1316
+#: ../app/dialogs/preferences-dialog.c:1307
 msgid "Show s_election"
 msgstr "Vis _utval"
 
-#: ../app/dialogs/preferences-dialog.c:1319
+#: ../app/dialogs/preferences-dialog.c:1310
 msgid "Show _layer boundary"
 msgstr "Vis lag_grense"
 
-#: ../app/dialogs/preferences-dialog.c:1322
+#: ../app/dialogs/preferences-dialog.c:1313
 msgid "Show _guides"
 msgstr "Vis _hjelpelinjer"
 
-#: ../app/dialogs/preferences-dialog.c:1325
+#: ../app/dialogs/preferences-dialog.c:1316
 msgid "Show gri_d"
 msgstr "Vis r_utenett"
 
-#: ../app/dialogs/preferences-dialog.c:1331
+#: ../app/dialogs/preferences-dialog.c:1322
 msgid "Canvas _padding mode:"
 msgstr "Lerret_fyllmodus:"
 
-#: ../app/dialogs/preferences-dialog.c:1336
+#: ../app/dialogs/preferences-dialog.c:1327
 msgid "Custom p_adding color:"
 msgstr "Eigendefinert _lerretfarge"
 
-#: ../app/dialogs/preferences-dialog.c:1337
+#: ../app/dialogs/preferences-dialog.c:1328
 msgid "Select Custom Canvas Padding Color"
 msgstr "Vel eigendefinert lerretfarge"
 
-#: ../app/dialogs/preferences-dialog.c:1426
+#: ../app/dialogs/preferences-dialog.c:1417
 msgid "Preferences"
 msgstr "Innstillingar"
 
-#: ../app/dialogs/preferences-dialog.c:1538
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:1529
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment"
 msgstr "Omgivnader"
 
-#: ../app/dialogs/preferences-dialog.c:1552
+#: ../app/dialogs/preferences-dialog.c:1543
 msgid "Resource Consumption"
 msgstr "Ressursbruk"
 
-#: ../app/dialogs/preferences-dialog.c:1562
+#: ../app/dialogs/preferences-dialog.c:1553
 msgid "Minimal number of _undo levels:"
 msgstr "Minimum _angrenivå:"
 
-#: ../app/dialogs/preferences-dialog.c:1565
+#: ../app/dialogs/preferences-dialog.c:1556
 msgid "Maximum undo _memory:"
 msgstr "Maksimalt angre_minne:"
 
-#: ../app/dialogs/preferences-dialog.c:1568
+#: ../app/dialogs/preferences-dialog.c:1559
 msgid "Tile cache _size:"
 msgstr "_Storleik på mellomlageret:"
 
-#: ../app/dialogs/preferences-dialog.c:1571
+#: ../app/dialogs/preferences-dialog.c:1562
 msgid "Maximum _new image size:"
 msgstr "Maksimumsformat for _nye bilete:"
 
-#: ../app/dialogs/preferences-dialog.c:1576
+#: ../app/dialogs/preferences-dialog.c:1567
 msgid "Number of _processors to use:"
 msgstr "Talet på _prosessorar som kan brukast:"
 
 #. Image Thumbnails
-#: ../app/dialogs/preferences-dialog.c:1581
+#: ../app/dialogs/preferences-dialog.c:1572
 msgid "Image Thumbnails"
 msgstr "Biletminiatyrar"
 
-#: ../app/dialogs/preferences-dialog.c:1586
+#: ../app/dialogs/preferences-dialog.c:1577
 msgid "Size of _thumbnails:"
 msgstr "Storleik på _miniatyrbileta:"
 
-#: ../app/dialogs/preferences-dialog.c:1590
+#: ../app/dialogs/preferences-dialog.c:1581
 msgid "Maximum _filesize for thumbnailing:"
 msgstr "Maksimal filstorleik for miniatyrar:"
 
 #. File Saving
-#: ../app/dialogs/preferences-dialog.c:1594
+#: ../app/dialogs/preferences-dialog.c:1585
 msgid "Saving Images"
 msgstr "Biletlagringa"
 
-#: ../app/dialogs/preferences-dialog.c:1597
+#: ../app/dialogs/preferences-dialog.c:1588
 msgid "Confirm closing of unsa_ved images"
 msgstr "Bekreft lukking av _ulagra bilete"
 
-#: ../app/dialogs/preferences-dialog.c:1607
-msgid "Save document _history on exit"
-msgstr "_Lagra dokumentloggen ved avslutning"
+#: ../app/dialogs/preferences-dialog.c:1598
+msgid "Keep record of used files in the Recent Documents list"
+msgstr "Behald lista over brukte filer i dokumentloggen"
 
-#: ../app/dialogs/preferences-dialog.c:1616
+#: ../app/dialogs/preferences-dialog.c:1607
 msgid "User Interface"
 msgstr "Brukargrensesnitt"
 
-#: ../app/dialogs/preferences-dialog.c:1619
+#: ../app/dialogs/preferences-dialog.c:1610
 msgid "Interface"
 msgstr "Grensesnitt"
 
 #. Previews
-#: ../app/dialogs/preferences-dialog.c:1626
+#: ../app/dialogs/preferences-dialog.c:1617
 msgid "Previews"
 msgstr "Førehandsvisingar"
 
-#: ../app/dialogs/preferences-dialog.c:1629
+#: ../app/dialogs/preferences-dialog.c:1620
 msgid "_Enable layer & channel previews"
 msgstr "_Slå på førehandsvisingar for  lag og kanalar"
 
-#: ../app/dialogs/preferences-dialog.c:1635
+#: ../app/dialogs/preferences-dialog.c:1626
 msgid "_Default layer & channel preview size:"
 msgstr "Standard storleik for førehandsvising av _lag og kanalar:"
 
-#: ../app/dialogs/preferences-dialog.c:1638
+#: ../app/dialogs/preferences-dialog.c:1629
 msgid "Na_vigation preview size:"
 msgstr "Standard storleik for førehandsvising av _navigering:"
 
 #. Keyboard Shortcuts
-#: ../app/dialogs/preferences-dialog.c:1642
+#: ../app/dialogs/preferences-dialog.c:1633
 msgid "Keyboard Shortcuts"
 msgstr "Tastatursnarvegar"
 
-#: ../app/dialogs/preferences-dialog.c:1646
+#: ../app/dialogs/preferences-dialog.c:1637
 msgid "Show menu _mnemonics (access keys)"
 msgstr "Vis meny_snarvegtastar"
 
-#: ../app/dialogs/preferences-dialog.c:1649
+#: ../app/dialogs/preferences-dialog.c:1640
 msgid "_Use dynamic keyboard shortcuts"
 msgstr "Bruk _dynamiske snarvegtastar"
 
-#: ../app/dialogs/preferences-dialog.c:1653
+#: ../app/dialogs/preferences-dialog.c:1644
 msgid "Configure _Keyboard Shortcuts..."
-msgstr "Set opp _tastatursnarvegar..."
+msgstr "Set opp _tastatursnarvegar …"
 
-#: ../app/dialogs/preferences-dialog.c:1664
+#: ../app/dialogs/preferences-dialog.c:1651
+msgid "_Save keyboard shortcuts on exit"
+msgstr "_Lagra tastatursnarvegane ved avslutning"
+
+#: ../app/dialogs/preferences-dialog.c:1655
 msgid "Save Keyboard Shortcuts _Now"
 msgstr "Lagra tastatursnarvegane _nå"
 
-#: ../app/dialogs/preferences-dialog.c:1671
+#: ../app/dialogs/preferences-dialog.c:1662
 msgid "_Reset Keyboard Shortcuts to Default Values"
 msgstr "_Tilbakestill tastatursnarvegane til standardverdiar"
 
-#: ../app/dialogs/preferences-dialog.c:1680
+#: ../app/dialogs/preferences-dialog.c:1671
 msgid "Remove _All Keyboard Shortcuts"
 msgstr "Fjern _alle snarvegtastane"
 
-#: ../app/dialogs/preferences-dialog.c:1692
-#: ../app/dialogs/preferences-dialog.c:1731
+#: ../app/dialogs/preferences-dialog.c:1683
+#: ../app/dialogs/preferences-dialog.c:1722
 msgid "Theme"
 msgstr "Tema"
 
-#: ../app/dialogs/preferences-dialog.c:1701
+#: ../app/dialogs/preferences-dialog.c:1692
 msgid "Select Theme"
 msgstr "Vel tema"
 
-#: ../app/dialogs/preferences-dialog.c:1783
+#: ../app/dialogs/preferences-dialog.c:1774
 msgid "Reload C_urrent Theme"
 msgstr "Last _gjeldande tema på nytt"
 
-#: ../app/dialogs/preferences-dialog.c:1795
+#: ../app/dialogs/preferences-dialog.c:1786
 msgid "Help System"
 msgstr "Hjelpsystemet"
 
 #. General
-#: ../app/dialogs/preferences-dialog.c:1807
-#: ../app/dialogs/preferences-dialog.c:1858
-#: ../app/dialogs/preferences-dialog.c:2045
-#: ../app/widgets/gimpcontrollereditor.c:188
+#: ../app/dialogs/preferences-dialog.c:1798
+#: ../app/dialogs/preferences-dialog.c:1892
+#: ../app/dialogs/preferences-dialog.c:2079
+#: ../app/widgets/gimpcontrollereditor.c:189
 msgid "General"
 msgstr "Generelt"
 
-#: ../app/dialogs/preferences-dialog.c:1810
+#: ../app/dialogs/preferences-dialog.c:1801
 msgid "Show _tooltips"
 msgstr "Vis _verktøytips"
 
-#: ../app/dialogs/preferences-dialog.c:1813
+#: ../app/dialogs/preferences-dialog.c:1804
 msgid "Show help _buttons"
 msgstr "Vis hjelp_knappar"
 
-#: ../app/dialogs/preferences-dialog.c:1816
-msgid "Show tips on _startup"
-msgstr "Vis tips ved opp_start"
+#: ../app/dialogs/preferences-dialog.c:1817
+msgid "Use the online version"
+msgstr "Bruk hjelp frå nettet"
+
+#: ../app/dialogs/preferences-dialog.c:1818
+msgid "Use a locally installed copy"
+msgstr "Bruk ein lokal installert kopi"
+
+#: ../app/dialogs/preferences-dialog.c:1819
+#| msgid "_Enter manually"
+msgid "User manual:"
+msgstr "Brukarhandboka:"
+
+#: ../app/dialogs/preferences-dialog.c:1826
+msgid "There's a local installation of the user manual."
+msgstr "Handboka er installert lokalt"
+
+#: ../app/dialogs/preferences-dialog.c:1831
+msgid "The user manual is not installed locally."
+msgstr "Handboka er ikkje installert lokalt"
 
 #. Help Browser
-#: ../app/dialogs/preferences-dialog.c:1820
+#: ../app/dialogs/preferences-dialog.c:1854
 msgid "Help Browser"
 msgstr "Hjelplesar"
 
-#: ../app/dialogs/preferences-dialog.c:1824
+#: ../app/dialogs/preferences-dialog.c:1858
 msgid "H_elp browser to use:"
 msgstr "Vis _hjelpfilene i"
 
-#: ../app/dialogs/preferences-dialog.c:1829
+#: ../app/dialogs/preferences-dialog.c:1863
 msgid "Web Browser"
 msgstr "Nettlesar"
 
-#: ../app/dialogs/preferences-dialog.c:1833
+#: ../app/dialogs/preferences-dialog.c:1867
 msgid "_Web browser to use:"
 msgstr "_Nettlesar som skal brukast:"
 
-#: ../app/dialogs/preferences-dialog.c:1861
+#: ../app/dialogs/preferences-dialog.c:1895
 msgid "_Save tool options on exit"
 msgstr "_Lagra verktøyinnstillingane ved avslutning"
 
-#: ../app/dialogs/preferences-dialog.c:1865
+#: ../app/dialogs/preferences-dialog.c:1899
 msgid "Save Tool Options _Now"
 msgstr "Lagra verktøyinnstillingane _nå"
 
-#: ../app/dialogs/preferences-dialog.c:1872
+#: ../app/dialogs/preferences-dialog.c:1906
 msgid "_Reset Saved Tool Options to Default Values"
 msgstr "_Tilbakestill verktøyinnstillingane til standardverdiar"
 
 #. Snapping Distance
-#: ../app/dialogs/preferences-dialog.c:1882
+#: ../app/dialogs/preferences-dialog.c:1916
 msgid "Guide & Grid Snapping"
 msgstr "Festing til hjelpelinjer og rutenett"
 
-#: ../app/dialogs/preferences-dialog.c:1887
+#: ../app/dialogs/preferences-dialog.c:1921
 msgid "_Snap distance:"
 msgstr "Feste_avstand:"
 
-#: ../app/dialogs/preferences-dialog.c:1895
+#: ../app/dialogs/preferences-dialog.c:1929
 msgid "Default _interpolation:"
 msgstr "Førehandsvald _interpolasjon:"
 
 #. Global Brush, Pattern, ...
-#: ../app/dialogs/preferences-dialog.c:1902
+#: ../app/dialogs/preferences-dialog.c:1936
 msgid "Paint Options Shared Between Tools"
 msgstr "Teikneinnstillingar felles for fleire verktøy"
 
-#: ../app/dialogs/preferences-dialog.c:1915
+#: ../app/dialogs/preferences-dialog.c:1949
 msgid "Move Tool"
 msgstr "Flytteverktøyet"
 
-#: ../app/dialogs/preferences-dialog.c:1919
+#: ../app/dialogs/preferences-dialog.c:1953
 msgid "Set layer or path as active"
 msgstr "Set lag eller bane som aktiv"
 
-#: ../app/dialogs/preferences-dialog.c:1932
+#: ../app/dialogs/preferences-dialog.c:1966
+#: ../app/widgets/gimptoolbox.c:633
 msgid "Toolbox"
 msgstr "Verktøykassa"
 
 #. Appearance
-#: ../app/dialogs/preferences-dialog.c:1944
-#: ../app/dialogs/preferences-dialog.c:2118
-#: ../app/widgets/gimpgrideditor.c:196
+#: ../app/dialogs/preferences-dialog.c:1978
+#: ../app/dialogs/preferences-dialog.c:2152
+#: ../app/widgets/gimpgrideditor.c:204
 msgid "Appearance"
 msgstr "Utsjånad"
 
-#: ../app/dialogs/preferences-dialog.c:1948
+#: ../app/dialogs/preferences-dialog.c:1982
 msgid "Show _foreground & background color"
 msgstr "Vel _forgrunns- og bakgrunnsfarge"
 
-#: ../app/dialogs/preferences-dialog.c:1952
+#: ../app/dialogs/preferences-dialog.c:1986
 msgid "Show active _brush, pattern & gradient"
 msgstr "Vis aktive _penslar, mønsterelement og fargeovergangar"
 
-#: ../app/dialogs/preferences-dialog.c:1956
+#: ../app/dialogs/preferences-dialog.c:1990
 msgid "Show active _image"
 msgstr "Vis aktivt _bilete"
 
-#: ../app/dialogs/preferences-dialog.c:1969
+#: ../app/dialogs/preferences-dialog.c:2003
 msgid "Default New Image"
 msgstr "Standardinnstillingar for nytt bilete"
 
-#: ../app/dialogs/preferences-dialog.c:1972
+#: ../app/dialogs/preferences-dialog.c:2006
 msgid "Default Image"
 msgstr "Standardinnstillingar for bilete"
 
-#: ../app/dialogs/preferences-dialog.c:2009
+#: ../app/dialogs/preferences-dialog.c:2043
 msgid "Default Image Grid"
 msgstr "Standard rutenett for bilete"
 
-#: ../app/dialogs/preferences-dialog.c:2012
+#: ../app/dialogs/preferences-dialog.c:2046
 msgid "Default Grid"
 msgstr "Standard rutenett"
 
-#: ../app/dialogs/preferences-dialog.c:2033
+#: ../app/dialogs/preferences-dialog.c:2067
 msgid "Image Windows"
 msgstr "Biletvindauge"
 
-#: ../app/dialogs/preferences-dialog.c:2048
+#: ../app/dialogs/preferences-dialog.c:2082
 msgid "Use \"_Dot for dot\" by default"
 msgstr "Bruk «_punkt for punkt» som standard"
 
-#: ../app/dialogs/preferences-dialog.c:2054
+#: ../app/dialogs/preferences-dialog.c:2088
 msgid "Marching _ants speed:"
 msgstr "Farten på dei «marsjerende _maura»:"
 
 #. Zoom & Resize Behavior
-#: ../app/dialogs/preferences-dialog.c:2058
+#: ../app/dialogs/preferences-dialog.c:2092
 msgid "Zoom & Resize Behavior"
 msgstr "Oppførsel ved endring av visinga"
 
-#: ../app/dialogs/preferences-dialog.c:2062
+#: ../app/dialogs/preferences-dialog.c:2096
 msgid "Resize window on _zoom"
 msgstr "_Endre vindaugestorleik ved endring av biletvisinga"
 
-#: ../app/dialogs/preferences-dialog.c:2065
+#: ../app/dialogs/preferences-dialog.c:2099
 msgid "Resize window on image _size change"
 msgstr "_Tilpass vindauget etter biletformatet"
 
-#: ../app/dialogs/preferences-dialog.c:2071
+#: ../app/dialogs/preferences-dialog.c:2105
 msgid "Fit to window"
 msgstr "Tilpass til vindauget"
 
-#: ../app/dialogs/preferences-dialog.c:2073
+#: ../app/dialogs/preferences-dialog.c:2107
 msgid "Initial zoom _ratio:"
 msgstr "Format ved _opning:"
 
 #. Space Bar
-#: ../app/dialogs/preferences-dialog.c:2077
+#: ../app/dialogs/preferences-dialog.c:2111
 msgid "Space Bar"
 msgstr "Mellomromstast"
 
-#: ../app/dialogs/preferences-dialog.c:2083
+#: ../app/dialogs/preferences-dialog.c:2117
 msgid "_While space bar is pressed:"
 msgstr "_Medan mellomromstasten er nede:"
 
 #. Mouse Pointers
-#: ../app/dialogs/preferences-dialog.c:2087
+#: ../app/dialogs/preferences-dialog.c:2121
 msgid "Mouse Pointers"
 msgstr "Musempeikarar"
 
-#: ../app/dialogs/preferences-dialog.c:2091
+#: ../app/dialogs/preferences-dialog.c:2125
 msgid "Show _brush outline"
 msgstr "Vis _penselomriss"
 
-#: ../app/dialogs/preferences-dialog.c:2094
+#: ../app/dialogs/preferences-dialog.c:2128
 msgid "Show pointer for paint _tools"
 msgstr "Vis peikar for teikneverktøya"
 
-#: ../app/dialogs/preferences-dialog.c:2100
+#: ../app/dialogs/preferences-dialog.c:2134
 msgid "Pointer _mode:"
 msgstr "Peikar_modus"
 
-#: ../app/dialogs/preferences-dialog.c:2103
+#: ../app/dialogs/preferences-dialog.c:2137
 msgid "Pointer re_ndering:"
 msgstr "Markør_bilete:"
 
-#: ../app/dialogs/preferences-dialog.c:2115
+#: ../app/dialogs/preferences-dialog.c:2149
 msgid "Image Window Appearance"
 msgstr "Innstillingar for biletvindauget"
 
-#: ../app/dialogs/preferences-dialog.c:2126
+#: ../app/dialogs/preferences-dialog.c:2160
 msgid "Default Appearance in Normal Mode"
 msgstr "Standard utsjånad i normalmodus"
 
-#: ../app/dialogs/preferences-dialog.c:2131
+#: ../app/dialogs/preferences-dialog.c:2165
 msgid "Default Appearance in Fullscreen Mode"
 msgstr "Standard utsjånad i fullskjermmodus"
 
-#: ../app/dialogs/preferences-dialog.c:2140
+#: ../app/dialogs/preferences-dialog.c:2174
 msgid "Image Title & Statusbar Format"
 msgstr "Format for tittel- og statuslinjene i biletet"
 
-#: ../app/dialogs/preferences-dialog.c:2143
+#: ../app/dialogs/preferences-dialog.c:2177
 msgid "Title & Status"
 msgstr "Tittel og status"
 
-#: ../app/dialogs/preferences-dialog.c:2161
+#: ../app/dialogs/preferences-dialog.c:2195
 msgid "Current format"
 msgstr "Gjeldande format"
 
-#: ../app/dialogs/preferences-dialog.c:2162
+#: ../app/dialogs/preferences-dialog.c:2196
 msgid "Default format"
 msgstr "Standardformat"
 
-#: ../app/dialogs/preferences-dialog.c:2163
+#: ../app/dialogs/preferences-dialog.c:2197
 msgid "Show zoom percentage"
 msgstr "Vis forstørringa i prosent"
 
-#: ../app/dialogs/preferences-dialog.c:2164
+#: ../app/dialogs/preferences-dialog.c:2198
 msgid "Show zoom ratio"
 msgstr "Vis forstørringsforhold"
 
-#: ../app/dialogs/preferences-dialog.c:2165
+#: ../app/dialogs/preferences-dialog.c:2199
 msgid "Show image size"
 msgstr "Vis _storleik på bilete"
 
-#: ../app/dialogs/preferences-dialog.c:2178
+#: ../app/dialogs/preferences-dialog.c:2212
 msgid "Image Title Format"
 msgstr "Tittelformat for biletet"
 
-#: ../app/dialogs/preferences-dialog.c:2180
+#: ../app/dialogs/preferences-dialog.c:2214
 msgid "Image Statusbar Format"
 msgstr "Statuslinjeformat for biletet"
 
-#: ../app/dialogs/preferences-dialog.c:2265
+#: ../app/dialogs/preferences-dialog.c:2299
 msgid "Display"
 msgstr "Skjerm"
 
-#: ../app/dialogs/preferences-dialog.c:2281
+#: ../app/dialogs/preferences-dialog.c:2315
 msgid "_Check style:"
 msgstr "Rutestil"
 
-#: ../app/dialogs/preferences-dialog.c:2284
+#: ../app/dialogs/preferences-dialog.c:2318
 msgid "Check _size:"
 msgstr "Rute_storleik:"
 
-#: ../app/dialogs/preferences-dialog.c:2287
+#: ../app/dialogs/preferences-dialog.c:2321
 msgid "Monitor Resolution"
 msgstr "Skjermoppløysing"
 
-#: ../app/dialogs/preferences-dialog.c:2291
-#: ../app/widgets/gimpcursorview.c:124 ../app/widgets/gimpgrideditor.c:261
-#: ../app/widgets/gimpgrideditor.c:293
+#: ../app/dialogs/preferences-dialog.c:2325
+#: ../app/widgets/gimpcursorview.c:124
+#: ../app/widgets/gimpgrideditor.c:269
+#: ../app/widgets/gimpgrideditor.c:301
 msgid "Pixels"
 msgstr "Pikslar"
 
-#: ../app/dialogs/preferences-dialog.c:2313
+#: ../app/dialogs/preferences-dialog.c:2347
 #: ../app/widgets/gimpimagepropview.c:476
 msgid "ppi"
 msgstr "PPI"
 
-#: ../app/dialogs/preferences-dialog.c:2329
+#: ../app/dialogs/preferences-dialog.c:2363
 #, c-format
 msgid "_Detect automatically (currently %d × %d ppi)"
 msgstr "_Finn automatisk.  (Er nå %d × %d ppi)"
 
-#: ../app/dialogs/preferences-dialog.c:2349
+#: ../app/dialogs/preferences-dialog.c:2383
 msgid "_Enter manually"
 msgstr "_Skriv inn manuelt"
 
-#: ../app/dialogs/preferences-dialog.c:2364
+#: ../app/dialogs/preferences-dialog.c:2398
 msgid "C_alibrate..."
-msgstr "_Kalibrer..."
+msgstr "_Kalibrer …"
 
-#: ../app/dialogs/preferences-dialog.c:2387
+#: ../app/dialogs/preferences-dialog.c:2421
 msgid "Color Management"
 msgstr "Fargestyring"
 
-#: ../app/dialogs/preferences-dialog.c:2407
+#: ../app/dialogs/preferences-dialog.c:2441
 msgid "_RGB profile:"
 msgstr "_RGB-profil:"
 
-#: ../app/dialogs/preferences-dialog.c:2408
+#: ../app/dialogs/preferences-dialog.c:2442
 msgid "Select RGB Color Profile"
 msgstr "Vel ein RGB fargeprofil"
 
-#: ../app/dialogs/preferences-dialog.c:2409
+#: ../app/dialogs/preferences-dialog.c:2443
 msgid "_CMYK profile:"
 msgstr "_CMYK- profil:"
 
-#: ../app/dialogs/preferences-dialog.c:2410
+#: ../app/dialogs/preferences-dialog.c:2444
 msgid "Select CMYK Color Profile"
 msgstr "Vel ein CMYK fargeprofil"
 
-#: ../app/dialogs/preferences-dialog.c:2411
+#: ../app/dialogs/preferences-dialog.c:2445
 msgid "_Monitor profile:"
 msgstr "_Skjermprofil"
 
-#: ../app/dialogs/preferences-dialog.c:2412
+#: ../app/dialogs/preferences-dialog.c:2446
 msgid "Select Monitor Color Profile"
 msgstr "Vel fargeprofil for skjermen"
 
-#: ../app/dialogs/preferences-dialog.c:2413
+#: ../app/dialogs/preferences-dialog.c:2447
 msgid "_Print simulation profile:"
 msgstr "_Skrivarsimuleringsprofil:"
 
-#: ../app/dialogs/preferences-dialog.c:2414
+#: ../app/dialogs/preferences-dialog.c:2448
 msgid "Select Printer Color Profile"
 msgstr "Vel fargeprofil for skrivar"
 
-#: ../app/dialogs/preferences-dialog.c:2425
+#: ../app/dialogs/preferences-dialog.c:2459
 msgid "_Mode of operation:"
 msgstr "_Operasjonsmodus"
 
-#: ../app/dialogs/preferences-dialog.c:2455
+#: ../app/dialogs/preferences-dialog.c:2489
 msgid "_Try to use the system monitor profile"
 msgstr "_Prøv å bruke skjermprofilen i systemet"
 
-#: ../app/dialogs/preferences-dialog.c:2465
+#: ../app/dialogs/preferences-dialog.c:2499
 msgid "_Display rendering intent:"
 msgstr "Fargetilpassinga for skjermen"
 
-#: ../app/dialogs/preferences-dialog.c:2474
+#: ../app/dialogs/preferences-dialog.c:2508
 msgid "_Softproof rendering intent:"
-msgstr "Førehandsvising på skjermen:"
+msgstr "_Førehandsvising på skjermen:"
 
-#: ../app/dialogs/preferences-dialog.c:2487
+#: ../app/dialogs/preferences-dialog.c:2521
 msgid "Mark out of gamut colors"
 msgstr "Merk fargane som er utanfor fargekartet"
 
-#: ../app/dialogs/preferences-dialog.c:2492
+#: ../app/dialogs/preferences-dialog.c:2526
 msgid "Select Warning Color"
 msgstr "Vel åtvaringsfarge"
 
-#: ../app/dialogs/preferences-dialog.c:2505
+#: ../app/dialogs/preferences-dialog.c:2539
 msgid "File Open behaviour:"
 msgstr "Oppførsel ved opning av fila:"
 
-#: ../app/dialogs/preferences-dialog.c:2517
+#: ../app/dialogs/preferences-dialog.c:2551
 msgid "Input Devices"
 msgstr "Inndataeiningar"
 
 #. Extended Input Devices
-#: ../app/dialogs/preferences-dialog.c:2527
+#: ../app/dialogs/preferences-dialog.c:2561
 msgid "Extended Input Devices"
 msgstr "Utvida inndataeiningar"
 
-#: ../app/dialogs/preferences-dialog.c:2531
+#: ../app/dialogs/preferences-dialog.c:2565
 msgid "Configure E_xtended Input Devices..."
-msgstr "Set opp _utvida inndataeiningar..."
+msgstr "Set opp _utvida inndataeiningar …"
 
-#: ../app/dialogs/preferences-dialog.c:2538
+#: ../app/dialogs/preferences-dialog.c:2572
 msgid "_Save input device settings on exit"
 msgstr "_Lagra innstillingar for inndataeiningar ved avslutning"
 
-#: ../app/dialogs/preferences-dialog.c:2542
+#: ../app/dialogs/preferences-dialog.c:2576
 msgid "Save Input Device Settings _Now"
 msgstr "Lagra innstillingar for inndataeiningar _nå"
 
-#: ../app/dialogs/preferences-dialog.c:2549
+#: ../app/dialogs/preferences-dialog.c:2583
 msgid "_Reset Saved Input Device Settings to Default Values"
-msgstr ""
-"_Tilbakestill lagra innstillingar for inndataeiningar  til standardverdiane"
+msgstr "_Tilbakestill lagra innstillingar for inndataeiningar  til standardverdiane"
 
-#: ../app/dialogs/preferences-dialog.c:2564
+#: ../app/dialogs/preferences-dialog.c:2598
 msgid "Additional Input Controllers"
 msgstr "Ekstra inndatakontrollar"
 
-#: ../app/dialogs/preferences-dialog.c:2567
+#: ../app/dialogs/preferences-dialog.c:2601
 msgid "Input Controllers"
 msgstr "Inndatakontrollar"
 
-#: ../app/dialogs/preferences-dialog.c:2583
+#: ../app/dialogs/preferences-dialog.c:2617
 msgid "Window Management"
 msgstr "Vindaugehandtering"
 
-#: ../app/dialogs/preferences-dialog.c:2592
+#: ../app/dialogs/preferences-dialog.c:2626
 msgid "Window Manager Hints"
-msgstr "Melding til vindaugehandteraren"
+msgstr "Vindaugetypar"
 
-#: ../app/dialogs/preferences-dialog.c:2598
+#: ../app/dialogs/preferences-dialog.c:2632
 msgid "Hint for the _toolbox:"
-msgstr "Meldingar for verktøykassa:"
+msgstr " _Verktøykassa:"
 
-#: ../app/dialogs/preferences-dialog.c:2602
+#: ../app/dialogs/preferences-dialog.c:2636
 msgid "Hint for other _docks:"
-msgstr "Meldingar for _andre samlevindauge:"
+msgstr "_Andre vindauge:"
 
-#: ../app/dialogs/preferences-dialog.c:2607
+#: ../app/dialogs/preferences-dialog.c:2641
 msgid "Toolbox and other docks are transient to the active image window"
-msgstr ""
-"Verktøykassa og andre samlevindauge vil følgje det aktive biletvindauget"
+msgstr "Verktøykassa og andre samlevindauge vil følgje det aktive biletvindauget"
 
-#: ../app/dialogs/preferences-dialog.c:2612
+#: ../app/dialogs/preferences-dialog.c:2646
 msgid "Focus"
 msgstr "Fokus"
 
-#: ../app/dialogs/preferences-dialog.c:2616
+#: ../app/dialogs/preferences-dialog.c:2650
 msgid "Activate the _focused image"
 msgstr "Aktiver biletet som har _fokus"
 
 #. Window Positions
-#: ../app/dialogs/preferences-dialog.c:2620
+#: ../app/dialogs/preferences-dialog.c:2654
 msgid "Window Positions"
 msgstr "Vindaugeposisjonar"
 
-#: ../app/dialogs/preferences-dialog.c:2623
+#: ../app/dialogs/preferences-dialog.c:2657
 msgid "_Save window positions on exit"
 msgstr "_Lagra vindaugeposisjonane ved avslutning"
 
-#: ../app/dialogs/preferences-dialog.c:2627
+#: ../app/dialogs/preferences-dialog.c:2661
 msgid "Save Window Positions _Now"
 msgstr "Lagra vindaugeposisjonane _nå"
 
-#: ../app/dialogs/preferences-dialog.c:2634
+#: ../app/dialogs/preferences-dialog.c:2668
 msgid "_Reset Saved Window Positions to Default Values"
 msgstr "Tilbakestill lagra vindaugeposisjonar til standardverdiane"
 
-#: ../app/dialogs/preferences-dialog.c:2649
+#: ../app/dialogs/preferences-dialog.c:2683
 msgid "Folders"
 msgstr "Mapper"
 
-#: ../app/dialogs/preferences-dialog.c:2669
+#: ../app/dialogs/preferences-dialog.c:2703
 msgid "Temporary folder:"
 msgstr "Mellombels mappe:"
 
-#: ../app/dialogs/preferences-dialog.c:2670
+#: ../app/dialogs/preferences-dialog.c:2704
 msgid "Select Folder for Temporary Files"
 msgstr "Vel mappe for mellombels filer"
 
-#: ../app/dialogs/preferences-dialog.c:2674
+#: ../app/dialogs/preferences-dialog.c:2708
 msgid "Swap folder:"
 msgstr "Mellomlagringsmappe:"
 
-#: ../app/dialogs/preferences-dialog.c:2675
+#: ../app/dialogs/preferences-dialog.c:2709
 msgid "Select Swap Folder"
 msgstr "Vel mellomlagringsmappe"
 
-#: ../app/dialogs/preferences-dialog.c:2710
+#: ../app/dialogs/preferences-dialog.c:2744
 msgid "Brush Folders"
 msgstr "Penselmapper"
 
-#: ../app/dialogs/preferences-dialog.c:2712
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Select Brush Folders"
 msgstr "Vel penselmapper"
 
-#: ../app/dialogs/preferences-dialog.c:2714
+#: ../app/dialogs/preferences-dialog.c:2748
 msgid "Pattern Folders"
 msgstr "Mønstermapper"
 
-#: ../app/dialogs/preferences-dialog.c:2716
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Select Pattern Folders"
 msgstr "Vel mapper for mønsterelement"
 
-#: ../app/dialogs/preferences-dialog.c:2718
+#: ../app/dialogs/preferences-dialog.c:2752
 msgid "Palette Folders"
 msgstr "Palettmapper"
 
-#: ../app/dialogs/preferences-dialog.c:2720
+#: ../app/dialogs/preferences-dialog.c:2754
 msgid "Select Palette Folders"
 msgstr "Vel palettmapper"
 
-#: ../app/dialogs/preferences-dialog.c:2722
+#: ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradient Folders"
 msgstr "Mapper for fargeovergangar"
 
-#: ../app/dialogs/preferences-dialog.c:2724
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Select Gradient Folders"
 msgstr "Vel fargeovergangsmapper"
 
-#: ../app/dialogs/preferences-dialog.c:2726
+#: ../app/dialogs/preferences-dialog.c:2760
 msgid "Font Folders"
 msgstr "Skrifttypemapper"
 
-#: ../app/dialogs/preferences-dialog.c:2728
+#: ../app/dialogs/preferences-dialog.c:2762
 msgid "Select Font Folders"
 msgstr "Vel skrifttypemapper"
 
-#: ../app/dialogs/preferences-dialog.c:2730
+#: ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-In Folders"
 msgstr "Mapper for programtillegg"
 
-#: ../app/dialogs/preferences-dialog.c:2732
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Select Plug-In Folders"
 msgstr "Vel mapper for programtillegg"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Scripts"
 msgstr "Skript"
 
-#: ../app/dialogs/preferences-dialog.c:2734
+#: ../app/dialogs/preferences-dialog.c:2768
 msgid "Script-Fu Folders"
 msgstr "Script-Fu-mapper"
 
-#: ../app/dialogs/preferences-dialog.c:2736
+#: ../app/dialogs/preferences-dialog.c:2770
 msgid "Select Script-Fu Folders"
 msgstr "Vel Script-Fu-mapper"
 
-#: ../app/dialogs/preferences-dialog.c:2738
+#: ../app/dialogs/preferences-dialog.c:2772
 msgid "Module Folders"
 msgstr "Modulmapper"
 
-#: ../app/dialogs/preferences-dialog.c:2740
+#: ../app/dialogs/preferences-dialog.c:2774
 msgid "Select Module Folders"
 msgstr "Vel mapper for modular"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreters"
 msgstr "Tolkar"
 
-#: ../app/dialogs/preferences-dialog.c:2742
+#: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreter Folders"
 msgstr "Mapper for interpreter"
 
-#: ../app/dialogs/preferences-dialog.c:2744
+#: ../app/dialogs/preferences-dialog.c:2778
 msgid "Select Interpreter Folders"
 msgstr "Vel mappe for interpreter"
 
-#: ../app/dialogs/preferences-dialog.c:2746
+#: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment Folders"
 msgstr "Mapper for omgivnader"
 
-#: ../app/dialogs/preferences-dialog.c:2748
+#: ../app/dialogs/preferences-dialog.c:2782
 msgid "Select Environment Folders"
 msgstr "Vel mapper for omgivnader"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Themes"
 msgstr "Tema"
 
-#: ../app/dialogs/preferences-dialog.c:2750
+#: ../app/dialogs/preferences-dialog.c:2784
 msgid "Theme Folders"
 msgstr "Temamapper"
 
-#: ../app/dialogs/preferences-dialog.c:2752
+#: ../app/dialogs/preferences-dialog.c:2786
 msgid "Select Theme Folders"
 msgstr "Vel temamapper"
 
@@ -8125,28 +8046,33 @@ msgid "Print Size"
 msgstr "Utskriftstorleik"
 
 #. the image size labels
-#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:202
+#: ../app/dialogs/print-size-dialog.c:165
+#: ../app/widgets/gimpsizebox.c:202
 #: ../app/widgets/gimptemplateeditor.c:161
 msgid "_Width:"
 msgstr "_Breidde:"
 
-#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:206
+#: ../app/dialogs/print-size-dialog.c:172
+#: ../app/widgets/gimpsizebox.c:206
 #: ../app/widgets/gimptemplateeditor.c:168
 msgid "H_eight:"
 msgstr "H_øgde:"
 
 #. the resolution labels
-#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:264
+#: ../app/dialogs/print-size-dialog.c:222
+#: ../app/widgets/gimpsizebox.c:264
 #: ../app/widgets/gimptemplateeditor.c:288
 msgid "_X resolution:"
 msgstr "_X-oppløysing:"
 
-#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:267
+#: ../app/dialogs/print-size-dialog.c:229
+#: ../app/widgets/gimpsizebox.c:267
 #: ../app/widgets/gimptemplateeditor.c:295
 msgid "_Y resolution:"
 msgstr "_Y-oppløysing:"
 
-#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:260
+#: ../app/dialogs/print-size-dialog.c:240
+#: ../app/widgets/gimpsizebox.c:260
 #: ../app/widgets/gimptemplateeditor.c:308
 #, c-format
 msgid "pixels/%a"
@@ -8183,7 +8109,8 @@ msgstr "_Avslutt utan lagring"
 msgid "Canvas Size"
 msgstr "Storleiken på lerretet"
 
-#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109
+#: ../app/dialogs/resize-dialog.c:130
+#: ../app/dialogs/scale-dialog.c:109
 msgid "Layer Size"
 msgstr "Lagstorleik"
 
@@ -8208,7 +8135,8 @@ msgid "_Vertical:"
 msgstr "_Vertikal:"
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:139
+#: ../app/dialogs/scale-dialog.c:98
+#: ../app/widgets/gimptemplateeditor.c:139
 msgid "Image Size"
 msgstr "Biletstorleik"
 
@@ -8221,58 +8149,63 @@ msgid "I_nterpolation:"
 msgstr "I_nterpolasjon:"
 
 #: ../app/dialogs/scale-dialog.c:206
-msgid ""
-"Indexed color layers are always scaled without interpolation. The chosen "
-"interpolation type will affect channels and layer masks only."
-msgstr ""
-"Biletlag med indekserte fargar blir alltid skalerte utan interpolering. Den "
-"valde interpolasjonstypen vil bare ha verknad på kanalar og lagmasker."
+msgid "Indexed color layers are always scaled without interpolation. The chosen interpolation type will affect channels and layer masks only."
+msgstr "Biletlag med indekserte fargar blir alltid skalerte utan interpolering. Den valde interpolasjonstypen vil bare ha verknad på kanalar og lagmasker."
 
 #: ../app/dialogs/stroke-dialog.c:102
 msgid "Choose Stroke Style"
 msgstr "Vel strøkstil"
 
-#: ../app/dialogs/stroke-dialog.c:217
+#: ../app/dialogs/stroke-dialog.c:225
 msgid "Paint tool:"
 msgstr "Teikneverktøy:"
 
-#: ../app/dialogs/tips-dialog.c:90
-msgid "Your GIMP tips file appears to be missing!"
+#: ../app/dialogs/stroke-dialog.c:246
+msgid "_Emulate brush dynamics"
+msgstr "_Etterlikner penseldynamikk"
+
+#: ../app/dialogs/tips-dialog.c:89
+#| msgid "The GIMP tips file could not be parsed!"
+msgid "The GIMP tips file is empty!"
+msgstr "GIMP si tips-fil er tom!"
+
+#: ../app/dialogs/tips-dialog.c:93
+#| msgid "Your GIMP tips file appears to be missing!"
+msgid "The GIMP tips file appears to be missing!"
 msgstr "Det ser ut til at tipsfila manglar!"
 
-#: ../app/dialogs/tips-dialog.c:92
+#: ../app/dialogs/tips-dialog.c:95
 #, c-format
 msgid "There should be a file called '%s'. Please check your installation."
-msgstr ""
-"Det skulle ha vore ei fil med namnet «%s» her. Kontroller installasjonen for "
-"feil."
+msgstr "Det skulle ha vore ei fil med namnet «%s» her. Kontroller installasjonen for feil."
 
-#: ../app/dialogs/tips-dialog.c:98
+#: ../app/dialogs/tips-dialog.c:101
 msgid "The GIMP tips file could not be parsed!"
 msgstr "GIMP si tips-fil kunne ikkje tolkast!"
 
-#: ../app/dialogs/tips-dialog.c:127
+#: ../app/dialogs/tips-dialog.c:129
 msgid "GIMP Tip of the Day"
 msgstr "GIMP «Dagens tips»"
 
-#: ../app/dialogs/tips-dialog.c:133
+#: ../app/dialogs/tips-dialog.c:135
 msgid "_Previous Tip"
 msgstr "_Førre tips"
 
-#: ../app/dialogs/tips-dialog.c:139
+#: ../app/dialogs/tips-dialog.c:141
 msgid "_Next Tip"
 msgstr "_Neste tips"
 
-#: ../app/dialogs/tips-dialog.c:205
-msgid "Show tip next time GIMP starts"
-msgstr "Vis «Dagens tips» ved opning av GIMP"
+#. a link to the related section in the user manual
+#: ../app/dialogs/tips-dialog.c:194
+msgid "Learn more"
+msgstr "Lær meir"
 
 #. This is a special string to specify the language identifier to
 #. look for in the gimp-tips.xml file. Please translate the C in it
 #. according to the name of the po file used for gimp-tips.xml.
 #. E.g. for the german translation, that would be "tips-locale:de".
 #.
-#: ../app/dialogs/tips-parser.c:189
+#: ../app/dialogs/tips-parser.c:188
 msgid "tips-locale:C"
 msgstr "tips-locale:nn"
 
@@ -8341,135 +8274,127 @@ msgstr "Verktøyikon med trådkors"
 msgid "Crosshair only"
 msgstr "Bare trådkors"
 
-#: ../app/display/display-enums.c:55
+#: ../app/display/display-enums.c:85
 msgid "From theme"
 msgstr "Frå tema"
 
-#: ../app/display/display-enums.c:56
+#: ../app/display/display-enums.c:86
 msgid "Light check color"
 msgstr "Farge for lyse ruter"
 
-#: ../app/display/display-enums.c:57
+#: ../app/display/display-enums.c:87
 msgid "Dark check color"
 msgstr "Farge for mørke ruter"
 
-#: ../app/display/display-enums.c:58
+#: ../app/display/display-enums.c:88
 msgid "Custom color"
 msgstr "Eigendefinert farge"
 
-#: ../app/display/display-enums.c:86
+#: ../app/display/display-enums.c:116
 msgid "No action"
 msgstr "Ingenting"
 
-#: ../app/display/display-enums.c:87
+#: ../app/display/display-enums.c:117
 msgid "Pan view"
 msgstr "Panorering"
 
-#: ../app/display/display-enums.c:88
+#: ../app/display/display-enums.c:118
 msgid "Switch to Move tool"
 msgstr "Bytt til flytteverktøyet"
 
-#: ../app/display/display-enums.c:115
+#: ../app/display/display-enums.c:145
 msgid "quality|Low"
 msgstr "quality|Låg"
 
-#: ../app/display/display-enums.c:116
+#: ../app/display/display-enums.c:146
 msgid "quality|High"
 msgstr "quality|Høg"
 
-#: ../app/display/gimpdisplay-handlers.c:155
+#: ../app/display/gimpdisplay-handlers.c:160
 #, c-format
 msgid "Image saved to '%s'"
 msgstr "Biletet blei lagra i «%s»"
 
-#: ../app/display/gimpdisplayshell.c:895
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "Opna biletmenyen"
 
-#: ../app/display/gimpdisplayshell.c:1004
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "Forstørr eller forminsk biletet når vindaugeformatet blir endra"
 
-#: ../app/display/gimpdisplayshell.c:1054
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "Naviger i biletvisinga"
 
-#: ../app/display/gimpdisplayshell-close.c:125
-#: ../app/display/gimpdisplayshell-close.c:202
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375
+#: ../app/widgets/gimptoolbox.c:222
+msgid "Drop image files here to open them"
+msgstr "Slepp biletfilene her for å opna dei"
+
+#: ../app/display/gimpdisplayshell-close.c:147
+#: ../app/display/gimpdisplayshell-close.c:224
 #, c-format
 msgid "Close %s"
 msgstr "Lukk %s"
 
-#: ../app/display/gimpdisplayshell-close.c:137
+#: ../app/display/gimpdisplayshell-close.c:159
 msgid "Do_n't Save"
 msgstr "_Ikkje lagra"
 
-#: ../app/display/gimpdisplayshell-close.c:209
+#: ../app/display/gimpdisplayshell-close.c:231
 #, c-format
 msgid "Save the changes to image '%s' before closing?"
 msgstr "Ønskjer du å lagra endringane i biletet «%s» før du lukker det?"
 
-#: ../app/display/gimpdisplayshell-close.c:232
+#: ../app/display/gimpdisplayshell-close.c:254
 #, c-format
 msgid "If you don't save the image, changes from the last hour will be lost."
-msgid_plural ""
-"If you don't save the image, changes from the last %d hours will be lost."
-msgstr[0] ""
-"Dersom du ikkje lagrar biletet, vil endringar gjort den siste timen forsvinne"
-msgstr[1] ""
-"Dersom du ikkje lagrar biletet, vil endringar gjort dei siste %d timane "
-"forsvinne."
+msgid_plural "If you don't save the image, changes from the last %d hours will be lost."
+msgstr[0] "Dersom du ikkje lagrar biletet, vil endringar gjort den siste timen forsvinne"
+msgstr[1] "Dersom du ikkje lagrar biletet, vil endringar gjort dei siste %d timane forsvinne."
 
-#: ../app/display/gimpdisplayshell-close.c:242
+#: ../app/display/gimpdisplayshell-close.c:264
 #, c-format
-msgid ""
-"If you don't save the image, changes from the last hour and %d minute will "
-"be lost."
-msgid_plural ""
-"If you don't save the image, changes from the last hour and %d minutes will "
-"be lost."
-msgstr[0] ""
-"Dersom du ikkje lagrar biletet vil endringar gjort siste 1 time og %d minutt "
-"forsvinne."
-msgstr[1] ""
-"Dersom du ikkje lagrar biletet vil endringar gjort siste 1 time og %d minutt "
-"forsvinne."
+msgid "If you don't save the image, changes from the last hour and %d minute will be lost."
+msgid_plural "If you don't save the image, changes from the last hour and %d minutes will be lost."
+msgstr[0] "Dersom du ikkje lagrar biletet vil endringar gjort siste 1 time og %d minutt forsvinne."
+msgstr[1] "Dersom du ikkje lagrar biletet vil endringar gjort siste 1 time og %d minutt forsvinne."
 
-#: ../app/display/gimpdisplayshell-close.c:253
+#: ../app/display/gimpdisplayshell-close.c:275
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
-msgid_plural ""
-"If you don't save the image, changes from the last %d minutes will be lost."
-msgstr[0] ""
-"Dersom du ikkje lagrar biletet vil endringar gjort siste minutt forsvinne."
-msgstr[1] ""
-"Dersom du ikkje lagrar biletet vil endringar gjort siste %d minutt forsvinne."
+msgid_plural "If you don't save the image, changes from the last %d minutes will be lost."
+msgstr[0] "Dersom du ikkje lagrar biletet vil endringar gjort siste minutt forsvinne."
+msgstr[1] "Dersom du ikkje lagrar biletet vil endringar gjort siste %d minutt forsvinne."
 
-#: ../app/display/gimpdisplayshell-dnd.c:209
-#: ../app/display/gimpdisplayshell-dnd.c:491
-#: ../app/display/gimpdisplayshell-dnd.c:541
+#: ../app/display/gimpdisplayshell-dnd.c:255
+#: ../app/display/gimpdisplayshell-dnd.c:587
+#: ../app/display/gimpdisplayshell-dnd.c:658
 msgid "Drop New Layer"
 msgstr "Slepp nytt lag"
 
-#: ../app/display/gimpdisplayshell-dnd.c:254
+#: ../app/display/gimpdisplayshell-dnd.c:301
 msgid "Drop New Path"
 msgstr "Slepp ny bane"
 
-#: ../app/display/gimpdisplayshell-dnd.c:433
-#: ../app/widgets/gimplayertreeview.c:720
+#: ../app/display/gimpdisplayshell-dnd.c:497
+#: ../app/widgets/gimplayertreeview.c:719
 msgid "Drop layers"
 msgstr "Slepp lag"
 
-#: ../app/display/gimpdisplayshell-dnd.c:529
-#: ../app/widgets/gimplayertreeview.c:802 ../app/widgets/gimptoolbox-dnd.c:361
+#: ../app/display/gimpdisplayshell-dnd.c:648
+#: ../app/widgets/gimplayertreeview.c:801
+#: ../app/widgets/gimptoolbox-dnd.c:361
 msgid "Dropped Buffer"
 msgstr "Sluppe buffer"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:78
+#: ../app/display/gimpdisplayshell-filter-dialog.c:75
 msgid "Color Display Filters"
 msgstr "Filter for fargevising"
 
-#: ../app/display/gimpdisplayshell-filter-dialog.c:81
+#: ../app/display/gimpdisplayshell-filter-dialog.c:78
 msgid "Configure Color Display Filters"
 msgstr "Set opp filter for fargevising"
 
@@ -8477,65 +8402,63 @@ msgstr "Set opp filter for fargevising"
 msgid "Layer Select"
 msgstr "Vel lag"
 
-#: ../app/display/gimpdisplayshell-scale.c:616
+#: ../app/display/gimpdisplayshell-scale-dialog.c:114
 msgid "Zoom Ratio"
 msgstr "Forstørringsforhold"
 
-#: ../app/display/gimpdisplayshell-scale.c:618
+#: ../app/display/gimpdisplayshell-scale-dialog.c:116
 msgid "Select Zoom Ratio"
 msgstr "Vel forstørringsforhold"
 
-#: ../app/display/gimpdisplayshell-scale.c:661
+#: ../app/display/gimpdisplayshell-scale-dialog.c:159
 msgid "Zoom ratio:"
 msgstr "Skala:"
 
-#: ../app/display/gimpdisplayshell-scale.c:686
+#: ../app/display/gimpdisplayshell-scale-dialog.c:184
 msgid "Zoom:"
 msgstr "Forstørring:"
 
-#: ../app/display/gimpdisplayshell-title.c:226
+#: ../app/display/gimpdisplayshell-title.c:233
 msgid "RGB-empty"
 msgstr "RGB-tom"
 
-#: ../app/display/gimpdisplayshell-title.c:229
+#: ../app/display/gimpdisplayshell-title.c:236
 msgid "grayscale-empty"
 msgstr "gråtone-tom"
 
-#: ../app/display/gimpdisplayshell-title.c:229
+#: ../app/display/gimpdisplayshell-title.c:236
 msgid "grayscale"
 msgstr "gråtone"
 
-#: ../app/display/gimpdisplayshell-title.c:232
+#: ../app/display/gimpdisplayshell-title.c:239
 msgid "indexed-empty"
 msgstr "indeksert-tom"
 
-#: ../app/display/gimpdisplayshell-title.c:232
+#: ../app/display/gimpdisplayshell-title.c:239
 msgid "indexed"
 msgstr "indeksert"
 
-#: ../app/display/gimpdisplayshell-title.c:286
+#: ../app/display/gimpdisplayshell-title.c:293
 msgid "(modified)"
 msgstr "(endra)"
 
-#: ../app/display/gimpdisplayshell-title.c:291
+#: ../app/display/gimpdisplayshell-title.c:298
 msgid "(clean)"
 msgstr "(tomt)"
 
-#: ../app/display/gimpdisplayshell-title.c:330
-#: ../app/display/gimpdisplayshell-title.c:342
-#: ../app/widgets/gimpactiongroup.c:803
+#: ../app/display/gimpdisplayshell-title.c:346
+#: ../app/display/gimpdisplayshell-title.c:359
+#: ../app/widgets/gimpactiongroup.c:805
 msgid "(none)"
 msgstr "(ingen)"
 
-#: ../app/display/gimpstatusbar.c:223
-msgid "Cancel"
-msgstr "Avbryt"
+#: ../app/display/gimpstatusbar.c:346
+#, c-format
+msgid "Cancel %s"
+msgstr "Avbryt %s"
 
-#: ../app/display/gimpstatusbar.c:491
-msgid "Other..."
-msgstr "Anna..."
-
-#: ../app/file/file-open.c:131 ../app/file/file-save.c:111
+#: ../app/file/file-open.c:131
+#: ../app/file/file-save.c:111
 #, c-format
 msgid "Not a regular file"
 msgstr "Ikkje ei vanleg fil."
@@ -8543,81 +8466,85 @@ msgstr "Ikkje ei vanleg fil."
 #: ../app/file/file-open.c:183
 #, c-format
 msgid "%s plug-in returned SUCCESS but did not return an image"
-msgstr ""
-"%s programtillegget rapporterte vellukka køyring, men returnerte ikkje noe "
-"bilete."
+msgstr "%s programtillegget rapporterte vellukka køyring, men returnerte ikkje noe bilete."
 
 #: ../app/file/file-open.c:194
 #, c-format
 msgid "%s plug-In could not open image"
 msgstr "%s programtillegget greidde ikkje å opna biletet"
 
-#: ../app/file/file-open.c:458
+#: ../app/file/file-open.c:455
 #, c-format
 msgid "Image doesn't contain any layers"
 msgstr "Biletet inneheld ingen lag."
 
-#: ../app/file/file-open.c:507
+#: ../app/file/file-open.c:505
 #, c-format
 msgid "Opening '%s' failed: %s"
 msgstr "Feil ved opninga av «%s»: %s"
 
-#: ../app/file/file-open.c:615
-msgid ""
-"Color management has been disabled. It can be enabled again in the "
-"Preferences dialog."
-msgstr ""
-"Fargestyringa er slått av. Du kan slå ho på igjen frå brukarinnstillingane."
+#: ../app/file/file-open.c:613
+msgid "Color management has been disabled. It can be enabled again in the Preferences dialog."
+msgstr "Fargestyringa er slått av. Du kan slå ho på igjen frå brukarinnstillingane."
 
 #: ../app/file/file-procedure.c:200
 #, c-format
 msgid "Unknown file type"
 msgstr "Ukjent filtype"
 
-#: ../app/file/file-save.c:195
+#: ../app/file/file-save.c:192
 #, c-format
 msgid "%s plug-in could not save image"
 msgstr "Programtillegget %s kunne ikkje lagra biletet"
 
 #: ../app/file/file-utils.c:74
-#, fuzzy, c-format
+#, c-format
 msgid "'%s:' is not a valid URI scheme"
-msgstr "URI-en «%s» er ikkje ein absolutt URI som brukar «file»-måten"
+msgstr " «%s» er ikkje gyldig URI"
 
-#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:122
+#: ../app/file/file-utils.c:88
+#: ../app/file/file-utils.c:122
 #, c-format
 msgid "Invalid character sequence in URI"
 msgstr "Ugyldig teiknsekvens i URI"
 
-#: ../app/gegl/gimpcurvesconfig.c:347
+#: ../app/gegl/gimpcurvesconfig.c:384
 #, c-format
 msgid "not a GIMP Curves file"
 msgstr "ikkje ei GIMP kurvefil"
 
-#: ../app/gegl/gimpcurvesconfig.c:361 ../app/gegl/gimplevelsconfig.c:596
+#: ../app/gegl/gimpcurvesconfig.c:398
+#: ../app/gegl/gimplevelsconfig.c:711
 #, c-format
 msgid "parse error"
 msgstr "Tolkingsfeil"
 
-#: ../app/gegl/gimplevelsconfig.c:549
+#: ../app/gegl/gimplevelsconfig.c:664
 #, c-format
 msgid "not a GIMP Levels file"
 msgstr "ikkje ei GIMP nivåfil"
 
-#: ../app/gui/splash.c:117
+#. initialize the document history
+#: ../app/gui/gui.c:426
+msgid "Documents"
+msgstr "Dokument"
+
+#: ../app/gui/splash.c:116
 msgid "GIMP Startup"
 msgstr "GIMP oppstart"
 
-#: ../app/paint/gimpairbrush.c:69 ../app/tools/gimpairbrushtool.c:54
+#: ../app/paint/gimpairbrush.c:69
+#: ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "Luftpensel"
 
-#: ../app/paint/gimpbrushcore.c:354
+#: ../app/paint/gimpbrushcore.c:353
 #, c-format
 msgid "No brushes available for use with this tool."
 msgstr "Ingen penslar tilgjengelege for bruk med dette verktøyet."
 
-#: ../app/paint/gimpclone.c:99 ../app/tools/gimpclonetool.c:61
+#: ../app/paint/gimpclone.c:99
+#: ../app/tools/gimpclonetool.c:61
 msgid "Clone"
 msgstr "Kloning"
 
@@ -8626,7 +8553,7 @@ msgstr "Kloning"
 msgid "No patterns available for use with this tool."
 msgstr "Ingen mønsterelement er tilgjengelege for bruk med dette verktøyet."
 
-#: ../app/paint/gimpconvolve.c:75
+#: ../app/paint/gimpconvolve.c:77
 msgid "Convolve"
 msgstr "Konturutjamning"
 
@@ -8634,11 +8561,13 @@ msgstr "Konturutjamning"
 msgid "Dodge/Burn"
 msgstr "Avskygging/Etterbelysning"
 
-#: ../app/paint/gimperaser.c:62 ../app/tools/gimperasertool.c:66
+#: ../app/paint/gimperaser.c:62
+#: ../app/tools/gimperasertool.c:66
 msgid "Eraser"
 msgstr "Viskeler"
 
-#: ../app/paint/gimpheal.c:115 ../app/tools/gimphealtool.c:53
+#: ../app/paint/gimpheal.c:115
+#: ../app/tools/gimphealtool.c:53
 msgid "Heal"
 msgstr "Helbred"
 
@@ -8647,25 +8576,34 @@ msgstr "Helbred"
 msgid "Healing does not operate on indexed layers."
 msgstr "«Helbred» verkar ikkje på indekserte lag."
 
-#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:51
+#: ../app/paint/gimppaintbrush.c:63
+#: ../app/tools/gimppaintbrushtool.c:51
 msgid "Paintbrush"
 msgstr "Målarpensel"
 
-#: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
+#: ../app/paint/gimppaintcore-stroke.c:332
+#, c-format
+msgid "Not enough points to stroke"
+msgstr "Ikkje nok punkt for oppstrekinga"
+
+#: ../app/paint/gimppencil.c:42
+#: ../app/tools/gimppenciltool.c:51
 msgid "Pencil"
 msgstr "Blyant"
 
-#: ../app/paint/gimpperspectiveclone.c:95 ../app/paint/paint-enums.c:52
-#: ../app/tools/gimpperspectiveclonetool.c:127
+#: ../app/paint/gimpperspectiveclone.c:97
+#: ../app/paint/paint-enums.c:52
+#: ../app/tools/gimpperspectiveclonetool.c:126
 msgid "Perspective Clone"
 msgstr "Perspektivkloning"
 
-#: ../app/paint/gimpperspectiveclone.c:160
+#: ../app/paint/gimpperspectiveclone.c:162
 #, c-format
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "Perspektivkloning verkar ikkje på indekserte lag."
 
-#: ../app/paint/gimpsmudge.c:78 ../app/tools/gimpsmudgetool.c:53
+#: ../app/paint/gimpsmudge.c:78
+#: ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "Gni ut"
 
@@ -8698,271 +8636,291 @@ msgstr "Slør"
 msgid "Sharpen"
 msgstr "Skjerp"
 
-#: ../app/pdb/channel_cmds.c:180
+#: ../app/pdb/channel-cmds.c:183
 msgid "Combine Masks"
 msgstr "Kombiner masker"
 
-#: ../app/pdb/drawable_transform_cmds.c:307
-#: ../app/pdb/drawable_transform_cmds.c:391
-#: ../app/pdb/transform_tools_cmds.c:145 ../app/tools/gimpperspectivetool.c:67
+#: ../app/pdb/drawable-transform-cmds.c:310
+#: ../app/pdb/drawable-transform-cmds.c:395
+#: ../app/pdb/transform-tools-cmds.c:146
+#: ../app/tools/gimpperspectivetool.c:69
 msgid "Perspective"
 msgstr "Perspektiv"
 
-#: ../app/pdb/drawable_transform_cmds.c:822
-#: ../app/pdb/drawable_transform_cmds.c:893
-#: ../app/pdb/transform_tools_cmds.c:358 ../app/tools/gimpsheartool.c:110
+#: ../app/pdb/drawable-transform-cmds.c:832
+#: ../app/pdb/drawable-transform-cmds.c:904
+#: ../app/pdb/transform-tools-cmds.c:362
+#: ../app/tools/gimpsheartool.c:111
 msgid "Shearing"
-msgstr "Forskyving..."
+msgstr "Forskyving …"
 
-#: ../app/pdb/drawable_transform_cmds.c:977
-#: ../app/pdb/transform_tools_cmds.c:433
+#: ../app/pdb/drawable-transform-cmds.c:989
+#: ../app/pdb/transform-tools-cmds.c:438
 msgid "2D Transform"
 msgstr "2D-transformasjon"
 
-#: ../app/pdb/drawable_transform_cmds.c:1059
-#: ../app/pdb/drawable_transform_cmds.c:1151
-#: ../app/pdb/drawable_transform_cmds.c:1241
+#: ../app/pdb/drawable-transform-cmds.c:1072
+#: ../app/pdb/drawable-transform-cmds.c:1165
+#: ../app/pdb/drawable-transform-cmds.c:1256
 msgid "2D Transforming"
 msgstr "2D-transformering"
 
-#: ../app/pdb/edit_cmds.c:695 ../app/tools/gimpblendtool.c:224
+#: ../app/pdb/edit-cmds.c:709
+#: ../app/tools/gimpblendtool.c:225
 msgid "Blending"
 msgstr "Blander"
 
-#: ../app/pdb/floating_sel_cmds.c:63
+#: ../app/pdb/floating-sel-cmds.c:63
 #, c-format
 msgid "Cannot remove this layer because it is not a floating selection."
 msgstr "Kan ikkje fjerne dette laget fordi det ikkje er eit flytande utval."
 
-#: ../app/pdb/floating_sel_cmds.c:94
+#: ../app/pdb/floating-sel-cmds.c:95
 #, c-format
 msgid "Cannot anchor this layer because it is not a floating selection."
 msgstr "Kan ikkje forankre dette laget fordi det ikkje er eit flytande utval."
 
-#: ../app/pdb/floating_sel_cmds.c:125
+#: ../app/pdb/floating-sel-cmds.c:127
 #, c-format
-msgid ""
-"Cannot convert this layer to a normal layer because it is not a floating "
-"selection."
-msgstr ""
-"Kan ikkje konvertere dette laget fordi det ikkje er eit flytande utval."
+msgid "Cannot convert this layer to a normal layer because it is not a floating selection."
+msgstr "Kan ikkje konvertere dette laget fordi det ikkje er eit flytande utval."
 
-#: ../app/pdb/floating_sel_cmds.c:184
+#: ../app/pdb/floating-sel-cmds.c:188
 #, fuzzy, c-format
 msgid "Cannot rigor this layer because it is not a floating selection."
 msgstr "Kan ikkje forankre dette laget fordi det ikkje er eit flytande utval."
 
-#: ../app/pdb/floating_sel_cmds.c:217
+#: ../app/pdb/floating-sel-cmds.c:222
 #, fuzzy, c-format
 msgid "Cannot relax this layer because it is not a floating selection."
 msgstr "Kan ikkje forankre dette laget fordi det ikkje er eit flytande utval."
 
 #: ../app/pdb/gimppdb-query.c:300
+#: ../app/pdb/gimppdb.c:307
+#: ../app/pdb/gimppdb.c:377
 #, c-format
 msgid "Procedure '%s' not found"
 msgstr "Fann ikkje prosedyren «%s»"
 
-#: ../app/pdb/gimppdb-utils.c:55
+#: ../app/pdb/gimppdb-utils.c:61
 #, c-format
 msgid "Invalid empty brush name"
 msgstr "Ugyldig, tomt buffernamn"
 
-#: ../app/pdb/gimppdb-utils.c:65
+#: ../app/pdb/gimppdb-utils.c:71
 #, c-format
 msgid "Brush '%s' not found"
 msgstr "Fann ikkje penselen «%s»"
 
-#: ../app/pdb/gimppdb-utils.c:70
+#: ../app/pdb/gimppdb-utils.c:76
 #, c-format
 msgid "Brush '%s' is not editable"
 msgstr "Penselen «%s» kan ikkje redigerast"
 
-#: ../app/pdb/gimppdb-utils.c:96
+#: ../app/pdb/gimppdb-utils.c:102
 #, c-format
 msgid "Brush '%s' is not a generated brush"
 msgstr "Penselen «%s» er ikkje ein generert pensel"
 
-#: ../app/pdb/gimppdb-utils.c:116
+#: ../app/pdb/gimppdb-utils.c:122
 #, c-format
 msgid "Invalid empty pattern name"
 msgstr "Namnet på mønsteret er ugyldig"
 
-#: ../app/pdb/gimppdb-utils.c:126
+#: ../app/pdb/gimppdb-utils.c:132
 #, c-format
 msgid "Pattern '%s' not found"
 msgstr "Fann ikkje mønsteret «%s»"
 
-#: ../app/pdb/gimppdb-utils.c:146
+#: ../app/pdb/gimppdb-utils.c:152
 #, c-format
 msgid "Invalid empty gradient name"
 msgstr "Namnet på fargeovergangen er ugyldig"
 
-#: ../app/pdb/gimppdb-utils.c:156
+#: ../app/pdb/gimppdb-utils.c:162
 #, c-format
 msgid "Gradient '%s' not found"
 msgstr "Fann ikkje fargeovergangen «%s»"
 
-#: ../app/pdb/gimppdb-utils.c:161
+#: ../app/pdb/gimppdb-utils.c:167
 #, c-format
 msgid "Gradient '%s' is not editable"
 msgstr "Fargeovergangen «%s» kan ikkje redigerast"
 
-#: ../app/pdb/gimppdb-utils.c:182
+#: ../app/pdb/gimppdb-utils.c:188
 #, c-format
 msgid "Invalid empty palette name"
 msgstr "Ugyldig, tomt palettnamn"
 
-#: ../app/pdb/gimppdb-utils.c:192
+#: ../app/pdb/gimppdb-utils.c:198
 #, c-format
 msgid "Palette '%s' not found"
 msgstr "Fann ikkje paletten «%s»"
 
-#: ../app/pdb/gimppdb-utils.c:197
+#: ../app/pdb/gimppdb-utils.c:203
 #, c-format
 msgid "Palette '%s' is not editable"
 msgstr "Paletten «%s» kan ikkje redigerast"
 
-#: ../app/pdb/gimppdb-utils.c:217
+#: ../app/pdb/gimppdb-utils.c:223
 #, c-format
 msgid "Invalid empty font name"
 msgstr "Ugyldig, tomt skrifttypenamn"
 
-#: ../app/pdb/gimppdb-utils.c:227
+#: ../app/pdb/gimppdb-utils.c:233
 #, c-format
 msgid "Font '%s' not found"
 msgstr "Fann ikkje skrifttypen «%s»"
 
-#: ../app/pdb/gimppdb-utils.c:246
+#: ../app/pdb/gimppdb-utils.c:252
 #, c-format
 msgid "Invalid empty buffer name"
 msgstr "Ugyldig, tomt buffernamn"
 
-#: ../app/pdb/gimppdb-utils.c:256
+#: ../app/pdb/gimppdb-utils.c:262
 #, c-format
 msgid "Named buffer '%s' not found"
 msgstr "Fann ikkje den namngitte buffaren «%s»"
 
-#: ../app/pdb/gimppdb-utils.c:275
-#, fuzzy, c-format
+#: ../app/pdb/gimppdb-utils.c:281
+#, c-format
 msgid "Invalid empty paint method name"
-msgstr "Namnet på mønsteret er ugyldig"
+msgstr "Ugyldig namn på malemetode"
 
-#: ../app/pdb/gimppdb-utils.c:285
+#: ../app/pdb/gimppdb-utils.c:291
 #, c-format
 msgid "Paint method '%s' does not exist"
 msgstr "Teiknemetoden «%s» finst ikkje"
 
-#: ../app/pdb/gimppdb-utils.c:301
+#: ../app/pdb/gimppdb-utils.c:307
 #, c-format
-msgid "Item '%s' (%d) cannot be used because it has not been added to an image"
-msgstr "«%s» (%d) kan ikkje brukast sidan det ikkje er lagt til i eit bilete"
+#| msgid ""
+#| "Item '%s' (%d) cannot be used because it has not been added to an image"
+msgid "Item '%s' (%d) can not be used because it has not been added to an image"
+msgstr "Elementet «%s» (%d) kan ikkje brukast sidan det ikkje er lagt til i eit bilete"
 
-#: ../app/pdb/gimppdb-utils.c:327
+#: ../app/pdb/gimppdb-utils.c:329
+#, c-format
+#| msgid ""
+#| "Item '%s' (%d) cannot be used because it has not been added to an image"
+msgid "Item '%s' (%d) has already been added to an image"
+msgstr "Elementet «%s» (%d) er alt lagt til eit bilete"
+
+#: ../app/pdb/gimppdb-utils.c:337
+#, c-format
+msgid "Trying to add item '%s' (%d) to wrong image"
+msgstr "Du prøver å legge elementet «%s» (%d) til feil bilete"
+
+#: ../app/pdb/gimppdb-utils.c:356
+#, c-format
+#| msgid ""
+#| "Item '%s' (%d) cannot be used because it has not been added to an image"
+msgid "Layer '%s' (%d) can not be used because it is not a text layer"
+msgstr "Du kan ikkje bruke laget «%s» (%d) sidan dette ikkje er eit tekstlag"
+
+#: ../app/pdb/gimppdb-utils.c:401
+#, c-format
+msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
+msgstr "Biletet «%s» (%d) er av typen «%s» medan det er venta eit bilete av typen «%s»"
+
+#: ../app/pdb/gimppdb-utils.c:430
+#, c-format
+msgid "Image '%s' (%d) is already of type '%s'"
+msgstr "Biletet «%s» (%d) er av type «%s» frå før"
+
+#: ../app/pdb/gimppdb-utils.c:455
 #, c-format
 msgid "Vectors object %d does not contain stroke with ID %d"
-msgstr ""
+msgstr "Vektorobjektet %d inneheld ikkje strøk med ID %d"
 
-#: ../app/pdb/gimppdb.c:306 ../app/pdb/gimppdb.c:376
+#: ../app/pdb/gimppdb.c:411
 #, c-format
-msgid ""
-"PDB calling error:\n"
-"Procedure '%s' not found"
-msgstr ""
-"Feil ved PDB-kall:\n"
-"Fann ikkje prosedyren «%s»"
+#| msgid ""
+#| "Procedure '%s' has been called with a wrong value type for argument '%"
+#| "s' (#%d). Expected %s, got %s."
+msgid "Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, got %s."
+msgstr "Prosedyren «%s» er kalla opp med feil type for argument nr %d. Venta %s, fekk %s."
 
-#: ../app/pdb/gimppdb.c:410
+#: ../app/pdb/gimpprocedure.c:361
+#: ../app/plug-in/gimppluginprocframe.c:209
 #, c-format
-msgid ""
-"PDB calling error for procedure '%s':\n"
-"Argument #%d type mismatch (expected %s, got %s)"
-msgstr ""
-"Feil ved PDB-kall for prosedyre «%s»:\n"
-"Argument nr. %d hadde typefeil (venta %s, fekk %s)"
+#| msgid "Procedure '%s' not found"
+msgid "Procedure '%s' returned no return values"
+msgstr "Prosedyren «%s» returnerte ingen returverdi"
 
-#: ../app/pdb/gimpprocedure.c:515
+#: ../app/pdb/gimpprocedure.c:585
 #, c-format
-msgid ""
-"Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
-"Expected %s, got %s."
-msgstr ""
-"Prosedyren «%s» returnerte feil verditype for returverdien «%s» (nr. %d). "
-"Venta %s, fekk %s."
+msgid "Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected %s, got %s."
+msgstr "Prosedyren «%s» returnerte feil verditype for returverdien «%s» (nr. %d). Venta %s, fekk %s."
 
-#: ../app/pdb/gimpprocedure.c:526
+#: ../app/pdb/gimpprocedure.c:597
 #, c-format
-msgid ""
-"Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
-"d). Expected %s, got %s."
-msgstr ""
-"Prosedyren «%s» er kalla opp med feil verditype for argumentet «%s» (nr. %"
-"d). Venta %s, fekk %s."
+msgid "Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). Expected %s, got %s."
+msgstr "Prosedyren «%s» er kalla opp med feil verditype for argumentet «%s» (nr. %d). Venta %s, fekk %s."
 
-#: ../app/pdb/gimpprocedure.c:558
+#: ../app/pdb/gimpprocedure.c:629
 #, c-format
-msgid ""
-"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
-"in is trying to work on a layer that doesn't exist any longer."
-msgstr ""
-"Prosedyren «%s» returnerte feil ID for argumentet «%s». Mest truleg at eit "
-"programtillegg prøver å arbeide på eit biletlag som ikkje finst."
+msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgstr "Prosedyren «%s» returnerte feil ID for argumentet «%s». Mest truleg at eit programtillegg prøver å arbeide på eit biletlag som ikkje finst."
 
-#: ../app/pdb/gimpprocedure.c:570
+#: ../app/pdb/gimpprocedure.c:641
 #, c-format
-msgid ""
-"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
-"likely a plug-in is trying to work on a layer that doesn't exist any longer."
-msgstr ""
-"Prosedyren «%s» er kalla opp med feil ID for argumentet «%s». Mest truleg at "
-"eit programtillegg prøver å arbeide på eit biletlag som ikkje finst."
+msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgstr "Prosedyren «%s» er kalla opp med feil ID for argumentet «%s». Mest truleg at eit programtillegg prøver å arbeide på eit biletlag som ikkje finst."
 
-#: ../app/pdb/gimpprocedure.c:586
+#: ../app/pdb/gimpprocedure.c:657
 #, c-format
-msgid ""
-"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
-"in is trying to work on an image that doesn't exist any longer."
-msgstr ""
-"Prosedyren «%s» returnerte feil ID for argumentet «%s». Mest truleg at eit "
-"programtillegg prøver å arbeide på eit bilete som ikkje finst."
+msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
+msgstr "Prosedyren «%s» returnerte feil ID for argumentet «%s». Mest truleg at eit programtillegg prøver å arbeide på eit bilete som ikkje finst."
 
-#: ../app/pdb/gimpprocedure.c:598
+#: ../app/pdb/gimpprocedure.c:669
 #, c-format
-msgid ""
-"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
-"likely a plug-in is trying to work on an image that doesn't exist any longer."
-msgstr ""
-"Prosedyren «%s» er kalla opp med feil ID for argumentet «%s». Mest truleg at "
-"eit programtillegg prøver å arbeide på eit bilete som ikkje finst."
+msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
+msgstr "Prosedyren «%s» er kalla opp med feil ID for argumentet «%s». Mest truleg at eit programtillegg prøver å arbeide på eit bilete som ikkje finst."
 
-#: ../app/pdb/gimpprocedure.c:618
+#: ../app/pdb/gimpprocedure.c:689
 #, c-format
-msgid ""
-"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
-"is out of range."
-msgstr ""
-"Prosedyren «%s» returnerte «%s» som returverdi «%s» (nr. %d, type %s). Denne "
-"verdien er utanfor verdiområdet."
+msgid "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is out of range."
+msgstr "Prosedyren «%s» returnerte «%s» som returverdi «%s» (nr. %d, type %s). Denne verdien er utanfor verdiområdet."
 
-#: ../app/pdb/gimpprocedure.c:631
+#: ../app/pdb/gimpprocedure.c:702
 #, c-format
-msgid ""
-"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %"
-"s). This value is out of range."
-msgstr ""
-"Prosedyren «%s» blei kalla opp med verdien «%s» som argument «%s» (nr. %d, "
-"type %s). Denne verdien er utanfor verdiområdet."
+msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range."
+msgstr "Prosedyren «%s» blei kalla opp med verdien «%s» som argument «%s» (nr. %d, type %s). Denne verdien er utanfor verdiområdet."
 
-#: ../app/pdb/image_cmds.c:2131
+#: ../app/pdb/image-cmds.c:2268
 #, c-format
-msgid ""
-"Image resolution is out of bounds, using the default resolution instead."
-msgstr ""
-"Biletoppløysinga er utanfor grensene, bruker standard oppløysing i staden."
+msgid "Image resolution is out of bounds, using the default resolution instead."
+msgstr "Biletoppløysinga er utanfor grensene, bruker standard oppløysing i staden."
 
-#: ../app/pdb/selection_tools_cmds.c:215 ../app/tools/gimpfreeselecttool.c:97
+#: ../app/pdb/selection-tools-cmds.c:218
+#: ../app/tools/gimpfreeselecttool.c:197
 msgid "Free Select"
 msgstr "Frihandsutval"
 
+#: ../app/pdb/text-layer-cmds.c:90
+#, c-format
+#| msgid "Text Tool: Create or edit text layers"
+msgid "Failed to create text layer"
+msgstr "Kunne ikkje oppretta eit tekstlag"
+
+#: ../app/pdb/text-layer-cmds.c:163
+#: ../app/pdb/text-layer-cmds.c:235
+#: ../app/pdb/text-layer-cmds.c:314
+#: ../app/pdb/text-layer-cmds.c:394
+#: ../app/pdb/text-layer-cmds.c:467
+#: ../app/pdb/text-layer-cmds.c:539
+#: ../app/pdb/text-layer-cmds.c:611
+#: ../app/pdb/text-layer-cmds.c:683
+#: ../app/pdb/text-layer-cmds.c:755
+#: ../app/pdb/text-layer-cmds.c:825
+#: ../app/pdb/text-layer-cmds.c:897
+#: ../app/pdb/text-layer-cmds.c:969
+#: ../app/pdb/text-layer-cmds.c:1041
+#| msgid "Edit Layer Attributes"
+msgid "Set text layer attribute"
+msgstr "Rediger attributta for tekstlaget"
+
 #: ../app/plug-in/gimpenvirontable.c:282
 #, c-format
 msgid "Empty variable name in environment file %s"
@@ -8978,34 +8936,60 @@ msgstr "Ugyldig variabelnamn i omgivnadsfil %s: %s"
 msgid "Bad interpreter referenced in interpreter file %s: %s"
 msgstr "Feil fortolkarreferanse i fortolkarfila %s: %s."
 
-#: ../app/plug-in/gimpinterpreterdb.c:322
+#: ../app/plug-in/gimpinterpreterdb.c:323
 #, c-format
 msgid "Bad binary format string in interpreter file %s"
 msgstr "Feil binærformatstreng i fortolkarfila %s"
 
-#: ../app/plug-in/gimpplugin-message.c:451
+#: ../app/plug-in/gimpplugin-message.c:423
 #, c-format
+#| msgid ""
+#| "PDB calling error for procedure '%s':\n"
+#| "%s"
 msgid ""
-"PDB calling error for procedure '%s':\n"
+"Calling error for procedure '%s':\n"
 "%s"
 msgstr ""
-"Feil ved PDB-kall i prosedyren «%s»:\n"
+"Oppkallsfeil for prosedyren «%s»:\n"
 "%s"
 
-#: ../app/plug-in/gimpplugin.c:635
+#: ../app/plug-in/gimpplugin-message.c:432
+#, c-format
+#| msgid ""
+#| "PDB calling error for procedure '%s':\n"
+#| "%s"
+msgid ""
+"Execution error for procedure '%s':\n"
+"%s"
+msgstr ""
+"Køyrefeil for prosedyren «%s»:\n"
+"%s"
+
+#: ../app/plug-in/gimpplugin-progress.c:330
+#| msgid "Cancel"
+msgid "Cancelled"
+msgstr "Avbrote"
+
+#: ../app/plug-in/gimpplugin.c:639
 #, c-format
 msgid ""
 "Plug-in crashed: \"%s\"\n"
 "(%s)\n"
 "\n"
-"The dying plug-in may have messed up GIMP's internal state. You may want to "
-"save your images and restart GIMP to be on the safe side."
+"The dying plug-in may have messed up GIMP's internal state. You may want to save your images and restart GIMP to be on the safe side."
 msgstr ""
 "Programtillegget krasja: «%s»\n"
 "(%s)\n"
 "\n"
-"Det hender at slike krasj øydelegg GIMP. Du bør difor lagra bileta dine og "
-"starte GIMP på nytt for å vere på den sikre sida."
+"Det hender at slike krasj øydelegg GIMP. Du bør difor lagra bileta dine og starte GIMP på nytt for å vere på den sikre sida."
+
+#: ../app/plug-in/gimppluginmanager-call.c:173
+#: ../app/plug-in/gimppluginmanager-call.c:223
+#: ../app/plug-in/gimppluginmanager-call.c:321
+#, c-format
+#| msgid "Failed to resize swap file: %s"
+msgid "Failed to run plug-in \"%s\""
+msgstr "Kunne ikkje køyre programtillegget «%s»"
 
 #: ../app/plug-in/gimppluginmanager-restore.c:222
 msgid "Searching Plug-Ins"
@@ -9021,11 +9005,11 @@ msgstr "Kontrollerer nye programtillegg"
 
 #: ../app/plug-in/gimppluginmanager-restore.c:357
 msgid "Initializing Plug-ins"
-msgstr "Set opp programtillegga"
+msgstr "Klargjer programtillegga"
 
 #: ../app/plug-in/gimppluginmanager-restore.c:429
 msgid "Starting Extensions"
-msgstr "Starter utvidingar"
+msgstr "Starter programutvidingar"
 
 #: ../app/plug-in/gimppluginmanager.c:296
 msgid "Plug-In Interpreters"
@@ -9035,6 +9019,30 @@ msgstr "Tolkar for programtillegg"
 msgid "Plug-In Environment"
 msgstr "Omgivnader for programtillegg"
 
+#: ../app/plug-in/gimppluginprocedure.c:989
+#, c-format
+#| msgid ""
+#| "PDB calling error for procedure '%s':\n"
+#| "%s"
+msgid ""
+"Calling error for '%s':\n"
+"%s"
+msgstr ""
+"Oppkallsfeil for «%s»:\n"
+"%s"
+
+#: ../app/plug-in/gimppluginprocedure.c:1001
+#, c-format
+#| msgid ""
+#| "PDB calling error for procedure '%s':\n"
+#| "%s"
+msgid ""
+"Execution error for '%s':\n"
+"%s"
+msgstr ""
+"Utføringsfeil for «%s»:\n"
+"%s"
+
 #: ../app/plug-in/plug-in-icc-profile.c:113
 #: ../app/plug-in/plug-in-icc-profile.c:188
 #: ../app/plug-in/plug-in-icc-profile.c:247
@@ -9064,22 +9072,6 @@ msgstr "ugyldig verdi «%s» for ikontype"
 msgid "invalid value '%ld' for icon type"
 msgstr "ugyldig verdi «%ld» for ikontype"
 
-#: ../app/text/text-enums.c:81
-msgid "Left justified"
-msgstr "Venstrejustert"
-
-#: ../app/text/text-enums.c:82
-msgid "Right justified"
-msgstr "Høgrejustert"
-
-#: ../app/text/text-enums.c:83
-msgid "Centered"
-msgstr "Sentrert"
-
-#: ../app/text/text-enums.c:84
-msgid "Filled"
-msgstr "Blokkjustert"
-
 #. This is a so-called pangram; it's supposed to
 #. contain all characters found in the alphabet.
 #: ../app/text/gimpfont.c:45
@@ -9090,7 +9082,8 @@ msgstr ""
 "Høvdingens kjære squaw\n"
 "får litt pizza i Mexico by."
 
-#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:706
+#: ../app/text/gimptext-compat.c:108
+#: ../app/tools/gimptexttool.c:879
 msgid "Add Text Layer"
 msgstr "Legg til tekstlag"
 
@@ -9144,16 +9137,15 @@ msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
 "%s\n"
 "\n"
-"Some text properties may be wrong. Unless you want to edit the text layer, "
-"you don't need to worry about this."
+"Some text properties may be wrong. Unless you want to edit the text layer, you don't need to worry about this."
 msgstr ""
-"Problem med tekstparasitt for laget «%s»: \\n\n"
+"Problem med tekstparasitt for laget «%s»: \\n"
+"\n"
 "%s\n"
 "\n"
-"Noen av teksteigenskapane kan vere feil. Du treng bare bry deg om dette "
-"dersom du ønskjer å redigera tekstlaget."
+"Noen av teksteigenskapane kan vere feil. Du treng bare bry deg om dette dersom du ønskjer å redigera tekstlaget."
 
-#: ../app/tools/gimp-tools.c:325
+#: ../app/tools/gimp-tools.c:327
 msgid ""
 "This tool has\n"
 "no options."
@@ -9169,189 +9161,215 @@ msgstr "Verktøyet «luftpensel»: Mal med pensel med variabelt trykk"
 msgid "_Airbrush"
 msgstr "_Luftpensel"
 
-#: ../app/tools/gimpairbrushtool.c:92 ../app/tools/gimpconvolvetool.c:217
+#: ../app/tools/gimpairbrushtool.c:92
+#: ../app/tools/gimpconvolvetool.c:217
 #: ../app/tools/gimpsmudgetool.c:97
 msgid "Rate:"
 msgstr "Grad:"
 
 #: ../app/tools/gimpairbrushtool.c:98
+#: ../app/tools/gimppaintoptions-gui.c:198
 msgid "Pressure:"
 msgstr "Trykk:"
 
-#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:752
+#: ../app/tools/gimpaligntool.c:134
+#: ../app/tools/gimpaligntool.c:766
 msgid "Align"
 msgstr "Innretting"
 
 #: ../app/tools/gimpaligntool.c:135
 msgid "Alignment Tool: Align or arrange layers and other objects"
-msgstr ""
-"Innrettingsverktøyet: Innrett biletobjekt i høve til eitt bestemt objekt"
+msgstr "Innrettingsverktøyet: Innrett biletobjekt i høve til eitt bestemt objekt"
 
 #: ../app/tools/gimpaligntool.c:136
 msgid "_Align"
 msgstr "_Innrett"
 
-#: ../app/tools/gimpaligntool.c:585
+#: ../app/tools/gimpaligntool.c:599
 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
 msgstr "Klikk på eit lag, bane eller hjelpelinje for å plukke opp fleire lag."
 
-#: ../app/tools/gimpaligntool.c:594
+#: ../app/tools/gimpaligntool.c:608
 msgid "Click to pick this layer as first item"
 msgstr "Klikk for å hente dette laget som første element"
 
-#: ../app/tools/gimpaligntool.c:602
+#: ../app/tools/gimpaligntool.c:616
 msgid "Click to add this layer to the list"
 msgstr "Klikk for å legge dette laget til lista"
 
-#: ../app/tools/gimpaligntool.c:606
+#: ../app/tools/gimpaligntool.c:620
 msgid "Click to pick this guide as first item"
 msgstr "Klikk for å hente denne hjelpelinja som første element"
 
-#: ../app/tools/gimpaligntool.c:614
+#: ../app/tools/gimpaligntool.c:628
 msgid "Click to add this guide to the list"
 msgstr "Klikk for å legge denne hjelpelinja til lista"
 
-#: ../app/tools/gimpaligntool.c:618
+#: ../app/tools/gimpaligntool.c:632
 msgid "Click to pick this path as first item"
 msgstr "Klikk for å hente denne banen som første element"
 
-#: ../app/tools/gimpaligntool.c:626
+#: ../app/tools/gimpaligntool.c:640
 msgid "Click to add this path to the list"
 msgstr "Klikk for å legge denne banen til lista"
 
-#: ../app/tools/gimpaligntool.c:764
+#: ../app/tools/gimpaligntool.c:778
 msgid "Relative to:"
 msgstr "Relativ til:"
 
-#: ../app/tools/gimpaligntool.c:782
+#: ../app/tools/gimpaligntool.c:796
 msgid "Align left edge of target"
 msgstr "Innrett etter venstre målside"
 
-#: ../app/tools/gimpaligntool.c:788
+#: ../app/tools/gimpaligntool.c:802
 msgid "Align center of target"
 msgstr "Innrett etter midten av målet"
 
-#: ../app/tools/gimpaligntool.c:794
+#: ../app/tools/gimpaligntool.c:808
 msgid "Align right edge of target"
 msgstr "Innrett etter høgre målside"
 
-#: ../app/tools/gimpaligntool.c:804
+#: ../app/tools/gimpaligntool.c:818
 msgid "Align top edge of target"
 msgstr "Innrett etter øvre målside"
 
-#: ../app/tools/gimpaligntool.c:810
+#: ../app/tools/gimpaligntool.c:824
 msgid "Align middle of target"
 msgstr "Innrett etter midten av målet"
 
-#: ../app/tools/gimpaligntool.c:816
+#: ../app/tools/gimpaligntool.c:830
 msgid "Align bottom of target"
 msgstr "Innrett etter nedre målside"
 
-#: ../app/tools/gimpaligntool.c:820
+#: ../app/tools/gimpaligntool.c:834
 msgid "Distribute"
 msgstr "Med forskyving"
 
-#: ../app/tools/gimpaligntool.c:834
+#: ../app/tools/gimpaligntool.c:848
 msgid "Distribute left edges of targets"
 msgstr "Forskyv etter venstre målside"
 
-#: ../app/tools/gimpaligntool.c:841
+#: ../app/tools/gimpaligntool.c:855
 msgid "Distribute horizontal centers of targets"
 msgstr "Forskyv etter midten, vassrett"
 
-#: ../app/tools/gimpaligntool.c:848
+#: ../app/tools/gimpaligntool.c:862
 msgid "Distribute right edges of targets"
 msgstr "Forskyv etter høgre målside"
 
-#: ../app/tools/gimpaligntool.c:858
+#: ../app/tools/gimpaligntool.c:872
 msgid "Distribute top edges of targets"
 msgstr "Forskyv etter øvre målside"
 
-#: ../app/tools/gimpaligntool.c:865
+#: ../app/tools/gimpaligntool.c:879
 msgid "Distribute vertical centers of targets"
 msgstr "Forskyv etter midten, loddrett"
 
-#: ../app/tools/gimpaligntool.c:871
+#: ../app/tools/gimpaligntool.c:885
 msgid "Distribute bottoms of targets"
 msgstr "Forskyv etter nedre målside"
 
-#: ../app/tools/gimpaligntool.c:879 ../app/tools/gimpblendoptions.c:212
+#: ../app/tools/gimpaligntool.c:893
+#: ../app/tools/gimpblendoptions.c:222
 msgid "Offset:"
 msgstr "Forskyving:"
 
-#: ../app/tools/gimpblendoptions.c:222 ../app/widgets/gimpbrusheditor.c:146
+#: ../app/tools/gimpblendoptions.c:216
+#: ../app/tools/gimppaintoptions-gui.c:648
+msgid "Gradient:"
+msgstr "Fargeovergang:"
+
+#: ../app/tools/gimpblendoptions.c:232
+#: ../app/widgets/gimpbrusheditor.c:146
 msgid "Shape:"
 msgstr "Form:"
 
-#: ../app/tools/gimpblendoptions.c:229 ../app/tools/gimppaintoptions-gui.c:456
+#: ../app/tools/gimpblendoptions.c:239
+#: ../app/tools/gimppaintoptions-gui.c:672
 msgid "Repeat:"
 msgstr "Gjenta:"
 
-#: ../app/tools/gimpblendoptions.c:247
+#: ../app/tools/gimpblendoptions.c:257
 msgid "Adaptive supersampling"
 msgstr "Adaptiv utjamning"
 
-#: ../app/tools/gimpblendoptions.c:255
+#: ../app/tools/gimpblendoptions.c:265
 msgid "Max depth:"
 msgstr "_Maks djupn:"
 
-#: ../app/tools/gimpblendoptions.c:262
+#: ../app/tools/gimpblendoptions.c:272
 #: ../app/tools/gimpbucketfilloptions.c:287
+#: ../app/tools/gimpregionselectoptions.c:220
 msgid "Threshold:"
 msgstr "Terskel:"
 
-#: ../app/tools/gimpblendtool.c:109
+#: ../app/tools/gimpblendtool.c:108
 msgid "Blend Tool: Fill selected area with a color gradient"
 msgstr "Blandeverktøyet: Fyll valde område med ein fargeovergang"
 
-#: ../app/tools/gimpblendtool.c:110
+#: ../app/tools/gimpblendtool.c:109
 msgid "Blen_d"
 msgstr "_Bland"
 
-#: ../app/tools/gimpblendtool.c:163
+#: ../app/tools/gimpblendtool.c:164
 #, c-format
 msgid "Blend does not operate on indexed layers."
 msgstr "«Bland» verkar ikkje på indekserte lag"
 
-#: ../app/tools/gimpblendtool.c:400 ../app/tools/gimppainttool.c:595
-#, fuzzy, c-format
+#: ../app/tools/gimpblendtool.c:402
+#: ../app/tools/gimppainttool.c:606
+#, c-format
 msgid "%s for constrained angles"
-msgstr "Vel _område"
+msgstr "%s for faste vinklar"
 
-#: ../app/tools/gimpblendtool.c:401
+#: ../app/tools/gimpblendtool.c:403
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s for å flytte heile linja"
 
-#: ../app/tools/gimpblendtool.c:403
+#: ../app/tools/gimpblendtool.c:407
 msgid "Blend: "
 msgstr "Bland: "
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:107
+#: ../app/tools/gimpbrightnesscontrasttool.c:112
 msgid "Brightness/Contrast Tool: Adjust brightness and contrast"
 msgstr "Verktøyet for å justere lysstyrke og kontrast"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:108
+#: ../app/tools/gimpbrightnesscontrasttool.c:113
 msgid "B_rightness-Contrast..."
-msgstr "_Lysstyrke-Kontrast..."
+msgstr "_Lysstyrke-Kontrast …"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:128
+#: ../app/tools/gimpbrightnesscontrasttool.c:133
 msgid "Adjust Brightness and Contrast"
 msgstr "Juster lysstyrke og kontrast"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:176
+#: ../app/tools/gimpbrightnesscontrasttool.c:135
+#| msgid "Brightness-Contrast"
+msgid "Import Brightness-Contrast settings"
+msgstr "Importer innstillingane for lysstyrke-kontrast"
+
+#: ../app/tools/gimpbrightnesscontrasttool.c:136
+#| msgid "Brightness-Contrast"
+msgid "Export Brightness-Contrast settings"
+msgstr "Eksporter innstillingane for lysstyrke-kontrast"
+
+#: ../app/tools/gimpbrightnesscontrasttool.c:184
 #, c-format
 msgid "Brightness-Contrast does not operate on indexed layers."
 msgstr "Lysstyrke-kontrast verkar ikkje på indekserte lag."
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:307
+#: ../app/tools/gimpbrightnesscontrasttool.c:325
 msgid "_Brightness:"
 msgstr "_Lysstyrke:"
 
-#: ../app/tools/gimpbrightnesscontrasttool.c:322
+#: ../app/tools/gimpbrightnesscontrasttool.c:340
 msgid "Con_trast:"
 msgstr "Kon_trast:"
 
+#: ../app/tools/gimpbrightnesscontrasttool.c:354
+msgid "Edit these Settings as Levels"
+msgstr "Rediger desse innstillingane som nivå"
+
 #: ../app/tools/gimpbucketfilloptions.c:100
 msgid "Allow completely transparent regions to be filled"
 msgstr "Tillat fylling av heilt gjennomsiktige område"
@@ -9361,6 +9379,7 @@ msgid "Base filled area on all visible layers"
 msgstr "Baser fylt område på alle synlige lag"
 
 #: ../app/tools/gimpbucketfilloptions.c:112
+#: ../app/tools/gimpregionselectoptions.c:96
 msgid "Maximum color difference"
 msgstr "Maksimal fargedifferanse"
 
@@ -9392,9 +9411,12 @@ msgstr "Finn liknande fargar"
 msgid "Fill transparent areas"
 msgstr "Fyll gjennomsiktige område"
 
-#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:114
-#: ../app/tools/gimpcolorpickeroptions.c:160 ../app/tools/gimphealtool.c:99
-#: ../app/tools/gimpperspectiveclonetool.c:965
+#: ../app/tools/gimpbucketfilloptions.c:275
+#: ../app/tools/gimpclonetool.c:114
+#: ../app/tools/gimpcolorpickeroptions.c:151
+#: ../app/tools/gimphealtool.c:99
+#: ../app/tools/gimpperspectiveclonetool.c:941
+#: ../app/tools/gimpregionselectoptions.c:208
 msgid "Sample merged"
 msgstr "Flett synlege"
 
@@ -9408,40 +9430,39 @@ msgstr "Fyll"
 
 #: ../app/tools/gimpbucketfilltool.c:82
 msgid "Bucket Fill Tool: Fill selected area with a color or pattern"
-msgstr ""
-"Verktøyet «fyll»: Fyll valde område med ein farge eller eit mønsterelement"
+msgstr "Verktøyet «fyll»: Fyll valde område med ein farge eller eit mønsterelement"
 
 #: ../app/tools/gimpbucketfilltool.c:83
 msgid "_Bucket Fill"
 msgstr "Fargef_ylling"
 
-#: ../app/tools/gimpbycolorselecttool.c:65
+#: ../app/tools/gimpbycolorselecttool.c:67
 msgid "Select by Color"
 msgstr "Vel etter farge"
 
-#: ../app/tools/gimpbycolorselecttool.c:66
+#: ../app/tools/gimpbycolorselecttool.c:68
 msgid "Select by Color Tool: Select regions with similar colors"
 msgstr "Verktøyet «vel etter farge»: Vel område med liknande fargar"
 
-#: ../app/tools/gimpbycolorselecttool.c:67
+#: ../app/tools/gimpbycolorselecttool.c:69
 msgid "_By Color Select"
 msgstr "_Vel etter farge"
 
 #: ../app/tools/gimpclonetool.c:62
 msgid "Clone Tool: Selectively copy from an image or pattern, using a brush"
-msgstr ""
-"Kloningsverktøyet: Kopier selektivt frå eit bilete eller eit mønsterelement "
-"ved bruk av pensel"
+msgstr "Kloningsverktøyet: Kopier selektivt frå eit bilete eller eit mønsterelement ved bruk av pensel"
 
 #: ../app/tools/gimpclonetool.c:63
 msgid "_Clone"
 msgstr "_Kloning"
 
-#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:89
+#: ../app/tools/gimpclonetool.c:86
+#: ../app/tools/gimpclonetool.c:89
 msgid "Click to clone"
 msgstr "Klikk for å klone"
 
-#: ../app/tools/gimpclonetool.c:87 ../app/tools/gimpclonetool.c:91
+#: ../app/tools/gimpclonetool.c:87
+#: ../app/tools/gimpclonetool.c:91
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s for å setje ei ny klonekjelde"
@@ -9451,12 +9472,13 @@ msgid "Click to set a new clone source"
 msgstr "Klikk for å setje ei ny klonekjelde"
 
 #: ../app/tools/gimpclonetool.c:109
-#: ../app/tools/gimpperspectiveclonetool.c:960
+#: ../app/tools/gimpperspectiveclonetool.c:936
 msgid "Source"
 msgstr "Kjelde"
 
-#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:111
-#: ../app/tools/gimpperspectiveclonetool.c:979
+#: ../app/tools/gimpclonetool.c:128
+#: ../app/tools/gimphealtool.c:111
+#: ../app/tools/gimpperspectiveclonetool.c:955
 msgid "Alignment:"
 msgstr "Innretting:"
 
@@ -9466,81 +9488,100 @@ msgstr "Verktøyet «fargebalanse»: Blir brukt til å justere fargefordelinga"
 
 #: ../app/tools/gimpcolorbalancetool.c:96
 msgid "Color _Balance..."
-msgstr "Farge_balanse..."
+msgstr "Farge_balanse …"
 
 #: ../app/tools/gimpcolorbalancetool.c:113
 msgid "Adjust Color Balance"
 msgstr "Justere fargebalansen"
 
-#: ../app/tools/gimpcolorbalancetool.c:160
+#: ../app/tools/gimpcolorbalancetool.c:115
+#| msgid "Color Balance"
+msgid "Import Color Balance Settings"
+msgstr "Importer innstillingane for fargebalanse"
+
+#: ../app/tools/gimpcolorbalancetool.c:116
+#| msgid "Color Balance"
+msgid "Export Color Balance Settings"
+msgstr "Eksporter innstillingane for fargebalanse"
+
+#: ../app/tools/gimpcolorbalancetool.c:163
 #, c-format
 msgid "Color Balance operates only on RGB color layers."
 msgstr "Justeringa av fargebalansen verkar bare på RGB-fargelag."
 
-#: ../app/tools/gimpcolorbalancetool.c:264
+#: ../app/tools/gimpcolorbalancetool.c:270
 msgid "Select Range to Adjust"
 msgstr "Vel område som skal justerast"
 
-#: ../app/tools/gimpcolorbalancetool.c:273 ../app/tools/gimplevelstool.c:159
+#: ../app/tools/gimpcolorbalancetool.c:279
+#: ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr "Juster fargenivåa for vald område"
 
-#: ../app/tools/gimpcolorbalancetool.c:290
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimpcolorbalancetool.c:296
+#: ../app/tools/gimphuesaturationtool.c:255
 msgid "Cyan"
 msgstr "Cyanblå"
 
-#: ../app/tools/gimpcolorbalancetool.c:299
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimpcolorbalancetool.c:305
+#: ../app/tools/gimphuesaturationtool.c:257
 msgid "Magenta"
 msgstr "Magentaraud"
 
-#: ../app/tools/gimpcolorbalancetool.c:308
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimpcolorbalancetool.c:314
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "Yellow"
 msgstr "Gul"
 
-#: ../app/tools/gimpcolorbalancetool.c:319
+#: ../app/tools/gimpcolorbalancetool.c:325
 msgid "R_eset Range"
 msgstr "_Tilbakestill fargane"
 
-#: ../app/tools/gimpcolorbalancetool.c:328
+#: ../app/tools/gimpcolorbalancetool.c:334
 msgid "Preserve _luminosity"
 msgstr "Bevar farge_glød"
 
-#: ../app/tools/gimpcolorizetool.c:90
+#: ../app/tools/gimpcolorizetool.c:91
 msgid "Colorize Tool: Colorize the image"
 msgstr "Innfarging: Fargar inn biletet med ein farge "
 
-#: ../app/tools/gimpcolorizetool.c:91
+#: ../app/tools/gimpcolorizetool.c:92
 msgid "Colori_ze..."
-msgstr "_Innfarging..."
+msgstr "_Innfarging …"
 
-#: ../app/tools/gimpcolorizetool.c:108
+#: ../app/tools/gimpcolorizetool.c:109
 msgid "Colorize the Image"
 msgstr "Farg inn biletet"
 
-#: ../app/tools/gimpcolorizetool.c:152
+#: ../app/tools/gimpcolorizetool.c:111
+msgid "Import Colorize Settings"
+msgstr "Importer fargeinnstillingane"
+
+#: ../app/tools/gimpcolorizetool.c:112
+msgid "Export Colorize Settings"
+msgstr "Eksporter fargeinnstillingane"
+
+#: ../app/tools/gimpcolorizetool.c:156
 #, c-format
 msgid "Colorize operates only on RGB color layers."
 msgstr "Innfarging kan bare gjerast på RGB-fargelag."
 
-#: ../app/tools/gimpcolorizetool.c:214
+#: ../app/tools/gimpcolorizetool.c:221
 msgid "Select Color"
 msgstr "Vel farge"
 
-#: ../app/tools/gimpcolorizetool.c:232
-#: ../app/tools/gimphuesaturationtool.c:384
+#: ../app/tools/gimpcolorizetool.c:238
+#: ../app/tools/gimphuesaturationtool.c:388
 msgid "_Hue:"
 msgstr "_Kulør:"
 
-#: ../app/tools/gimpcolorizetool.c:247
-#: ../app/tools/gimphuesaturationtool.c:422
+#: ../app/tools/gimpcolorizetool.c:253
+#: ../app/tools/gimphuesaturationtool.c:426
 msgid "_Saturation:"
 msgstr "_Metning:"
 
-#: ../app/tools/gimpcolorizetool.c:262
-#: ../app/tools/gimphuesaturationtool.c:403
+#: ../app/tools/gimpcolorizetool.c:268
+#: ../app/tools/gimphuesaturationtool.c:407
 msgid "_Lightness:"
 msgstr "_Lysverdi:"
 
@@ -9549,20 +9590,20 @@ msgid "Sample average"
 msgstr "Gjennomsnitt"
 
 #: ../app/tools/gimpcoloroptions.c:171
-#: ../app/tools/gimprectangleselectoptions.c:167
+#: ../app/tools/gimprectangleselectoptions.c:176
 #: ../app/tools/gimpselectionoptions.c:281
 #: ../app/widgets/gimpbrusheditor.c:154
 msgid "Radius:"
 msgstr "Radius:"
 
 #. the pick FG/BG frame
-#: ../app/tools/gimpcolorpickeroptions.c:165
+#: ../app/tools/gimpcolorpickeroptions.c:156
 #, c-format
 msgid "Pick Mode  (%s)"
 msgstr "Hentemodus %s"
 
 #. the use_info_window toggle button
-#: ../app/tools/gimpcolorpickeroptions.c:174
+#: ../app/tools/gimpcolorpickeroptions.c:165
 #, c-format
 msgid "Use info window  (%s)"
 msgstr "Bruk infovindauget  (%s)"
@@ -9583,11 +9624,13 @@ msgstr "_Fargeplukkar"
 msgid "Click in any image to view its color"
 msgstr "Klikk i kva bilete som helst for å sjå fargane i det"
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:498
+#: ../app/tools/gimpcolorpickertool.c:249
+#: ../app/tools/gimppainttool.c:509
 msgid "Click in any image to pick the foreground color"
 msgstr "Klikk i kva bilete som helst for å henta bakgrunnsfarge"
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:504
+#: ../app/tools/gimpcolorpickertool.c:257
+#: ../app/tools/gimppainttool.c:515
 msgid "Click in any image to pick the background color"
 msgstr "Klikk i kva bilete som helst for å henta bakgrunnsfarge"
 
@@ -9600,15 +9643,16 @@ msgstr "Klikk i kva bilete som helst for å legge farge til paletten"
 msgid "Color Picker Information"
 msgstr "Informasjon frå fargeplukkaren"
 
-#: ../app/tools/gimpcolortool.c:255 ../app/tools/gimpcolortool.c:432
+#: ../app/tools/gimpcolortool.c:258
+#: ../app/tools/gimpcolortool.c:437
 msgid "Move Sample Point: "
 msgstr "Flytt prøvepunktet:"
 
-#: ../app/tools/gimpcolortool.c:426
+#: ../app/tools/gimpcolortool.c:430
 msgid "Cancel Sample Point"
 msgstr "Avbryt prøvepunkta"
 
-#: ../app/tools/gimpcolortool.c:433
+#: ../app/tools/gimpcolortool.c:438
 msgid "Add Sample Point: "
 msgstr "Legg til prøvepunkt"
 
@@ -9656,89 +9700,115 @@ msgstr "%s for å sløra"
 msgid "Convolve Type  (%s)"
 msgstr "Arbeidsmodus (%s)"
 
-#: ../app/tools/gimpcropoptions.c:148
+#: ../app/tools/gimpcropoptions.c:161
 msgid "Current layer only"
 msgstr "Bare dette laget"
 
-#: ../app/tools/gimpcropoptions.c:154
+#: ../app/tools/gimpcropoptions.c:167
 msgid "Allow growing"
 msgstr "Tillat forstørring"
 
-#: ../app/tools/gimpcroptool.c:115
+#: ../app/tools/gimpcroptool.c:126
 msgid "Crop"
 msgstr "Beskjer"
 
-#: ../app/tools/gimpcroptool.c:116
+#: ../app/tools/gimpcroptool.c:127
 msgid "Crop Tool: Remove edge areas from image or layer"
 msgstr "Beskjeringsverktøyet: Fjern kantområda frå eit bilete eller eit lag"
 
-#: ../app/tools/gimpcroptool.c:117
+#: ../app/tools/gimpcroptool.c:128
 msgid "_Crop"
 msgstr "_Beskjer"
 
-#: ../app/tools/gimpcroptool.c:244
+#: ../app/tools/gimpcroptool.c:269
 msgid "Click or press Enter to crop"
 msgstr "Klikk eller trykk  for å beskjere"
 
-#: ../app/tools/gimpcurvestool.c:131
+#: ../app/tools/gimpcurvestool.c:141
 msgid "Curves Tool: Adjust color curves"
 msgstr "Kurveverktøyet: Juster fargekurvene"
 
-#: ../app/tools/gimpcurvestool.c:132
+#: ../app/tools/gimpcurvestool.c:142
 msgid "_Curves..."
-msgstr "_Kurver..."
+msgstr "_Kurver …"
 
-#: ../app/tools/gimpcurvestool.c:158
+#: ../app/tools/gimpcurvestool.c:168
 msgid "Adjust Color Curves"
 msgstr "Juster fargekurver"
 
-#: ../app/tools/gimpcurvestool.c:160
-msgid "Load Curves"
-msgstr "Last kurver"
+#: ../app/tools/gimpcurvestool.c:170
+#| msgid "Load Curves"
+msgid "Import Curves"
+msgstr "Importer kurver"
 
-#: ../app/tools/gimpcurvestool.c:161
-msgid "Load curves settings from file"
-msgstr "Last kurveinnstillingane frå fil"
+#: ../app/tools/gimpcurvestool.c:171
+#| msgid "Load Curves"
+msgid "Export Curves"
+msgstr "Eksporter kurver"
 
-#: ../app/tools/gimpcurvestool.c:162
-msgid "Save Curves"
-msgstr "Lagra kurvene"
-
-#: ../app/tools/gimpcurvestool.c:163
-msgid "Save curves settings to file"
-msgstr "Lagra kurveinntillingane til fil"
-
-#: ../app/tools/gimpcurvestool.c:213
+#: ../app/tools/gimpcurvestool.c:221
 #, c-format
 msgid "Curves does not operate on indexed layers."
 msgstr "«Kurve» verkar ikkje på indekserte lag."
 
-#: ../app/tools/gimpcurvestool.c:315
+#: ../app/tools/gimpcurvestool.c:323
 msgid "Click to add a control point"
 msgstr "Klikk for å legge til eit kontrollpunkt"
 
-#: ../app/tools/gimpcurvestool.c:320
+#: ../app/tools/gimpcurvestool.c:328
 msgid "Click to add control points to all channels"
 msgstr "Klikk for å legge til kontrollpunkt i alle kanalane"
 
-#: ../app/tools/gimpcurvestool.c:428 ../app/tools/gimplevelstool.c:361
+#: ../app/tools/gimpcurvestool.c:441
+#: ../app/tools/gimplevelstool.c:380
 msgid "Cha_nnel:"
 msgstr "Ka_nal:"
 
-#: ../app/tools/gimpcurvestool.c:452 ../app/tools/gimplevelstool.c:383
+#: ../app/tools/gimpcurvestool.c:467
+#: ../app/tools/gimplevelstool.c:404
 msgid "R_eset Channel"
 msgstr "_Tilbakestilll kanal"
 
-#. Horizontal button box for load / save
-#. all channels frame
-#: ../app/tools/gimpcurvestool.c:544 ../app/tools/gimplevelstool.c:622
-msgid "All Channels"
-msgstr "Alle kanalar"
+#: ../app/tools/gimpcurvestool.c:557
+#| msgid "Curve Type"
+msgid "Curve _type:"
+msgstr "_Kurvetype:"
 
-#. The radio box for selecting the curve type
-#: ../app/tools/gimpcurvestool.c:562
-msgid "Curve Type"
-msgstr "Kurvetype"
+#: ../app/tools/gimpcurvestool.c:632
+#: ../app/tools/gimplevelstool.c:752
+#, c-format
+#| msgid "Could not read %d bytes from '%s': %s"
+msgid "Could not read header from '%s': %s"
+msgstr "Kunne ikkje lese header frå  «%s»: %s"
+
+#: ../app/tools/gimpcurvestool.c:705
+#, fuzzy
+msgid "Use _old curves file format"
+msgstr "Åtvaring: «%s» er ei fil i gammalt format."
+
+#: ../app/tools/gimpdesaturatetool.c:78
+#| msgid "Turn colors into shades of gray"
+msgid "Desaturate Tool: Turn colors into shades of gray"
+msgstr "Avmettingsverktøyet: Omformar fargane til gråtoner"
+
+#: ../app/tools/gimpdesaturatetool.c:79
+msgid "_Desaturate..."
+msgstr "_Mindre metning"
+
+#: ../app/tools/gimpdesaturatetool.c:93
+#| msgid "Remove Colors"
+msgid "Desaturate (Remove Colors)"
+msgstr "Avmetting (Fjern fargane)"
+
+#: ../app/tools/gimpdesaturatetool.c:125
+#, c-format
+#| msgid "Desaturate operates only on RGB color layers."
+msgid "Desaturate does only operate on RGB layers."
+msgstr "«Mindre metning» verkar bare på RGB-fargelag."
+
+#: ../app/tools/gimpdesaturatetool.c:191
+msgid "Choose shade of gray based on:"
+msgstr "Lag gråtonene ut frå"
 
 #: ../app/tools/gimpdodgeburntool.c:73
 msgid "Dodge / Burn"
@@ -9746,8 +9816,7 @@ msgstr "Avskygging/Etterbelysning"
 
 #: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
-msgstr ""
-"Etterbelys/Avskygg: Gjer biletet mørkare eller lysare vedhjelp av ein pensel"
+msgstr "Etterbelys/Avskygg: Gjer biletet mørkare eller lysare vedhjelp av ein pensel"
 
 #: ../app/tools/gimpdodgeburntool.c:75
 msgid "Dod_ge / Burn"
@@ -9785,22 +9854,23 @@ msgstr "%s for å avskygge"
 msgid "Type  (%s)"
 msgstr "Type  (%s)"
 
-#: ../app/tools/gimpdodgeburntool.c:214
-#: ../app/tools/gimpperspectiveclonetool.c:952
-msgid "Mode"
+#. mode (highlights, midtones, or shadows)
+#: ../app/tools/gimpdodgeburntool.c:213
+#| msgid "Rate"
+msgid "Range"
 msgstr "Verkeområde"
 
-#: ../app/tools/gimpdodgeburntool.c:226
+#: ../app/tools/gimpdodgeburntool.c:225
 msgid "Exposure:"
 msgstr "Eksponering:"
 
-#: ../app/tools/gimpeditselectiontool.c:203
-#: ../app/tools/gimpeditselectiontool.c:1173
+#: ../app/tools/gimpeditselectiontool.c:244
+#: ../app/tools/gimpeditselectiontool.c:1229
 msgid "Move Floating Selection"
 msgstr "Flytt det flytande utvalet"
 
-#: ../app/tools/gimpeditselectiontool.c:411
-#: ../app/tools/gimpeditselectiontool.c:679
+#: ../app/tools/gimpeditselectiontool.c:457
+#: ../app/tools/gimpeditselectiontool.c:726
 msgid "Move: "
 msgstr "Flytt: "
 
@@ -9818,8 +9888,7 @@ msgstr "_Ellipseutval"
 
 #: ../app/tools/gimperasertool.c:67
 msgid "Eraser Tool: Erase to background or transparency using a brush"
-msgstr ""
-"Viskeverktøyet: Visker til bakgrunn eller gjennomsikt ved hjelp av ein pensel"
+msgstr "Viskeverktøyet: Visker til bakgrunn eller gjennomsikt ved hjelp av ein pensel"
 
 #: ../app/tools/gimperasertool.c:68
 msgid "_Eraser"
@@ -9854,18 +9923,15 @@ msgstr "Spegelvend  "
 msgid "Flip Type  (%s)"
 msgstr "Venderetning (%s)"
 
-#: ../app/tools/gimpfliptool.c:77
+#: ../app/tools/gimpfliptool.c:79
 msgid "Flip"
 msgstr "Spegelvend"
 
-#: ../app/tools/gimpfliptool.c:78
-msgid ""
-"Flip Tool: Reverse the layer, selection or path horizontally or vertically"
-msgstr ""
-"Verktøyet «spegelvend» spegelvender lag, utval eller banar horisontalt eller "
-"vertikalt"
-
 #: ../app/tools/gimpfliptool.c:80
+msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
+msgstr "Verktøyet «spegelvend» spegelvender lag, utval eller banar horisontalt eller vertikalt"
+
+#: ../app/tools/gimpfliptool.c:82
 msgid "_Flip"
 msgstr "Spegel_vend"
 
@@ -9883,9 +9949,7 @@ msgid "Size of the brush used for refinements"
 msgstr "Storleiken på penselen som blir brukt til forbetringane"
 
 #: ../app/tools/gimpforegroundselectoptions.c:102
-msgid ""
-"Smaller values give a more accurate selection border but may introduce holes "
-"in the selection"
+msgid "Smaller values give a more accurate selection border but may introduce holes in the selection"
 msgstr "Klipp"
 
 #: ../app/tools/gimpforegroundselectoptions.c:121
@@ -9925,7 +9989,7 @@ msgstr "Liten pensel"
 
 #: ../app/tools/gimpforegroundselectoptions.c:310
 msgid "Large brush"
-msgstr "Stor pensel  "
+msgstr "Stor pensel    "
 
 #: ../app/tools/gimpforegroundselectoptions.c:334
 msgid "Smoothing:"
@@ -9946,53 +10010,108 @@ msgstr "Forgrunnsutval"
 
 #: ../app/tools/gimpforegroundselecttool.c:146
 msgid "Foreground Select Tool: Select a region containing foreground objects"
-msgstr ""
-"Verktøyet «forgrunnsutval»: Vel ut eit område som inneheld forgrunnsobjekt"
+msgstr "Verktøyet «forgrunnsutval»: Vel ut eit område som inneheld forgrunnsobjekt"
 
 #: ../app/tools/gimpforegroundselecttool.c:147
 msgid "F_oreground Select"
 msgstr "F_orgrunnsutval"
 
-#: ../app/tools/gimpforegroundselecttool.c:310
+#: ../app/tools/gimpforegroundselecttool.c:314
 msgid "Add more strokes or press Enter to accept the selection"
 msgstr "Legg til fleire strøk eller trykk  for å godta utvalet"
 
-#: ../app/tools/gimpforegroundselecttool.c:312
+#: ../app/tools/gimpforegroundselecttool.c:316
 msgid "Mark foreground by painting on the object to extract"
 msgstr "Marker forgrunnen ved å teikne på objektet som skal plukkast ut"
 
-#: ../app/tools/gimpforegroundselecttool.c:323
-msgid "Draw a rough circle around the object to extract"
-msgstr "Teikna ein omtrentleg sirkel rundt objektet som skal plukkast ut"
+#: ../app/tools/gimpforegroundselecttool.c:327
+#| msgid "Draw a rough circle around the object to extract"
+msgid "Rougly outline the object to extract"
+msgstr "Teikna eit omtrentleg omriss rundt objektet som skal plukkast ut"
 
-#: ../app/tools/gimpforegroundselecttool.c:745
-msgid "command|Foreground Select"
-msgstr "Kommando: Forgrunnsutval"
+#: ../app/tools/gimpforegroundselecttool.c:766
+#| msgid "Foreground Select"
+msgctxt "command"
+msgid "Foreground Select"
+msgstr "Forgrunnsutval"
 
-#: ../app/tools/gimpfreeselecttool.c:98
-msgid "Free Select Tool: Select a hand-drawn region"
+#: ../app/tools/gimpfreeselecttool.c:198
+#| msgid "Free Select Tool: Select a hand-drawn region"
+msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
 msgstr "Verktøyet «frihandsutval»: Teikna utvalet på frihand."
 
-#: ../app/tools/gimpfreeselecttool.c:99
+#: ../app/tools/gimpfreeselecttool.c:199
 msgid "_Free Select"
 msgstr "_Frihandsutval"
 
-#: ../app/tools/gimpfreeselecttool.c:311
-msgid "command|Free Select"
-msgstr "Kommando: Frihandsutval"
+#: ../app/tools/gimpfreeselecttool.c:1116
+#| msgid "Click-Drag to create a new selection"
+msgid "Click to complete selection"
+msgstr "Klikk for å komplettere utvalet"
 
-#: ../app/tools/gimpfuzzyselecttool.c:63
+#: ../app/tools/gimpfreeselecttool.c:1120
+#, fuzzy
+#| msgid "Click-Drag to move the component around"
+msgid "Click-Drag to move segment vertex"
+msgstr "Klikk-og-dra for å flytte alle punkta"
+
+#: ../app/tools/gimpfreeselecttool.c:1125
+msgid "Return commits, Escape cancels, Backspace removes last segment"
+msgstr " bekrefter,  avbryt,  fjerner det siste segmentet"
+
+#: ../app/tools/gimpfreeselecttool.c:1129
+msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
+msgstr ""
+
+#: ../app/tools/gimpfreeselecttool.c:1581
+#| msgid "Free Select"
+msgctxt "command"
+msgid "Free Select"
+msgstr "Frihandsutval"
+
+#: ../app/tools/gimpfuzzyselecttool.c:65
 msgid "Fuzzy Select"
 msgstr "Tryllestaven"
 
-#: ../app/tools/gimpfuzzyselecttool.c:64
+#: ../app/tools/gimpfuzzyselecttool.c:66
 msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color"
 msgstr "Verktøyet «tryllestaven»: Lag eit utval på grunnlag av farge."
 
-#: ../app/tools/gimpfuzzyselecttool.c:65
+#: ../app/tools/gimpfuzzyselecttool.c:67
 msgid "Fu_zzy Select"
 msgstr "_Tryllestaven"
 
+#: ../app/tools/gimpgegltool.c:92
+#: ../app/tools/gimpgegltool.c:111
+msgid "GEGL Operation"
+msgstr "GEGL-operasjon"
+
+#: ../app/tools/gimpgegltool.c:93
+msgid "GEGL Tool: Use an arbitrary GEGL operation"
+msgstr "GEGL-verktøyet: Vel ein GEGL-operasjon (32 bits fargehandtering)."
+
+#: ../app/tools/gimpgegltool.c:94
+#| msgid "Open _Location..."
+msgid "_GEGL Operation..."
+msgstr "_GEGL-operasjon …"
+
+#: ../app/tools/gimpgegltool.c:158
+#, c-format
+#| msgid "Healing does not operate on indexed layers."
+msgid "GEGL operations do not operate on indexed layers."
+msgstr "GEGL-operasjonane verkar ikkje på indekserte lag."
+
+#: ../app/tools/gimpgegltool.c:338
+#| msgid "_Saturation:"
+msgid "_Operation:"
+msgstr "_Operasjon:"
+
+#. The options vbox
+#: ../app/tools/gimpgegltool.c:411
+#| msgid "Recent Settings:"
+msgid "Operation Settings"
+msgstr "Innstillingar"
+
 #: ../app/tools/gimphealtool.c:54
 msgid "Healing Tool: Heal image irregularities"
 msgstr "Verktøyet «helbred»: Reparerer småfeil i biletet "
@@ -10001,11 +10120,13 @@ msgstr "Verktøyet «helbred»: Reparerer småfeil i biletet "
 msgid "_Heal"
 msgstr "_Helbred"
 
-#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:80
+#: ../app/tools/gimphealtool.c:77
+#: ../app/tools/gimphealtool.c:80
 msgid "Click to heal"
 msgstr "Klikk for å helbrede"
 
-#: ../app/tools/gimphealtool.c:78 ../app/tools/gimphealtool.c:82
+#: ../app/tools/gimphealtool.c:78
+#: ../app/tools/gimphealtool.c:82
 #, c-format
 msgid "%s to set a new heal source"
 msgstr "%s for å setje ei ny kjelde for helbredinga"
@@ -10024,101 +10145,103 @@ msgstr "Verktøyet «kulør/metning»: Juster kulør, metning og lysmengde"
 
 #: ../app/tools/gimphuesaturationtool.c:104
 msgid "Hue-_Saturation..."
-msgstr "Kulør og _metning..."
+msgstr "Kulør og _metning …"
 
 #: ../app/tools/gimphuesaturationtool.c:121
 msgid "Adjust Hue / Lightness / Saturation"
 msgstr "Juster kulør / lys / metning"
 
-#: ../app/tools/gimphuesaturationtool.c:168
+#: ../app/tools/gimphuesaturationtool.c:123
+#| msgid "Hue-Saturation"
+msgid "Import Hue-Saturation Settings"
+msgstr "Importer innstillingane for kulør og metning"
+
+#: ../app/tools/gimphuesaturationtool.c:124
+#| msgid "Hue-Saturation"
+msgid "Export Hue-Saturation Settings"
+msgstr "Eksporter innstillingane for kulør og metning"
+
+#: ../app/tools/gimphuesaturationtool.c:171
 #, c-format
 msgid "Hue-Saturation operates only on RGB color layers."
 msgstr "Kulør - metning verkar bare på RGB-fargelag."
 
-#: ../app/tools/gimphuesaturationtool.c:247
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "M_aster"
 msgstr "_Alle"
 
-#: ../app/tools/gimphuesaturationtool.c:247
+#: ../app/tools/gimphuesaturationtool.c:251
 msgid "Adjust all colors"
 msgstr "Endre alle fargane"
 
-#: ../app/tools/gimphuesaturationtool.c:248
+#: ../app/tools/gimphuesaturationtool.c:252
 msgid "_R"
 msgstr "_R"
 
-#: ../app/tools/gimphuesaturationtool.c:249
+#: ../app/tools/gimphuesaturationtool.c:253
 msgid "_Y"
 msgstr "_Y"
 
-#: ../app/tools/gimphuesaturationtool.c:250
+#: ../app/tools/gimphuesaturationtool.c:254
 msgid "_G"
 msgstr "_G"
 
-#: ../app/tools/gimphuesaturationtool.c:251
+#: ../app/tools/gimphuesaturationtool.c:255
 msgid "_C"
 msgstr "_C"
 
-#: ../app/tools/gimphuesaturationtool.c:252
+#: ../app/tools/gimphuesaturationtool.c:256
 msgid "_B"
 msgstr "_B"
 
-#: ../app/tools/gimphuesaturationtool.c:253
+#: ../app/tools/gimphuesaturationtool.c:257
 msgid "_M"
 msgstr "_M"
 
-#: ../app/tools/gimphuesaturationtool.c:256
+#: ../app/tools/gimphuesaturationtool.c:262
 msgid "Select Primary Color to Adjust"
 msgstr "Vel primærfarge som skal endrast"
 
-#: ../app/tools/gimphuesaturationtool.c:347
+#: ../app/tools/gimphuesaturationtool.c:352
 msgid "_Overlap:"
 msgstr "_Overlapping"
 
-#: ../app/tools/gimphuesaturationtool.c:366
+#: ../app/tools/gimphuesaturationtool.c:371
 msgid "Adjust Selected Color"
 msgstr "Endre vald farge"
 
-#: ../app/tools/gimphuesaturationtool.c:443
+#: ../app/tools/gimphuesaturationtool.c:447
 msgid "R_eset Color"
 msgstr "_Tilbakestill farge"
 
-#: ../app/tools/gimpimagemaptool.c:335
-msgid "Recent Settings:"
-msgstr "Gjeldande innstillingar:"
+#: ../app/tools/gimpimagemaptool-settings.c:81
+#| msgid "Pressure:"
+msgid "Pre_sets:"
+msgstr "Førehands_valde:"
 
-#: ../app/tools/gimpimagemaptool.c:345
-msgid "Pick a setting from the list"
-msgstr "Vel ei innstilling frå lista"
-
-#: ../app/tools/gimpimagemaptool.c:356
-msgid "_Preview"
-msgstr "_Førehandsvis"
-
-#: ../app/tools/gimpimagemaptool.c:388
-msgid "Quick Load"
-msgstr "Snarhenting"
-
-#: ../app/tools/gimpimagemaptool.c:417
-msgid "Quick Save"
-msgstr "Snarlagring"
-
-#: ../app/tools/gimpimagemaptool.c:860
+#: ../app/tools/gimpimagemaptool-settings.c:221
 #, c-format
 msgid "Settings saved to '%s'"
 msgstr "Innstillingane blei lagra i «%s»"
 
+#: ../app/tools/gimpimagemaptool.c:318
+msgid "_Preview"
+msgstr "_Førehandsvis"
+
 #. adjust sliders
 #: ../app/tools/gimpinkoptions-gui.c:56
 msgid "Adjustment"
 msgstr "Justering"
 
-#: ../app/tools/gimpinkoptions-gui.c:68 ../app/tools/gimpinkoptions-gui.c:93
-#: ../app/tools/gimprectangleoptions.c:983 ../app/tools/gimptextoptions.c:436
+#: ../app/tools/gimpinkoptions-gui.c:68
+#: ../app/tools/gimpinkoptions-gui.c:93
+#: ../app/tools/gimprectangleoptions.c:973
+#: ../app/tools/gimptextoptions.c:452
 msgid "Size:"
 msgstr "Storleik:"
 
-#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1034
+#: ../app/tools/gimpinkoptions-gui.c:76
+#: ../app/tools/gimpmeasuretool.c:1037
 #: ../app/widgets/gimpbrusheditor.c:208
 msgid "Angle:"
 msgstr "Vinkel:"
@@ -10141,7 +10264,7 @@ msgid "Type"
 msgstr "Type"
 
 #. Blob shape widget
-#: ../app/tools/gimpinkoptions-gui.c:148
+#: ../app/tools/gimpinkoptions-gui.c:149
 msgid "Shape"
 msgstr "Form"
 
@@ -10153,6 +10276,10 @@ msgstr "Verktøyet «penn»: Kalligrafisk penn"
 msgid "In_k"
 msgstr "_Penn"
 
+#: ../app/tools/gimpiscissorsoptions.c:126
+msgid "Interactive boundary"
+msgstr "Vis interaktiv grense"
+
 #: ../app/tools/gimpiscissorstool.c:278
 msgid "Scissors"
 msgstr "Saks"
@@ -10165,100 +10292,111 @@ msgstr "Sakseverktøyet: Vel former med bruk av «intelligent» kanttilpassing"
 msgid "Intelligent _Scissors"
 msgstr "Intelligent _saks"
 
-#: ../app/tools/gimpiscissorstool.c:926 ../app/tools/gimpmeasuretool.c:606
+#: ../app/tools/gimpiscissorstool.c:940
+#: ../app/tools/gimpmeasuretool.c:609
 msgid "Click-Drag to move this point"
 msgstr "Klikk og dra for å flytte dette punktet"
 
-#: ../app/tools/gimpiscissorstool.c:928 ../app/tools/gimpiscissorstool.c:993
+#: ../app/tools/gimpiscissorstool.c:942
+#: ../app/tools/gimpiscissorstool.c:1007
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%s: Ikkje fest til rutenett"
 
-#: ../app/tools/gimpiscissorstool.c:945
+#: ../app/tools/gimpiscissorstool.c:959
 msgid "Click to close the curve"
 msgstr "Klikk for å lukka kurven"
 
-#: ../app/tools/gimpiscissorstool.c:951
+#: ../app/tools/gimpiscissorstool.c:965
 msgid "Click to add a point on this segment"
 msgstr "Klikk for å legge til eit punkt på dette segmentet"
 
-#: ../app/tools/gimpiscissorstool.c:965
+#: ../app/tools/gimpiscissorstool.c:979
 msgid "Click or press Enter to convert to a selection"
 msgstr "Klikk eller trykk  for å omforme til eit utval"
 
-#: ../app/tools/gimpiscissorstool.c:975
+#: ../app/tools/gimpiscissorstool.c:989
 msgid "Press Enter to convert to a selection"
 msgstr "Trykk  for å omforme til eit utval"
 
-#: ../app/tools/gimpiscissorstool.c:990
+#: ../app/tools/gimpiscissorstool.c:1004
 msgid "Click or Click-Drag to add a point"
 msgstr "Klikk eller klikk-og-dra for å legge til eit punkt"
 
-#: ../app/tools/gimplevelstool.c:138
+#: ../app/tools/gimplevelstool.c:151
 msgid "Levels Tool: Adjust color levels"
 msgstr "Nivåverktøyet: Justerer fargenivåa"
 
-#: ../app/tools/gimplevelstool.c:139
+#: ../app/tools/gimplevelstool.c:152
 msgid "_Levels..."
-msgstr "_Nivå..."
+msgstr "_Nivå …"
 
-#: ../app/tools/gimplevelstool.c:161
-msgid "Load Levels"
-msgstr "Last nivå"
+#: ../app/tools/gimplevelstool.c:174
+#| msgid "Input Levels"
+msgid "Import Levels"
+msgstr "Importer nivåa"
 
-#: ../app/tools/gimplevelstool.c:162
-msgid "Load levels settings from file"
-msgstr "Hent nivåinnstillingar frå fil"
+#: ../app/tools/gimplevelstool.c:175
+#| msgid "Input Levels"
+msgid "Export Levels"
+msgstr "Eksporter nivåa"
 
-#: ../app/tools/gimplevelstool.c:163
-msgid "Save Levels"
-msgstr "Lagra nivå"
-
-#: ../app/tools/gimplevelstool.c:164
-msgid "Save levels settings to file"
-msgstr "Lagra nivåinntillingane til fil"
-
-#: ../app/tools/gimplevelstool.c:217
+#: ../app/tools/gimplevelstool.c:228
 #, c-format
 msgid "Levels does not operate on indexed layers."
 msgstr "«Nivå» verkar ikkje på indekserte lag."
 
-#: ../app/tools/gimplevelstool.c:299
+#: ../app/tools/gimplevelstool.c:310
 msgid "Pick black point"
 msgstr "Vel svartpunkt"
 
-#: ../app/tools/gimplevelstool.c:303
+#: ../app/tools/gimplevelstool.c:314
 msgid "Pick gray point"
 msgstr "Vel gråpunkt"
 
-#: ../app/tools/gimplevelstool.c:307
+#: ../app/tools/gimplevelstool.c:318
 msgid "Pick white point"
 msgstr "Vel kvitpunkt"
 
 #. Input levels frame
-#: ../app/tools/gimplevelstool.c:398
+#: ../app/tools/gimplevelstool.c:419
 msgid "Input Levels"
 msgstr "Nivå inn:"
 
-#: ../app/tools/gimplevelstool.c:502
+#: ../app/tools/gimplevelstool.c:522
 msgid "Gamma"
 msgstr "Gamma"
 
 #. Output levels frame
-#: ../app/tools/gimplevelstool.c:544
+#: ../app/tools/gimplevelstool.c:564
 msgid "Output Levels"
 msgstr "Nivå ut"
 
-#: ../app/tools/gimplevelstool.c:650
+#. all channels frame
+#: ../app/tools/gimplevelstool.c:641
+msgid "All Channels"
+msgstr "Alle kanalar"
+
+#: ../app/tools/gimplevelstool.c:655
 msgid "Adjust levels automatically"
 msgstr "Juster nivåa automatisk"
 
+#: ../app/tools/gimplevelstool.c:682
+msgid "Edit these Settings as Curves"
+msgstr "Rediger desse innstillingane som kurver"
+
+#: ../app/tools/gimplevelstool.c:825
+#, fuzzy
+msgid "Use _old levels file format"
+msgstr "Åtvaring: «%s» er ei fil i gammalt format."
+
 #: ../app/tools/gimpmagnifyoptions.c:167
 msgid "Auto-resize window"
 msgstr "Automatisk tilpassing av vindauget"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:172 ../app/tools/gimpmoveoptions.c:188
+#: ../app/tools/gimpmagnifyoptions.c:172
+#: ../app/tools/gimpmoveoptions.c:188
 #, c-format
 msgid "Tool Toggle  (%s)"
 msgstr "Verktøymodus (%s) "
@@ -10291,42 +10429,42 @@ msgstr "Måleverktøyet: Måler avstandar og vinklar"
 msgid "_Measure"
 msgstr "_Måling"
 
-#: ../app/tools/gimpmeasuretool.c:238
+#: ../app/tools/gimpmeasuretool.c:241
 msgid "Add Guides"
 msgstr "Legg til hjelpelinjer"
 
-#: ../app/tools/gimpmeasuretool.c:558
+#: ../app/tools/gimpmeasuretool.c:561
 msgid "Click to place vertical and horizontal guides"
 msgstr "Klikk for å plassere vertikale og horisontale hjelpelinjer"
 
-#: ../app/tools/gimpmeasuretool.c:567
+#: ../app/tools/gimpmeasuretool.c:570
 msgid "Click to place a horizontal guide"
 msgstr "Klikk for å plassere ei horisontal hjelpelinje"
 
-#: ../app/tools/gimpmeasuretool.c:581
+#: ../app/tools/gimpmeasuretool.c:584
 msgid "Click to place a vertical guide"
 msgstr "Klikk for å plassere ei vertikal hjelpelinje"
 
-#: ../app/tools/gimpmeasuretool.c:595
+#: ../app/tools/gimpmeasuretool.c:598
 msgid "Click-Drag to add a new point"
 msgstr "Klikk-og-dra for å legge til eit nytt punkt"
 
-#: ../app/tools/gimpmeasuretool.c:625
+#: ../app/tools/gimpmeasuretool.c:628
 msgid "Click-Drag to move all points"
 msgstr "Klikk-og-dra for å flytte alle punkta"
 
 #. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:986
+#: ../app/tools/gimpmeasuretool.c:989
 msgid "Measure Distances and Angles"
 msgstr "Mål avstandar og vinklar"
 
-#: ../app/tools/gimpmeasuretool.c:1006
+#: ../app/tools/gimpmeasuretool.c:1009
 msgid "Distance:"
 msgstr "Avstand:"
 
 #: ../app/tools/gimpmoveoptions.c:140
 msgid "Pick a layer or guide"
-msgstr "Plukk eit lag eller ei hjelpelinje"
+msgstr "Flytt eit lag eller ei hjelpelinje"
 
 #: ../app/tools/gimpmoveoptions.c:141
 msgid "Move the active layer"
@@ -10348,27 +10486,30 @@ msgstr "Flytt den aktive banen"
 msgid "Move:"
 msgstr "Flytt  "
 
-#: ../app/tools/gimpmovetool.c:125
-msgid "tool|Move"
+#: ../app/tools/gimpmovetool.c:127
+#| msgid "Move"
+msgctxt "tool"
+msgid "Move"
 msgstr "Flytt"
 
-#: ../app/tools/gimpmovetool.c:126
+#: ../app/tools/gimpmovetool.c:128
 msgid "Move Tool: Move layers, selections, and other objects"
 msgstr "Flytteverktøyet: Flytt lag, utval og andre objekt"
 
-#: ../app/tools/gimpmovetool.c:127
+#: ../app/tools/gimpmovetool.c:129
 msgid "_Move"
 msgstr "Fl_ytt"
 
-#: ../app/tools/gimpmovetool.c:271 ../app/tools/gimpmovetool.c:552
+#: ../app/tools/gimpmovetool.c:276
+#: ../app/tools/gimpmovetool.c:570
 msgid "Move Guide: "
 msgstr "Flytt hjelpelinje: "
 
-#: ../app/tools/gimpmovetool.c:546
+#: ../app/tools/gimpmovetool.c:564
 msgid "Cancel Guide"
 msgstr "Avbryt hjelpelinje"
 
-#: ../app/tools/gimpmovetool.c:552
+#: ../app/tools/gimpmovetool.c:570
 msgid "Add Guide: "
 msgstr "Legg til hjelpelinje: "
 
@@ -10380,95 +10521,101 @@ msgstr "Penselverktøyet: Teiknar mjuke penselstrøk"
 msgid "_Paintbrush"
 msgstr "Målar_pensel"
 
-#: ../app/tools/gimppaintoptions-gui.c:99
+#: ../app/tools/gimppaintoptions-gui.c:112
 #: ../app/tools/gimpselectionoptions.c:211
-#: ../app/widgets/gimpbrushselect.c:191 ../app/widgets/gimplayertreeview.c:269
+#: ../app/widgets/gimpbrushselect.c:191
+#: ../app/widgets/gimplayertreeview.c:269
 msgid "Mode:"
 msgstr "Modus:"
 
-#: ../app/tools/gimppaintoptions-gui.c:114
+#: ../app/tools/gimppaintoptions-gui.c:127
 #: ../app/tools/gimptransformoptions.c:348
-#: ../app/widgets/gimpbrushselect.c:178 ../app/widgets/gimplayertreeview.c:284
+#: ../app/widgets/gimpbrushselect.c:178
+#: ../app/widgets/gimplayertreeview.c:284
 msgid "Opacity:"
 msgstr "Dekkevne:"
 
-#: ../app/tools/gimppaintoptions-gui.c:124
+#: ../app/tools/gimppaintoptions-gui.c:137
 msgid "Brush:"
 msgstr "Pensel:"
 
-#: ../app/tools/gimppaintoptions-gui.c:129
+#: ../app/tools/gimppaintoptions-gui.c:142
 msgid "Scale:"
-msgstr "Skalering:"
+msgstr "Breidde:"
 
-#: ../app/tools/gimppaintoptions-gui.c:143
-#: ../app/tools/gimppaintoptions-gui.c:432
-msgid "Gradient:"
-msgstr "Fargeovergang:"
-
-#: ../app/tools/gimppaintoptions-gui.c:179
-msgid "Incremental"
-msgstr "Aukande"
-
-#: ../app/tools/gimppaintoptions-gui.c:195
-msgid "Hard edge"
-msgstr "Hard kant"
-
-#: ../app/tools/gimppaintoptions-gui.c:231
-msgid "Pressure sensitivity"
-msgstr "Trykkfølsemd"
-
-#: ../app/tools/gimppaintoptions-gui.c:252
+#: ../app/tools/gimppaintoptions-gui.c:150
 msgid "Opacity"
 msgstr "Dekkevne"
 
-#: ../app/tools/gimppaintoptions-gui.c:268
+#: ../app/tools/gimppaintoptions-gui.c:156
 msgid "Hardness"
 msgstr "Hardleik"
 
-#: ../app/tools/gimppaintoptions-gui.c:279
+#: ../app/tools/gimppaintoptions-gui.c:162
 msgid "Rate"
 msgstr "Grad"
 
-#: ../app/tools/gimppaintoptions-gui.c:295
-#: ../app/tools/gimppaintoptions-gui.c:304 ../app/tools/tools-enums.c:151
+#: ../app/tools/gimppaintoptions-gui.c:168
+#: ../app/tools/tools-enums.c:151
 msgid "Size"
 msgstr "Format"
 
-#: ../app/tools/gimppaintoptions-gui.c:339
+#: ../app/tools/gimppaintoptions-gui.c:186
+msgid "Brush Dynamics"
+msgstr "Penseldynamikk"
+
+#: ../app/tools/gimppaintoptions-gui.c:204
+#| msgid "Select by:"
+msgid "Velocity:"
+msgstr "Fart: "
+
+#: ../app/tools/gimppaintoptions-gui.c:210
+msgid "Random:"
+msgstr "Tilfeldig:"
+
+#: ../app/tools/gimppaintoptions-gui.c:264
+msgid "Incremental"
+msgstr "Aukande"
+
+#: ../app/tools/gimppaintoptions-gui.c:280
+msgid "Hard edge"
+msgstr "Hard kant"
+
+#: ../app/tools/gimppaintoptions-gui.c:565
 msgid "Fade out"
 msgstr "Uttoning"
 
-#: ../app/tools/gimppaintoptions-gui.c:348
-#: ../app/tools/gimppaintoptions-gui.c:441
+#: ../app/tools/gimppaintoptions-gui.c:574
+#: ../app/tools/gimppaintoptions-gui.c:657
 msgid "Length:"
 msgstr "Lengde:"
 
-#: ../app/tools/gimppaintoptions-gui.c:380
+#: ../app/tools/gimppaintoptions-gui.c:601
 msgid "Apply Jitter"
 msgstr "Legg til sitring"
 
-#: ../app/tools/gimppaintoptions-gui.c:385
+#: ../app/tools/gimppaintoptions-gui.c:606
 msgid "Amount:"
 msgstr "Mengde:"
 
-#: ../app/tools/gimppaintoptions-gui.c:415
+#: ../app/tools/gimppaintoptions-gui.c:631
 msgid "Use color from gradient"
 msgstr "Bruk farge frå fargeovergang"
 
-#: ../app/tools/gimppainttool.c:132
+#: ../app/tools/gimppainttool.c:136
 msgid "Click to paint"
 msgstr "Klikk for å teikne"
 
-#: ../app/tools/gimppainttool.c:133
+#: ../app/tools/gimppainttool.c:137
 msgid "Click to draw the line"
 msgstr "Klikk for å teikne linja"
 
-#: ../app/tools/gimppainttool.c:134
+#: ../app/tools/gimppainttool.c:138
 #, c-format
 msgid "%s to pick a color"
 msgstr "%s for å hente ein farge"
 
-#: ../app/tools/gimppainttool.c:651
+#: ../app/tools/gimppainttool.c:662
 #, c-format
 msgid "%s for a straight line"
 msgstr "%s for ei rett linje"
@@ -10481,68 +10628,47 @@ msgstr "Blyanten: Teiknar med harde kantar"
 msgid "Pe_ncil"
 msgstr "_Blyant"
 
-#: ../app/tools/gimpperspectiveclonetool.c:128
-msgid ""
-"Perspective Clone Tool: Clone from an image source after applying a "
-"perspective transformation"
+#: ../app/tools/gimpperspectiveclonetool.c:127
+msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation"
 msgstr "Verktøyet «perspektivkloning»: Kloner i perspektiv frå ei biletkjelde "
 
-#: ../app/tools/gimpperspectiveclonetool.c:130
+#: ../app/tools/gimpperspectiveclonetool.c:129
 msgid "_Perspective Clone"
 msgstr "_Perspektivkloning"
 
-#: ../app/tools/gimpperspectiveclonetool.c:701
+#: ../app/tools/gimpperspectiveclonetool.c:692
 msgid "Ctrl-Click to set a clone source"
 msgstr "Ctrl-Klikk for å setje klonekjelde"
 
-#: ../app/tools/gimpperspectivetool.c:68
-msgid "Perspective Tool: Change perspective of the layer, selection or path"
-msgstr ""
-"Perspektivverktøyet: Endrar perspektivet for eit lag, eit utval eller ein "
-"bane "
-
 #: ../app/tools/gimpperspectivetool.c:70
+msgid "Perspective Tool: Change perspective of the layer, selection or path"
+msgstr "Perspektivverktøyet: Endrar perspektivet for eit lag, eit utval eller ein bane "
+
+#: ../app/tools/gimpperspectivetool.c:72
 msgid "_Perspective"
 msgstr "_Perspektiv"
 
-#: ../app/tools/gimpperspectivetool.c:97
-msgid "command|Perspective"
-msgstr "Kommando: Perspektiv"
+#: ../app/tools/gimpperspectivetool.c:99
+#| msgid "Perspective"
+msgctxt "command"
+msgid "Perspective"
+msgstr "Perspektiv"
 
-#: ../app/tools/gimpperspectivetool.c:98
+#: ../app/tools/gimpperspectivetool.c:100
 msgid "Perspective transformation"
 msgstr "Perspektivtransformasjon"
 
-#: ../app/tools/gimpperspectivetool.c:113
+#: ../app/tools/gimpperspectivetool.c:115
 msgid "Transformation Matrix"
 msgstr "Transformasjonsmatrise"
 
-#: ../app/tools/gimppolygonselecttool.c:162
-#, fuzzy
-msgid "Polygon Select"
-msgstr "Forgrunnsutval"
-
-#: ../app/tools/gimppolygonselecttool.c:163
-#, fuzzy
-msgid "Polygon Select Tool: Select a hand-drawn polygon"
-msgstr "Verktøyet «frihandsutval»: Teikna utvalet på frihand."
-
-#: ../app/tools/gimppolygonselecttool.c:164
-#, fuzzy
-msgid "_Polygon Select"
-msgstr "F_orgrunnsutval"
-
-#: ../app/tools/gimppolygonselecttool.c:575
-msgid "command|Polygon Select"
-msgstr "Kommando: Forgrunnsutval"
-
 #: ../app/tools/gimpposterizetool.c:85
 msgid "Posterize Tool: Reduce to a limited set of colors"
 msgstr "Posteriseringsverktøyet: Reduserer fargane til eit avgrensa fargeutval"
 
 #: ../app/tools/gimpposterizetool.c:86
 msgid "_Posterize..."
-msgstr "_Posterisering (plakat)..."
+msgstr "_Posterisering (plakat) …"
 
 #: ../app/tools/gimpposterizetool.c:103
 msgid "Posterize (Reduce Number of Colors)"
@@ -10553,7 +10679,7 @@ msgstr "Posterisering (reduser talet på fargar)"
 msgid "Posterize does not operate on indexed layers."
 msgstr "Posteriseringa verkar ikkje på indekserte lag."
 
-#: ../app/tools/gimpposterizetool.c:224
+#: ../app/tools/gimpposterizetool.c:226
 msgid "Posterize _levels:"
 msgstr "Talet på fargar:"
 
@@ -10562,80 +10688,98 @@ msgid "Use all visible layers when shrinking the selection"
 msgstr "Bruk alle synlege lag ved krymping av utvalet"
 
 #. Current, as in what is currently in use.
-#: ../app/tools/gimprectangleoptions.c:739
+#: ../app/tools/gimprectangleoptions.c:729
 msgid "Current"
 msgstr "Nåverande"
 
-#: ../app/tools/gimprectangleoptions.c:817
+#: ../app/tools/gimprectangleoptions.c:807
 msgid "Expand from center"
 msgstr "Ekspander frå sentrum"
 
-#: ../app/tools/gimprectangleoptions.c:840
+#: ../app/tools/gimprectangleoptions.c:830
 msgid "Fixed:"
 msgstr "Fast "
 
-#: ../app/tools/gimprectangleoptions.c:973
+#: ../app/tools/gimprectangleoptions.c:963
 msgid "Position:"
 msgstr "Posisjon"
 
-#: ../app/tools/gimprectangleoptions.c:991
+#: ../app/tools/gimprectangleoptions.c:981
 msgid "Highlight"
 msgstr "Utheving"
 
 #. Auto Shrink
-#: ../app/tools/gimprectangleoptions.c:1001
+#: ../app/tools/gimprectangleoptions.c:991
 msgid "Auto Shrink"
 msgstr "Autokrymp"
 
-#: ../app/tools/gimprectangleoptions.c:1008
+#: ../app/tools/gimprectangleoptions.c:998
 msgid "Shrink merged"
 msgstr "Krymp fletta"
 
-#: ../app/tools/gimprectangleselectoptions.c:155
+#: ../app/tools/gimprectangleselectoptions.c:164
 msgid "Rounded corners"
 msgstr "Avrunda hjørne"
 
-#: ../app/tools/gimprectangleselecttool.c:165
+#: ../app/tools/gimprectangleselecttool.c:167
 msgid "Rectangle Select"
 msgstr "Rektangelutval"
 
-#: ../app/tools/gimprectangleselecttool.c:166
+#: ../app/tools/gimprectangleselecttool.c:168
 msgid "Rectangle Select Tool: Select a rectangular region"
 msgstr "Rektangelverktøyet: Marker eit rektangulært område"
 
-#: ../app/tools/gimprectangleselecttool.c:167
+#: ../app/tools/gimprectangleselecttool.c:169
 msgid "_Rectangle Select"
 msgstr "_Rektangelutval"
 
-#: ../app/tools/gimprectangletool.c:1068 ../app/tools/gimprectangletool.c:1943
+#: ../app/tools/gimprectangletool.c:1085
+#: ../app/tools/gimprectangletool.c:1981
 msgid "Rectangle: "
 msgstr "Rektangel:"
 
+#: ../app/tools/gimpregionselectoptions.c:83
+msgid "Allow completely transparent regions to be selected"
+msgstr "Tillat utveljing av heilt gjennomsiktige område"
+
+#: ../app/tools/gimpregionselectoptions.c:90
+#| msgid "Base selection on all visible layers"
+msgid "Base region_select on all visible layers"
+msgstr "Baser område_utvalet på alle dei synlege laga"
+
+#: ../app/tools/gimpregionselectoptions.c:202
+msgid "Select transparent areas"
+msgstr "Vel gjennomsiktige område"
+
+#: ../app/tools/gimpregionselectoptions.c:227
+msgid "Select by:"
+msgstr "Vel etter: "
+
 #: ../app/tools/gimpregionselecttool.c:162
 msgid "Move the mouse to change threshold"
 msgstr "Flytt musa for å endre terskelverdi"
 
-#: ../app/tools/gimprotatetool.c:85
+#: ../app/tools/gimprotatetool.c:90
 msgid "Rotate"
 msgstr "Roter"
 
-#: ../app/tools/gimprotatetool.c:86
+#: ../app/tools/gimprotatetool.c:91
 msgid "Rotate Tool: Rotate the layer, selection or path"
 msgstr "Roteringsverktøyet: Roterer eit lag, eit utval eller ein bane"
 
-#: ../app/tools/gimprotatetool.c:87
+#: ../app/tools/gimprotatetool.c:92
 msgid "_Rotate"
 msgstr "_Roter"
 
-#: ../app/tools/gimprotatetool.c:142
+#: ../app/tools/gimprotatetool.c:188
 msgid "_Angle:"
 msgstr "_Vinkel:"
 
-#: ../app/tools/gimprotatetool.c:157
+#: ../app/tools/gimprotatetool.c:204
 msgid "Center _X:"
 msgstr "Senter _X"
 
-#: ../app/tools/gimprotatetool.c:166
+#: ../app/tools/gimprotatetool.c:213
 msgid "Center _Y:"
 msgstr "Senter _Y"
 
@@ -10652,16 +10796,19 @@ msgid "_Scale"
 msgstr "_Skaler"
 
 #: ../app/tools/gimpscaletool.c:106
-msgid "command|Scale"
-msgstr "Kommando: Skaler"
+#| msgid "Scale"
+msgctxt "command"
+msgid "Scale"
+msgstr "Skaler"
 
-#: ../app/tools/gimpselectionoptions.c:258 ../app/tools/gimptextoptions.c:457
+#: ../app/tools/gimpselectionoptions.c:258
+#: ../app/tools/gimptextoptions.c:473
 msgid "Antialiasing"
 msgstr "Kantutjamning"
 
 #: ../app/tools/gimpselectionoptions.c:273
 msgid "Feather edges"
-msgstr "Fjørkantar"
+msgstr "Mjuke kantar"
 
 #: ../app/tools/gimpselectiontool.c:251
 msgid "Click-Drag to replace the current selection"
@@ -10699,27 +10846,29 @@ msgstr "Klikk-og-dra for å flytte ein kopi av dei valde pikslane"
 msgid "Click to anchor the floating selection"
 msgstr "Klikk for å forankre det flytande utvalet"
 
-#: ../app/tools/gimpsheartool.c:81
+#: ../app/tools/gimpsheartool.c:82
 msgid "Shear"
 msgstr "Forskyv"
 
-#: ../app/tools/gimpsheartool.c:82
+#: ../app/tools/gimpsheartool.c:83
 msgid "Shear Tool: Shear the layer, selection or path"
 msgstr "Forskyvingsverktøyet: Forskyv eit lag, eit utval eller ein bane"
 
-#: ../app/tools/gimpsheartool.c:83
+#: ../app/tools/gimpsheartool.c:84
 msgid "S_hear"
 msgstr "_Forskyv"
 
-#: ../app/tools/gimpsheartool.c:109
-msgid "command|Shear"
-msgstr "Kommando: Forskyv"
+#: ../app/tools/gimpsheartool.c:110
+#| msgid "Shear"
+msgctxt "command"
+msgid "Shear"
+msgstr "Forskyv"
 
-#: ../app/tools/gimpsheartool.c:133
+#: ../app/tools/gimpsheartool.c:134
 msgid "Shear magnitude _X:"
 msgstr "Forskyv X:"
 
-#: ../app/tools/gimpsheartool.c:143
+#: ../app/tools/gimpsheartool.c:144
 msgid "Shear magnitude _Y:"
 msgstr "Forskyv X:"
 
@@ -10739,118 +10888,122 @@ msgstr "Klikk for å gni ut fargane"
 msgid "Click to smudge the line"
 msgstr "Klikk for å glatte ut linja"
 
-#: ../app/tools/gimptextoptions.c:114
-msgid ""
-"Hinting alters the font outline to produce a crisp bitmap at small sizes"
-msgstr ""
-"«Hinting» betyr å gjere endringar i omrisset til skrifttypane slik at "
-"teksten blir tydelegare når skrifttypen er liten. GIMP hentar data frå "
-"skrifttypen dersom desse er tilgjengelege."
+#: ../app/tools/gimptextoptions.c:127
+msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes"
+msgstr "«Hinting» betyr å gjere endringar i omrisset til skrifttypane slik at teksten blir tydelegare når skrifttypen er liten. GIMP hentar data frå skrifttypen dersom desse er tilgjengelege."
 
-#: ../app/tools/gimptextoptions.c:121
-msgid ""
-"If available, hints from the font are used but you may prefer to always use "
-"the automatic hinter"
-msgstr ""
-"For å vere på den sikre sida, kan du få GIMP til å tydeleggjere skriftteikna "
-"uansett om «hint» er tilgjengeleg frå skrifttypen eller ikkje."
+#: ../app/tools/gimptextoptions.c:134
+msgid "If available, hints from the font are used but you may prefer to always use the automatic hinter"
+msgstr "For å vere på den sikre sida, kan du få GIMP til å tydeleggjere skriftteikna uansett om «hint» er tilgjengeleg frå skrifttypen eller ikkje."
 
-#: ../app/tools/gimptextoptions.c:146
+#: ../app/tools/gimptextoptions.c:159
 msgid "Indentation of the first line"
 msgstr "Innrykk på første linje"
 
-#: ../app/tools/gimptextoptions.c:152
+#: ../app/tools/gimptextoptions.c:165
 msgid "Adjust line spacing"
 msgstr "Juster linjeavstand"
 
-#: ../app/tools/gimptextoptions.c:158
+#: ../app/tools/gimptextoptions.c:171
 msgid "Adjust letter spacing"
 msgstr "Juster bokstavavstand"
 
-#: ../app/tools/gimptextoptions.c:429
+#: ../app/tools/gimptextoptions.c:445
 msgid "Font:"
 msgstr "Skrifttype:"
 
-#: ../app/tools/gimptextoptions.c:441
+#: ../app/tools/gimptextoptions.c:461
 msgid "Hinting"
 msgstr "Hinting"
 
-#: ../app/tools/gimptextoptions.c:448
+#: ../app/tools/gimptextoptions.c:466
 msgid "Force auto-hinter"
 msgstr "Tving automatiske hint"
 
-#: ../app/tools/gimptextoptions.c:465
+#: ../app/tools/gimptextoptions.c:487
 msgid "Text Color"
 msgstr "Tekstfarge"
 
-#: ../app/tools/gimptextoptions.c:470
+#: ../app/tools/gimptextoptions.c:492
 msgid "Color:"
 msgstr "Farge:"
 
-#: ../app/tools/gimptextoptions.c:476
+#: ../app/tools/gimptextoptions.c:498
 msgid "Justify:"
 msgstr "Justering:"
 
 #. Create a path from the current text
-#: ../app/tools/gimptextoptions.c:498
+#: ../app/tools/gimptextoptions.c:520
 msgid "Path from Text"
 msgstr "Opprett bane frå tekst"
 
-#: ../app/tools/gimptextoptions.c:505
+#: ../app/tools/gimptextoptions.c:527
 msgid "Text along Path"
 msgstr "Tekst langs bane"
 
-#: ../app/tools/gimptexttool.c:142
+#: ../app/tools/gimptexttool.c:161
 msgid "Text Tool: Create or edit text layers"
 msgstr "Tekstverktøyet: Oppretter eller redigerer tekstlag"
 
-#: ../app/tools/gimptexttool.c:143
+#: ../app/tools/gimptexttool.c:162
 msgid "Te_xt"
 msgstr "_Tekst"
 
-#: ../app/tools/gimptexttool.c:753
+#: ../app/tools/gimptexttool.c:956
 msgid "GIMP Text Editor"
 msgstr "GIMP tekstbehandlar"
 
-#: ../app/tools/gimptexttool.c:864 ../app/tools/gimptexttool.c:867
+#: ../app/tools/gimptexttool.c:1072
+#: ../app/tools/gimptexttool.c:1075
 msgid "Confirm Text Editing"
 msgstr "Bekreft tekstredigering"
 
-#: ../app/tools/gimptexttool.c:896
+#: ../app/tools/gimptexttool.c:1079
+#| msgid "Create a New Layer"
+msgid "Create _New Layer"
+msgstr "Opprett eit _nytt lag"
+
+#: ../app/tools/gimptexttool.c:1103
 msgid ""
-"The layer you selected is a text layer but it has been modified using other "
-"tools. Editing the layer with the text tool will discard these "
-"modifications.\n"
+"The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n"
 "\n"
 "You can edit the layer or create a new text layer from its text attributes."
 msgstr ""
-"Det valde laget er eit tekstlag som er endra med andre verktøy. Dersom du "
-"gjer forandringar i laget ved hjelp av tekstverktøyet, vil dei andre "
-"endringane bli forkasta.\n"
+"Det valde laget er eit tekstlag som er endra med andre verktøy. Dersom du gjer forandringar i laget ved hjelp av tekstverktøyet, vil dei andre endringane bli forkasta.\n"
 "\n"
-"Du kan redigere laget eller oppretta eit nytt tekstlag med dette laget sine "
-"tekstinnstillingar."
+"Du kan redigere laget eller oppretta eit nytt tekstlag med dette laget sine tekstinnstillingar."
+
+#: ../app/tools/gimptexttool.c:1315
+#| msgid "Rename Text Layer"
+msgid "Reshape Text Layer"
+msgstr "Endre forma på tekstlaget"
 
 #: ../app/tools/gimpthresholdtool.c:91
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
-msgstr ""
-"Terskelverktøyet: Reduser biletet til to fargar ved hjelp av ein vald "
-"grenseverdi"
+msgstr "Terskelverktøyet: Reduser biletet til to fargar ved hjelp av ein vald grenseverdi"
 
 #: ../app/tools/gimpthresholdtool.c:92
 msgid "_Threshold..."
-msgstr "_Terskel..."
+msgstr "_Terskel …"
 
 #: ../app/tools/gimpthresholdtool.c:109
 msgid "Apply Threshold"
 msgstr "Bruk terskel"
 
-#: ../app/tools/gimpthresholdtool.c:158
+#: ../app/tools/gimpthresholdtool.c:111
+msgid "Import Threshold Settings"
+msgstr "Importer nivåinnstillingane"
+
+#: ../app/tools/gimpthresholdtool.c:112
+msgid "Export Threshold Settings"
+msgstr "Eksporter nivåinnstillingane"
+
+#: ../app/tools/gimpthresholdtool.c:161
 #, c-format
 msgid "Threshold does not operate on indexed layers."
 msgstr "Terskel verkar ikkje på indekserte lag."
 
-#: ../app/tools/gimpthresholdtool.c:263
+#: ../app/tools/gimpthresholdtool.c:266
 msgid "Automatically adjust to optimal binarization threshold"
 msgstr "Juster automatisk til optimal binæriseringsterskel"
 
@@ -10885,15 +11038,15 @@ msgstr "15º  (%s)"
 msgid "Keep aspect  (%s)"
 msgstr "Uendra proporsjonar (%s)"
 
-#: ../app/tools/gimptransformtool.c:236
+#: ../app/tools/gimptransformtool.c:238
 msgid "Transforming"
 msgstr "Transformerer"
 
-#: ../app/tools/gimptransformtool.c:1162
+#: ../app/tools/gimptransformtool.c:1165
 msgid "There is no layer to transform."
 msgstr "Det er ingen lag å transformera"
 
-#: ../app/tools/gimptransformtool.c:1173
+#: ../app/tools/gimptransformtool.c:1176
 msgid "There is no path to transform."
 msgstr "Det er ingen bane å transformera"
 
@@ -10935,128 +11088,130 @@ msgstr "Baneverktøyet: Opprett og rediger banar"
 msgid "Pat_hs"
 msgstr "_Banar"
 
-#: ../app/tools/gimpvectortool.c:320
+#: ../app/tools/gimpvectortool.c:322
 msgid "Add Stroke"
 msgstr "Legg til strøk"
 
-#: ../app/tools/gimpvectortool.c:338
+#: ../app/tools/gimpvectortool.c:345
 msgid "Add Anchor"
 msgstr "Legg til anker"
 
-#: ../app/tools/gimpvectortool.c:361
+#: ../app/tools/gimpvectortool.c:370
 msgid "Insert Anchor"
 msgstr "Set inn anker"
 
-#: ../app/tools/gimpvectortool.c:390
+#: ../app/tools/gimpvectortool.c:400
 msgid "Drag Handle"
 msgstr "Dra handtak"
 
-#: ../app/tools/gimpvectortool.c:419
+#: ../app/tools/gimpvectortool.c:429
 msgid "Drag Anchor"
 msgstr "Dra anker"
 
-#: ../app/tools/gimpvectortool.c:436
+#: ../app/tools/gimpvectortool.c:446
 msgid "Drag Anchors"
 msgstr "Dra anker"
 
-#: ../app/tools/gimpvectortool.c:456
+#: ../app/tools/gimpvectortool.c:468
 msgid "Drag Curve"
 msgstr "Dra kurve"
 
-#: ../app/tools/gimpvectortool.c:484
+#: ../app/tools/gimpvectortool.c:496
 msgid "Connect Strokes"
 msgstr "Kople strøka saman"
 
-#: ../app/tools/gimpvectortool.c:514
+#: ../app/tools/gimpvectortool.c:527
 msgid "Drag Path"
 msgstr "Dra bane"
 
-#: ../app/tools/gimpvectortool.c:524
+#: ../app/tools/gimpvectortool.c:537
 msgid "Convert Edge"
 msgstr "Konverter kant"
 
-#: ../app/tools/gimpvectortool.c:554
+#: ../app/tools/gimpvectortool.c:567
 msgid "Delete Anchor"
 msgstr "Slett anker"
 
-#: ../app/tools/gimpvectortool.c:576
+#: ../app/tools/gimpvectortool.c:589
 msgid "Delete Segment"
 msgstr "Slett segment"
 
-#: ../app/tools/gimpvectortool.c:788
+#: ../app/tools/gimpvectortool.c:807
 msgid "Move Anchors"
 msgstr "Flytt ankera"
 
-#: ../app/tools/gimpvectortool.c:1146
+#: ../app/tools/gimpvectortool.c:1167
 msgid "Click to pick path to edit"
 msgstr "Klikk for å hente  bane for redigering"
 
-#: ../app/tools/gimpvectortool.c:1149
+#: ../app/tools/gimpvectortool.c:1171
 msgid "Click to create a new path"
 msgstr "Klikk for å opprette ein ny bane."
 
-#: ../app/tools/gimpvectortool.c:1152
+#: ../app/tools/gimpvectortool.c:1175
 msgid "Click to create a new component of the path"
 msgstr "Klikk for å oppretta ein ny komponent i banen."
 
-#: ../app/tools/gimpvectortool.c:1155
+#: ../app/tools/gimpvectortool.c:1179
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "Klikk eller klikk-og-dra for å oppretta eit nytt anker"
 
-#: ../app/tools/gimpvectortool.c:1164 ../app/tools/gimpvectortool.c:1171
+#: ../app/tools/gimpvectortool.c:1189
+#: ../app/tools/gimpvectortool.c:1196
 msgid "Click-Drag to move the anchor around"
 msgstr "Klikk-og-dra for å flytte ankeret rundt."
 
-#: ../app/tools/gimpvectortool.c:1174 ../app/tools/gimpvectortool.c:1185
+#: ../app/tools/gimpvectortool.c:1200
+#: ../app/tools/gimpvectortool.c:1213
 msgid "Click-Drag to move the anchors around"
 msgstr "Klikk-og-dra for å flytte ankera rundt."
 
-#: ../app/tools/gimpvectortool.c:1177
+#: ../app/tools/gimpvectortool.c:1204
 msgid "Click-Drag to move the handle around"
 msgstr "Klikk-og-dra for å flytte handtaket rundt"
 
-#: ../app/tools/gimpvectortool.c:1190
+#: ../app/tools/gimpvectortool.c:1218
 msgid "Click-Drag to change the shape of the curve"
 msgstr "Klikk og dra for å endre forma på kurva"
 
-#: ../app/tools/gimpvectortool.c:1193
+#: ../app/tools/gimpvectortool.c:1221
 #, c-format
 msgid "%s: symmetrical"
 msgstr "%s: symmetrisk"
 
-#: ../app/tools/gimpvectortool.c:1197
+#: ../app/tools/gimpvectortool.c:1226
 msgid "Click-Drag to move the component around"
 msgstr "Klikk og dra for å flytte komponenten"
 
-#: ../app/tools/gimpvectortool.c:1204
+#: ../app/tools/gimpvectortool.c:1234
 msgid "Click-Drag to move the path around"
 msgstr "Klikk og dra for å flytte banen."
 
-#: ../app/tools/gimpvectortool.c:1207
+#: ../app/tools/gimpvectortool.c:1238
 msgid "Click-Drag to insert an anchor on the path"
 msgstr "Klikk for å sette inn eit anker i banen"
 
-#: ../app/tools/gimpvectortool.c:1214
+#: ../app/tools/gimpvectortool.c:1246
 msgid "Click to delete this anchor"
 msgstr "Klikk for å slette dette ankeret."
 
-#: ../app/tools/gimpvectortool.c:1217
+#: ../app/tools/gimpvectortool.c:1250
 msgid "Click to connect this anchor with the selected endpoint"
 msgstr "Klikk for å kopla dette ankeret saman med det valde endepunktet."
 
-#: ../app/tools/gimpvectortool.c:1221
+#: ../app/tools/gimpvectortool.c:1255
 msgid "Click to open up the path"
 msgstr "Klikk for å opna banen."
 
-#: ../app/tools/gimpvectortool.c:1224
+#: ../app/tools/gimpvectortool.c:1259
 msgid "Click to make this node angular"
 msgstr "Klikk for å gjere denne noden vinkla."
 
-#: ../app/tools/gimpvectortool.c:1730
+#: ../app/tools/gimpvectortool.c:1766
 msgid "Delete Anchors"
 msgstr "Slett anker"
 
-#: ../app/tools/gimpvectortool.c:1903
+#: ../app/tools/gimpvectortool.c:1939
 msgid "There is no active layer or channel to stroke to"
 msgstr "Det er ingen aktive lag eller kanalar å teikna på"
 
@@ -11080,13 +11235,15 @@ msgstr "Gylne snitt"
 msgid "Aspect ratio"
 msgstr "Sideforhold"
 
-#: ../app/tools/tools-enums.c:149 ../app/widgets/gimpgrideditor.c:257
-#: ../app/widgets/gimpgrideditor.c:289
+#: ../app/tools/tools-enums.c:149
+#: ../app/widgets/gimpgrideditor.c:265
+#: ../app/widgets/gimpgrideditor.c:297
 msgid "Width"
 msgstr "Breidde"
 
-#: ../app/tools/tools-enums.c:150 ../app/widgets/gimpgrideditor.c:259
-#: ../app/widgets/gimpgrideditor.c:291
+#: ../app/tools/tools-enums.c:150
+#: ../app/widgets/gimpgrideditor.c:267
+#: ../app/widgets/gimpgrideditor.c:299
 msgid "Height"
 msgstr "Høgde"
 
@@ -11102,7 +11259,8 @@ msgstr "Fast storleik"
 msgid "Fixed aspect ratio"
 msgstr "Uendra proporsjonar"
 
-#: ../app/tools/tools-enums.c:211 ../app/vectors/gimpvectors.c:191
+#: ../app/tools/tools-enums.c:211
+#: ../app/vectors/gimpvectors.c:192
 msgid "Path"
 msgstr "Bane"
 
@@ -11130,31 +11288,35 @@ msgstr "Lag ny"
 msgid "Move"
 msgstr "Flytt"
 
-#: ../app/vectors/gimpvectors.c:192
+#: ../app/vectors/gimpvectors.c:193
 msgid "Rename Path"
 msgstr "Endre namn på bane"
 
-#: ../app/vectors/gimpvectors.c:193 ../app/vectors/gimpvectors.c:315
+#: ../app/vectors/gimpvectors.c:194
+#: ../app/vectors/gimpvectors.c:316
 msgid "Move Path"
 msgstr "Flytt banen"
 
-#: ../app/vectors/gimpvectors.c:194
+#: ../app/vectors/gimpvectors.c:195
 msgid "Scale Path"
 msgstr "Skaler banen"
 
-#: ../app/vectors/gimpvectors.c:195
+#: ../app/vectors/gimpvectors.c:196
 msgid "Resize Path"
 msgstr "Endre storleik på banen"
 
-#: ../app/vectors/gimpvectors.c:196 ../app/vectors/gimpvectors.c:414
+#: ../app/vectors/gimpvectors.c:197
+#: ../app/vectors/gimpvectors.c:415
 msgid "Flip Path"
 msgstr "Spegelvend banen"
 
-#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:445
+#: ../app/vectors/gimpvectors.c:198
+#: ../app/vectors/gimpvectors.c:446
 msgid "Rotate Path"
 msgstr "Roter banen"
 
-#: ../app/vectors/gimpvectors.c:198 ../app/vectors/gimpvectors.c:475
+#: ../app/vectors/gimpvectors.c:199
+#: ../app/vectors/gimpvectors.c:476
 msgid "Transform Path"
 msgstr "Transformer banen"
 
@@ -11186,51 +11348,57 @@ msgstr "Fann ingen banar i bufferen"
 msgid "Failed to import paths from '%s': %s"
 msgstr "Kunne ikkje importere banar frå «%s»: %s."
 
-#: ../app/widgets/gimpactiongroup.c:800
+#: ../app/widgets/gimpactioneditor.c:71
+#| msgid "Shear"
+msgid "_Search:"
+msgstr "_Søk:"
+
+#: ../app/widgets/gimpactiongroup.c:802
 #, c-format
 msgid "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 msgstr "RGBA (%0.3f, %0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpactionview.c:312
-#: ../app/widgets/gimpcontrollereditor.c:347
+#: ../app/widgets/gimpactionview.c:346
+#: ../app/widgets/gimpcontrollereditor.c:348
 msgid "Action"
 msgstr "Handling"
 
-#: ../app/widgets/gimpactionview.c:341
+#: ../app/widgets/gimpactionview.c:375
 msgid "Shortcut"
 msgstr "Snarveg"
 
-#: ../app/widgets/gimpactionview.c:365
+#: ../app/widgets/gimpactionview.c:401
 msgid "Name"
 msgstr "Namn"
 
-#: ../app/widgets/gimpactionview.c:497 ../app/widgets/gimpactionview.c:701
+#: ../app/widgets/gimpactionview.c:641
+#: ../app/widgets/gimpactionview.c:846
 msgid "Changing shortcut failed."
 msgstr "Endring av snarveg mislukka."
 
-#: ../app/widgets/gimpactionview.c:539
+#: ../app/widgets/gimpactionview.c:683
 msgid "Conflicting Shortcuts"
 msgstr "Konflikt mellom snarvegar"
 
-#: ../app/widgets/gimpactionview.c:545
+#: ../app/widgets/gimpactionview.c:689
 msgid "_Reassign shortcut"
 msgstr "_Tilordna snarveg på nytt"
 
-#: ../app/widgets/gimpactionview.c:560
+#: ../app/widgets/gimpactionview.c:704
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
 msgstr "Svarvegen «%s» er i bruk frå før av «%s» frå «%s»-gruppa."
 
-#: ../app/widgets/gimpactionview.c:564
+#: ../app/widgets/gimpactionview.c:708
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
 msgstr "Tilordning av snarvegen på nytt vil fjerna han frå «%s»."
 
-#: ../app/widgets/gimpactionview.c:637
+#: ../app/widgets/gimpactionview.c:781
 msgid "Invalid shortcut."
 msgstr "Ugyldig snarveg."
 
-#: ../app/widgets/gimpactionview.c:725
+#: ../app/widgets/gimpactionview.c:870
 msgid "Removing shortcut failed."
 msgstr "Fjerning av snarveg mislukka."
 
@@ -11256,8 +11424,9 @@ msgstr "Mellomrom:"
 msgid "Percentage of width of brush"
 msgstr "Prosent av penselbreidda"
 
-#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
-#: ../app/widgets/gimpeditor.c:744
+#: ../app/widgets/gimpbufferview.c:173
+#: ../app/widgets/gimpbufferview.c:257
+#: ../app/widgets/gimpeditor.c:754
 msgid "(None)"
 msgstr "(Ingen)"
 
@@ -11308,30 +11477,30 @@ msgid "No filter selected"
 msgstr "Ingen filter vald"
 
 #: ../app/widgets/gimpcoloreditor.c:263
-msgid ""
-"Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
-"CSS color names."
-msgstr ""
-"Hexadesimal fargenotasjon slik som brukt i HTML og CSS. Du kan også bruke "
-"CSS fargenamn. Skriv første bokstaven i fargen for å få opp lista."
+msgid "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts CSS color names."
+msgstr "Hexadesimal fargenotasjon slik som brukt i HTML og CSS. Du kan også bruke CSS fargenamn. Skriv første bokstaven i fargen for å få opp lista."
 
 #: ../app/widgets/gimpcolorframe.c:501
 msgid "Index:"
 msgstr "Indeks:"
 
-#: ../app/widgets/gimpcolorframe.c:514 ../app/widgets/gimpcolorframe.c:540
+#: ../app/widgets/gimpcolorframe.c:514
+#: ../app/widgets/gimpcolorframe.c:540
 msgid "Red:"
 msgstr "Raud:"
 
-#: ../app/widgets/gimpcolorframe.c:515 ../app/widgets/gimpcolorframe.c:541
+#: ../app/widgets/gimpcolorframe.c:515
+#: ../app/widgets/gimpcolorframe.c:541
 msgid "Green:"
 msgstr "Grøn:"
 
-#: ../app/widgets/gimpcolorframe.c:516 ../app/widgets/gimpcolorframe.c:542
+#: ../app/widgets/gimpcolorframe.c:516
+#: ../app/widgets/gimpcolorframe.c:542
 msgid "Blue:"
 msgstr "Blå:"
 
-#: ../app/widgets/gimpcolorframe.c:529 ../app/widgets/gimpcolorframe.c:562
+#: ../app/widgets/gimpcolorframe.c:529
+#: ../app/widgets/gimpcolorframe.c:562
 msgid "Value:"
 msgstr "Verdi:"
 
@@ -11367,68 +11536,76 @@ msgstr "Svart:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: ../app/widgets/gimpcolorframe.c:623 ../app/widgets/gimpcursorview.c:134
-#: ../app/widgets/gimpcursorview.c:140 ../app/widgets/gimpcursorview.c:156
-#: ../app/widgets/gimpcursorview.c:162 ../app/widgets/gimpcursorview.c:445
-#: ../app/widgets/gimpcursorview.c:446 ../app/widgets/gimpcursorview.c:447
-#: ../app/widgets/gimpcursorview.c:448
+#: ../app/widgets/gimpcolorframe.c:623
+#: ../app/widgets/gimpcursorview.c:134
+#: ../app/widgets/gimpcursorview.c:140
+#: ../app/widgets/gimpcursorview.c:156
+#: ../app/widgets/gimpcursorview.c:162
+#: ../app/widgets/gimpcursorview.c:444
+#: ../app/widgets/gimpcursorview.c:445
+#: ../app/widgets/gimpcursorview.c:446
+#: ../app/widgets/gimpcursorview.c:447
 msgid "n/a"
 msgstr "i/t"
 
-#: ../app/widgets/gimpcolormapeditor.c:226
+#: ../app/widgets/gimpcolormapeditor.c:225
 msgid "Color index:"
 msgstr "Fargeindeks:"
 
-#: ../app/widgets/gimpcolormapeditor.c:236
+#: ../app/widgets/gimpcolormapeditor.c:235
 msgid "HTML notation:"
 msgstr "HTML-notasjon:"
 
-#: ../app/widgets/gimpcolormapeditor.c:493
+#: ../app/widgets/gimpcolormapeditor.c:492
 msgid "Only indexed images have a colormap."
-msgstr ""
+msgstr "Bare indekserte bilete har fargekart."
 
 #: ../app/widgets/gimpcolorselectorpalette.c:59
 msgid "Palette"
 msgstr "Palett"
 
-#: ../app/widgets/gimpcontainerpopup.c:538
+#: ../app/widgets/gimpcontainerpopup.c:540
 msgid "Smaller Previews"
 msgstr "Mindre førehandsvisingar"
 
-#: ../app/widgets/gimpcontainerpopup.c:543
+#: ../app/widgets/gimpcontainerpopup.c:545
 msgid "Larger Previews"
 msgstr "Større førehandsvisingar"
 
-#: ../app/widgets/gimpcontrollereditor.c:201
+#: ../app/widgets/gimpcontrollereditor.c:202
 msgid "_Dump events from this controller"
 msgstr "_Avslå handlingar frå denne kontrollen"
 
-#: ../app/widgets/gimpcontrollereditor.c:206
+#: ../app/widgets/gimpcontrollereditor.c:207
 msgid "_Enable this controller"
-msgstr "Aktiviser _denne kontrollen"
+msgstr "aktiver _denne kontrollen"
 
-#: ../app/widgets/gimpcontrollereditor.c:227
+#: ../app/widgets/gimpcontrollereditor.c:228
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../app/widgets/gimpcontrollereditor.c:341
+#: ../app/widgets/gimpcontrollereditor.c:234
+msgid "State:"
+msgstr "Tilstand:"
+
+#: ../app/widgets/gimpcontrollereditor.c:342
 msgid "Event"
 msgstr "Hending"
 
-#: ../app/widgets/gimpcontrollereditor.c:366
+#: ../app/widgets/gimpcontrollereditor.c:367
 msgid "_Grab event"
 msgstr "_Hent hending"
 
-#: ../app/widgets/gimpcontrollereditor.c:376
+#: ../app/widgets/gimpcontrollereditor.c:377
 msgid "Select the next event arriving from the controller"
 msgstr "Vel den neste hendinga som skal kome frå kontrollaren"
 
-#: ../app/widgets/gimpcontrollereditor.c:534
+#: ../app/widgets/gimpcontrollereditor.c:535
 #, c-format
 msgid "Remove the action assigned to '%s'"
 msgstr "Fjern handlinga tillagt «%s»"
 
-#: ../app/widgets/gimpcontrollereditor.c:539
+#: ../app/widgets/gimpcontrollereditor.c:540
 #, c-format
 msgid "Assign an action to '%s'"
 msgstr "Tilordn handlinga til «%s»"
@@ -11519,17 +11696,17 @@ msgstr "Flytt den valde kontrollaren opp"
 msgid "Move the selected controller down"
 msgstr "Flytt den valde kontrollaren ned"
 
-#: ../app/widgets/gimpcontrollerlist.c:428
+#: ../app/widgets/gimpcontrollerlist.c:430
 #, c-format
 msgid "Add '%s' to the list of active controllers"
 msgstr "Legg  «%s» til i lista over aktive kontrollar."
 
-#: ../app/widgets/gimpcontrollerlist.c:479
+#: ../app/widgets/gimpcontrollerlist.c:481
 #, c-format
 msgid "Remove '%s' from the list of active controllers"
 msgstr "Fjern  «%s»  frå lista over aktive kontrollar"
 
-#: ../app/widgets/gimpcontrollerlist.c:512
+#: ../app/widgets/gimpcontrollerlist.c:514
 msgid ""
 "There can only be one active keyboard controller.\n"
 "\n"
@@ -11538,7 +11715,7 @@ msgstr ""
 "Du kan bare ha ein aktiv tastaturkontrollerar.\n"
 "Du har ein tastaturkontrollerar frå før i lista over kontrollar."
 
-#: ../app/widgets/gimpcontrollerlist.c:522
+#: ../app/widgets/gimpcontrollerlist.c:524
 msgid ""
 "There can only be one active wheel controller.\n"
 "\n"
@@ -11547,38 +11724,34 @@ msgstr ""
 "Du kan bare ha ein aktiv hjulkontroll.\n"
 "Du har ein hjulkontroll frå før i lista over kontrollar."
 
-#: ../app/widgets/gimpcontrollerlist.c:549
+#: ../app/widgets/gimpcontrollerlist.c:551
 msgid "Remove Controller?"
 msgstr "Fjern kontrollaren?"
 
-#: ../app/widgets/gimpcontrollerlist.c:554
+#: ../app/widgets/gimpcontrollerlist.c:556
 msgid "Disable Controller"
 msgstr "Kople ut kontrollaren"
 
-#: ../app/widgets/gimpcontrollerlist.c:556
+#: ../app/widgets/gimpcontrollerlist.c:558
 msgid "Remove Controller"
 msgstr "Fjern kontrollaren"
 
-#: ../app/widgets/gimpcontrollerlist.c:567
+#: ../app/widgets/gimpcontrollerlist.c:569
 #, c-format
 msgid "Remove Controller '%s'?"
 msgstr "Fjern kontrollaren «%s»"
 
-#: ../app/widgets/gimpcontrollerlist.c:571
+#: ../app/widgets/gimpcontrollerlist.c:573
 #, c-format
 msgid ""
-"Removing this controller from the list of active controllers will "
-"permanently delete all event mappings you have configured.\n"
+"Removing this controller from the list of active controllers will permanently delete all event mappings you have configured.\n"
 "\n"
-"Selecting \"Disable Controller\" will disable the controller without "
-"removing it."
+"Selecting \"Disable Controller\" will disable the controller without removing it."
 msgstr ""
-"Fjernar du denne kontrollaren frå lista over aktive kontrollar, vil du også "
-"fjerne alle hendingar som er knytte til denne.\n"
-"Valet «Deaktiver kontrollaren» gjer at kontrollaren ikkje blir brukt, utan å "
-"fjerna han."
+"Fjernar du denne kontrollaren frå lista over aktive kontrollar, vil du også fjerne alle hendingar som er knytte til denne.\n"
+"Valet «Deaktiver kontrollaren» gjer at kontrollaren ikkje blir brukt, utan å fjerna han."
 
-#: ../app/widgets/gimpcontrollerlist.c:631
+#: ../app/widgets/gimpcontrollerlist.c:633
 msgid "Configure Input Controller"
 msgstr "Innstillingar for inndatakontrollaren"
 
@@ -11634,11 +11807,13 @@ msgstr "Musehjul"
 msgid "Mouse Wheel Events"
 msgstr "Musehjulhandlingar"
 
-#: ../app/widgets/gimpcursorview.c:137 ../app/widgets/gimpcursorview.c:159
+#: ../app/widgets/gimpcursorview.c:137
+#: ../app/widgets/gimpcursorview.c:159
 msgid "X"
 msgstr "X"
 
-#: ../app/widgets/gimpcursorview.c:143 ../app/widgets/gimpcursorview.c:165
+#: ../app/widgets/gimpcursorview.c:143
+#: ../app/widgets/gimpcursorview.c:165
 msgid "Y"
 msgstr "Y"
 
@@ -11654,7 +11829,7 @@ msgstr "Lagra"
 msgid "Revert"
 msgstr "Tilbakestill"
 
-#: ../app/widgets/gimpdataeditor.c:445
+#: ../app/widgets/gimpdataeditor.c:444
 #, c-format
 msgid "%s (read only)"
 msgstr "%s (bare for lesing)"
@@ -11694,33 +11869,7 @@ msgstr "Ei fil med namnet «%s» finst frå før."
 msgid "Do you want to replace it with the image you are saving?"
 msgstr "Vil du bytte ut dette biletet med det biletet du lagrar?"
 
-#: ../app/widgets/gimpdock.c:287
-msgid "Close all Tabs?"
-msgstr "Lukk alle faner?"
-
-#: ../app/widgets/gimpdock.c:293
-msgid "Close all Tabs"
-msgstr "Lukk alle faner"
-
-#: ../app/widgets/gimpdock.c:303
-msgid "Close all tabs?"
-msgstr "Lukk alle faner?"
-
-#: ../app/widgets/gimpdock.c:306
-#, c-format
-msgid ""
-"This window has %d tab open. Closing the window will also close all its tabs."
-msgid_plural ""
-"This window has %d tabs open. Closing the window will also close all its "
-"tabs."
-msgstr[0] ""
-"Dette vindauget har ei open fane. Dersom du lukker vindauget, vil også fanen "
-"bli lukka."
-msgstr[1] ""
-"Dette vindauget har %d opne faner. Dersom du lukker vindauget, vil også "
-"fanen bli lukka. "
-
-#: ../app/widgets/gimpdockable.c:166
+#: ../app/widgets/gimpdockable.c:194
 msgid "Configure this tab"
 msgstr "Innstillingar for fanen"
 
@@ -11741,23 +11890,23 @@ msgstr "Meldingane er vidaresendt til stderr."
 msgid "%s Message"
 msgstr "Melding frå %s"
 
-#: ../app/widgets/gimpfiledialog.c:273
+#: ../app/widgets/gimpfiledialog.c:310
 msgid "Automatically Detected"
 msgstr "Funne automatisk"
 
-#: ../app/widgets/gimpfiledialog.c:283
+#: ../app/widgets/gimpfiledialog.c:320
 msgid "By Extension"
 msgstr "Etter filutvidinga"
 
-#: ../app/widgets/gimpfiledialog.c:542
+#: ../app/widgets/gimpfiledialog.c:652
 msgid "All files"
 msgstr "Alle filer"
 
-#: ../app/widgets/gimpfiledialog.c:547
+#: ../app/widgets/gimpfiledialog.c:657
 msgid "All images"
-msgstr "Alle bileta"
+msgstr "Alle biletfilene"
 
-#: ../app/widgets/gimpfiledialog.c:676
+#: ../app/widgets/gimpfiledialog.c:786
 #, c-format
 msgid "Select File _Type (%s)"
 msgstr "Vel fil_type (%s)"
@@ -11785,128 +11934,148 @@ msgstr "Skala: %d:1"
 msgid "Displaying [%0.4f, %0.4f]"
 msgstr "Synleg område [%0.6f - %0.4f]"
 
-#: ../app/widgets/gimpgradienteditor.c:996
+#: ../app/widgets/gimpgradienteditor.c:997
 #, c-format
 msgid "Position: %0.4f"
 msgstr "Posisjon: %0.4f"
 
-#: ../app/widgets/gimpgradienteditor.c:997
+#: ../app/widgets/gimpgradienteditor.c:998
 #, c-format
 msgid "RGB (%0.3f, %0.3f, %0.3f)"
 msgstr "RGB (%0.3f, %0.3f, %0.3f)"
 
-#: ../app/widgets/gimpgradienteditor.c:999
+#: ../app/widgets/gimpgradienteditor.c:1000
 #, c-format
 msgid "HSV (%0.1f, %0.1f, %0.1f)"
 msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 
-#: ../app/widgets/gimpgradienteditor.c:1001
+#: ../app/widgets/gimpgradienteditor.c:1002
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
 msgstr "Luminans: %0.3f    Dekkevne: %0.3f"
 
-#: ../app/widgets/gimpgradienteditor.c:1032
+#: ../app/widgets/gimpgradienteditor.c:1033
 #, c-format
 msgid "RGB (%d, %d, %d)"
 msgstr "RGB (%d, %d, %d)"
 
-#: ../app/widgets/gimpgradienteditor.c:1043
+#: ../app/widgets/gimpgradienteditor.c:1044
 msgid "Foreground color set to:"
 msgstr "Forgrunnsfarge sett til:"
 
-#: ../app/widgets/gimpgradienteditor.c:1050
+#: ../app/widgets/gimpgradienteditor.c:1051
 msgid "Background color set to:"
 msgstr "Bakgrunnsfarge sett til:"
 
-#: ../app/widgets/gimpgradienteditor.c:1282
-#: ../app/widgets/gimpgradienteditor.c:1348
+#: ../app/widgets/gimpgradienteditor.c:1285
+#: ../app/widgets/gimpgradienteditor.c:1351
 #, c-format
 msgid "%s%sDrag: move & compress"
 msgstr "%s%s-dra: flytt og komprimer"
 
-#: ../app/widgets/gimpgradienteditor.c:1288
+#: ../app/widgets/gimpgradienteditor.c:1291
 msgid "Drag: move"
 msgstr "Dra: flytt"
 
-#: ../app/widgets/gimpgradienteditor.c:1295
-#: ../app/widgets/gimpgradienteditor.c:1309
-#: ../app/widgets/gimpgradienteditor.c:1323
-#: ../app/widgets/gimpgradienteditor.c:1345
+#: ../app/widgets/gimpgradienteditor.c:1298
+#: ../app/widgets/gimpgradienteditor.c:1312
+#: ../app/widgets/gimpgradienteditor.c:1326
+#: ../app/widgets/gimpgradienteditor.c:1348
 #, c-format
 msgid "%s%sClick: extend selection"
 msgstr "%s%s-klikk: utvid utvalet"
 
-#: ../app/widgets/gimpgradienteditor.c:1301
-#: ../app/widgets/gimpgradienteditor.c:1315
+#: ../app/widgets/gimpgradienteditor.c:1304
+#: ../app/widgets/gimpgradienteditor.c:1318
 msgid "Click: select"
 msgstr "Klikk: vel"
 
-#: ../app/widgets/gimpgradienteditor.c:1329
-#: ../app/widgets/gimpgradienteditor.c:1353
+#: ../app/widgets/gimpgradienteditor.c:1332
+#: ../app/widgets/gimpgradienteditor.c:1356
 msgid "Click: select    Drag: move"
 msgstr "Klikk: vel    Dra: flytt"
 
-#: ../app/widgets/gimpgradienteditor.c:1568
-#: ../app/widgets/gimpgradienteditor.c:1576
+#: ../app/widgets/gimpgradienteditor.c:1571
+#: ../app/widgets/gimpgradienteditor.c:1579
 #, c-format
 msgid "Handle position: %0.4f"
 msgstr "Posisjon for handtak: %0.6f"
 
-#: ../app/widgets/gimpgradienteditor.c:1593
+#: ../app/widgets/gimpgradienteditor.c:1596
 #, c-format
 msgid "Distance: %0.4f"
 msgstr "Avstand: %0.6f"
 
-#: ../app/widgets/gimpgrideditor.c:209
+#: ../app/widgets/gimpgrideditor.c:217
 msgid "Line _style:"
 msgstr "Linje_stil:"
 
-#: ../app/widgets/gimpgrideditor.c:213
+#: ../app/widgets/gimpgrideditor.c:221
 msgid "Change grid foreground color"
 msgstr "Endre strekfargen for rutenettet"
 
-#: ../app/widgets/gimpgrideditor.c:220
+#: ../app/widgets/gimpgrideditor.c:228
 msgid "_Foreground color:"
 msgstr "_Strekfarge:"
 
-#: ../app/widgets/gimpgrideditor.c:224
+#: ../app/widgets/gimpgrideditor.c:232
 msgid "Change grid background color"
 msgstr "Endre bakgrunnsfargen for rutenettet"
 
-#: ../app/widgets/gimpgrideditor.c:231
+#: ../app/widgets/gimpgrideditor.c:239
 msgid "_Background color:"
 msgstr "_Bakgrunnsfarge:"
 
-#: ../app/widgets/gimpgrideditor.c:236
+#: ../app/widgets/gimpgrideditor.c:244
 msgid "Spacing"
 msgstr "Mellomrom"
 
-#: ../app/widgets/gimphelp.c:189
-msgid "Help browser not found"
-msgstr "Fann ikkje Hjelp_lesar"
+#: ../app/widgets/gimphelp.c:294
+#| msgid "H_elp browser to use:"
+msgid "Help browser is missing"
+msgstr "Hjelplesaren manglar"
 
-#: ../app/widgets/gimphelp.c:190
-msgid "Could not find GIMP help browser."
-msgstr "Fann ikkje GIMP sin hjelplesar"
+#: ../app/widgets/gimphelp.c:295
+#| msgid "GIMP help browser"
+msgid "The GIMP help browser is not available."
+msgstr "GIMP sin hjelplesar er ikkje tilgjengeleg."
 
-#: ../app/widgets/gimphelp.c:191
-msgid ""
-"The GIMP help browser plug-in appears to be missing from your installation."
-msgstr ""
-"Det ser ut til at programtillegget for GIMP sin hjelplesar manglar i denne "
-"installasjonen."
+#: ../app/widgets/gimphelp.c:296
+#| msgid ""
+#| "The GIMP help browser plug-in appears to be missing from your "
+#| "installation."
+msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages."
+msgstr "Det ser ut til at programtillegget for GIMP sin hjelplesar manglar i denne installasjonen. Du kan i staden bruke nettlesaren for å sjå hjelpsidene."
 
-#: ../app/widgets/gimphelp.c:232
+#: ../app/widgets/gimphelp.c:337
 msgid "Help browser doesn't start"
 msgstr "Hjelp_lesaren startar ikkje"
 
-#: ../app/widgets/gimphelp.c:233
+#: ../app/widgets/gimphelp.c:338
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "Fekk ikkje starta programtillegget for GIMP sin hjelplesar."
 
-#: ../app/widgets/gimphelp.c:259
-msgid "Use _web browser instead"
-msgstr "Bruk _nettlesar i staden"
+#: ../app/widgets/gimphelp.c:365
+#| msgid "Web Browser"
+msgid "Use _Web Browser"
+msgstr "Bruk _nettlesar"
+
+#: ../app/widgets/gimphelp.c:614
+#| msgid "Open the GIMP user manual"
+msgid "GIMP user manual is missing"
+msgstr "Finn ikkje GIMP-handboka"
+
+#: ../app/widgets/gimphelp.c:621
+msgid "_Read Online"
+msgstr "Les frå _Internett"
+
+#: ../app/widgets/gimphelp.c:645
+msgid "The GIMP user manual is not installed on your computer."
+msgstr "Brukarhandboka til GIMP er ikkje innstallert på denne maskinen"
+
+#: ../app/widgets/gimphelp.c:648
+msgid "You may either install the additional help package or change your preferences to use the online version."
+msgstr "Du kan anten innstallere hjelppakka eller setje førehandsinnstillingane slik at du bruker nettversjonen av hjelp."
 
 #: ../app/widgets/gimphistogrameditor.c:99
 msgid "Mean:"
@@ -11938,7 +12107,7 @@ msgstr "Kanal:"
 
 #: ../app/widgets/gimpimageprofileview.c:200
 msgid "Querying..."
-msgstr "Spørjing..."
+msgstr "Spørjing …"
 
 #: ../app/widgets/gimpimagepropview.c:122
 msgid "Pixel dimensions:"
@@ -12010,11 +12179,11 @@ msgstr "%g × %g %s"
 msgid "colors"
 msgstr "fargar"
 
-#: ../app/widgets/gimpitemtreeview.c:983
+#: ../app/widgets/gimpitemtreeview.c:980
 msgid "Set Item Exclusive Visible"
 msgstr "Gjer elementet eksklusivt synleg"
 
-#: ../app/widgets/gimpitemtreeview.c:991
+#: ../app/widgets/gimpitemtreeview.c:988
 msgid "Set Item Exclusive Linked"
 msgstr "Gjer elementet eksklusivt lenka"
 
@@ -12030,7 +12199,7 @@ msgstr "Lås alfakanalen"
 msgid "Lock:"
 msgstr "Lås: "
 
-#: ../app/widgets/gimplayertreeview.c:842
+#: ../app/widgets/gimplayertreeview.c:841
 msgid "Empty Layer"
 msgstr "Tomt lag"
 
@@ -12039,18 +12208,15 @@ msgid "Auto"
 msgstr "Auto"
 
 #: ../app/widgets/gimpmenudock.c:170
-msgid ""
-"When enabled the dialog automatically follows the image you are working on."
-msgstr ""
-"Når denne er aktivisert, vil dialogen automatisk følgje biletet du arbeider "
-"med."
+msgid "When enabled the dialog automatically follows the image you are working on."
+msgstr "Når denne er aktivert, vil dialogen automatisk følgje biletet du arbeider med."
 
-#: ../app/widgets/gimpmessagebox.c:437
+#: ../app/widgets/gimpmessagebox.c:443
 #, c-format
 msgid "Message repeated %d times."
 msgstr "Meldinga er gjentatt %d gonger."
 
-#: ../app/widgets/gimpmessagebox.c:439
+#: ../app/widgets/gimpmessagebox.c:445
 msgid "Message repeated once."
 msgstr "Meldinga gjentatt ei gong."
 
@@ -12071,7 +12237,7 @@ msgstr "ICC-fargeprofil (*.icc, *.icm)"
 msgid "Progress"
 msgstr "Framgang"
 
-#: ../app/widgets/gimpselectiondata.c:241
+#: ../app/widgets/gimpselectiondata.c:242
 #, c-format
 msgid ""
 "The filename '%s' couldn't be converted to a valid URI:\n"
@@ -12082,10 +12248,68 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/widgets/gimpselectiondata.c:245
+#: ../app/widgets/gimpselectiondata.c:246
 msgid "Invalid UTF-8"
 msgstr "Ugyldig UTF-8"
 
+#: ../app/widgets/gimpsettingsbox.c:239
+msgid "Pick a setting from the list"
+msgstr "Vel ei innstilling frå lista"
+
+#: ../app/widgets/gimpsettingsbox.c:260
+#| msgid "Save curves settings to file"
+msgid "Add settings to favorites"
+msgstr "Legg innstillingane i favorittar"
+
+#: ../app/widgets/gimpsettingsbox.c:288
+#| msgid "Load curves settings from file"
+msgid "_Import Settings from File..."
+msgstr "_Importer innstillingane frå ei fil …"
+
+#: ../app/widgets/gimpsettingsbox.c:294
+#| msgid "_Save Error Log to File..."
+msgid "_Export Settings to File..."
+msgstr "_Eksporter innstillingane til ei fil …"
+
+#: ../app/widgets/gimpsettingsbox.c:301
+#| msgid "_Merge Palettes..."
+msgid "_Manage Settings..."
+msgstr "_Handter innstillingane …"
+
+#: ../app/widgets/gimpsettingsbox.c:588
+msgid "Add Settings to Favorites"
+msgstr "Legg innstillingane til i favorittlista"
+
+#: ../app/widgets/gimpsettingsbox.c:591
+#| msgid "Enter a name for the saved options"
+msgid "Enter a name for the settings"
+msgstr "Skriv eit namn for innstillingane"
+
+#: ../app/widgets/gimpsettingsbox.c:592
+#| msgid "Saved Options"
+msgid "Saved Settings"
+msgstr "Lagra innstillingar"
+
+#: ../app/widgets/gimpsettingsbox.c:627
+#| msgid "Re_name Saved Options"
+msgid "Manage Saved Settings"
+msgstr "Handter dei lagra innstillingane"
+
+#: ../app/widgets/gimpsettingseditor.c:174
+#| msgid "Load curves settings from file"
+msgid "Import settings from a file"
+msgstr "Importer innstillingane frå ei fil"
+
+#: ../app/widgets/gimpsettingseditor.c:183
+#| msgid "Save levels settings to file"
+msgid "Export the selected settings to a file"
+msgstr "Lagra dei markerte innstillingane til ei fil"
+
+#: ../app/widgets/gimpsettingseditor.c:192
+#| msgid "Delete the selected template"
+msgid "Delete the selected settings"
+msgstr "Slett dei markerte innstillingane"
+
 #: ../app/widgets/gimpsizebox.c:464
 #, c-format
 msgid "%d × %d ppi"
@@ -12149,33 +12373,33 @@ msgstr "_Fyll med:"
 msgid "Comme_nt:"
 msgstr "_Kommentar:"
 
-#: ../app/widgets/gimptemplateeditor.c:528
+#: ../app/widgets/gimptemplateeditor.c:530
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: ../app/widgets/gimptemplateeditor.c:541
+#: ../app/widgets/gimptemplateeditor.c:543
 msgid "_Icon:"
 msgstr "_Ikon:"
 
-#: ../app/widgets/gimptemplateeditor.c:668
+#: ../app/widgets/gimptemplateeditor.c:671
 #, c-format
 msgid "%d × %d ppi, %s"
 msgstr "%d × %d ppi, %s"
 
-#: ../app/widgets/gimptemplateeditor.c:670
+#: ../app/widgets/gimptemplateeditor.c:673
 #, c-format
 msgid "%d ppi, %s"
 msgstr "%d ppi, %s"
 
-#: ../app/widgets/gimptexteditor.c:185
+#: ../app/widgets/gimptexteditor.c:188
 msgid "_Language:"
 msgstr "_Språk:"
 
-#: ../app/widgets/gimptexteditor.c:230
+#: ../app/widgets/gimptexteditor.c:234
 msgid "_Use selected font"
 msgstr "_Bruk vald skrifttype"
 
-#: ../app/widgets/gimpthumbbox.c:329
+#: ../app/widgets/gimpthumbbox.c:344
 #, c-format
 msgid ""
 "Click to update preview\n"
@@ -12184,25 +12408,27 @@ msgstr ""
 "Klikk for å oppdatere førehandsvisinga\n"
 "%s%s-klikk for å tvinga oppdatering sjølv om førehandsvisinga er oppdatert."
 
-#: ../app/widgets/gimpthumbbox.c:347
+#: ../app/widgets/gimpthumbbox.c:362
 msgid "Pr_eview"
 msgstr "Før_ehandsvising"
 
-#: ../app/widgets/gimpthumbbox.c:402 ../app/widgets/gimpthumbbox.c:467
+#: ../app/widgets/gimpthumbbox.c:417
+#: ../app/widgets/gimpthumbbox.c:481
 msgid "No selection"
 msgstr "Ingen utval"
 
-#: ../app/widgets/gimpthumbbox.c:595 ../app/widgets/gimpthumbbox.c:616
+#: ../app/widgets/gimpthumbbox.c:609
+#: ../app/widgets/gimpthumbbox.c:630
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "Miniatyr %d av %d"
 
-#: ../app/widgets/gimpthumbbox.c:729 ../app/widgets/gimpthumbbox.c:739
+#: ../app/widgets/gimpthumbbox.c:743
+#: ../app/widgets/gimpthumbbox.c:753
 msgid "Creating preview..."
-msgstr "Lager førehandsvising..."
+msgstr "Lager førehandsvising …"
 
 #: ../app/widgets/gimptoolbox-color-area.c:80
-#, fuzzy
 msgid ""
 "Foreground & background colors.\n"
 "The black and white squares reset colors.\n"
@@ -12261,30 +12487,30 @@ msgstr ""
 
 #: ../app/widgets/gimptooloptionseditor.c:165
 msgid "Save options to..."
-msgstr "Lagra innstillingane til ..."
+msgstr "Lagra innstillingane til …"
 
 #: ../app/widgets/gimptooloptionseditor.c:173
 msgid "Restore options from..."
-msgstr "Gjenopprett innstillingane frå ..."
+msgstr "Gjenopprett innstillingane frå …"
 
 #: ../app/widgets/gimptooloptionseditor.c:181
 msgid "Delete saved options..."
-msgstr "Slett lagra innstillingar..."
+msgstr "Slett lagra innstillingar …"
 
 #: ../app/widgets/gimptooloptionseditor.c:480
 #, c-format
 msgid "Error saving tool options presets: %s"
 msgstr "Fel ved lagring av forvalde verktøyinnstillingar: %s"
 
-#: ../app/widgets/gimpuimanager.c:736
+#: ../app/widgets/gimpuimanager.c:738
 msgid "Your GIMP installation is incomplete:"
 msgstr "Installasjonen av GIMP er ikkje ferdig:"
 
-#: ../app/widgets/gimpuimanager.c:738
+#: ../app/widgets/gimpuimanager.c:740
 msgid "Plase make sure the menu XML files are correctly installed."
 msgstr "Ver sikker på at XML-filene for menyen er korrekt installerte."
 
-#: ../app/widgets/gimpuimanager.c:744
+#: ../app/widgets/gimpuimanager.c:746
 #, c-format
 msgid "There was an error parsing the menu definition from %s: %s"
 msgstr "Feil i tolkinga av menydefinisjonen frå %s: %s"
@@ -12325,27 +12551,27 @@ msgstr "Opna dialogvindauget for palettval"
 msgid "Open the font selection dialog"
 msgstr "Opna dialogen for skriftval"
 
-#: ../app/widgets/gimpwidgets-utils.c:604
+#: ../app/widgets/gimpwidgets-utils.c:608
 #, c-format
 msgid "%s (try %s)"
 msgstr "%s (prøv %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:604
+#: ../app/widgets/gimpwidgets-utils.c:608
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:608
+#: ../app/widgets/gimpwidgets-utils.c:612
 #, c-format
 msgid "%s (try %s, %s)"
 msgstr "%s (prøv %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:612
+#: ../app/widgets/gimpwidgets-utils.c:616
 #, c-format
 msgid "%s (try %s, %s, %s)"
 msgstr "%s (prøv %s, %s, %s)"
 
-#: ../app/widgets/gimpwidgets-utils.c:878
+#: ../app/widgets/gimpwidgets-utils.c:882
 #, c-format
 msgid "Invalid UTF-8 data in file '%s'."
 msgstr "Ugyldige UTF-8 data i fila «%s»."
@@ -12399,12 +12625,14 @@ msgid "Web browser"
 msgstr "Nettlesar"
 
 #: ../app/widgets/widgets-enums.c:229
-msgid "Linear"
-msgstr "Lineær"
+#| msgid "Histogram"
+msgid "Linear histogram"
+msgstr "Lineært histogram"
 
 #: ../app/widgets/widgets-enums.c:230
-msgid "Logarithmic"
-msgstr "Logaritmisk"
+#| msgid "Logarithmic"
+msgid "Logarithmic histogram"
+msgstr "Logaritmisk histogram"
 
 #: ../app/widgets/widgets-enums.c:263
 msgid "Icon"
@@ -12440,29 +12668,22 @@ msgstr "Normalvindauge"
 
 #: ../app/widgets/widgets-enums.c:299
 msgid "Utility window"
-msgstr "Verktøyvindauge"
+msgstr "Bruksvindauge"
 
 #: ../app/widgets/widgets-enums.c:300
 msgid "Keep above"
 msgstr "Alltid øvst"
 
-#: ../app/xcf/xcf-load.c:276
-msgid ""
-"This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
-"incomplete."
-msgstr ""
-"Denne XCF-fila er øydelagt. Eg har lasta inn så mykje eg kunne, men fekk "
-"ikkje med alt."
+#: ../app/xcf/xcf-load.c:277
+msgid "This XCF file is corrupt!  I have loaded as much of it as I can, but it is incomplete."
+msgstr "Denne XCF-fila er øydelagt. Eg har lasta inn så mykje eg kunne, men fekk ikkje med alt."
 
-#: ../app/xcf/xcf-load.c:285
+#: ../app/xcf/xcf-load.c:286
 #, c-format
-msgid ""
-"This XCF file is corrupt!  I could not even salvage any partial image data "
-"from it."
-msgstr ""
-"Denne XCF-fila er øydelagt. Det er ikkje råd å lasta inn noe som helst."
+msgid "This XCF file is corrupt!  I could not even salvage any partial image data from it."
+msgstr "Denne XCF-fila er øydelagt. Det er ikkje råd å lasta inn noe som helst."
 
-#: ../app/xcf/xcf-load.c:323
+#: ../app/xcf/xcf-load.c:324
 msgid ""
 "XCF warning: version 0 of XCF file format\n"
 "did not save indexed colormaps correctly.\n"
@@ -12481,12 +12702,15 @@ msgstr "Ugyldig UTF-8-streng i XCF-fil."
 msgid "Error writing XCF: %s"
 msgstr "Feil ved skriving til XCF-fila: %s"
 
-#: ../app/xcf/xcf-seek.c:44 ../app/xcf/xcf-seek.c:61 ../app/xcf/xcf-seek.c:72
+#: ../app/xcf/xcf-seek.c:44
+#: ../app/xcf/xcf-seek.c:61
+#: ../app/xcf/xcf-seek.c:72
 #, c-format
 msgid "Could not seek in XCF file: %s"
 msgstr "Kunne ikkje søke i XCF-fila %s"
 
-#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167
+#: ../app/xcf/xcf.c:99
+#: ../app/xcf/xcf.c:167
 msgid "GIMP XCF image"
 msgstr "GIMP XCF-bilete"
 
@@ -12500,12 +12724,12 @@ msgstr "Opnar «%s»"
 msgid "XCF error: unsupported XCF file version %d encountered"
 msgstr "XCF-feil: Har ikkje støtte for XCF-filversjon %dt"
 
-#: ../app/xcf/xcf.c:382
+#: ../app/xcf/xcf.c:383
 #, c-format
 msgid "Saving '%s'"
-msgstr "Lagrar «%s»..."
+msgstr "Lagrar «%s» …"
 
-#: ../app/xcf/xcf.c:402
+#: ../app/xcf/xcf.c:403
 #, c-format
 msgid "Error saving XCF file: %s"
 msgstr "Feil under lagringa av XCF-fila %s"
@@ -12548,21 +12772,3 @@ msgstr "Forsikra deg om at verktøykassa er synleg!"
 msgid "Couldn't start '%s': %s"
 msgstr "Kunne ikkje starta «%s»: %s"
 
-#, fuzzy
-#~ msgid "Fit Image _to Window"
-#~ msgstr "_Tilpass biletet i vindauget"
-
-#~ msgid "Allow completely transparent regions to be selected"
-#~ msgstr "Tillat utveljing av heilt gjennomsiktige område"
-
-#~ msgid "Base selection on all visible layers"
-#~ msgstr "Baser utvalet på alle dei synlege laga"
-
-#~ msgid "Interactive boundary"
-#~ msgstr "Vis interaktiv grense"
-
-#~ msgid "Select transparent areas"
-#~ msgstr "Vel gjennomsiktige område"
-
-#~ msgid "Select by:"
-#~ msgstr "Vel etter: "
diff --git a/po/pl.po b/po/pl.po
index c7df7ab578..d74199bc26 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -40,15 +40,14 @@ msgstr ""
 "Project-Id-Version: gimp.gimp-2-6.pl\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2008-11-08 22:02+0100\n"
-"PO-Revision-Date: 2008-11-04 12:30+0100\n"
-"Last-Translator: Bartosz Kosiorek \n"
+"PO-Revision-Date: 2009-08-18 16:09+0100\n"
+"Last-Translator: Tomasz Dominikowski \n"
 "Language-Team: Polish \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
-"|| n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 "X-Poedit-Language: Polish\n"
 "X-Poedit-Country: POLAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
@@ -57,9 +56,10 @@ msgstr ""
 msgid "GIMP"
 msgstr "GIMP"
 
-#: ../app/about.h:27 ../desktop/gimp.desktop.in.in.h:2
+#: ../app/about.h:27
+#: ../desktop/gimp.desktop.in.in.h:2
 msgid "GNU Image Manipulation Program"
-msgstr "GNU Image Manipulation Program"
+msgstr "Edytor obrazów GIMP"
 
 #: ../app/about.h:30
 msgid ""
@@ -71,64 +71,42 @@ msgstr ""
 
 #: ../app/about.h:34
 msgid ""
-"GIMP is free software; you can redistribute it and/or modify it under the "
-"terms of the GNU General Public License as published by the Free Software "
-"Foundation; either version 2 of the License, or (at your option) any later "
-"version.\n"
+"GIMP is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.\n"
 "\n"
-"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY "
-"WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS "
-"FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more "
-"details.\n"
+"GIMP is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\n"
 "\n"
-"You should have received a copy of the GNU General Public License along with "
-"GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - "
-"Suite 330, Boston, MA 02111-1307, USA."
+"You should have received a copy of the GNU General Public License along with GIMP; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-"Program GIMP jest wolnym oprogramowaniem; można go rozprowadzać dalej i/lub "
-"modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez "
-"Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub "
-"którejś z późniejszych wersji.\n"
+"Program GIMP jest wolnym oprogramowaniem; można go rozprowadzać dalej i/lub modyfikować na warunkach Powszechnej Licencji Publicznej GNU, wydanej przez Fundację Wolnego Oprogramowania - według wersji drugiej tej Licencji lub którejś z późniejszych wersji.\n"
 "\n"
-" Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny "
-"- jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI "
-"HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania "
-"bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną "
-"GNU. \n"
+" Niniejszy program rozpowszechniany jest z nadzieją, iż będzie on użyteczny - jednak BEZ JAKIEJKOLWIEK GWARANCJI, nawet domyślnej gwarancji PRZYDATNOŚCI HANDLOWEJ albo PRZYDATNOŚCI DO OKREŚLONYCH ZASTOSOWAŃ. W celu uzyskania bliższych informacji należy zapoznać się z Powszechną Licencją Publiczną GNU. \n"
 "\n"
-"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz "
-"Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie "
-"- proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, "
-"Fifth Floor, Boston, MA 02110-130159 USA"
+"Z pewnością wraz z niniejszym programem dostarczono także egzemplarz Powszechnej Licencji Publicznej GNU (GNU General Public License); jeśli nie - proszę napisać do Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-130159 USA"
 
 #: ../app/app.c:214
 #, c-format
 msgid ""
 "Unable to open a test swap file.\n"
 "\n"
-"To avoid data loss, please check the location and permissions of the swap "
-"directory defined in your Preferences (currently \"%s\")."
+"To avoid data loss, please check the location and permissions of the swap directory defined in your Preferences (currently \"%s\")."
 msgstr ""
 "Nie można otworzyć testowego pliku wymiany.\n"
 "\n"
-"Aby zapobiec utracie danych, zweryfikuj położenie oraz uprawnienia katalogu "
-"wymiany zdefiniowanego w preferencjach programu (aktualnie jest to \"%s\")."
+"Aby zapobiec utracie danych, zweryfikuj położenie oraz uprawnienia katalogu wymiany zdefiniowanego w preferencjach programu (aktualnie jest to \"%s\")."
 
 #: ../app/batch.c:75
 #, c-format
 msgid "No batch interpreter specified, using the default '%s'.\n"
-msgstr ""
-"Nie ustawiono interpretera poleceń wsadowych, użyty zostanie domyślny \"%s"
-"\". \n"
+msgstr "Nie ustawiono interpretera poleceń wsadowych, użyty zostanie domyślny \"%s\". \n"
 
-#: ../app/batch.c:93 ../app/batch.c:111
+#: ../app/batch.c:93
+#: ../app/batch.c:111
 #, c-format
 msgid "The batch interpreter '%s' is not available. Batch mode disabled."
-msgstr ""
-"Interpreter poleceń wsadowych \"%s\" nie jest dostępny, wyłączono tryb "
-"wsadowy."
+msgstr "Interpreter poleceń wsadowych \"%s\" nie jest dostępny, wyłączono tryb wsadowy."
 
-#: ../app/main.c:144 ../tools/gimp-remote.c:60
+#: ../app/main.c:144
+#: ../tools/gimp-remote.c:60
 msgid "Show version information and exit"
 msgstr "Wyświetla informację o wersji i wychodzi"
 
@@ -170,8 +148,7 @@ msgstr "Nie wykorzystuje pamięci dzielonej pomiędzy programem GIMP a wtyczkami
 
 #: ../app/main.c:194
 msgid "Do not use special CPU acceleration functions"
-msgstr ""
-"Nie wykorzystuje specjalnych instrukcji procesora przyśpieszających działanie"
+msgstr "Nie wykorzystuje specjalnych instrukcji procesora przyśpieszających działanie"
 
 #: ../app/main.c:199
 msgid "Use an alternate sessionrc file"
@@ -205,8 +182,7 @@ msgstr "Tryb kompatybilności PDB (off|on|warn)"
 #. don't translate the mode names (never|query|always)
 #: ../app/main.c:236
 msgid "Debug in case of a crash (never|query|always)"
-msgstr ""
-"Debuguj w przypadku nieoczekiwanego zamknięcia programu (nigdy|pytaj|zawsze)"
+msgstr "Debuguj w przypadku nieoczekiwanego zamknięcia programu (nigdy|pytaj|zawsze)"
 
 #: ../app/main.c:241
 msgid "Enable non-fatal debugging signal handlers"
@@ -238,8 +214,7 @@ msgstr "Inny program GIMP jest już uruchomiony."
 
 #: ../app/main.c:462
 msgid "GIMP output. Type any character to close this window."
-msgstr ""
-"Wyjście programu GIMP. Należy wprowadzić dowolny znak, aby zamknąć okno."
+msgstr "Wyjście programu GIMP. Należy wprowadzić dowolny znak, aby zamknąć okno."
 
 #: ../app/main.c:463
 #, c-format
@@ -248,8 +223,7 @@ msgstr "(Wprowadzenie dowolnego znaku zamyka okno)\n"
 
 #: ../app/main.c:480
 msgid "GIMP output. You can minimize this window, but don't close it."
-msgstr ""
-"Wyjście programu GIMP. Można zminimalizować okno, lecz nie należy go zamykać."
+msgstr "Wyjście programu GIMP. Można zminimalizować okno, lecz nie należy go zamykać."
 
 #: ../app/sanity.c:342
 #, c-format
@@ -258,28 +232,20 @@ msgid ""
 "\n"
 "Please check the value of the environment variable G_FILENAME_ENCODING."
 msgstr ""
-"Nie można dokonać konwersji z ustawionego kodowania nazw plików na kodowanie "
-"UTF-8: %s\n"
+"Nie można dokonać konwersji z ustawionego kodowania nazw plików na kodowanie UTF-8: %s\n"
 "\n"
 "Sprawdź wartość zmiennej środowiskowej o nazwie G_FILENAME_ENCODING."
 
 #: ../app/sanity.c:361
 #, c-format
 msgid ""
-"The name of the directory holding the GIMP user configuration cannot be "
-"converted to UTF-8: %s\n"
+"The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n"
 "\n"
-"Your filesystem probably stores files in an encoding other than UTF-8 and "
-"you didn't tell GLib about this. Please set the environment variable "
-"G_FILENAME_ENCODING."
+"Your filesystem probably stores files in an encoding other than UTF-8 and you didn't tell GLib about this. Please set the environment variable G_FILENAME_ENCODING."
 msgstr ""
-"Nie można przekonwertować na kodowanie UTF-8 nazwy katalogu przechowującego "
-"konfigurację użytkownika programu GIMP: %s\n"
+"Nie można przekonwertować na kodowanie UTF-8 nazwy katalogu przechowującego konfigurację użytkownika programu GIMP: %s\n"
 "\n"
-"Prawdopodobnie nazwy plików zapisane w systemie plików oparto na kodowaniu "
-"innym niż UTF-8, a jednocześnie nie udostępniono programom wykorzystującym "
-"bibliotekę GLib informacji o tym kodowaniu. Aby to zrobić, należy ustawić "
-"odpowiednio zmienną środowiskową G_FILENAME_ENCODING."
+"Prawdopodobnie nazwy plików zapisane w systemie plików oparto na kodowaniu innym niż UTF-8, a jednocześnie nie udostępniono programom wykorzystującym bibliotekę GLib informacji o tym kodowaniu. Aby to zrobić, należy ustawić odpowiednio zmienną środowiskową G_FILENAME_ENCODING."
 
 #. show versions of libraries used by GIMP
 #: ../app/version.c:64
@@ -287,31 +253,39 @@ msgstr ""
 msgid "using %s version %s (compiled against version %s)"
 msgstr "%s używa wersji %s (skompilowano wersję %s)"
 
-#: ../app/version.c:127 ../tools/gimp-remote.c:95
+#: ../app/version.c:127
+#: ../tools/gimp-remote.c:95
 #, c-format
 msgid "%s version %s"
 msgstr "%s wersja %s"
 
-#: ../app/actions/actions.c:101 ../app/actions/dialogs-actions.c:123
-#: ../app/dialogs/dialogs.c:224 ../app/widgets/gimpbrusheditor.c:90
+#: ../app/actions/actions.c:101
+#: ../app/actions/dialogs-actions.c:123
+#: ../app/dialogs/dialogs.c:224
+#: ../app/widgets/gimpbrusheditor.c:90
 msgid "Brush Editor"
 msgstr "Edytor pędzli"
 
 #. initialize the list of gimp brushes
-#: ../app/actions/actions.c:104 ../app/core/gimp.c:838
-#: ../app/dialogs/dialogs.c:157 ../app/dialogs/preferences-dialog.c:2738
+#: ../app/actions/actions.c:104
+#: ../app/core/gimp.c:838
+#: ../app/dialogs/dialogs.c:157
+#: ../app/dialogs/preferences-dialog.c:2738
 msgid "Brushes"
 msgstr "Pędzle"
 
-#: ../app/actions/actions.c:107 ../app/dialogs/dialogs.c:169
+#: ../app/actions/actions.c:107
+#: ../app/dialogs/dialogs.c:169
 msgid "Buffers"
 msgstr "Bufory"
 
-#: ../app/actions/actions.c:110 ../app/dialogs/dialogs.c:182
+#: ../app/actions/actions.c:110
+#: ../app/dialogs/dialogs.c:182
 msgid "Channels"
 msgstr "Kanały"
 
-#: ../app/actions/actions.c:113 ../app/dialogs/convert-dialog.c:174
+#: ../app/actions/actions.c:113
+#: ../app/dialogs/convert-dialog.c:174
 #: ../app/dialogs/dialogs.c:190
 msgid "Colormap"
 msgstr "Paleta kolorów"
@@ -324,7 +298,8 @@ msgstr "Konfiguracja"
 msgid "Context"
 msgstr "Kontekst"
 
-#: ../app/actions/actions.c:122 ../app/dialogs/dialogs.c:150
+#: ../app/actions/actions.c:122
+#: ../app/dialogs/dialogs.c:150
 msgid "Pointer Information"
 msgstr "Informacje o wskaźniku"
 
@@ -345,7 +320,8 @@ msgid "Dockable"
 msgstr "Element dokowalny"
 
 #. Document History
-#: ../app/actions/actions.c:137 ../app/dialogs/dialogs.c:171
+#: ../app/actions/actions.c:137
+#: ../app/dialogs/dialogs.c:171
 #: ../app/dialogs/preferences-dialog.c:1589
 msgid "Document History"
 msgstr "Historia dokumentów"
@@ -354,11 +330,13 @@ msgstr "Historia dokumentów"
 msgid "Drawable"
 msgstr "Obszar rysowania"
 
-#: ../app/actions/actions.c:143 ../app/tools/tools-enums.c:300
+#: ../app/actions/actions.c:143
+#: ../app/tools/tools-enums.c:300
 msgid "Edit"
 msgstr "Edycja"
 
-#: ../app/actions/actions.c:146 ../app/dialogs/dialogs.c:146
+#: ../app/actions/actions.c:146
+#: ../app/dialogs/dialogs.c:146
 msgid "Error Console"
 msgstr "Konsola błędów"
 
@@ -366,19 +344,24 @@ msgstr "Konsola błędów"
 msgid "File"
 msgstr "Plik"
 
-#: ../app/actions/actions.c:152 ../app/dialogs/dialogs.c:165
+#: ../app/actions/actions.c:152
+#: ../app/dialogs/dialogs.c:165
 #: ../app/dialogs/preferences-dialog.c:2754
 msgid "Fonts"
 msgstr "Czcionki"
 
-#: ../app/actions/actions.c:155 ../app/actions/dialogs-actions.c:141
-#: ../app/dialogs/dialogs.c:228 ../app/widgets/gimpgradienteditor.c:276
+#: ../app/actions/actions.c:155
+#: ../app/actions/dialogs-actions.c:141
+#: ../app/dialogs/dialogs.c:228
+#: ../app/widgets/gimpgradienteditor.c:276
 msgid "Gradient Editor"
 msgstr "Edytor gradientów"
 
 #. initialize the list of gimp gradients
-#: ../app/actions/actions.c:158 ../app/core/gimp.c:850
-#: ../app/dialogs/dialogs.c:161 ../app/dialogs/preferences-dialog.c:2750
+#: ../app/actions/actions.c:158
+#: ../app/core/gimp.c:850
+#: ../app/dialogs/dialogs.c:161
+#: ../app/dialogs/preferences-dialog.c:2750
 msgid "Gradients"
 msgstr "Gradienty"
 
@@ -386,48 +369,60 @@ msgstr "Gradienty"
 msgid "Help"
 msgstr "Pomoc"
 
-#: ../app/actions/actions.c:164 ../app/core/core-enums.c:212
+#: ../app/actions/actions.c:164
+#: ../app/core/core-enums.c:212
 #: ../app/tools/tools-enums.c:242
 msgid "Image"
 msgstr "Obraz"
 
 #. list & grid views
-#: ../app/actions/actions.c:167 ../app/dialogs/dialogs.c:155
+#: ../app/actions/actions.c:167
+#: ../app/dialogs/dialogs.c:155
 msgid "Images"
 msgstr "Obrazy"
 
-#: ../app/actions/actions.c:170 ../app/dialogs/dialogs.c:178
+#: ../app/actions/actions.c:170
+#: ../app/dialogs/dialogs.c:178
 #: ../app/dialogs/resize-dialog.c:286
 msgid "Layers"
 msgstr "Warstwy"
 
-#: ../app/actions/actions.c:173 ../app/actions/dialogs-actions.c:153
-#: ../app/dialogs/dialogs.c:232 ../app/widgets/gimppaletteeditor.c:155
+#: ../app/actions/actions.c:173
+#: ../app/actions/dialogs-actions.c:153
+#: ../app/dialogs/dialogs.c:232
+#: ../app/widgets/gimppaletteeditor.c:155
 msgid "Palette Editor"
 msgstr "Edytor palety"
 
 #. initialize the list of gimp palettes
-#: ../app/actions/actions.c:176 ../app/core/gimp.c:846
-#: ../app/dialogs/dialogs.c:163 ../app/dialogs/preferences-dialog.c:2746
+#: ../app/actions/actions.c:176
+#: ../app/core/gimp.c:846
+#: ../app/dialogs/dialogs.c:163
+#: ../app/dialogs/preferences-dialog.c:2746
 msgid "Palettes"
 msgstr "Palety"
 
 #. initialize the list of gimp patterns
-#: ../app/actions/actions.c:179 ../app/core/gimp.c:842
-#: ../app/dialogs/dialogs.c:159 ../app/dialogs/preferences-dialog.c:2742
+#: ../app/actions/actions.c:179
+#: ../app/core/gimp.c:842
+#: ../app/dialogs/dialogs.c:159
+#: ../app/dialogs/preferences-dialog.c:2742
 msgid "Patterns"
 msgstr "Desenie"
 
-#: ../app/actions/actions.c:182 ../app/dialogs/preferences-dialog.c:2758
+#: ../app/actions/actions.c:182
+#: ../app/dialogs/preferences-dialog.c:2758
 msgid "Plug-Ins"
 msgstr "Wtyczki"
 
-#: ../app/actions/actions.c:185 ../app/core/core-enums.c:860
+#: ../app/actions/actions.c:185
+#: ../app/core/core-enums.c:860
 #: ../app/core/gimpchannel.c:362
 msgid "Quick Mask"
 msgstr "Szybka maska"
 
-#: ../app/actions/actions.c:188 ../app/dialogs/dialogs.c:206
+#: ../app/actions/actions.c:188
+#: ../app/dialogs/dialogs.c:206
 msgid "Sample Points"
 msgstr "Punkty wzorcowe"
 
@@ -436,7 +431,8 @@ msgid "Select"
 msgstr "Zaznaczenie"
 
 #. initialize the template list
-#: ../app/actions/actions.c:194 ../app/core/gimp.c:859
+#: ../app/actions/actions.c:194
+#: ../app/core/gimp.c:859
 #: ../app/dialogs/dialogs.c:173
 msgid "Templates"
 msgstr "Szablony"
@@ -445,16 +441,20 @@ msgstr "Szablony"
 msgid "Text Editor"
 msgstr "Edytor tekstowy"
 
-#: ../app/actions/actions.c:200 ../app/dialogs/dialogs.c:138
-#: ../app/dialogs/preferences-dialog.c:1874 ../app/gui/gui.c:423
+#: ../app/actions/actions.c:200
+#: ../app/dialogs/dialogs.c:138
+#: ../app/dialogs/preferences-dialog.c:1874
+#: ../app/gui/gui.c:423
 msgid "Tool Options"
 msgstr "Opcje narzędzia"
 
-#: ../app/actions/actions.c:203 ../app/dialogs/dialogs.c:167
+#: ../app/actions/actions.c:203
+#: ../app/dialogs/dialogs.c:167
 msgid "Tools"
 msgstr "Narzędzia"
 
-#: ../app/actions/actions.c:206 ../app/dialogs/dialogs.c:186
+#: ../app/actions/actions.c:206
+#: ../app/dialogs/dialogs.c:186
 #: ../app/tools/gimpvectortool.c:160
 msgid "Paths"
 msgstr "Ścieżki"
@@ -655,7 +655,8 @@ msgstr "Kanał na _zaznaczenie"
 msgid "Replace the selection with this channel"
 msgstr "Zamienia zaznaczenie na kanał"
 
-#: ../app/actions/channels-actions.c:111 ../app/actions/layers-actions.c:266
+#: ../app/actions/channels-actions.c:111
+#: ../app/actions/layers-actions.c:266
 #: ../app/actions/vectors-actions.c:173
 msgid "_Add to Selection"
 msgstr "Dod_aj do zaznaczenia"
@@ -664,8 +665,10 @@ msgstr "Dod_aj do zaznaczenia"
 msgid "Add this channel to the current selection"
 msgstr "Dodaj bieżący kanał do bieżącego zaznaczenia"
 
-#: ../app/actions/channels-actions.c:117 ../app/actions/layers-actions.c:272
-#: ../app/actions/layers-actions.c:299 ../app/actions/layers-actions.c:326
+#: ../app/actions/channels-actions.c:117
+#: ../app/actions/layers-actions.c:272
+#: ../app/actions/layers-actions.c:299
+#: ../app/actions/layers-actions.c:326
 #: ../app/actions/vectors-actions.c:179
 msgid "_Subtract from Selection"
 msgstr "Od_ejmij od zaznaczenia"
@@ -674,8 +677,10 @@ msgstr "Od_ejmij od zaznaczenia"
 msgid "Subtract this channel from the current selection"
 msgstr "Odejmuje ten kanał od bieżącego zaznaczenia"
 
-#: ../app/actions/channels-actions.c:123 ../app/actions/layers-actions.c:278
-#: ../app/actions/layers-actions.c:305 ../app/actions/layers-actions.c:332
+#: ../app/actions/channels-actions.c:123
+#: ../app/actions/layers-actions.c:278
+#: ../app/actions/layers-actions.c:305
+#: ../app/actions/layers-actions.c:332
 #: ../app/actions/vectors-actions.c:185
 msgid "_Intersect with Selection"
 msgstr "Prze_tnij z zaznaczeniem"
@@ -721,13 +726,16 @@ msgstr "Kolor nowego kanału"
 #: ../app/actions/channels-commands.c:243
 #: ../app/display/gimpdisplayshell-dnd.c:584
 #: ../app/widgets/gimpchanneltreeview.c:249
-#: ../app/widgets/gimplayertreeview.c:773 ../app/widgets/gimptoolbox-dnd.c:313
+#: ../app/widgets/gimplayertreeview.c:773
+#: ../app/widgets/gimptoolbox-dnd.c:313
 #, c-format
 msgid "%s Channel Copy"
 msgstr "Kopia kanału %s"
 
-#: ../app/actions/channels-commands.c:307 ../app/core/gimpselection.c:549
-#: ../app/pdb/selection-cmds.c:454 ../app/pdb/selection-cmds.c:521
+#: ../app/actions/channels-commands.c:307
+#: ../app/core/gimpselection.c:549
+#: ../app/pdb/selection-cmds.c:454
+#: ../app/pdb/selection-cmds.c:521
 msgid "Channel to Selection"
 msgstr "Kanał na zaznaczenie"
 
@@ -784,11 +792,13 @@ msgstr "Jeżeli jest to możliwe, używa GEGL-a do przetwarzania obrazu"
 msgid "_Context"
 msgstr "_Kontekst"
 
-#: ../app/actions/context-actions.c:47 ../app/actions/image-actions.c:59
+#: ../app/actions/context-actions.c:47
+#: ../app/actions/image-actions.c:59
 msgid "_Colors"
 msgstr "_Kolory"
 
-#: ../app/actions/context-actions.c:48 ../app/actions/layers-actions.c:58
+#: ../app/actions/context-actions.c:48
+#: ../app/actions/layers-actions.c:58
 msgid "_Opacity"
 msgstr "K_rycie"
 
@@ -805,7 +815,8 @@ msgstr "_Narzędzie"
 msgid "_Brush"
 msgstr "_Pędzel"
 
-#: ../app/actions/context-actions.c:52 ../app/actions/plug-in-actions.c:99
+#: ../app/actions/context-actions.c:52
+#: ../app/actions/plug-in-actions.c:99
 #: ../app/dialogs/preferences-dialog.c:1937
 msgid "_Pattern"
 msgstr "_Deseń"
@@ -880,13 +891,16 @@ msgid "Sample Merged"
 msgstr "Próbkuje wszystkie warstwy"
 
 # c-format
-#: ../app/actions/data-commands.c:107 ../app/actions/documents-commands.c:342
-#: ../app/actions/file-commands.c:184 ../app/dialogs/file-open-dialog.c:220
+#: ../app/actions/data-commands.c:107
+#: ../app/actions/documents-commands.c:342
+#: ../app/actions/file-commands.c:184
+#: ../app/dialogs/file-open-dialog.c:220
 #: ../app/dialogs/file-open-dialog.c:264
 #: ../app/dialogs/file-open-location-dialog.c:213
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:537
-#: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
+#: ../app/widgets/gimplayertreeview.c:730
+#: ../app/widgets/gimptoolbox-dnd.c:158
 #: ../app/widgets/gimptoolbox.c:979
 #, c-format
 msgid ""
@@ -899,10 +913,14 @@ msgstr ""
 "%s"
 
 #: ../app/actions/data-commands.c:133
-#: ../app/core/gimpbrushgenerated-load.c:125 ../app/core/gimpimage.c:1419
-#: ../app/core/gimppalette-import.c:211 ../app/core/gimppalette-load.c:222
-#: ../app/core/gimppalette.c:333 ../app/dialogs/palette-import-dialog.c:774
-#: ../app/pdb/image-cmds.c:2198 ../app/widgets/gimpdnd-xds.c:92
+#: ../app/core/gimpbrushgenerated-load.c:125
+#: ../app/core/gimpimage.c:1419
+#: ../app/core/gimppalette-import.c:211
+#: ../app/core/gimppalette-load.c:222
+#: ../app/core/gimppalette.c:333
+#: ../app/dialogs/palette-import-dialog.c:774
+#: ../app/pdb/image-cmds.c:2198
+#: ../app/widgets/gimpdnd-xds.c:92
 msgid "Untitled"
 msgstr "Bez nazwy"
 
@@ -917,8 +935,7 @@ msgstr "Usunąć \"%s\"?"
 
 #: ../app/actions/data-commands.c:257
 #, c-format
-msgid ""
-"Are you sure you want to remove '%s' from the list and delete it on disk?"
+msgid "Are you sure you want to remove '%s' from the list and delete it on disk?"
 msgstr "Czy na pewno usunąć \"%s\" z listy i z dysku?"
 
 #: ../app/actions/dialogs-actions.c:39
@@ -1001,7 +1018,8 @@ msgstr "_Historia operacji"
 msgid "Open the undo history dialog"
 msgstr "Otwiera okno historii cofnięć"
 
-#: ../app/actions/dialogs-actions.c:99 ../app/dialogs/dialogs.c:150
+#: ../app/actions/dialogs-actions.c:99
+#: ../app/dialogs/dialogs.c:150
 msgid "Pointer"
 msgstr "Wskaźnik"
 
@@ -1161,7 +1179,8 @@ msgstr "Wyświetla porady przydatny przy użytkowaniu programu GIMP"
 msgid "_About"
 msgstr "_O programie"
 
-#: ../app/actions/dialogs-actions.c:231 ../app/dialogs/about-dialog.c:114
+#: ../app/actions/dialogs-actions.c:231
+#: ../app/dialogs/about-dialog.c:114
 #: ../app/gui/gui.c:473
 msgid "About GIMP"
 msgstr "Informacje o programie GIMP"
@@ -1174,11 +1193,13 @@ msgstr "Przenieś na _ekran"
 msgid "Close Dock"
 msgstr "Zamknij dok"
 
-#: ../app/actions/dock-actions.c:52 ../app/actions/view-actions.c:123
+#: ../app/actions/dock-actions.c:52
+#: ../app/actions/view-actions.c:123
 msgid "_Open Display..."
 msgstr "_Otwórz wyświetlanie..."
 
-#: ../app/actions/dock-actions.c:53 ../app/actions/view-actions.c:124
+#: ../app/actions/dock-actions.c:53
+#: ../app/actions/view-actions.c:124
 msgid "Connect to another display"
 msgstr "Łączy z innym wyświetlaniem"
 
@@ -1375,12 +1396,8 @@ msgid "Clear the Recent Documents list?"
 msgstr "Wyczyścić całą historię dokumentów?"
 
 #: ../app/actions/documents-commands.c:224
-msgid ""
-"Clearing the document history will permanently remove all items from the "
-"recent documents list in all applications."
-msgstr ""
-"Czyszczenie historii dokumentów, trwale usunie wszystkie pozycje ostatnio "
-"używanych dokumentów."
+msgid "Clearing the document history will permanently remove all items from the recent documents list in all applications."
+msgstr "Czyszczenie historii dokumentów, trwale usunie wszystkie pozycje ostatnio używanych dokumentów."
 
 #: ../app/actions/drawable-actions.c:45
 msgid "_Equalize"
@@ -1414,7 +1431,8 @@ msgstr "_Przesunięcie..."
 msgid "Shift the pixels, optionally wrapping them at the borders"
 msgstr "Przesuwa piksele, opcjonalnie otaczając je ramkami"
 
-#: ../app/actions/drawable-actions.c:72 ../app/actions/vectors-actions.c:153
+#: ../app/actions/drawable-actions.c:72
+#: ../app/actions/vectors-actions.c:153
 msgid "_Linked"
 msgstr "_Dowiązany"
 
@@ -1422,7 +1440,8 @@ msgstr "_Dowiązany"
 msgid "Toggle the linked state"
 msgstr "Przełącza stan dowiązania"
 
-#: ../app/actions/drawable-actions.c:79 ../app/actions/vectors-actions.c:147
+#: ../app/actions/drawable-actions.c:79
+#: ../app/actions/vectors-actions.c:147
 msgid "_Visible"
 msgstr "_Widoczny"
 
@@ -1430,7 +1449,8 @@ msgstr "_Widoczny"
 msgid "Toggle visibility"
 msgstr "Przełącza widoczność"
 
-#: ../app/actions/drawable-actions.c:89 ../app/actions/image-actions.c:159
+#: ../app/actions/drawable-actions.c:89
+#: ../app/actions/image-actions.c:159
 msgid "Flip _Horizontally"
 msgstr "Odbij po_ziomo"
 
@@ -1438,7 +1458,8 @@ msgstr "Odbij po_ziomo"
 msgid "Flip horizontally"
 msgstr "Odbija poziomo"
 
-#: ../app/actions/drawable-actions.c:95 ../app/actions/image-actions.c:165
+#: ../app/actions/drawable-actions.c:95
+#: ../app/actions/image-actions.c:165
 msgid "Flip _Vertically"
 msgstr "Odbij p_ionowo"
 
@@ -1446,7 +1467,8 @@ msgstr "Odbij p_ionowo"
 msgid "Flip vertically"
 msgstr "Odbija pionowo"
 
-#: ../app/actions/drawable-actions.c:104 ../app/actions/image-actions.c:174
+#: ../app/actions/drawable-actions.c:104
+#: ../app/actions/image-actions.c:174
 msgid "Rotate 90° _clockwise"
 msgstr "Obróć o 90° w _prawo"
 
@@ -1454,7 +1476,8 @@ msgstr "Obróć o 90° w _prawo"
 msgid "Rotate 90 degrees to the right"
 msgstr "Obraca o 90 stopni w zgodnie z ruchem wskazówek zegara"
 
-#: ../app/actions/drawable-actions.c:110 ../app/actions/image-actions.c:180
+#: ../app/actions/drawable-actions.c:110
+#: ../app/actions/image-actions.c:180
 msgid "Rotate _180°"
 msgstr "Obróć o _180°"
 
@@ -1462,7 +1485,8 @@ msgstr "Obróć o _180°"
 msgid "Turn upside-down"
 msgstr "Odwraca do góry nogami"
 
-#: ../app/actions/drawable-actions.c:116 ../app/actions/image-actions.c:186
+#: ../app/actions/drawable-actions.c:116
+#: ../app/actions/image-actions.c:186
 msgid "Rotate 90° counter-clock_wise"
 msgstr "Obróć o 90° w _lewo"
 
@@ -1498,7 +1522,8 @@ msgstr "_Bufor"
 msgid "Undo History Menu"
 msgstr "Menu historii operacji"
 
-#: ../app/actions/edit-actions.c:72 ../app/actions/edit-actions.c:313
+#: ../app/actions/edit-actions.c:72
+#: ../app/actions/edit-actions.c:313
 msgid "_Undo"
 msgstr "Cof_nij"
 
@@ -1506,7 +1531,8 @@ msgstr "Cof_nij"
 msgid "Undo the last operation"
 msgstr "Cofa ostatnia operację"
 
-#: ../app/actions/edit-actions.c:78 ../app/actions/edit-actions.c:314
+#: ../app/actions/edit-actions.c:78
+#: ../app/actions/edit-actions.c:314
 msgid "_Redo"
 msgstr "P_onów"
 
@@ -1538,7 +1564,8 @@ msgstr "Wy_czyść historię operacji"
 msgid "Remove all operations from the undo history"
 msgstr "Usuwa wszystkie pozycje z historii dokumentów"
 
-#: ../app/actions/edit-actions.c:102 ../app/actions/edit-actions.c:315
+#: ../app/actions/edit-actions.c:102
+#: ../app/actions/edit-actions.c:315
 msgid "_Fade..."
 msgstr "_Zanikanie..."
 
@@ -1591,7 +1618,8 @@ msgstr "Wkleja zawartość schowka do bieżącego zaznaczenia"
 msgid "From _Clipboard"
 msgstr "Ze _schowka"
 
-#: ../app/actions/edit-actions.c:139 ../app/actions/edit-actions.c:145
+#: ../app/actions/edit-actions.c:139
+#: ../app/actions/edit-actions.c:145
 msgid "Create a new image from the content of the clipboard"
 msgstr "Tworzy nowy obraz z zawartości schowka"
 
@@ -1704,17 +1732,21 @@ msgstr "Wyczyszczenie historii operacji tego obrazu, zwolni %s pamięci."
 msgid "Cut pixels to the clipboard"
 msgstr "Wycięto piksele do schowka"
 
-#: ../app/actions/edit-commands.c:228 ../app/actions/edit-commands.c:254
+#: ../app/actions/edit-commands.c:228
+#: ../app/actions/edit-commands.c:254
 msgid "Copied pixels to the clipboard"
 msgstr "Skopiowano piksele do schowka"
 
-#: ../app/actions/edit-commands.c:315 ../app/actions/edit-commands.c:349
+#: ../app/actions/edit-commands.c:315
+#: ../app/actions/edit-commands.c:349
 #: ../app/actions/edit-commands.c:525
 msgid "There is no image data in the clipboard to paste."
 msgstr "Nie ma danych obrazu w schowku do wklejenia."
 
-#: ../app/actions/edit-commands.c:338 ../app/core/gimpbrushclipboard.c:181
-#: ../app/core/gimppatternclipboard.c:181 ../app/widgets/gimpclipboard.c:296
+#: ../app/actions/edit-commands.c:338
+#: ../app/core/gimpbrushclipboard.c:181
+#: ../app/core/gimppatternclipboard.c:181
+#: ../app/widgets/gimpclipboard.c:296
 msgid "Clipboard"
 msgstr "Schowek"
 
@@ -1722,7 +1754,8 @@ msgstr "Schowek"
 msgid "Cut Named"
 msgstr "Wytnij nazwany"
 
-#: ../app/actions/edit-commands.c:366 ../app/actions/edit-commands.c:407
+#: ../app/actions/edit-commands.c:366
+#: ../app/actions/edit-commands.c:407
 #: ../app/actions/edit-commands.c:427
 msgid "Enter a name for this buffer"
 msgstr "Wprowadź nazwę bufora"
@@ -1739,7 +1772,8 @@ msgstr "Kopiuj widoczne nazwane"
 msgid "There is no active layer or channel to cut from."
 msgstr "Brak aktywnej warstwy lub kanału, z którego można wyciąć."
 
-#: ../app/actions/edit-commands.c:547 ../app/actions/edit-commands.c:579
+#: ../app/actions/edit-commands.c:547
+#: ../app/actions/edit-commands.c:579
 #: ../app/actions/edit-commands.c:603
 msgid "(Unnamed Buffer)"
 msgstr "(Bufor bez nazwy)"
@@ -1904,7 +1938,8 @@ msgstr "Zapisz i zamknij..."
 msgid "Save this image and close its window"
 msgstr "Zapisuje bieżący obraz i zamyka okno"
 
-#: ../app/actions/file-commands.c:104 ../app/actions/file-commands.c:456
+#: ../app/actions/file-commands.c:104
+#: ../app/actions/file-commands.c:456
 #: ../app/dialogs/file-open-dialog.c:76
 msgid "Open Image"
 msgstr "Otwarcie obrazu"
@@ -1917,7 +1952,8 @@ msgstr "Otwiera obraz jako warstwy"
 msgid "Saving canceled"
 msgstr "Zapisywanie anulowane"
 
-#: ../app/actions/file-commands.c:275 ../app/dialogs/file-save-dialog.c:513
+#: ../app/actions/file-commands.c:275
+#: ../app/dialogs/file-save-dialog.c:513
 #: ../app/widgets/gimpdnd-xds.c:173
 #, c-format
 msgid ""
@@ -1933,7 +1969,8 @@ msgstr ""
 msgid "No changes need to be saved"
 msgstr "Nie znaleziono zmian"
 
-#: ../app/actions/file-commands.c:307 ../app/dialogs/file-save-dialog.c:88
+#: ../app/actions/file-commands.c:307
+#: ../app/dialogs/file-save-dialog.c:88
 msgid "Save Image"
 msgstr "Zapis obrazu"
 
@@ -1963,12 +2000,8 @@ msgid "Revert '%s' to '%s'?"
 msgstr "Czy przywrócić \"%s\" do wersji \"%s\"?"
 
 #: ../app/actions/file-commands.c:408
-msgid ""
-"By reverting the image to the state saved on disk, you will lose all "
-"changes, including all undo information."
-msgstr ""
-"Przywrócenie obrazu do stanu zapisanego w pliku spowoduje utratę wszystkich "
-"dokonanych w nim zmian, wraz z informacjami o historii operacji."
+msgid "By reverting the image to the state saved on disk, you will lose all changes, including all undo information."
+msgstr "Przywrócenie obrazu do stanu zapisanego w pliku spowoduje utratę wszystkich dokonanych w nim zmian, wraz z informacjami o historii operacji."
 
 #: ../app/actions/file-commands.c:563
 msgid "(Unnamed Template)"
@@ -2140,7 +2173,8 @@ msgstr "Bliżej"
 
 #: ../app/actions/gradient-editor-actions.c:371
 #: ../app/actions/palette-editor-actions.c:88
-#: ../app/actions/view-actions.c:262 ../app/actions/view-actions.c:274
+#: ../app/actions/view-actions.c:262
+#: ../app/actions/view-actions.c:274
 msgid "Zoom in"
 msgstr "Powiększenie"
 
@@ -2151,7 +2185,8 @@ msgstr "Dalej"
 
 #: ../app/actions/gradient-editor-actions.c:377
 #: ../app/actions/palette-editor-actions.c:94
-#: ../app/actions/view-actions.c:256 ../app/actions/view-actions.c:268
+#: ../app/actions/view-actions.c:256
+#: ../app/actions/view-actions.c:268
 msgid "Zoom out"
 msgstr "Zmniejszenie"
 
@@ -2395,7 +2430,8 @@ msgstr "Modyfikacja gradientu"
 msgid "Save '%s' as POV-Ray"
 msgstr "Zapis \"%s\" w formacie POV-Ray"
 
-#: ../app/actions/help-actions.c:38 ../app/actions/help-actions.c:41
+#: ../app/actions/help-actions.c:38
+#: ../app/actions/help-actions.c:41
 msgid "_Help"
 msgstr "Pomo_c"
 
@@ -2411,7 +2447,8 @@ msgstr "Pomoc _kontekstowa"
 msgid "Show the help for a specific user interface item"
 msgstr "Wyświetla pomoc określonego przez użytkownika obiektu"
 
-#: ../app/actions/image-actions.c:47 ../app/actions/image-actions.c:51
+#: ../app/actions/image-actions.c:47
+#: ../app/actions/image-actions.c:51
 msgid "Image Menu"
 msgstr "Menu obrazu"
 
@@ -2423,7 +2460,8 @@ msgstr "_Obraz"
 msgid "_Mode"
 msgstr "_Tryb"
 
-#: ../app/actions/image-actions.c:56 ../app/actions/layers-actions.c:56
+#: ../app/actions/image-actions.c:56
+#: ../app/actions/layers-actions.c:56
 msgid "_Transform"
 msgstr "Prze_kształcenie"
 
@@ -2435,12 +2473,14 @@ msgstr "Pro_wadnice"
 msgid "I_nfo"
 msgstr "I_nformacje"
 
-#: ../app/actions/image-actions.c:61 ../app/tools/gimplevelstool.c:653
+#: ../app/actions/image-actions.c:61
+#: ../app/tools/gimplevelstool.c:653
 #: ../app/tools/gimpthresholdtool.c:264
 msgid "_Auto"
 msgstr "_Automatycznie"
 
-#: ../app/actions/image-actions.c:62 ../app/actions/plug-in-actions.c:95
+#: ../app/actions/image-actions.c:62
+#: ../app/actions/plug-in-actions.c:95
 msgid "_Map"
 msgstr "O_dwzorowania"
 
@@ -2496,7 +2536,8 @@ msgstr "_Skaluj obraz..."
 msgid "Change the size of the image content"
 msgstr "Zmienia rozmiar zawartości obrazu"
 
-#: ../app/actions/image-actions.c:102 ../app/actions/layers-actions.c:188
+#: ../app/actions/image-actions.c:102
+#: ../app/actions/layers-actions.c:188
 msgid "_Crop to Selection"
 msgstr "_Kadruj według zaznaczenia"
 
@@ -2516,15 +2557,18 @@ msgstr "Tworzy duplikat obrazu"
 msgid "Merge Visible _Layers..."
 msgstr "_Połącz widoczne warstwy..."
 
-#: ../app/actions/image-actions.c:115 ../app/actions/layers-actions.c:141
+#: ../app/actions/image-actions.c:115
+#: ../app/actions/layers-actions.c:141
 msgid "Merge all visible layers into one layer"
 msgstr "Łączy wszystkie widoczne warstwy w jedną"
 
-#: ../app/actions/image-actions.c:120 ../app/actions/layers-actions.c:146
+#: ../app/actions/image-actions.c:120
+#: ../app/actions/layers-actions.c:146
 msgid "_Flatten Image"
 msgstr "Spłasz_cz obraz"
 
-#: ../app/actions/image-actions.c:121 ../app/actions/layers-actions.c:147
+#: ../app/actions/image-actions.c:121
+#: ../app/actions/layers-actions.c:147
 msgid "Merge all layers into one and remove transparency"
 msgstr "Łączy wszystkie widoczne warstwy w jedną i usuwa przezroczystość"
 
@@ -2588,7 +2632,8 @@ msgstr "Obraca obraz o 90 stopni w lewo"
 msgid "Set Image Canvas Size"
 msgstr "Ustawienie wymiarów płótna obrazu"
 
-#: ../app/actions/image-commands.c:261 ../app/actions/image-commands.c:282
+#: ../app/actions/image-commands.c:261
+#: ../app/actions/image-commands.c:282
 #: ../app/actions/image-commands.c:559
 msgid "Resizing"
 msgstr "Zmienianie wymiarów"
@@ -2605,31 +2650,38 @@ msgstr "Odbijanie"
 
 #: ../app/actions/image-commands.c:383
 #: ../app/pdb/drawable-transform-cmds.c:525
-#: ../app/pdb/drawable-transform-cmds.c:604 ../app/pdb/image-cmds.c:533
-#: ../app/pdb/transform-tools-cmds.c:215 ../app/tools/gimprotatetool.c:122
+#: ../app/pdb/drawable-transform-cmds.c:604
+#: ../app/pdb/image-cmds.c:533
+#: ../app/pdb/transform-tools-cmds.c:215
+#: ../app/tools/gimprotatetool.c:122
 msgid "Rotating"
 msgstr "Obracanie"
 
-#: ../app/actions/image-commands.c:408 ../app/actions/layers-commands.c:639
+#: ../app/actions/image-commands.c:408
+#: ../app/actions/layers-commands.c:639
 msgid "Cannot crop because the current selection is empty."
-msgstr ""
-"Nie można przeprowadzić kadrowania, gdyż bieżące zaznaczenie jest puste."
+msgstr "Nie można przeprowadzić kadrowania, gdyż bieżące zaznaczenie jest puste."
 
 #: ../app/actions/image-commands.c:606
 msgid "Change Print Size"
 msgstr "Zmień rozmiar wydruku"
 
-#: ../app/actions/image-commands.c:647 ../app/core/gimpimage-scale.c:82
+#: ../app/actions/image-commands.c:647
+#: ../app/core/gimpimage-scale.c:82
 msgid "Scale Image"
 msgstr "Skalowanie obrazu"
 
 #. Scaling
-#: ../app/actions/image-commands.c:658 ../app/actions/layers-commands.c:1101
+#: ../app/actions/image-commands.c:658
+#: ../app/actions/layers-commands.c:1101
 #: ../app/dialogs/preferences-dialog.c:1919
 #: ../app/pdb/drawable-transform-cmds.c:682
-#: ../app/pdb/drawable-transform-cmds.c:758 ../app/pdb/image-cmds.c:405
-#: ../app/pdb/image-cmds.c:441 ../app/pdb/layer-cmds.c:289
-#: ../app/pdb/layer-cmds.c:334 ../app/pdb/transform-tools-cmds.c:291
+#: ../app/pdb/drawable-transform-cmds.c:758
+#: ../app/pdb/image-cmds.c:405
+#: ../app/pdb/image-cmds.c:441
+#: ../app/pdb/layer-cmds.c:289
+#: ../app/pdb/layer-cmds.c:334
+#: ../app/pdb/transform-tools-cmds.c:291
 #: ../app/tools/gimpscaletool.c:107
 msgid "Scaling"
 msgstr "Skalowanie"
@@ -2646,7 +2698,8 @@ msgstr "_Wysuń widoki"
 msgid "Raise this image's displays"
 msgstr "Wysuwa widoki bieżącego obrazu"
 
-#: ../app/actions/images-actions.c:53 ../app/actions/view-actions.c:75
+#: ../app/actions/images-actions.c:53
+#: ../app/actions/view-actions.c:75
 msgid "_New View"
 msgstr "_Nowy widok"
 
@@ -2951,7 +3004,8 @@ msgstr "Kanał alfa na z_aznaczenie"
 msgid "Replace the selection with the layer's alpha channel"
 msgstr "Zamienia zaznaczenie z kanałem alfa warstwy"
 
-#: ../app/actions/layers-actions.c:293 ../app/actions/layers-actions.c:320
+#: ../app/actions/layers-actions.c:293
+#: ../app/actions/layers-actions.c:320
 msgid "A_dd to Selection"
 msgstr "Dod_aj do zaznaczenia"
 
@@ -3036,8 +3090,10 @@ msgstr "Atrybuty warstwy"
 msgid "Edit Layer Attributes"
 msgstr "Modyfikacja atrybutów warstwy"
 
-#: ../app/actions/layers-commands.c:249 ../app/actions/layers-commands.c:251
-#: ../app/actions/layers-commands.c:319 ../app/actions/layers-commands.c:323
+#: ../app/actions/layers-commands.c:249
+#: ../app/actions/layers-commands.c:251
+#: ../app/actions/layers-commands.c:319
+#: ../app/actions/layers-commands.c:323
 #: ../app/widgets/gimpdrawabletreeview.c:326
 #: ../app/widgets/gimplayertreeview.c:835
 msgid "New Layer"
@@ -3055,7 +3111,8 @@ msgstr "Widoczny"
 msgid "Set Layer Boundary Size"
 msgstr "Ustawienie wymiarów granic warstwy"
 
-#: ../app/actions/layers-commands.c:612 ../app/core/gimplayer.c:251
+#: ../app/actions/layers-commands.c:612
+#: ../app/core/gimplayer.c:251
 msgid "Scale Layer"
 msgstr "Skaluj warstwę"
 
@@ -3071,7 +3128,8 @@ msgstr "Maska warstwy na zaznaczenie"
 msgid "Please select a channel first"
 msgstr "Zaznacz najpierw kanał"
 
-#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1282
+#: ../app/actions/layers-commands.c:1044
+#: ../app/core/gimplayer.c:1282
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "Dodanie maski warstwy"
@@ -3384,8 +3442,7 @@ msgstr "Przywrócenie domyślnych opcji wszystkich filtrów"
 
 #: ../app/actions/plug-in-commands.c:281
 msgid "Do you really want to reset all filters to default values?"
-msgstr ""
-"Czy na pewno przywrócić domyślne wartości opcji dla wszystkich filtrów?"
+msgstr "Czy na pewno przywrócić domyślne wartości opcji dla wszystkich filtrów?"
 
 #: ../app/actions/quick-mask-actions.c:42
 msgid "Quick Mask Menu"
@@ -3537,7 +3594,8 @@ msgstr "Ry_suj wzdłuż zaznaczenia"
 msgid "Stroke the selection with last used values"
 msgstr "Rysuje wzdłuż zaznaczenia z użyciem ostatnich wartości"
 
-#: ../app/actions/select-commands.c:153 ../app/core/gimpselection.c:167
+#: ../app/actions/select-commands.c:153
+#: ../app/core/gimpselection.c:167
 msgid "Feather Selection"
 msgstr "Zmiękcza zaznaczenie"
 
@@ -3545,7 +3603,8 @@ msgstr "Zmiękcza zaznaczenie"
 msgid "Feather selection by"
 msgstr "Zmiękcza zaznaczenie o"
 
-#: ../app/actions/select-commands.c:191 ../app/core/gimpselection.c:174
+#: ../app/actions/select-commands.c:191
+#: ../app/core/gimpselection.c:174
 msgid "Shrink Selection"
 msgstr "Zmniejszenie zaznaczenia"
 
@@ -3557,7 +3616,8 @@ msgstr "Stopień zmniejszenia zaznaczenia"
 msgid "_Shrink from image border"
 msgstr "_Zmniejsz od granic obrazu"
 
-#: ../app/actions/select-commands.c:228 ../app/core/gimpselection.c:173
+#: ../app/actions/select-commands.c:228
+#: ../app/core/gimpselection.c:173
 msgid "Grow Selection"
 msgstr "Powiększenie zaznaczenia"
 
@@ -3565,7 +3625,8 @@ msgstr "Powiększenie zaznaczenia"
 msgid "Grow selection by"
 msgstr "Stopień powiększenia zaznaczenia"
 
-#: ../app/actions/select-commands.c:255 ../app/core/gimpselection.c:172
+#: ../app/actions/select-commands.c:255
+#: ../app/core/gimpselection.c:172
 msgid "Border Selection"
 msgstr "Obramowanie zaznaczenia"
 
@@ -3583,13 +3644,16 @@ msgstr "_Zmiękcz krawędzie"
 msgid "_Lock selection to image edges"
 msgstr "_Blokuj zaznaczenie do krawędzi obrazu"
 
-#: ../app/actions/select-commands.c:330 ../app/actions/select-commands.c:362
-#: ../app/actions/vectors-commands.c:379 ../app/actions/vectors-commands.c:412
+#: ../app/actions/select-commands.c:330
+#: ../app/actions/select-commands.c:362
+#: ../app/actions/vectors-commands.c:379
+#: ../app/actions/vectors-commands.c:412
 #: ../app/dialogs/stroke-dialog.c:299
 msgid "There is no active layer or channel to stroke to."
 msgstr "Brak aktywnej warstwy lub kanału, na którym można rysować."
 
-#: ../app/actions/select-commands.c:336 ../app/core/gimpselection.c:151
+#: ../app/actions/select-commands.c:336
+#: ../app/core/gimpselection.c:151
 msgid "Stroke Selection"
 msgstr "Rysowanie wzdłuż zaznaczenia"
 
@@ -3656,8 +3720,7 @@ msgstr "Usunięcie szablonu"
 
 #: ../app/actions/templates-commands.c:239
 #, c-format
-msgid ""
-"Are you sure you want to delete template '%s' from the list and from disk?"
+msgid "Are you sure you want to delete template '%s' from the list and from disk?"
 msgstr "Czy na pewno usunąć szablon \"%s\" z listy i z dysku?"
 
 #: ../app/actions/text-editor-actions.c:44
@@ -3668,7 +3731,8 @@ msgstr "Otwórz"
 msgid "Load text from file"
 msgstr "Wczytanie tekstu z pliku"
 
-#: ../app/actions/text-editor-actions.c:50 ../app/core/gimp-edit.c:445
+#: ../app/actions/text-editor-actions.c:50
+#: ../app/core/gimp-edit.c:445
 msgid "Clear"
 msgstr "Wyczyść"
 
@@ -3697,14 +3761,22 @@ msgid "Open Text File (UTF-8)"
 msgstr "Otwiera plik tekstowy (UTF-8)"
 
 #: ../app/actions/text-editor-commands.c:144
-#: ../app/config/gimpconfig-file.c:59 ../app/core/gimpbrush-load.c:140
-#: ../app/core/gimpbrush-load.c:420 ../app/core/gimpbrushgenerated-load.c:73
-#: ../app/core/gimpbrushpipe-load.c:81 ../app/core/gimpcurve-load.c:55
-#: ../app/core/gimpgradient-load.c:62 ../app/core/gimppalette-load.c:76
-#: ../app/core/gimppalette-load.c:270 ../app/core/gimppalette-load.c:314
-#: ../app/core/gimppalette-load.c:368 ../app/core/gimppalette-load.c:456
-#: ../app/core/gimppalette-load.c:599 ../app/core/gimppattern-load.c:76
-#: ../app/tools/gimpcurvestool.c:623 ../app/tools/gimplevelstool.c:743
+#: ../app/config/gimpconfig-file.c:59
+#: ../app/core/gimpbrush-load.c:140
+#: ../app/core/gimpbrush-load.c:420
+#: ../app/core/gimpbrushgenerated-load.c:73
+#: ../app/core/gimpbrushpipe-load.c:81
+#: ../app/core/gimpcurve-load.c:55
+#: ../app/core/gimpgradient-load.c:62
+#: ../app/core/gimppalette-load.c:76
+#: ../app/core/gimppalette-load.c:270
+#: ../app/core/gimppalette-load.c:314
+#: ../app/core/gimppalette-load.c:368
+#: ../app/core/gimppalette-load.c:456
+#: ../app/core/gimppalette-load.c:599
+#: ../app/core/gimppattern-load.c:76
+#: ../app/tools/gimpcurvestool.c:623
+#: ../app/tools/gimplevelstool.c:743
 #: ../app/xcf/xcf.c:329
 #, c-format
 msgid "Could not open '%s' for reading: %s"
@@ -3908,7 +3980,8 @@ msgstr "Utworzenie duplikatu ścieżki"
 msgid "_Delete Path"
 msgstr "_Usuń ścieżkę"
 
-#: ../app/actions/vectors-actions.c:78 ../app/core/core-enums.c:920
+#: ../app/actions/vectors-actions.c:78
+#: ../app/core/core-enums.c:920
 msgid "Delete path"
 msgstr "Usunięcie ścieżki"
 
@@ -3984,7 +4057,8 @@ msgstr "_Importuj ścieżkę..."
 msgid "Path to Sele_ction"
 msgstr "Ścieżka na _zaznaczenie"
 
-#: ../app/actions/vectors-actions.c:163 ../app/tools/gimpvectortool.c:1912
+#: ../app/actions/vectors-actions.c:163
+#: ../app/tools/gimpvectortool.c:1912
 msgid "Path to selection"
 msgstr "Ścieżka na zaznaczenie"
 
@@ -3996,7 +4070,8 @@ msgstr "Ze ś_cieżki"
 msgid "Add"
 msgstr "Dodanie"
 
-#: ../app/actions/vectors-actions.c:180 ../app/base/base-enums.c:119
+#: ../app/actions/vectors-actions.c:180
+#: ../app/base/base-enums.c:119
 msgid "Subtract"
 msgstr "Odejmowanie"
 
@@ -4008,7 +4083,8 @@ msgstr "Przecięcie"
 msgid "Selecti_on to Path"
 msgstr "Zaznaczenie na ś_cieżkę"
 
-#: ../app/actions/vectors-actions.c:195 ../app/actions/vectors-actions.c:201
+#: ../app/actions/vectors-actions.c:195
+#: ../app/actions/vectors-actions.c:201
 msgid "Selection to path"
 msgstr "Przekształcenie zaznaczenia na ścieżkę"
 
@@ -4032,7 +4108,8 @@ msgstr "Atrybuty ścieżki"
 msgid "Edit Path Attributes"
 msgstr "Modyfikacja atrybutów ścieżki"
 
-#: ../app/actions/vectors-commands.c:165 ../app/actions/vectors-commands.c:166
+#: ../app/actions/vectors-commands.c:165
+#: ../app/actions/vectors-commands.c:166
 #: ../app/actions/vectors-commands.c:188
 msgid "New Path"
 msgstr "Nowa ścieżka"
@@ -4041,13 +4118,16 @@ msgstr "Nowa ścieżka"
 msgid "New Path Options"
 msgstr "Opcje nowej ścieżki"
 
-#: ../app/actions/vectors-commands.c:305 ../app/pdb/paths-cmds.c:640
+#: ../app/actions/vectors-commands.c:305
+#: ../app/pdb/paths-cmds.c:640
 #: ../app/pdb/vectors-cmds.c:1253
 msgid "Path to Selection"
 msgstr "Utworzenie zaznaczenia ze ścieżki"
 
-#: ../app/actions/vectors-commands.c:385 ../app/tools/gimpvectoroptions.c:199
-#: ../app/tools/gimpvectortool.c:1945 ../app/vectors/gimpvectors.c:200
+#: ../app/actions/vectors-commands.c:385
+#: ../app/tools/gimpvectoroptions.c:199
+#: ../app/tools/gimpvectortool.c:1945
+#: ../app/vectors/gimpvectors.c:200
 msgid "Stroke Path"
 msgstr "Rysuj wzdłuż ścieżki"
 
@@ -4098,7 +4178,8 @@ msgstr "Dopasowuje powiększenie do okna"
 # FIXME
 # 1. app/gui/file-commands.c: "Przywróć"
 # 2. app/widgets/gimpdataeditor.c: "Przywraca"
-#: ../app/actions/view-actions.c:99 ../app/actions/view-actions.c:579
+#: ../app/actions/view-actions.c:99
+#: ../app/actions/view-actions.c:579
 msgid "Re_vert Zoom"
 msgstr "Przyw_róć powiększenie"
 
@@ -4432,24 +4513,28 @@ msgstr "Wygładzona"
 msgid "Freehand"
 msgstr "Odręczna"
 
-#: ../app/base/base-enums.c:55 ../app/base/base-enums.c:125
+#: ../app/base/base-enums.c:55
+#: ../app/base/base-enums.c:125
 #: ../app/core/core-enums.c:1202
 msgid "Value"
 msgstr "Wartość"
 
-#: ../app/base/base-enums.c:56 ../app/core/core-enums.c:1197
+#: ../app/base/base-enums.c:56
+#: ../app/core/core-enums.c:1197
 #: ../app/tools/gimpcolorbalancetool.c:296
 #: ../app/tools/gimphuesaturationtool.c:252
 msgid "Red"
 msgstr "Czerwony"
 
-#: ../app/base/base-enums.c:57 ../app/core/core-enums.c:1198
+#: ../app/base/base-enums.c:57
+#: ../app/core/core-enums.c:1198
 #: ../app/tools/gimpcolorbalancetool.c:305
 #: ../app/tools/gimphuesaturationtool.c:254
 msgid "Green"
 msgstr "Zielony"
 
-#: ../app/base/base-enums.c:58 ../app/core/core-enums.c:1199
+#: ../app/base/base-enums.c:58
+#: ../app/core/core-enums.c:1199
 #: ../app/tools/gimpcolorbalancetool.c:314
 #: ../app/tools/gimphuesaturationtool.c:256
 msgid "Blue"
@@ -4459,7 +4544,8 @@ msgstr "Niebieski"
 msgid "Alpha"
 msgstr "Alfa"
 
-#: ../app/base/base-enums.c:60 ../app/display/gimpdisplayshell-title.c:233
+#: ../app/base/base-enums.c:60
+#: ../app/display/gimpdisplayshell-title.c:233
 #: ../app/widgets/widgets-enums.c:84
 msgid "RGB"
 msgstr "RGB"
@@ -4504,15 +4590,18 @@ msgstr "Tylko ciemniejsze"
 msgid "Lighten only"
 msgstr "Tylko jaśniejsze"
 
-#: ../app/base/base-enums.c:122 ../app/core/core-enums.c:1200
+#: ../app/base/base-enums.c:122
+#: ../app/core/core-enums.c:1200
 msgid "Hue"
 msgstr "Odcień"
 
-#: ../app/base/base-enums.c:123 ../app/core/core-enums.c:1201
+#: ../app/base/base-enums.c:123
+#: ../app/core/core-enums.c:1201
 msgid "Saturation"
 msgstr "Nasycenie"
 
-#: ../app/base/base-enums.c:124 ../app/tools/gimppaintoptions-gui.c:174
+#: ../app/base/base-enums.c:124
+#: ../app/tools/gimppaintoptions-gui.c:174
 msgid "Color"
 msgstr "Kolor"
 
@@ -4561,33 +4650,31 @@ msgid "Anti erase"
 msgstr "Cofanie wycierania"
 
 #: ../app/base/tile-swap.c:553
-msgid ""
-"Unable to open swap file. GIMP has run out of memory and cannot use the swap "
-"file. Some parts of your images may be corrupted. Try to save your work "
-"using different filenames, restart GIMP and check the location of the swap "
-"directory in your Preferences."
-msgstr ""
-"Nie można otworzyć pliku wymiany. Program GIMP wyczerpał dostępną pamięć i "
-"nie może użyć pliku wymiany. Część elementów obrazów może ulec uszkodzeniu. "
-"Spróbuj zapisać dane pod inną nazwą, ponownie uruchom program i sprawdź "
-"położenie katalogu wymiany w \"Preferencjach\"."
+msgid "Unable to open swap file. GIMP has run out of memory and cannot use the swap file. Some parts of your images may be corrupted. Try to save your work using different filenames, restart GIMP and check the location of the swap directory in your Preferences."
+msgstr "Nie można otworzyć pliku wymiany. Program GIMP wyczerpał dostępną pamięć i nie może użyć pliku wymiany. Część elementów obrazów może ulec uszkodzeniu. Spróbuj zapisać dane pod inną nazwą, ponownie uruchom program i sprawdź położenie katalogu wymiany w \"Preferencjach\"."
 
 #: ../app/base/tile-swap.c:568
 #, c-format
 msgid "Failed to resize swap file: %s"
 msgstr "Nie można zmienić rozmiaru pliku wymiany: %s"
 
-#: ../app/config/gimpconfig-file.c:68 ../app/core/gimpbrushgenerated-save.c:63
-#: ../app/core/gimpcurve-save.c:53 ../app/core/gimpgradient-save.c:51
-#: ../app/core/gimpgradient-save.c:145 ../app/core/gimppalette-save.c:56
-#: ../app/gui/themes.c:239 ../app/tools/gimpcurvestool.c:676
-#: ../app/tools/gimplevelstool.c:796 ../app/vectors/gimpvectors-export.c:83
+#: ../app/config/gimpconfig-file.c:68
+#: ../app/core/gimpbrushgenerated-save.c:63
+#: ../app/core/gimpcurve-save.c:53
+#: ../app/core/gimpgradient-save.c:51
+#: ../app/core/gimpgradient-save.c:145
+#: ../app/core/gimppalette-save.c:56
+#: ../app/gui/themes.c:239
+#: ../app/tools/gimpcurvestool.c:676
+#: ../app/tools/gimplevelstool.c:796
+#: ../app/vectors/gimpvectors-export.c:83
 #: ../app/xcf/xcf.c:422
 #, c-format
 msgid "Could not open '%s' for writing: %s"
 msgstr "Nie można otworzyć \"%s\" do zapisu: %s"
 
-#: ../app/config/gimpconfig-file.c:79 ../app/config/gimpconfig-file.c:102
+#: ../app/config/gimpconfig-file.c:79
+#: ../app/config/gimpconfig-file.c:102
 #, c-format
 msgid "Error writing '%s': %s"
 msgstr "Błąd zapisu \"%s\": %s"
@@ -4599,35 +4686,20 @@ msgstr "Błąd odczytu \"%s\": %s"
 
 #: ../app/config/gimpconfig-file.c:132
 #, c-format
-msgid ""
-"There was an error parsing your '%s' file. Default values will be used. A "
-"backup of your configuration has been created at '%s'."
-msgstr ""
-"Przy analizie zawartości pliku \"%s\" wystąpił błąd. Zamiast niego zostaną "
-"użyte wartości domyślne. Utworzono kopię zapasową konfiguracji w pliku \"%s"
-"\"."
+msgid "There was an error parsing your '%s' file. Default values will be used. A backup of your configuration has been created at '%s'."
+msgstr "Przy analizie zawartości pliku \"%s\" wystąpił błąd. Zamiast niego zostaną użyte wartości domyślne. Utworzono kopię zapasową konfiguracji w pliku \"%s\"."
 
 #. Not all strings defined here are used in the user interface
 #. *  (the preferences dialog mainly) and only those that are should
 #. *  be marked for translation.
 #.
 #: ../app/config/gimprc-blurbs.h:13
-msgid ""
-"When enabled, an image will become the active image when its image window "
-"receives the focus. This is useful for window managers using \"click to focus"
-"\"."
-msgstr ""
-"Powoduje, że obraz staje się aktywny, kiedy okno otrzyma wskazanie (fokus). "
-"Opcja ta jest przydatna w przypadku, gdy używany menedżer okien przekazuje "
-"fokus okna po jego kliknięciu (ang. \"click to focus\")."
+msgid "When enabled, an image will become the active image when its image window receives the focus. This is useful for window managers using \"click to focus\"."
+msgstr "Powoduje, że obraz staje się aktywny, kiedy okno otrzyma wskazanie (fokus). Opcja ta jest przydatna w przypadku, gdy używany menedżer okien przekazuje fokus okna po jego kliknięciu (ang. \"click to focus\")."
 
 #: ../app/config/gimprc-blurbs.h:23
-msgid ""
-"Sets the canvas padding color used if the padding mode is set to custom "
-"color."
-msgstr ""
-"Ustawia kolor wyściółki płótna, używany jeśli wygląd wyściółki ustalony jest "
-"na dowolny kolor."
+msgid "Sets the canvas padding color used if the padding mode is set to custom color."
+msgstr "Ustawia kolor wyściółki płótna, używany jeśli wygląd wyściółki ustalony jest na dowolny kolor."
 
 #: ../app/config/gimprc-blurbs.h:27
 msgid "Specifies how the area around the image should be drawn."
@@ -4635,13 +4707,11 @@ msgstr "Określa sposób rysowania obszaru wokół obrazu."
 
 #: ../app/config/gimprc-blurbs.h:33
 msgid "How to handle embedded color profiles when opening a file."
-msgstr ""
-"Określa jak przetwarzać dodatkowe profile koloru, przy otwieraniu jest pliku."
+msgstr "Określa jak przetwarzać dodatkowe profile koloru, przy otwieraniu jest pliku."
 
 #: ../app/config/gimprc-blurbs.h:36
 msgid "Ask for confirmation before closing an image without saving."
-msgstr ""
-"Powoduje konieczność potwierdzania zamknięcia każdego niezapisanego obrazu."
+msgstr "Powoduje konieczność potwierdzania zamknięcia każdego niezapisanego obrazu."
 
 #: ../app/config/gimprc-blurbs.h:39
 msgid "Sets the pixel format to use for mouse pointers."
@@ -4652,50 +4722,24 @@ msgid "Sets the type of mouse pointers to use."
 msgstr "Ustawia typ używanej myszy."
 
 #: ../app/config/gimprc-blurbs.h:45
-msgid ""
-"Context-dependent mouse pointers are helpful.  They are enabled by default.  "
-"However, they require overhead that you may want to do without."
-msgstr ""
-"Wskaźnik myszy zmieniający swój kształt w zależności od treści, znacznie "
-"ułatwia pracę. Opcja ta jest domyślnie włączona, jednak powoduje dodatkowe "
-"zużycie zasobów."
+msgid "Context-dependent mouse pointers are helpful.  They are enabled by default.  However, they require overhead that you may want to do without."
+msgstr "Wskaźnik myszy zmieniający swój kształt w zależności od treści, znacznie ułatwia pracę. Opcja ta jest domyślnie włączona, jednak powoduje dodatkowe zużycie zasobów."
 
 #: ../app/config/gimprc-blurbs.h:53
-msgid ""
-"When enabled, this will ensure that each pixel of an image gets mapped to a "
-"pixel on the screen."
-msgstr ""
-"Opcja zapewnia, że każdy piksel obrazu jest odwzorowywany na piksel na "
-"ekranie."
+msgid "When enabled, this will ensure that each pixel of an image gets mapped to a pixel on the screen."
+msgstr "Opcja zapewnia, że każdy piksel obrazu jest odwzorowywany na piksel na ekranie."
 
 #: ../app/config/gimprc-blurbs.h:75
 msgid "This is the distance in pixels where Guide and Grid snapping activates."
-msgstr ""
-"Określa odległość w pikselach, przy której uaktywniają się prowadnice i "
-"siatka."
+msgstr "Określa odległość w pikselach, przy której uaktywniają się prowadnice i siatka."
 
 #: ../app/config/gimprc-blurbs.h:79
-msgid ""
-"Tools such as fuzzy-select and bucket fill find regions based on a seed-fill "
-"algorithm.  The seed fill starts at the initially selected pixel and "
-"progresses in all directions until the difference of pixel intensity from "
-"the original is greater than a specified threshold. This value represents "
-"the default threshold."
-msgstr ""
-"Narzędzia, takie jak zaznaczenie rozmyte, czy wypełnienie kubełkiem, "
-"identyfikują ciągłe obszary w oparciu o algorytm wypełniania przez "
-"wysiewanie. Wysiewanie rozpoczyna się we wskazanym punkcie początkowym i "
-"postępuje we wszystkich kierunkach, aż do momentu, w którym różnica jasności "
-"pomiędzy punktem bieżącym i początkowym jest większa od pewnego progu. "
-"Ustawienie reprezentuje domyślną wartość progu."
+msgid "Tools such as fuzzy-select and bucket fill find regions based on a seed-fill algorithm.  The seed fill starts at the initially selected pixel and progresses in all directions until the difference of pixel intensity from the original is greater than a specified threshold. This value represents the default threshold."
+msgstr "Narzędzia, takie jak zaznaczenie rozmyte, czy wypełnienie kubełkiem, identyfikują ciągłe obszary w oparciu o algorytm wypełniania przez wysiewanie. Wysiewanie rozpoczyna się we wskazanym punkcie początkowym i postępuje we wszystkich kierunkach, aż do momentu, w którym różnica jasności pomiędzy punktem bieżącym i początkowym jest większa od pewnego progu. Ustawienie reprezentuje domyślną wartość progu."
 
 #: ../app/config/gimprc-blurbs.h:92
-msgid ""
-"The window type hint that is set on dock windows. This may affect the way "
-"your window manager decorates and handles dock windows."
-msgstr ""
-"Typ podpowiedzi powiązanych z oknami doków. Ustawienie to może wpłynąć na "
-"sposób, w jaki menedżer okien ozdabia i obsługuje okna doków."
+msgid "The window type hint that is set on dock windows. This may affect the way your window manager decorates and handles dock windows."
+msgstr "Typ podpowiedzi powiązanych z oknami doków. Ustawienie to może wpłynąć na sposób, w jaki menedżer okien ozdabia i obsługuje okna doków."
 
 #: ../app/config/gimprc-blurbs.h:123
 msgid "When enabled, the selected brush will be used for all tools."
@@ -4703,13 +4747,11 @@ msgstr "Powoduje użycie wybranego pędzla w odniesieniu do wszystkich narzędzi
 
 #: ../app/config/gimprc-blurbs.h:129
 msgid "When enabled, the selected gradient will be used for all tools."
-msgstr ""
-"Powoduje użycie wybranego gradientu w odniesieniu do wszystkich narzędzi."
+msgstr "Powoduje użycie wybranego gradientu w odniesieniu do wszystkich narzędzi."
 
 #: ../app/config/gimprc-blurbs.h:132
 msgid "When enabled, the selected pattern will be used for all tools."
-msgstr ""
-"Powoduje użycie wybranego desenia w odniesieniu do wszystkich narzędzi."
+msgstr "Powoduje użycie wybranego desenia w odniesieniu do wszystkich narzędzi."
 
 #: ../app/config/gimprc-blurbs.h:146
 msgid "Sets the browser used by the help system."
@@ -4724,278 +4766,144 @@ msgid "Sets the text to appear in image window titles."
 msgstr "Ustawia napis pojawiający się na pasku tytułowym okna z obrazem."
 
 #: ../app/config/gimprc-blurbs.h:160
-msgid ""
-"When enabled, this will ensure that the full image is visible after a file "
-"is opened, otherwise it will be displayed with a scale of 1:1."
-msgstr ""
-"Powoduje, że po wczytaniu obrazu skala jego widoku ustalana jest w taki "
-"sposób, aby cały obraz był widoczny. Jeśli opcja nie jest aktywna, skala "
-"ustawiana jest zawsze na 1:1."
+msgid "When enabled, this will ensure that the full image is visible after a file is opened, otherwise it will be displayed with a scale of 1:1."
+msgstr "Powoduje, że po wczytaniu obrazu skala jego widoku ustalana jest w taki sposób, aby cały obraz był widoczny. Jeśli opcja nie jest aktywna, skala ustawiana jest zawsze na 1:1."
 
 #: ../app/config/gimprc-blurbs.h:164
-msgid ""
-"Install a private colormap; might be useful on 8-bit (256 colors) displays."
-msgstr ""
-"Instalacja osobistą palety kolorów, jest przydatna w przypadku pracy na "
-"ekranie w trybie 8-bitowym (256-kolorowym)."
+msgid "Install a private colormap; might be useful on 8-bit (256 colors) displays."
+msgstr "Instalacja osobistą palety kolorów, jest przydatna w przypadku pracy na ekranie w trybie 8-bitowym (256-kolorowym)."
 
 #: ../app/config/gimprc-blurbs.h:167
-msgid ""
-"Sets the level of interpolation used for scaling and other transformations."
-msgstr ""
-"Rodzaj interpolacji wykorzystywany przy skalowaniu i innych przekształceniach"
+msgid "Sets the level of interpolation used for scaling and other transformations."
+msgstr "Rodzaj interpolacji wykorzystywany przy skalowaniu i innych przekształceniach"
 
 #: ../app/config/gimprc-blurbs.h:174
 msgid "How many recently opened image filenames to keep on the File menu."
-msgstr ""
-"Ilość wyświetlanych w menu \"Plik\" nazw plików z ostatnio otwieranymi "
-"obrazami."
+msgstr "Ilość wyświetlanych w menu \"Plik\" nazw plików z ostatnio otwieranymi obrazami."
 
 #: ../app/config/gimprc-blurbs.h:177
-msgid ""
-"Speed of marching ants in the selection outline.  This value is in "
-"milliseconds (less time indicates faster marching)."
-msgstr ""
-"Szybkość animacji obwódki, widocznej wokół zaznaczonego obszaru. Wartość "
-"jest podana w milisekundach (krótszy czas oznacza szybszą animację)."
+msgid "Speed of marching ants in the selection outline.  This value is in milliseconds (less time indicates faster marching)."
+msgstr "Szybkość animacji obwódki, widocznej wokół zaznaczonego obszaru. Wartość jest podana w milisekundach (krótszy czas oznacza szybszą animację)."
 
 #: ../app/config/gimprc-blurbs.h:181
-msgid ""
-"GIMP will warn the user if an attempt is made to create an image that would "
-"take more memory than the size specified here."
-msgstr ""
-"Program GIMP wyświetli ostrzeżenie, jeżeli ilość pamięci niezbędna do "
-"utworzenia obrazu przekroczy podaną tutaj wartość. "
+msgid "GIMP will warn the user if an attempt is made to create an image that would take more memory than the size specified here."
+msgstr "Program GIMP wyświetli ostrzeżenie, jeżeli ilość pamięci niezbędna do utworzenia obrazu przekroczy podaną tutaj wartość. "
 
 #: ../app/config/gimprc-blurbs.h:185
 msgid "When enabled, GIMP will show mnemonics in menus."
 msgstr "Powoduje wyświetlanie mnemoników w pozycjach menu programu."
 
 #: ../app/config/gimprc-blurbs.h:188
-msgid ""
-"Generally only a concern for 8-bit displays, this sets the minimum number of "
-"system colors allocated for GIMP."
-msgstr ""
-"Ustawienie odnosi się tylko do ekranów 8-bitowych.Ustala minimalną liczbę "
-"kolorów systemowych, alokowanych przez program GIMP."
+msgid "Generally only a concern for 8-bit displays, this sets the minimum number of system colors allocated for GIMP."
+msgstr "Ustawienie odnosi się tylko do ekranów 8-bitowych.Ustala minimalną liczbę kolorów systemowych, alokowanych przez program GIMP."
 
 #: ../app/config/gimprc-blurbs.h:198
-msgid ""
-"Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, "
-"forces the X server to be queried for both horizontal and vertical "
-"resolution information."
-msgstr ""
-"Ustala rozdzielczość poziomą monitora w punktach na cal. Jeżeli ustawione "
-"jest 0, wymusza zapytanie X serwera o rozdzielczość pionową i poziomą."
+msgid "Sets the monitor's horizontal resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
+msgstr "Ustala rozdzielczość poziomą monitora w punktach na cal. Jeżeli ustawione jest 0, wymusza zapytanie X serwera o rozdzielczość pionową i poziomą."
 
 #: ../app/config/gimprc-blurbs.h:203
-msgid ""
-"Sets the monitor's vertical resolution, in dots per inch.  If set to 0, "
-"forces the X server to be queried for both horizontal and vertical "
-"resolution information."
-msgstr ""
-"Ustala rozdzielczość pionową monitora w punktach na cal. Jeżeli ustawione "
-"jest 0, wymusza zapytanie X serwera o rozdzielczość pionową i poziomą."
+msgid "Sets the monitor's vertical resolution, in dots per inch.  If set to 0, forces the X server to be queried for both horizontal and vertical resolution information."
+msgstr "Ustala rozdzielczość pionową monitora w punktach na cal. Jeżeli ustawione jest 0, wymusza zapytanie X serwera o rozdzielczość pionową i poziomą."
 
 #: ../app/config/gimprc-blurbs.h:208
-msgid ""
-"If enabled, the move tool sets the edited layer or path as active.  This "
-"used to be the default behaviour in older versions."
-msgstr ""
-"Powoduje, że narzędzie przesuwania ustawia edytowaną warstwę lub ścieżkę na "
-"aktywną. Zachowanie to występowało jako domyślne w starszych wersjach "
-"programu."
+msgid "If enabled, the move tool sets the edited layer or path as active.  This used to be the default behaviour in older versions."
+msgstr "Powoduje, że narzędzie przesuwania ustawia edytowaną warstwę lub ścieżkę na aktywną. Zachowanie to występowało jako domyślne w starszych wersjach programu."
 
 #: ../app/config/gimprc-blurbs.h:212
-msgid ""
-"Sets the size of the navigation preview available in the lower right corner "
-"of the image window."
-msgstr ""
-"Ustala rozmiar podglądu nawigacyjnego, widocznego w prawym dolnym rogu okna "
-"obrazu."
+msgid "Sets the size of the navigation preview available in the lower right corner of the image window."
+msgstr "Ustala rozmiar podglądu nawigacyjnego, widocznego w prawym dolnym rogu okna obrazu."
 
 #: ../app/config/gimprc-blurbs.h:216
 msgid "Sets how many processors GIMP should try to use simultaneously."
 msgstr "Określa ilość procesorów, jakie powinien równocześnie używać GIMP."
 
 #: ../app/config/gimprc-blurbs.h:229
-msgid ""
-"When enabled, the X server is queried for the mouse's current position on "
-"each motion event, rather than relying on the position hint.  This means "
-"painting with large brushes should be more accurate, but it may be slower.  "
-"Perversely, on some X servers enabling this option results in faster "
-"painting."
-msgstr ""
-"Powoduje, że serwer X odpytywany jest o współrzędne wskaźnika myszy przy "
-"każdym zdarzeniu opisującym zmianę jego położenia (zamiast użycia informacji "
-"przekazanych ze zdarzeniem). Powinno to zwiększyć precyzję rysowania przy "
-"użyciu pędzli o dużych rozmiarach, jednak kosztem szybkości działania. Co "
-"ciekawe, w przypadku niektórych serwerów X użycie tej opcji powoduje, że "
-"program działa szybciej."
+msgid "When enabled, the X server is queried for the mouse's current position on each motion event, rather than relying on the position hint.  This means painting with large brushes should be more accurate, but it may be slower.  Perversely, on some X servers enabling this option results in faster painting."
+msgstr "Powoduje, że serwer X odpytywany jest o współrzędne wskaźnika myszy przy każdym zdarzeniu opisującym zmianę jego położenia (zamiast użycia informacji przekazanych ze zdarzeniem). Powinno to zwiększyć precyzję rysowania przy użyciu pędzli o dużych rozmiarach, jednak kosztem szybkości działania. Co ciekawe, w przypadku niektórych serwerów X użycie tej opcji powoduje, że program działa szybciej."
 
 #: ../app/config/gimprc-blurbs.h:245
-msgid ""
-"Sets whether GIMP should create previews of layers and channels. Previews in "
-"the layers and channels dialog are nice to have but they can slow things "
-"down when working with large images."
-msgstr ""
-"Określa, czy program GIMP powinien tworzyć podglądy warstw i kanałów. "
-"Podglądy w oknie warstw i kanałów ułatwiają pracę, jednak przy pracy z "
-"dużymi obrazami mogą negatywnie wpłynąć na szybkość działania programu."
+msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images."
+msgstr "Określa, czy program GIMP powinien tworzyć podglądy warstw i kanałów. Podglądy w oknie warstw i kanałów ułatwiają pracę, jednak przy pracy z dużymi obrazami mogą negatywnie wpłynąć na szybkość działania programu."
 
 #: ../app/config/gimprc-blurbs.h:250
-msgid ""
-"Sets the preview size used for layers and channel previews in newly created "
-"dialogs."
-msgstr ""
-"Ustawia rozmiar podglądu warstw i kanałów w nowoutworzonych oknach "
-"dialogowych."
+msgid "Sets the preview size used for layers and channel previews in newly created dialogs."
+msgstr "Ustawia rozmiar podglądu warstw i kanałów w nowoutworzonych oknach dialogowych."
 
 #: ../app/config/gimprc-blurbs.h:254
-msgid ""
-"When enabled, the image window will automatically resize itself whenever the "
-"physical image size changes."
-msgstr ""
-"Powoduje automatyczną zmianę wymiarów okna z obrazem w przypadku zmiany "
-"fizycznych wymiarów obrazu."
+msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes."
+msgstr "Powoduje automatyczną zmianę wymiarów okna z obrazem w przypadku zmiany fizycznych wymiarów obrazu."
 
 #: ../app/config/gimprc-blurbs.h:258
-msgid ""
-"When enabled, the image window will automatically resize itself when zooming "
-"into and out of images."
-msgstr ""
-"Powoduje automatyczną zmianę wymiarów okna z obrazem w przypadku zmiany "
-"powiększenia obrazu."
+msgid "When enabled, the image window will automatically resize itself when zooming into and out of images."
+msgstr "Powoduje automatyczną zmianę wymiarów okna z obrazem w przypadku zmiany powiększenia obrazu."
 
 #: ../app/config/gimprc-blurbs.h:262
 msgid "Let GIMP try to restore your last saved session on each startup."
-msgstr ""
-"Powoduje, że przy każdym uruchomieniu programu GIMP przywracana jest "
-"poprzednia zapisana sesja."
+msgstr "Powoduje, że przy każdym uruchomieniu programu GIMP przywracana jest poprzednia zapisana sesja."
 
 #: ../app/config/gimprc-blurbs.h:265
-msgid ""
-"Remember the current tool, pattern, color, and brush across GIMP sessions."
-msgstr ""
-"Powoduje zapamiętywanie aktywnego narzędzia, desenia, koloru oraz pędzla "
-"pomiędzy kolejnymi sesjami programu GIMP."
+msgid "Remember the current tool, pattern, color, and brush across GIMP sessions."
+msgstr "Powoduje zapamiętywanie aktywnego narzędzia, desenia, koloru oraz pędzla pomiędzy kolejnymi sesjami programu GIMP."
 
 #: ../app/config/gimprc-blurbs.h:269
-msgid ""
-"Keep a permanent record of all opened and saved files in the Recent "
-"Documents list."
-msgstr ""
-"Zachowuje wszystkie rekordy otwartych i zapisanych plików na liście historii "
-"dokumentówi."
+msgid "Keep a permanent record of all opened and saved files in the Recent Documents list."
+msgstr "Zachowuje wszystkie rekordy otwartych i zapisanych plików na liście historii dokumentówi."
 
 #: ../app/config/gimprc-blurbs.h:273
 msgid "Save the positions and sizes of the main dialogs when GIMP exits."
-msgstr ""
-"Powoduje zapisywanie położeń i rozmiarów głównych okien dialogowych przed "
-"zakończeniem działania programu."
+msgstr "Powoduje zapisywanie położeń i rozmiarów głównych okien dialogowych przed zakończeniem działania programu."
 
 #: ../app/config/gimprc-blurbs.h:276
 msgid "Save the tool options when GIMP exits."
-msgstr ""
-"Powoduje zapisywanie opcji narzędzi kiedy uruchomiony jest program GIMP."
+msgstr "Powoduje zapisywanie opcji narzędzi kiedy uruchomiony jest program GIMP."
 
 #: ../app/config/gimprc-blurbs.h:282
-msgid ""
-"When enabled, all paint tools will show a preview of the current brush's "
-"outline."
-msgstr ""
-"Powoduje wyświetlanie podglądu kształtu aktywnego pędzla podczas używania "
-"któregokolwiek z narzędzi rysowniczych."
+msgid "When enabled, all paint tools will show a preview of the current brush's outline."
+msgstr "Powoduje wyświetlanie podglądu kształtu aktywnego pędzla podczas używania któregokolwiek z narzędzi rysowniczych."
 
 #: ../app/config/gimprc-blurbs.h:286
-msgid ""
-"When enabled, dialogs will show a help button that gives access to the "
-"related help page.  Without this button, the help page can still be reached "
-"by pressing F1."
-msgstr ""
-"Powoduje, że w oknach dialogowych dostępny będzie przycisk pomocy, dający "
-"dostęp do strony pomocy powiązanej z oknem. Przy wyłączonej opcji pomoc "
-"nadal będzie dostępna poprzez przyciśnięcie klawisza F1."
+msgid "When enabled, dialogs will show a help button that gives access to the related help page.  Without this button, the help page can still be reached by pressing F1."
+msgstr "Powoduje, że w oknach dialogowych dostępny będzie przycisk pomocy, dający dostęp do strony pomocy powiązanej z oknem. Przy wyłączonej opcji pomoc nadal będzie dostępna poprzez przyciśnięcie klawisza F1."
 
 #: ../app/config/gimprc-blurbs.h:291
-msgid ""
-"When enabled, the mouse pointer will be shown over the image while using a "
-"paint tool."
-msgstr ""
-"Powoduje, że w czasie rysowania, nad obrazem wyświetlany jest wskaźnik myszy."
+msgid "When enabled, the mouse pointer will be shown over the image while using a paint tool."
+msgstr "Powoduje, że w czasie rysowania, nad obrazem wyświetlany jest wskaźnik myszy."
 
 #: ../app/config/gimprc-blurbs.h:295
-msgid ""
-"When enabled, the menubar is visible by default. This can also be toggled "
-"with the \"View->Show Menubar\" command."
-msgstr ""
-"Powoduje, że domyślnie pasek menu jest widoczny. Ustawienie można zmienić w "
-"dowolnej chwili przy użyciu opcji \"Widok->Wyświetl pasek menu\"."
+msgid "When enabled, the menubar is visible by default. This can also be toggled with the \"View->Show Menubar\" command."
+msgstr "Powoduje, że domyślnie pasek menu jest widoczny. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl pasek menu\"."
 
 #: ../app/config/gimprc-blurbs.h:299
-msgid ""
-"When enabled, the rulers are visible by default. This can also be toggled "
-"with the \"View->Show Rulers\" command."
-msgstr ""
-"Powoduje, że domyślnie linijki są widoczne. Ustawienie można zmienić w "
-"dowolnej chwili przy użyciu opcji \"Widok->Wyświetl linijki\"."
+msgid "When enabled, the rulers are visible by default. This can also be toggled with the \"View->Show Rulers\" command."
+msgstr "Powoduje, że domyślnie linijki są widoczne. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl linijki\"."
 
 #: ../app/config/gimprc-blurbs.h:303
-msgid ""
-"When enabled, the scrollbars are visible by default. This can also be "
-"toggled with the \"View->Show Scrollbars\" command."
-msgstr ""
-"Powoduje, że domyślnie paski przewijania są widoczne. Ustawienie można "
-"zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl paski "
-"przewijania\"."
+msgid "When enabled, the scrollbars are visible by default. This can also be toggled with the \"View->Show Scrollbars\" command."
+msgstr "Powoduje, że domyślnie paski przewijania są widoczne. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl paski przewijania\"."
 
 #: ../app/config/gimprc-blurbs.h:307
-msgid ""
-"When enabled, the statusbar is visible by default. This can also be toggled "
-"with the \"View->Show Statusbar\" command."
-msgstr ""
-"Powoduje, że domyślnie pasek stanu jest widoczny. Ustawienie można zmienić w "
-"dowolnej chwili przy użyciu opcji \"Widok->Wyświetl pasek stanu\"."
+msgid "When enabled, the statusbar is visible by default. This can also be toggled with the \"View->Show Statusbar\" command."
+msgstr "Powoduje, że domyślnie pasek stanu jest widoczny. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl pasek stanu\"."
 
 #: ../app/config/gimprc-blurbs.h:311
-msgid ""
-"When enabled, the selection is visible by default. This can also be toggled "
-"with the \"View->Show Selection\" command."
-msgstr ""
-"Powoduje, że domyślnie zaznaczenie jest widoczne. Ustawienie można zmienić w "
-"dowolnej chwili przy użyciu opcji \"Widok->Wyświetl zaznaczenia\"."
+msgid "When enabled, the selection is visible by default. This can also be toggled with the \"View->Show Selection\" command."
+msgstr "Powoduje, że domyślnie zaznaczenie jest widoczne. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl zaznaczenia\"."
 
 #: ../app/config/gimprc-blurbs.h:315
-msgid ""
-"When enabled, the layer boundary is visible by default. This can also be "
-"toggled with the \"View->Show Layer Boundary\" command."
-msgstr ""
-"Powoduje, że domyślnie granice warstwy są widoczne. Ustawienie można zmienić "
-"w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl granice warstwy\"."
+msgid "When enabled, the layer boundary is visible by default. This can also be toggled with the \"View->Show Layer Boundary\" command."
+msgstr "Powoduje, że domyślnie granice warstwy są widoczne. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl granice warstwy\"."
 
 #: ../app/config/gimprc-blurbs.h:319
-msgid ""
-"When enabled, the guides are visible by default. This can also be toggled "
-"with the \"View->Show Guides\" command."
-msgstr ""
-"Powoduje, że domyślnie prowadnice są widoczne. Ustawienie można zmienić w "
-"dowolnej chwili przy użyciu opcji \"Widok->Wyświetl prowadnice\"."
+msgid "When enabled, the guides are visible by default. This can also be toggled with the \"View->Show Guides\" command."
+msgstr "Powoduje, że domyślnie prowadnice są widoczne. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl prowadnice\"."
 
 #: ../app/config/gimprc-blurbs.h:323
-msgid ""
-"When enabled, the grid is visible by default. This can also be toggled with "
-"the \"View->Show Grid\" command."
-msgstr ""
-"Powoduje, że domyślnie siatka jest widoczna. Ustawienie można zmienić w "
-"dowolnej chwili przy użyciu opcji \"Widok->Wyświetl siatkę\"."
+msgid "When enabled, the grid is visible by default. This can also be toggled with the \"View->Show Grid\" command."
+msgstr "Powoduje, że domyślnie siatka jest widoczna. Ustawienie można zmienić w dowolnej chwili przy użyciu opcji \"Widok->Wyświetl siatkę\"."
 
 #: ../app/config/gimprc-blurbs.h:327
-msgid ""
-"When enabled, the sample points are visible by default. This can also be "
-"toggled with the \"View->Show Sample Points\" command."
-msgstr ""
-"Powoduje, że domyślnie punkty wzorcowe są widoczne. Ustawienie można zmienić "
-"w  przy użyciu opcji \"Widok->Wyświetl punkty wzorcowe\"."
+msgid "When enabled, the sample points are visible by default. This can also be toggled with the \"View->Show Sample Points\" command."
+msgstr "Powoduje, że domyślnie punkty wzorcowe są widoczne. Ustawienie można zmienić w  przy użyciu opcji \"Widok->Wyświetl punkty wzorcowe\"."
 
 #: ../app/config/gimprc-blurbs.h:331
 msgid "Show a tooltip when the pointer hovers over an item."
@@ -5006,100 +4914,48 @@ msgid "What to do when the space bar is pressed in the image window."
 msgstr "Określa co zrobić, gdy została wciśnięta spacja w oknie obrazu."
 
 #: ../app/config/gimprc-blurbs.h:337
-msgid ""
-"Sets the swap file location. GIMP uses a tile based memory allocation "
-"scheme. The swap file is used to quickly and easily swap tiles out to disk "
-"and back in. Be aware that the swap file can easily get very large if GIMP "
-"is used with large images. Also, things can get horribly slow if the swap "
-"file is created on a folder that is mounted over NFS.  For these reasons, it "
-"may be desirable to put your swap file in \"/tmp\"."
-msgstr ""
-"Ustala położenie pliku wymiany. Program GIMP używa pamięci stronicowanej. "
-"Plik wymiany służy do szybkiego zapisu pamięci stronicowej na dysk i z "
-"powrotem. Należy pamiętać o tym, że przy pracy z dużymi obrazami, plik "
-"wymiany może szybko osiągnąć ogromne rozmiary. Ze względu na szybkość "
-"działania, nie należy umieszczać pliku wymiany na dyskach sieciowych (np. "
-"poprzez NFS). W większości przypadków zaleca się umiejscowienie go w "
-"katalogu \"/tmp\"."
+msgid "Sets the swap file location. GIMP uses a tile based memory allocation scheme. The swap file is used to quickly and easily swap tiles out to disk and back in. Be aware that the swap file can easily get very large if GIMP is used with large images. Also, things can get horribly slow if the swap file is created on a folder that is mounted over NFS.  For these reasons, it may be desirable to put your swap file in \"/tmp\"."
+msgstr "Ustala położenie pliku wymiany. Program GIMP używa pamięci stronicowanej. Plik wymiany służy do szybkiego zapisu pamięci stronicowej na dysk i z powrotem. Należy pamiętać o tym, że przy pracy z dużymi obrazami, plik wymiany może szybko osiągnąć ogromne rozmiary. Ze względu na szybkość działania, nie należy umieszczać pliku wymiany na dyskach sieciowych (np. poprzez NFS). W większości przypadków zaleca się umiejscowienie go w katalogu \"/tmp\"."
 
 #: ../app/config/gimprc-blurbs.h:346
 msgid "When enabled, menus can be torn off."
 msgstr "Pozwala na odrywanie menu."
 
 #: ../app/config/gimprc-blurbs.h:349
-msgid ""
-"When enabled, dock windows (the toolbox and palettes) are set to be "
-"transient to the active image window. Most window managers will keep the "
-"dock windows above the image window then, but it may also have other effects."
-msgstr ""
-"Kiedy jest włączona, okna doku (przybornika i palet), tymczasowo zostają "
-"ustawione jako aktywne okna obrazu. Wtedy większość menedżerów okien "
-"zachowuje okna doku, ponad oknem obrazu. Niestety mogą także pojawić się "
-"inne efekty."
+msgid "When enabled, dock windows (the toolbox and palettes) are set to be transient to the active image window. Most window managers will keep the dock windows above the image window then, but it may also have other effects."
+msgstr "Kiedy jest włączona, okna doku (przybornika i palet), tymczasowo zostają ustawione jako aktywne okna obrazu. Wtedy większość menedżerów okien zachowuje okna doku, ponad oknem obrazu. Niestety mogą także pojawić się inne efekty."
 
 #: ../app/config/gimprc-blurbs.h:355
-msgid ""
-"When enabled, you can change keyboard shortcuts for menu items by hitting a "
-"key combination while the menu item is highlighted."
-msgstr ""
-"Umożliwia modyfikowanie skrótów klawiszowych związanych z pozycjami menu, "
-"poprzez przyciśnięcie wybranej kombinacji klawiszy, kiedy dana pozycja jest "
-"aktywna."
+msgid "When enabled, you can change keyboard shortcuts for menu items by hitting a key combination while the menu item is highlighted."
+msgstr "Umożliwia modyfikowanie skrótów klawiszowych związanych z pozycjami menu, poprzez przyciśnięcie wybranej kombinacji klawiszy, kiedy dana pozycja jest aktywna."
 
 #: ../app/config/gimprc-blurbs.h:359
 msgid "Save changed keyboard shortcuts when GIMP exits."
-msgstr ""
-"Powoduje zapisywanie skrótów klawiszowych przed zakończeniem działania "
-"programu GIMP."
+msgstr "Powoduje zapisywanie skrótów klawiszowych przed zakończeniem działania programu GIMP."
 
 #: ../app/config/gimprc-blurbs.h:362
 msgid "Restore saved keyboard shortcuts on each GIMP startup."
-msgstr ""
-"Powoduje przywracanie zapisanych skrótów klawiszowych przy uruchamianiu "
-"programu GIMP."
+msgstr "Powoduje przywracanie zapisanych skrótów klawiszowych przy uruchamianiu programu GIMP."
 
 #: ../app/config/gimprc-blurbs.h:365
-msgid ""
-"Sets the folder for temporary storage. Files will appear here during the "
-"course of running GIMP.  Most files will disappear when GIMP exits, but some "
-"files are likely to remain, so it is best if this folder not be one that is "
-"shared by other users."
-msgstr ""
-"Ustawia katalog przeznaczony na tymczasowe przechowywanie danych. Będą się w "
-"nim pojawiały pliki tworzone w czasie działania programu GIMP. Większość z "
-"plików zostanie usunięta przy zakończeniu działania programu, jednak "
-"istnieje możliwość, że część plików pozostanie, więc zaleca się, aby katalog "
-"ten nie był współdzielony z innymi użytkownikami."
+msgid "Sets the folder for temporary storage. Files will appear here during the course of running GIMP.  Most files will disappear when GIMP exits, but some files are likely to remain, so it is best if this folder not be one that is shared by other users."
+msgstr "Ustawia katalog przeznaczony na tymczasowe przechowywanie danych. Będą się w nim pojawiały pliki tworzone w czasie działania programu GIMP. Większość z plików zostanie usunięta przy zakończeniu działania programu, jednak istnieje możliwość, że część plików pozostanie, więc zaleca się, aby katalog ten nie był współdzielony z innymi użytkownikami."
 
 #: ../app/config/gimprc-blurbs.h:377
 msgid "Sets the size of the thumbnail shown in the Open dialog."
 msgstr "Ustawia rozmiar miniaturek w oknie wyboru pliku."
 
 #: ../app/config/gimprc-blurbs.h:380
-msgid ""
-"The thumbnail in the Open dialog will be automatically updated if the file "
-"being previewed is smaller than the size set here."
-msgstr ""
-"W przypadku, gdy rozmiar obrazu przeglądanego w oknie otwarcia obrazu będzie "
-"mniejszy od podanej tutaj wartości, nastąpi automatyczne zaktualizowanie "
-"jego miniaturki."
+msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here."
+msgstr "W przypadku, gdy rozmiar obrazu przeglądanego w oknie otwarcia obrazu będzie mniejszy od podanej tutaj wartości, nastąpi automatyczne zaktualizowanie jego miniaturki."
 
 #: ../app/config/gimprc-blurbs.h:384
-msgid ""
-"When the amount of pixel data exceeds this limit, GIMP will start to swap "
-"tiles to disk.  This is a lot slower but it makes it possible to work on "
-"images that wouldn't fit into memory otherwise.  If you have a lot of RAM, "
-"you may want to set this to a higher value."
-msgstr ""
-"Kiedy ilość danych pikseli przekroczy ten limit, GIMP uruchomi pamięć "
-"wymiany. Jest ona o wiele wolniejsza, lecz pozwala pracować na obrazach nie "
-"mieszczących się w pamięci. Jeżeli posiadasz dużą ilość pamięci RAM, zwiększ "
-"tę wartość."
+msgid "When the amount of pixel data exceeds this limit, GIMP will start to swap tiles to disk.  This is a lot slower but it makes it possible to work on images that wouldn't fit into memory otherwise.  If you have a lot of RAM, you may want to set this to a higher value."
+msgstr "Kiedy ilość danych pikseli przekroczy ten limit, GIMP uruchomi pamięć wymiany. Jest ona o wiele wolniejsza, lecz pozwala pracować na obrazach nie mieszczących się w pamięci. Jeżeli posiadasz dużą ilość pamięci RAM, zwiększ tę wartość."
 
 #: ../app/config/gimprc-blurbs.h:390
 msgid "Show the current foreground and background colors in the toolbox."
-msgstr ""
-"Wyświetla aktywny kolor pierwszoplanowy oraz tła z kolorem tła w przyborniku"
+msgstr "Wyświetla aktywny kolor pierwszoplanowy oraz tła z kolorem tła w przyborniku"
 
 #: ../app/config/gimprc-blurbs.h:393
 msgid "Show the currently selected brush, pattern and gradient in the toolbox."
@@ -5110,12 +4966,8 @@ msgid "Show the currently active image in the toolbox."
 msgstr "Wyświetla aktywny obraz w przyborniku."
 
 #: ../app/config/gimprc-blurbs.h:402
-msgid ""
-"The window type hint that is set on the toolbox. This may affect how your "
-"window manager decorates and handles the toolbox window."
-msgstr ""
-"Typ podpowiedzi powiązanej z oknem przybornika. Ustawienie to może wpłynąć "
-"na sposób, w jaki menedżer okien wyświetla okno przybornika."
+msgid "The window type hint that is set on the toolbox. This may affect how your window manager decorates and handles the toolbox window."
+msgstr "Typ podpowiedzi powiązanej z oknem przybornika. Ustawienie to może wpłynąć na sposób, w jaki menedżer okien wyświetla okno przybornika."
 
 #: ../app/config/gimprc-blurbs.h:406
 msgid "Sets the manner in which transparency is displayed in images."
@@ -5123,36 +4975,19 @@ msgstr "Ustala sposób prezentowania przezroczystości w obrazie."
 
 #: ../app/config/gimprc-blurbs.h:409
 msgid "Sets the size of the checkerboard used to display transparency."
-msgstr ""
-"Ustawia rozmiar szachownicy używanej dla zobrazowania przezroczystości."
+msgstr "Ustawia rozmiar szachownicy używanej dla zobrazowania przezroczystości."
 
 #: ../app/config/gimprc-blurbs.h:412
-msgid ""
-"When enabled, GIMP will not save an image if it has not been changed since "
-"it was opened."
-msgstr ""
-"Sprawia że GIMP nie zapisuje obrazu, dopóki nie zostanie zmieniony (odkąd "
-"zostanie otwarty)."
+msgid "When enabled, GIMP will not save an image if it has not been changed since it was opened."
+msgstr "Sprawia że GIMP nie zapisuje obrazu, dopóki nie zostanie zmieniony (odkąd zostanie otwarty)."
 
 #: ../app/config/gimprc-blurbs.h:416
-msgid ""
-"Sets the minimal number of operations that can be undone. More undo levels "
-"are kept available until the undo-size limit is reached."
-msgstr ""
-"Ustala minimalną liczbę operacji w programie, które można cofnąć. Możliwość "
-"cofnięcia większej liczby operacji istnieje do czasu osiągnięcia "
-"ograniczenia rozmiaru historii operacji."
+msgid "Sets the minimal number of operations that can be undone. More undo levels are kept available until the undo-size limit is reached."
+msgstr "Ustala minimalną liczbę operacji w programie, które można cofnąć. Możliwość cofnięcia większej liczby operacji istnieje do czasu osiągnięcia ograniczenia rozmiaru historii operacji."
 
 #: ../app/config/gimprc-blurbs.h:420
-msgid ""
-"Sets an upper limit to the memory that is used per image to keep operations "
-"on the undo stack. Regardless of this setting, at least as many undo-levels "
-"as configured can be undone."
-msgstr ""
-"Ustawia maksymalny rozmiar pamięci, jaki może zostać przydzielony każdemu z "
-"obrazów na historię operacji. Niezależnie od tego ustawienia program "
-"gwarantuje jednak możliwość cofnięcia przynajmniej takiej liczby operacji, "
-"jaką skonfigurowano jako minimalną."
+msgid "Sets an upper limit to the memory that is used per image to keep operations on the undo stack. Regardless of this setting, at least as many undo-levels as configured can be undone."
+msgstr "Ustawia maksymalny rozmiar pamięci, jaki może zostać przydzielony każdemu z obrazów na historię operacji. Niezależnie od tego ustawienia program gwarantuje jednak możliwość cofnięcia przynajmniej takiej liczby operacji, jaką skonfigurowano jako minimalną."
 
 #: ../app/config/gimprc-blurbs.h:425
 msgid "Sets the size of the previews in the Undo History."
@@ -5160,27 +4995,17 @@ msgstr "Ustawia rozmiar podglądów w historii operacji."
 
 #: ../app/config/gimprc-blurbs.h:428
 msgid "When enabled, pressing F1 will open the help browser."
-msgstr ""
-"Powoduje uruchomienie przeglądarki pomocy po przyciśnięciu klawisza F1."
+msgstr "Powoduje uruchomienie przeglądarki pomocy po przyciśnięciu klawisza F1."
 
 #: ../app/config/gimprc-blurbs.h:439
 #, c-format
-msgid ""
-"Sets the external web browser to be used.  This can be an absolute path or "
-"the name of an executable to search for in the user's PATH. If the command "
-"contains '%s' it will be replaced with the URL, else the URL will be "
-"appended to the command with a space separating the two."
-msgstr ""
-"Określa, jaki program ma być używany w roli zewnętrznej przeglądarki WWW. "
-"Jako wartość można podać ścieżkę bezwzględną programu lub nazwę programu "
-"znajdującego się na ścieżce przeszukiwań (PATH). Jeśli polecenie zawiera "
-"napis \"%s\", to przy uruchamianiu przeglądarki zostanie on zastąpiony "
-"adresem URL przeznaczonym do wyświetlenia. Jeśli polecenie nie zawiera tego "
-"napisu, wówczas adres URL zostanie dołączony (po poprzedzeniu go spacją) na "
-"końcu polecenia."
+msgid "Sets the external web browser to be used.  This can be an absolute path or the name of an executable to search for in the user's PATH. If the command contains '%s' it will be replaced with the URL, else the URL will be appended to the command with a space separating the two."
+msgstr "Określa, jaki program ma być używany w roli zewnętrznej przeglądarki WWW. Jako wartość można podać ścieżkę bezwzględną programu lub nazwę programu znajdującego się na ścieżce przeszukiwań (PATH). Jeśli polecenie zawiera napis \"%s\", to przy uruchamianiu przeglądarki zostanie on zastąpiony adresem URL przeznaczonym do wyświetlenia. Jeśli polecenie nie zawiera tego napisu, wówczas adres URL zostanie dołączony (po poprzedzeniu go spacją) na końcu polecenia."
 
-#: ../app/config/gimprc-deserialize.c:135 ../app/core/gimp-modules.c:134
-#: ../app/core/gimp-units.c:164 ../app/gui/session.c:206
+#: ../app/config/gimprc-deserialize.c:135
+#: ../app/core/gimp-modules.c:134
+#: ../app/core/gimp-units.c:164
+#: ../app/gui/session.c:206
 #: ../app/plug-in/plug-in-rc.c:213
 msgid "fatal parse error"
 msgstr "poważny błąd przy analizie składniowej"
@@ -5191,8 +5016,10 @@ msgid "value for token %s is not a valid UTF-8 string"
 msgstr "wartość tokenu %s nie jest poprawnym napisem UTF-8"
 
 #. no undo (or redo) steps available
-#: ../app/core/core-enums.c:53 ../app/core/core-enums.c:252
-#: ../app/core/core-enums.c:504 ../app/paint/paint-enums.c:81
+#: ../app/core/core-enums.c:53
+#: ../app/core/core-enums.c:252
+#: ../app/core/core-enums.c:504
+#: ../app/paint/paint-enums.c:81
 #: ../app/widgets/gimpimagepropview.c:416
 msgid "None"
 msgstr "Brak"
@@ -5229,7 +5056,8 @@ msgstr "Dowolna paleta"
 msgid "First item"
 msgstr "Pierwszy obiekt"
 
-#: ../app/core/core-enums.c:213 ../app/dialogs/dialogs.c:198
+#: ../app/core/core-enums.c:213
+#: ../app/dialogs/dialogs.c:198
 #: ../app/tools/tools-enums.c:210
 msgid "Selection"
 msgstr "Zaznaczenie"
@@ -5259,11 +5087,13 @@ msgid "White"
 msgstr "Białe"
 
 #. Transparency
-#: ../app/core/core-enums.c:250 ../app/dialogs/preferences-dialog.c:2305
+#: ../app/core/core-enums.c:250
+#: ../app/dialogs/preferences-dialog.c:2305
 msgid "Transparency"
 msgstr "Przezroczysta"
 
-#: ../app/core/core-enums.c:251 ../app/core/core-enums.c:308
+#: ../app/core/core-enums.c:251
+#: ../app/core/core-enums.c:308
 msgid "Pattern"
 msgstr "Deseń"
 
@@ -5283,7 +5113,8 @@ msgstr "Pełny kolor"
 msgid "Miter"
 msgstr "Zaostrzony"
 
-#: ../app/core/core-enums.c:337 ../app/core/core-enums.c:367
+#: ../app/core/core-enums.c:337
+#: ../app/core/core-enums.c:367
 msgid "Round"
 msgstr "Zaokrąglony"
 
@@ -5295,7 +5126,8 @@ msgstr "Ścięty skośnie"
 msgid "Butt"
 msgstr "Pniak"
 
-#: ../app/core/core-enums.c:368 ../app/core/core-enums.c:443
+#: ../app/core/core-enums.c:368
+#: ../app/core/core-enums.c:443
 msgid "Square"
 msgstr "Prostokątny"
 
@@ -5351,11 +5183,13 @@ msgstr "Kolisty"
 msgid "Diamond"
 msgstr "Rombowy"
 
-#: ../app/core/core-enums.c:472 ../app/dialogs/preferences-dialog.c:2337
+#: ../app/core/core-enums.c:472
+#: ../app/dialogs/preferences-dialog.c:2337
 msgid "Horizontal"
 msgstr "Poziomo"
 
-#: ../app/core/core-enums.c:473 ../app/dialogs/preferences-dialog.c:2339
+#: ../app/core/core-enums.c:473
+#: ../app/dialogs/preferences-dialog.c:2339
 msgid "Vertical"
 msgstr "Pionowo"
 
@@ -5475,37 +5309,46 @@ msgstr "Połączenie warstw"
 msgid "Merge paths"
 msgstr "Połączenie ścieżek"
 
-#: ../app/core/core-enums.c:861 ../app/core/core-enums.c:892
-#: ../app/core/gimpimage-grid.c:58 ../app/dialogs/grid-dialog.c:152
+#: ../app/core/core-enums.c:861
+#: ../app/core/core-enums.c:892
+#: ../app/core/gimpimage-grid.c:58
+#: ../app/dialogs/grid-dialog.c:152
 #: ../app/tools/tools-enums.c:241
 msgid "Grid"
 msgstr "Siatka"
 
-#: ../app/core/core-enums.c:862 ../app/core/core-enums.c:894
+#: ../app/core/core-enums.c:862
+#: ../app/core/core-enums.c:894
 msgid "Guide"
 msgstr "Prowadnica"
 
-#: ../app/core/core-enums.c:863 ../app/core/core-enums.c:895
+#: ../app/core/core-enums.c:863
+#: ../app/core/core-enums.c:895
 msgid "Sample Point"
 msgstr "Punkt wzorcowy"
 
-#: ../app/core/core-enums.c:864 ../app/core/core-enums.c:896
+#: ../app/core/core-enums.c:864
+#: ../app/core/core-enums.c:896
 msgid "Layer/Channel"
 msgstr "Warstwa/kanał"
 
-#: ../app/core/core-enums.c:865 ../app/core/core-enums.c:897
+#: ../app/core/core-enums.c:865
+#: ../app/core/core-enums.c:897
 msgid "Layer/Channel modification"
 msgstr "Warstwa/modyfikacja kanału"
 
-#: ../app/core/core-enums.c:866 ../app/core/core-enums.c:898
+#: ../app/core/core-enums.c:866
+#: ../app/core/core-enums.c:898
 msgid "Selection mask"
 msgstr "Maska zaznaczenia"
 
-#: ../app/core/core-enums.c:867 ../app/core/core-enums.c:901
+#: ../app/core/core-enums.c:867
+#: ../app/core/core-enums.c:901
 msgid "Item visibility"
 msgstr "Widoczność elementu"
 
-#: ../app/core/core-enums.c:868 ../app/core/core-enums.c:902
+#: ../app/core/core-enums.c:868
+#: ../app/core/core-enums.c:902
 msgid "Link/Unlink item"
 msgstr "Powiąż/usuń dowiązanie elementu"
 
@@ -5513,7 +5356,8 @@ msgstr "Powiąż/usuń dowiązanie elementu"
 msgid "Item properties"
 msgstr "Właściwości elementu"
 
-#: ../app/core/core-enums.c:870 ../app/core/core-enums.c:900
+#: ../app/core/core-enums.c:870
+#: ../app/core/core-enums.c:900
 msgid "Move item"
 msgstr "Przesunięcie elementu"
 
@@ -5529,15 +5373,18 @@ msgstr "Zmiana wymiarów elementu"
 msgid "Add layer"
 msgstr "Dodanie warstwy"
 
-#: ../app/core/core-enums.c:874 ../app/core/core-enums.c:911
+#: ../app/core/core-enums.c:874
+#: ../app/core/core-enums.c:911
 msgid "Add layer mask"
 msgstr "Dodanie maski warstwy"
 
-#: ../app/core/core-enums.c:875 ../app/core/core-enums.c:913
+#: ../app/core/core-enums.c:875
+#: ../app/core/core-enums.c:913
 msgid "Apply layer mask"
 msgstr "Zastosowanie maski warstwy"
 
-#: ../app/core/core-enums.c:876 ../app/core/core-enums.c:923
+#: ../app/core/core-enums.c:876
+#: ../app/core/core-enums.c:923
 msgid "Floating selection to layer"
 msgstr "Oderwane zaznaczenie na warstwę"
 
@@ -5556,34 +5403,41 @@ msgstr "Usunięcie oderwanego zaznaczenia"
 # FIXME
 # 1. app/core/core-enums.c:1 app/core/gimpedit.c:1: "Wklejenie"
 # 2. app/widgets/gimpbufferview.c: "Wklej"
-#: ../app/core/core-enums.c:880 ../app/core/gimp-edit.c:262
+#: ../app/core/core-enums.c:880
+#: ../app/core/gimp-edit.c:262
 msgid "Paste"
 msgstr "Wklej"
 
-#: ../app/core/core-enums.c:881 ../app/core/gimp-edit.c:557
+#: ../app/core/core-enums.c:881
+#: ../app/core/gimp-edit.c:557
 msgid "Cut"
 msgstr "Wycięcie"
 
-#: ../app/core/core-enums.c:882 ../app/tools/gimptexttool.c:160
+#: ../app/core/core-enums.c:882
+#: ../app/tools/gimptexttool.c:160
 #: ../app/widgets/widgets-enums.c:265
 msgid "Text"
 msgstr "Tekst"
 
-#: ../app/core/core-enums.c:883 ../app/core/core-enums.c:926
+#: ../app/core/core-enums.c:883
+#: ../app/core/core-enums.c:926
 #: ../app/core/gimpdrawable-transform.c:567
 msgid "Transform"
 msgstr "Przekształcenie"
 
-#: ../app/core/core-enums.c:884 ../app/core/core-enums.c:927
+#: ../app/core/core-enums.c:884
+#: ../app/core/core-enums.c:927
 #: ../app/paint/gimppaintcore.c:135
 msgid "Paint"
 msgstr "Rysowanie"
 
-#: ../app/core/core-enums.c:885 ../app/core/core-enums.c:930
+#: ../app/core/core-enums.c:885
+#: ../app/core/core-enums.c:930
 msgid "Attach parasite"
 msgstr "Dołączenie danych pasożytniczych"
 
-#: ../app/core/core-enums.c:886 ../app/core/core-enums.c:931
+#: ../app/core/core-enums.c:886
+#: ../app/core/core-enums.c:931
 msgid "Remove parasite"
 msgstr "Usunięcie danych pasożytniczych"
 
@@ -5591,7 +5445,8 @@ msgstr "Usunięcie danych pasożytniczych"
 msgid "Import paths"
 msgstr "Import ścieżek"
 
-#: ../app/core/core-enums.c:888 ../app/pdb/drawable-cmds.c:885
+#: ../app/core/core-enums.c:888
+#: ../app/pdb/drawable-cmds.c:885
 msgid "Plug-In"
 msgstr "Wtyczka"
 
@@ -5691,7 +5546,8 @@ msgstr "Zakotwiczenie oderwanego zaznaczenia"
 msgid "Relax floating selection"
 msgstr "Usunięcie oderwanego zaznaczenia"
 
-#: ../app/core/core-enums.c:928 ../app/paint/gimpink.c:95
+#: ../app/core/core-enums.c:928
+#: ../app/paint/gimpink.c:95
 #: ../app/tools/gimpinktool.c:55
 msgid "Ink"
 msgstr "Stalówka"
@@ -5734,14 +5590,17 @@ msgid "Convert to RGB workspace"
 msgstr "Konwertuj do obszaru roboczego RGB"
 
 # c-format
-#: ../app/core/gimp-contexts.c:155 ../app/core/gimptooloptions.c:231
-#: ../app/gui/session.c:307 ../app/menus/menus.c:433
+#: ../app/core/gimp-contexts.c:155
+#: ../app/core/gimptooloptions.c:231
+#: ../app/gui/session.c:307
+#: ../app/menus/menus.c:433
 #: ../app/widgets/gimpdevices.c:258
 #, c-format
 msgid "Deleting \"%s\" failed: %s"
 msgstr "Usunięcie \"%s\" nie powiodło się: %s"
 
-#: ../app/core/gimp-edit.c:190 ../app/core/gimp-edit.c:326
+#: ../app/core/gimp-edit.c:190
+#: ../app/core/gimp-edit.c:326
 msgid "Pasted Layer"
 msgstr "Wklejona warstwa"
 
@@ -5787,33 +5646,27 @@ msgstr "Kolor pierwszoplanowy na przezroczystość"
 
 #: ../app/core/gimp-user-install.c:153
 #, c-format
-msgid ""
-"It seems you have used GIMP %s before.  GIMP will now migrate your user "
-"settings to '%s'."
-msgstr ""
-"Prawdopodobnie używano wcześniej programu GIMP %s.  Rrozpocznie się teraz "
-"migracja ustawień użytkownika do wersji \"%s\"."
+msgid "It seems you have used GIMP %s before.  GIMP will now migrate your user settings to '%s'."
+msgstr "Prawdopodobnie używano wcześniej programu GIMP %s.  Rrozpocznie się teraz migracja ustawień użytkownika do wersji \"%s\"."
 
 #: ../app/core/gimp-user-install.c:158
 #, c-format
-msgid ""
-"It appears that you are using GIMP for the first time.  GIMP will now create "
-"a folder named '%s' and copy some files to it."
-msgstr ""
-"Prawdopodobnie uruchomiono program GIMP po raz pierwszy. Nastąpi teraz "
-"utworzenie katalogu \"%s\" i zostaną do niego skopiowane pliki."
+msgid "It appears that you are using GIMP for the first time.  GIMP will now create a folder named '%s' and copy some files to it."
+msgstr "Prawdopodobnie uruchomiono program GIMP po raz pierwszy. Nastąpi teraz utworzenie katalogu \"%s\" i zostaną do niego skopiowane pliki."
 
 #: ../app/core/gimp-user-install.c:309
 #, c-format
 msgid "Copying file '%s' from '%s'..."
 msgstr "Kopiowanie pliku \"%s\" z \"%s\"..."
 
-#: ../app/core/gimp-user-install.c:324 ../app/core/gimp-user-install.c:350
+#: ../app/core/gimp-user-install.c:324
+#: ../app/core/gimp-user-install.c:350
 #, c-format
 msgid "Creating folder '%s'..."
 msgstr "Tworzenie katalogu \"%s\"..."
 
-#: ../app/core/gimp-user-install.c:335 ../app/core/gimp-user-install.c:361
+#: ../app/core/gimp-user-install.c:335
+#: ../app/core/gimp-user-install.c:361
 #, c-format
 msgid "Cannot create folder '%s': %s"
 msgstr "Nie można utworzyć katalogu \"%s\": %s"
@@ -5842,7 +5695,8 @@ msgid "Fonts (this may take a while)"
 msgstr "Czcionki (może to zająć kilka minut)"
 
 #. initialize the module list
-#: ../app/core/gimp.c:863 ../app/dialogs/preferences-dialog.c:2766
+#: ../app/core/gimp.c:863
+#: ../app/dialogs/preferences-dialog.c:2766
 msgid "Modules"
 msgstr "Moduły"
 
@@ -5864,39 +5718,34 @@ msgstr "Błąd przy analizie składniowej pliku \"%s\" z pędzlami: Wysokość =
 #: ../app/core/gimpbrush-load.c:215
 #, c-format
 msgid "Fatal parse error in brush file '%s': Bytes = 0."
-msgstr ""
-"Błąd przy analizie składniowej pliku \"%s\" z pędzlami: Rozmiar pliku = 0 "
-"Bajtów"
+msgstr "Błąd przy analizie składniowej pliku \"%s\" z pędzlami: Rozmiar pliku = 0 Bajtów"
 
 #: ../app/core/gimpbrush-load.c:239
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown depth %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznana "
-"głębia %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznana głębia %d."
 
 #: ../app/core/gimpbrush-load.c:252
 #, c-format
 msgid "Fatal parse error in brush file '%s': Unknown version %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznana "
-"wersja %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznana wersja %d."
 
-#: ../app/core/gimpbrush-load.c:268 ../app/core/gimpbrush-load.c:388
+#: ../app/core/gimpbrush-load.c:268
+#: ../app/core/gimpbrush-load.c:388
 #: ../app/core/gimpbrush-load.c:720
 #, c-format
 msgid "Fatal parse error in brush file '%s': File appears truncated."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: plik wydaje "
-"się być obcięty."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: plik wydaje się być obcięty."
 
-#: ../app/core/gimpbrush-load.c:276 ../app/core/gimpbrushgenerated-load.c:128
+#: ../app/core/gimpbrush-load.c:276
+#: ../app/core/gimpbrushgenerated-load.c:128
 #: ../app/core/gimpbrushpipe-load.c:97
 #, c-format
 msgid "Invalid UTF-8 string in brush file '%s'."
 msgstr "Niepoprawny napis UTF-8 w pliku z pędzlami \"%s\"."
 
-#: ../app/core/gimpbrush-load.c:283 ../app/core/gimpitem.c:505
+#: ../app/core/gimpbrush-load.c:283
+#: ../app/core/gimpitem.c:505
 #: ../app/core/gimppattern-load.c:146
 #: ../app/dialogs/template-options-dialog.c:83
 #: ../app/tools/gimpvectortool.c:299
@@ -5909,48 +5758,33 @@ msgid ""
 "Fatal parse error in brush file '%s': Unsupported brush depth %d\n"
 "GIMP brushes must be GRAY or RGBA."
 msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: "
-"Nieobsługiwana głębia pędzla (%d).\n"
-"Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości albo w "
-"formacie RGBA."
+"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: Nieobsługiwana głębia pędzla (%d).\n"
+"Pędzle programu GIMP muszą być zapisane albo w odcieniach szarości albo w formacie RGBA."
 
 #: ../app/core/gimpbrush-load.c:448
 #, c-format
-msgid ""
-"Fatal parse error in brush file '%s': unable to decode abr format version %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nie można "
-"dekodować wersji formatu abr %d."
+msgid "Fatal parse error in brush file '%s': unable to decode abr format version %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nie można dekodować wersji formatu abr %d."
 
 #: ../app/core/gimpbrush-load.c:615
 #, c-format
 msgid "Fatal parse error in brush file '%s': Wide brushes are not supported."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: Duże pędzle "
-"nie są obsługiwane"
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: Duże pędzle nie są obsługiwane"
 
 #: ../app/core/gimpbrushgenerated-load.c:87
 #, c-format
 msgid "Fatal parse error in brush file '%s': Not a GIMP brush file."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: to nie jest "
-"plik z pędzlami programu GIMP."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: to nie jest plik z pędzlami programu GIMP."
 
 #: ../app/core/gimpbrushgenerated-load.c:104
 #, c-format
-msgid ""
-"Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
-msgstr ""
-"Błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznana wersja "
-"pliku z pędzlami programu GIMP, w linii %d."
+msgid "Fatal parse error in brush file '%s': Unknown GIMP brush version in line %d."
+msgstr "Błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznana wersja pliku z pędzlami programu GIMP, w linii %d."
 
 #: ../app/core/gimpbrushgenerated-load.c:150
 #, c-format
-msgid ""
-"Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznany "
-"kształt pędzla w linii %d."
+msgid "Fatal parse error in brush file '%s': Unknown GIMP brush shape in line %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: nieznany kształt pędzla w linii %d."
 
 #: ../app/core/gimpbrushgenerated-load.c:226
 #, c-format
@@ -5967,13 +5801,12 @@ msgstr "Plik jest obcięty w linii %d"
 msgid "Error while reading brush file '%s': %s"
 msgstr "Przy odczycie z pliku \"%s\" z pędzlami: %s"
 
-#: ../app/core/gimpbrushpipe-load.c:113 ../app/core/gimpbrushpipe-load.c:133
+#: ../app/core/gimpbrushpipe-load.c:113
+#: ../app/core/gimpbrushpipe-load.c:133
 #: ../app/core/gimpbrushpipe-load.c:223
 #, c-format
 msgid "Fatal parse error in brush file '%s': File is corrupt."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: plik jest "
-"uszkodzony."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z pędzlami: plik jest uszkodzony."
 
 #: ../app/core/gimpchannel-select.c:60
 msgctxt "command"
@@ -5999,7 +5832,8 @@ msgstr "Zaznaczenie z kanału alfa"
 msgid "%s Channel to Selection"
 msgstr "Kanał %s na zaznaczenie"
 
-#: ../app/core/gimpchannel-select.c:520 ../app/tools/gimpfuzzyselecttool.c:80
+#: ../app/core/gimpchannel-select.c:520
+#: ../app/tools/gimpfuzzyselecttool.c:80
 msgctxt "command"
 msgid "Fuzzy Select"
 msgstr "Zaznaczenie rozmyte"
@@ -6038,7 +5872,8 @@ msgstr "Odbicie kanału"
 msgid "Rotate Channel"
 msgstr "Obrót kanału"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:843
+#: ../app/core/gimpchannel.c:264
+#: ../app/core/gimpdrawable-transform.c:843
 msgid "Transform Channel"
 msgstr "Przekształcenie kanału"
 
@@ -6091,16 +5926,19 @@ msgstr "Ustawienie koloru kanału"
 msgid "Set Channel Opacity"
 msgstr "Ustawienie krycia kanału"
 
-#: ../app/core/gimpchannel.c:1747 ../app/core/gimpselection.c:520
+#: ../app/core/gimpchannel.c:1747
+#: ../app/core/gimpselection.c:520
 msgid "Selection Mask"
 msgstr "Maska zaznaczenia"
 
-#: ../app/core/gimpdata.c:526 ../app/core/gimptoolpresets.c:279
+#: ../app/core/gimpdata.c:526
+#: ../app/core/gimptoolpresets.c:279
 #, c-format
 msgid "Could not delete '%s': %s"
 msgstr "Nie można usunąć \"%s\": %s"
 
-#: ../app/core/gimpdatafactory.c:415 ../app/core/gimpdatafactory.c:575
+#: ../app/core/gimpdatafactory.c:415
+#: ../app/core/gimpdatafactory.c:575
 #: ../app/core/gimpdatafactory.c:595
 #, c-format
 msgid ""
@@ -6112,12 +5950,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdatafactory.c:494 ../app/core/gimpdatafactory.c:497
-#: ../app/core/gimpitem.c:312 ../app/core/gimpitem.c:315
+#: ../app/core/gimpdatafactory.c:494
+#: ../app/core/gimpdatafactory.c:497
+#: ../app/core/gimpitem.c:312
+#: ../app/core/gimpitem.c:315
 msgid "copy"
 msgstr "kopia"
 
-#: ../app/core/gimpdatafactory.c:506 ../app/core/gimpitem.c:324
+#: ../app/core/gimpdatafactory.c:506
+#: ../app/core/gimpitem.c:324
 #, c-format
 msgid "%s copy"
 msgstr "kopia: %s"
@@ -6137,7 +5978,8 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../app/core/gimpdrawable-blend.c:245 ../app/tools/gimpblendtool.c:107
+#: ../app/core/gimpdrawable-blend.c:245
+#: ../app/tools/gimpblendtool.c:107
 msgid "Blend"
 msgstr "Gradient"
 
@@ -6167,11 +6009,13 @@ msgid "Color Balance"
 msgstr "Balans kolorów"
 
 #: ../app/core/gimpdrawable-colorize.c:73
-#: ../app/core/gimpdrawable-colorize.c:85 ../app/tools/gimpcolorizetool.c:90
+#: ../app/core/gimpdrawable-colorize.c:85
+#: ../app/tools/gimpcolorizetool.c:90
 msgid "Colorize"
 msgstr "Barwienie"
 
-#: ../app/core/gimpdrawable-curves.c:165 ../app/core/gimpdrawable-curves.c:182
+#: ../app/core/gimpdrawable-curves.c:165
+#: ../app/core/gimpdrawable-curves.c:182
 #: ../app/tools/gimpcurvestool.c:140
 msgid "Curves"
 msgstr "Krzywe"
@@ -6199,11 +6043,13 @@ msgstr "Odcień i nasycenie"
 msgid "Hue_Saturation"
 msgstr "Odcień_nasycenie"
 
-#: ../app/core/gimpdrawable-invert.c:60 ../app/core/gimpdrawable-invert.c:68
+#: ../app/core/gimpdrawable-invert.c:60
+#: ../app/core/gimpdrawable-invert.c:68
 msgid "Invert"
 msgstr "Inwersja"
 
-#: ../app/core/gimpdrawable-levels.c:154 ../app/core/gimpdrawable-levels.c:170
+#: ../app/core/gimpdrawable-levels.c:154
+#: ../app/core/gimpdrawable-levels.c:170
 #: ../app/tools/gimplevelstool.c:150
 msgid "Levels"
 msgstr "Poziomy"
@@ -6213,7 +6059,8 @@ msgid "Offset Drawable"
 msgstr "Przesunięcie obszaru rysowania"
 
 #: ../app/core/gimpdrawable-posterize.c:70
-#: ../app/core/gimpdrawable-posterize.c:80 ../app/tools/gimpposterizetool.c:84
+#: ../app/core/gimpdrawable-posterize.c:80
+#: ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
 msgstr "Redukcja kolorów"
 
@@ -6222,21 +6069,25 @@ msgid "Render Stroke"
 msgstr "Narysowanie pociągnięcia"
 
 #: ../app/core/gimpdrawable-threshold.c:71
-#: ../app/core/gimpdrawable-threshold.c:82 ../app/tools/gimpthresholdtool.c:90
+#: ../app/core/gimpdrawable-threshold.c:82
+#: ../app/tools/gimpthresholdtool.c:90
 msgid "Threshold"
 msgstr "Progowanie"
 
-#: ../app/core/gimpdrawable-transform.c:629 ../app/tools/gimpfliptool.c:116
+#: ../app/core/gimpdrawable-transform.c:629
+#: ../app/tools/gimpfliptool.c:116
 msgctxt "command"
 msgid "Flip"
 msgstr "Odbicie"
 
-#: ../app/core/gimpdrawable-transform.c:716 ../app/tools/gimprotatetool.c:121
+#: ../app/core/gimpdrawable-transform.c:716
+#: ../app/tools/gimprotatetool.c:121
 msgctxt "command"
 msgid "Rotate"
 msgstr "Obrót"
 
-#: ../app/core/gimpdrawable-transform.c:841 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:841
+#: ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "Przekształcenie warstwy"
 
@@ -6244,20 +6095,18 @@ msgstr "Przekształcenie warstwy"
 msgid "Transformation"
 msgstr "Przekształcenie"
 
-#: ../app/core/gimpgradient-load.c:71 ../app/core/gimpgradient-load.c:96
-#: ../app/core/gimpgradient-load.c:117 ../app/core/gimpgradient-load.c:168
+#: ../app/core/gimpgradient-load.c:71
+#: ../app/core/gimpgradient-load.c:96
+#: ../app/core/gimpgradient-load.c:117
+#: ../app/core/gimpgradient-load.c:168
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Read error in line %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: błąd przy "
-"odczycie wiersza %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: błąd przy odczycie wiersza %d."
 
 #: ../app/core/gimpgradient-load.c:81
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Not a GIMP gradient file."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: to nie "
-"jest plik z gradientem programu GIMP."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: to nie jest plik z gradientem programu GIMP."
 
 #: ../app/core/gimpgradient-load.c:109
 #, c-format
@@ -6267,23 +6116,19 @@ msgstr "Niepoprawny napis UTF-8 w pliku \"%s\" z gradientem."
 #: ../app/core/gimpgradient-load.c:136
 #, c-format
 msgid "Fatal parse error in gradient file '%s': File is corrupt in line %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: plik jest "
-"uszkodzony w linii %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: plik jest uszkodzony w linii %d."
 
-#: ../app/core/gimpgradient-load.c:218 ../app/core/gimpgradient-load.c:229
+#: ../app/core/gimpgradient-load.c:218
+#: ../app/core/gimpgradient-load.c:229
 #, c-format
 msgid "Fatal parse error in gradient file '%s': Corrupt segment %d in line %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: Uszkodzony "
-"segment %d w linii %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z gradientem: Uszkodzony segment %d w linii %d."
 
-#: ../app/core/gimpgradient-load.c:241 ../app/core/gimpgradient-load.c:255
+#: ../app/core/gimpgradient-load.c:241
+#: ../app/core/gimpgradient-load.c:255
 #, c-format
 msgid "Gradient file '%s' is corrupt: Segments do not span the range 0-1."
-msgstr ""
-"Plik '\"%s\" z gradientem jest nieprawidłowy: Segmenty nie zawierają się w "
-"przedziale 0-1."
+msgstr "Plik '\"%s\" z gradientem jest nieprawidłowy: Segmenty nie zawierają się w przedziale 0-1."
 
 #: ../app/core/gimpgradient-load.c:334
 #, c-format
@@ -6304,11 +6149,8 @@ msgid "The foreground color of the grid."
 msgstr "Kolor pierwszoplanowy siatki."
 
 #: ../app/core/gimpgrid.c:95
-msgid ""
-"The background color of the grid; only used in double dashed line style."
-msgstr ""
-"Kolor tła siatki, używany tylko przy wyświetlaniu linii podwójnie "
-"kreskowanej."
+msgid "The background color of the grid; only used in double dashed line style."
+msgstr "Kolor tła siatki, używany tylko przy wyświetlaniu linii podwójnie kreskowanej."
 
 #: ../app/core/gimpgrid.c:101
 msgid "Horizontal spacing of grid lines."
@@ -6319,8 +6161,7 @@ msgid "Vertical spacing of grid lines."
 msgstr "Pionowe odstępy pomiędzy liniami siatki."
 
 #: ../app/core/gimpgrid.c:115
-msgid ""
-"Horizontal offset of the first grid line; this may be a negative number."
+msgid "Horizontal offset of the first grid line; this may be a negative number."
 msgstr "Poziome przesunięcie pierwszej linii siatki; może być liczbą ujemną."
 
 #: ../app/core/gimpgrid.c:122
@@ -6373,7 +6214,8 @@ msgctxt "command"
 msgid "Crop Image"
 msgstr "Kadrowanie obrazu"
 
-#: ../app/core/gimpimage-crop.c:133 ../app/core/gimpimage-resize.c:90
+#: ../app/core/gimpimage-crop.c:133
+#: ../app/core/gimpimage-resize.c:90
 msgid "Resize Image"
 msgstr "Zmiana wymiarów obrazu"
 
@@ -6385,7 +6227,8 @@ msgstr "Dodanie prowadnicy poziomej"
 msgid "Add Vertical Guide"
 msgstr "Dodanie prowadnicy pionowej"
 
-#: ../app/core/gimpimage-guides.c:115 ../app/tools/gimpmovetool.c:564
+#: ../app/core/gimpimage-guides.c:115
+#: ../app/tools/gimpmovetool.c:564
 msgid "Remove Guide"
 msgstr "Usunięcie prowadnicy"
 
@@ -6410,7 +6253,8 @@ msgstr "Obraca obiekty"
 msgid "Transform Items"
 msgstr "Przekształca obiektów"
 
-#: ../app/core/gimpimage-merge.c:102 ../app/core/gimpimage-merge.c:114
+#: ../app/core/gimpimage-merge.c:102
+#: ../app/core/gimpimage-merge.c:114
 msgid "Merge Visible Layers"
 msgstr "Połączenie widocznych warstw"
 
@@ -6429,9 +6273,7 @@ msgstr "Połącz widoczne ścieżki"
 #: ../app/core/gimpimage-merge.c:289
 #, c-format
 msgid "Not enough visible paths for a merge. There must be at least two."
-msgstr ""
-"Niewystarczająca ilość widocznych ścieżek do połączenia. Potrzebne są "
-"przynajmniej dwie."
+msgstr "Niewystarczająca ilość widocznych ścieżek do połączenia. Potrzebne są przynajmniej dwie."
 
 #: ../app/core/gimpimage-quick-mask.c:82
 msgid "Enable Quick Mask"
@@ -6445,7 +6287,8 @@ msgstr "Wyłączenie szybkiej maski"
 msgid "Add Sample Point"
 msgstr "Dodaj punkt wzorcowy"
 
-#: ../app/core/gimpimage-sample-points.c:98 ../app/tools/gimpcolortool.c:429
+#: ../app/core/gimpimage-sample-points.c:98
+#: ../app/tools/gimpcolortool.c:429
 msgid "Remove Sample Point"
 msgstr "Usuń punkt wzorcowy"
 
@@ -6478,7 +6321,8 @@ msgstr "Usunięcie z obrazu danych pasożytniczych"
 msgid "Add Layer"
 msgstr "Dodanie warstwy"
 
-#: ../app/core/gimpimage.c:2935 ../app/core/gimpimage.c:2948
+#: ../app/core/gimpimage.c:2935
+#: ../app/core/gimpimage.c:2948
 msgid "Remove Layer"
 msgstr "Usunięcie warstwy"
 
@@ -6522,7 +6366,8 @@ msgstr "Obniżenie warstwy na dno"
 msgid "Add Channel"
 msgstr "Dodanie kanału"
 
-#: ../app/core/gimpimage.c:3252 ../app/core/gimpimage.c:3263
+#: ../app/core/gimpimage.c:3252
+#: ../app/core/gimpimage.c:3263
 msgid "Remove Channel"
 msgstr "Usunięcie kanału"
 
@@ -6582,7 +6427,8 @@ msgstr "Obniżenie ścieżki"
 msgid "Lower Path to Bottom"
 msgstr "Obniżenie ścieżki na dno"
 
-#: ../app/core/gimpimagefile.c:528 ../app/dialogs/preferences-dialog.c:1721
+#: ../app/core/gimpimagefile.c:528
+#: ../app/dialogs/preferences-dialog.c:1721
 msgid "Folder"
 msgstr "Katalog"
 
@@ -6615,8 +6461,10 @@ msgid "(Preview may be out of date)"
 msgstr "(Podgląd może być nieaktualny)"
 
 #. pixel size
-#: ../app/core/gimpimagefile.c:605 ../app/widgets/gimpimagepropview.c:446
-#: ../app/widgets/gimpsizebox.c:438 ../app/widgets/gimptemplateeditor.c:566
+#: ../app/core/gimpimagefile.c:605
+#: ../app/widgets/gimpimagepropview.c:446
+#: ../app/widgets/gimpsizebox.c:438
+#: ../app/widgets/gimptemplateeditor.c:566
 #, c-format
 msgid "%d × %d pixel"
 msgid_plural "%d × %d pixels"
@@ -6624,7 +6472,8 @@ msgstr[0] "%d x %d piksel"
 msgstr[1] "%d x %d piksele"
 msgstr[2] "%d x %d pikseli"
 
-#: ../app/core/gimpimagefile.c:628 ../app/display/gimpdisplayshell-title.c:325
+#: ../app/core/gimpimagefile.c:628
+#: ../app/display/gimpdisplayshell-title.c:325
 #, c-format
 msgid "%d layer"
 msgid_plural "%d layers"
@@ -6645,7 +6494,8 @@ msgstr "Dołączenie danych pasożytniczych"
 msgid "Attach Parasite to Item"
 msgstr "Dołączenie do elementu danych pasożytniczych"
 
-#: ../app/core/gimpitem.c:1190 ../app/core/gimpitem.c:1197
+#: ../app/core/gimpitem.c:1190
+#: ../app/core/gimpitem.c:1197
 msgid "Remove Parasite from Item"
 msgstr "Usunięcie z elementu danych pasożytniczych"
 
@@ -6657,20 +6507,18 @@ msgstr "Usunięcie oderwanego zaznaczenia"
 msgid "Anchor Floating Selection"
 msgstr "Zakotwiczenie oderwanego zaznaczenia"
 
-#: ../app/core/gimplayer-floating-sel.c:205 ../app/core/gimplayer.c:643
+#: ../app/core/gimplayer-floating-sel.c:205
+#: ../app/core/gimplayer.c:643
 #, c-format
-msgid ""
-"Cannot create a new layer from the floating selection because it belongs to "
-"a layer mask or channel."
-msgstr ""
-"Nie można utworzyć nowej warstwy z oderwanego zaznaczenia, ponieważ należy "
-"ono do maski warstwy lub kanału."
+msgid "Cannot create a new layer from the floating selection because it belongs to a layer mask or channel."
+msgstr "Nie można utworzyć nowej warstwy z oderwanego zaznaczenia, ponieważ należy ono do maski warstwy lub kanału."
 
 #: ../app/core/gimplayer-floating-sel.c:211
 msgid "Floating Selection to Layer"
 msgstr "Oderwane zaznaczenie na warstwę"
 
-#: ../app/core/gimplayer.c:248 ../app/tools/tools-enums.c:209
+#: ../app/core/gimplayer.c:248
+#: ../app/tools/tools-enums.c:209
 msgid "Layer"
 msgstr "Warstwa"
 
@@ -6678,7 +6526,8 @@ msgstr "Warstwa"
 msgid "Rename Layer"
 msgstr "Zmiana nazwy warstwy"
 
-#: ../app/core/gimplayer.c:250 ../app/pdb/layer-cmds.c:434
+#: ../app/core/gimplayer.c:250
+#: ../app/pdb/layer-cmds.c:434
 #: ../app/pdb/layer-cmds.c:470
 msgid "Move Layer"
 msgstr "Przesunięcie warstwy"
@@ -6695,7 +6544,8 @@ msgstr "Odbicie warstwy"
 msgid "Rotate Layer"
 msgstr "Obrót warstwy"
 
-#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1329
+#: ../app/core/gimplayer.c:405
+#: ../app/core/gimplayer.c:1329
 #: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
@@ -6724,7 +6574,8 @@ msgstr "Nie można dodać maski warstwy o wymiarach różnych od wymiarów warst
 msgid "Transfer Alpha to Mask"
 msgstr "Przeniesienie kanału alfa na maskę"
 
-#: ../app/core/gimplayer.c:1556 ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:1556
+#: ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "Zastosowanie maski warstwy"
 
@@ -6768,21 +6619,19 @@ msgstr "Indeks %d"
 msgid "Unknown type of palette file: %s"
 msgstr "Nieznany typ pliku palety: %s"
 
-#: ../app/core/gimppalette-load.c:85 ../app/core/gimppalette-load.c:110
-#: ../app/core/gimppalette-load.c:131 ../app/core/gimppalette-load.c:160
+#: ../app/core/gimppalette-load.c:85
+#: ../app/core/gimppalette-load.c:110
+#: ../app/core/gimppalette-load.c:131
+#: ../app/core/gimppalette-load.c:160
 #: ../app/core/gimppalette-load.c:236
 #, c-format
 msgid "Fatal parse error in palette file '%s': Read error in line %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z paletą: błąd przy "
-"odczycie wiersza %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z paletą: błąd przy odczycie wiersza %d."
 
 #: ../app/core/gimppalette-load.c:95
 #, c-format
 msgid "Fatal parse error in palette file '%s': Missing magic header."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z paletą: brak nagłówka "
-"identyfikacyjnego."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z paletą: brak nagłówka identyfikacyjnego."
 
 #: ../app/core/gimppalette-load.c:123
 #, c-format
@@ -6791,56 +6640,40 @@ msgstr "Niepoprawny napis UTF-8 w pliku z paletą \"%s\"."
 
 #: ../app/core/gimppalette-load.c:147
 #, c-format
-msgid ""
-"Reading palette file '%s': Invalid number of columns in line %d. Using "
-"default value."
-msgstr ""
-"Odczytywanie pliku \"%s\" z paletą: niepoprawna ilość kolumn w wierszu %d, "
-"użyto wartości domyślnej."
+msgid "Reading palette file '%s': Invalid number of columns in line %d. Using default value."
+msgstr "Odczytywanie pliku \"%s\" z paletą: niepoprawna ilość kolumn w wierszu %d, użyto wartości domyślnej."
 
 #: ../app/core/gimppalette-load.c:183
 #, c-format
 msgid "Reading palette file '%s': Missing RED component in line %d."
-msgstr ""
-"Odczytywanie pliku \"%s\" z paletą: brak czerwonej (RED) składowej w wierszu "
-"%d."
+msgstr "Odczytywanie pliku \"%s\" z paletą: brak czerwonej (RED) składowej w wierszu %d."
 
 #: ../app/core/gimppalette-load.c:191
 #, c-format
 msgid "Reading palette file '%s': Missing GREEN component in line %d."
-msgstr ""
-"Odczytywanie pliku \"%s\" z paletą: brak zielonej (GREEN) składowej w "
-"wierszu %d."
+msgstr "Odczytywanie pliku \"%s\" z paletą: brak zielonej (GREEN) składowej w wierszu %d."
 
 #: ../app/core/gimppalette-load.c:199
 #, c-format
 msgid "Reading palette file '%s': Missing BLUE component in line %d."
-msgstr ""
-"Odczytywanie pliku \"%s\" z paletą: brak niebieskiej (BLUE) składowej w "
-"wierszu %d."
+msgstr "Odczytywanie pliku \"%s\" z paletą: brak niebieskiej (BLUE) składowej w wierszu %d."
 
 #: ../app/core/gimppalette-load.c:209
 #, c-format
 msgid "Reading palette file '%s': RGB value out of range in line %d."
-msgstr ""
-"Odczytywanie pliku \"%s\" z paletą: wartość RGB w wierszu %d jest poza "
-"zakresem."
+msgstr "Odczytywanie pliku \"%s\" z paletą: wartość RGB w wierszu %d jest poza zakresem."
 
-#: ../app/core/gimppattern-load.c:85 ../app/core/gimppattern-load.c:131
+#: ../app/core/gimppattern-load.c:85
+#: ../app/core/gimppattern-load.c:131
 #: ../app/core/gimppattern-load.c:162
 #, c-format
 msgid "Fatal parse error in pattern file '%s': File appears truncated."
-msgstr ""
-"Błąd przy analizie składniowej pliku \"%s\" z deseniami: Plik jest "
-"prawdopodobnie ucięty."
+msgstr "Błąd przy analizie składniowej pliku \"%s\" z deseniami: Plik jest prawdopodobnie ucięty."
 
 #: ../app/core/gimppattern-load.c:104
 #, c-format
-msgid ""
-"Fatal parse error in pattern file '%s': Unknown pattern format version %d."
-msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z deseniami: nieznana "
-"wersja formatu desenia (%d)."
+msgid "Fatal parse error in pattern file '%s': Unknown pattern format version %d."
+msgstr "Poważny błąd przy analizie składniowej pliku \"%s\" z deseniami: nieznana wersja formatu desenia (%d)."
 
 #: ../app/core/gimppattern-load.c:114
 #, c-format
@@ -6848,28 +6681,27 @@ msgid ""
 "Fatal parse error in pattern file '%s: Unsupported pattern depth %d.\n"
 "GIMP Patterns must be GRAY or RGB."
 msgstr ""
-"Poważny błąd przy analizie składniowej pliku \"%s\" z deseniami: "
-"nieobsługiwana głębia desenia (%d).\n"
-"Desenie programu GIMP muszą być zapisane albo w odcieniach szarości albo w "
-"formacie RGB."
+"Poważny błąd przy analizie składniowej pliku \"%s\" z deseniami: nieobsługiwana głębia desenia (%d).\n"
+"Desenie programu GIMP muszą być zapisane albo w odcieniach szarości albo w formacie RGB."
 
 #: ../app/core/gimppattern-load.c:139
 #, c-format
 msgid "Invalid UTF-8 string in pattern file '%s'."
 msgstr "Niepoprawny napis UTF-8 w pliku z deseniami \"%s\"."
 
-#: ../app/core/gimppdbprogress.c:288 ../app/widgets/gimppdbdialog.c:352
+#: ../app/core/gimppdbprogress.c:288
+#: ../app/widgets/gimppdbdialog.c:352
 #, c-format
 msgid "Unable to run %s callback. The corresponding plug-in may have crashed."
-msgstr ""
-"Nie można wywołać funkcji typu %s. Być może przestała działać odpowiadająca "
-"jej wtyczka."
+msgstr "Nie można wywołać funkcji typu %s. Być może przestała działać odpowiadająca jej wtyczka."
 
-#: ../app/core/gimpprogress.c:107 ../app/core/gimpprogress.c:154
+#: ../app/core/gimpprogress.c:107
+#: ../app/core/gimpprogress.c:154
 msgid "Please wait"
 msgstr "Proszę czekać"
 
-#: ../app/core/gimpselection.c:150 ../app/tools/gimpeditselectiontool.c:242
+#: ../app/core/gimpselection.c:150
+#: ../app/tools/gimpeditselectiontool.c:242
 msgid "Move Selection"
 msgstr "Przesunięcie zaznaczenia"
 
@@ -6914,16 +6746,12 @@ msgstr "Oderwana warstwa"
 
 #: ../app/core/gimpstrokeoptions.c:119
 #, fuzzy
-msgid ""
-"Convert a mitered join to a bevelled join if the miter would extend to a "
-"distance of more than miter-limit * line-width from the actual join point."
+msgid "Convert a mitered join to a bevelled join if the miter would extend to a distance of more than miter-limit * line-width from the actual join point."
 msgstr "Konwertuje połączenie narożnikowe na Kontrast punkt."
 
 #: ../app/core/gimptemplate.c:106
 msgid "The unit used for coordinate display when not in dot-for-dot mode."
-msgstr ""
-"Jednostka używana przy wyświetlaniu współrzędnych na obrazie, jeśli nie jest "
-"ustawiony tryb \"punkt do punktu\"."
+msgstr "Jednostka używana przy wyświetlaniu współrzędnych na obrazie, jeśli nie jest ustawiony tryb \"punkt do punktu\"."
 
 #: ../app/core/gimptemplate.c:113
 msgid "The horizontal image resolution."
@@ -6933,7 +6761,8 @@ msgstr "Pozioma rozdzielczość obrazu."
 msgid "The vertical image resolution."
 msgstr "Pionowa rozdzielczość obrazu."
 
-#: ../app/core/gimptemplate.c:405 ../app/widgets/widgets-enums.c:24
+#: ../app/core/gimptemplate.c:405
+#: ../app/widgets/widgets-enums.c:24
 msgid "Background"
 msgstr "Tło"
 
@@ -6942,9 +6771,12 @@ msgstr "Tło"
 msgid "pixel"
 msgstr "piksel"
 
-#: ../app/core/gimpunit.c:56 ../app/tools/gimpmeasuretool.c:874
-#: ../app/tools/gimpmeasuretool.c:1017 ../app/tools/gimpmeasuretool.c:1073
-#: ../app/tools/gimpmeasuretool.c:1101 ../app/tools/gimppainttool.c:615
+#: ../app/core/gimpunit.c:56
+#: ../app/tools/gimpmeasuretool.c:874
+#: ../app/tools/gimpmeasuretool.c:1017
+#: ../app/tools/gimpmeasuretool.c:1073
+#: ../app/tools/gimpmeasuretool.c:1101
+#: ../app/tools/gimppainttool.c:615
 msgid "pixels"
 msgstr "piksele"
 
@@ -7038,7 +6870,8 @@ msgid "_Remove unused colors from colormap"
 msgstr "_Usuń nieużywane kolory z palety kolorów"
 
 #. dithering
-#: ../app/dialogs/convert-dialog.c:232 ../app/tools/gimpblendoptions.c:247
+#: ../app/dialogs/convert-dialog.c:232
+#: ../app/tools/gimpblendoptions.c:247
 msgid "Dithering"
 msgstr "Dithering"
 
@@ -7054,12 +6887,14 @@ msgstr "D_ithering przezroczystości"
 msgid "Converting to indexed colors"
 msgstr "Konwertowanie na kolory indeksowane"
 
-#: ../app/dialogs/convert-dialog.c:414 ../app/pdb/convert-cmds.c:150
+#: ../app/dialogs/convert-dialog.c:414
+#: ../app/pdb/convert-cmds.c:150
 #, c-format
 msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "Nie można dokonać konwersji na paletę z więcej niż 256 kolorami."
 
-#: ../app/dialogs/dialogs-constructors.c:184 ../app/gui/gui.c:158
+#: ../app/dialogs/dialogs-constructors.c:184
+#: ../app/gui/gui.c:158
 #: ../app/gui/gui-message.c:148
 msgid "GIMP Message"
 msgstr "Komunikat programu GIMP"
@@ -7149,23 +6984,14 @@ msgstr "Otwarcie położenia"
 msgid "Enter location (URI):"
 msgstr "Wprowadź położenie (URI):"
 
-#: ../app/dialogs/file-save-dialog.c:302 ../app/dialogs/file-save-dialog.c:338
-msgid ""
-"The given filename does not have any known file extension. Please enter a "
-"known file extension or select a file format from the file format list."
-msgstr ""
-"Podany plik nie ma żadnego znanego rozszerzenia. Wpisz lub wybierz "
-"rozszerzenie z listy."
+#: ../app/dialogs/file-save-dialog.c:302
+#: ../app/dialogs/file-save-dialog.c:338
+msgid "The given filename does not have any known file extension. Please enter a known file extension or select a file format from the file format list."
+msgstr "Podany plik nie ma żadnego znanego rozszerzenia. Wpisz lub wybierz rozszerzenie z listy."
 
 #: ../app/dialogs/file-save-dialog.c:371
-msgid ""
-"Saving remote files needs to determine the file format from the file "
-"extension. Please enter a file extension that matches the selected file "
-"format or enter no file extension at all."
-msgstr ""
-"Aby zapisać do zdalnych plików, potrzebne jest ustalenie formatu pliku, na "
-"podstawie jego rozszerzenia. Wpisz rozszerzenie pliku, które pasuje do "
-"podanego pliku, lub nie wpisuj rozszerzenia."
+msgid "Saving remote files needs to determine the file format from the file extension. Please enter a file extension that matches the selected file format or enter no file extension at all."
+msgstr "Aby zapisać do zdalnych plików, potrzebne jest ustalenie formatu pliku, na podstawie jego rozszerzenia. Wpisz rozszerzenie pliku, które pasuje do podanego pliku, lub nie wpisuj rozszerzenia."
 
 #: ../app/dialogs/file-save-dialog.c:428
 msgid "Extension Mismatch"
@@ -7240,12 +7066,8 @@ msgstr "Wystąpiła próba utworzenia obrazu o rozmiarze %s."
 
 #: ../app/dialogs/image-new-dialog.c:324
 #, c-format
-msgid ""
-"An image of the chosen size will use more memory than what is configured as "
-"\"Maximum Image Size\" in the Preferences dialog (currently %s)."
-msgstr ""
-"Wybrany rozmiar obrazu wymaga pamięci przekraczającej wartość ustaloną w "
-"oknie Preferencje jako \"Maksymalny rozmiar obrazu\" (aktualnie: %s)."
+msgid "An image of the chosen size will use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
+msgstr "Wybrany rozmiar obrazu wymaga pamięci przekraczającej wartość ustaloną w oknie Preferencje jako \"Maksymalny rozmiar obrazu\" (aktualnie: %s)."
 
 #: ../app/dialogs/image-properties-dialog.c:60
 #: ../app/dialogs/image-properties-dialog.c:63
@@ -7275,21 +7097,12 @@ msgstr "Potwierdzenie skalowania"
 
 #: ../app/dialogs/image-scale-dialog.c:245
 #, c-format
-msgid ""
-"Scaling the image to the chosen size will make it use more memory than what "
-"is configured as \"Maximum Image Size\" in the Preferences dialog (currently "
-"%s)."
-msgstr ""
-"Przeskalowanie obrazu do wybranego rozmiaru wymaga ilości pamięci "
-"przekraczającej wartość ustaloną w oknie preferencji jako \"Maksymalny "
-"rozmiar obrazu\" (aktualnie: %s)."
+msgid "Scaling the image to the chosen size will make it use more memory than what is configured as \"Maximum Image Size\" in the Preferences dialog (currently %s)."
+msgstr "Przeskalowanie obrazu do wybranego rozmiaru wymaga ilości pamięci przekraczającej wartość ustaloną w oknie preferencji jako \"Maksymalny rozmiar obrazu\" (aktualnie: %s)."
 
 #: ../app/dialogs/image-scale-dialog.c:260
-msgid ""
-"Scaling the image to the chosen size will shrink some layers completely away."
-msgstr ""
-"Przeskalowanie obrazu do podanych wymiarów spowoduje przycięcie niektórych "
-"warstw."
+msgid "Scaling the image to the chosen size will shrink some layers completely away."
+msgstr "Przeskalowanie obrazu do podanych wymiarów spowoduje przycięcie niektórych warstw."
 
 #: ../app/dialogs/image-scale-dialog.c:264
 msgid "Is this what you want to do?"
@@ -7300,12 +7113,8 @@ msgid "Configure Keyboard Shortcuts"
 msgstr "Konfiguracja skrótów klawiszowych"
 
 #: ../app/dialogs/keyboard-shortcuts-dialog.c:73
-msgid ""
-"To edit a shortcut key, click on the corresponding row and type a new "
-"accelerator, or press backspace to clear."
-msgstr ""
-"Aby edytować klawisz skrótu, kliknij na odpowiedni rząd i wprowadź nowy "
-"akcelerator lub wyczyść pozycję naciskając Backspace."
+msgid "To edit a shortcut key, click on the corresponding row and type a new accelerator, or press backspace to clear."
+msgstr "Aby edytować klawisz skrótu, kliknij na odpowiedni rząd i wprowadź nowy akcelerator lub wyczyść pozycję naciskając Backspace."
 
 #: ../app/dialogs/keyboard-shortcuts-dialog.c:81
 msgid "S_ave keyboard shortcuts on exit"
@@ -7352,8 +7161,7 @@ msgstr "Menedżer modułów"
 
 #: ../app/dialogs/module-dialog.c:150
 msgid "You will have to restart GIMP for the changes to take effect."
-msgstr ""
-"Aby zastosować zmiany, konieczne jest ponowne uruchomienie programu GIMP."
+msgstr "Aby zastosować zmiany, konieczne jest ponowne uruchomienie programu GIMP."
 
 #: ../app/dialogs/module-dialog.c:191
 msgid "Module"
@@ -7400,8 +7208,10 @@ msgid "Offset Channel"
 msgstr "Przesunięcie kanału"
 
 #. The offset frame
-#: ../app/dialogs/offset-dialog.c:118 ../app/dialogs/offset-dialog.c:152
-#: ../app/dialogs/resize-dialog.c:197 ../app/widgets/gimpgrideditor.c:276
+#: ../app/dialogs/offset-dialog.c:118
+#: ../app/dialogs/offset-dialog.c:152
+#: ../app/dialogs/resize-dialog.c:197
+#: ../app/widgets/gimpgrideditor.c:276
 msgid "Offset"
 msgstr "Przesunięcie"
 
@@ -7410,11 +7220,13 @@ msgstr "Przesunięcie"
 msgid "_Offset"
 msgstr "_Przesunięcie"
 
-#: ../app/dialogs/offset-dialog.c:184 ../app/dialogs/resize-dialog.c:226
+#: ../app/dialogs/offset-dialog.c:184
+#: ../app/dialogs/resize-dialog.c:226
 msgid "_X:"
 msgstr "_X:"
 
-#: ../app/dialogs/offset-dialog.c:186 ../app/dialogs/resize-dialog.c:227
+#: ../app/dialogs/offset-dialog.c:186
+#: ../app/dialogs/resize-dialog.c:227
 msgid "_Y:"
 msgstr "_Y:"
 
@@ -7517,21 +7329,15 @@ msgstr "Czy na pewno przywrócić domyślne wartości  wszystkich preferencji?"
 
 #: ../app/dialogs/preferences-dialog.c:355
 msgid "You will have to restart GIMP for the following changes to take effect:"
-msgstr ""
-"Aby weszły w życie wymienione poniżej zmiany, będzie konieczne ponowne "
-"uruchomienie programu GIMP:"
+msgstr "Aby weszły w życie wymienione poniżej zmiany, będzie konieczne ponowne uruchomienie programu GIMP:"
 
 #: ../app/dialogs/preferences-dialog.c:494
 msgid "Configure Input Devices"
 msgstr "Konfiguruje urządzenia wejściowe"
 
 #: ../app/dialogs/preferences-dialog.c:571
-msgid ""
-"Your keyboard shortcuts will be reset to default values the next time you "
-"start GIMP."
-msgstr ""
-"Skróty klawiszowe zostaną ustawione na wartości domyślne przy następnym "
-"uruchomieniu programu GIMP."
+msgid "Your keyboard shortcuts will be reset to default values the next time you start GIMP."
+msgstr "Skróty klawiszowe zostaną ustawione na wartości domyślne przy następnym uruchomieniu programu GIMP."
 
 #: ../app/dialogs/preferences-dialog.c:582
 msgid "Remove all Keyboard Shortcuts"
@@ -7542,28 +7348,16 @@ msgid "Do you really want to remove all keyboard shortcuts from all menus?"
 msgstr "Czy na pewno usunąć wszystkie skróty klawiszowe z wszystkich menu?"
 
 #: ../app/dialogs/preferences-dialog.c:645
-msgid ""
-"Your window setup will be reset to default values the next time you start "
-"GIMP."
-msgstr ""
-"Ustawienia okien zostaną ustawione na wartości domyślne przy następnym "
-"uruchomieniu programu GIMP."
+msgid "Your window setup will be reset to default values the next time you start GIMP."
+msgstr "Ustawienia okien zostaną ustawione na wartości domyślne przy następnym uruchomieniu programu GIMP."
 
 #: ../app/dialogs/preferences-dialog.c:680
-msgid ""
-"Your input device settings will be reset to default values the next time you "
-"start GIMP."
-msgstr ""
-"Ustawienia urządzenia wejściowego zostaną ustawione na wartości domyślne "
-"przy następnym uruchomieniu programu GIMP."
+msgid "Your input device settings will be reset to default values the next time you start GIMP."
+msgstr "Ustawienia urządzenia wejściowego zostaną ustawione na wartości domyślne przy następnym uruchomieniu programu GIMP."
 
 #: ../app/dialogs/preferences-dialog.c:715
-msgid ""
-"Your tool options will be reset to default values the next time you start "
-"GIMP."
-msgstr ""
-"Ustawienia narzędzi zostaną ustawione na wartości domyślne przy następnym "
-"uruchomieniu programu GIMP."
+msgid "Your tool options will be reset to default values the next time you start GIMP."
+msgstr "Ustawienia narzędzi zostaną ustawione na wartości domyślne przy następnym uruchomieniu programu GIMP."
 
 #: ../app/dialogs/preferences-dialog.c:1283
 msgid "Show _menubar"
@@ -7834,7 +7628,8 @@ msgstr "Przesuwanie"
 msgid "Set layer or path as active"
 msgstr "Ustaw warstwę lub ścieżkę na aktywną"
 
-#: ../app/dialogs/preferences-dialog.c:1960 ../app/widgets/gimptoolbox.c:631
+#: ../app/dialogs/preferences-dialog.c:1960
+#: ../app/widgets/gimptoolbox.c:631
 msgid "Toolbox"
 msgstr "Przybornik"
 
@@ -8001,7 +7796,8 @@ msgid "Monitor Resolution"
 msgstr "Rozdzielczość monitora"
 
 #: ../app/dialogs/preferences-dialog.c:2319
-#: ../app/widgets/gimpcursorview.c:124 ../app/widgets/gimpgrideditor.c:269
+#: ../app/widgets/gimpcursorview.c:124
+#: ../app/widgets/gimpgrideditor.c:269
 #: ../app/widgets/gimpgrideditor.c:301
 msgid "Pixels"
 msgstr "Piksele"
@@ -8291,28 +8087,33 @@ msgid "Print Size"
 msgstr "Rozmiar wydruku"
 
 #. the image size labels
-#: ../app/dialogs/print-size-dialog.c:165 ../app/widgets/gimpsizebox.c:202
+#: ../app/dialogs/print-size-dialog.c:165
+#: ../app/widgets/gimpsizebox.c:202
 #: ../app/widgets/gimptemplateeditor.c:161
 msgid "_Width:"
 msgstr "_Szerokość:"
 
-#: ../app/dialogs/print-size-dialog.c:172 ../app/widgets/gimpsizebox.c:206
+#: ../app/dialogs/print-size-dialog.c:172
+#: ../app/widgets/gimpsizebox.c:206
 #: ../app/widgets/gimptemplateeditor.c:168
 msgid "H_eight:"
 msgstr "_Wysokość:"
 
 #. the resolution labels
-#: ../app/dialogs/print-size-dialog.c:222 ../app/widgets/gimpsizebox.c:264
+#: ../app/dialogs/print-size-dialog.c:222
+#: ../app/widgets/gimpsizebox.c:264
 #: ../app/widgets/gimptemplateeditor.c:288
 msgid "_X resolution:"
 msgstr "Rozdzielczość _X:"
 
-#: ../app/dialogs/print-size-dialog.c:229 ../app/widgets/gimpsizebox.c:267
+#: ../app/dialogs/print-size-dialog.c:229
+#: ../app/widgets/gimpsizebox.c:267
 #: ../app/widgets/gimptemplateeditor.c:295
 msgid "_Y resolution:"
 msgstr "Rozdzielczość _Y:"
 
-#: ../app/dialogs/print-size-dialog.c:240 ../app/widgets/gimpsizebox.c:260
+#: ../app/dialogs/print-size-dialog.c:240
+#: ../app/widgets/gimpsizebox.c:260
 #: ../app/widgets/gimptemplateeditor.c:308
 #, c-format
 msgid "pixels/%a"
@@ -8350,7 +8151,8 @@ msgstr "_Porzuć zmiany"
 msgid "Canvas Size"
 msgstr "Wymiary płótna"
 
-#: ../app/dialogs/resize-dialog.c:130 ../app/dialogs/scale-dialog.c:109
+#: ../app/dialogs/resize-dialog.c:130
+#: ../app/dialogs/scale-dialog.c:109
 msgid "Layer Size"
 msgstr "Wymiary warstwy"
 
@@ -8375,7 +8177,8 @@ msgid "_Vertical:"
 msgstr "Pio_nowo:"
 
 #. Image size frame
-#: ../app/dialogs/scale-dialog.c:98 ../app/widgets/gimptemplateeditor.c:139
+#: ../app/dialogs/scale-dialog.c:98
+#: ../app/widgets/gimptemplateeditor.c:139
 msgid "Image Size"
 msgstr "Wymiary obrazu"
 
@@ -8388,12 +8191,8 @@ msgid "I_nterpolation:"
 msgstr "I_nterpolacja:"
 
 #: ../app/dialogs/scale-dialog.c:206
-msgid ""
-"Indexed color layers are always scaled without interpolation. The chosen "
-"interpolation type will affect channels and layer masks only."
-msgstr ""
-"Warstwy w trybie indeksowanym są zawsze skalowane bez interpolacji. Wybrany "
-"typ interpolacji wpłynie tylko na kanały i maski."
+msgid "Indexed color layers are always scaled without interpolation. The chosen interpolation type will affect channels and layer masks only."
+msgstr "Warstwy w trybie indeksowanym są zawsze skalowane bez interpolacji. Wybrany typ interpolacji wpłynie tylko na kanały i maski."
 
 #: ../app/dialogs/stroke-dialog.c:102
 msgid "Choose Stroke Style"
@@ -8460,9 +8259,7 @@ msgstr "Instalacja użytkownika nie powiodła się!"
 
 #: ../app/dialogs/user-install-dialog.c:96
 msgid "The GIMP user installation failed; see the log for details."
-msgstr ""
-"Instalacja programu GIMP nie powiodła się. Należy sprawdzić plik log po "
-"więcej szczegółów."
+msgstr "Instalacja programu GIMP nie powiodła się. Należy sprawdzić plik log po więcej szczegółów."
 
 #: ../app/dialogs/user-install-dialog.c:99
 msgid "Installation Log"
@@ -8571,7 +8368,8 @@ msgid "Navigate the image display"
 msgstr "Kontroluje wyświetlanie obrazu"
 
 #: ../app/display/gimpdisplayshell.c:1274
-#: ../app/display/gimpdisplayshell.c:1364 ../app/widgets/gimptoolbox.c:222
+#: ../app/display/gimpdisplayshell.c:1364
+#: ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
 msgstr "Upuść tutaj pliki obrazu, aby je otworzyć"
 
@@ -8593,50 +8391,26 @@ msgstr "Czy zapisać zmiany w obrazie \"%s\" przed jego zamknięciem?"
 #: ../app/display/gimpdisplayshell-close.c:254
 #, c-format
 msgid "If you don't save the image, changes from the last hour will be lost."
-msgid_plural ""
-"If you don't save the image, changes from the last %d hours will be lost."
-msgstr[0] ""
-"Jeśli obraz nie zostanie zapisany, zmiany z ostatniej godziny zostaną "
-"utracone."
-msgstr[1] ""
-"Jeśli obraz nie zostanie zapisany, zmiany z %d ostatnich godzin zostaną "
-"utracone."
-msgstr[2] ""
-"Jeśli obraz nie zostanie zapisany, zmiany z %d ostatnich godzin zostaną "
-"utracone."
+msgid_plural "If you don't save the image, changes from the last %d hours will be lost."
+msgstr[0] "Jeśli obraz nie zostanie zapisany, zmiany z ostatniej godziny zostaną utracone."
+msgstr[1] "Jeśli obraz nie zostanie zapisany, zmiany z %d ostatnich godzin zostaną utracone."
+msgstr[2] "Jeśli obraz nie zostanie zapisany, zmiany z %d ostatnich godzin zostaną utracone."
 
 #: ../app/display/gimpdisplayshell-close.c:264
 #, c-format
-msgid ""
-"If you don't save the image, changes from the last hour and %d minute will "
-"be lost."
-msgid_plural ""
-"If you don't save the image, changes from the last hour and %d minutes will "
-"be lost."
-msgstr[0] ""
-"Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej godziny i %d minuty "
-"zostaną utracone."
-msgstr[1] ""
-"Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej godziny i %d minut "
-"zostaną utracone."
-msgstr[2] ""
-"Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej godziny i %d minut "
-"zostaną utracone."
+msgid "If you don't save the image, changes from the last hour and %d minute will be lost."
+msgid_plural "If you don't save the image, changes from the last hour and %d minutes will be lost."
+msgstr[0] "Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej godziny i %d minuty zostaną utracone."
+msgstr[1] "Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej godziny i %d minut zostaną utracone."
+msgstr[2] "Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej godziny i %d minut zostaną utracone."
 
 #: ../app/display/gimpdisplayshell-close.c:275
 #, c-format
 msgid "If you don't save the image, changes from the last minute will be lost."
-msgid_plural ""
-"If you don't save the image, changes from the last %d minutes will be lost."
-msgstr[0] ""
-"Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej minuty zostaną "
-"utracone."
-msgstr[1] ""
-"Jeśli obraz nie zostanie zapisany,  zmiany z ostatnich %d minut zostaną "
-"utracone."
-msgstr[2] ""
-"Jeśli obraz nie zostanie zapisany,  zmiany z ostatnich %d minut zostaną "
-"utracone."
+msgid_plural "If you don't save the image, changes from the last %d minutes will be lost."
+msgstr[0] "Jeśli obraz nie zostanie zapisany,  zmiany z ostatniej minuty zostaną utracone."
+msgstr[1] "Jeśli obraz nie zostanie zapisany,  zmiany z ostatnich %d minut zostaną utracone."
+msgstr[2] "Jeśli obraz nie zostanie zapisany,  zmiany z ostatnich %d minut zostaną utracone."
 
 #: ../app/display/gimpdisplayshell-dnd.c:255
 #: ../app/display/gimpdisplayshell-dnd.c:587
@@ -8654,7 +8428,8 @@ msgid "Drop layers"
 msgstr "Upuszczone warstwy"
 
 #: ../app/display/gimpdisplayshell-dnd.c:648
-#: ../app/widgets/gimplayertreeview.c:801 ../app/widgets/gimptoolbox-dnd.c:361
+#: ../app/widgets/gimplayertreeview.c:801
+#: ../app/widgets/gimptoolbox-dnd.c:361
 msgid "Dropped Buffer"
 msgstr "Upuszczony bufor"
 
@@ -8725,7 +8500,8 @@ msgstr "(brak)"
 msgid "Cancel %s"
 msgstr "Anuluj %s"
 
-#: ../app/file/file-open.c:131 ../app/file/file-save.c:111
+#: ../app/file/file-open.c:131
+#: ../app/file/file-save.c:111
 #, c-format
 msgid "Not a regular file"
 msgstr "To nie jest zwykły plik"
@@ -8752,12 +8528,8 @@ msgid "Opening '%s' failed: %s"
 msgstr "Nie można otworzyć pliku \"%s\": %s"
 
 #: ../app/file/file-open.c:613
-msgid ""
-"Color management has been disabled. It can be enabled again in the "
-"Preferences dialog."
-msgstr ""
-"Zarządzanie kolorami zostało wyłączone. Może ono zostać włączono ponownie w "
-"oknie Preferencji."
+msgid "Color management has been disabled. It can be enabled again in the Preferences dialog."
+msgstr "Zarządzanie kolorami zostało wyłączone. Może ono zostać włączono ponownie w oknie Preferencji."
 
 #: ../app/file/file-procedure.c:200
 #, c-format
@@ -8774,7 +8546,8 @@ msgstr "Wtyczka %s nie może zapisać obrazu"
 msgid "'%s:' is not a valid URI scheme"
 msgstr "\"%s:\" nie jest poprawnym znacznikiem URI"
 
-#: ../app/file/file-utils.c:88 ../app/file/file-utils.c:122
+#: ../app/file/file-utils.c:88
+#: ../app/file/file-utils.c:122
 #, c-format
 msgid "Invalid character sequence in URI"
 msgstr "Niepoprawna ciąg znaków w URI"
@@ -8784,7 +8557,8 @@ msgstr "Niepoprawna ciąg znaków w URI"
 msgid "not a GIMP Curves file"
 msgstr "nie jest plikiem krzywych programu GIMP"
 
-#: ../app/gegl/gimpcurvesconfig.c:398 ../app/gegl/gimplevelsconfig.c:711
+#: ../app/gegl/gimpcurvesconfig.c:398
+#: ../app/gegl/gimplevelsconfig.c:711
 #, c-format
 msgid "parse error"
 msgstr "błąd przy analizie składniowej"
@@ -8803,7 +8577,8 @@ msgstr "Dokumenty"
 msgid "GIMP Startup"
 msgstr "Uruchamianie programu GIMP"
 
-#: ../app/paint/gimpairbrush.c:69 ../app/tools/gimpairbrushtool.c:54
+#: ../app/paint/gimpairbrush.c:69
+#: ../app/tools/gimpairbrushtool.c:54
 msgid "Airbrush"
 msgstr "Aerograf"
 
@@ -8812,7 +8587,8 @@ msgstr "Aerograf"
 msgid "No brushes available for use with this tool."
 msgstr "Brak dostępnych pędzli dla tego narzędzia."
 
-#: ../app/paint/gimpclone.c:99 ../app/tools/gimpclonetool.c:61
+#: ../app/paint/gimpclone.c:99
+#: ../app/tools/gimpclonetool.c:61
 msgid "Clone"
 msgstr "Klonowanie"
 
@@ -8829,11 +8605,13 @@ msgstr "Rozmywanie lub wyostrzanie"
 msgid "Dodge/Burn"
 msgstr "Rozjaśnianie lub wypalanie"
 
-#: ../app/paint/gimperaser.c:62 ../app/tools/gimperasertool.c:66
+#: ../app/paint/gimperaser.c:62
+#: ../app/tools/gimperasertool.c:66
 msgid "Eraser"
 msgstr "Gumka"
 
-#: ../app/paint/gimpheal.c:115 ../app/tools/gimphealtool.c:53
+#: ../app/paint/gimpheal.c:115
+#: ../app/tools/gimphealtool.c:53
 msgid "Heal"
 msgstr "Łatka"
 
@@ -8842,15 +8620,18 @@ msgstr "Łatka"
 msgid "Healing does not operate on indexed layers."
 msgstr "Łatanie nie jest możliwe na warstwach indeksowanych."
 
-#: ../app/paint/gimppaintbrush.c:63 ../app/tools/gimppaintbrushtool.c:51
+#: ../app/paint/gimppaintbrush.c:63
+#: ../app/tools/gimppaintbrushtool.c:51
 msgid "Paintbrush"
 msgstr "Pędzel"
 
-#: ../app/paint/gimppencil.c:42 ../app/tools/gimppenciltool.c:51
+#: ../app/paint/gimppencil.c:42
+#: ../app/tools/gimppenciltool.c:51
 msgid "Pencil"
 msgstr "Ołówek"
 
-#: ../app/paint/gimpperspectiveclone.c:97 ../app/paint/paint-enums.c:52
+#: ../app/paint/gimpperspectiveclone.c:97
+#: ../app/paint/paint-enums.c:52
 #: ../app/tools/gimpperspectiveclonetool.c:126
 msgid "Perspective Clone"
 msgstr "Klon perspektywy"
@@ -8860,7 +8641,8 @@ msgstr "Klon perspektywy"
 msgid "Perspective Clone does not operate on indexed layers."
 msgstr "Klon perspektywy nie jest możliwy na warstwach indeksowanych."
 
-#: ../app/paint/gimpsmudge.c:78 ../app/tools/gimpsmudgetool.c:53
+#: ../app/paint/gimpsmudge.c:78
+#: ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
 msgstr "Rozsmarowywanie"
 
@@ -8899,13 +8681,15 @@ msgstr "Łączy maski"
 
 #: ../app/pdb/drawable-transform-cmds.c:310
 #: ../app/pdb/drawable-transform-cmds.c:395
-#: ../app/pdb/transform-tools-cmds.c:146 ../app/tools/gimpperspectivetool.c:69
+#: ../app/pdb/transform-tools-cmds.c:146
+#: ../app/tools/gimpperspectivetool.c:69
 msgid "Perspective"
 msgstr "Perspektywa"
 
 #: ../app/pdb/drawable-transform-cmds.c:832
 #: ../app/pdb/drawable-transform-cmds.c:904
-#: ../app/pdb/transform-tools-cmds.c:362 ../app/tools/gimpsheartool.c:111
+#: ../app/pdb/transform-tools-cmds.c:362
+#: ../app/tools/gimpsheartool.c:111
 msgid "Shearing"
 msgstr "Nachylanie"
 
@@ -8920,44 +8704,38 @@ msgstr "Przekształcenia 2D"
 msgid "2D Transforming"
 msgstr "Przekształcanie 2D"
 
-#: ../app/pdb/edit-cmds.c:709 ../app/tools/gimpblendtool.c:223
+#: ../app/pdb/edit-cmds.c:709
+#: ../app/tools/gimpblendtool.c:223
 msgid "Blending"
 msgstr "Mieszanie"
 
 #: ../app/pdb/floating-sel-cmds.c:63
 #, c-format
 msgid "Cannot remove this layer because it is not a floating selection."
-msgstr ""
-"Nie można usunąć warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
+msgstr "Nie można usunąć warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
 
 #: ../app/pdb/floating-sel-cmds.c:95
 #, c-format
 msgid "Cannot anchor this layer because it is not a floating selection."
-msgstr ""
-"Nie można zakotwiczyć warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
+msgstr "Nie można zakotwiczyć warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
 
 #: ../app/pdb/floating-sel-cmds.c:127
 #, c-format
-msgid ""
-"Cannot convert this layer to a normal layer because it is not a floating "
-"selection."
-msgstr ""
-"Nie można skonwertować warstwy na normalną, ponieważ nie jest ona oderwanym "
-"zaznaczeniem."
+msgid "Cannot convert this layer to a normal layer because it is not a floating selection."
+msgstr "Nie można skonwertować warstwy na normalną, ponieważ nie jest ona oderwanym zaznaczeniem."
 
 #: ../app/pdb/floating-sel-cmds.c:188
 #, c-format
 msgid "Cannot rigor this layer because it is not a floating selection."
-msgstr ""
-"Nie można zablokować warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
+msgstr "Nie można zablokować warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
 
 #: ../app/pdb/floating-sel-cmds.c:222
 #, c-format
 msgid "Cannot relax this layer because it is not a floating selection."
-msgstr ""
-"Nie można odblokować warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
+msgstr "Nie można odblokować warstwy, ponieważ nie jest ona oderwanym zaznaczeniem."
 
-#: ../app/pdb/gimppdb-query.c:300 ../app/pdb/gimppdb.c:307
+#: ../app/pdb/gimppdb-query.c:300
+#: ../app/pdb/gimppdb.c:307
 #: ../app/pdb/gimppdb.c:377
 #, c-format
 msgid "Procedure '%s' not found"
@@ -9055,11 +8833,8 @@ msgstr "Nie istnieje metoda rysowania \"%s\""
 
 #: ../app/pdb/gimppdb-utils.c:305
 #, c-format
-msgid ""
-"Item '%s' (%d) can not be used because it has not been added to an image"
-msgstr ""
-"Element \"%s\" (%d) nie może zostac użyty, ponieważ nie został dodany do "
-"obrazu"
+msgid "Item '%s' (%d) can not be used because it has not been added to an image"
+msgstr "Element \"%s\" (%d) nie może zostac użyty, ponieważ nie został dodany do obrazu"
 
 #: ../app/pdb/gimppdb-utils.c:327
 #, c-format
@@ -9074,15 +8849,12 @@ msgstr "Próbowano dodać element \"%s\" (%d) do złego obrazu"
 #: ../app/pdb/gimppdb-utils.c:354
 #, c-format
 msgid "Layer '%s' (%d) can not be used because it is not a text layer"
-msgstr ""
-"Warstwa \"%s\" (%d) nie może zostać użyta ponieważ nie jest warstwą tekstową"
+msgstr "Warstwa \"%s\" (%d) nie może zostać użyta ponieważ nie jest warstwą tekstową"
 
 #: ../app/pdb/gimppdb-utils.c:395
 #, c-format
 msgid "Image '%s' (%d) is of type '%s', but an image of type '%s' is expected"
-msgstr ""
-"Obraz \"%s\" (%d) jest typu \"%s\", natomiast spodziewany typ obrazu to \"%s"
-"\""
+msgstr "Obraz \"%s\" (%d) jest typu \"%s\", natomiast spodziewany typ obrazu to \"%s\""
 
 #: ../app/pdb/gimppdb-utils.c:418
 #, c-format
@@ -9096,99 +8868,62 @@ msgstr "Obiekt wektorowy %d nie zawiera krzywej o ID %d"
 
 #: ../app/pdb/gimppdb.c:411
 #, c-format
-msgid ""
-"Procedure '%s' has been called with a wrong type for argument #%d. Expected %"
-"s, got %s."
-msgstr ""
-"Procedura \"%s\" została wywołana z błędnym typem argumentu #%d. Spodziewany "
-"%s, otrzymany %s."
+msgid "Procedure '%s' has been called with a wrong type for argument #%d. Expected %s, got %s."
+msgstr "Procedura \"%s\" została wywołana z błędnym typem argumentu #%d. Spodziewany %s, otrzymany %s."
 
-#: ../app/pdb/gimpprocedure.c:361 ../app/plug-in/gimppluginprocframe.c:209
+#: ../app/pdb/gimpprocedure.c:361
+#: ../app/plug-in/gimppluginprocframe.c:209
 #, c-format
 msgid "Procedure '%s' returned no return values"
 msgstr "Procedura \"%s\" nie zwróciła wartości"
 
 #: ../app/pdb/gimpprocedure.c:585
 #, c-format
-msgid ""
-"Procedure '%s' returned a wrong value type for return value '%s' (#%d). "
-"Expected %s, got %s."
-msgstr ""
-"Procedura \"%s\" zwróciła zły typ wartości \"%s\" (#%d). Spodziewany %s, "
-"otrzymany %s."
+msgid "Procedure '%s' returned a wrong value type for return value '%s' (#%d). Expected %s, got %s."
+msgstr "Procedura \"%s\" zwróciła zły typ wartości \"%s\" (#%d). Spodziewany %s, otrzymany %s."
 
 #: ../app/pdb/gimpprocedure.c:597
 #, c-format
-msgid ""
-"Procedure '%s' has been called with a wrong value type for argument '%s' (#%"
-"d). Expected %s, got %s."
-msgstr ""
-"Procedura \"%s\" została wywołana z błędnym argumentem \"%s\" (#%d). "
-"Spodziewany %s, otrzymany %s."
+msgid "Procedure '%s' has been called with a wrong value type for argument '%s' (#%d). Expected %s, got %s."
+msgstr "Procedura \"%s\" została wywołana z błędnym argumentem \"%s\" (#%d). Spodziewany %s, otrzymany %s."
 
 #: ../app/pdb/gimpprocedure.c:629
 #, c-format
-msgid ""
-"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
-"in is trying to work on a layer that doesn't exist any longer."
-msgstr ""
-"Procedura \"%s\" zwróciła błędny ID dla argumentu \"%s\". Prawdopodobnie "
-"wtyczka próbuje pracować na warstwie, która nie istnieje."
+msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgstr "Procedura \"%s\" zwróciła błędny ID dla argumentu \"%s\". Prawdopodobnie wtyczka próbuje pracować na warstwie, która nie istnieje."
 
 #: ../app/pdb/gimpprocedure.c:641
 #, c-format
-msgid ""
-"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
-"likely a plug-in is trying to work on a layer that doesn't exist any longer."
-msgstr ""
-"Procedura \"%s\" wywołała błędny ID dla argumentu \"%s\". Prawdopodobnie "
-"wtyczka próbuje pracować na warstwie, która nie istnieje."
+msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on a layer that doesn't exist any longer."
+msgstr "Procedura \"%s\" wywołała błędny ID dla argumentu \"%s\". Prawdopodobnie wtyczka próbuje pracować na warstwie, która nie istnieje."
 
 #: ../app/pdb/gimpprocedure.c:657
 #, c-format
-msgid ""
-"Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-"
-"in is trying to work on an image that doesn't exist any longer."
-msgstr ""
-"Procedura \"%s\" zwróciła błędny ID dla argumentu \"%s\". Prawdopodobnie "
-"wtyczka próbuje pracować na obrazie, który nie istnieje."
+msgid "Procedure '%s' returned an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
+msgstr "Procedura \"%s\" zwróciła błędny ID dla argumentu \"%s\". Prawdopodobnie wtyczka próbuje pracować na obrazie, który nie istnieje."
 
 #: ../app/pdb/gimpprocedure.c:669
 #, c-format
-msgid ""
-"Procedure '%s' has been called with an invalid ID for argument '%s'. Most "
-"likely a plug-in is trying to work on an image that doesn't exist any longer."
-msgstr ""
-"Procedura \"%s\" wywołała błędny ID dla argumentu \"%s\". Prawdopodobnie "
-"wtyczka próbuje pracować na obrazie, który nie istnieje."
+msgid "Procedure '%s' has been called with an invalid ID for argument '%s'. Most likely a plug-in is trying to work on an image that doesn't exist any longer."
+msgstr "Procedura \"%s\" wywołała błędny ID dla argumentu \"%s\". Prawdopodobnie wtyczka próbuje pracować na obrazie, który nie istnieje."
 
 #: ../app/pdb/gimpprocedure.c:689
 #, c-format
-msgid ""
-"Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value "
-"is out of range."
-msgstr ""
-"Procedura \"%s\" zwróciła \"%s\", jako wartość \"%s\" (#%d, typ %s). Ta "
-"wartość jest poza zakresem."
+msgid "Procedure '%s' returned '%s' as return value '%s' (#%d, type %s). This value is out of range."
+msgstr "Procedura \"%s\" zwróciła \"%s\", jako wartość \"%s\" (#%d, typ %s). Ta wartość jest poza zakresem."
 
 #: ../app/pdb/gimpprocedure.c:702
 #, c-format
-msgid ""
-"Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %"
-"s). This value is out of range."
-msgstr ""
-"Procedura \"%s\" została wywołana z wartością \"%s\", jako argument \"%s\" (#"
-"%d, typ %s). Ta wartość jest poza zakresem."
+msgid "Procedure '%s' has been called with value '%s' for argument '%s' (#%d, type %s). This value is out of range."
+msgstr "Procedura \"%s\" została wywołana z wartością \"%s\", jako argument \"%s\" (#%d, typ %s). Ta wartość jest poza zakresem."
 
 #: ../app/pdb/image-cmds.c:2268
 #, c-format
-msgid ""
-"Image resolution is out of bounds, using the default resolution instead."
-msgstr ""
-"Rozdzielczość obrazu przekracza dopuszczalny zakres. Użyto rozdzielczości "
-"domyślnej."
+msgid "Image resolution is out of bounds, using the default resolution instead."
+msgstr "Rozdzielczość obrazu przekracza dopuszczalny zakres. Użyto rozdzielczości domyślnej."
 
-#: ../app/pdb/selection-tools-cmds.c:218 ../app/tools/gimpfreeselecttool.c:197
+#: ../app/pdb/selection-tools-cmds.c:218
+#: ../app/tools/gimpfreeselecttool.c:197
 msgid "Free Select"
 msgstr "Zaznaczenie odręczne"
 
@@ -9200,12 +8935,18 @@ msgstr "Nie powiodło sie utworzenie warstwy tekstowej"
 # KOLIZJA
 # app/gui/layers-commands.c - "Modyfikacja atrybutów warstwy"
 # app/widgets/gimplayertreeview.c - "Modyfikuje atrybuty warstwy"
-#: ../app/pdb/text-layer-cmds.c:163 ../app/pdb/text-layer-cmds.c:235
-#: ../app/pdb/text-layer-cmds.c:314 ../app/pdb/text-layer-cmds.c:394
-#: ../app/pdb/text-layer-cmds.c:467 ../app/pdb/text-layer-cmds.c:539
-#: ../app/pdb/text-layer-cmds.c:611 ../app/pdb/text-layer-cmds.c:683
-#: ../app/pdb/text-layer-cmds.c:755 ../app/pdb/text-layer-cmds.c:825
-#: ../app/pdb/text-layer-cmds.c:897 ../app/pdb/text-layer-cmds.c:969
+#: ../app/pdb/text-layer-cmds.c:163
+#: ../app/pdb/text-layer-cmds.c:235
+#: ../app/pdb/text-layer-cmds.c:314
+#: ../app/pdb/text-layer-cmds.c:394
+#: ../app/pdb/text-layer-cmds.c:467
+#: ../app/pdb/text-layer-cmds.c:539
+#: ../app/pdb/text-layer-cmds.c:611
+#: ../app/pdb/text-layer-cmds.c:683
+#: ../app/pdb/text-layer-cmds.c:755
+#: ../app/pdb/text-layer-cmds.c:825
+#: ../app/pdb/text-layer-cmds.c:897
+#: ../app/pdb/text-layer-cmds.c:969
 #: ../app/pdb/text-layer-cmds.c:1041
 msgid "Set text layer attribute"
 msgstr "Modyfikuje atrybut warstwy tekstowej"
@@ -9258,15 +8999,12 @@ msgid ""
 "Plug-in crashed: \"%s\"\n"
 "(%s)\n"
 "\n"
-"The dying plug-in may have messed up GIMP's internal state. You may want to "
-"save your images and restart GIMP to be on the safe side."
+"The dying plug-in may have messed up GIMP's internal state. You may want to save your images and restart GIMP to be on the safe side."
 msgstr ""
 "We wtyczce wystąpił błąd: \"%s\"\n"
 "(%s)\n"
 "\n"
-"Wtyczka przerywając działanie w wyniku błędu, mogła uszkodzić wewnętrzny "
-"stan programu GIMP. Dla bezpieczeństwa zalecane jest zapisanie obrazów i "
-"ponowne uruchomienie programu."
+"Wtyczka przerywając działanie w wyniku błędu, mogła uszkodzić wewnętrzny stan programu GIMP. Dla bezpieczeństwa zalecane jest zapisanie obrazów i ponowne uruchomienie programu."
 
 #: ../app/plug-in/gimppluginmanager-call.c:173
 #: ../app/plug-in/gimppluginmanager-call.c:223
@@ -9360,7 +9098,8 @@ msgstr ""
 "pchnąć w tę łódź jeża\n"
 "lub ośm skrzyń fig."
 
-#: ../app/text/gimptext-compat.c:108 ../app/tools/gimptexttool.c:877
+#: ../app/text/gimptext-compat.c:108
+#: ../app/tools/gimptexttool.c:877
 msgid "Add Text Layer"
 msgstr "Dodanie warstwy tekstowej"
 
@@ -9414,15 +9153,12 @@ msgid ""
 "Problems parsing the text parasite for layer '%s':\n"
 "%s\n"
 "\n"
-"Some text properties may be wrong. Unless you want to edit the text layer, "
-"you don't need to worry about this."
+"Some text properties may be wrong. Unless you want to edit the text layer, you don't need to worry about this."
 msgstr ""
-"Wystąpił problem przy analizowaniu zawartości elementu pasożytniczego "
-"opisującego tekst, dołączonego do warstwy \"%s\":\n"
+"Wystąpił problem przy analizowaniu zawartości elementu pasożytniczego opisującego tekst, dołączonego do warstwy \"%s\":\n"
 "%s\n"
 "\n"
-"Niektóre właściwości tekstu mogą być niepoprawne. Jeśli tekst nie będzie "
-"modyfikowany, nie ma to większego znaczenia."
+"Niektóre właściwości tekstu mogą być niepoprawne. Jeśli tekst nie będzie modyfikowany, nie ma to większego znaczenia."
 
 #: ../app/tools/gimp-tools.c:327
 msgid ""
@@ -9440,16 +9176,19 @@ msgstr "Aerograf: Rysuje ze zmiennym naciskiem"
 msgid "_Airbrush"
 msgstr "_Aerograf"
 
-#: ../app/tools/gimpairbrushtool.c:92 ../app/tools/gimpconvolvetool.c:217
+#: ../app/tools/gimpairbrushtool.c:92
+#: ../app/tools/gimpconvolvetool.c:217
 #: ../app/tools/gimpsmudgetool.c:97
 msgid "Rate:"
 msgstr "Tempo:"
 
-#: ../app/tools/gimpairbrushtool.c:98 ../app/tools/gimppaintoptions-gui.c:198
+#: ../app/tools/gimpairbrushtool.c:98
+#: ../app/tools/gimppaintoptions-gui.c:198
 msgid "Pressure:"
 msgstr "Nacisk: "
 
-#: ../app/tools/gimpaligntool.c:134 ../app/tools/gimpaligntool.c:754
+#: ../app/tools/gimpaligntool.c:134
+#: ../app/tools/gimpaligntool.c:754
 msgid "Align"
 msgstr "Wyrównanie"
 
@@ -9463,9 +9202,7 @@ msgstr "_Wyrównaj"
 
 #: ../app/tools/gimpaligntool.c:587
 msgid "Click on a layer, path or guide, or Click-Drag to pick several layers"
-msgstr ""
-"Kliknij na warstwie, ścieżce lub prowadnicy, lub kliknij i przeciągnij aby "
-"pobrać kilka warstw"
+msgstr "Kliknij na warstwie, ścieżce lub prowadnicy, lub kliknij i przeciągnij aby pobrać kilka warstw"
 
 #: ../app/tools/gimpaligntool.c:596
 msgid "Click to pick this layer as first item"
@@ -9547,19 +9284,23 @@ msgstr "Rozmieszczenie pionowych środków"
 msgid "Distribute bottoms of targets"
 msgstr "Rozmieszczenie dołów krawędzi"
 
-#: ../app/tools/gimpaligntool.c:881 ../app/tools/gimpblendoptions.c:222
+#: ../app/tools/gimpaligntool.c:881
+#: ../app/tools/gimpblendoptions.c:222
 msgid "Offset:"
 msgstr "Przesunięcie:"
 
-#: ../app/tools/gimpblendoptions.c:216 ../app/tools/gimppaintoptions-gui.c:648
+#: ../app/tools/gimpblendoptions.c:216
+#: ../app/tools/gimppaintoptions-gui.c:648
 msgid "Gradient:"
 msgstr "Gradient:"
 
-#: ../app/tools/gimpblendoptions.c:232 ../app/widgets/gimpbrusheditor.c:146
+#: ../app/tools/gimpblendoptions.c:232
+#: ../app/widgets/gimpbrusheditor.c:146
 msgid "Shape:"
 msgstr "Kształt:"
 
-#: ../app/tools/gimpblendoptions.c:239 ../app/tools/gimppaintoptions-gui.c:672
+#: ../app/tools/gimpblendoptions.c:239
+#: ../app/tools/gimppaintoptions-gui.c:672
 msgid "Repeat:"
 msgstr "Okresowość:"
 
@@ -9590,7 +9331,8 @@ msgstr "_Gradient"
 msgid "Blend does not operate on indexed layers."
 msgstr "Gradient nie pracuje na warstwach indeksowanych."
 
-#: ../app/tools/gimpblendtool.c:400 ../app/tools/gimppainttool.c:606
+#: ../app/tools/gimpblendtool.c:400
+#: ../app/tools/gimppainttool.c:606
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s dla wymuszonych kątów"
@@ -9647,9 +9389,7 @@ msgstr "Pozwala na wypełnianie całkowicie przezroczystych obszarów"
 
 #: ../app/tools/gimpbucketfilloptions.c:106
 msgid "Base filled area on all visible layers"
-msgstr ""
-"Powoduje ustalanie wypełnianego obszaru w oparciu o wszystkie widoczne "
-"warstwy"
+msgstr "Powoduje ustalanie wypełnianego obszaru w oparciu o wszystkie widoczne warstwy"
 
 #: ../app/tools/gimpbucketfilloptions.c:112
 #: ../app/tools/gimpregionselectoptions.c:96
@@ -9687,8 +9427,10 @@ msgstr "Wyszukiwanie podobnych kolorów"
 msgid "Fill transparent areas"
 msgstr "Z obszarami przezroczystymi"
 
-#: ../app/tools/gimpbucketfilloptions.c:275 ../app/tools/gimpclonetool.c:114
-#: ../app/tools/gimpcolorpickeroptions.c:151 ../app/tools/gimphealtool.c:99
+#: ../app/tools/gimpbucketfilloptions.c:275
+#: ../app/tools/gimpclonetool.c:114
+#: ../app/tools/gimpcolorpickeroptions.c:151
+#: ../app/tools/gimphealtool.c:99
 #: ../app/tools/gimpperspectiveclonetool.c:941
 #: ../app/tools/gimpregionselectoptions.c:208
 msgid "Sample merged"
@@ -9716,8 +9458,7 @@ msgstr "Zaznaczenie według koloru"
 
 #: ../app/tools/gimpbycolorselecttool.c:68
 msgid "Select by Color Tool: Select regions with similar colors"
-msgstr ""
-"Narzędzie zaznaczenie według koloru: Zaznacza obszary z podobnymi kolorami"
+msgstr "Narzędzie zaznaczenie według koloru: Zaznacza obszary z podobnymi kolorami"
 
 #: ../app/tools/gimpbycolorselecttool.c:69
 msgid "_By Color Select"
@@ -9731,11 +9472,13 @@ msgstr "Klonowanie: Selektywnie kopiuje obraz lub deseń, używając pędzla"
 msgid "_Clone"
 msgstr "_Klonowanie"
 
-#: ../app/tools/gimpclonetool.c:86 ../app/tools/gimpclonetool.c:89
+#: ../app/tools/gimpclonetool.c:86
+#: ../app/tools/gimpclonetool.c:89
 msgid "Click to clone"
 msgstr "Kliknij, aby sklonować"
 
-#: ../app/tools/gimpclonetool.c:87 ../app/tools/gimpclonetool.c:91
+#: ../app/tools/gimpclonetool.c:87
+#: ../app/tools/gimpclonetool.c:91
 #, c-format
 msgid "%s to set a new clone source"
 msgstr "%s ustawia nowe źródło klonowania"
@@ -9749,7 +9492,8 @@ msgstr "Kliknij, aby ustawić nowe źródło klonowania."
 msgid "Source"
 msgstr "Źródło"
 
-#: ../app/tools/gimpclonetool.c:128 ../app/tools/gimphealtool.c:111
+#: ../app/tools/gimpclonetool.c:128
+#: ../app/tools/gimphealtool.c:111
 #: ../app/tools/gimpperspectiveclonetool.c:955
 msgid "Alignment:"
 msgstr "Wyrównanie:"
@@ -9783,7 +9527,8 @@ msgstr "Balansu koloru możliwy jest tylko na warstwach RGB."
 msgid "Select Range to Adjust"
 msgstr "Wybór modyfikowanego zakresu"
 
-#: ../app/tools/gimpcolorbalancetool.c:279 ../app/tools/gimplevelstool.c:172
+#: ../app/tools/gimpcolorbalancetool.c:279
+#: ../app/tools/gimplevelstool.c:172
 msgid "Adjust Color Levels"
 msgstr "Modyfikacja poziomów kolorów"
 
@@ -9894,11 +9639,13 @@ msgstr "Po_branie koloru"
 msgid "Click in any image to view its color"
 msgstr "Kliknij na obraz, aby zobaczyć jego kolor"
 
-#: ../app/tools/gimpcolorpickertool.c:249 ../app/tools/gimppainttool.c:509
+#: ../app/tools/gimpcolorpickertool.c:249
+#: ../app/tools/gimppainttool.c:509
 msgid "Click in any image to pick the foreground color"
 msgstr "Kliknij na dowolny obraz, aby pobrać jego kolor pierwszoplanowy"
 
-#: ../app/tools/gimpcolorpickertool.c:257 ../app/tools/gimppainttool.c:515
+#: ../app/tools/gimpcolorpickertool.c:257
+#: ../app/tools/gimppainttool.c:515
 msgid "Click in any image to pick the background color"
 msgstr "Kliknij na dowolny obraz, aby pobrać jego kolor tła"
 
@@ -9911,7 +9658,8 @@ msgstr "Kliknij na dowolny obraz, aby dodać kolor do palety"
 msgid "Color Picker Information"
 msgstr "Informacje o zakraplaczu"
 
-#: ../app/tools/gimpcolortool.c:258 ../app/tools/gimpcolortool.c:437
+#: ../app/tools/gimpcolortool.c:258
+#: ../app/tools/gimpcolortool.c:437
 msgid "Move Sample Point: "
 msgstr "Przesuń punkt wzorcowy: "
 
@@ -9929,8 +9677,7 @@ msgstr "Rozmywanie / wyostrzanie"
 
 #: ../app/tools/gimpconvolvetool.c:74
 msgid "Blur / Sharpen Tool: Selective blurring or unblurring using a brush"
-msgstr ""
-"Rozmywanie / Wyostrzanie: Selektywnie rozmywa lub wyostrza używając pędzla"
+msgstr "Rozmywanie / Wyostrzanie: Selektywnie rozmywa lub wyostrza używając pędzla"
 
 #: ../app/tools/gimpconvolvetool.c:75
 msgid "Bl_ur / Sharpen"
@@ -10025,11 +9772,13 @@ msgstr "Kliknij, aby dodać punkt kontrolny"
 msgid "Click to add control points to all channels"
 msgstr "Kliknij, aby dodać punkty kontrolne do wszystkich kanałów"
 
-#: ../app/tools/gimpcurvestool.c:441 ../app/tools/gimplevelstool.c:380
+#: ../app/tools/gimpcurvestool.c:441
+#: ../app/tools/gimplevelstool.c:380
 msgid "Cha_nnel:"
 msgstr "Ka_nał:"
 
-#: ../app/tools/gimpcurvestool.c:467 ../app/tools/gimplevelstool.c:404
+#: ../app/tools/gimpcurvestool.c:467
+#: ../app/tools/gimplevelstool.c:404
 msgid "R_eset Channel"
 msgstr "R_esetuj kanał"
 
@@ -10037,7 +9786,8 @@ msgstr "R_esetuj kanał"
 msgid "Curve _type:"
 msgstr "_Typ krzywej:"
 
-#: ../app/tools/gimpcurvestool.c:632 ../app/tools/gimplevelstool.c:752
+#: ../app/tools/gimpcurvestool.c:632
+#: ../app/tools/gimplevelstool.c:752
 #, c-format
 msgid "Could not read header from '%s': %s"
 msgstr "Nie można odczytaćnagłówka z \"%s\": %s"
@@ -10073,9 +9823,7 @@ msgstr "Rozjaśnianie / Wypalenie"
 
 #: ../app/tools/gimpdodgeburntool.c:74
 msgid "Dodge / Burn Tool: Selectively lighten or darken using a brush"
-msgstr ""
-"Rozjaśnianie / Wypalenie: Selektywnie rozjaśnia lub przyciemnia używając "
-"pędzla"
+msgstr "Rozjaśnianie / Wypalenie: Selektywnie rozjaśnia lub przyciemnia używając pędzla"
 
 #: ../app/tools/gimpdodgeburntool.c:75
 msgid "Dod_ge / Burn"
@@ -10188,8 +9936,7 @@ msgid "Flip"
 msgstr "Odbicie"
 
 #: ../app/tools/gimpfliptool.c:80
-msgid ""
-"Flip Tool: Reverse the layer, selection or path horizontally or vertically"
+msgid "Flip Tool: Reverse the layer, selection or path horizontally or vertically"
 msgstr "Odbicie: Odwraca warstwę, zaznaczenie lub ścieżkę, pionowo lub poziomo"
 
 #: ../app/tools/gimpfliptool.c:82
@@ -10210,12 +9957,8 @@ msgid "Size of the brush used for refinements"
 msgstr "Rozmiar użytego pędzla"
 
 #: ../app/tools/gimpforegroundselectoptions.c:102
-msgid ""
-"Smaller values give a more accurate selection border but may introduce holes "
-"in the selection"
-msgstr ""
-"Mniejsze wartości dają większą dokładność zaznaczenia, lecz mogą powodować "
-"dziury w zaznaczeniu"
+msgid "Smaller values give a more accurate selection border but may introduce holes in the selection"
+msgstr "Mniejsze wartości dają większą dokładność zaznaczenia, lecz mogą powodować dziury w zaznaczeniu"
 
 #: ../app/tools/gimpforegroundselectoptions.c:121
 msgid "Sensitivity for brightness component"
@@ -10275,9 +10018,7 @@ msgstr "Zaznaczenie pierwszego planu"
 
 #: ../app/tools/gimpforegroundselecttool.c:146
 msgid "Foreground Select Tool: Select a region containing foreground objects"
-msgstr ""
-"Zaznaczenie pierwszego planu: Zaznacza obszar zawierający obiekty z "
-"pierwszego planu"
+msgstr "Zaznaczenie pierwszego planu: Zaznacza obszar zawierający obiekty z pierwszego planu"
 
 #: ../app/tools/gimpforegroundselecttool.c:147
 msgid "F_oreground Select"
@@ -10285,8 +10026,7 @@ msgstr "Zaznaczenie _pierwszego planu"
 
 #: ../app/tools/gimpforegroundselecttool.c:314
 msgid "Add more strokes or press Enter to accept the selection"
-msgstr ""
-"Zrób więcej pociągnięć lub naciśnij \"Enter\", aby zaakceptować zaznaczenie"
+msgstr "Zrób więcej pociągnięć lub naciśnij \"Enter\", aby zaakceptować zaznaczenie"
 
 #: ../app/tools/gimpforegroundselecttool.c:316
 msgid "Mark foreground by painting on the object to extract"
@@ -10302,11 +10042,8 @@ msgid "Foreground Select"
 msgstr "Zaznaczenie pierwszego planu"
 
 #: ../app/tools/gimpfreeselecttool.c:198
-msgid ""
-"Free Select Tool: Select a hand-drawn region with free and polygonal segments"
-msgstr ""
-"Odręczne zaznaczanie obszarów: Pozwala zaznaczyć obszar za pomocą wielokątów "
-"lub odręcznie"
+msgid "Free Select Tool: Select a hand-drawn region with free and polygonal segments"
+msgstr "Odręczne zaznaczanie obszarów: Pozwala zaznaczyć obszar za pomocą wielokątów lub odręcznie"
 
 #: ../app/tools/gimpfreeselecttool.c:199
 msgid "_Free Select"
@@ -10322,14 +10059,11 @@ msgstr "Kliknij i przeciągnij, aby przemieścić segment wierzchołka"
 
 #: ../app/tools/gimpfreeselecttool.c:1125
 msgid "Return commits, Escape cancels, Backspace removes last segment"
-msgstr ""
-"Klawisz Enter potwierdza, Escape anuluje, Backspace usuwa ostatni segment"
+msgstr "Klawisz Enter potwierdza, Escape anuluje, Backspace usuwa ostatni segment"
 
 #: ../app/tools/gimpfreeselecttool.c:1129
 msgid "Click-Drag adds a free segment, Click adds a polygonal segment"
-msgstr ""
-"Kliknięcie i przeciągnięcie, dodaje odręczny segment. Kliknięcie dodaje "
-"segment wielokątny"
+msgstr "Kliknięcie i przeciągnięcie, dodaje odręczny segment. Kliknięcie dodaje segment wielokątny"
 
 #: ../app/tools/gimpfreeselecttool.c:1581
 msgctxt "command"
@@ -10348,7 +10082,8 @@ msgstr "Zaznaczenie rozmyte: Zaznacza regularny obszar na podstawie koloru"
 msgid "Fu_zzy Select"
 msgstr "Zaznaczenie roz_myte"
 
-#: ../app/tools/gimpgegltool.c:92 ../app/tools/gimpgegltool.c:111
+#: ../app/tools/gimpgegltool.c:92
+#: ../app/tools/gimpgegltool.c:111
 msgid "GEGL Operation"
 msgstr "Operacja GEGL-a"
 
@@ -10382,11 +10117,13 @@ msgstr "Łatka: Usuwa nieregularności z obrazu"
 msgid "_Heal"
 msgstr "_Łatka"
 
-#: ../app/tools/gimphealtool.c:77 ../app/tools/gimphealtool.c:80
+#: ../app/tools/gimphealtool.c:77
+#: ../app/tools/gimphealtool.c:80
 msgid "Click to heal"
 msgstr "Kliknięcie usuwa nieregularności"
 
-#: ../app/tools/gimphealtool.c:78 ../app/tools/gimphealtool.c:82
+#: ../app/tools/gimphealtool.c:78
+#: ../app/tools/gimphealtool.c:82
 #, c-format
 msgid "%s to set a new heal source"
 msgstr "%s ustawia nowe źródło usuwania nieregularności"
@@ -10490,12 +10227,15 @@ msgstr "_Podgląd"
 msgid "Adjustment"
 msgstr "Dopasowanie"
 
-#: ../app/tools/gimpinkoptions-gui.c:68 ../app/tools/gimpinkoptions-gui.c:93
-#: ../app/tools/gimprectangleoptions.c:973 ../app/tools/gimptextoptions.c:452
+#: ../app/tools/gimpinkoptions-gui.c:68
+#: ../app/tools/gimpinkoptions-gui.c:93
+#: ../app/tools/gimprectangleoptions.c:973
+#: ../app/tools/gimptextoptions.c:452
 msgid "Size:"
 msgstr "Rozmiar:"
 
-#: ../app/tools/gimpinkoptions-gui.c:76 ../app/tools/gimpmeasuretool.c:1034
+#: ../app/tools/gimpinkoptions-gui.c:76
+#: ../app/tools/gimpmeasuretool.c:1034
 #: ../app/widgets/gimpbrusheditor.c:208
 msgid "Angle:"
 msgstr "Kąt:"
@@ -10540,18 +10280,19 @@ msgstr "Nożyczki"
 
 #: ../app/tools/gimpiscissorstool.c:279
 msgid "Scissors Select Tool: Select shapes using intelligent edge-fitting"
-msgstr ""
-"Inteligentne nożyce: Zaznacza obszary, używając dopasowania do krawędzi"
+msgstr "Inteligentne nożyce: Zaznacza obszary, używając dopasowania do krawędzi"
 
 #: ../app/tools/gimpiscissorstool.c:280
 msgid "Intelligent _Scissors"
 msgstr "Inteligentne _nożyce"
 
-#: ../app/tools/gimpiscissorstool.c:940 ../app/tools/gimpmeasuretool.c:606
+#: ../app/tools/gimpiscissorstool.c:940
+#: ../app/tools/gimpmeasuretool.c:606
 msgid "Click-Drag to move this point"
 msgstr "Kliknięcie i przeciągnięcie przemieszcza bieżący punkt"
 
-#: ../app/tools/gimpiscissorstool.c:942 ../app/tools/gimpiscissorstool.c:1007
+#: ../app/tools/gimpiscissorstool.c:942
+#: ../app/tools/gimpiscissorstool.c:1007
 #, c-format
 msgid "%s: disable auto-snap"
 msgstr "%s: wyłącza automatyczne-przyciągania"
@@ -10645,7 +10386,8 @@ msgid "Auto-resize window"
 msgstr "Dopasuj rozmiar okna"
 
 #. tool toggle
-#: ../app/tools/gimpmagnifyoptions.c:172 ../app/tools/gimpmoveoptions.c:188
+#: ../app/tools/gimpmagnifyoptions.c:172
+#: ../app/tools/gimpmoveoptions.c:188
 #, c-format
 msgid "Tool Toggle  (%s)"
 msgstr "Przełącznik narzędzia  %s"
@@ -10754,7 +10496,8 @@ msgstr "Przesunięcie: Przesuwa warstwy, zaznaczenia i inne obiekty"
 msgid "_Move"
 msgstr "_Przesunięcie"
 
-#: ../app/tools/gimpmovetool.c:276 ../app/tools/gimpmovetool.c:570
+#: ../app/tools/gimpmovetool.c:276
+#: ../app/tools/gimpmovetool.c:570
 msgid "Move Guide: "
 msgstr "Przenieś prowadnicę: "
 
@@ -10776,13 +10519,15 @@ msgstr "_Pędzel"
 
 #: ../app/tools/gimppaintoptions-gui.c:112
 #: ../app/tools/gimpselectionoptions.c:211
-#: ../app/widgets/gimpbrushselect.c:191 ../app/widgets/gimplayertreeview.c:269
+#: ../app/widgets/gimpbrushselect.c:191
+#: ../app/widgets/gimplayertreeview.c:269
 msgid "Mode:"
 msgstr "Tryb:"
 
 #: ../app/tools/gimppaintoptions-gui.c:127
 #: ../app/tools/gimptransformoptions.c:348
-#: ../app/widgets/gimpbrushselect.c:178 ../app/widgets/gimplayertreeview.c:284
+#: ../app/widgets/gimpbrushselect.c:178
+#: ../app/widgets/gimplayertreeview.c:284
 msgid "Opacity:"
 msgstr "Krycie:"
 
@@ -10809,7 +10554,8 @@ msgstr "Tempo"
 # kolizja!
 # app/gui/resize-dialog.c: "Wymiary"
 # app/tools/gimppaintoptions-gui.c: "Rozmiar"
-#: ../app/tools/gimppaintoptions-gui.c:168 ../app/tools/tools-enums.c:151
+#: ../app/tools/gimppaintoptions-gui.c:168
+#: ../app/tools/tools-enums.c:151
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -10881,11 +10627,8 @@ msgid "Pe_ncil"
 msgstr "Ołó_wek"
 
 #: ../app/tools/gimpperspectiveclonetool.c:127
-msgid ""
-"Perspective Clone Tool: Clone from an image source after applying a "
-"perspective transformation"
-msgstr ""
-"Klon perspektywy: Klonuje obraz po zastosowaniu transformacji perspektywy"
+msgid "Perspective Clone Tool: Clone from an image source after applying a perspective transformation"
+msgstr "Klon perspektywy: Klonuje obraz po zastosowaniu transformacji perspektywy"
 
 #: ../app/tools/gimpperspectiveclonetool.c:129
 msgid "_Perspective Clone"
@@ -10988,7 +10731,8 @@ msgstr "Zaznaczenie prostokątne: Zaznacza obszar prostokątny"
 msgid "_Rectangle Select"
 msgstr "Zaznaczenie p_rostokątne"
 
-#: ../app/tools/gimprectangletool.c:1084 ../app/tools/gimprectangletool.c:1980
+#: ../app/tools/gimprectangletool.c:1084
+#: ../app/tools/gimprectangletool.c:1980
 msgid "Rectangle: "
 msgstr "Prostokąt: "
 
@@ -11054,7 +10798,8 @@ msgctxt "command"
 msgid "Scale"
 msgstr "Skalowanie"
 
-#: ../app/tools/gimpselectionoptions.c:258 ../app/tools/gimptextoptions.c:473
+#: ../app/tools/gimpselectionoptions.c:258
+#: ../app/tools/gimptextoptions.c:473
 msgid "Antialiasing"
 msgstr "Wygładzaj"
 
@@ -11141,20 +10886,12 @@ msgid "Click to smudge the line"
 msgstr "Kliknij, aby rozsmarować linię"
 
 #: ../app/tools/gimptextoptions.c:127
-msgid ""
-"Hinting alters the font outline to produce a crisp bitmap at small sizes"
-msgstr ""
-"Hinting wpływa przy niewielkich rozmiarach znaków na kształt czcionki, tak "
-"aby przy rasteryzacji powstawała bitmapa lepszej jakości."
+msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes"
+msgstr "Hinting wpływa przy niewielkich rozmiarach znaków na kształt czcionki, tak aby przy rasteryzacji powstawała bitmapa lepszej jakości."
 
 #: ../app/tools/gimptextoptions.c:134
-msgid ""
-"If available, hints from the font are used but you may prefer to always use "
-"the automatic hinter"
-msgstr ""
-"Jeśli dostępne są podpowiedzi dotyczące rasteryzacji dołączone do czcionki, "
-"wówczas GIMP z nich korzysta. Możliwe jest jednak korzystanie wyłącznie ze "
-"sposobu hintingu wbudowanego w program."
+msgid "If available, hints from the font are used but you may prefer to always use the automatic hinter"
+msgstr "Jeśli dostępne są podpowiedzi dotyczące rasteryzacji dołączone do czcionki, wówczas GIMP z nich korzysta. Możliwe jest jednak korzystanie wyłącznie ze sposobu hintingu wbudowanego w program."
 
 #: ../app/tools/gimptextoptions.c:159
 msgid "Indentation of the first line"
@@ -11213,7 +10950,8 @@ msgstr "_Tekst"
 msgid "GIMP Text Editor"
 msgstr "Edytor tekstowy programu GIMP"
 
-#: ../app/tools/gimptexttool.c:1070 ../app/tools/gimptexttool.c:1073
+#: ../app/tools/gimptexttool.c:1070
+#: ../app/tools/gimptexttool.c:1073
 msgid "Confirm Text Editing"
 msgstr "Potwierdzenie modyfikacji tekstu"
 
@@ -11223,18 +10961,13 @@ msgstr "Utwórz _nową warstwę"
 
 #: ../app/tools/gimptexttool.c:1101
 msgid ""
-"The layer you selected is a text layer but it has been modified using other "
-"tools. Editing the layer with the text tool will discard these "
-"modifications.\n"
+"The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n"
 "\n"
 "You can edit the layer or create a new text layer from its text attributes."
 msgstr ""
-"Zaznaczona warstwa jest warstwą tekstową, jednak została zmodyfikowana przy "
-"użyciu innych narzędzi. Wprowadzenie zmian przy użyciu narzędzia tekstowego "
-"spowoduje porzucenie zmian wykonanych wcześniej innymi narzędziami.\n"
+"Zaznaczona warstwa jest warstwą tekstową, jednak została zmodyfikowana przy użyciu innych narzędzi. Wprowadzenie zmian przy użyciu narzędzia tekstowego spowoduje porzucenie zmian wykonanych wcześniej innymi narzędziami.\n"
 "\n"
-"Możliwe jest zmodyfikowanie warstwy lub utworzenie nowej warstwy tekstowej w "
-"oparciu o atrybuty obecnej."
+"Możliwe jest zmodyfikowanie warstwy lub utworzenie nowej warstwy tekstowej w oparciu o atrybuty obecnej."
 
 #: ../app/tools/gimptexttool.c:1313
 msgid "Reshape Text Layer"
@@ -11242,9 +10975,7 @@ msgstr "Zmiana kształtu warstwy tekstowej"
 
 #: ../app/tools/gimpthresholdtool.c:91
 msgid "Threshold Tool: Reduce image to two colors using a threshold"
-msgstr ""
-"Progowanie: Zmniejsza do dwóch liczbę kolorów w obrazie przy użyciu "
-"progowania"
+msgstr "Progowanie: Zmniejsza do dwóch liczbę kolorów w obrazie przy użyciu progowania"
 
 #: ../app/tools/gimpthresholdtool.c:92
 msgid "_Threshold..."
@@ -11420,11 +11151,13 @@ msgstr "Kliknij, aby stworzyć nową składową ścieżki"
 msgid "Click or Click-Drag to create a new anchor"
 msgstr "Kliknij lub kliknij i przeciągnij, aby stworzyć nowe zakotwiczenie"
 
-#: ../app/tools/gimpvectortool.c:1189 ../app/tools/gimpvectortool.c:1196
+#: ../app/tools/gimpvectortool.c:1189
+#: ../app/tools/gimpvectortool.c:1196
 msgid "Click-Drag to move the anchor around"
 msgstr "Kliknij i przeciągnij, aby przemieścić zakotwiczenie"
 
-#: ../app/tools/gimpvectortool.c:1200 ../app/tools/gimpvectortool.c:1213
+#: ../app/tools/gimpvectortool.c:1200
+#: ../app/tools/gimpvectortool.c:1213
 msgid "Click-Drag to move the anchors around"
 msgstr "Kliknij i przeciągnij, aby przemieścić zakotwiczenie"
 
@@ -11459,8 +11192,7 @@ msgstr "Kliknij, aby usunąć zakotwiczenie"
 
 #: ../app/tools/gimpvectortool.c:1250
 msgid "Click to connect this anchor with the selected endpoint"
-msgstr ""
-"Kliknij, aby połączyć bieżące zakotwiczenie z zaznaczonym punktem końcowym"
+msgstr "Kliknij, aby połączyć bieżące zakotwiczenie z zaznaczonym punktem końcowym"
 
 #: ../app/tools/gimpvectortool.c:1255
 msgid "Click to open up the path"
@@ -11499,12 +11231,14 @@ msgstr "Złoty podział"
 msgid "Aspect ratio"
 msgstr "Proporcje"
 
-#: ../app/tools/tools-enums.c:149 ../app/widgets/gimpgrideditor.c:265
+#: ../app/tools/tools-enums.c:149
+#: ../app/widgets/gimpgrideditor.c:265
 #: ../app/widgets/gimpgrideditor.c:297
 msgid "Width"
 msgstr "Szerokość"
 
-#: ../app/tools/tools-enums.c:150 ../app/widgets/gimpgrideditor.c:267
+#: ../app/tools/tools-enums.c:150
+#: ../app/widgets/gimpgrideditor.c:267
 #: ../app/widgets/gimpgrideditor.c:299
 msgid "Height"
 msgstr "Wysokość"
@@ -11521,7 +11255,8 @@ msgstr "Stały rozmiar"
 msgid "Fixed aspect ratio"
 msgstr "Stałe proporcje"
 
-#: ../app/tools/tools-enums.c:211 ../app/vectors/gimpvectors.c:192
+#: ../app/tools/tools-enums.c:211
+#: ../app/vectors/gimpvectors.c:192
 msgid "Path"
 msgstr "Ścieżka"
 
@@ -11553,7 +11288,8 @@ msgstr "Przesunięcie"
 msgid "Rename Path"
 msgstr "Zmiana nazwy ścieżki"
 
-#: ../app/vectors/gimpvectors.c:194 ../app/vectors/gimpvectors.c:316
+#: ../app/vectors/gimpvectors.c:194
+#: ../app/vectors/gimpvectors.c:316
 msgid "Move Path"
 msgstr "Przesunięcie ścieżki"
 
@@ -11565,15 +11301,18 @@ msgstr "Przeskalowanie ścieżki"
 msgid "Resize Path"
 msgstr "Zmiana rozmiaru ścieżki"
 
-#: ../app/vectors/gimpvectors.c:197 ../app/vectors/gimpvectors.c:415
+#: ../app/vectors/gimpvectors.c:197
+#: ../app/vectors/gimpvectors.c:415
 msgid "Flip Path"
 msgstr "Odbicie ścieżki"
 
-#: ../app/vectors/gimpvectors.c:198 ../app/vectors/gimpvectors.c:446
+#: ../app/vectors/gimpvectors.c:198
+#: ../app/vectors/gimpvectors.c:446
 msgid "Rotate Path"
 msgstr "Obrót ścieżki"
 
-#: ../app/vectors/gimpvectors.c:199 ../app/vectors/gimpvectors.c:476
+#: ../app/vectors/gimpvectors.c:199
+#: ../app/vectors/gimpvectors.c:476
 msgid "Transform Path"
 msgstr "Przekształcenie ścieżki"
 
@@ -11627,7 +11366,8 @@ msgstr "Skrót"
 msgid "Name"
 msgstr "Nazwa"
 
-#: ../app/widgets/gimpactionview.c:641 ../app/widgets/gimpactionview.c:846
+#: ../app/widgets/gimpactionview.c:641
+#: ../app/widgets/gimpactionview.c:846
 msgid "Changing shortcut failed."
 msgstr "Nie można zmienić skrótu."
 
@@ -11642,15 +11382,12 @@ msgstr "_Zmień przypisanie skrótu"
 #: ../app/widgets/gimpactionview.c:704
 #, c-format
 msgid "Shortcut \"%s\" is already taken by \"%s\" from the \"%s\" group."
-msgstr ""
-"Skrót \"%s\" został już powiązany z operacją \"%s\" z grupy o nazwie \"%s\"."
+msgstr "Skrót \"%s\" został już powiązany z operacją \"%s\" z grupy o nazwie \"%s\"."
 
 #: ../app/widgets/gimpactionview.c:708
 #, c-format
 msgid "Reassigning the shortcut will cause it to be removed from \"%s\"."
-msgstr ""
-"Zmiana przypisania skrótu spowoduje, że jego skojarzenie z operacją \"%s\" "
-"zostanie usunięte."
+msgstr "Zmiana przypisania skrótu spowoduje, że jego skojarzenie z operacją \"%s\" zostanie usunięte."
 
 #: ../app/widgets/gimpactionview.c:781
 msgid "Invalid shortcut."
@@ -11682,7 +11419,8 @@ msgstr "Odstęp:"
 msgid "Percentage of width of brush"
 msgstr "Procent szerokości pędzla"
 
-#: ../app/widgets/gimpbufferview.c:173 ../app/widgets/gimpbufferview.c:257
+#: ../app/widgets/gimpbufferview.c:173
+#: ../app/widgets/gimpbufferview.c:257
 #: ../app/widgets/gimpeditor.c:754
 msgid "(None)"
 msgstr "(Brak)"
@@ -11734,30 +11472,30 @@ msgid "No filter selected"
 msgstr "Nie zaznaczono filtru"
 
 #: ../app/widgets/gimpcoloreditor.c:263
-msgid ""
-"Hexadecimal color notation as used in HTML and CSS.  This entry also accepts "
-"CSS color names."
-msgstr ""
-"Heksadecymedalny zapis koloru jest używany w HTML-u oraz w CSS. To pole "
-"dopuszcza również nazwy koloru CSS."
+msgid "Hexadecimal color notation as used in HTML and CSS.  This entry also accepts CSS color names."
+msgstr "Heksadecymedalny zapis koloru jest używany w HTML-u oraz w CSS. To pole dopuszcza również nazwy koloru CSS."
 
 #: ../app/widgets/gimpcolorframe.c:501
 msgid "Index:"
 msgstr "Indeks:"
 
-#: ../app/widgets/gimpcolorframe.c:514 ../app/widgets/gimpcolorframe.c:540
+#: ../app/widgets/gimpcolorframe.c:514
+#: ../app/widgets/gimpcolorframe.c:540
 msgid "Red:"
 msgstr "Czerwony:"
 
-#: ../app/widgets/gimpcolorframe.c:515 ../app/widgets/gimpcolorframe.c:541
+#: ../app/widgets/gimpcolorframe.c:515
+#: ../app/widgets/gimpcolorframe.c:541
 msgid "Green:"
 msgstr "Zielony:"
 
-#: ../app/widgets/gimpcolorframe.c:516 ../app/widgets/gimpcolorframe.c:542
+#: ../app/widgets/gimpcolorframe.c:516
+#: ../app/widgets/gimpcolorframe.c:542
 msgid "Blue:"
 msgstr "Niebieski:"
 
-#: ../app/widgets/gimpcolorframe.c:529 ../app/widgets/gimpcolorframe.c:562
+#: ../app/widgets/gimpcolorframe.c:529
+#: ../app/widgets/gimpcolorframe.c:562
 msgid "Value:"
 msgstr "Wartość:"
 
@@ -11793,10 +11531,14 @@ msgstr "Czarny:"
 msgid "Alpha:"
 msgstr "Alfa:"
 
-#: ../app/widgets/gimpcolorframe.c:623 ../app/widgets/gimpcursorview.c:134
-#: ../app/widgets/gimpcursorview.c:140 ../app/widgets/gimpcursorview.c:156
-#: ../app/widgets/gimpcursorview.c:162 ../app/widgets/gimpcursorview.c:444
-#: ../app/widgets/gimpcursorview.c:445 ../app/widgets/gimpcursorview.c:446
+#: ../app/widgets/gimpcolorframe.c:623
+#: ../app/widgets/gimpcursorview.c:134
+#: ../app/widgets/gimpcursorview.c:140
+#: ../app/widgets/gimpcursorview.c:156
+#: ../app/widgets/gimpcursorview.c:162
+#: ../app/widgets/gimpcursorview.c:444
+#: ../app/widgets/gimpcursorview.c:445
+#: ../app/widgets/gimpcursorview.c:446
 #: ../app/widgets/gimpcursorview.c:447
 msgid "n/a"
 msgstr "nd"
@@ -11999,14 +11741,11 @@ msgstr "Usunąć urządzenie \"%s\"?"
 #: ../app/widgets/gimpcontrollerlist.c:573
 #, c-format
 msgid ""
-"Removing this controller from the list of active controllers will "
-"permanently delete all event mappings you have configured.\n"
+"Removing this controller from the list of active controllers will permanently delete all event mappings you have configured.\n"
 "\n"
-"Selecting \"Disable Controller\" will disable the controller without "
-"removing it."
+"Selecting \"Disable Controller\" will disable the controller without removing it."
 msgstr ""
-"Usunięcie tego urządzenia z listy aktywnych urządzeń, usunie wszystkie "
-"mapowania zdarzeń, które zostały skonfigurowane.\n"
+"Usunięcie tego urządzenia z listy aktywnych urządzeń, usunie wszystkie mapowania zdarzeń, które zostały skonfigurowane.\n"
 "\n"
 "Polecenie \"Wyłącz urządzenie\" wyłączy urządzenie, bez usuwania go."
 
@@ -12066,11 +11805,13 @@ msgstr "Kółko myszy"
 msgid "Mouse Wheel Events"
 msgstr "Zdarzenia kółka myszy"
 
-#: ../app/widgets/gimpcursorview.c:137 ../app/widgets/gimpcursorview.c:159
+#: ../app/widgets/gimpcursorview.c:137
+#: ../app/widgets/gimpcursorview.c:159
 msgid "X"
 msgstr "X"
 
-#: ../app/widgets/gimpcursorview.c:143 ../app/widgets/gimpcursorview.c:165
+#: ../app/widgets/gimpcursorview.c:143
+#: ../app/widgets/gimpcursorview.c:165
 msgid "Y"
 msgstr "Y"
 
@@ -12302,12 +12043,8 @@ msgid "The GIMP help browser is not available."
 msgstr "Nie można odnaleźć przeglądarki pomocy programu GIMP."
 
 #: ../app/widgets/gimphelp.c:278
-msgid ""
-"The GIMP help browser plug-in appears to be missing from your installation. "
-"You may instead use the web browser for reading the help pages."
-msgstr ""
-"Nie można odnaleźć wtyczki przeglądarki pomocy programu GIMP. Alternatywnie, "
-"możesz użyć przeglądarki internetowej aby przeczytać strony pomocy. "
+msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages."
+msgstr "Nie można odnaleźć wtyczki przeglądarki pomocy programu GIMP. Alternatywnie, możesz użyć przeglądarki internetowej aby przeczytać strony pomocy. "
 
 #: ../app/widgets/gimphelp.c:319
 msgid "Help browser doesn't start"
@@ -12331,17 +12068,11 @@ msgstr "_Czytaj z sieci"
 
 #: ../app/widgets/gimphelp.c:627
 msgid "The GIMP user manual is not installed on your computer."
-msgstr ""
-"Podręcznik użytkownika programu GIMP nie został zainstalowany na tym "
-"komputerze."
+msgstr "Podręcznik użytkownika programu GIMP nie został zainstalowany na tym komputerze."
 
 #: ../app/widgets/gimphelp.c:630
-msgid ""
-"You may either install the additional help package or change your "
-"preferences to use the online version."
-msgstr ""
-"Możesz zainstalować dodatkowe pakiety pomocy lub zmienić ustawienia, aby "
-"użyć wersji sieciowej."
+msgid "You may either install the additional help package or change your preferences to use the online version."
+msgstr "Możesz zainstalować dodatkowe pakiety pomocy lub zmienić ustawienia, aby użyć wersji sieciowej."
 
 #: ../app/widgets/gimphistogrameditor.c:99
 msgid "Mean:"
@@ -12474,10 +12205,8 @@ msgid "Auto"
 msgstr "Autom."
 
 #: ../app/widgets/gimpmenudock.c:170
-msgid ""
-"When enabled the dialog automatically follows the image you are working on."
-msgstr ""
-"Powoduje, że okno dialogowe automatycznie dopasowuje się do bieżącego obrazu."
+msgid "When enabled the dialog automatically follows the image you are working on."
+msgstr "Powoduje, że okno dialogowe automatycznie dopasowuje się do bieżącego obrazu."
 
 #: ../app/widgets/gimpmessagebox.c:443
 #, c-format
@@ -12670,16 +12399,19 @@ msgstr ""
 msgid "Pr_eview"
 msgstr "_Podgląd"
 
-#: ../app/widgets/gimpthumbbox.c:417 ../app/widgets/gimpthumbbox.c:481
+#: ../app/widgets/gimpthumbbox.c:417
+#: ../app/widgets/gimpthumbbox.c:481
 msgid "No selection"
 msgstr "Brak zaznaczenia"
 
-#: ../app/widgets/gimpthumbbox.c:609 ../app/widgets/gimpthumbbox.c:630
+#: ../app/widgets/gimpthumbbox.c:609
+#: ../app/widgets/gimpthumbbox.c:630
 #, c-format
 msgid "Thumbnail %d of %d"
 msgstr "Miniaturka %d z %d"
 
-#: ../app/widgets/gimpthumbbox.c:743 ../app/widgets/gimpthumbbox.c:753
+#: ../app/widgets/gimpthumbbox.c:743
+#: ../app/widgets/gimpthumbbox.c:753
 msgid "Creating preview..."
 msgstr "Tworzenie podglądu ..."
 
@@ -12930,18 +12662,12 @@ msgid "Keep above"
 msgstr "Wyświetlaj na wierzchu"
 
 #: ../app/xcf/xcf-load.c:277
-msgid ""
-"This XCF file is corrupt!  I have loaded as much of it as I can, but it is "
-"incomplete."
-msgstr ""
-"Plik XCF jest uszkodzony!  Tylko część pliku została wczytana, dlatego jest "
-"niekompletny."
+msgid "This XCF file is corrupt!  I have loaded as much of it as I can, but it is incomplete."
+msgstr "Plik XCF jest uszkodzony!  Tylko część pliku została wczytana, dlatego jest niekompletny."
 
 #: ../app/xcf/xcf-load.c:286
 #, c-format
-msgid ""
-"This XCF file is corrupt!  I could not even salvage any partial image data "
-"from it."
+msgid "This XCF file is corrupt!  I could not even salvage any partial image data from it."
 msgstr "Plik XCF jest uszkodzony!  Nie można było wczytać nawet części pliku."
 
 #: ../app/xcf/xcf-load.c:324
@@ -12963,12 +12689,15 @@ msgstr "Niepoprawne ciąg znaków UTF-8 w pliku XCF"
 msgid "Error writing XCF: %s"
 msgstr "Błąd przy zapisie pliku w formacie XCF: %s"
 
-#: ../app/xcf/xcf-seek.c:44 ../app/xcf/xcf-seek.c:61 ../app/xcf/xcf-seek.c:72
+#: ../app/xcf/xcf-seek.c:44
+#: ../app/xcf/xcf-seek.c:61
+#: ../app/xcf/xcf-seek.c:72
 #, c-format
 msgid "Could not seek in XCF file: %s"
 msgstr "Nie można przeglądać pliku XCF: %s"
 
-#: ../app/xcf/xcf.c:99 ../app/xcf/xcf.c:167
+#: ../app/xcf/xcf.c:99
+#: ../app/xcf/xcf.c:167
 msgid "GIMP XCF image"
 msgstr "Obraz XCF programu GIMP"
 
@@ -13003,9 +12732,7 @@ msgstr "Edytor obrazu"
 
 #: ../tools/gimp-remote.c:65
 msgid "Use a running GIMP only, never start a new one"
-msgstr ""
-"Należy używać wyłącznie aktualnie uruchomionego programu GIMP. Nie należy "
-"uruchamiać nowego."
+msgstr "Należy używać wyłącznie aktualnie uruchomionego programu GIMP. Nie należy uruchamiać nowego."
 
 #: ../tools/gimp-remote.c:70
 msgid "Only check if GIMP is running, then quit"
@@ -13013,8 +12740,7 @@ msgstr "Zaznacz jeżeli GIMP jest już uruchomiony, a potem wyjdź"
 
 #: ../tools/gimp-remote.c:76
 msgid "Print X window ID of GIMP toolbox window, then quit"
-msgstr ""
-"Wyświetla numer identyfikacyjny ID okna przybornika GIMP-a i kończy pracę"
+msgstr "Wyświetla numer identyfikacyjny ID okna przybornika GIMP-a i kończy pracę"
 
 #: ../tools/gimp-remote.c:82
 msgid "Start GIMP without showing the startup window"
@@ -13033,3 +12759,4 @@ msgstr "Upewnij się, że przybornik jest widoczny."
 #, c-format
 msgid "Couldn't start '%s': %s"
 msgstr "Nie można uruchomić \"%s\": %s"
+
diff --git a/po/ro.po b/po/ro.po
index a41800ad50..229204ec89 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -1,22 +1,22 @@
-# gimp ro translation
+# Romanian GIMP translation
 # Copyright (C) YEAR Free Software Foundation, Inc.
 # Robert Claudiu Gheorghe , 2001.
-# Cristian Secară , 2008.
+# Cristian Secară , 2008-2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-22 23:29+0200\n"
-"PO-Revision-Date: 2009-03-20 17:09+0200\n"
+"POT-Creation-Date: 2009-09-28 23:09+0300\n"
+"PO-Revision-Date: 2009-09-20 23:30+0200\n"
 "Last-Translator: Cristian Secară \n"
-"Language-Team: Română \n"
+"Language-Team: Gnome Romanian Team \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
 "20)) ? 1 : 2;\n"
-"X-Poedit-Bookmarks: 1111,2471,1245,-1,-1,-1,-1,-1,-1,-1\n"
+"X-Poedit-Bookmarks: 77,2471,1245,-1,-1,-1,-1,-1,-1,-1\n"
 
 #: ../app/about.h:24
 msgid "GIMP"
@@ -213,7 +213,7 @@ msgstr "(Scrieți orice caracter pentru a închide această fereastră)\n"
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "Ieșire GIMP. Puteți imnimiza această feeastră, dar nu o închideți."
 
-#: ../app/sanity.c:342
+#: ../app/sanity.c:365
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -224,7 +224,7 @@ msgstr ""
 "\n"
 "Verificați valoarea variabilei de mediu G_FILENAME_ENCODING."
 
-#: ../app/sanity.c:361
+#: ../app/sanity.c:384
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be "
@@ -430,11 +430,11 @@ msgstr "Ferestre"
 
 #: ../app/actions/brush-editor-actions.c:43
 msgid "Brush Editor Menu"
-msgstr "Meniu editare penel"
+msgstr "Meniu de editor de penel"
 
 #: ../app/actions/brush-editor-actions.c:50
 msgid "Edit Active Brush"
-msgstr "Editare penel activ"
+msgstr "Editează penelul activ"
 
 #: ../app/actions/brushes-actions.c:43
 msgid "Brushes Menu"
@@ -490,11 +490,11 @@ msgstr "Reîmprospătează penelurile"
 
 #: ../app/actions/brushes-actions.c:86
 msgid "_Edit Brush..."
-msgstr "_Editare penel..."
+msgstr "_Editează penelul..."
 
 #: ../app/actions/brushes-actions.c:87
 msgid "Edit brush"
-msgstr "Editare penel"
+msgstr "Editează penelul"
 
 #: ../app/actions/buffers-actions.c:42
 msgid "Buffers Menu"
@@ -538,11 +538,11 @@ msgstr "Meniu canale"
 
 #: ../app/actions/channels-actions.c:48
 msgid "_Edit Channel Attributes..."
-msgstr "_Editare atribute canal..."
+msgstr "_Editează atributele de canal..."
 
 #: ../app/actions/channels-actions.c:49
 msgid "Edit the channel's name, color and opacity"
-msgstr "Editare nume canal, culoare și opacitate"
+msgstr "Editează numele de canal, culoare și opacitate"
 
 #: ../app/actions/channels-actions.c:54
 msgid "_New Channel..."
@@ -652,7 +652,7 @@ msgstr "Atribute canal"
 
 #: ../app/actions/channels-commands.c:88
 msgid "Edit Channel Attributes"
-msgstr "Editare atribute canal"
+msgstr "Editare atribute de canal"
 
 #: ../app/actions/channels-commands.c:90
 msgid "Edit Channel Color"
@@ -699,12 +699,12 @@ msgstr "Meniu paletă de culori"
 #: ../app/actions/colormap-actions.c:48
 #: ../app/actions/palette-editor-actions.c:48
 msgid "_Edit Color..."
-msgstr "_Editare culoare..."
+msgstr "_Editează culoarea..."
 
 #: ../app/actions/colormap-actions.c:49
 #: ../app/actions/palette-editor-actions.c:49
 msgid "Edit color"
-msgstr "Editare culoare"
+msgstr "Editează culoarea"
 
 #: ../app/actions/colormap-actions.c:57
 msgid "_Add Color from FG"
@@ -725,7 +725,7 @@ msgstr "Adaugă culoarea de fundal actuală"
 #: ../app/actions/colormap-commands.c:73
 #, c-format
 msgid "Edit colormap entry #%d"
-msgstr "Editarea intrării #%d din paleta de culori"
+msgstr "Editare intrare #%d din paleta de culori"
 
 #: ../app/actions/colormap-commands.c:80
 msgid "Edit Colormap Entry"
@@ -846,7 +846,7 @@ msgstr "Eșantion combinat"
 #: ../app/dialogs/file-open-location-dialog.c:225
 #: ../app/display/gimpdisplayshell-dnd.c:537
 #: ../app/widgets/gimplayertreeview.c:730 ../app/widgets/gimptoolbox-dnd.c:158
-#: ../app/widgets/gimptoolbox.c:979
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -1352,7 +1352,7 @@ msgstr "_Egalizează"
 
 #: ../app/actions/drawable-actions.c:46
 msgid "Automatic contrast enhancement"
-msgstr "Ameliorare automată de contrast"
+msgstr "Îmbunătățire automată de contrast"
 
 #: ../app/actions/drawable-actions.c:51
 msgid "In_vert"
@@ -1836,9 +1836,10 @@ msgstr "Închide toate i_maginile"
 msgid "Close all opened images"
 msgstr "Închide toate imaginile deschise"
 
+# hm ? cu părăsire dă aiurea, a se vedea comentarii la
 #: ../app/actions/file-actions.c:107
 msgid "_Quit"
-msgstr "Părăs_ește"
+msgstr "Părăs_ește aplicația"
 
 # hm ?
 #: ../app/actions/file-actions.c:108
@@ -1976,7 +1977,7 @@ msgstr "Scanează din nou lista de fonturi"
 
 #: ../app/actions/gradient-editor-actions.c:46
 msgid "Gradient Editor Menu"
-msgstr "Meniu editor degrade"
+msgstr "Meniu de editor de degrade"
 
 #: ../app/actions/gradient-editor-actions.c:50
 msgid "Left Color Type"
@@ -2359,11 +2360,11 @@ msgstr "Reîmprospătează degradeurile"
 
 #: ../app/actions/gradients-actions.c:87
 msgid "_Edit Gradient..."
-msgstr "_Editare degrade..."
+msgstr "_Editează degradeul..."
 
 #: ../app/actions/gradients-actions.c:88
 msgid "Edit gradient"
-msgstr "Editare degrade"
+msgstr "Editează degradeul"
 
 # hm ? sau ca fișier POV-Ray ?
 #: ../app/actions/gradients-commands.c:66
@@ -2594,10 +2595,12 @@ msgstr "Nu se poate decupa deoarece selecția curentă este goală."
 msgid "Change Print Size"
 msgstr "Schimbă dimensiunea de tipărire"
 
+# apare la contextul lui undo
 #: ../app/actions/image-commands.c:647 ../app/core/gimpimage-scale.c:82
 msgid "Scale Image"
-msgstr "Scalează imaginea"
+msgstr "Scalare imagine"
 
+# apare pe bara de progres
 #. Scaling
 #: ../app/actions/image-commands.c:658 ../app/actions/layers-commands.c:1101
 #: ../app/dialogs/preferences-dialog.c:1925
@@ -2679,7 +2682,7 @@ msgstr "Activează instrumentul text pe acest strat de text"
 
 #: ../app/actions/layers-actions.c:68
 msgid "_Edit Layer Attributes..."
-msgstr "_Editare atribute strat..."
+msgstr "_Editează atributele de strat..."
 
 #: ../app/actions/layers-actions.c:69
 msgid "Edit the layer's name"
@@ -2863,7 +2866,7 @@ msgstr "Păstrează informațiile despre transparență "
 
 #: ../app/actions/layers-actions.c:222
 msgid "_Edit Layer Mask"
-msgstr "_Editare mască de strat"
+msgstr "_Editează masca de strat"
 
 #: ../app/actions/layers-actions.c:223
 msgid "Work on the layer mask"
@@ -3000,11 +3003,11 @@ msgstr "Stabilește opacitatea"
 
 #: ../app/actions/layers-commands.c:203
 msgid "Layer Attributes"
-msgstr "Atribute strat"
+msgstr "Atribute de strat"
 
 #: ../app/actions/layers-commands.c:206
 msgid "Edit Layer Attributes"
-msgstr "Editare atribute strat"
+msgstr "Editare atribute de strat"
 
 #: ../app/actions/layers-commands.c:249 ../app/actions/layers-commands.c:251
 #: ../app/actions/layers-commands.c:319 ../app/actions/layers-commands.c:323
@@ -3041,7 +3044,8 @@ msgstr "Mască de strat la selecție"
 msgid "Please select a channel first"
 msgstr "Mai întâi selectați un canal"
 
-#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1282
+# apare la contextul lui undo
+#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1283
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "Adăugare mască de strat"
@@ -3231,11 +3235,11 @@ msgstr "Reîmprospătează modelele"
 
 #: ../app/actions/patterns-actions.c:86
 msgid "_Edit Pattern..."
-msgstr "_Editare model..."
+msgstr "_Editează modelul..."
 
 #: ../app/actions/patterns-actions.c:87
 msgid "Edit pattern"
-msgstr "Editare model"
+msgstr "Editează modelul"
 
 #: ../app/actions/plug-in-actions.c:83
 msgid "Filte_rs"
@@ -3287,7 +3291,7 @@ msgstr "D_ecor"
 
 #: ../app/actions/plug-in-actions.c:96
 msgid "_Render"
-msgstr "_Render"
+msgstr "_Randare"
 
 #: ../app/actions/plug-in-actions.c:97
 msgid "_Clouds"
@@ -3373,7 +3377,7 @@ msgid "Toggle _Quick Mask"
 msgstr "Comută _masca rapidă"
 
 #: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1167
+#: ../app/display/gimpdisplayshell.c:1169
 msgid "Toggle Quick Mask"
 msgstr "Comută masca rapidă"
 
@@ -3601,11 +3605,11 @@ msgstr "Duplică șablonul selectat"
 
 #: ../app/actions/templates-actions.c:64
 msgid "_Edit Template..."
-msgstr "_Editare șablon"
+msgstr "_Editează șablonul..."
 
 #: ../app/actions/templates-actions.c:65
 msgid "Edit the selected template"
-msgstr "Editare șablon selectat"
+msgstr "Editează șablonul selectat"
 
 #: ../app/actions/templates-actions.c:70
 msgid "_Delete Template"
@@ -3626,7 +3630,7 @@ msgstr "Creează un șablon nou"
 #: ../app/actions/templates-commands.c:175
 #: ../app/actions/templates-commands.c:178
 msgid "Edit Template"
-msgstr "Editare șablon"
+msgstr "Editează șablonul"
 
 #: ../app/actions/templates-commands.c:213
 msgid "Delete Template"
@@ -3854,11 +3858,11 @@ msgstr "Instrument _cale"
 
 #: ../app/actions/vectors-actions.c:53
 msgid "_Edit Path Attributes..."
-msgstr "_Editare atribute cale..."
+msgstr "_Editează atributele de cale..."
 
 #: ../app/actions/vectors-actions.c:54
 msgid "Edit path attributes"
-msgstr "Editare atribute cale"
+msgstr "Editează atributele de cale"
 
 #: ../app/actions/vectors-actions.c:59
 msgid "_New Path..."
@@ -5184,6 +5188,7 @@ msgid "value for token %s is not a valid UTF-8 string"
 msgstr "valoarea reprezentării %s nu este un șir UTF-8 valid"
 
 # la alinierea de la healing tool
+# la redimensionare canava
 #. no undo (or redo) steps available
 #: ../app/core/core-enums.c:53 ../app/core/core-enums.c:252
 #: ../app/core/core-enums.c:504 ../app/paint/paint-enums.c:81
@@ -5366,7 +5371,7 @@ msgstr "Toate straturile"
 
 #: ../app/core/core-enums.c:506
 msgid "Image-sized layers"
-msgstr "Straturi de dimensiunea imaginii"
+msgstr "Straturile de dimensiunea imaginii"
 
 #: ../app/core/core-enums.c:507
 msgid "All visible layers"
@@ -6023,7 +6028,7 @@ msgstr "Întoarce canalul"
 msgid "Rotate Channel"
 msgstr "Rotește canalul"
 
-#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:843
+#: ../app/core/gimpchannel.c:264 ../app/core/gimpdrawable-transform.c:886
 msgid "Transform Channel"
 msgstr "Transformă canalul"
 
@@ -6146,6 +6151,8 @@ msgctxt "command"
 msgid "Bucket Fill"
 msgstr "Umplere cu găleata"
 
+# titlu pe bara de fereastră
+# apare la contextul lui undo
 #: ../app/core/gimpdrawable-color-balance.c:80
 #: ../app/core/gimpdrawable-color-balance.c:90
 #: ../app/tools/gimpcolorbalancetool.c:94
@@ -6213,21 +6220,21 @@ msgstr "Randare tușă"
 msgid "Threshold"
 msgstr "Prag"
 
-#: ../app/core/gimpdrawable-transform.c:629 ../app/tools/gimpfliptool.c:116
+#: ../app/core/gimpdrawable-transform.c:645 ../app/tools/gimpfliptool.c:116
 msgctxt "command"
 msgid "Flip"
 msgstr "Întoarcere"
 
-#: ../app/core/gimpdrawable-transform.c:716 ../app/tools/gimprotatetool.c:121
+#: ../app/core/gimpdrawable-transform.c:745 ../app/tools/gimprotatetool.c:121
 msgctxt "command"
 msgid "Rotate"
 msgstr "Rotire"
 
-#: ../app/core/gimpdrawable-transform.c:841 ../app/core/gimplayer.c:255
+#: ../app/core/gimpdrawable-transform.c:884 ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "Strat de transformare"
 
-#: ../app/core/gimpdrawable-transform.c:856
+#: ../app/core/gimpdrawable-transform.c:899
 msgid "Transformation"
 msgstr "Transformare"
 
@@ -6672,7 +6679,7 @@ msgid "Rotate Layer"
 msgstr "Rotire strat"
 
 # hm ? sau mască ?
-#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1329
+#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1330
 #: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
@@ -6687,39 +6694,40 @@ msgstr ""
 "Selecție plutitoare\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1265
+#: ../app/core/gimplayer.c:1266
 #, c-format
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "Nu se poate adăuga o mască de strat deoarece stratul are deja una."
 
-#: ../app/core/gimplayer.c:1276
+#: ../app/core/gimplayer.c:1277
 #, c-format
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr ""
 "Nu se poate adăuga un strat de mască de dimensiune diferită față de stratul "
 "specificat."
 
-#: ../app/core/gimplayer.c:1384
+#: ../app/core/gimplayer.c:1385
 msgid "Transfer Alpha to Mask"
 msgstr "Transfer alfa la mască"
 
-#: ../app/core/gimplayer.c:1556 ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:1557 ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "Aplicare mască de strat"
 
-#: ../app/core/gimplayer.c:1557
+#: ../app/core/gimplayer.c:1558
 msgid "Delete Layer Mask"
 msgstr "Ștergere mască de strat"
 
-#: ../app/core/gimplayer.c:1669
+# apare la contextul lui undo
+#: ../app/core/gimplayer.c:1670
 msgid "Add Alpha Channel"
 msgstr "Adăugare canal alfa"
 
-#: ../app/core/gimplayer.c:1723
+#: ../app/core/gimplayer.c:1724
 msgid "Remove Alpha Channel"
 msgstr "Eliminare canal alfa"
 
-#: ../app/core/gimplayer.c:1745
+#: ../app/core/gimplayer.c:1746
 msgid "Layer to Image Size"
 msgstr "Strat la dimensiunea imaginii"
 
@@ -7814,7 +7822,7 @@ msgstr "Instrument de mutare"
 msgid "Set layer or path as active"
 msgstr "Stabilește ca activ stratul sau calea"
 
-#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:631
+#: ../app/dialogs/preferences-dialog.c:1966 ../app/widgets/gimptoolbox.c:633
 msgid "Toolbox"
 msgstr "Trusă de instrumente"
 
@@ -8543,20 +8551,20 @@ msgstr "Înaltă"
 msgid "Image saved to '%s'"
 msgstr "Imaginea a fost salvată în „%s”"
 
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "Accesează meniul de imagine"
 
-#: ../app/display/gimpdisplayshell.c:1138
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "Zoomează imaginea la schimbarea dimensiunii ferestrei"
 
-#: ../app/display/gimpdisplayshell.c:1188
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "Navighează afișarea imaginii"
 
-#: ../app/display/gimpdisplayshell.c:1283
-#: ../app/display/gimpdisplayshell.c:1373 ../app/widgets/gimptoolbox.c:222
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375 ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
 msgstr "Aruncați aici fișierele de imagine pentru a le deschide"
 
@@ -9632,7 +9640,7 @@ msgstr "Con_trast:"
 
 #: ../app/tools/gimpbrightnesscontrasttool.c:354
 msgid "Edit these Settings as Levels"
-msgstr "Editarea acestor configurări ca niveluri"
+msgstr "Editează aceste configurări ca niveluri"
 
 #: ../app/tools/gimpbucketfilloptions.c:100
 msgid "Allow completely transparent regions to be filled"
@@ -10481,7 +10489,7 @@ msgstr "Configurările au fost salvate în „%s”"
 
 #: ../app/tools/gimpimagemaptool.c:318
 msgid "_Preview"
-msgstr "_Previzualizare"
+msgstr "_Previzualizează"
 
 #. adjust sliders
 #: ../app/tools/gimpinkoptions-gui.c:56
@@ -10633,7 +10641,7 @@ msgstr "Ajustează automat nivelurile"
 
 #: ../app/tools/gimplevelstool.c:682
 msgid "Edit these Settings as Curves"
-msgstr "Editarea acestor configurări ca curbe"
+msgstr "Editează aceste configurări ca curbe"
 
 #: ../app/tools/gimplevelstool.c:825
 msgid "Use _old levels file format"
@@ -10995,7 +11003,7 @@ msgstr "Permite selectarea zonelor complet transparente"
 
 #: ../app/tools/gimpregionselectoptions.c:90
 msgid "Base region_select on all visible layers"
-msgstr "Bazează selecția zonei pe toate straturile vizibile"
+msgstr "Bazează _selecția zonei pe toate straturile vizibile"
 
 #: ../app/tools/gimpregionselectoptions.c:202
 msgid "Select transparent areas"
@@ -11215,7 +11223,7 @@ msgstr "Confirmare editare text"
 
 #: ../app/tools/gimptexttool.c:1079
 msgid "Create _New Layer"
-msgstr "Crează un strat _nou"
+msgstr "Creează un strat _nou"
 
 #: ../app/tools/gimptexttool.c:1103
 msgid ""
@@ -11263,7 +11271,7 @@ msgstr "Pragul nu operează pe imagini indexate."
 
 #: ../app/tools/gimpthresholdtool.c:266
 msgid "Automatically adjust to optimal binarization threshold"
-msgstr "Ajustează automat la pragul de binarizare optimă"
+msgstr "Ajustează automat la pragul de binarizare optim"
 
 #: ../app/tools/gimptransformoptions.c:273
 msgid "Transform:"
diff --git a/po/ru.po b/po/ru.po
index 740ed0cad6..3cd19ecc8a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,15 +4,15 @@
 # Valek Filippov , 1999-2002.
 # Anatoly A. Yakushin , 2003, 2004.
 # Roxana Kolosova , 2003-2006.
-# Alexandre Prokoudine , 2005, 2006, 2007.
+# Alexandre Prokoudine , 2005, 2006, 2007, 2009.
 msgid ""
 msgstr ""
 "Project-Id-Version: gimp trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-23 14:50+0300\n"
-"PO-Revision-Date: 2009-01-23 20:11+0300\n"
+"POT-Creation-Date: 2009-11-30 03:59+0300\n"
+"PO-Revision-Date: 2009-12-02 05:06+0300\n"
 "Last-Translator: Alexandre Prokoudine \n"
-"Language-Team: Russian \n"
+"Language-Team: Russian \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -191,7 +191,7 @@ msgstr "(Введите любой символ для закрытия этог
 msgid "GIMP output. You can minimize this window, but don't close it."
 msgstr "Вывод GIMP. Вы можете свернуть это окно, но не закрывайте его."
 
-#: ../app/sanity.c:342
+#: ../app/sanity.c:365
 #, c-format
 msgid ""
 "The configured filename encoding cannot be converted to UTF-8: %s\n"
@@ -202,7 +202,7 @@ msgstr ""
 "\n"
 "Проверьте значение переменной окружения G_FILENAME_ENCODING."
 
-#: ../app/sanity.c:361
+#: ../app/sanity.c:384
 #, c-format
 msgid ""
 "The name of the directory holding the GIMP user configuration cannot be converted to UTF-8: %s\n"
@@ -267,7 +267,7 @@ msgstr "Контекст"
 #: ../app/actions/actions.c:122
 #: ../app/dialogs/dialogs.c:150
 msgid "Pointer Information"
-msgstr "Информация о курсоре"
+msgstr "Информация об указателе"
 
 #: ../app/actions/actions.c:125
 msgid "Debug"
@@ -366,7 +366,7 @@ msgstr "Редактор палитры образцов"
 #: ../app/dialogs/dialogs.c:163
 #: ../app/dialogs/preferences-dialog.c:2752
 msgid "Palettes"
-msgstr "Палитры цветовых образцов"
+msgstr "Палитры цветов"
 
 #. initialize the list of gimp patterns
 #: ../app/actions/actions.c:179
@@ -410,7 +410,7 @@ msgstr "Редактор текста"
 #: ../app/actions/actions.c:200
 #: ../app/dialogs/dialogs.c:138
 #: ../app/dialogs/preferences-dialog.c:1880
-#: ../app/gui/gui.c:423
+#: ../app/gui/gui.c:429
 msgid "Tool Options"
 msgstr "Параметры инструментов"
 
@@ -455,7 +455,7 @@ msgstr "Открыть кисть как изображение"
 
 #: ../app/actions/brushes-actions.c:53
 msgid "_New Brush"
-msgstr "_Новая кисть"
+msgstr "_Создать кисть"
 
 #: ../app/actions/brushes-actions.c:54
 msgid "New brush"
@@ -463,7 +463,7 @@ msgstr "Новая кисть"
 
 #: ../app/actions/brushes-actions.c:59
 msgid "D_uplicate Brush"
-msgstr "С_оздать копию кисти"
+msgstr "Создать _копию кисти"
 
 #: ../app/actions/brushes-actions.c:60
 msgid "Duplicate brush"
@@ -471,11 +471,11 @@ msgstr "Создать копию кисти"
 
 #: ../app/actions/brushes-actions.c:65
 msgid "Copy Brush _Location"
-msgstr "Скопировать _местоположение кисти"
+msgstr "Скопировать _расположение кисти"
 
 #: ../app/actions/brushes-actions.c:66
 msgid "Copy brush file location to clipboard"
-msgstr "Скопировать местоположение файла кисти в буфер обмена"
+msgstr "Скопировать расположение файла кисти в буфер обмена"
 
 #: ../app/actions/brushes-actions.c:71
 msgid "_Delete Brush"
@@ -483,15 +483,15 @@ msgstr "_Удалить кисть"
 
 #: ../app/actions/brushes-actions.c:72
 msgid "Delete brush"
-msgstr "Удаление кисти"
+msgstr "Удалить кисть"
 
 #: ../app/actions/brushes-actions.c:77
 msgid "_Refresh Brushes"
-msgstr "_Обновить кисти"
+msgstr "_Обновить список кистей"
 
 #: ../app/actions/brushes-actions.c:78
 msgid "Refresh brushes"
-msgstr "Обновление кистей"
+msgstr "Обновить список кистей"
 
 #: ../app/actions/brushes-actions.c:86
 msgid "_Edit Brush..."
@@ -499,11 +499,11 @@ msgstr "_Изменить кисть..."
 
 #: ../app/actions/brushes-actions.c:87
 msgid "Edit brush"
-msgstr "Правка кисти"
+msgstr "Изменить кисть"
 
 #: ../app/actions/buffers-actions.c:42
 msgid "Buffers Menu"
-msgstr "Меню буферов"
+msgstr "Меню буферов обмена"
 
 #: ../app/actions/buffers-actions.c:46
 msgid "_Paste Buffer"
@@ -523,7 +523,7 @@ msgstr "Вставить выбранный буфер в выделение"
 
 #: ../app/actions/buffers-actions.c:58
 msgid "Paste Buffer as _New"
-msgstr "Вставить буфер как _новый"
+msgstr "Вставить буфер в _новое изображение"
 
 #: ../app/actions/buffers-actions.c:59
 msgid "Paste the selected buffer as new image"
@@ -547,11 +547,11 @@ msgstr "_Правка атрибутов канала..."
 
 #: ../app/actions/channels-actions.c:49
 msgid "Edit the channel's name, color and opacity"
-msgstr "Укажите имя канала, его цвет и прозрачность"
+msgstr "Изменить название канала, его цвет и прозрачность"
 
 #: ../app/actions/channels-actions.c:54
 msgid "_New Channel..."
-msgstr "_Новый канал..."
+msgstr "_Создать канал..."
 
 #: ../app/actions/channels-actions.c:55
 msgid "Create a new channel"
@@ -559,7 +559,7 @@ msgstr "Создать новый канал"
 
 #: ../app/actions/channels-actions.c:60
 msgid "_New Channel"
-msgstr "_Новый канал"
+msgstr "_Создать канал"
 
 #: ../app/actions/channels-actions.c:61
 msgid "Create a new channel with last used values"
@@ -615,7 +615,7 @@ msgstr "Сделать этот канал нижним в стопке"
 
 #: ../app/actions/channels-actions.c:105
 msgid "Channel to Sele_ction"
-msgstr "Канал → В_ыделение"
+msgstr "Канал в в_ыделение"
 
 #: ../app/actions/channels-actions.c:106
 msgid "Replace the selection with this channel"
@@ -671,7 +671,7 @@ msgstr "Правка цвета канала"
 #: ../app/actions/channels-commands.c:91
 #: ../app/actions/channels-commands.c:123
 msgid "_Fill opacity:"
-msgstr "_Непрозрачн. заливки:"
+msgstr "_Непрозрачность заливки:"
 
 #: ../app/actions/channels-commands.c:116
 #: ../app/actions/channels-commands.c:117
@@ -712,12 +712,12 @@ msgstr "Меню цветовой карты"
 #: ../app/actions/colormap-actions.c:48
 #: ../app/actions/palette-editor-actions.c:48
 msgid "_Edit Color..."
-msgstr "_Правка цвета..."
+msgstr "_Изменить цвет..."
 
 #: ../app/actions/colormap-actions.c:49
 #: ../app/actions/palette-editor-actions.c:49
 msgid "Edit color"
-msgstr "Изменить цвет"
+msgstr "Изменить этот цвет"
 
 #: ../app/actions/colormap-actions.c:57
 msgid "_Add Color from FG"
@@ -725,7 +725,7 @@ msgstr "_Добавить цвет из п. плана"
 
 #: ../app/actions/colormap-actions.c:58
 msgid "Add current foreground color"
-msgstr "Добавляет активный цвет переднего плана"
+msgstr "Добавить активный цвет переднего плана"
 
 #: ../app/actions/colormap-actions.c:63
 msgid "_Add Color from BG"
@@ -733,7 +733,7 @@ msgstr "Добавить _цвет из фона"
 
 #: ../app/actions/colormap-actions.c:64
 msgid "Add current background color"
-msgstr "Добавляет активный цвет фона"
+msgstr "Добавить текущий цвет фона"
 
 #: ../app/actions/colormap-commands.c:73
 #, c-format
@@ -750,7 +750,7 @@ msgstr "Исполь_зовать GEGL"
 
 #: ../app/actions/config-actions.c:40
 msgid "If possible, use GEGL for image processing"
-msgstr "По возможности использовать GEGL для обработки избражений"
+msgstr "По возможности использовать GEGL для обработки изображений"
 
 #: ../app/actions/context-actions.c:46
 msgid "_Context"
@@ -787,7 +787,7 @@ msgstr "_Текстура"
 
 #: ../app/actions/context-actions.c:53
 msgid "_Palette"
-msgstr "_Палитра образцов"
+msgstr "_Образцы цветов"
 
 #: ../app/actions/context-actions.c:54
 #: ../app/dialogs/palette-import-dialog.c:216
@@ -813,11 +813,11 @@ msgstr "Л_учи"
 
 #: ../app/actions/context-actions.c:60
 msgid "_Hardness"
-msgstr "_Жесткость"
+msgstr "_Жёсткость"
 
 #: ../app/actions/context-actions.c:61
 msgid "_Aspect"
-msgstr "_Перспектива"
+msgstr "GIMP"
 
 #: ../app/actions/context-actions.c:62
 msgid "A_ngle"
@@ -841,13 +841,13 @@ msgstr "Поменять местами цвета переднего плана
 
 #: ../app/actions/cursor-info-actions.c:40
 msgid "Pointer Information Menu"
-msgstr "Меню «Информация о курсоре мыши»"
+msgstr "Меню «Информация об указателе»"
 
 #: ../app/actions/cursor-info-actions.c:47
 #: ../app/actions/sample-points-actions.c:47
 #: ../app/widgets/gimpcursorview.c:192
 msgid "_Sample Merged"
-msgstr "_Объединять по образцу"
+msgstr "_Сводить слои"
 
 #: ../app/actions/cursor-info-actions.c:48
 #: ../app/actions/sample-points-actions.c:48
@@ -864,7 +864,7 @@ msgstr "Объединять по образцу"
 #: ../app/display/gimpdisplayshell-dnd.c:537
 #: ../app/widgets/gimplayertreeview.c:730
 #: ../app/widgets/gimptoolbox-dnd.c:158
-#: ../app/widgets/gimptoolbox.c:979
+#: ../app/widgets/gimptoolbox.c:981
 #, c-format
 msgid ""
 "Opening '%s' failed:\n"
@@ -959,7 +959,7 @@ msgstr "Открыть диалог гистограммы"
 
 #: ../app/actions/dialogs-actions.c:81
 msgid "_Selection Editor"
-msgstr "Правка _выделенной области"
+msgstr "_Редактор _выделения"
 
 #: ../app/actions/dialogs-actions.c:82
 msgid "Open the selection editor"
@@ -971,7 +971,7 @@ msgstr "На_вигация"
 
 #: ../app/actions/dialogs-actions.c:88
 msgid "Open the display navigation dialog"
-msgstr "Открыть диалог навигации по документу"
+msgstr "Открыть диалог навигации по изображению"
 
 #: ../app/actions/dialogs-actions.c:93
 msgid "Undo _History"
@@ -988,7 +988,7 @@ msgstr "Курсор мыши"
 
 #: ../app/actions/dialogs-actions.c:100
 msgid "Open the pointer information dialog"
-msgstr "Открыть диалог информации об курсоре"
+msgstr "Открыть диалог информации об указателе"
 
 #: ../app/actions/dialogs-actions.c:105
 msgid "_Sample Points"
@@ -1112,7 +1112,7 @@ msgstr "_Параметры"
 
 #: ../app/actions/dialogs-actions.c:207
 msgid "Open the preferences dialog"
-msgstr "Открыть диалог параметров программы"
+msgstr "Открыть диалог для настройки программы"
 
 #: ../app/actions/dialogs-actions.c:212
 msgid "_Keyboard Shortcuts"
@@ -1144,7 +1144,7 @@ msgstr "О прог_рамме"
 
 #: ../app/actions/dialogs-actions.c:231
 #: ../app/dialogs/about-dialog.c:114
-#: ../app/gui/gui.c:473
+#: ../app/gui/gui.c:479
 msgid "About GIMP"
 msgstr "О GIMP"
 
@@ -1164,7 +1164,7 @@ msgstr "Открыть _экран..."
 #: ../app/actions/dock-actions.c:53
 #: ../app/actions/view-actions.c:124
 msgid "Connect to another display"
-msgstr "Установить соединение с другим экраном"
+msgstr "Соеидиниться с другим экраном"
 
 #: ../app/actions/dock-actions.c:61
 msgid "_Show Image Selection"
@@ -1184,7 +1184,7 @@ msgstr "До_бавить вкладку"
 
 #: ../app/actions/dockable-actions.c:54
 msgid "_Preview Size"
-msgstr "Размер _эскиза"
+msgstr "Размер _миниатюры"
 
 #: ../app/actions/dockable-actions.c:55
 msgid "_Tab Style"
@@ -1292,7 +1292,7 @@ msgstr "_Развернуть или открыть изображение"
 
 #: ../app/actions/documents-actions.c:53
 msgid "Raise window if already open"
-msgstr "Сделать активным если уже открыто"
+msgstr "Сделать активным, если уже открыто"
 
 #: ../app/actions/documents-actions.c:58
 msgid "File Open _Dialog"
@@ -1304,19 +1304,19 @@ msgstr "Открыть изображение"
 
 #: ../app/actions/documents-actions.c:64
 msgid "Copy Image _Location"
-msgstr "Скопировать _местоположение файла"
+msgstr "Скопировать _расположение файла"
 
 #: ../app/actions/documents-actions.c:65
 msgid "Copy image location to clipboard"
-msgstr "Скопировать _местоположение файла в буфер обмена"
+msgstr "Скопировать _расположение файла в буфер обмена"
 
 #: ../app/actions/documents-actions.c:70
 msgid "Remove _Entry"
-msgstr "_Удалить элемент"
+msgstr "_Удалить запись"
 
 #: ../app/actions/documents-actions.c:71
 msgid "Remove the selected entry"
-msgstr "Удалить выбранный элемент"
+msgstr "Удалить выбранную запись"
 
 #: ../app/actions/documents-actions.c:76
 msgid "_Clear History"
@@ -1328,23 +1328,23 @@ msgstr "Очистить весь журнал открывавшихся док
 
 #: ../app/actions/documents-actions.c:82
 msgid "Recreate _Preview"
-msgstr "_Перечитать просмотр"
+msgstr "_Перечитать миниатюру"
 
 #: ../app/actions/documents-actions.c:83
 msgid "Recreate preview"
-msgstr "Перечитать просмотр"
+msgstr "Перечитать миниатюру"
 
 #: ../app/actions/documents-actions.c:88
 msgid "Reload _all Previews"
-msgstr "Перечитать _все просмотры"
+msgstr "Перечитать _все миниатюры"
 
 #: ../app/actions/documents-actions.c:89
 msgid "Reload all previews"
-msgstr "Перечитать все просмотры"
+msgstr "Перечитать все миниатюры"
 
 #: ../app/actions/documents-actions.c:94
 msgid "Remove Dangling E_ntries"
-msgstr "Удалить устаревшие записи"
+msgstr "Удалить устаревшие _записи"
 
 #: ../app/actions/documents-actions.c:95
 msgid "Remove dangling entries"
@@ -1360,7 +1360,7 @@ msgstr "Очистить весь журнал открывавшихся док
 
 #: ../app/actions/documents-commands.c:224
 msgid "Clearing the document history will permanently remove all items from the recent documents list in all applications."
-msgstr "Очистка журнала открывавшихся документов скажется на всех приложениях, а не только на GIMP."
+msgstr "Очистка журнала открывавшихся документов навсегда уберет изображения из списка недавних документов."
 
 #: ../app/actions/drawable-actions.c:45
 msgid "_Equalize"
@@ -1392,7 +1392,7 @@ msgstr "_Сместить..."
 
 #: ../app/actions/drawable-actions.c:64
 msgid "Shift the pixels, optionally wrapping them at the borders"
-msgstr "Переместить точки, заполняя границу изображением или фоном"
+msgstr "Переместить пикселы, заполняя границу изображением или фоном"
 
 #: ../app/actions/drawable-actions.c:72
 #: ../app/actions/vectors-actions.c:153
@@ -1475,7 +1475,7 @@ msgstr "_Правка"
 
 #: ../app/actions/edit-actions.c:64
 msgid "_Paste as"
-msgstr "_Вставить как"
+msgstr "Вставить _как"
 
 #: ../app/actions/edit-actions.c:65
 msgid "_Buffer"
@@ -1492,7 +1492,7 @@ msgstr "_Отменить"
 
 #: ../app/actions/edit-actions.c:73
 msgid "Undo the last operation"
-msgstr "Отменяет последнее действие"
+msgstr "Отменить последнее действие"
 
 #: ../app/actions/edit-actions.c:78
 #: ../app/actions/edit-actions.c:314
@@ -1501,7 +1501,7 @@ msgstr "Ве_рнуть"
 
 #: ../app/actions/edit-actions.c:79
 msgid "Redo the last operation that was undone"
-msgstr "Повторить последнее отмененное действие"
+msgstr "Повторить последнее отменённое действие"
 
 #: ../app/actions/edit-actions.c:84
 msgid "Strong Undo"
@@ -1525,7 +1525,7 @@ msgstr "О_чистить историю действий"
 
 #: ../app/actions/edit-actions.c:97
 msgid "Remove all operations from the undo history"
-msgstr "Удаляет все действия из истории"
+msgstr "Удалить все действия из истории"
 
 #: ../app/actions/edit-actions.c:102
 #: ../app/actions/edit-actions.c:315
@@ -1555,7 +1555,7 @@ msgstr "Скопировать выделенные точки в буфер о
 #. GIMP_STOCK_COPY_VISIBLE,
 #: ../app/actions/edit-actions.c:120
 msgid "Copy _Visible"
-msgstr "Копировать видимое"
+msgstr "Копировать в_идимое"
 
 #: ../app/actions/edit-actions.c:121
 msgid "Copy what is visible in the selected region"
@@ -1588,7 +1588,7 @@ msgstr "Создать новое изображение из содержимо
 
 #: ../app/actions/edit-actions.c:144
 msgid "_New Image"
-msgstr "_Новое изображение"
+msgstr "Новое _изображение"
 
 #: ../app/actions/edit-actions.c:150
 msgid "New _Layer"
@@ -1600,7 +1600,7 @@ msgstr "Создать новый слой из содержимого буфе
 
 #: ../app/actions/edit-actions.c:156
 msgid "Cu_t Named..."
-msgstr "Вы_резать в буфер с именем"
+msgstr "Вы_резать в буфер с именем..."
 
 #: ../app/actions/edit-actions.c:157
 msgid "Move the selected pixels to a named buffer"
@@ -1633,11 +1633,11 @@ msgstr "Вставить содержимое именованного буфе
 
 #: ../app/actions/edit-actions.c:180
 msgid "Cl_ear"
-msgstr "_Очистить"
+msgstr "О_чистить"
 
 #: ../app/actions/edit-actions.c:181
 msgid "Clear the selected pixels"
-msgstr "Удалить выделенные точки"
+msgstr "Удалить выделенные точки растра"
 
 #: ../app/actions/edit-actions.c:189
 msgid "Fill with _FG Color"
@@ -1759,11 +1759,11 @@ msgstr "Очистить консоль ошибок"
 
 #: ../app/actions/error-console-actions.c:50
 msgid "Select _All"
-msgstr "Выделить _все"
+msgstr "Выделить _всё"
 
 #: ../app/actions/error-console-actions.c:51
 msgid "Select all errors"
-msgstr "Выделить все ошибки"
+msgstr "Выделить все сообщения об ошибках"
 
 #: ../app/actions/error-console-actions.c:59
 msgid "_Save Error Log to File..."
@@ -1808,7 +1808,7 @@ msgstr "Создать"
 
 #: ../app/actions/file-actions.c:68
 msgid "Open _Recent"
-msgstr "Открыть _последние"
+msgstr "_Недавние файлы"
 
 #: ../app/actions/file-actions.c:71
 msgid "_Open..."
@@ -1816,7 +1816,7 @@ msgstr "_Открыть..."
 
 #: ../app/actions/file-actions.c:72
 msgid "Open an image file"
-msgstr "Открыть изображение"
+msgstr "Открыть файл изображения"
 
 #: ../app/actions/file-actions.c:77
 msgid "Op_en as Layers..."
@@ -1824,7 +1824,7 @@ msgstr "Открыть как сло_и..."
 
 #: ../app/actions/file-actions.c:78
 msgid "Open an image file as layers"
-msgstr "Открыть изображение как слои"
+msgstr "Открыть файлы изображений как слои"
 
 #: ../app/actions/file-actions.c:83
 msgid "Open _Location..."
@@ -1860,7 +1860,7 @@ msgstr "Закрыть все изображения"
 
 #: ../app/actions/file-actions.c:107
 msgid "_Quit"
-msgstr "В_ыйти"
+msgstr "В_ыход"
 
 #: ../app/actions/file-actions.c:108
 msgid "Quit the GNU Image Manipulation Program"
@@ -1921,7 +1921,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Не удалось '%s' сохранить:\n"
+"Не удалось сохранить  '%s':\n"
 "\n"
 "%s"
 
@@ -2030,35 +2030,35 @@ msgstr "Цвет крайней правой точки..."
 
 #: ../app/actions/gradient-editor-actions.c:112
 msgid "Ble_nd Endpoints' Colors"
-msgstr "Смешать цвета крайних точек"
+msgstr "С_мешать цвета крайних точек"
 
 #: ../app/actions/gradient-editor-actions.c:117
 msgid "Blend Endpoints' Opacit_y"
-msgstr "Смешать непрозрачность крайних точек"
+msgstr "Смешать _непрозрачность крайних точек"
 
 #: ../app/actions/gradient-editor-actions.c:125
 msgid "Edit Active Gradient"
-msgstr "Редактировать активный градиент"
+msgstr "Изменить активный градиент"
 
 #: ../app/actions/gradient-editor-actions.c:156
 msgid "_Left Neighbor's Right Endpoint"
-msgstr "Соседней слева к крайней правой точке"
+msgstr "_Соседней слева к крайней правой точке"
 
 #: ../app/actions/gradient-editor-actions.c:161
 msgid "_Right Endpoint"
-msgstr "Цвет крайней правой точки"
+msgstr "Цвет крайней _правой точки"
 
 #: ../app/actions/gradient-editor-actions.c:166
 #: ../app/actions/gradient-editor-actions.c:214
 msgid "_Foreground Color"
-msgstr "Цвет _переднего плана"
+msgstr "Цвета _переднего плана"
 
 #: ../app/actions/gradient-editor-actions.c:171
 #: ../app/actions/gradient-editor-actions.c:219
 #: ../app/actions/gradient-editor-actions.c:273
 #: ../app/actions/gradient-editor-actions.c:301
 msgid "_Background Color"
-msgstr "Цвет _фона"
+msgstr "Цвета _фона"
 
 #: ../app/actions/gradient-editor-actions.c:204
 msgid "_Right Neighbor's Left Endpoint"
@@ -2066,7 +2066,7 @@ msgstr "Соседней справа к крайней левой точке"
 
 #: ../app/actions/gradient-editor-actions.c:209
 msgid "_Left Endpoint"
-msgstr "Цвет крайней левой точки"
+msgstr "Цвет крайней _левой точки"
 
 #: ../app/actions/gradient-editor-actions.c:258
 #: ../app/actions/gradient-editor-actions.c:286
@@ -2094,19 +2094,19 @@ msgstr "_Линейная"
 
 #: ../app/actions/gradient-editor-actions.c:319
 msgid "_Curved"
-msgstr "_Кривые"
+msgstr "_Искривлённая"
 
 #: ../app/actions/gradient-editor-actions.c:324
 msgid "_Sinusoidal"
-msgstr "Синусоида"
+msgstr "_Синусоидальная"
 
 #: ../app/actions/gradient-editor-actions.c:329
 msgid "Spherical (i_ncreasing)"
-msgstr "Сфера (увеличивающаяся)"
+msgstr "_Сферическая (увеличивающаяся)"
 
 #: ../app/actions/gradient-editor-actions.c:334
 msgid "Spherical (_decreasing)"
-msgstr "Сфера (уменьшающаяся)"
+msgstr "Сф_ерическая (уменьшающаяся)"
 
 #: ../app/actions/gradient-editor-actions.c:339
 #: ../app/actions/gradient-editor-actions.c:362
@@ -2333,19 +2333,19 @@ msgstr "Новый градиент"
 
 #: ../app/actions/gradients-actions.c:54
 msgid "D_uplicate Gradient"
-msgstr "Создать копию градиента"
+msgstr "Создать _копию градиента"
 
 #: ../app/actions/gradients-actions.c:55
 msgid "Duplicate gradient"
-msgstr "Создать копию градиента"
+msgstr "Создать _копию градиента"
 
 #: ../app/actions/gradients-actions.c:60
 msgid "Copy Gradient _Location"
-msgstr "Скопировать _местоположение градиента"
+msgstr "Скопировать _расположение градиента"
 
 #: ../app/actions/gradients-actions.c:61
 msgid "Copy gradient file location to clipboard"
-msgstr "Скопировать _местоположение градиента в буфер обмена"
+msgstr "Скопировать _расположение файла градиента в буфер обмена"
 
 #: ../app/actions/gradients-actions.c:66
 msgid "Save as _POV-Ray..."
@@ -2361,7 +2361,7 @@ msgstr "_Удалить градиент"
 
 #: ../app/actions/gradients-actions.c:73
 msgid "Delete gradient"
-msgstr "Удалить градиент..."
+msgstr "Удалить градиент"
 
 #: ../app/actions/gradients-actions.c:78
 msgid "_Refresh Gradients"
@@ -2373,7 +2373,7 @@ msgstr "Обновить градиенты"
 
 #: ../app/actions/gradients-actions.c:87
 msgid "_Edit Gradient..."
-msgstr "_Правка градиента..."
+msgstr "_Изменить градиент..."
 
 #: ../app/actions/gradients-actions.c:88
 msgid "Edit gradient"
@@ -2395,7 +2395,7 @@ msgstr "Открыть руководство по GIMP"
 
 #: ../app/actions/help-actions.c:47
 msgid "_Context Help"
-msgstr "_Контекстная помощь"
+msgstr "_Контекстная справка"
 
 #: ../app/actions/help-actions.c:48
 msgid "Show the help for a specific user interface item"
@@ -2460,7 +2460,7 @@ msgstr "Изменить размер холста изображения"
 
 #: ../app/actions/image-actions.c:78
 msgid "F_it Canvas to Layers"
-msgstr "По _размеру слоев"
+msgstr "Холст по _размеру слоев"
 
 #: ../app/actions/image-actions.c:79
 msgid "Resize the image to enclose all layers"
@@ -2514,7 +2514,7 @@ msgstr "Объединить _видимые слои..."
 #: ../app/actions/image-actions.c:115
 #: ../app/actions/layers-actions.c:141
 msgid "Merge all visible layers into one layer"
-msgstr "Сводит все видимые слои в один"
+msgstr "Объединить все видимые слои в один"
 
 #: ../app/actions/image-actions.c:120
 #: ../app/actions/layers-actions.c:146
@@ -2524,7 +2524,7 @@ msgstr "Свести _изображение"
 #: ../app/actions/image-actions.c:121
 #: ../app/actions/layers-actions.c:147
 msgid "Merge all layers into one and remove transparency"
-msgstr "Сводит все слои в один и удаляет прозрачность"
+msgstr "Объединить все слои в один и удалить прозрачность"
 
 #: ../app/actions/image-actions.c:126
 msgid "Configure G_rid..."
@@ -2540,7 +2540,7 @@ msgstr "Сво_йства изображения"
 
 #: ../app/actions/image-actions.c:133
 msgid "Display information about this image"
-msgstr "Показывает информацию об изображении"
+msgstr "Показать информацию об изображении"
 
 #: ../app/actions/image-actions.c:142
 msgid "Convert the image to the RGB colorspace"
@@ -2552,7 +2552,7 @@ msgstr "Градации _серого"
 
 #: ../app/actions/image-actions.c:147
 msgid "Convert the image to grayscale"
-msgstr "Преобразовать изображение в градации серого"
+msgstr "Преобразовать цвет изображения в градации серого"
 
 #: ../app/actions/image-actions.c:151
 msgid "_Indexed..."
@@ -2673,7 +2673,7 @@ msgstr "Удалить это изображение"
 
 #: ../app/actions/layers-actions.c:48
 msgid "Layers Menu"
-msgstr "Меню слоев"
+msgstr "Меню слоёв"
 
 #: ../app/actions/layers-actions.c:51
 msgid "_Layer"
@@ -2681,7 +2681,7 @@ msgstr "Сло_й"
 
 #: ../app/actions/layers-actions.c:52
 msgid "Stac_k"
-msgstr "Стопка с_лоев"
+msgstr "Стопка с_лоёв"
 
 #: ../app/actions/layers-actions.c:53
 msgid "Te_xt to Selection"
@@ -2713,11 +2713,11 @@ msgstr "Использовать текстовый инструмент в эт
 
 #: ../app/actions/layers-actions.c:68
 msgid "_Edit Layer Attributes..."
-msgstr "Правка атрибутов слоя..."
+msgstr "_Изменить атрибуты слоя..."
 
 #: ../app/actions/layers-actions.c:69
 msgid "Edit the layer's name"
-msgstr "Правка имени слоя"
+msgstr "Правка названия слоя"
 
 #: ../app/actions/layers-actions.c:74
 msgid "_New Layer..."
@@ -2729,7 +2729,7 @@ msgstr "Создать новый слой и добавить его в изо
 
 #: ../app/actions/layers-actions.c:80
 msgid "_New Layer"
-msgstr "_Новый слой"
+msgstr "_Создать слой"
 
 #: ../app/actions/layers-actions.c:81
 msgid "Create a new layer with last used values"
@@ -2745,7 +2745,7 @@ msgstr "Создать новый слой из всех видимых данн
 
 #: ../app/actions/layers-actions.c:92
 msgid "D_uplicate Layer"
-msgstr "Про_дублировать слой"
+msgstr "Создать _копию слоя"
 
 #: ../app/actions/layers-actions.c:93
 msgid "Create a duplicate of the layer and add it to the image"
@@ -2757,7 +2757,7 @@ msgstr "_Удалить слой"
 
 #: ../app/actions/layers-actions.c:99
 msgid "Delete this layer"
-msgstr "Удаляет активный слой"
+msgstr "Удалить активный слой"
 
 #: ../app/actions/layers-actions.c:104
 msgid "_Raise Layer"
@@ -2765,7 +2765,7 @@ msgstr "_Поднять слой"
 
 #: ../app/actions/layers-actions.c:105
 msgid "Raise this layer one step in the layer stack"
-msgstr "Поднять активный слой на один вверх в стопке"
+msgstr "Поднять активный слой на один шаг вверх по стопке слоев"
 
 #: ../app/actions/layers-actions.c:110
 msgid "Layer to _Top"
@@ -2773,7 +2773,7 @@ msgstr "Сделать слой _верхним"
 
 #: ../app/actions/layers-actions.c:111
 msgid "Move this layer to the top of the layer stack"
-msgstr "Сделать активный слой верхним в стопке"
+msgstr "Сделать активный слой верхним в стопке слоев"
 
 #: ../app/actions/layers-actions.c:116
 msgid "_Lower Layer"
@@ -2781,7 +2781,7 @@ msgstr "_Опустить слой"
 
 #: ../app/actions/layers-actions.c:117
 msgid "Lower this layer one step in the layer stack"
-msgstr "Опустить активный слой на один вниз в стопке"
+msgstr "Опустить активный слой на один шаг вниз по стопке слоев"
 
 #: ../app/actions/layers-actions.c:122
 msgid "Layer to _Bottom"
@@ -2789,7 +2789,7 @@ msgstr "Сделать слой _нижним"
 
 #: ../app/actions/layers-actions.c:123
 msgid "Move this layer to the bottom of the layer stack"
-msgstr "Сделать активный слой нижним в стопке"
+msgstr "Сделать активный слой нижним в стопке слоев"
 
 #: ../app/actions/layers-actions.c:128
 msgid "_Anchor Layer"
@@ -2829,11 +2829,11 @@ msgstr "Создать контур из этого текстового сло
 
 #: ../app/actions/layers-actions.c:164
 msgid "Text alon_g Path"
-msgstr "Текст по _контуру"
+msgstr "Текст по к_онтуру"
 
 #: ../app/actions/layers-actions.c:165
 msgid "Warp this layer's text along the current path"
-msgstr "Направить текст этого слоя по текущему контуру"
+msgstr "Направить текст этого слоя по активному контуру"
 
 #: ../app/actions/layers-actions.c:170
 msgid "Layer B_oundary Size..."
@@ -2841,7 +2841,7 @@ msgstr "_Границы слоя..."
 
 #: ../app/actions/layers-actions.c:171
 msgid "Adjust the layer dimensions"
-msgstr "Изменяет размер слоя"
+msgstr "Изменить размер слоя"
 
 #: ../app/actions/layers-actions.c:176
 msgid "Layer to _Image Size"
@@ -2869,7 +2869,7 @@ msgstr "Добавить _маску слоя..."
 
 #: ../app/actions/layers-actions.c:195
 msgid "Add a mask that allows non-destructive editing of transparency"
-msgstr "Добавить маску, с помощью которой можно безопасно редактировать прозрачность"
+msgstr "Добавить маску, с помощью которой можно неразрушающе редактировать прозрачность"
 
 #: ../app/actions/layers-actions.c:200
 msgid "Add Alpha C_hannel"
@@ -2877,7 +2877,7 @@ msgstr "Добавить _альфа-канал"
 
 #: ../app/actions/layers-actions.c:201
 msgid "Add transparency information to the layer"
-msgstr "Добавить информацию о прозрачности в слой"
+msgstr "Добавить в слой информацию о прозрачности"
 
 #: ../app/actions/layers-actions.c:206
 msgid "_Remove Alpha Channel"
@@ -2885,15 +2885,15 @@ msgstr "_Удалить альфа-канал"
 
 #: ../app/actions/layers-actions.c:207
 msgid "Remove transparency information from the layer"
-msgstr "Удалить информацию о прозрачности из слоя"
+msgstr "Удалить из слоя информацию о прозрачности"
 
 #: ../app/actions/layers-actions.c:215
 msgid "Lock Alph_a Channel"
-msgstr "Запереть альфа-канал"
+msgstr "_Запереть альфа-канал"
 
 #: ../app/actions/layers-actions.c:216
 msgid "Keep transparency information on this layer from being modified"
-msgstr "Предохраняет информацию о прозрачности от изменений"
+msgstr "Предохранить информацию о прозрачности от изменений"
 
 #: ../app/actions/layers-actions.c:222
 msgid "_Edit Layer Mask"
@@ -2909,7 +2909,7 @@ msgstr "_Показать маску слоя"
 
 #: ../app/actions/layers-actions.c:235
 msgid "_Disable Layer Mask"
-msgstr "_Спрятать маску слоя"
+msgstr "_Скрыть маску слоя"
 
 #: ../app/actions/layers-actions.c:236
 msgid "Dismiss the effect of the layer mask"
@@ -2921,7 +2921,7 @@ msgstr "Применить _маску слоя"
 
 #: ../app/actions/layers-actions.c:246
 msgid "Apply the effect of the layer mask and remove it"
-msgstr "Применить эффект маски слоя и удалить ее"
+msgstr "Применить эффект маски слоя и удалить её"
 
 #: ../app/actions/layers-actions.c:251
 msgid "Delete Layer Mas_k"
@@ -2929,15 +2929,15 @@ msgstr "_Удалить маску слоя"
 
 #: ../app/actions/layers-actions.c:252
 msgid "Remove the layer mask and its effect"
-msgstr "Удалить маску слоя и ее эффект"
+msgstr "Удалить маску слоя и её эффект"
 
 #: ../app/actions/layers-actions.c:260
 msgid "_Mask to Selection"
-msgstr "_Маска → Выделение"
+msgstr "_Маска в выделение"
 
 #: ../app/actions/layers-actions.c:261
 msgid "Replace the selection with the layer mask"
-msgstr "Преобразует маску в выделение"
+msgstr "Преобразовать маску в выделение"
 
 #: ../app/actions/layers-actions.c:267
 msgid "Add the layer mask to the current selection"
@@ -2953,7 +2953,7 @@ msgstr "Пересечь маску слоя с текущим выделени
 
 #: ../app/actions/layers-actions.c:287
 msgid "Al_pha to Selection"
-msgstr "Аль_фа-канал → Выделение"
+msgstr "Аль_фа-канал в выделение"
 
 #: ../app/actions/layers-actions.c:288
 msgid "Replace the selection with the layer's alpha channel"
@@ -3022,7 +3022,7 @@ msgstr "Перейти на слой над текущим"
 
 #: ../app/actions/layers-actions.c:359
 msgid "Select _Next Layer"
-msgstr "Перейти на с_ледующий слой"
+msgstr "Перейти на _следующий слой"
 
 #: ../app/actions/layers-actions.c:360
 msgid "Select the layer below the current layer"
@@ -3079,14 +3079,14 @@ msgid "Please select a channel first"
 msgstr "Сначала выберите канал"
 
 #: ../app/actions/layers-commands.c:1044
-#: ../app/core/gimplayer.c:1282
+#: ../app/core/gimplayer.c:1283
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "Добавить маску слоя"
 
 #: ../app/actions/palette-editor-actions.c:44
 msgid "Palette Editor Menu"
-msgstr "Меню редактора палитр"
+msgstr "Меню редактора цветовых образцов"
 
 #: ../app/actions/palette-editor-actions.c:54
 msgid "_Delete Color"
@@ -3106,7 +3106,7 @@ msgstr "Новый цвет из _переднего плана"
 
 #: ../app/actions/palette-editor-actions.c:73
 msgid "New color from foreground color"
-msgstr "Добавляет в палитру активный цвет переднего плана"
+msgstr "Добавить активный цвет переднего плана"
 
 #: ../app/actions/palette-editor-actions.c:78
 msgid "New Color from _BG"
@@ -3114,7 +3114,7 @@ msgstr "Новый цвет из _фона"
 
 #: ../app/actions/palette-editor-actions.c:79
 msgid "New color from background color"
-msgstr "Добавить в палитру активный цвет фона"
+msgstr "Добавить текущий цвет фона"
 
 #: ../app/actions/palette-editor-actions.c:87
 #: ../app/actions/view-actions.c:261
@@ -3156,7 +3156,7 @@ msgstr "_Импортировать палитру..."
 
 #: ../app/actions/palettes-actions.c:55
 msgid "Import palette"
-msgstr "Импортировать палитру"
+msgstr "Импортировать файл палитры"
 
 #: ../app/actions/palettes-actions.c:60
 msgid "D_uplicate Palette"
@@ -3164,7 +3164,7 @@ msgstr "Создать _копию палитры"
 
 #: ../app/actions/palettes-actions.c:61
 msgid "Duplicate palette"
-msgstr "Создать копию палитры"
+msgstr "Создать _копию палитры"
 
 #: ../app/actions/palettes-actions.c:66
 msgid "_Merge Palettes..."
@@ -3176,19 +3176,19 @@ msgstr "Объединить палитры"
 
 #: ../app/actions/palettes-actions.c:72
 msgid "Copy Palette _Location"
-msgstr "Скопировать _местоположение палитры"
+msgstr "Скопировать _расположение палитры"
 
 #: ../app/actions/palettes-actions.c:73
 msgid "Copy palette file location to clipboard"
-msgstr "Скопировать местоположение палитры в буфер обмена"
+msgstr "Скопировать расположение файла палитры в буфер обмена"
 
 #: ../app/actions/palettes-actions.c:78
 msgid "_Delete Palette"
-msgstr "_Удалить палитру..."
+msgstr "_Удалить палитру"
 
 #: ../app/actions/palettes-actions.c:79
 msgid "Delete palette"
-msgstr "Удалить палитру..."
+msgstr "_Удалить палитру"
 
 #: ../app/actions/palettes-actions.c:84
 msgid "_Refresh Palettes"
@@ -3196,7 +3196,7 @@ msgstr "О_бновить палитры"
 
 #: ../app/actions/palettes-actions.c:85
 msgid "Refresh palettes"
-msgstr "Обновить палитры"
+msgstr "Обновить список цветовых палитр"
 
 #: ../app/actions/palettes-actions.c:93
 msgid "_Edit Palette..."
@@ -3224,11 +3224,11 @@ msgstr "Открыть _текстуру как изображение"
 
 #: ../app/actions/patterns-actions.c:48
 msgid "Open pattern as image"
-msgstr "Открыть текстуру как изображение"
+msgstr "Открыть _текстуру как изображение"
 
 #: ../app/actions/patterns-actions.c:53
 msgid "_New Pattern"
-msgstr "_Новая текстура"
+msgstr "_Создать текстуру"
 
 #: ../app/actions/patterns-actions.c:54
 msgid "New pattern"
@@ -3236,11 +3236,11 @@ msgstr "Новая текстура"
 
 #: ../app/actions/patterns-actions.c:59
 msgid "D_uplicate Pattern"
-msgstr "Создать _копию текстуры"
+msgstr "Про_дублировать текстуру"
 
 #: ../app/actions/patterns-actions.c:60
 msgid "Duplicate pattern"
-msgstr "Создать копию текстуры"
+msgstr "Про_дублировать текстуру"
 
 #: ../app/actions/patterns-actions.c:65
 msgid "Copy Pattern _Location"
@@ -3256,7 +3256,7 @@ msgstr "_Удалить текстуру"
 
 #: ../app/actions/patterns-actions.c:72
 msgid "Delete pattern"
-msgstr "Удалить текстуру"
+msgstr "_Удалить текстуру"
 
 #: ../app/actions/patterns-actions.c:77
 msgid "_Refresh Patterns"
@@ -3264,7 +3264,7 @@ msgstr "_Обновить текстуры"
 
 #: ../app/actions/patterns-actions.c:78
 msgid "Refresh patterns"
-msgstr "Обновить текстуры"
+msgstr "Обновить список текстур"
 
 #: ../app/actions/patterns-actions.c:86
 msgid "_Edit Pattern..."
@@ -3280,7 +3280,7 @@ msgstr "Фи_льтры"
 
 #: ../app/actions/plug-in-actions.c:84
 msgid "Recently Used"
-msgstr "Недавно использовавшиеся"
+msgstr "Недавно применявшиеся"
 
 #: ../app/actions/plug-in-actions.c:85
 msgid "_Blur"
@@ -3405,7 +3405,7 @@ msgid "Toggle _Quick Mask"
 msgstr "_Переключить быструю маску"
 
 #: ../app/actions/quick-mask-actions.c:54
-#: ../app/display/gimpdisplayshell.c:1167
+#: ../app/display/gimpdisplayshell.c:1169
 msgid "Toggle Quick Mask"
 msgstr "Переключить быструю маску"
 
@@ -3451,7 +3451,7 @@ msgstr "Вс_ё"
 
 #: ../app/actions/select-actions.c:51
 msgid "Select everything"
-msgstr "Выделить все изображение"
+msgstr "Выделить всё изображение"
 
 #: ../app/actions/select-actions.c:56
 msgid "select|_None"
@@ -3535,7 +3535,7 @@ msgstr "Обвести выделение указанным типом лини
 
 #: ../app/actions/select-actions.c:116
 msgid "_Stroke Selection"
-msgstr "_Обвести выделенное"
+msgstr "Обвести в_ыделенное"
 
 #: ../app/actions/select-actions.c:117
 msgid "Stroke the selection with last used values"
@@ -3618,7 +3618,7 @@ msgstr "Создать новое изображение из шаблона"
 
 #: ../app/actions/templates-actions.c:52
 msgid "_New Template..."
-msgstr "_Новый шаблон..."
+msgstr "_Создать шаблон..."
 
 #: ../app/actions/templates-actions.c:53
 msgid "Create a new template"
@@ -3626,11 +3626,11 @@ msgstr "Создать новый шаблон"
 
 #: ../app/actions/templates-actions.c:58
 msgid "D_uplicate Template..."
-msgstr "Создать копию шаблона..."
+msgstr "Создать _копию шаблона..."
 
 #: ../app/actions/templates-actions.c:59
 msgid "Duplicate the selected template"
-msgstr "Копировать выделенный шаблон"
+msgstr "Создать копию выбранного шаблона"
 
 #: ../app/actions/templates-actions.c:64
 msgid "_Edit Template..."
@@ -3685,7 +3685,7 @@ msgstr "Очистить"
 
 #: ../app/actions/text-editor-actions.c:51
 msgid "Clear all text"
-msgstr "Удалить текст"
+msgstr "Удалить весь текст"
 
 #: ../app/actions/text-editor-actions.c:59
 msgid "LTR"
@@ -3731,7 +3731,7 @@ msgstr "Невозможно открыть '%s' для чтения: %s"
 
 #: ../app/actions/tool-options-actions.c:56
 msgid "Tool Options Menu"
-msgstr "Параметры инструментов"
+msgstr "Меню параметров инструментов"
 
 #: ../app/actions/tool-options-actions.c:60
 msgid "_Save Options To"
@@ -3743,15 +3743,15 @@ msgstr "_Загрузить параметры из"
 
 #: ../app/actions/tool-options-actions.c:68
 msgid "Re_name Saved Options"
-msgstr "Пере_именовать сохраненные параметры"
+msgstr "_Переименовать сохранённые параметры"
 
 #: ../app/actions/tool-options-actions.c:72
 msgid "_Delete Saved Options"
-msgstr "_Удалить сохраненные параметры"
+msgstr "_Удалить сохранённые параметры"
 
 #: ../app/actions/tool-options-actions.c:76
 msgid "_New Entry..."
-msgstr "_Новый элемент..."
+msgstr "_Новую запись..."
 
 #: ../app/actions/tool-options-actions.c:81
 msgid "R_eset Tool Options"
@@ -3771,11 +3771,11 @@ msgstr "Сбросить параметры всех инструментов"
 
 #: ../app/actions/tool-options-commands.c:72
 msgid "Save Tool Options"
-msgstr "Сохранить параметры инструментов"
+msgstr "Сохранить параметры инструмента"
 
 #: ../app/actions/tool-options-commands.c:76
 msgid "Enter a name for the saved options"
-msgstr "Введите имя для сохраненных параметров"
+msgstr "Введите имя для сохраняемых параметров"
 
 #: ../app/actions/tool-options-commands.c:77
 #: ../app/actions/tool-options-commands.c:247
@@ -3789,7 +3789,7 @@ msgstr "Переименовать сохраненные параметры"
 
 #: ../app/actions/tool-options-commands.c:144
 msgid "Enter a new name for the saved options"
-msgstr "Введите новое имя для сохраненных параметров"
+msgstr "Введите новое название сохраненных параметров"
 
 #: ../app/actions/tool-options-commands.c:187
 msgid "Reset Tool Options"
@@ -3797,11 +3797,11 @@ msgstr "Сбросить параметры"
 
 #: ../app/actions/tool-options-commands.c:210
 msgid "Do you really want to reset all tool options to default values?"
-msgstr "Вы действительно хотите вернуться к настройкам по умолчанию для всех инструментов?"
+msgstr "Вы действительно хотите вернуться к исходным параметрам всех инструментов?"
 
 #: ../app/actions/tools-actions.c:47
 msgid "Tools Menu"
-msgstr "Меню панели инструментов"
+msgstr "Меню инструментов"
 
 #: ../app/actions/tools-actions.c:50
 msgid "_Tools"
@@ -3825,7 +3825,7 @@ msgstr "_Цвет"
 
 #: ../app/actions/tools-actions.c:57
 msgid "R_aise Tool"
-msgstr "_Поднять инструмент"
+msgstr "Опустить до _верха"
 
 #: ../app/actions/tools-actions.c:58
 msgid "Raise tool"
@@ -3837,7 +3837,7 @@ msgstr "Поднять до _верха"
 
 #: ../app/actions/tools-actions.c:64
 msgid "Raise tool to top"
-msgstr "Поднять инструмент до верха"
+msgstr "Поднять инструмент до самого верха"
 
 #: ../app/actions/tools-actions.c:69
 msgid "L_ower Tool"
@@ -3845,7 +3845,7 @@ msgstr "_Опустить инструмент"
 
 #: ../app/actions/tools-actions.c:70
 msgid "Lower tool"
-msgstr "Опустить инструмент"
+msgstr "_Опустить инструмент"
 
 #: ../app/actions/tools-actions.c:75
 msgid "Lo_wer to Bottom"
@@ -3853,7 +3853,7 @@ msgstr "Опустить до _низа"
 
 #: ../app/actions/tools-actions.c:76
 msgid "Lower tool to bottom"
-msgstr "Опустить инструмент до низа"
+msgstr "Опустить инструмент до самого низа"
 
 #: ../app/actions/tools-actions.c:81
 msgid "_Reset Order & Visibility"
@@ -3861,7 +3861,7 @@ msgstr "Исходные _порядок/видимость"
 
 #: ../app/actions/tools-actions.c:82
 msgid "Reset tool order and visibility"
-msgstr "Исходные порядок и видимость инструментов"
+msgstr "Исходные порядок и видимость инструмента"
 
 #: ../app/actions/tools-actions.c:90
 msgid "_Show in Toolbox"
@@ -3881,7 +3881,7 @@ msgstr "Про_извольное вращение..."
 
 #: ../app/actions/tools-actions.c:106
 msgid "Rotate by an arbitrary angle"
-msgstr "Вращение на произвольный угол"
+msgstr "Повернуть на произвольный угол"
 
 #: ../app/actions/vectors-actions.c:44
 msgid "Paths Menu"
@@ -3889,11 +3889,11 @@ msgstr "Меню контуров"
 
 #: ../app/actions/vectors-actions.c:48
 msgid "Path _Tool"
-msgstr "Инструмент контур"
+msgstr "_Контуры"
 
 #: ../app/actions/vectors-actions.c:53
 msgid "_Edit Path Attributes..."
-msgstr "Правка атрибутов контура..."
+msgstr "_Изменить атрибуты контура..."
 
 #: ../app/actions/vectors-actions.c:54
 msgid "Edit path attributes"
@@ -3901,7 +3901,7 @@ msgstr "Правка атрибутов контура"
 
 #: ../app/actions/vectors-actions.c:59
 msgid "_New Path..."
-msgstr "Новый контур..."
+msgstr "_Создать контур..."
 
 #: ../app/actions/vectors-actions.c:60
 msgid "New path..."
@@ -3913,19 +3913,19 @@ msgstr "_Новый контур"
 
 #: ../app/actions/vectors-actions.c:66
 msgid "New path with last values"
-msgstr "Новый контур со старыми значениями"
+msgstr "С_оздать контур с предыдущими значениями"
 
 #: ../app/actions/vectors-actions.c:71
 msgid "D_uplicate Path"
-msgstr "Создать копию контура"
+msgstr "Создать _копию контура"
 
 #: ../app/actions/vectors-actions.c:72
 msgid "Duplicate path"
-msgstr "Создать копию контура"
+msgstr "Создать _копию контура"
 
 #: ../app/actions/vectors-actions.c:77
 msgid "_Delete Path"
-msgstr "Удалить контур"
+msgstr "_Удалить контур"
 
 #: ../app/actions/vectors-actions.c:78
 #: ../app/core/core-enums.c:920
@@ -3934,19 +3934,19 @@ msgstr "Удалить контур"
 
 #: ../app/actions/vectors-actions.c:83
 msgid "Merge _Visible Paths"
-msgstr "Объединить видимые контуры"
+msgstr "Объединить _видимые контуры"
 
 #: ../app/actions/vectors-actions.c:88
 msgid "_Raise Path"
-msgstr "Поднять контур"
+msgstr "_Поднять контур"
 
 #: ../app/actions/vectors-actions.c:89
 msgid "Raise path"
-msgstr "Поднять контур"
+msgstr "Поднятие контура"
 
 #: ../app/actions/vectors-actions.c:94
 msgid "Raise Path to _Top"
-msgstr "Сделать контур верхним"
+msgstr "Сделать контур _верхним"
 
 #: ../app/actions/vectors-actions.c:95
 msgid "Raise path to top"
@@ -3954,15 +3954,15 @@ msgstr "Сделать контур верхним"
 
 #: ../app/actions/vectors-actions.c:100
 msgid "_Lower Path"
-msgstr "Опустить контур"
+msgstr "_Опустить контур"
 
 #: ../app/actions/vectors-actions.c:101
 msgid "Lower path"
-msgstr "Опустить контур"
+msgstr "Опускание контура"
 
 #: ../app/actions/vectors-actions.c:106
 msgid "Lower Path to _Bottom"
-msgstr "Сделать контур нижним"
+msgstr "Сделать контур _нижним"
 
 #: ../app/actions/vectors-actions.c:107
 msgid "Lower path to bottom"
@@ -3970,7 +3970,7 @@ msgstr "Сделать контур нижним"
 
 #: ../app/actions/vectors-actions.c:112
 msgid "Stro_ke Path..."
-msgstr "Обвести по контуру..."
+msgstr "Обвести ко_нтур..."
 
 #: ../app/actions/vectors-actions.c:113
 msgid "Paint along the path"
@@ -3978,7 +3978,7 @@ msgstr "Обрисовать контур заданным образом"
 
 #: ../app/actions/vectors-actions.c:118
 msgid "Stro_ke Path"
-msgstr "Обвести по контуру"
+msgstr "Обвести ко_нтур"
 
 #: ../app/actions/vectors-actions.c:119
 msgid "Paint along the path with last values"
@@ -3986,28 +3986,28 @@ msgstr "Обрисовать контур с параметрами как в п
 
 #: ../app/actions/vectors-actions.c:124
 msgid "Co_py Path"
-msgstr "Копировать контур"
+msgstr "_Копировать контур"
 
 #: ../app/actions/vectors-actions.c:129
 msgid "Paste Pat_h"
-msgstr "Вставить контур"
+msgstr "_Вставить контур"
 
 #: ../app/actions/vectors-actions.c:134
 msgid "E_xport Path..."
-msgstr "Экспортировать контур..."
+msgstr "_Экспортировать контур..."
 
 #: ../app/actions/vectors-actions.c:139
 msgid "I_mport Path..."
-msgstr "Импортировать контур..."
+msgstr "_Импортировать контур..."
 
 #: ../app/actions/vectors-actions.c:162
 msgid "Path to Sele_ction"
-msgstr "Контур → _Выделение"
+msgstr "Контур в _выделение"
 
 #: ../app/actions/vectors-actions.c:163
 #: ../app/tools/gimpvectortool.c:1912
 msgid "Path to selection"
-msgstr "Контур → Выделение"
+msgstr "Контур в выделение"
 
 #: ../app/actions/vectors-actions.c:168
 msgid "Fr_om Path"
@@ -4028,12 +4028,12 @@ msgstr "Пересечение"
 
 #: ../app/actions/vectors-actions.c:194
 msgid "Selecti_on to Path"
-msgstr "Выделение → _Контур"
+msgstr "Выделение в _контур"
 
 #: ../app/actions/vectors-actions.c:195
 #: ../app/actions/vectors-actions.c:201
 msgid "Selection to path"
-msgstr "Выделение → Контур"
+msgstr "Превратить выделение в контур"
 
 #: ../app/actions/vectors-actions.c:200
 msgid "To _Path"
@@ -4084,7 +4084,7 @@ msgstr "_Вид"
 
 #: ../app/actions/view-actions.c:68
 msgid "_Zoom"
-msgstr "Масштаб"
+msgstr "_Масштаб"
 
 #: ../app/actions/view-actions.c:69
 msgid "_Padding Color"
@@ -4104,7 +4104,7 @@ msgstr "_Закрыть"
 
 #: ../app/actions/view-actions.c:82
 msgid "Close this image window"
-msgstr "Закрыть окно изображения"
+msgstr "Закрыть это окно изображения"
 
 #: ../app/actions/view-actions.c:87
 msgid "_Fit Image in Window"
@@ -4120,7 +4120,7 @@ msgstr "_Заполнить окно"
 
 #: ../app/actions/view-actions.c:94
 msgid "Adjust the zoom ratio so that the entire window is used"
-msgstr "Подобрать размер просмотра так, чтобы пространство окна использовалось оптимально"
+msgstr "Подобрать масштаб отображения так, чтобы пространство окна использовалось оптимально"
 
 #: ../app/actions/view-actions.c:99
 #: ../app/actions/view-actions.c:579
@@ -4145,7 +4145,7 @@ msgstr "_Экранные фильтры..."
 
 #: ../app/actions/view-actions.c:112
 msgid "Configure filters applied to this view"
-msgstr "Настройка экранных фильтров"
+msgstr "Настроить экранные фильтры для этого окна"
 
 #: ../app/actions/view-actions.c:117
 msgid "Shrink _Wrap"
@@ -4373,7 +4373,7 @@ msgstr "Использовать светлый цвет фона"
 
 #: ../app/actions/view-actions.c:367
 msgid "_Dark Check Color"
-msgstr "_Темный"
+msgstr "_Тёмный"
 
 #: ../app/actions/view-actions.c:368
 msgid "Use the dark check color"
@@ -4389,7 +4389,7 @@ msgstr "Использовать произвольный цвет фона"
 
 #: ../app/actions/view-actions.c:379
 msgid "As in _Preferences"
-msgstr "Как в _настройках"
+msgstr "Как в _параметрах программы"
 
 #: ../app/actions/view-actions.c:380
 msgid "Reset padding color to what's configured in preferences"
@@ -4434,11 +4434,11 @@ msgstr "_Окна"
 
 #: ../app/actions/windows-actions.c:80
 msgid "_Recently Closed Docks"
-msgstr "_Недавние панели"
+msgstr "_Недавние прикрепляющиеся диалоги"
 
 #: ../app/actions/windows-actions.c:81
 msgid "_Dockable Dialogs"
-msgstr "_Панели"
+msgstr "_Прикрепляющиеся диалоги"
 
 #: ../app/actions/windows-actions.c:84
 msgid "Tool_box"
@@ -4586,7 +4586,7 @@ msgstr "Ластик"
 
 #: ../app/base/base-enums.c:135
 msgid "Replace"
-msgstr "Заменить"
+msgstr "Замена"
 
 #: ../app/base/base-enums.c:136
 msgid "Anti erase"
@@ -4682,7 +4682,7 @@ msgstr "Такие инструменты, как «Заливка» или «С
 
 #: ../app/config/gimprc-blurbs.h:92
 msgid "The window type hint that is set on dock windows. This may affect the way your window manager decorates and handles dock windows."
-msgstr "От этого параметра зависит то, какой вид придаст оконный менеджер панелям."
+msgstr "От этого параметра зависит то, какой вид оконный менеджер придаст панелям."
 
 #: ../app/config/gimprc-blurbs.h:123
 msgid "When enabled, the selected brush will be used for all tools."
@@ -4769,11 +4769,11 @@ msgstr "Если включено, X-сервер определяет пози
 
 #: ../app/config/gimprc-blurbs.h:245
 msgid "Sets whether GIMP should create previews of layers and channels. Previews in the layers and channels dialog are nice to have but they can slow things down when working with large images."
-msgstr "Указывает, надо ли создавать эскиз слоев и каналов. Эскиз слоев и каналов — приятная вещь, но ее использование может существенно замедлить работу с большими изображениями."
+msgstr "Указывает, надо ли создавать миниатюру слоев и каналов. Миниатюра слоев и каналов — приятная вещь, но ее использование может существенно замедлить работу с большими изображениями."
 
 #: ../app/config/gimprc-blurbs.h:250
 msgid "Sets the preview size used for layers and channel previews in newly created dialogs."
-msgstr "Устанавливает размер эскиза слоев и каналов."
+msgstr "Устанавливает размер миниатюры слоев и каналов."
 
 #: ../app/config/gimprc-blurbs.h:254
 msgid "When enabled, the image window will automatically resize itself whenever the physical image size changes."
@@ -4889,7 +4889,7 @@ msgstr "Определяет временный каталог. Здесь бу
 
 #: ../app/config/gimprc-blurbs.h:377
 msgid "Sets the size of the thumbnail shown in the Open dialog."
-msgstr "Установить размер эскиза в диалоге открытия файлов."
+msgstr "Установить размер миниатюры в диалоге открытия файлов."
 
 #: ../app/config/gimprc-blurbs.h:380
 msgid "The thumbnail in the Open dialog will be automatically updated if the file being previewed is smaller than the size set here."
@@ -4972,15 +4972,15 @@ msgstr "Нет"
 
 #: ../app/core/core-enums.c:54
 msgid "Floyd-Steinberg (normal)"
-msgstr "Смешивание цветов по Флойду-Стейнбергу (нормальное)"
+msgstr "По Флойду-Стейнбергу (нормальное)"
 
 #: ../app/core/core-enums.c:55
 msgid "Floyd-Steinberg (reduced color bleeding)"
-msgstr "Смешивание цветов по Флойду-Стейнбергу (уменьшенное растекание)"
+msgstr "По Флойду-Стейнбергу (уменьшенное растекание)"
 
 #: ../app/core/core-enums.c:56
 msgid "Positioned"
-msgstr "Позиция"
+msgstr "Фиксированное"
 
 #: ../app/core/core-enums.c:85
 msgid "Generate optimum palette"
@@ -4988,7 +4988,7 @@ msgstr "Создать оптимальную палитру"
 
 #: ../app/core/core-enums.c:86
 msgid "Use web-optimized palette"
-msgstr "Использовать оптимизированную для WWW палитру"
+msgstr "Использовать оптимизированную для веба палитру"
 
 #: ../app/core/core-enums.c:87
 msgid "Use black and white (1-bit) palette"
@@ -4996,7 +4996,7 @@ msgstr "Использовать черно-белую (1 разряд) пали
 
 #: ../app/core/core-enums.c:88
 msgid "Use custom palette"
-msgstr "Использовать свою палитру"
+msgstr "Использовать заказную палитру"
 
 #: ../app/core/core-enums.c:211
 msgid "First item"
@@ -5045,37 +5045,37 @@ msgstr "Текстура"
 
 #: ../app/core/core-enums.c:279
 msgid "Stroke line"
-msgstr "Линия штриха"
+msgstr "Обвести линией"
 
 #: ../app/core/core-enums.c:280
 msgid "Stroke with a paint tool"
-msgstr "Использовать один из инструментов"
+msgstr "Обвести рисующим инструментом"
 
 #: ../app/core/core-enums.c:307
 msgid "Solid color"
-msgstr "Один цвет"
+msgstr "Одним цветом"
 
 #: ../app/core/core-enums.c:336
 msgid "Miter"
-msgstr "Фацетное соединение"
+msgstr "Острое"
 
 #: ../app/core/core-enums.c:337
 #: ../app/core/core-enums.c:367
 msgid "Round"
-msgstr "Округлый"
+msgstr "Скругленное"
 
 #: ../app/core/core-enums.c:338
 msgid "Bevel"
-msgstr "Фасочное соединение"
+msgstr "Фаска"
 
 #: ../app/core/core-enums.c:366
 msgid "Butt"
-msgstr "Плоский"
+msgstr "Плоские"
 
 #: ../app/core/core-enums.c:368
 #: ../app/core/core-enums.c:443
 msgid "Square"
-msgstr "Квадратный"
+msgstr "Квадратные"
 
 #: ../app/core/core-enums.c:404
 msgid "Custom"
@@ -5087,15 +5087,15 @@ msgstr "Линия"
 
 #: ../app/core/core-enums.c:406
 msgid "Long dashes"
-msgstr "Длинные линии"
+msgstr "Длинные тире"
 
 #: ../app/core/core-enums.c:407
 msgid "Medium dashes"
-msgstr "Средние линии"
+msgstr "Средние тире"
 
 #: ../app/core/core-enums.c:408
 msgid "Short dashes"
-msgstr "Короткие линии"
+msgstr "Короткие тире"
 
 #: ../app/core/core-enums.c:409
 msgid "Sparse dots"
@@ -5149,7 +5149,7 @@ msgstr "Все слои"
 
 #: ../app/core/core-enums.c:506
 msgid "Image-sized layers"
-msgstr "Слои с размером изображения"
+msgstr "Слои размером с изображение"
 
 #: ../app/core/core-enums.c:507
 msgid "All visible layers"
@@ -5157,7 +5157,7 @@ msgstr "Все видимые слои"
 
 #: ../app/core/core-enums.c:508
 msgid "All linked layers"
-msgstr "Все соединенные слои"
+msgstr "Все связанные слои"
 
 #: ../app/core/core-enums.c:572
 msgid "Tiny"
@@ -5209,11 +5209,11 @@ msgstr "Без миниатюр"
 
 #: ../app/core/core-enums.c:673
 msgid "Normal (128x128)"
-msgstr "Стандарт (128x128)"
+msgstr "Обычный (128×128)"
 
 #: ../app/core/core-enums.c:674
 msgid "Large (256x256)"
-msgstr "Большой (256x256)"
+msgstr "Большой (256×256)"
 
 #: ../app/core/core-enums.c:850
 msgid "<>"
@@ -5233,7 +5233,7 @@ msgstr "Зеркально отразить изображение"
 
 #: ../app/core/core-enums.c:854
 msgid "Rotate image"
-msgstr "Вращать изображение"
+msgstr "Повернуть изображение"
 
 #: ../app/core/core-enums.c:855
 msgid "Crop image"
@@ -5245,7 +5245,7 @@ msgstr "Преобразовать изображение"
 
 #: ../app/core/core-enums.c:857
 msgid "Remove item"
-msgstr "Удалить элемент"
+msgstr "Удалить объект"
 
 #: ../app/core/core-enums.c:858
 msgid "Merge layers"
@@ -5286,7 +5286,7 @@ msgstr "Изменение слоя/канала"
 #: ../app/core/core-enums.c:866
 #: ../app/core/core-enums.c:898
 msgid "Selection mask"
-msgstr "Маска выделенной области"
+msgstr "Маска выделения"
 
 #: ../app/core/core-enums.c:867
 #: ../app/core/core-enums.c:901
@@ -5296,7 +5296,7 @@ msgstr "Видимость объекта"
 #: ../app/core/core-enums.c:868
 #: ../app/core/core-enums.c:902
 msgid "Link/Unlink item"
-msgstr "(Рас)соединение элемента"
+msgstr "(Рас)соединение объекта"
 
 #: ../app/core/core-enums.c:869
 msgid "Item properties"
@@ -5305,15 +5305,15 @@ msgstr "Свойства элемента"
 #: ../app/core/core-enums.c:870
 #: ../app/core/core-enums.c:900
 msgid "Move item"
-msgstr "Перемещение элемента"
+msgstr "Перемещение объекта"
 
 #: ../app/core/core-enums.c:871
 msgid "Scale item"
-msgstr "Масштабировать элемент"
+msgstr "Масштабирование объекта"
 
 #: ../app/core/core-enums.c:872
 msgid "Resize item"
-msgstr "Изменить размер элемента"
+msgstr "Смена размера объекта"
 
 #: ../app/core/core-enums.c:873
 msgid "Add layer"
@@ -5463,7 +5463,7 @@ msgstr "Удаление канала"
 
 #: ../app/core/core-enums.c:917
 msgid "Reposition channel"
-msgstr "Смещение канала"
+msgstr "Перестановка канала"
 
 #: ../app/core/core-enums.c:918
 msgid "Channel color"
@@ -5529,7 +5529,7 @@ msgstr "Сохранять встроенный профиль"
 
 #: ../app/core/core-enums.c:1262
 msgid "Convert to RGB workspace"
-msgstr "Преобразовать в модель рабочего пространства"
+msgstr "Преобразовать в рабочее пространство RGB"
 
 #: ../app/core/gimp-contexts.c:155
 #: ../app/core/gimptooloptions.c:231
@@ -5628,7 +5628,7 @@ msgstr "Поиск файлов данных"
 
 #: ../app/core/gimp.c:834
 msgid "Parasites"
-msgstr "Шумы"
+msgstr "Паразиты"
 
 #. initialize the list of fonts
 #: ../app/core/gimp.c:854
@@ -5777,7 +5777,7 @@ msgstr "%s Канал -> Выделенная область"
 #: ../app/tools/gimpfuzzyselecttool.c:80
 msgctxt "command"
 msgid "Fuzzy Select"
-msgstr "Выделение связанной области"
+msgstr "Выделение смежных областей"
 
 #: ../app/core/gimpchannel-select.c:567
 #: ../app/tools/gimpbycolorselecttool.c:82
@@ -5814,7 +5814,7 @@ msgid "Rotate Channel"
 msgstr "Вращение канала"
 
 #: ../app/core/gimpchannel.c:264
-#: ../app/core/gimpdrawable-transform.c:843
+#: ../app/core/gimpdrawable-transform.c:886
 msgid "Transform Channel"
 msgstr "Преобразование канала"
 
@@ -5852,7 +5852,7 @@ msgstr "Расширить канал"
 
 #: ../app/core/gimpchannel.c:293
 msgid "Shrink Channel"
-msgstr "Сжать канал"
+msgstr "Сузить канал"
 
 #: ../app/core/gimpchannel.c:710
 #, c-format
@@ -5953,7 +5953,7 @@ msgstr "Цветовой баланс"
 #: ../app/core/gimpdrawable-colorize.c:85
 #: ../app/tools/gimpcolorizetool.c:90
 msgid "Colorize"
-msgstr "Тонировать"
+msgstr "Тонирование"
 
 #: ../app/core/gimpdrawable-curves.c:165
 #: ../app/core/gimpdrawable-curves.c:182
@@ -6003,7 +6003,7 @@ msgstr "Сдвиг изображения"
 #: ../app/core/gimpdrawable-posterize.c:80
 #: ../app/tools/gimpposterizetool.c:84
 msgid "Posterize"
-msgstr "Постеризовать"
+msgstr "Постеризация"
 
 #: ../app/core/gimpdrawable-stroke.c:324
 msgid "Render Stroke"
@@ -6015,24 +6015,24 @@ msgstr "Обвести контур"
 msgid "Threshold"
 msgstr "Порог"
 
-#: ../app/core/gimpdrawable-transform.c:629
+#: ../app/core/gimpdrawable-transform.c:645
 #: ../app/tools/gimpfliptool.c:116
 msgctxt "command"
 msgid "Flip"
 msgstr "Зеркало"
 
-#: ../app/core/gimpdrawable-transform.c:716
+#: ../app/core/gimpdrawable-transform.c:745
 #: ../app/tools/gimprotatetool.c:121
 msgctxt "command"
 msgid "Rotate"
 msgstr "Вращение"
 
-#: ../app/core/gimpdrawable-transform.c:841
+#: ../app/core/gimpdrawable-transform.c:884
 #: ../app/core/gimplayer.c:255
 msgid "Transform Layer"
 msgstr "Преобразование слоя"
 
-#: ../app/core/gimpdrawable-transform.c:856
+#: ../app/core/gimpdrawable-transform.c:899
 msgid "Transformation"
 msgstr "Преобразование"
 
@@ -6373,23 +6373,23 @@ msgstr "Удалённый файл"
 
 #: ../app/core/gimpimagefile.c:568
 msgid "Click to create preview"
-msgstr "Нажмите для создания предпросмотра"
+msgstr "Нажмите для создания миниатюры"
 
 #: ../app/core/gimpimagefile.c:574
 msgid "Loading preview..."
-msgstr "Загрузка эскиза..."
+msgstr "Загрузка миниатюры..."
 
 #: ../app/core/gimpimagefile.c:580
 msgid "Preview is out of date"
-msgstr "Эскиз устарел"
+msgstr "Миниатюра устарела"
 
 #: ../app/core/gimpimagefile.c:586
 msgid "Cannot create preview"
-msgstr "Не удалось создать эскиз"
+msgstr "Не удалось создать миниатюру"
 
 #: ../app/core/gimpimagefile.c:596
 msgid "(Preview may be out of date)"
-msgstr "(Возможно, эскиз устарел)"
+msgstr "(Возможно, миниатюра устарела)"
 
 #. pixel size
 #: ../app/core/gimpimagefile.c:605
@@ -6399,9 +6399,9 @@ msgstr "(Возможно, эскиз устарел)"
 #, c-format
 msgid "%d × %d pixel"
 msgid_plural "%d × %d pixels"
-msgstr[0] "%d x %d точку растра"
-msgstr[1] "%d x %d точки растра"
-msgstr[2] "%d x %d точек растра"
+msgstr[0] "%d × %d точка растра"
+msgstr[1] "%d × %d точки растра"
+msgstr[2] "%d × %d точек растра"
 
 #: ../app/core/gimpimagefile.c:628
 #: ../app/display/gimpdisplayshell-title.c:325
@@ -6479,7 +6479,7 @@ msgid "Rotate Layer"
 msgstr "Вращение слоя"
 
 #: ../app/core/gimplayer.c:405
-#: ../app/core/gimplayer.c:1329
+#: ../app/core/gimplayer.c:1330
 #: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
@@ -6494,40 +6494,40 @@ msgstr ""
 "Плавающее выделение\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1265
+#: ../app/core/gimplayer.c:1266
 #, c-format
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "Не удалось добавить маску слоя, так как у слоя уже есть маска."
 
-#: ../app/core/gimplayer.c:1276
+#: ../app/core/gimplayer.c:1277
 #, c-format
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr ""
 "Невозможно добавить маску слоя, отличающуюся\n"
 " размерами от указанного слоя."
 
-#: ../app/core/gimplayer.c:1384
+#: ../app/core/gimplayer.c:1385
 msgid "Transfer Alpha to Mask"
 msgstr "Преобразовать альфа-канал в маску"
 
-#: ../app/core/gimplayer.c:1556
+#: ../app/core/gimplayer.c:1557
 #: ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "Применение маски слоя"
 
-#: ../app/core/gimplayer.c:1557
+#: ../app/core/gimplayer.c:1558
 msgid "Delete Layer Mask"
 msgstr "Удаление маски слоя"
 
-#: ../app/core/gimplayer.c:1669
+#: ../app/core/gimplayer.c:1670
 msgid "Add Alpha Channel"
 msgstr "Добавка альфа-канала"
 
-#: ../app/core/gimplayer.c:1723
+#: ../app/core/gimplayer.c:1724
 msgid "Remove Alpha Channel"
 msgstr "Удаление альфа-канала"
 
-#: ../app/core/gimplayer.c:1745
+#: ../app/core/gimplayer.c:1746
 msgid "Layer to Image Size"
 msgstr "Слой к размеру изображения"
 
@@ -6637,7 +6637,7 @@ msgid "Please wait"
 msgstr "Подождите пожалуйста"
 
 #: ../app/core/gimpselection.c:150
-#: ../app/tools/gimpeditselectiontool.c:242
+#: ../app/tools/gimpeditselectiontool.c:240
 msgid "Move Selection"
 msgstr "Перемещение выделения"
 
@@ -6709,10 +6709,10 @@ msgid "pixel"
 msgstr "точка растра"
 
 #: ../app/core/gimpunit.c:56
-#: ../app/tools/gimpmeasuretool.c:874
-#: ../app/tools/gimpmeasuretool.c:1017
-#: ../app/tools/gimpmeasuretool.c:1073
-#: ../app/tools/gimpmeasuretool.c:1101
+#: ../app/tools/gimpmeasuretool.c:877
+#: ../app/tools/gimpmeasuretool.c:1020
+#: ../app/tools/gimpmeasuretool.c:1076
+#: ../app/tools/gimpmeasuretool.c:1104
 #: ../app/tools/gimppainttool.c:615
 msgid "pixels"
 msgstr "точки растра"
@@ -6745,11 +6745,11 @@ msgstr "пункты"
 
 #: ../app/core/gimpunit.c:64
 msgid "pica"
-msgstr "пика"
+msgstr "пайка"
 
 #: ../app/core/gimpunit.c:64
 msgid "picas"
-msgstr "пики"
+msgstr "пайки"
 
 #: ../app/core/gimpunit.c:71
 msgid "percent"
@@ -6832,7 +6832,7 @@ msgid "Cannot convert to a palette with more than 256 colors."
 msgstr "Невозможно преобразовать в палитру больше 256 цветов."
 
 #: ../app/dialogs/dialogs-constructors.c:184
-#: ../app/gui/gui.c:158
+#: ../app/gui/gui.c:161
 #: ../app/gui/gui-message.c:148
 msgid "GIMP Message"
 msgstr "Сообщение GIMP"
@@ -6883,7 +6883,7 @@ msgstr "Окно навигации"
 
 #: ../app/dialogs/dialogs.c:218
 msgid "FG/BG"
-msgstr "П.план/Фон"
+msgstr "Передний план/Фон"
 
 #: ../app/dialogs/dialogs.c:218
 msgid "FG/BG Color"
@@ -6937,7 +6937,7 @@ msgstr "Указанное расширение не соответствует
 
 #: ../app/dialogs/file-save-dialog.c:448
 msgid "Do you want to save the image using this name anyway?"
-msgstr "Вы всё равно хотите сохранить файл с таким именем?"
+msgstr "Вы все равно хотите сохранить файл с таким именем?"
 
 #: ../app/dialogs/grid-dialog.c:85
 msgid "Configure Grid"
@@ -7072,12 +7072,12 @@ msgstr "_Имя слоя:"
 
 #. The size labels
 #: ../app/dialogs/layer-options-dialog.c:139
-#: ../app/tools/gimpmeasuretool.c:1062
+#: ../app/tools/gimpmeasuretool.c:1065
 msgid "Width:"
 msgstr "Ширина:"
 
 #: ../app/dialogs/layer-options-dialog.c:145
-#: ../app/tools/gimpmeasuretool.c:1090
+#: ../app/tools/gimpmeasuretool.c:1093
 msgid "Height:"
 msgstr "Высота:"
 
@@ -7377,15 +7377,15 @@ msgstr "Число используемых _процессоров:"
 #. Image Thumbnails
 #: ../app/dialogs/preferences-dialog.c:1572
 msgid "Image Thumbnails"
-msgstr "Эскизы изображений"
+msgstr "Миниатюры изображений"
 
 #: ../app/dialogs/preferences-dialog.c:1577
 msgid "Size of _thumbnails:"
-msgstr "Размер файлов _эскизов:"
+msgstr "Размер файлов _миниатюр:"
 
 #: ../app/dialogs/preferences-dialog.c:1581
 msgid "Maximum _filesize for thumbnailing:"
-msgstr "Максимальный размер эскизных _файлов:"
+msgstr "Максимальный размер _файлов миниатюр:"
 
 #. File Saving
 #: ../app/dialogs/preferences-dialog.c:1585
@@ -7415,11 +7415,11 @@ msgstr "Предварительный просмотр"
 
 #: ../app/dialogs/preferences-dialog.c:1620
 msgid "_Enable layer & channel previews"
-msgstr "Включить _предпросмотр слоев и каналов"
+msgstr "Включить м_иниатюры слоев и каналов"
 
 #: ../app/dialogs/preferences-dialog.c:1626
 msgid "_Default layer & channel preview size:"
-msgstr "_Размер предпросмотра слоев и каналов:"
+msgstr "_Размер миниатюр слоев и каналов:"
 
 #: ../app/dialogs/preferences-dialog.c:1629
 msgid "Na_vigation preview size:"
@@ -7505,11 +7505,11 @@ msgstr "Руководство пользователя:"
 
 #: ../app/dialogs/preferences-dialog.c:1826
 msgid "There's a local installation of the user manual."
-msgstr "Руководство пользователя установлено локально."
+msgstr "Руководство пользователя установлено локально"
 
 #: ../app/dialogs/preferences-dialog.c:1831
 msgid "The user manual is not installed locally."
-msgstr "Руководство пользователя не установлено локально."
+msgstr "Руководство пользователя не установлено локально"
 
 #. Help Browser
 #: ../app/dialogs/preferences-dialog.c:1854
@@ -7567,7 +7567,7 @@ msgid "Set layer or path as active"
 msgstr "Делать слой или контур активным"
 
 #: ../app/dialogs/preferences-dialog.c:1966
-#: ../app/widgets/gimptoolbox.c:631
+#: ../app/widgets/gimptoolbox.c:633
 msgid "Toolbox"
 msgstr "Панель инструментов"
 
@@ -7764,19 +7764,19 @@ msgstr "Управление цветом"
 
 #: ../app/dialogs/preferences-dialog.c:2441
 msgid "_RGB profile:"
-msgstr "_RGB-профиль:"
+msgstr "Профиль _RGB:"
 
 #: ../app/dialogs/preferences-dialog.c:2442
 msgid "Select RGB Color Profile"
-msgstr "Выберите RGB-профиль"
+msgstr "Выберите профиль RGB"
 
 #: ../app/dialogs/preferences-dialog.c:2443
 msgid "_CMYK profile:"
-msgstr "_CMYK-профиль:"
+msgstr "Профиль _CMYK:"
 
 #: ../app/dialogs/preferences-dialog.c:2444
 msgid "Select CMYK Color Profile"
-msgstr "Выберите CMYK-профиль"
+msgstr "Выберите профиль CMYK"
 
 #: ../app/dialogs/preferences-dialog.c:2445
 msgid "_Monitor profile:"
@@ -7865,7 +7865,7 @@ msgstr "Управление внешним видом окон"
 
 #: ../app/dialogs/preferences-dialog.c:2632
 msgid "Hint for the _toolbox:"
-msgstr "Тип окна для панели _инструментов:"
+msgstr "Тип окна для _других панелей:"
 
 #: ../app/dialogs/preferences-dialog.c:2636
 msgid "Hint for other _docks:"
@@ -7922,51 +7922,51 @@ msgstr "Выбрать каталог подкачки"
 
 #: ../app/dialogs/preferences-dialog.c:2744
 msgid "Brush Folders"
-msgstr "Каталоги кистей"
+msgstr "Папки с файлами кистей"
 
 #: ../app/dialogs/preferences-dialog.c:2746
 msgid "Select Brush Folders"
-msgstr "Выбрать каталоги кистей"
+msgstr "Выбрать папки с кистями"
 
 #: ../app/dialogs/preferences-dialog.c:2748
 msgid "Pattern Folders"
-msgstr "Каталоги текстур"
+msgstr "Папки с файлами текстур"
 
 #: ../app/dialogs/preferences-dialog.c:2750
 msgid "Select Pattern Folders"
-msgstr "Выбрать каталоги текстур"
+msgstr "Выбрать папки с текстурами"
 
 #: ../app/dialogs/preferences-dialog.c:2752
 msgid "Palette Folders"
-msgstr "Каталоги палитр"
+msgstr "Папки с файлами цветовых палитр"
 
 #: ../app/dialogs/preferences-dialog.c:2754
 msgid "Select Palette Folders"
-msgstr "Выбрать каталоги палитр"
+msgstr "Выбрать папки с палитрами"
 
 #: ../app/dialogs/preferences-dialog.c:2756
 msgid "Gradient Folders"
-msgstr "Каталоги градиентов"
+msgstr "Папки с файлами градиентов"
 
 #: ../app/dialogs/preferences-dialog.c:2758
 msgid "Select Gradient Folders"
-msgstr "Выбрать каталоги градиентов"
+msgstr "Выбрать папки с градиентами"
 
 #: ../app/dialogs/preferences-dialog.c:2760
 msgid "Font Folders"
-msgstr "Каталоги шрифтов"
+msgstr "Папки с файлами шрифтов"
 
 #: ../app/dialogs/preferences-dialog.c:2762
 msgid "Select Font Folders"
-msgstr "Выбрать каталоги шрифтов"
+msgstr "Выбрать папки со шрифтами"
 
 #: ../app/dialogs/preferences-dialog.c:2764
 msgid "Plug-In Folders"
-msgstr "Каталоги расширений"
+msgstr "Папки с файлами расширений"
 
 #: ../app/dialogs/preferences-dialog.c:2766
 msgid "Select Plug-In Folders"
-msgstr "Выбрать каталоги расширений"
+msgstr "Выбрать папки с расширениями"
 
 #: ../app/dialogs/preferences-dialog.c:2768
 msgid "Scripts"
@@ -7974,19 +7974,19 @@ msgstr "Сценарии"
 
 #: ../app/dialogs/preferences-dialog.c:2768
 msgid "Script-Fu Folders"
-msgstr "Каталоги Script-Fu"
+msgstr "Папки с файлами сценариев Script-Fu"
 
 #: ../app/dialogs/preferences-dialog.c:2770
 msgid "Select Script-Fu Folders"
-msgstr "Выбрать каталоги Script-Fu"
+msgstr "Выбрать папки со сценариями Script-Fu"
 
 #: ../app/dialogs/preferences-dialog.c:2772
 msgid "Module Folders"
-msgstr "Каталоги модулей"
+msgstr "Папки с файлами модулей"
 
 #: ../app/dialogs/preferences-dialog.c:2774
 msgid "Select Module Folders"
-msgstr "Выбрать каталоги модулей"
+msgstr "Выбрать папки с модулями"
 
 #: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreters"
@@ -7994,11 +7994,11 @@ msgstr "Интерпретаторы"
 
 #: ../app/dialogs/preferences-dialog.c:2776
 msgid "Interpreter Folders"
-msgstr "Каталоги интерпретаторов"
+msgstr "Папки с файлами интерпретаторов"
 
 #: ../app/dialogs/preferences-dialog.c:2778
 msgid "Select Interpreter Folders"
-msgstr "Выбрать каталоги интерпретаторов"
+msgstr "Выбрать папки с интерпретаторами"
 
 #: ../app/dialogs/preferences-dialog.c:2780
 msgid "Environment Folders"
@@ -8006,7 +8006,7 @@ msgstr "Каталоги окружения"
 
 #: ../app/dialogs/preferences-dialog.c:2782
 msgid "Select Environment Folders"
-msgstr "Выбрать каталоги окружения"
+msgstr "Выбрать папки окружения"
 
 #: ../app/dialogs/preferences-dialog.c:2784
 msgid "Themes"
@@ -8014,11 +8014,11 @@ msgstr "Стили оформления"
 
 #: ../app/dialogs/preferences-dialog.c:2784
 msgid "Theme Folders"
-msgstr "Каталоги стилей оформления"
+msgstr "Папки со стилями оформления"
 
 #: ../app/dialogs/preferences-dialog.c:2786
 msgid "Select Theme Folders"
-msgstr "Выбрать каталоги стилей оформления"
+msgstr "Выбрать папки стилей оформления"
 
 #: ../app/dialogs/print-size-dialog.c:138
 msgid "Print Size"
@@ -8293,20 +8293,20 @@ msgstr "Высокое"
 msgid "Image saved to '%s'"
 msgstr "Изображение сохранено в '%s'"
 
-#: ../app/display/gimpdisplayshell.c:1033
+#: ../app/display/gimpdisplayshell.c:1035
 msgid "Access the image menu"
 msgstr "Доступ к меню изображения"
 
-#: ../app/display/gimpdisplayshell.c:1138
+#: ../app/display/gimpdisplayshell.c:1140
 msgid "Zoom image when window size changes"
 msgstr "При изменении размера окна изменять размер изображения"
 
-#: ../app/display/gimpdisplayshell.c:1188
+#: ../app/display/gimpdisplayshell.c:1190
 msgid "Navigate the image display"
 msgstr "Навигация по изображению"
 
-#: ../app/display/gimpdisplayshell.c:1283
-#: ../app/display/gimpdisplayshell.c:1373
+#: ../app/display/gimpdisplayshell.c:1285
+#: ../app/display/gimpdisplayshell.c:1375
 #: ../app/widgets/gimptoolbox.c:222
 msgid "Drop image files here to open them"
 msgstr "Перетащите сюда изображения, которые хотите открыть"
@@ -8506,7 +8506,7 @@ msgid "not a GIMP Levels file"
 msgstr "не файл цветовых уровней GIMP"
 
 #. initialize the document history
-#: ../app/gui/gui.c:420
+#: ../app/gui/gui.c:426
 msgid "Documents"
 msgstr "Документы"
 
@@ -8586,7 +8586,7 @@ msgstr "Инструмент Штамп по перспективе не раб
 #: ../app/paint/gimpsmudge.c:78
 #: ../app/tools/gimpsmudgetool.c:53
 msgid "Smudge"
-msgstr "Палец"
+msgstr "Размазывание"
 
 #: ../app/paint/gimpsourcecore.c:227
 #, c-format
@@ -8647,7 +8647,7 @@ msgid "2D Transforming"
 msgstr "2D преобразование"
 
 #: ../app/pdb/edit-cmds.c:709
-#: ../app/tools/gimpblendtool.c:223
+#: ../app/tools/gimpblendtool.c:225
 msgid "Blending"
 msgstr "Заливка"
 
@@ -9044,7 +9044,7 @@ msgstr ""
 "Да, но фальшивый экземпляръ!"
 
 #: ../app/text/gimptext-compat.c:108
-#: ../app/tools/gimptexttool.c:877
+#: ../app/tools/gimptexttool.c:879
 msgid "Add Text Layer"
 msgstr "Добавить текстовый слой"
 
@@ -9272,23 +9272,23 @@ msgstr "Градиент: заливка цветным градиентом"
 msgid "Blen_d"
 msgstr "_Градиентная заливка"
 
-#: ../app/tools/gimpblendtool.c:162
+#: ../app/tools/gimpblendtool.c:164
 #, c-format
 msgid "Blend does not operate on indexed layers."
 msgstr "Градиентная заливка не действует на индексированные слои."
 
-#: ../app/tools/gimpblendtool.c:400
+#: ../app/tools/gimpblendtool.c:402
 #: ../app/tools/gimppainttool.c:606
 #, c-format
 msgid "%s for constrained angles"
 msgstr "%s для ограничения шага угла"
 
-#: ../app/tools/gimpblendtool.c:401
+#: ../app/tools/gimpblendtool.c:403
 #, c-format
 msgid "%s to move the whole line"
 msgstr "%s для смещения всей линии"
 
-#: ../app/tools/gimpblendtool.c:405
+#: ../app/tools/gimpblendtool.c:407
 msgid "Blend: "
 msgstr "Градиентная заливка: "
 
@@ -9356,11 +9356,11 @@ msgstr "Область применения (%s)"
 
 #: ../app/tools/gimpbucketfilloptions.c:243
 msgid "Fill whole selection"
-msgstr "Заполнить все выделенное"
+msgstr "Всё выделение"
 
 #: ../app/tools/gimpbucketfilloptions.c:244
 msgid "Fill similar colors"
-msgstr "Заполнить похожие цвета"
+msgstr "Похожие цвета"
 
 #: ../app/tools/gimpbucketfilloptions.c:253
 msgid "Finding Similar Colors"
@@ -9368,7 +9368,7 @@ msgstr "Поиск похожих цветов"
 
 #: ../app/tools/gimpbucketfilloptions.c:269
 msgid "Fill transparent areas"
-msgstr "Заполнить прозрачные области"
+msgstr "Залить прозрачные области"
 
 #: ../app/tools/gimpbucketfilloptions.c:275
 #: ../app/tools/gimpclonetool.c:114
@@ -9468,7 +9468,7 @@ msgstr "Цветовой баланс действует только на из
 
 #: ../app/tools/gimpcolorbalancetool.c:270
 msgid "Select Range to Adjust"
-msgstr "Выберите изменяемую область"
+msgstr "Выберите изменяемый диапазон"
 
 #: ../app/tools/gimpcolorbalancetool.c:279
 #: ../app/tools/gimplevelstool.c:172
@@ -9492,7 +9492,7 @@ msgstr "Желтый"
 
 #: ../app/tools/gimpcolorbalancetool.c:325
 msgid "R_eset Range"
-msgstr "_Восстановить область"
+msgstr "_Восстановить диапазон"
 
 #: ../app/tools/gimpcolorbalancetool.c:334
 msgid "Preserve _luminosity"
@@ -9504,7 +9504,7 @@ msgstr "Тонирование: окрашивание изображения"
 
 #: ../app/tools/gimpcolorizetool.c:92
 msgid "Colori_ze..."
-msgstr "Тон_ировать..."
+msgstr "Тон_ирование..."
 
 #: ../app/tools/gimpcolorizetool.c:109
 msgid "Colorize the Image"
@@ -9736,7 +9736,7 @@ msgstr "Невозможно прочесть заголовок из '%s': %s"
 
 #: ../app/tools/gimpcurvestool.c:705
 msgid "Use _old curves file format"
-msgstr "Использовать _старый формат кривых"
+msgstr "_Использовать старый формат кривых"
 
 #: ../app/tools/gimpdesaturatetool.c:78
 msgid "Desaturate Tool: Turn colors into shades of gray"
@@ -9744,7 +9744,7 @@ msgstr "Обесцвечивание: перевод цветов в града
 
 #: ../app/tools/gimpdesaturatetool.c:79
 msgid "_Desaturate..."
-msgstr "_Обесцветить..."
+msgstr "_Обесцвечивание..."
 
 #: ../app/tools/gimpdesaturatetool.c:93
 msgid "Desaturate (Remove Colors)"
@@ -9812,13 +9812,13 @@ msgstr "Диапазон"
 msgid "Exposure:"
 msgstr "Экспозиция:"
 
-#: ../app/tools/gimpeditselectiontool.c:246
-#: ../app/tools/gimpeditselectiontool.c:1231
+#: ../app/tools/gimpeditselectiontool.c:244
+#: ../app/tools/gimpeditselectiontool.c:1229
 msgid "Move Floating Selection"
 msgstr "Переместить плавающее выделение"
 
-#: ../app/tools/gimpeditselectiontool.c:459
-#: ../app/tools/gimpeditselectiontool.c:728
+#: ../app/tools/gimpeditselectiontool.c:457
+#: ../app/tools/gimpeditselectiontool.c:726
 msgid "Move: "
 msgstr "Перемещение: "
 
@@ -10012,15 +10012,15 @@ msgstr "Выделение от руки"
 
 #: ../app/tools/gimpfuzzyselecttool.c:65
 msgid "Fuzzy Select"
-msgstr "Выделение связанной области"
+msgstr "Выделение смежных областей"
 
 #: ../app/tools/gimpfuzzyselecttool.c:66
 msgid "Fuzzy Select Tool: Select a contiguous region on the basis of color"
-msgstr "Выделение связанной области: выделение области по цвету"
+msgstr "Выделение смежных областей: выделение соседних областей области по схожести цвета"
 
 #: ../app/tools/gimpfuzzyselecttool.c:67
 msgid "Fu_zzy Select"
-msgstr "В_ыделение связанной области"
+msgstr "В_ыделение смежных областей"
 
 #: ../app/tools/gimpgegltool.c:92
 #: ../app/tools/gimpgegltool.c:111
@@ -10029,7 +10029,7 @@ msgstr "Операция GEGL"
 
 #: ../app/tools/gimpgegltool.c:93
 msgid "GEGL Tool: Use an arbitrary GEGL operation"
-msgstr "Инструмент GEGL: выполнение любой операции GEGL"
+msgstr "Инструмент GEGL: выполнение произвольной операции GEGL"
 
 #: ../app/tools/gimpgegltool.c:94
 msgid "_GEGL Operation..."
@@ -10151,7 +10151,7 @@ msgstr "Восстановить _цвет"
 
 #: ../app/tools/gimpimagemaptool-settings.c:81
 msgid "Pre_sets:"
-msgstr "_Предустановки:"
+msgstr "_Профили:"
 
 #: ../app/tools/gimpimagemaptool-settings.c:221
 #, c-format
@@ -10175,7 +10175,7 @@ msgid "Size:"
 msgstr "Размер:"
 
 #: ../app/tools/gimpinkoptions-gui.c:76
-#: ../app/tools/gimpmeasuretool.c:1034
+#: ../app/tools/gimpmeasuretool.c:1037
 #: ../app/widgets/gimpbrusheditor.c:208
 msgid "Angle:"
 msgstr "Угол:"
@@ -10227,7 +10227,7 @@ msgid "Intelligent _Scissors"
 msgstr "_Умные ножницы"
 
 #: ../app/tools/gimpiscissorstool.c:940
-#: ../app/tools/gimpmeasuretool.c:606
+#: ../app/tools/gimpmeasuretool.c:609
 msgid "Click-Drag to move this point"
 msgstr "Нажмите и потащите, чтобы переместить точку"
 
@@ -10319,7 +10319,7 @@ msgstr "Изменить эти параметры как кривые"
 
 #: ../app/tools/gimplevelstool.c:825
 msgid "Use _old levels file format"
-msgstr "Использовать _старый формат уровней"
+msgstr "_Использовать старый формат уровней"
 
 #: ../app/tools/gimpmagnifyoptions.c:167
 msgid "Auto-resize window"
@@ -10360,36 +10360,36 @@ msgstr "Измеритель: измерение расстояний и угл
 msgid "_Measure"
 msgstr "_Измеритель"
 
-#: ../app/tools/gimpmeasuretool.c:238
+#: ../app/tools/gimpmeasuretool.c:241
 msgid "Add Guides"
 msgstr "Добавить направляющие"
 
-#: ../app/tools/gimpmeasuretool.c:558
+#: ../app/tools/gimpmeasuretool.c:561
 msgid "Click to place vertical and horizontal guides"
 msgstr "Щелкните для размещения вертикальной или горизонтальной направляющей"
 
-#: ../app/tools/gimpmeasuretool.c:567
+#: ../app/tools/gimpmeasuretool.c:570
 msgid "Click to place a horizontal guide"
 msgstr "Щелкните для размещения горизонтальной направляющей"
 
-#: ../app/tools/gimpmeasuretool.c:581
+#: ../app/tools/gimpmeasuretool.c:584
 msgid "Click to place a vertical guide"
 msgstr "Щелкните для размещения вертикальной направляющей"
 
-#: ../app/tools/gimpmeasuretool.c:595
+#: ../app/tools/gimpmeasuretool.c:598
 msgid "Click-Drag to add a new point"
 msgstr "Щелкните и потащите, чтобы добавить новую точку"
 
-#: ../app/tools/gimpmeasuretool.c:625
+#: ../app/tools/gimpmeasuretool.c:628
 msgid "Click-Drag to move all points"
 msgstr "Щелкните и потащите, чтобы переместить все точки"
 
 #. tool->display->shell
-#: ../app/tools/gimpmeasuretool.c:986
+#: ../app/tools/gimpmeasuretool.c:989
 msgid "Measure Distances and Angles"
 msgstr "Измерение расстояний и углов"
 
-#: ../app/tools/gimpmeasuretool.c:1006
+#: ../app/tools/gimpmeasuretool.c:1009
 msgid "Distance:"
 msgstr "Расстояние:"
 
@@ -10500,7 +10500,7 @@ msgstr "Скорость:"
 
 #: ../app/tools/gimppaintoptions-gui.c:210
 msgid "Random:"
-msgstr "Случайность"
+msgstr "Случайность:"
 
 #: ../app/tools/gimppaintoptions-gui.c:264
 msgid "Incremental"
@@ -10508,7 +10508,7 @@ msgstr "Дополняющий"
 
 #: ../app/tools/gimppaintoptions-gui.c:280
 msgid "Hard edge"
-msgstr "Жесткие края"
+msgstr "Жёсткие края"
 
 #: ../app/tools/gimppaintoptions-gui.c:565
 msgid "Fade out"
@@ -10730,7 +10730,7 @@ msgstr "Масштаб"
 #: ../app/tools/gimpselectionoptions.c:258
 #: ../app/tools/gimptextoptions.c:473
 msgid "Antialiasing"
-msgstr "Антиалиасинг"
+msgstr "Сглаживание"
 
 #: ../app/tools/gimpselectionoptions.c:273
 msgid "Feather edges"
@@ -10799,19 +10799,19 @@ msgstr "Коэффициент искривления по _Y:"
 
 #: ../app/tools/gimpsmudgetool.c:54
 msgid "Smudge Tool: Smudge selectively using a brush"
-msgstr "Палец: выборочное размазывание кистью"
+msgstr "Размазывание: выборочное размазывание кистью"
 
 #: ../app/tools/gimpsmudgetool.c:55
 msgid "_Smudge"
-msgstr "Пале_ц"
+msgstr "_Размазывание"
 
 #: ../app/tools/gimpsmudgetool.c:74
 msgid "Click to smudge"
-msgstr "Нажмите для размазывания"
+msgstr "Щелкните, чтобы размазать"
 
 #: ../app/tools/gimpsmudgetool.c:75
 msgid "Click to smudge the line"
-msgstr "Нажмите для размазывания линией"
+msgstr "Щелкните, чтобы размазать линией"
 
 #: ../app/tools/gimptextoptions.c:127
 msgid "Hinting alters the font outline to produce a crisp bitmap at small sizes"
@@ -10839,7 +10839,7 @@ msgstr "Шрифт:"
 
 #: ../app/tools/gimptextoptions.c:461
 msgid "Hinting"
-msgstr "Инструктирование"
+msgstr "Хинтинг"
 
 #: ../app/tools/gimptextoptions.c:466
 msgid "Force auto-hinter"
@@ -10874,20 +10874,20 @@ msgstr "Текст: создание и редактирование текст
 msgid "Te_xt"
 msgstr "_Текст"
 
-#: ../app/tools/gimptexttool.c:954
+#: ../app/tools/gimptexttool.c:956
 msgid "GIMP Text Editor"
 msgstr "Текстовый редактор GIMP"
 
-#: ../app/tools/gimptexttool.c:1070
-#: ../app/tools/gimptexttool.c:1073
+#: ../app/tools/gimptexttool.c:1072
+#: ../app/tools/gimptexttool.c:1075
 msgid "Confirm Text Editing"
 msgstr "Подтвердите изменение текста"
 
-#: ../app/tools/gimptexttool.c:1077
+#: ../app/tools/gimptexttool.c:1079
 msgid "Create _New Layer"
 msgstr "_Создать новый слой"
 
-#: ../app/tools/gimptexttool.c:1101
+#: ../app/tools/gimptexttool.c:1103
 msgid ""
 "The layer you selected is a text layer but it has been modified using other tools. Editing the layer with the text tool will discard these modifications.\n"
 "\n"
@@ -10897,7 +10897,7 @@ msgstr ""
 "\n"
 "Вы можете продолжить редактировать этот слой или создать новый."
 
-#: ../app/tools/gimptexttool.c:1313
+#: ../app/tools/gimptexttool.c:1315
 msgid "Reshape Text Layer"
 msgstr "Смена размера текстового слоя"
 
@@ -11156,7 +11156,7 @@ msgstr "Золотое сечение"
 
 #: ../app/tools/tools-enums.c:148
 msgid "Aspect ratio"
-msgstr "Соотношение сторон"
+msgstr "Соотн. сторон"
 
 #: ../app/tools/tools-enums.c:149
 #: ../app/widgets/gimpgrideditor.c:265
@@ -11172,7 +11172,7 @@ msgstr "Высота"
 
 #: ../app/tools/tools-enums.c:179
 msgid "Free select"
-msgstr "Свободное выделение"
+msgstr "Произвольное выделение"
 
 #: ../app/tools/tools-enums.c:180
 msgid "Fixed size"
@@ -11424,7 +11424,7 @@ msgstr "Синий:"
 #: ../app/widgets/gimpcolorframe.c:529
 #: ../app/widgets/gimpcolorframe.c:562
 msgid "Value:"
-msgstr "Значение:"
+msgstr "Яркость"
 
 #: ../app/widgets/gimpcolorframe.c:553
 msgid "Hex:"
@@ -11468,7 +11468,7 @@ msgstr "Альфа-канал:"
 #: ../app/widgets/gimpcursorview.c:446
 #: ../app/widgets/gimpcursorview.c:447
 msgid "n/a"
-msgstr "n/a"
+msgstr "н/д"
 
 #: ../app/widgets/gimpcolormapeditor.c:225
 msgid "Color index:"
@@ -11877,7 +11877,7 @@ msgstr "HSV (%0.1f, %0.1f, %0.1f)"
 #: ../app/widgets/gimpgradienteditor.c:1002
 #, c-format
 msgid "Luminance: %0.1f    Opacity: %0.1f"
-msgstr "Светимость: %0.1f    Непрозрачность: %0.1f"
+msgstr "Яркость %0.1f    Непрозрачность: %0.1f"
 
 #: ../app/widgets/gimpgradienteditor.c:1033
 #, c-format
@@ -11955,43 +11955,43 @@ msgstr "Цвет _фона:"
 msgid "Spacing"
 msgstr "Ячейки"
 
-#: ../app/widgets/gimphelp.c:276
+#: ../app/widgets/gimphelp.c:294
 msgid "Help browser is missing"
 msgstr "Программа для просмотра справки отсутствует"
 
-#: ../app/widgets/gimphelp.c:277
+#: ../app/widgets/gimphelp.c:295
 msgid "The GIMP help browser is not available."
 msgstr "Программа для просмотра руководства по GIMP отсутствует."
 
-#: ../app/widgets/gimphelp.c:278
+#: ../app/widgets/gimphelp.c:296
 msgid "The GIMP help browser plug-in appears to be missing from your installation. You may instead use the web browser for reading the help pages."
 msgstr "Встроенный просмотрщик справки GIMP отсутствует. Вы можете использовать вместо него обычный веб-браузер."
 
-#: ../app/widgets/gimphelp.c:319
+#: ../app/widgets/gimphelp.c:337
 msgid "Help browser doesn't start"
 msgstr "Программа просмотра справки не запускается"
 
-#: ../app/widgets/gimphelp.c:320
+#: ../app/widgets/gimphelp.c:338
 msgid "Could not start the GIMP help browser plug-in."
 msgstr "Не удалось запустить программу просмотра справки GIMP"
 
-#: ../app/widgets/gimphelp.c:347
+#: ../app/widgets/gimphelp.c:365
 msgid "Use _Web Browser"
 msgstr "Использовать _веб-браузер"
 
-#: ../app/widgets/gimphelp.c:596
+#: ../app/widgets/gimphelp.c:614
 msgid "GIMP user manual is missing"
 msgstr "Руководство по GIMP отсутствует"
 
-#: ../app/widgets/gimphelp.c:603
+#: ../app/widgets/gimphelp.c:621
 msgid "_Read Online"
 msgstr "_Прочитать в Сети"
 
-#: ../app/widgets/gimphelp.c:627
+#: ../app/widgets/gimphelp.c:645
 msgid "The GIMP user manual is not installed on your computer."
 msgstr "Руководство пользователя GIMP не установлено на этом компьютере"
 
-#: ../app/widgets/gimphelp.c:630
+#: ../app/widgets/gimphelp.c:648
 msgid "You may either install the additional help package or change your preferences to use the online version."
 msgstr "Вам стоит либо установить пакет со справкой, либо изменить параметры программы, чтобы использовать справку из Интернета"
 
@@ -12176,7 +12176,7 @@ msgstr "Выберите параметр из списка"
 
 #: ../app/widgets/gimpsettingsbox.c:260
 msgid "Add settings to favorites"
-msgstr "Добавить эти параметры в список избранных"
+msgstr "Добавить эти параметры в избранное"
 
 #: ../app/widgets/gimpsettingsbox.c:288
 msgid "_Import Settings from File..."
@@ -12208,15 +12208,15 @@ msgstr "Сохраненные параметры"
 
 #: ../app/widgets/gimpsettingseditor.c:174
 msgid "Import settings from a file"
-msgstr "Импортировать предустановки из файла"
+msgstr "Импортировать профили из файла"
 
 #: ../app/widgets/gimpsettingseditor.c:183
 msgid "Export the selected settings to a file"
-msgstr "Экспортировать выбранные предустановки в файл"
+msgstr "Экспортировать выбранные профили в файл"
 
 #: ../app/widgets/gimpsettingseditor.c:192
 msgid "Delete the selected settings"
-msgstr "Удалить выбранные предустановки"
+msgstr "Удалить выбранные профили"
 
 #: ../app/widgets/gimpsizebox.c:464
 #, c-format
@@ -12238,11 +12238,11 @@ msgstr "Стиль _линии"
 
 #: ../app/widgets/gimpstrokeeditor.c:221
 msgid "_Cap style:"
-msgstr "Стиль _концов:"
+msgstr "_Концы:"
 
 #: ../app/widgets/gimpstrokeeditor.c:227
 msgid "_Join style:"
-msgstr "Стиль _угла:"
+msgstr "_Соединение:"
 
 #: ../app/widgets/gimpstrokeeditor.c:232
 msgid "_Miter limit:"
@@ -12486,11 +12486,11 @@ msgstr "Недопустимая строка UTF-8 в файле'%s'."
 
 #: ../app/widgets/widgets-enums.c:23
 msgid "Foreground"
-msgstr "Переднего плана"
+msgstr "Передний план"
 
 #: ../app/widgets/widgets-enums.c:83
 msgid "Pixel"
-msgstr "Пикселов"
+msgstr "Пиксел"
 
 #: ../app/widgets/widgets-enums.c:85
 msgid "HSV"
@@ -12502,7 +12502,7 @@ msgstr "CMYK"
 
 #: ../app/widgets/widgets-enums.c:115
 msgid "Pick only"
-msgstr "Показать информацию о цвете"
+msgstr "Только снять"
 
 #: ../app/widgets/widgets-enums.c:116
 msgid "Set foreground color"
@@ -12518,15 +12518,15 @@ msgstr "Добавить в палитру"
 
 #: ../app/widgets/widgets-enums.c:173
 msgid "Black & white"
-msgstr "Черно-белый"
+msgstr "Упрощённый"
 
 #: ../app/widgets/widgets-enums.c:174
 msgid "Fancy"
-msgstr "Цветной"
+msgstr "Обычный"
 
 #: ../app/widgets/widgets-enums.c:201
 msgid "GIMP help browser"
-msgstr "Справочная система"
+msgstr "Справочная система GIMP"
 
 #: ../app/widgets/widgets-enums.c:202
 msgid "Web browser"
@@ -12570,7 +12570,7 @@ msgstr "Состояние и описание"
 
 #: ../app/widgets/widgets-enums.c:298
 msgid "Normal window"
-msgstr "Стандартное окно"
+msgstr "Обычное окно"
 
 #: ../app/widgets/widgets-enums.c:299
 msgid "Utility window"
@@ -12678,6 +12678,900 @@ msgstr "Убедитесь, что панель инструментов вид
 msgid "Couldn't start '%s': %s"
 msgstr "Невозможно запустить '%s': %s"
 
+#~ msgid "Paint Dynamics"
+#~ msgstr "Динамика рисования"
+#~ msgid "Paint Dynamics Editor"
+#~ msgstr "Редактор динамики рисования"
+#~ msgid "Text Tool"
+#~ msgstr "Текст"
+#~ msgid "%s: %.2f"
+#~ msgstr "%s: %.2f"
+#~ msgid "%s: %d"
+#~ msgstr "%s: %d"
+#~ msgctxt "brushes-action"
+#~ msgid "Create a new brush"
+#~ msgstr "Создать новую кисть"
+#~ msgctxt "brushes-action"
+#~ msgid "Duplicate this brush"
+#~ msgstr "Создать копию кисти"
+#~ msgctxt "brushes-action"
+#~ msgid "Delete this brush"
+#~ msgstr "Удалить эту кисть"
+#~ msgctxt "context-action"
+#~ msgid "_Brush"
+#~ msgstr "_Кисть"
+#~ msgctxt "context-action"
+#~ msgid "_Pattern"
+#~ msgstr "_Текстура"
+#~ msgctxt "context-action"
+#~ msgid "_Gradient"
+#~ msgstr "_Градиент"
+#~ msgctxt "context-action"
+#~ msgid "_Aspect Ratio"
+#~ msgstr "Соот_ношение сторон"
+#~ msgid "Paint Mode: %s"
+#~ msgstr "Режим рисования: %s"
+#~ msgid "Brush Shape: %s"
+#~ msgstr "Форма кисти: %s"
+#~ msgid "Brush Radius: %2.2f"
+#~ msgstr "Радиус кисти: %2.2f"
+#~ msgid "Brush Angle: %2.2f"
+#~ msgstr "Угол кисти: %2.2f"
+#~ msgctxt "cursor-info-action"
+#~ msgid "_Sample Merged"
+#~ msgstr "С_водить слои"
+#~ msgctxt "cursor-info-action"
+#~ msgid "Use the composite color of all visible layers"
+#~ msgstr "Использовать все видимые слои при выделении области"
+#~ msgctxt "dialogs-action"
+#~ msgid "Pointer"
+#~ msgstr "Указатель"
+#~ msgctxt "dialogs-action"
+#~ msgid "Brush Editor"
+#~ msgstr "Редактор кистей"
+#~ msgctxt "dialogs-action"
+#~ msgid "Paint Dynamics"
+#~ msgstr "Динамика рисования"
+#~ msgctxt "dialogs-action"
+#~ msgid "Open paint dynamics dialog"
+#~ msgstr "Открыть диалог динамики рисования"
+#~ msgctxt "dialogs-action"
+#~ msgid "Paint Dynamics Editor"
+#~ msgstr "Редактор динамики рисования"
+#~ msgctxt "dialogs-action"
+#~ msgid "Open the paint dynamics editor"
+#~ msgstr "Открыть редактор динамики рисования"
+#~ msgctxt "dialogs-action"
+#~ msgid "Gradient Editor"
+#~ msgstr "Редактор градиентов"
+#~ msgctxt "dialogs-action"
+#~ msgid "Palette Editor"
+#~ msgstr "Редактор палитры образцов"
+#~ msgctxt "dialogs-action"
+#~ msgid "About GIMP"
+#~ msgstr "О GIMP"
+#~ msgctxt "documents-action"
+#~ msgid "Remove entries for which the corresponding file is not available"
+#~ msgstr "Удалить записи о файлах, которые уже недоступны"
+#~ msgctxt "drawable-action"
+#~ msgid "L_ock pixels"
+#~ msgstr "_Запереть точки растра от изменений"
+
+#, fuzzy
+#~ msgctxt "drawable-action"
+#~ msgid "Keep the pixels on this drawable from being modified"
+#~ msgstr "Предохранить информацию о прозрачности от изменений"
+#~ msgctxt "dynamics-action"
+#~ msgid "Paint Dynamics Menu"
+#~ msgstr "Меню динамики рисования"
+#~ msgctxt "dynamics-action"
+#~ msgid "_New Dynamics"
+#~ msgstr "_Создать динамику"
+#~ msgctxt "dynamics-action"
+#~ msgid "Create a new dynamics"
+#~ msgstr "Создать новую динамику"
+#~ msgctxt "dynamics-action"
+#~ msgid "D_uplicate Dynamics"
+#~ msgstr "Создать _копию динамики"
+#~ msgctxt "dynamics-action"
+#~ msgid "Duplicate this dynamics"
+#~ msgstr "Создать копию этой динамики"
+#~ msgctxt "dynamics-action"
+#~ msgid "Copy Dynamics _Location"
+#~ msgstr "Скопировать _местоположение динамики"
+#~ msgctxt "dynamics-action"
+#~ msgid "Copy dynamics file location to clipboard"
+#~ msgstr "Скопировать местоположение файла динамики в буфер обмена"
+#~ msgctxt "dynamics-action"
+#~ msgid "_Delete Dynamics"
+#~ msgstr "_Удалить динамику"
+#~ msgctxt "dynamics-action"
+#~ msgid "Delete this dynamics"
+#~ msgstr "Удалить эту динамику"
+#~ msgctxt "dynamics-action"
+#~ msgid "Refresh dynamics"
+#~ msgstr "Обновить динамику"
+#~ msgctxt "dynamics-action"
+#~ msgid "_Edit Dynamics..."
+#~ msgstr "_Изменить динамику..."
+#~ msgctxt "dynamics-action"
+#~ msgid "Edit dynamics"
+#~ msgstr "Изменить динамику"
+#~ msgctxt "dynamics-editor-action"
+#~ msgid "Paint Dynamics Editor Menu"
+#~ msgstr "Меню редактора динамики рисования"
+#~ msgctxt "dynamics-editor-action"
+#~ msgid "Edit Active Dynamics"
+#~ msgstr "Изменить активную динамику"
+#~ msgctxt "edit-action"
+#~ msgid "_Undo"
+#~ msgstr "_Отменить"
+#~ msgctxt "edit-action"
+#~ msgid "_Redo"
+#~ msgstr "Ве_рнуть"
+#~ msgctxt "edit-action"
+#~ msgid "_Fade..."
+#~ msgstr "_Ослабить..."
+#~ msgctxt "edit-action"
+#~ msgid "Copy what is visible in the selected region to a named buffer"
+#~ msgstr "Скопировать всё видимое в именованный буфер"
+#~ msgctxt "edit-action"
+#~ msgid "Fill _with Pattern"
+#~ msgstr "_Залить текстурой"
+#~ msgctxt "error-console-action"
+#~ msgid "Write all error messages to a file"
+#~ msgstr "Записать все сообщения об ошибках в файл"
+#~ msgctxt "error-console-action"
+#~ msgid "Write the selected error messages to a file"
+#~ msgstr "Записать выделенные сообщения об ошибках в файл"
+#~ msgctxt "file-action"
+#~ msgid "Create _Template..."
+#~ msgstr "Создать _шаблон..."
+#~ msgctxt "file-action"
+#~ msgid "Export to"
+#~ msgstr "Экспортировать в"
+#~ msgctxt "file-action"
+#~ msgid "Export the image again"
+#~ msgstr "Повторно экспортировать изображение"
+#~ msgctxt "file-action"
+#~ msgid "Overwrite"
+#~ msgstr "Перезаписать"
+#~ msgctxt "file-action"
+#~ msgid "Export the image back to the imported file in the import format"
+#~ msgstr "Экспортировать изображение обратно в исходный импортированный файл"
+#~ msgctxt "file-action"
+#~ msgid "Export..."
+#~ msgstr "Экспортировать..."
+#~ msgctxt "file-action"
+#~ msgid "Export the image to various file formats such as PNG or JPEG"
+#~ msgstr "Экспортировать изображение в такие форматы данных как PNG и JPEG"
+#~ msgid "Export to %s"
+#~ msgstr "Экспортировать в %s"
+#~ msgid "Overwrite %s"
+#~ msgstr "Перезаписать %s"
+#~ msgid "Export to"
+#~ msgstr "Экспортировать в"
+#~ msgctxt "fonts-action"
+#~ msgid "Rescan the installed fonts"
+#~ msgstr "Повторно просканировать установленные шрифты"
+#~ msgctxt "gradient-editor-color-type"
+#~ msgid "_Background Color"
+#~ msgstr "Цвет _фона"
+#~ msgctxt "gradient-editor-coloring"
+#~ msgid "(Varies)"
+#~ msgstr "(Изменяется)"
+#~ msgctxt "gradients-action"
+#~ msgid "Create a new gradient"
+#~ msgstr "Создать новый градиент"
+#~ msgctxt "gradients-action"
+#~ msgid "Duplicate this gradient"
+#~ msgstr "Создать копию этого градиента"
+#~ msgctxt "gradients-action"
+#~ msgid "Delete this gradient"
+#~ msgstr "Удалить этот градиент"
+#~ msgctxt "image-action"
+#~ msgid "_Colors"
+#~ msgstr "_Цвет"
+#~ msgctxt "image-action"
+#~ msgid "_Auto"
+#~ msgstr "_Авто"
+#~ msgctxt "image-convert-action"
+#~ msgid "_RGB"
+#~ msgstr "_RGB"
+#~ msgctxt "image-action"
+#~ msgid "Flip _Horizontally"
+#~ msgstr "Отразить по _горизонтали"
+#~ msgctxt "image-action"
+#~ msgid "Flip _Vertically"
+#~ msgstr "Отразить по _вертикали"
+#~ msgctxt "image-action"
+#~ msgid "Rotate 90° _clockwise"
+#~ msgstr "Повернуть на 90° _по часовой стрелке"
+#~ msgctxt "image-action"
+#~ msgid "Rotate _180°"
+#~ msgstr "П_овернуть на 180°"
+#~ msgctxt "image-action"
+#~ msgid "Rotate 90° counter-clock_wise"
+#~ msgstr "Повернуть на 90° п_ротив часовой стрелки"
+#~ msgctxt "layers-action"
+#~ msgid "_Transform"
+#~ msgstr "Пре_образования"
+#~ msgctxt "layers-action"
+#~ msgid "_Opacity"
+#~ msgstr "_Непрозрачность"
+#~ msgctxt "layers-action"
+#~ msgid "New Layer _Group..."
+#~ msgstr "_Создать группу слоёв..."
+#~ msgctxt "layers-action"
+#~ msgid "Create a new layer group and add it to the image"
+#~ msgstr "Создать новую группу слоёв и добавить её в изображение"
+#~ msgctxt "layers-action"
+#~ msgid "Merge Layer Group"
+#~ msgstr "Свести группу слоёв"
+
+#, fuzzy
+#~ msgctxt "layers-action"
+#~ msgid "Merge the layer group's layers into one normal layer"
+#~ msgstr "Объединить все видимые слои в один"
+#~ msgctxt "layers-action"
+#~ msgid "Merge all visible layers into one layer"
+#~ msgstr "Объединить все видимые слои в один"
+#~ msgctxt "layers-action"
+#~ msgid "_Flatten Image"
+#~ msgstr "Свести _изображение"
+#~ msgctxt "layers-action"
+#~ msgid "Merge all layers into one and remove transparency"
+#~ msgstr "Свести все слои в один и удалить прозрачность"
+#~ msgctxt "layers-action"
+#~ msgid "_Crop to Selection"
+#~ msgstr "О_ткадрировать в выделение"
+#~ msgctxt "layers-action"
+#~ msgid "_Add to Selection"
+#~ msgstr "_Добавить к выделению"
+#~ msgctxt "layers-action"
+#~ msgid "_Subtract from Selection"
+#~ msgstr "Вы_честь из выделения"
+#~ msgctxt "layers-action"
+#~ msgid "_Intersect with Selection"
+#~ msgstr "_Пересечь с выделением"
+#~ msgctxt "palette-editor-action"
+#~ msgid "_Edit Color..."
+#~ msgstr "_Изменить цвет..."
+#~ msgctxt "palette-editor-action"
+#~ msgid "Edit this entry"
+#~ msgstr "Изменить этот цвет в наборе"
+#~ msgctxt "palette-editor-action"
+#~ msgid "Delete this entry"
+#~ msgstr "Удалить этот цвет из набора"
+#~ msgctxt "palette-editor-action"
+#~ msgid "Create a new entry from the foreground color"
+#~ msgstr "Добавить в палитру активный цвет переднего плана"
+#~ msgctxt "palette-editor-action"
+#~ msgid "Create a new entry from the background color"
+#~ msgstr "Добавить в палитру активный цвет фона"
+#~ msgctxt "palettes-action"
+#~ msgid "Create a new palette"
+#~ msgstr "Создать новую цветовую палитру"
+#~ msgctxt "palettes-action"
+#~ msgid "Duplicate this palette"
+#~ msgstr "Создать копию этой палитры"
+#~ msgctxt "palettes-action"
+#~ msgid "Delete this palette"
+#~ msgstr "Удалить эту палитру..."
+#~ msgctxt "patterns-action"
+#~ msgid "Open this pattern as an image"
+#~ msgstr "Открыть эту текстуру как файл изображения"
+#~ msgctxt "patterns-action"
+#~ msgid "Create a new pattern"
+#~ msgstr "Создать новую текстуру"
+#~ msgctxt "patterns-action"
+#~ msgid "Duplicate this pattern"
+#~ msgstr "Создать копию этой текстуры"
+#~ msgctxt "patterns-action"
+#~ msgid "Delete this pattern"
+#~ msgstr "Удалить эту текстуру"
+#~ msgctxt "plug-in-action"
+#~ msgid "_Map"
+#~ msgstr "_Карта"
+#~ msgctxt "plug-in-action"
+#~ msgid "_Pattern"
+#~ msgstr "_Текстура"
+#~ msgctxt "quick-mask-action"
+#~ msgid "Toggle Quick Mask on/off"
+#~ msgstr "Включить или выключить быструю маску"
+#~ msgctxt "sample-points-action"
+#~ msgid "_Sample Merged"
+#~ msgstr "С_вести слои"
+#~ msgctxt "sample-points-action"
+#~ msgid "Use the composite color of all visible layers"
+#~ msgstr "Использовать все видимые слои при выделении области"
+#~ msgctxt "select-action"
+#~ msgid "_All"
+#~ msgstr "_Всё"
+#~ msgctxt "select-action"
+#~ msgid "_None"
+#~ msgstr "_Снять выделение"
+#~ msgctxt "templates-action"
+#~ msgid "Duplicate this template"
+#~ msgstr "Создать копию выделенного шаблона"
+#~ msgctxt "templates-action"
+#~ msgid "Edit this template"
+#~ msgstr "Отредактировать этот шаблон"
+#~ msgctxt "templates-action"
+#~ msgid "Delete this template"
+#~ msgstr "Удалить этот шаблон"
+#~ msgctxt "text-editor-action"
+#~ msgid "Clear"
+#~ msgstr "Очистить"
+#~ msgctxt "text-tool-action"
+#~ msgid "Text Tool Menu"
+#~ msgstr "Меню инструмента «Текст»"
+#~ msgctxt "text-tool-action"
+#~ msgid "Input _Methods"
+#~ msgstr "_Методы ввода"
+#~ msgctxt "text-tool-action"
+#~ msgid "Cu_t"
+#~ msgstr "Вы_резать"
+#~ msgctxt "text-tool-action"
+#~ msgid "_Copy"
+#~ msgstr "_Копировать"
+#~ msgctxt "text-tool-action"
+#~ msgid "_Paste"
+#~ msgstr "_Вставить"
+#~ msgctxt "text-tool-action"
+#~ msgid "_Delete"
+#~ msgstr "_Удалить"
+#~ msgctxt "text-tool-action"
+#~ msgid "_Open text file..."
+#~ msgstr "_Открыть текстовый файл..."
+#~ msgctxt "text-tool-action"
+#~ msgid "Cl_ear"
+#~ msgstr "О_чистить"
+#~ msgctxt "text-tool-action"
+#~ msgid "Clear all text"
+#~ msgstr "Удалить весь текст"
+#~ msgctxt "text-tool-action"
+#~ msgid "Create a path from the outlines of the current text"
+#~ msgstr "Создать контур из текущего текстового блока"
+#~ msgctxt "text-tool-action"
+#~ msgid "Text _along Path"
+#~ msgstr "_Текст по контуру"
+#~ msgctxt "text-tool-action"
+#~ msgid "Bend the text along the currently active path"
+#~ msgstr "Направить текст этого блока по текущему контуру"
+#~ msgctxt "text-tool-action"
+#~ msgid "From left to right"
+#~ msgstr "Слева направо"
+#~ msgctxt "text-tool-action"
+#~ msgid "From right to left"
+#~ msgstr "Справа налево"
+#~ msgctxt "vectors-action"
+#~ msgid "Create a new path..."
+#~ msgstr "Создать новый контур..."
+#~ msgctxt "vectors-action"
+#~ msgid "Create a new path with last used values"
+#~ msgstr "Создать новый контур с предыдущими параметрами"
+#~ msgctxt "vectors-action"
+#~ msgid "Duplicate this path"
+#~ msgstr "Создать копию этого контура"
+#~ msgctxt "vectors-action"
+#~ msgid "Delete this path"
+#~ msgstr "Удалить этот контур"
+#~ msgctxt "vectors-action"
+#~ msgid "Raise this path"
+#~ msgstr "Поднять этот контур"
+#~ msgctxt "vectors-action"
+#~ msgid "Raise this path to the top"
+#~ msgstr "Сделать этот контур верхним"
+#~ msgctxt "vectors-action"
+#~ msgid "Lower this path"
+#~ msgstr "Опустить этот контур"
+#~ msgctxt "vectors-action"
+#~ msgid "Lower this path to the bottom"
+#~ msgstr "Сделать этот контур нижним"
+#~ msgctxt "vectors-action"
+#~ msgid "_Visible"
+#~ msgstr "_Видимый"
+#~ msgctxt "vectors-action"
+#~ msgid "_Linked"
+#~ msgstr "С_вязанный"
+#~ msgctxt "vectors-action"
+#~ msgid "L_ock strokes"
+#~ msgstr "За_переть элементы контура от изменений"
+#~ msgctxt "vectors-action"
+#~ msgid "Path to selection"
+#~ msgstr "Контур → Выделение"
+#~ msgctxt "vectors-action"
+#~ msgid "Replace selection with path"
+#~ msgstr "Создать из канала выделенную область"
+#~ msgctxt "vectors-action"
+#~ msgid "_Add to Selection"
+#~ msgstr "_Добавить к выделению"
+#~ msgctxt "vectors-action"
+#~ msgid "Add path to selection"
+#~ msgstr "Добавить контур к выделению"
+#~ msgctxt "vectors-action"
+#~ msgid "_Subtract from Selection"
+#~ msgstr "Вы_честь из выделения"
+#~ msgctxt "vectors-action"
+#~ msgid "Subtract path from selection"
+#~ msgstr "Вычесть контур из выделения"
+#~ msgctxt "vectors-action"
+#~ msgid "_Intersect with Selection"
+#~ msgstr "_Пересечь с выделением"
+#~ msgctxt "vectors-action"
+#~ msgid "Intersect path with selection"
+#~ msgstr "Пересечь контур с выделением"
+#~ msgctxt "view-action"
+#~ msgid "_New View"
+#~ msgstr "В _новом окне"
+#~ msgctxt "view-action"
+#~ msgid "Re_vert Zoom"
+#~ msgstr "_Вернуть масштаб"
+#~ msgctxt "view-action"
+#~ msgid "_Open Display..."
+#~ msgstr "Открыть _экран..."
+#~ msgctxt "view-action"
+#~ msgid "Connect to another display"
+#~ msgstr "Установить соединение с другим экраном"
+#~ msgctxt "view-zoom-action"
+#~ msgid "Zoom _Out"
+#~ msgstr "У_меньшить масштаб"
+#~ msgctxt "view-action"
+#~ msgid "Zoom out"
+#~ msgstr "Уменьшить масштаб просмотра"
+#~ msgctxt "view-zoom-action"
+#~ msgid "Zoom _In"
+#~ msgstr "У_величить масштаб"
+#~ msgctxt "view-action"
+#~ msgid "Zoom in"
+#~ msgstr "Увеличить масштаб просмотра"
+#~ msgctxt "view-zoom-action"
+#~ msgid "Zoom Out"
+#~ msgstr "Уменьшить"
+#~ msgctxt "view-zoom-action"
+#~ msgid "Zoom In"
+#~ msgstr "Увеличить"
+#~ msgctxt "windows-action"
+#~ msgid "Single-window mode"
+#~ msgstr "Однооконный режим"
+#~ msgctxt "windows-action"
+#~ msgid ""
+#~ "When enabled GIMP is in a single-window mode. Far from completely "
+#~ "implemented!"
+#~ msgstr ""
+#~ "Если включено, GIMP работает в однооконном режиме. Текущая реализация "
+#~ "пока что далека от завершённости!"
+#~ msgctxt "histogram-channel"
+#~ msgid "Red"
+#~ msgstr "Красный"
+#~ msgctxt "histogram-channel"
+#~ msgid "Green"
+#~ msgstr "Зеленый"
+#~ msgctxt "histogram-channel"
+#~ msgid "Blue"
+#~ msgstr "Синий"
+#~ msgctxt "histogram-channel"
+#~ msgid "RGB"
+#~ msgstr "RGB"
+#~ msgctxt "layer-mode-effects"
+#~ msgid "Subtract"
+#~ msgstr "Вычитание"
+#~ msgctxt "layer-mode-effects"
+#~ msgid "Color"
+#~ msgstr "Цвет"
+#~ msgctxt "layer-mode-effects"
+#~ msgid "Value"
+#~ msgstr "Значение"
+
+#, fuzzy
+#~ msgid "When enabled, the selected dynamics will be used for all tools."
+#~ msgstr "Если включено, выбранная кисть используется всеми инструментами."
+#~ msgid "Use GIMP in a single-window mode."
+#~ msgstr "Использовать GIMP в однооконном режиме"
+#~ msgctxt "convert-dither-type"
+#~ msgid "None"
+#~ msgstr "Нет"
+#~ msgctxt "align-reference-type"
+#~ msgid "Image"
+#~ msgstr "Изображение"
+#~ msgctxt "align-reference-type"
+#~ msgid "Selection"
+#~ msgstr "Выделение"
+#~ msgctxt "fill-type"
+#~ msgid "Transparency"
+#~ msgstr "Прозрачный слой"
+#~ msgctxt "fill-type"
+#~ msgid "None"
+#~ msgstr "Нет"
+#~ msgctxt "fill-style"
+#~ msgid "Pattern"
+#~ msgstr "Текстурой"
+#~ msgctxt "cap-style"
+#~ msgid "Round"
+#~ msgstr "Круглые"
+#~ msgctxt "brush-generated-shape"
+#~ msgid "Square"
+#~ msgstr "Квадратный"
+#~ msgctxt "orientation-type"
+#~ msgid "Horizontal"
+#~ msgstr "Горизонтальное"
+#~ msgctxt "orientation-type"
+#~ msgid "Vertical"
+#~ msgstr "Вертикальное"
+#~ msgctxt "item-set"
+#~ msgid "None"
+#~ msgstr "Нет"
+#~ msgctxt "undo-type"
+#~ msgid "Quick Mask"
+#~ msgstr "Быстрая маска"
+#~ msgctxt "undo-type"
+#~ msgid "Grid"
+#~ msgstr "Сетка"
+#~ msgctxt "undo-type"
+#~ msgid "Paste"
+#~ msgstr "Вставить"
+#~ msgctxt "undo-type"
+#~ msgid "Cut"
+#~ msgstr "Вырезать"
+#~ msgctxt "undo-type"
+#~ msgid "Text"
+#~ msgstr "Текст"
+#~ msgctxt "undo-type"
+#~ msgid "Transform"
+#~ msgstr "Преобразование"
+#~ msgctxt "undo-type"
+#~ msgid "Paint"
+#~ msgstr "Рисование"
+#~ msgctxt "undo-type"
+#~ msgid "Plug-In"
+#~ msgstr "Расширение"
+#~ msgctxt "undo-type"
+#~ msgid "Reorder layer"
+#~ msgstr "Реорганизация слоев"
+#~ msgctxt "undo-type"
+#~ msgid "Resume group layer resize"
+#~ msgstr "Возобновить изменение размера группы слоев"
+#~ msgctxt "undo-type"
+#~ msgid "Convert group layer"
+#~ msgstr "Преобразование группы слоев"
+#~ msgctxt "undo-type"
+#~ msgid "Reorder channel"
+#~ msgstr "Реорганизация каналов"
+#~ msgctxt "undo-type"
+#~ msgid "Reorder path"
+#~ msgstr "Реорганизация контуров"
+#~ msgctxt "undo-type"
+#~ msgid "Ink"
+#~ msgstr "Перо"
+#~ msgctxt "select-criterion"
+#~ msgid "Red"
+#~ msgstr "Красный"
+#~ msgctxt "select-criterion"
+#~ msgid "Green"
+#~ msgstr "Зеленый"
+#~ msgctxt "select-criterion"
+#~ msgid "Blue"
+#~ msgstr "Синий"
+#~ msgctxt "select-criterion"
+#~ msgid "Hue"
+#~ msgstr "Тон"
+#~ msgctxt "select-criterion"
+#~ msgid "Saturation"
+#~ msgstr "Насыщенность"
+#~ msgctxt "select-criterion"
+#~ msgid "Value"
+#~ msgstr "Значение"
+#~ msgid "FG to BG (Hardedge)"
+#~ msgstr "Основной в фоновый (резкий переход)"
+#~ msgid "tags-locale:C"
+#~ msgstr "tips-locale:ru"
+#~ msgid "Dynamics"
+#~ msgstr "Динамика рисования"
+#~ msgid "Updating tag cache"
+#~ msgstr "Обновляется кэш меток"
+#~ msgid "Brush Spacing"
+#~ msgstr "Интервал кисти"
+#~ msgid "Brush Shape"
+#~ msgstr "Форма кисти"
+#~ msgid "Brush Radius"
+#~ msgstr "Радиус кисти"
+#~ msgid "Brush Spikes"
+#~ msgstr "Лучи кисти"
+#~ msgid "Brush Hardness"
+#~ msgstr "Жесткость кисти"
+#~ msgid "Brush Aspect Ratio"
+#~ msgstr "Соотношение сторон кисти"
+#~ msgid "Brush Angle"
+#~ msgstr "Угол кисти"
+#~ msgid "Paint Mode"
+#~ msgstr "Режим рисования"
+#~ msgid "Layer Group"
+#~ msgstr "Группа слоёв"
+#~ msgid "Rename Layer Group"
+#~ msgstr "Переименование группы слоёв"
+#~ msgid "Move Layer Group"
+#~ msgstr "Перемещение группы слоёв"
+#~ msgid "Scale Layer Group"
+#~ msgstr "Масштабирование группы слоёв"
+#~ msgid "Resize Layer Group"
+#~ msgstr "Смена размера группы слоёв"
+#~ msgid "Flip Layer Group"
+#~ msgstr "Отражение группы слоёв"
+#~ msgid "Rotate Layer Group"
+#~ msgstr "Вращение группы слоёв"
+#~ msgid "Transform Layer Group"
+#~ msgstr "Преобразование группы слоёв"
+#~ msgid "Cannot merge down to a layer group."
+#~ msgstr "Невозможно выполнить сведение в группу слоёв."
+#~ msgid "The layer to merge down to is locked."
+#~ msgstr "Слой, в который должно быть выполнено сведение, заперт"
+#~ msgid "There is no visible layer to merge down to."
+#~ msgstr "Нет видимого слоя, в который можно выполнить сведение."
+#~ msgid "Merge Layer Group"
+#~ msgstr "Объединить группу слоёв"
+#~ msgid "Could not read header from palette file '%s'"
+#~ msgstr "Невозможно прочесть заголовок из файла палитры '%s'"
+#~ msgid "Fatal parse error in palette file '%s'"
+#~ msgstr "Неисправимая ошибка разбора файла палитры '%s'"
+#~ msgctxt "unit-plural"
+#~ msgid "pixels"
+#~ msgstr "точки растра"
+#~ msgctxt "plural"
+#~ msgid "percent"
+#~ msgstr "проценты"
+#~ msgid "Export Image"
+#~ msgstr "Экспорт изображения"
+#~ msgid ""
+#~ "You can use this dialog to export to various file formats. If you want to "
+#~ "save the image to the GIMP XCF format, use File→Save instead."
+#~ msgstr ""
+#~ "Вы можете использовать этот диалог для экспорта в различные форматы "
+#~ "данных. Если же вам нужно сохранить файл в формате GIMP XCF, "
+#~ "воспользуйтесь командой Файл→Сохранить."
+#~ msgid ""
+#~ "You can use this dialog to save to the GIMP XCF format. Use File→Export "
+#~ "to export to other file formats."
+#~ msgstr ""
+#~ "Вы можете использовать этот диалог для сохранения файлов в формате GIMP "
+#~ "XCF. Используйте команду Файл→Экспортировать для экспорта в прочие "
+#~ "форматы данных."
+#~ msgid "_Dynamics"
+#~ msgstr "_Динамика"
+#~ msgid "Tools configuration"
+#~ msgstr "Видимые в панели инструменты"
+#~ msgid "Hint for _docks and toolbox:"
+#~ msgstr "Тип окна для _панелей:"
+#~ msgid "Dynamics Folders"
+#~ msgstr "Папки с файлами динамики рисования"
+#~ msgid "Select Dynamics Folders"
+#~ msgstr "Выбрать папки с файлами динамики рисования"
+#~ msgctxt "zoom-quality"
+#~ msgid "Low"
+#~ msgstr "Низкое"
+#~ msgctxt "zoom-quality"
+#~ msgid "High"
+#~ msgstr "Высокое"
+#~ msgid "Selection Bounding Box"
+#~ msgstr "Площадка (BB) выделения"
+#~ msgid "W"
+#~ msgstr "Ш"
+#~ msgid "H"
+#~ msgstr "В"
+#~ msgid "Close _without Saving"
+#~ msgstr "Закрыть _без сохранения"
+#~ msgid "Cannot modify the pixels of layer groups."
+#~ msgstr "Невозможно изменять точки растра группы слоёв"
+#~ msgid "The active layer's pixels are locked."
+#~ msgstr "Точки растра активного слоя заблокированы от изменений"
+#~ msgid "Image exported to '%s'"
+#~ msgstr "Изображение экспортировано в '%s'"
+#~ msgid " (exported)"
+#~ msgstr " (экспортировано)"
+#~ msgid " (overwritten)"
+#~ msgstr " (перезаписано)"
+#~ msgid " (imported)"
+#~ msgstr " (импортировано)"
+
+#, fuzzy
+#~ msgid "No paint dynamics available for use with this tool."
+#~ msgstr "Нет текстур, доступных для использования с этим инструментом."
+#~ msgid "Ink Blob Size"
+#~ msgstr "Размер капли Пера"
+#~ msgid "Ink Blob Aspect Ratio"
+#~ msgstr "Соотношение сторон капли Пера"
+#~ msgid "Ink Blob Angle"
+#~ msgstr "Угол Пера"
+#~ msgid "Brush Scale"
+#~ msgstr "Масштаб кисти"
+#~ msgctxt "perspective-clone-mode"
+#~ msgid "Perspective Clone"
+#~ msgstr "Штамп по перспективе"
+#~ msgctxt "source-align-mode"
+#~ msgid "None"
+#~ msgstr "Нет"
+#~ msgid "Item '%s' (%d) cannot be modified because its contents are locked"
+#~ msgstr ""
+#~ "Невозможно изменить объект '%s' (%d), потому что его содержимое заперто "
+#~ "от изменений"
+#~ msgid "Item '%s' (%d) cannot be modified because it is a group item"
+#~ msgstr ""
+#~ "Невозможно изменить объект '%s' (%d), потому что это группа объектов"
+#~ msgid "Remove path stroke"
+#~ msgstr "Удаление обводки контура"
+
+#, fuzzy
+#~ msgid "Close path stroke"
+#~ msgstr "Соединить контуры"
+
+#, fuzzy
+#~ msgid "Scale path stroke"
+#~ msgstr "Масштабирование контура"
+
+#, fuzzy
+#~ msgid "Rotate path stroke"
+#~ msgstr "Вращать контур"
+
+#, fuzzy
+#~ msgid "Flip path stroke"
+#~ msgstr "Отразить контур"
+
+#, fuzzy
+#~ msgid "Add path stroke"
+#~ msgstr "Добавить контур"
+#~ msgid "Color Picker Average Radius"
+#~ msgstr "Средний радиус пипетки"
+#~ msgid "There is no active layer to crop."
+#~ msgstr "Нет активного слоя или канала для кадрирования."
+#~ msgid "Click to locate on curve (try Shift, Ctrl)"
+#~ msgstr ""
+#~ "Щелкните мышкой для помещения точки под курсором на кривую (попробуйте с "
+#~ "Shift, Ctrl)"
+#~ msgctxt "tool"
+#~ msgid "_Zoom"
+#~ msgstr "_Лупа"
+#~ msgid "Aspect Ratio:"
+#~ msgstr "Соотн. сторон:"
+#~ msgid "Cannot paint on layer groups."
+#~ msgstr "Невозможно рисовать на группе слоев"
+#~ msgid ""
+#~ "The text language may have an effect on the way the text is rendered."
+#~ msgstr "Выбор языка текста может изменить внешний вид текста"
+#~ msgid ""
+#~ "Use an external editor window for text entry, instead of direct-on-canvas "
+#~ "editing"
+#~ msgstr ""
+#~ "Использовать окно с редактором текста вместо редактирования текста прямо "
+#~ "на холсте"
+#~ msgid "Use editor"
+#~ msgstr "Использовать диалог редактора"
+#~ msgid "Can't work on an empty image, add a layer first"
+#~ msgstr "Работа с пустым изображением невозможна, для начала добавьте слой"
+#~ msgid "The active path's strokes are locked."
+#~ msgstr "Элементы активного контура заблокированы от изменений"
+#~ msgid "The active path is locked."
+#~ msgstr "Активный контур заблокирован от изменений"
+#~ msgctxt "rectangle-guide"
+#~ msgid "Diagonal lines"
+#~ msgstr "Диагональные линии"
+#~ msgctxt "rectangle-tool-fixed-rule"
+#~ msgid "Aspect ratio"
+#~ msgstr "Соотн. сторон"
+#~ msgctxt "rectangle-tool-fixed-rule"
+#~ msgid "Width"
+#~ msgstr "Ширина"
+#~ msgctxt "rectangle-tool-fixed-rule"
+#~ msgid "Height"
+#~ msgstr "Высота"
+#~ msgctxt "rectangle-tool-fixed-rule"
+#~ msgid "Size"
+#~ msgstr "Размер"
+#~ msgctxt "transform-type"
+#~ msgid "Layer"
+#~ msgstr "Слой"
+#~ msgctxt "transform-type"
+#~ msgid "Selection"
+#~ msgstr "Выделение"
+#~ msgctxt "transform-type"
+#~ msgid "Path"
+#~ msgstr "Контур"
+#~ msgctxt "transform-preview-type"
+#~ msgid "Grid"
+#~ msgstr "Сетка"
+#~ msgctxt "transform-preview-type"
+#~ msgid "Image"
+#~ msgstr "Изображение"
+#~ msgctxt "vector-mode"
+#~ msgid "Edit"
+#~ msgstr "Правка"
+#~ msgctxt "vector-mode"
+#~ msgid "Move"
+#~ msgstr "Перемещение"
+#~ msgid "Lock pixels"
+#~ msgstr "Запереть точки растра от изменений"
+#~ msgid "Pressure"
+#~ msgstr "Нажим"
+#~ msgid "Tilt"
+#~ msgstr "Наклон"
+
+#, fuzzy
+#~ msgid "Fade"
+#~ msgstr "_Ослабить"
+#~ msgid "Angle"
+#~ msgstr "Угол"
+#~ msgid "Jitter"
+#~ msgstr "Дрожание"
+#~ msgid "Fill Color"
+#~ msgstr "Цвет заливки"
+#~ msgid "Use default comment"
+#~ msgstr "Использовать типовой комментарий"
+#~ msgid ""
+#~ "Replace the current image comment with the default comment set in "
+#~ "Edit→Preferences→Default Image."
+#~ msgstr ""
+#~ "Заменить текущий комментарий к изображению на указанный в параметрах "
+#~ "программы типовой (Правка→Параметры→Изображение по умолчанию)."
+#~ msgid "filter"
+#~ msgstr "фильтр по меткам"
+#~ msgid "enter tags"
+#~ msgstr "введите метки"
+#~ msgid ","
+#~ msgstr ","
+#~ msgid "Raise this tool"
+#~ msgstr "Поднять инструмент"
+#~ msgid "Lower this tool"
+#~ msgstr "Опустить инструмент"
+#~ msgid "Lock path strokes"
+#~ msgstr "Запереть контур от изменений"
+#~ msgctxt "active-color"
+#~ msgid "Background"
+#~ msgstr "РезкостьФон"
+#~ msgctxt "color-frame-mode"
+#~ msgid "RGB"
+#~ msgstr "RGB"
+#~ msgctxt "tab-style"
+#~ msgid "Text"
+#~ msgstr "Текст"
+#~ msgid "fuzzy"
+#~ msgstr "растушеванные"
+#~ msgid "round"
+#~ msgstr "круглые"
+#~ msgid "Direction:"
+#~ msgstr "Направление:"
+#~ msgid "Group Layer"
+#~ msgstr "Группа слоев"
+
+#, fuzzy
+#~ msgid "Cannot merge down a layer group."
+#~ msgstr "Невозможно переименовать маски слоёв."
+
+#, fuzzy
+#~ msgid "Raise this tool Raise this tool to the top"
+#~ msgstr "Поднять инструмент до верха"
+
+#, fuzzy
+#~ msgid "Lower this tool Lower this tool to the bottom"
+#~ msgstr "Опустить инструмент до низа"
+#~ msgctxt "layers-action"
+#~ msgid "_New Group Layer..."
+#~ msgstr "Создать _группу слоев..."
+#~ msgctxt "layers-action"
+#~ msgid "Create a new group layer and add it to the image"
+#~ msgstr "Создать новую группу слоя и добавить её в изображение"
+#~ msgid "Scale Group Layer"
+#~ msgstr "Смена размера группы слоев"
+#~ msgid "Resize Group Layer"
+#~ msgstr "Смена размера группы слоев"
+#~ msgid "Flip Group Layer"
+#~ msgstr "Отражение группы слоев"
+#~ msgid "Rotate Group Layer"
+#~ msgstr "Вращение группы слоев"
+#~ msgid "Transform Group Layer"
+#~ msgstr "Преобразование группы слоев"
+#~ msgid "Query"
+#~ msgstr "Запросить"
+#~ msgid "Assign"
+#~ msgstr "Назначить"
 #~ msgid "Ne_w"
 #~ msgstr "Соз_дать"
 #~ msgid "Channel is already on top."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e8af50a712..c4d8abc5d8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgstr ""
 "Project-Id-Version: gimp HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gimp&component=general\n"
-"POT-Creation-Date: 2009-07-26 19:04+0000\n"
+"POT-Creation-Date: 2009-10-12 20:01+0000\n"
 "PO-Revision-Date: 2009-07-27 21:50+0800\n"
 "Last-Translator: Aron Xu \n"
 "Language-Team: Chinese/Simplified \n"
@@ -119,7 +119,7 @@ msgstr "不加载画笔、渐变、图案等"
 
 #: ../app/main.c:179
 msgid "Do not load any fonts"
-msgstr "不装入任何字体"
+msgstr "不载入任何字体"
 
 #: ../app/main.c:184
 msgid "Do not show a startup window"
@@ -1928,7 +1928,7 @@ msgstr "恢复(_V)"
 #
 #: ../app/actions/file-actions.c:96
 msgid "Reload the image file from disk"
-msgstr "从磁盘重新装入图像文件"
+msgstr "从磁盘重新载入图像文件"
 
 #
 #: ../app/actions/file-actions.c:101
@@ -2473,7 +2473,7 @@ msgstr "将渐变文件位置复制到剪贴板"
 #
 #: ../app/actions/gradients-actions.c:66
 msgid "Save as _POV-Ray..."
-msgstr "保存为 ＿POV-Ray..."
+msgstr "另存为 _POV-Ray..."
 
 #
 #: ../app/actions/gradients-actions.c:67
@@ -3327,7 +3327,7 @@ msgstr "图层蒙板到选区"
 msgid "Please select a channel first"
 msgstr "请先选择通道"
 
-#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1282
+#: ../app/actions/layers-commands.c:1044 ../app/core/gimplayer.c:1283
 #: ../app/dialogs/layer-add-mask-dialog.c:81
 msgid "Add Layer Mask"
 msgstr "添加图层蒙板"
@@ -4421,7 +4421,7 @@ msgstr "从路径(_O)"
 
 #: ../app/actions/vectors-actions.c:174
 msgid "Add"
-msgstr ""
+msgstr "添加"
 
 #
 #: ../app/actions/vectors-actions.c:180 ../app/base/base-enums.c:119
@@ -5545,7 +5545,7 @@ msgid ""
 "you may want to set this to a higher value."
 msgstr ""
 "当像素数据量超过限制时，GIMP 将开始交换数据到磁盘。这将使速度极大减慢但它却使"
-"得处理无法装入内存的图像成为可能。如果您的内存很多，您可能希望设置一个更大的"
+"得处理无法载入内存的图像成为可能。如果您的内存很多，您可能希望设置一个更大的"
 "值。"
 
 #: ../app/config/gimprc-blurbs.h:390
@@ -6662,7 +6662,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"装入数据失败：\n"
+"载入数据失败：\n"
 "\n"
 "%s"
 
@@ -7192,7 +7192,7 @@ msgstr "翻转图层"
 msgid "Rotate Layer"
 msgstr "旋转图层"
 
-#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1329
+#: ../app/core/gimplayer.c:405 ../app/core/gimplayer.c:1330
 #: ../app/core/gimplayermask.c:208
 #, c-format
 msgid "%s mask"
@@ -7207,37 +7207,37 @@ msgstr ""
 "浮动选区\n"
 "(%s)"
 
-#: ../app/core/gimplayer.c:1265
+#: ../app/core/gimplayer.c:1266
 #, c-format
 msgid "Unable to add a layer mask since the layer already has one."
 msgstr "无法添加图层蒙板，因为已有一个。"
 
-#: ../app/core/gimplayer.c:1276
+#: ../app/core/gimplayer.c:1277
 #, c-format
 msgid "Cannot add layer mask of different dimensions than specified layer."
 msgstr "无法添加跟指定图层尺寸不同的图层蒙板。"
 
-#: ../app/core/gimplayer.c:1384
+#: ../app/core/gimplayer.c:1385
 msgid "Transfer Alpha to Mask"
 msgstr "转移 Alpha 到蒙板"
 
-#: ../app/core/gimplayer.c:1556 ../app/core/gimplayermask.c:235
+#: ../app/core/gimplayer.c:1557 ../app/core/gimplayermask.c:235
 msgid "Apply Layer Mask"
 msgstr "应用图层蒙板"
 
-#: ../app/core/gimplayer.c:1557
+#: ../app/core/gimplayer.c:1558
 msgid "Delete Layer Mask"
 msgstr "删除图层蒙板"
 
-#: ../app/core/gimplayer.c:1669
+#: ../app/core/gimplayer.c:1670
 msgid "Add Alpha Channel"
 msgstr "添加 Alpha 通道"
 
-#: ../app/core/gimplayer.c:1723
+#: ../app/core/gimplayer.c:1724
 msgid "Remove Alpha Channel"
 msgstr "删除 Alpha 通道"
 
-#: ../app/core/gimplayer.c:1745
+#: ../app/core/gimplayer.c:1746
 msgid "Layer to Image Size"
 msgstr "图层到图像大小"
 
@@ -7483,10 +7483,12 @@ msgstr "访问 GIMP 网站"
 #: ../app/dialogs/about-dialog.c:128
 msgid "translator-credits"
 msgstr ""
-"Yuheng Xie\n"
-"Funda Wang\n"
-"Cai Qian\n"
-"神州散人"
+"Yuheng Xie \n"
+"Funda Wang \n"
+"Cai Qian \n"
+"Shawn Syu \n"
+"神州散人 \n"
+"Aron Xu　"
 
 #: ../app/dialogs/about-dialog.c:529
 msgid "GIMP is brought to you by"
@@ -9056,7 +9058,7 @@ msgstr "关闭 %s"
 #
 #: ../app/display/gimpdisplayshell-close.c:159
 msgid "Do_n't Save"
-msgstr "保存(_S)"
+msgstr "不保存(_S)"
 
 #: ../app/display/gimpdisplayshell-close.c:231
 #, c-format
diff --git a/py-compile b/py-compile
index d6e900b30e..3f9d05b603 100755
--- a/py-compile
+++ b/py-compile
@@ -1,9 +1,10 @@
 #!/bin/sh
 # py-compile - Compile a Python program
 
-scriptversion=2005-05-14.22
+scriptversion=2009-04-28.21; # UTC
 
-# Copyright (C) 2000, 2001, 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2008, 2009 Free Software
+# Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -16,9 +17,7 @@ scriptversion=2005-05-14.22
 # GNU General Public License for more details.
 
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program.  If not, see .
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -103,38 +102,38 @@ else
 fi
 
 $PYTHON -c "
-import sys, os, string, py_compile
+import sys, os, py_compile
 
 files = '''$files'''
 
-print 'Byte-compiling python modules...'
-for file in string.split(files):
+sys.stdout.write('Byte-compiling python modules...\n')
+for file in files.split():
     $pathtrans
     $filetrans
     if not os.path.exists(filepath) or not (len(filepath) >= 3
                                             and filepath[-3:] == '.py'):
-	continue
-    print file,
+	    continue
+    sys.stdout.write(file)
     sys.stdout.flush()
     py_compile.compile(filepath, filepath + 'c', path)
-print" || exit $?
+sys.stdout.write('\n')" || exit $?
 
 # this will fail for python < 1.5, but that doesn't matter ...
 $PYTHON -O -c "
-import sys, os, string, py_compile
+import sys, os, py_compile
 
 files = '''$files'''
-print 'Byte-compiling python modules (optimized versions) ...'
-for file in string.split(files):
+sys.stdout.write('Byte-compiling python modules (optimized versions) ...\n')
+for file in files.split():
     $pathtrans
     $filetrans
     if not os.path.exists(filepath) or not (len(filepath) >= 3
                                             and filepath[-3:] == '.py'):
-	continue
-    print file,
+	    continue
+    sys.stdout.write(file)
     sys.stdout.flush()
     py_compile.compile(filepath, filepath + 'o', path)
-print" 2>/dev/null || :
+sys.stdout.write('\n')" 2>/dev/null || :
 
 # Local Variables:
 # mode: shell-script
@@ -142,5 +141,6 @@ print" 2>/dev/null || :
 # eval: (add-hook 'write-file-hooks 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
 # End:
diff --git a/themes/Default/Makefile.in b/themes/Default/Makefile.in
index 7c9ed9af4f..8534134682 100644
--- a/themes/Default/Makefile.in
+++ b/themes/Default/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -61,16 +64,58 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(themedatadir)"
-themedataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(themedata_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -383,9 +428,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  themes/Default/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  themes/Default/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Default/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu themes/Default/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -403,6 +448,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -412,20 +458,23 @@ clean-libtool:
 install-themedataDATA: $(themedata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(themedatadir)" || $(MKDIR_P) "$(DESTDIR)$(themedatadir)"
-	@list='$(themedata_DATA)'; for p in $$list; do \
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(themedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  $(themedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(themedatadir)" || exit $$?; \
 	done
 
 uninstall-themedataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(themedata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(themedatadir)/$$f"; \
-	done
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(themedatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(themedatadir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -451,7 +500,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -485,16 +534,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -509,7 +558,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -521,7 +570,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -530,29 +579,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -573,29 +627,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -628,6 +697,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -646,6 +716,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -654,18 +726,28 @@ install-data-am: install-themedataDATA
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -686,8 +768,8 @@ ps-am:
 
 uninstall-am: uninstall-themedataDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -704,6 +786,7 @@ uninstall-am: uninstall-themedataDATA
 	tags tags-recursive uninstall uninstall-am \
 	uninstall-themedataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/Default/images/Makefile.in b/themes/Default/images/Makefile.in
index 49a1dcd7a2..8a04204beb 100644
--- a/themes/Default/images/Makefile.in
+++ b/themes/Default/images/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -61,16 +64,58 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(themedatadir)"
-themedataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(noinst_DATA) $(themedata_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -737,9 +782,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  themes/Default/images/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  themes/Default/images/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Default/images/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu themes/Default/images/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -757,6 +802,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -766,20 +812,23 @@ clean-libtool:
 install-themedataDATA: $(themedata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(themedatadir)" || $(MKDIR_P) "$(DESTDIR)$(themedatadir)"
-	@list='$(themedata_DATA)'; for p in $$list; do \
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(themedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  $(themedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(themedatadir)" || exit $$?; \
 	done
 
 uninstall-themedataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(themedata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(themedatadir)/$$f"; \
-	done
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(themedatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(themedatadir)" && rm -f $$files
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -805,7 +854,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -839,16 +888,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -863,7 +912,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -875,7 +924,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -884,29 +933,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -927,29 +981,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -983,6 +1052,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -1001,6 +1071,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -1009,18 +1081,28 @@ install-data-am: install-themedataDATA
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -1041,8 +1123,8 @@ ps-am:
 
 uninstall-am: uninstall-themedataDATA
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -1073,6 +1155,7 @@ gimp-core-pixbufs.h: $(CORE_IMAGES) Makefile.am
 
 gimp-stock-pixbufs.h: stock-icons.list
 	$(GDK_PIXBUF_CSOURCE) --raw --build-list `cat $<` > $(@F)
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/Default/images/preferences/Makefile.in b/themes/Default/images/preferences/Makefile.in
index 9ad744cea9..8421ada1f8 100644
--- a/themes/Default/images/preferences/Makefile.in
+++ b/themes/Default/images/preferences/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(themedatadir)"
-themedataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(themedata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -435,9 +452,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  themes/Default/images/preferences/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  themes/Default/images/preferences/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Default/images/preferences/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu themes/Default/images/preferences/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -455,6 +472,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -464,20 +482,23 @@ clean-libtool:
 install-themedataDATA: $(themedata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(themedatadir)" || $(MKDIR_P) "$(DESTDIR)$(themedatadir)"
-	@list='$(themedata_DATA)'; for p in $$list; do \
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(themedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  $(themedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(themedatadir)" || exit $$?; \
 	done
 
 uninstall-themedataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(themedata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(themedatadir)/$$f"; \
-	done
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(themedatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(themedatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -501,13 +522,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -538,6 +563,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -556,6 +582,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -564,18 +592,28 @@ install-data-am: install-themedataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -610,6 +648,7 @@ uninstall-am: uninstall-themedataDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-themedataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/Makefile.in b/themes/Makefile.in
index eab6ecd39a..398d4c7147 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -46,6 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
@@ -57,10 +60,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -370,9 +401,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  themes/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  themes/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu themes/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -390,6 +421,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -421,7 +453,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -455,16 +487,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -479,7 +511,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -491,7 +523,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -500,29 +532,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -543,29 +580,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -595,6 +647,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -613,6 +666,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -621,18 +676,28 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -653,8 +718,8 @@ ps-am:
 
 uninstall-am:
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-generic clean-libtool \
@@ -670,6 +735,7 @@ uninstall-am:
 	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
 	uninstall uninstall-am
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/Small/Makefile.in b/themes/Small/Makefile.in
index f2e86778dc..050274490e 100644
--- a/themes/Small/Makefile.in
+++ b/themes/Small/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -47,6 +49,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -54,9 +57,23 @@ am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
     *) f=$$p;; \
   esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(themedatadir)"
-themedataDATA_INSTALL = $(INSTALL_DATA)
 DATA = $(themedata_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 AA_LIBS = @AA_LIBS@
@@ -370,9 +387,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  themes/Small/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  themes/Small/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu themes/Small/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu themes/Small/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -390,6 +407,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -399,20 +417,23 @@ clean-libtool:
 install-themedataDATA: $(themedata_DATA)
 	@$(NORMAL_INSTALL)
 	test -z "$(themedatadir)" || $(MKDIR_P) "$(DESTDIR)$(themedatadir)"
-	@list='$(themedata_DATA)'; for p in $$list; do \
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(themedataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  $(themedataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(themedatadir)/$$f"; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(themedatadir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(themedatadir)" || exit $$?; \
 	done
 
 uninstall-themedataDATA:
 	@$(NORMAL_UNINSTALL)
-	@list='$(themedata_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(themedatadir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(themedatadir)/$$f"; \
-	done
+	@list='$(themedata_DATA)'; test -n "$(themedatadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(themedatadir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(themedatadir)" && rm -f $$files
 tags: TAGS
 TAGS:
 
@@ -436,13 +457,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -473,6 +498,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -491,6 +517,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -499,18 +527,28 @@ install-data-am: install-themedataDATA
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -545,6 +583,7 @@ uninstall-am: uninstall-themedataDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-themedataDATA
 
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/tools/Makefile.in b/tools/Makefile.in
index 801c1ee8df..d58d3c151a 100644
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,8 +17,9 @@
 
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -50,8 +52,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
-binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_gimp_remote_2_6_OBJECTS = gimp-remote.$(OBJEXT) \
 	gimp-remote-x11.$(OBJEXT)
@@ -71,6 +73,7 @@ test_clipboard_DEPENDENCIES = $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
+am__mv = mv -f
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
@@ -93,10 +96,38 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
 	ps-recursive uninstall-recursive
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
+	distdir
 ETAGS = etags
 CTAGS = ctags
 DIST_SUBDIRS = pdbgen
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+am__relativize = \
+  dir0=`pwd`; \
+  sed_first='s,^\([^/]*\)/.*$$,\1,'; \
+  sed_rest='s,^[^/]*/*,,'; \
+  sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+  sed_butlast='s,/*[^/]*$$,,'; \
+  while test -n "$$dir1"; do \
+    first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+    if test "$$first" != "."; then \
+      if test "$$first" = ".."; then \
+        dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+        dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+      else \
+        first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+        if test "$$first2" = "$$first"; then \
+          dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+        else \
+          dir2="../$$dir2"; \
+        fi; \
+        dir0="$$dir0"/"$$first"; \
+      fi; \
+    fi; \
+    dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+  done; \
+  reldir="$$dir2"
 AA_LIBS = @AA_LIBS@
 ACLOCAL = @ACLOCAL@
 ALLOCA = @ALLOCA@
@@ -461,9 +492,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tools/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tools/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tools/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -481,41 +512,59 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  if test -f $$p \
-	     || test -f $$p1 \
-	  ; then \
-	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) '$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	   $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(binPROGRAMS_INSTALL) "$$p" "$(DESTDIR)$(bindir)/$$f" || exit 1; \
-	  else :; fi; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	for p in $$list; do echo "$$p $$p"; done | \
+	sed 's/$(EXEEXT)$$//' | \
+	while read p p1; do if test -f $$p || test -f $$p1; \
+	  then echo "$$p"; echo "$$p"; else :; fi; \
+	done | \
+	sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \
+	    -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \
+	sed 'N;N;N;s,\n, ,g' | \
+	$(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
+	  { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
+	    if ($$2 == $$4) files[d] = files[d] " " $$1; \
+	    else { print "f", $$3 "/" $$4, $$1; } } \
+	  END { for (d in files) print "f", d, files[d] }' | \
+	while read type dir files; do \
+	    if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+	    test -z "$$files" || { \
+	    echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
+	    $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \
+	    } \
+	; done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	files=`for p in $$list; do echo "$$p"; done | \
+	  sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
+	      -e 's/$$/$(EXEEXT)/' `; \
+	test -n "$$list" || exit 0; \
+	echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(bindir)" && rm -f $$files
 
 clean-binPROGRAMS:
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 
 clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
+	@list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \
+	echo " rm -f" $$list; \
+	rm -f $$list || exit $$?; \
+	test -n "$(EXEEXT)" || exit 0; \
+	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
+	echo " rm -f" $$list; \
+	rm -f $$list
 gimp-remote-2.6$(EXEEXT): $(gimp_remote_2_6_OBJECTS) $(gimp_remote_2_6_DEPENDENCIES) 
 	@rm -f gimp-remote-2.6$(EXEEXT)
 	$(LINK) $(gimp_remote_2_6_OBJECTS) $(gimp_remote_2_6_LDADD) $(LIBS)
@@ -543,21 +592,21 @@ distclean-compile:
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c $<
 
 .c.obj:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
 
 .c.lo:
 @am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@am__fastdepCC_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
+@am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
@@ -592,7 +641,7 @@ $(RECURSIVE_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done; \
 	if test "$$dot_seen" = "no"; then \
@@ -626,16 +675,16 @@ $(RECURSIVE_CLEAN_TARGETS):
 	  else \
 	    local_target="$$target"; \
 	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+	  ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
 	  || eval $$failcom; \
 	done && test -z "$$fail"
 tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 ctags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+	  test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
 	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -650,7 +699,7 @@ tags: TAGS
 
 TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
+	set x; \
 	here=`pwd`; \
 	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
 	  include_option=--etags-include; \
@@ -662,7 +711,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+	      set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
 	  fi; \
 	done; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
@@ -671,29 +720,34 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
 	fi
 ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
-	tags=; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
 	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
 	      END { if (nonempty) { for (i in files) print i; }; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
+	test -z "$(CTAGS_ARGS)$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
+	     $$unique
 
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
 
 distclean-tags:
 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -714,29 +768,44 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || $(MKDIR_P) "$(distdir)/$$subdir" \
 	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
+	  fi; \
+	done
+	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	  if test "$$subdir" = .; then :; else \
+	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
+	    $(am__relativize); \
+	    new_distdir=$$reldir; \
+	    dir1=$$subdir; dir2="$(top_distdir)"; \
+	    $(am__relativize); \
+	    new_top_distdir=$$reldir; \
+	    echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
+	    echo "     am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
+	    ($(am__cd) $$subdir && \
 	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
+	        top_distdir="$$new_top_distdir" \
+	        distdir="$$new_distdir" \
 		am__remove_distdir=: \
 		am__skip_length_check=: \
+		am__skip_mode_fix=: \
 	        distdir) \
 	      || exit 1; \
 	  fi; \
@@ -769,6 +838,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -790,6 +860,8 @@ dvi-am:
 
 html: html-recursive
 
+html-am:
+
 info: info-recursive
 
 info-am:
@@ -798,20 +870,29 @@ install-data-am:
 
 install-dvi: install-dvi-recursive
 
+install-dvi-am:
+
 install-exec-am: install-binPROGRAMS
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
-
 install-html: install-html-recursive
 
+install-html-am:
+
 install-info: install-info-recursive
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-recursive
 
+install-pdf-am:
+
 install-ps: install-ps-recursive
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
@@ -834,8 +915,8 @@ ps-am:
 
 uninstall-am: uninstall-binPROGRAMS uninstall-local
 
-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
-	install-exec-am install-strip
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
+	install-am install-exec-am install-strip tags-recursive
 
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am check check-am clean clean-binPROGRAMS \
@@ -866,6 +947,7 @@ install-exec-hook:
 
 uninstall-local:
 @DEFAULT_BINARY_TRUE@	rm -f $(DESTDIR)$(bindir)/gimp-remote
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/tools/gimptool.c b/tools/gimptool.c
index 1adddd2292..473fbbe03f 100644
--- a/tools/gimptool.c
+++ b/tools/gimptool.c
@@ -628,7 +628,7 @@ maybe_append_exe (const gchar *what)
   gchar *p = strrchr (what, '.');
 
   if (p == NULL || g_ascii_strcasecmp (p, ".exe") != 0)
-    return g_strconcat (what, ".exe");
+    return g_strconcat (what, ".exe", NULL);
 #endif
 
   return what;
diff --git a/tools/pdbgen/Makefile.in b/tools/pdbgen/Makefile.in
index 0fddc88266..6e830abe8b 100644
--- a/tools/pdbgen/Makefile.in
+++ b/tools/pdbgen/Makefile.in
@@ -1,8 +1,9 @@
-# Makefile.in generated by automake 1.10.2 from Makefile.am.
+# Makefile.in generated by automake 1.11 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
+# Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -15,8 +16,9 @@
 @SET_MAKE@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
@@ -46,6 +48,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -458,9 +461,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__confi
 	      exit 1;; \
 	  esac; \
 	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  tools/pdbgen/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  tools/pdbgen/Makefile
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu tools/pdbgen/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu tools/pdbgen/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
 	@case '$?' in \
@@ -478,6 +481,7 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
 
 mostlyclean-libtool:
 	-rm -f *.lo
@@ -507,13 +511,17 @@ distdir: $(DISTFILES)
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  if test -d $$d/$$file; then \
 	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
 	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
 	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
 	    || exit 1; \
 	  fi; \
 	done
@@ -541,6 +549,7 @@ clean-generic:
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
 	-test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
 
 maintainer-clean-generic:
@@ -560,6 +569,8 @@ dvi-am:
 
 html: html-am
 
+html-am:
+
 info: info-am
 
 info-am:
@@ -568,18 +579,28 @@ install-data-am:
 
 install-dvi: install-dvi-am
 
+install-dvi-am:
+
 install-exec-am:
 
 install-html: install-html-am
 
+install-html-am:
+
 install-info: install-info-am
 
+install-info-am:
+
 install-man:
 
 install-pdf: install-pdf-am
 
+install-pdf-am:
+
 install-ps: install-ps-am
 
+install-ps-am:
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -655,6 +676,7 @@ stamp-enum-code: $(srcdir)/enumcode.pl $(enum_deps)
 	 && echo timestamp > $$rootme/stamp-enum-code
 
 all-local: stamp-pdbgen stamp-enum-code
+
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

value_name :

 return location for the value's name (or NULL) + return location for the value's name (or NULL)

value_nick :

 return location for the value's nick (or NULL) + return location for the value's nick (or NULL)

value_desc :

 return location for the value's translated desc (or NULL) + return location for the value's translated desc (or NULL)

value_help :

 return location for the value's translated help (or NULL) + return location for the value's translated help (or NULL)

Returns :

 TRUE if value is valid for the flags_type, - FALSE otherwise + TRUE if value is valid for the flags_type, + FALSE otherwise